Add regular expression version