Update References (properly)