Improved Node Lookup and Persistence