from code review: include entity annotations