Add group category support