Further simplified the API for the data model