Added regular expression matching