Entity API change