Matchups now working with team references