Removed dependancy on aggregator