Added some S3 changes