Refactored implementation of nodes.