Improvements in Regex Class