Critical NC template updates