Update field groupings