Added support for Amazon S3