Buckets is now a map of vectors instead of lists