Reworked node lookup