Team model changes