Updated entities and endpoints

Braces