More updates to data model.