Corrected MatchData for legacy methods