renamed class
Added lazy bucket allocation