A new data model for the api, based on the full db schema