Simplied team manager, added tournament team support, added generics support