Added TeamHandler
Merge remote-tracking branch 'origin/alex2'
Fix the teamhandler