Moved factory methods into MatchXml