REfactor, teams enum added