Refactored SearchNode