Hooks now receive nodeId as a second parameter