Added missing @group annotations