NxMatchInfo redesign