Added matchup class