Targets now have buckets