Refactored Bucket into Bucket and ContainerDescriptor.