Added explicit index mappings.