Updated entities and endpoints

Let's use curly braces for style even where not strictly necessary.