Added support for node identifier