diff --git a/quickfix/examples/demo_config.rs b/quickfix/examples/demo_config.rs
index 25387ce..edacb0f 100644
--- a/quickfix/examples/demo_config.rs
+++ b/quickfix/examples/demo_config.rs
@@ -18,27 +18,28 @@ impl ApplicationCallback for MyApplication {
 }
 
 fn build_settings() -> Result<SessionSettings, QuickFixError> {
-    let mut global_params = Dictionary::default();
-    global_params.set("ConnectionType", "acceptor".to_string())?;
-    global_params.set("ReconnectInterval", 60)?;
-    global_params.set("FileStorePath", "store".to_string())?;
+    let mut settings = SessionSettings::new();
 
-    let mut session1_params = Dictionary::default();
-    session1_params.set("StartTime", "12:30:00".to_string())?;
-    session1_params.set("EndTime", "23:30:00".to_string())?;
-    session1_params.set("HeartBtInt", 20)?;
-    session1_params.set("SocketAcceptPort", 4000)?;
-    session1_params.set(
-        "DataDictionary",
-        "quickfix-ffi/libquickfix/spec/FIX41.xml".to_string(),
-    )?;
+    settings.set(None, {
+        let mut params = Dictionary::default();
+        params.set("ConnectionType", "acceptor".to_string())?;
+        params.set("ReconnectInterval", 60)?;
+        params.set("FileStorePath", "store".to_string())?;
+        params
+    })?;
 
-    let mut settings = SessionSettings::new();
-    settings.set(None, global_params)?;
-    settings.set(
-        Some(SessionId::try_new("FIX.4.4", "ME", "THEIR", "")?),
-        session1_params,
-    )?;
+    settings.set(Some(SessionId::try_new("FIX.4.4", "ME", "THEIR", "")?), {
+        let mut params = Dictionary::default();
+        params.set("StartTime", "12:30:00".to_string())?;
+        params.set("EndTime", "23:30:00".to_string())?;
+        params.set("HeartBtInt", 20)?;
+        params.set("SocketAcceptPort", 4000)?;
+        params.set(
+            "DataDictionary",
+            "quickfix-ffi/libquickfix/spec/FIX41.xml".to_string(),
+        )?;
+        params
+    })?;
 
     Ok(settings)
 }
diff --git a/quickfix/tests/test_socket.rs b/quickfix/tests/test_socket.rs
index fc23f4b..990e0e9 100644
--- a/quickfix/tests/test_socket.rs
+++ b/quickfix/tests/test_socket.rs
@@ -5,26 +5,27 @@ struct MyApplication;
 impl ApplicationCallback for MyApplication {}
 
 fn build_settings(connection_type: &str) -> Result<SessionSettings, QuickFixError> {
-    let mut global_params = Dictionary::default();
-    global_params.set("ConnectionType", connection_type.to_string())?;
-    global_params.set("FileStorePath", "store".to_string())?;
+    let mut settings = SessionSettings::new();
 
-    let mut session1_params = Dictionary::default();
-    session1_params.set("StartTime", "12:30:00".to_string())?;
-    session1_params.set("EndTime", "23:30:00".to_string())?;
-    session1_params.set("HeartBtInt", 20)?;
-    session1_params.set("SocketAcceptPort", 4000)?;
-    session1_params.set(
-        "DataDictionary",
-        "../quickfix-ffi/libquickfix/spec/FIX41.xml".to_string(),
-    )?;
+    settings.set(None, {
+        let mut params = Dictionary::default();
+        params.set("ConnectionType", connection_type.to_string())?;
+        params.set("FileStorePath", "store".to_string())?;
+        params
+    })?;
 
-    let mut settings = SessionSettings::new();
-    settings.set(None, global_params)?;
-    settings.set(
-        Some(SessionId::try_new("FIX.4.4", "ME", "THEIR", "")?),
-        session1_params,
-    )?;
+    settings.set(Some(SessionId::try_new("FIX.4.4", "ME", "THEIR", "")?), {
+        let mut params = Dictionary::default();
+        params.set("StartTime", "12:30:00".to_string())?;
+        params.set("EndTime", "23:30:00".to_string())?;
+        params.set("HeartBtInt", 20)?;
+        params.set("SocketAcceptPort", 4000)?;
+        params.set(
+            "DataDictionary",
+            "../quickfix-ffi/libquickfix/spec/FIX41.xml".to_string(),
+        )?;
+        params
+    })?;
 
     Ok(settings)
 }