Added indices to tables