Added more indexes.