Added NI class