Add support for teams