Added support for various group systems