Add support for regexes