Improve DependencyManager