More dependency management