Add TeamService and co