Feature/bucket to aggregator