Added S3 capabilites