Improved dependency resolver