Team Tool improvements