added regular expression support