Changing mapping for AWS