Updated index mappings