Added teams support