Add support for search/replace