Performance

Improved performance of regex parser.