Updates to entity fetching API; minor improvement in graphs.