Updated nid to/from string for new NID structure