API entities revised