Added support for nodes and server