Added Amazon S3 functionality