Node index refactor

No match.