Enhance insrumentation to make it easier to manually add nodes.