Added support for team name, identifers