In progress refactoring of dock and aggregator