Add groupId to session
Patch on controller name matching?