Converting team-members to new directive