Refactor/searcher