entities and API updated