Moved regexps to a better place