Updated for AWS configuration