Using buckets instead of single records