updates to entity api