Fixed dependency management