Adding support for creating groups