Bucket refactored