Added better visitor and nodes