Further work on node manager