Update models + team implementation