Introduced support for regex matching