Added s3 integration