PIM-1457 : Update menus with groups and variant groups