[enhancement] add entity graph and change index annotations