Changes to data model again.