Better dependency management