Improved dependency-management