Added Regex into helpers