Added model choice fields that allow models to be grouped.