Add re-match feature