Entity API updates part 5