Add new info fields. Reformat code