resolver refactoring