Add match-fetching code