Added stuff for amazon s3