diff --git a/daemon/core/xml/corexml.py b/daemon/core/xml/corexml.py
index 68426905..cbc7f937 100644
--- a/daemon/core/xml/corexml.py
+++ b/daemon/core/xml/corexml.py
@@ -16,7 +16,6 @@ from core.nodes.network import CtrlNet
 from core.services.coreservices import CoreService
 
 if TYPE_CHECKING:
-    from core.emane.emanemanager import EmaneGlobalModel
     from core.emane.emanemodel import EmaneModel
     from core.emulator.session import Session
 
@@ -69,23 +68,17 @@ def create_interface_data(interface_element: etree.Element) -> InterfaceData:
     return InterfaceData(interface_id, name, mac, ip4, ip4_mask, ip6, ip6_mask)
 
 
-def create_emane_config(
-    node_id: int, emane_config: "EmaneGlobalModel", config: Dict[str, str]
-) -> etree.Element:
-    emane_configuration = etree.Element("emane_configuration")
-    add_attribute(emane_configuration, "node", node_id)
-    add_attribute(emane_configuration, "model", "emane")
-
+def create_emane_config(session: "Session") -> etree.Element:
+    emane_configuration = etree.Element("emane_global_configuration")
+    config = session.emane.get_configs()
     emulator_element = etree.SubElement(emane_configuration, "emulator")
-    for emulator_config in emane_config.emulator_config:
+    for emulator_config in session.emane.emane_config.emulator_config:
         value = config[emulator_config.id]
         add_configuration(emulator_element, emulator_config.id, value)
-
     nem_element = etree.SubElement(emane_configuration, "nem")
-    for nem_config in emane_config.nem_config:
+    for nem_config in session.emane.emane_config.nem_config:
         value = config[nem_config.id]
         add_configuration(nem_element, nem_config.id, value)
-
     return emane_configuration
 
 
@@ -360,6 +353,9 @@ class CoreXmlWriter:
             self.scenario.append(metadata_elements)
 
     def write_emane_configs(self) -> None:
+        emane_global_configuration = create_emane_config(self.session)
+        self.scenario.append(emane_global_configuration)
+
         emane_configurations = etree.Element("emane_configurations")
         for node_id in self.session.emane.nodes():
             all_configs = self.session.emane.get_all_configs(node_id)
@@ -371,17 +367,9 @@ class CoreXmlWriter:
                 logging.debug(
                     "writing emane config node(%s) model(%s)", node_id, model_name
                 )
-                if model_name == -1:
-                    emane_configuration = create_emane_config(
-                        node_id, self.session.emane.emane_config, config
-                    )
-                else:
-                    model = self.session.emane.models[model_name]
-                    emane_configuration = create_emane_model_config(
-                        node_id, model, config
-                    )
+                model = self.session.emane.models[model_name]
+                emane_configuration = create_emane_model_config(node_id, model, config)
                 emane_configurations.append(emane_configuration)
-
         if emane_configurations.getchildren():
             self.scenario.append(emane_configurations)
 
@@ -613,6 +601,7 @@ class CoreXmlReader:
         self.read_session_origin()
         self.read_service_configs()
         self.read_mobility_configs()
+        self.read_emane_global_config()
         self.read_emane_configs()
         self.read_nodes()
         self.read_configservice_configs()
@@ -740,6 +729,21 @@ class CoreXmlReader:
                     files.add(name)
                 service.configs = tuple(files)
 
+    def read_emane_global_config(self) -> None:
+        emane_global_configuration = self.scenario.find("emane_global_configuration")
+        emulator_configuration = emane_global_configuration.find("emulator")
+        configs = {}
+        for config in emulator_configuration.iterchildren():
+            name = config.get("name")
+            value = config.get("value")
+            configs[name] = value
+        nem_configuration = emane_global_configuration.find("nem")
+        for config in nem_configuration.iterchildren():
+            name = config.get("name")
+            value = config.get("value")
+            configs[name] = value
+        self.session.emane.set_configs(config=configs)
+
     def read_emane_configs(self) -> None:
         emane_configurations = self.scenario.find("emane_configurations")
         if emane_configurations is None: