added functionality of managing unmapped buckets