Better support for dependency management