Updates to handle current/other/all node functionality.