Entity API added