Refactored Searcher a little bit