Entity API updates part 3