diff --git a/base_operator_stack.jsonnet b/base_operator_stack.jsonnet
index 68cb364..c30fcfe 100644
--- a/base_operator_stack.jsonnet
+++ b/base_operator_stack.jsonnet
@@ -67,24 +67,24 @@ local vars = import 'vars.jsonnet';
     local pvc = k.core.v1.persistentVolumeClaim,
     prometheus+: {
       spec+: {
-        retention: '15d',
-        externalUrl: 'http://' + $._config.urls.prom_ingress,
-      }
-      + ( if vars.enablePersistence['prometheus'] then {
-        storage: {
-          volumeClaimTemplate:
-            pvc.new() +
-            pvc.mixin.spec.withAccessModes('ReadWriteOnce') +
-            pvc.mixin.spec.resources.withRequests({ storage: '20Gi' }),
-          // Uncomment below to define a StorageClass name
-          //+ pvc.mixin.spec.withStorageClassName('nfs-master-ssd'),
-        },
-      } else {}),
+               retention: '15d',
+               externalUrl: 'http://' + $._config.urls.prom_ingress,
+             }
+             + (if vars.enablePersistence.prometheus then {
+                  storage: {
+                    volumeClaimTemplate:
+                      pvc.new() +
+                      pvc.mixin.spec.withAccessModes('ReadWriteOnce') +
+                      pvc.mixin.spec.resources.withRequests({ storage: '20Gi' }),
+                    // Uncomment below to define a StorageClass name
+                    //+ pvc.mixin.spec.withStorageClassName('nfs-master-ssd'),
+                  },
+                } else {}),
     },
   },
 
   // Override deployment for Grafana data persistence
-  grafana+:: if vars.enablePersistence['grafana'] then {
+  grafana+:: if vars.enablePersistence.grafana then {
     deployment+: {
       spec+: {
         template+: {
diff --git a/main.jsonnet b/main.jsonnet
index 735e674..a346dc4 100644
--- a/main.jsonnet
+++ b/main.jsonnet
@@ -1,5 +1,14 @@
 local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
 local vars = import 'vars.jsonnet';
+local enabledModules = [module.name for module in vars.modules if module.enabled];
+
+local join_objects(objs) =
+    local aux(arr, i, running) =
+        if i >= std.length(arr) then
+            running
+        else
+            aux(arr, i + 1, running + arr[i]) tailstrict;
+    aux(objs, 0, {});
 
 local kp = (import 'kube-prometheus/kube-prometheus.libsonnet')
            + (import 'kube-prometheus/kube-prometheus-anti-affinity.libsonnet')
@@ -10,11 +19,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet')
            + (import 'base_operator_stack.jsonnet')
            + (import 'smtp_server.jsonnet')
            // Additional Modules
-           + (if vars.installModules['arm-exporter'] then (import 'arm_exporter.jsonnet') else {})
-           + (if vars.installModules.metallb then (import 'metallb.jsonnet') else {})
-           + (if vars.installModules.traefik then (import 'traefik.jsonnet') else {})
-           + (if vars.installModules['ups-exporter'] then (import 'ups_exporter.jsonnet') else {})
-           + (if vars.installModules['elastic-exporter'] then (import 'elasticsearch_exporter.jsonnet') else {})
+           + join_objects([module.file for module in vars.modules if module.enabled])
            // Load image versions last to override default from modules
            + (import 'image_sources_versions.jsonnet');
 
@@ -27,15 +32,35 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet')
 { ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } +
 { ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } +
 { ['ingress-' + name]: kp.ingress[name] for name in std.objectFields(kp.ingress) } +
-{ ['smtp-server-' + name]: kp.smtpServer[name] for name in std.objectFields(kp.smtpServer) } +
+{ ['smtp-server-' + name]: kp.smtpServer[name] for name in std.objectFields(kp.smtpServer) }
 // Additional Modules
-(if vars.installModules['arm-exporter'] then
-   { ['arm-exporter-' + name]: kp.armExporter[name] for name in std.objectFields(kp.armExporter) } else {}) +
-(if vars.installModules.metallb then
-   { ['metallb-' + name]: kp.metallb[name] for name in std.objectFields(kp.metallb) } else {}) +
-(if vars.installModules.traefik then
-   { ['traefik-' + name]: kp.traefik[name] for name in std.objectFields(kp.traefik) } else {}) +
-(if vars.installModules['ups-exporter'] then
-   { ['ups-exporter-' + name]: kp.upsExporter[name] for name in std.objectFields(kp.upsExporter) } else {}) +
-(if vars.installModules['elastic-exporter'] then
-   { ['elasticexporter-' + name]: kp.elasticExporter[name] for name in std.objectFields(kp.elasticExporter) } else {})
+
+{
+    [std.asciiLower(moduleName) + '-' + objName]: {kp.moduleName[objName]}
+    for objName in [std.objectFields(kp[moduleName]] for moduleName in enabledModules
+}
+
+
+// {
+//   local items = ["a", "b", "c"],
+//   joined: {
+//     [x + i]: {
+//       data: "x = %s and i = %s" % [x, i],
+//     } for i in ["1", "2"] for x in items
+//   }
+// }
+
+// { ['arm-exporter-' + name]: kp.armExporter[name] for name in std.objectFields(kp.armExporter) }
+
+// {[std.asciiLower(moduleName) + '-' + objName]: kp.moduleName[objName] for objName in [std.objectFields(kp[moduleName]) for moduleName in enabledModules]}
+
+// (if vars.installModules['arm-exporter'] then
+//    { ['arm-exporter-' + name]: kp.armExporter[name] for name in std.objectFields(kp.armExporter) } else {}) +
+// (if vars.installModules.metallb then
+//    { ['metallb-' + name]: kp.metallb[name] for name in std.objectFields(kp.metallb) } else {}) +
+// (if vars.installModules.traefik then
+//    { ['traefik-' + name]: kp.traefik[name] for name in std.objectFields(kp.traefik) } else {}) +
+// (if vars.installModules['ups-exporter'] then
+//    { ['ups-exporter-' + name]: kp.upsExporter[name] for name in std.objectFields(kp.upsExporter) } else {}) +
+// (if vars.installModules['elastic-exporter'] then
+//    { ['elasticexporter-' + name]: kp.elasticExporter[name] for name in std.objectFields(kp.elasticExporter) } else {})
diff --git a/metallb.jsonnet b/metallb.jsonnet
index 8500a9d..a9874de 100644
--- a/metallb.jsonnet
+++ b/metallb.jsonnet
@@ -10,7 +10,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
 
   },
 
-  metallb+:: {
+  metallbExporter+:: {
     serviceMonitor:
       {
         apiVersion: 'monitoring.coreos.com/v1',
diff --git a/traefik.jsonnet b/traefik.jsonnet
index 6cafe98..2e6223e 100644
--- a/traefik.jsonnet
+++ b/traefik.jsonnet
@@ -9,7 +9,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
     },
   },
 
-  traefik+:: {
+  traefikExporter+:: {
     serviceMonitor:
       {
         apiVersion: 'monitoring.coreos.com/v1',
diff --git a/vars.jsonnet b/vars.jsonnet
index f130685..1f01c51 100644
--- a/vars.jsonnet
+++ b/vars.jsonnet
@@ -1,12 +1,32 @@
 {
   // Enable or disable additional modules
-  installModules: {
-    'arm-exporter': false,
-    metallb: false,
-    traefik: false,
-    'ups-exporter': false,
-    'elastic-exporter': false,
-  },
+  modules: [
+    {
+      name: 'armExporter',
+      enabled: true,
+      file: import 'arm_exporter.jsonnet',
+    },
+    {
+      name: 'upsExporter',
+      enabled: true,
+      file: import 'ups_exporter.jsonnet',
+    },
+    {
+      name: 'metallbExporter',
+      enabled: true,
+      file: import 'metallb.jsonnet',
+    },
+    {
+      name: 'traefikExporter',
+      enabled: true,
+      file: import 'traefik.jsonnet',
+    },
+    {
+      name: 'elasticExporter',
+      enabled: true,
+      file: import 'elasticsearch_exporter.jsonnet',
+    },
+  ],
 
   // Setting these to false, defaults to emptyDirs
   enablePersistence: {
@@ -15,10 +35,10 @@
   },
 
   // Domain suffix for the ingresses
-  suffixDomain: "192.168.99.102.nip.io",
+  suffixDomain: '192.168.99.100.nip.io',
 
   // Grafana "from" email
   grafana: {
     from_address: 'myemail@gmail.com',
   },
-}
\ No newline at end of file
+}