Changed NI references properties to avoid version hell.