Regex enhancements