Updates to Entity APIs part 4