Added groups to scopes mapping