Fix up the structure of the endpoints to align to original model