Improved: Regex term