added Entity, Enumeration, Direction, TeamworkType, and updated Challenge to use TeamworkType