Final changes for Amazon S3