Add support for nms 16R3 regeneration