add amazon s3 and image capability