Support for messages and teams