Added S3 integration