diff --git a/bffhd/config/dhall.rs b/bffhd/config/dhall.rs
index c01637d..f327c53 100644
--- a/bffhd/config/dhall.rs
+++ b/bffhd/config/dhall.rs
@@ -90,11 +90,11 @@ pub struct Config {
 
     /// Actors to load and their configuration options
     pub actors: HashMap<String, ModuleConfig>,
-    pub actor_connections: Vec<(String, String)>,
+    pub actor_connections: HashMap<String, String>,
 
     /// Initiators to load and their configuration options
     pub initiators: HashMap<String, ModuleConfig>,
-    pub init_connections: Vec<(String, String)>,
+    pub init_connections: HashMap<String, String>,
 }
 
 impl Config {
@@ -167,9 +167,9 @@ impl Default for Config {
             "resource_a".to_string(),
             MachineDescription {
                 name: "Resource A".to_string(),
-                description: Option::from("Some description".to_string()),
-                wiki: Option::from("Some wiki url".to_string()),
-                category: Option::from("Some category".to_string()),
+                description: Option::from("A description".to_string()),
+                wiki: Option::from("https://some.wiki.url".to_string()),
+                category: Option::from("A category".to_string()),
                 privs: PrivilegesBuf {
                     disclose: PermissionBuf {
                         inner: "lab.some.disclose".to_string(),
@@ -191,9 +191,9 @@ impl Default for Config {
             "resource_b".to_string(),
             MachineDescription {
                 name: "Resource B".to_string(),
-                description: Option::from("Some description".to_string()),
-                wiki: Option::from("Some wiki url".to_string()),
-                category: Option::from("Some category".to_string()),
+                description: Option::from("A description".to_string()),
+                wiki: Option::from("https://some.wiki.url".to_string()),
+                category: Option::from("A category".to_string()),
                 privs: PrivilegesBuf {
                     disclose: PermissionBuf {
                         inner: "lab.some.disclose".to_string(),
@@ -248,9 +248,9 @@ impl Default for Config {
             roles,
             machines,
             actors,
-            actor_connections: vec![("actor_123".to_string(), "resource_a".to_string())],
+            actor_connections: vec!(("actor".to_string(), "actor_123".to_string()), ("machine".to_string(),"resource_a".to_string())).into_iter().collect(),
             initiators,
-            init_connections: vec![("initiator_123".to_string(), "resource_b".to_string())],
-        }
+            init_connections: vec!(("initiator".to_string(), "initiator_123".to_string()), ("machine".to_string(),"resource_b".to_string())).into_iter().collect(),
+           }
     }
 }