Add visit number variable and new ID variables for NSRR