Added support for regular expressions