Added support for node names