Added Amazon S3 support for images