Separate grouping from bodies