Added Amazon S3 infrastructure