added basic group support