Updated team model