Added support for team members