Added support for 2 new forms of IN and single NIN