Handling list of buckets instead of single bucket