Updated to handle node cluster properly