Added Regex Support