add MatchInfo handling