Updates to Entity APIs part 1