Synced with latest data model changes