Added aggregator. Totally forgot that one