Add aggregator to more things [ci skip]