Added missing index and mapping setup