Change the HoistModel to allow multiple levels
Buckets now return lists