Updated to use MatchInfo class in order to help organize things as bit
more.