Added championships teams and groups support