Added basic group support
Added basic group support