Changes to RegexHelper class