Adding index with mapping