Model changes to reflect new database structure