Added support for inactive nodes