Added context searcher