Changed storage to Amazon S3