Changing the data model around