Added support for groups

Signed-off-by: hajee <hajee@moretIA.com>