Removed partial_search dependency