Get rid of dock dependency in aggregator