Add support for grups