Expand on Team model