DockUtils and more refactorings