added index mapper