Improve Nodes Helper

Fixes #425 and #424