Add indexes and other nice things