Add batch process handling on matches