Node Manager Changes