updates to correct mismatch with data model