Add non cli for team selection.