Making the endpoint details more robust so that we can transition to the
new data model