Add regular expression matching