Update for multiple loads and circural references.