Updated Group api