added groups structure