Feature/teams modeling