Aggregator is now separated.