Revise entity reference code