Adding S3 compatibility