Latest large round of data model changes