Added support for Team selection