Added a new class for buckets.