Adding more indexes back in