Added NDI and ODI Assessments