added support for regexp