Bucket/Bambucket refactoring