Improve the data model API