Added more group functions