Added more group capabilities