Updated search algorithms