Adding support for node-walk in lieu of home grown code