Updated Node Handling