Add support for AWS