Update for new group structure

Changes in Common Groups - Ressource groups