Fixes: #2493 Adapted things to new GroupsAttribute code