Added indices to several model fields