Added groups for 3.2