[IMP] buckets refactoring