Updated resolver