Work on node support - ref #41