[BACKLOG-1562] Refactoring implementation to use Node References.