Add support for Regex