index mapping improved