Adding fieldsGrouping