Adding indexes. More need to come.