Added awareness of singleton nodes.