Improve the data model