Regexes changed to use some posix style groups