Updated dependency resolver