Adds indexes, tweaks data types of some fields