Updated entities and endpoints