Added S3 storage and keys