Handle extra groups