Refactored CL Searcher into base class