[CORE-4891] Added data index mapping types