Use new XML format for core data model