Added Amazon S3 and keys