Improve dependency management