Added Amazon s3 support