Entity API updates part 1