Expand container API for S3Bucket and Snapshot support