Added regular expression parsing