Changes for Amazon S3