Resolver refactoring