In progres refactoring of dock and aggregator