added more indexes