Adding more NDS mappings for caid