Introduce new entities to replace NI ones