Adding S3 bucket support