Addition of NodeId to help identify nodes