Adding more indexes to code review