Support s3 bucket option