refactored resolver collector