Added indices for existent data