Added in data model syncing in several places where it was missing