Updated with node references