Add support for regex search