Added 2 more indexes