Fixed resolver definitions