I moved TEAMS_PRESENT to the match entity and removed some redundant code.