Added support for adding groups