Add NodeResolver and clean up node name -> content ID resolution system