Started to refactor new dependency solver