added support for AWS