Updated entity references