refactored definition resolver complexity