Updates to Entity APIs part 5