Added link resolver functionality to refactor branch