Add support for moar groups