Make MatchData more compliant