Add support for regex matching