Move to the AWS Gem