Updated entities and endpoints

Is this a textual description or should this be an enum?