added basic team support