updates on NodeRetriever class