newer version entity api