Add group types, fixed #31