Added teams helper and support for team projects
Fix other models