Added more indexes to most tables