Enhance "node" event

Similar to previous commit.