Added support for node labels