Added indexes and some.