Added mapping for NCI and NCI mapping