Work on data model