Added s3 storage