Add blackbird stuff for S3 variants