Add group suffixes