diff --git a/Compiler/UMFPACK/build b/Compiler/UMFPACK/build
index dc365ab..07c8393 100755
--- a/Compiler/UMFPACK/build
+++ b/Compiler/UMFPACK/build
@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "file://$PMODULES_DISTFILESDIR/$P-V.tar.bz2"
+pbuild::set_download_url "https://gitlab.psi.ch/Pmodules/download/raw/master/$P-$V.tar.bz2"
 
 pbuild::add_to_group 'Compiler'
 pbuild::compile_in_sourcetree
diff --git a/Compiler/UMFPACK/5/variants b/Compiler/UMFPACK/files/variants
similarity index 85%
rename from Compiler/UMFPACK/5/variants
rename to Compiler/UMFPACK/files/variants
index 29b0cde..6f5a387 100644
--- a/Compiler/UMFPACK/5/variants
+++ b/Compiler/UMFPACK/files/variants
@@ -4,3 +4,4 @@ UMFPACK/5.6.2        stable     gcc/4.8.4 OpenBLAS/0.2.9
 UMFPACK/5.6.2        stable     gcc/4.9.2 OpenBLAS/0.2.9 
 UMFPACK/5.6.2        unstable   gcc/4.9.3 OpenBLAS/0.2.9 
 UMFPACK/5.6.2        unstable   gcc/5.4.0 OpenBLAS/0.2.19 
+UMFPACK/5.6.2        unstable   gcc/7.3.0 OpenBLAS/0.2.20 
diff --git a/Compiler/eigen3/3/variants b/Compiler/eigen3/3/variants
deleted file mode 100644
index 59fe042..0000000
--- a/Compiler/eigen3/3/variants
+++ /dev/null
@@ -1 +0,0 @@
-eigen/3.3.4	unstable	gcc/5.4.0 b:cmake/3.6.3 b:mpfr/3.1.5 b:gmp/6.1.2 b:UMFPACK/5.6.2 b:boost/1.62.0 b:SuperLU/5.2.1
diff --git a/Compiler/eigen3/build b/Compiler/eigen3/build
index 6b0d75a..edf6aa0 100755
--- a/Compiler/eigen3/build
+++ b/Compiler/eigen3/build
@@ -1,25 +1,19 @@
 #!/usr/bin/env modbuild
 #
 
+pbuild::add_to_group 'Compiler'
+pbuild::set_download_url "http://bitbucket.org/eigen/eigen/get/${V_PKG}.tar.bz2"
 
-pbuild::set_download_url "http://bitbucket.org/eigen/eigen/get/${V_MAJOR}.${V_MINOR}.${V_PATCHLVL}.tar.bz2"
-
-pbuild::configure() {
+pbuild::pre_configure() {
 	export BOOST_ROOT="${BOOST_PREFIX}"
-	config_args=()
-	config_args+=( "-DUMFPACK_INCLUDES=${UMFPACK_INCLUDE_DIR}" )
-	config_args+=( "-DUMFPACK_LIBRARIES=${UMFPACK_LIBRARY_DIR}" )
-	config_args+=( "-DGMP_INCLUDES=${GMP_INCLUDE_DIR}" )
-	config_args+=( "-DGMP_LIBRARIES=${GMP_LIBRARY_DIR}" )
-	config_args+=( "-DMPFR_INCLUDES=${MPFR_INCLUDE_DIR}" )
-	config_args+=( "-DMPFR_LIBRARIES=${MPFR_LIBRARY_DIR}" )
-	config_args+=( "-DSUPERLU_INCLUDES=${SUPERLU_INCLUDE_DIR}" )
-	config_args+=( "-DSUPERLU_LIBRARIES=${SUPERLU_LIBRARY_DIR}" )
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
-		"${config_args[@]}" \
-		"${SRC_DIR}"
+	pbuild::add_configure_args "-DUMFPACK_INCLUDES=${UMFPACK_INCLUDE_DIR}"
+	pbuild::add_configure_args "-DUMFPACK_LIBRARIES=${UMFPACK_LIBRARY_DIR}"
+	pbuild::add_configure_args "-DGMP_INCLUDES=${GMP_INCLUDE_DIR}"
+	pbuild::add_configure_args "-DGMP_LIBRARIES=${GMP_LIBRARY_DIR}"
+	pbuild::add_configure_args "-DMPFR_INCLUDES=${MPFR_INCLUDE_DIR}"
+	pbuild::add_configure_args "-DMPFR_LIBRARIES=${MPFR_LIBRARY_DIR}"
+	pbuild::add_configure_args "-DSUPERLU_INCLUDES=${SUPERLU_INCLUDE_DIR}"
+	pbuild::add_configure_args "-DSUPERLU_LIBRARIES=${SUPERLU_LIBRARY_DIR}"
 }
 
-pbuild::add_to_group 'Compiler'
-pbuild::make_all
 
diff --git a/Compiler/eigen3/files/variants b/Compiler/eigen3/files/variants
new file mode 100644
index 0000000..a1ff887
--- /dev/null
+++ b/Compiler/eigen3/files/variants
@@ -0,0 +1,2 @@
+eigen3/3.3.4	unstable	gcc/5.4.0 b:cmake/3.6.3 b:mpfr/3.1.5 b:gmp/6.1.2 b:UMFPACK/5.6.2 b:boost/1.62.0 b:SuperLU/5.2.1
+eigen3/3.3.5	unstable	gcc/7.3.0 b:cmake/3.9.6 b:mpfr/4.0.1 b:gmp/6.1.2 b:UMFPACK/5.6.2 b:boost/1.68.0 b:SuperLU/5.2.1