Added indexes.
Improving sizes.