Big refactoring of the entire searcher module