More changes on data model