Added Searcher & Added composer