Entity API updates part 4