Added more indexes