Add node run state tag handling