Add better support for node.