Added regexps