Added node returning capability on container