Update after ncip restructure