Many changes to data model