Added entity references