refactor(resolver)