refactored resolver cases