Improved integration with pcre