Add GetNode
refactoring