Added Amazon S3 support