Fix export_to_dict and update to latest CMS data model