Update matcher to use regex