Enhancement of regular expression