some more refactoring of the dependency manager