Improved dependency-system massively