Add more indexes