Adding regular expression matching