Added support for configurable team number