Add match factory