Updated CPU resolver