diff --git a/Compiler/H5root/with_modules b/Compiler/H5root/with_modules
new file mode 100644
index 0000000..19c356f
--- /dev/null
+++ b/Compiler/H5root/with_modules
@@ -0,0 +1,4 @@
+gcc/4.8.3
+hdf5_serial/1.8.12
+H5hut_serial/1.99.13
+root/5.34.26
diff --git a/Compiler/openmpi/1.10.0/variants b/Compiler/openmpi/1.10/variants
similarity index 100%
rename from Compiler/openmpi/1.10.0/variants
rename to Compiler/openmpi/1.10/variants
diff --git a/Compiler/openmpi/1.6.5/variants b/Compiler/openmpi/1.6.5/variants
deleted file mode 100644
index e3a3a4c..0000000
--- a/Compiler/openmpi/1.6.5/variants
+++ /dev/null
@@ -1,8 +0,0 @@
-:Linux:Darwin:	stable		gcc/4.7.4
-:Linux:Darwin:	stable		gcc/4.8.3
-:Linux:Darwin:	stable		gcc/4.8.4
-:Linux:Darwin:	unstable	gcc/4.8.5
-:Linux:Darwin:	stable		gcc/4.9.2
-:Linux:Darwin:	unstable	gcc/4.9.3
-:Linux:		stable		intel/15.2
-:Linux:		stable		intel/15.3
diff --git a/Compiler/openmpi/1.6/variants b/Compiler/openmpi/1.6/variants
new file mode 100644
index 0000000..cb898d0
--- /dev/null
+++ b/Compiler/openmpi/1.6/variants
@@ -0,0 +1,9 @@
+1.6.5	stable		Linux,Darwin	gcc/4.7.4
+1.6.5	stable		Linux,Darwin	gcc/4.8.3
+1.6.5	stable		Linux,Darwin	gcc/4.8.4
+1.6.5	unstable	Linux,Darwin	gcc/4.8.5
+1.6.5	stable		Linux,Darwin	gcc/4.9.2
+1.6.5	unstable	Linux,Darwin	gcc/4.9.3
+1.6.5	stable		Linux		intel/15.2
+1.6.5	stable		Linux		intel/15.3
+
diff --git a/Compiler/openmpi/1.8.2/variants b/Compiler/openmpi/1.8.2/variants
deleted file mode 100644
index 9b00e28..0000000
--- a/Compiler/openmpi/1.8.2/variants
+++ /dev/null
@@ -1,6 +0,0 @@
-stable		gcc/4.7.4
-stable		gcc/4.8.3
-stable		gcc/4.8.4
-unstable	gcc/4.8.5
-stable		gcc/4.9.2
-unstable	gcc/4.9.3
diff --git a/Compiler/openmpi/1.8.4/variants b/Compiler/openmpi/1.8.4/variants
deleted file mode 100644
index 9b00e28..0000000
--- a/Compiler/openmpi/1.8.4/variants
+++ /dev/null
@@ -1,6 +0,0 @@
-stable		gcc/4.7.4
-stable		gcc/4.8.3
-stable		gcc/4.8.4
-unstable	gcc/4.8.5
-stable		gcc/4.9.2
-unstable	gcc/4.9.3
diff --git a/Compiler/openmpi/1.8.8/variants b/Compiler/openmpi/1.8.8/variants
deleted file mode 100644
index 3ce0ed6..0000000
--- a/Compiler/openmpi/1.8.8/variants
+++ /dev/null
@@ -1,4 +0,0 @@
-:Linux:Darwin:	unstable	gcc/4.8.5
-:Linux:Darwin:	unstable	gcc/4.9.3
-:Linux:Darwin:	unstable	gcc/5.2.0
-:Linux:		unstable	intel/15.3
diff --git a/Compiler/openmpi/1.8/variants b/Compiler/openmpi/1.8/variants
new file mode 100644
index 0000000..108db59
--- /dev/null
+++ b/Compiler/openmpi/1.8/variants
@@ -0,0 +1,8 @@
+1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin	gcc/4.7.4
+1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin	gcc/4.8.3
+1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin	gcc/4.8.4
+1.8.2,1.8.4,1.8.8	unstable    Linux,Darwin	gcc/4.8.5
+1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin 	gcc/4.9.2
+1.8.2,1.8.4,1.8.8	unstable    Linux,Darwin	gcc/4.9.3
+
+
diff --git a/Programming/gcc/with_modules-4.9.3 b/Programming/gcc/with_modules-4.9.3
new file mode 100644
index 0000000..1b560bd
--- /dev/null
+++ b/Programming/gcc/with_modules-4.9.3
@@ -0,0 +1,3 @@
+gmp/6.0.0
+mpfr/3.1.3
+mpc/1.0.3
diff --git a/bin/manage_variants b/bin/manage_variants
new file mode 100755
index 0000000..68e5cd4
--- /dev/null
+++ b/bin/manage_variants
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+declare buildblock=$1
+declare variants=$2
+
+
+declare -r OS=$(uname -s)
+
+while read versions release oss dependencies; do
+      	 [[ "${oss}" =~ "${OS}" ]] || continue
+	 versions_a=( ${versions//,/ } )
+	 dependencies_a=( ${dependencies//,/ } )
+	 for version in "${versions_a[@]}"; do
+	         "${buildblock}"  "${version}" --release=${release} "${dependencies_a[@]/#/--with=}"
+	 done
+done < "${variants}"
\ No newline at end of file