diff --git a/applications/knl/poisson_dg/knl_poisson_dg.mini b/applications/knl/poisson_dg/knl_poisson_dg.mini
index 41755b7e08a746af270a3d6572dea6dc6273404a..9f93bbb9b5586861cf9386e886a3387b8683aad5 100644
--- a/applications/knl/poisson_dg/knl_poisson_dg.mini
+++ b/applications/knl/poisson_dg/knl_poisson_dg.mini
@@ -52,6 +52,7 @@ vectorization_vertical = 2
 matrix_free = 1
 generate_jacobians = 0
 quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval
+geometry_mixins = sumfact_equidistant
 
 [formcompiler.ufl_variants]
 cell = hexahedron
diff --git a/applications/knl/poisson_dg/verify.mini b/applications/knl/poisson_dg/verify.mini
index b82dce6952c34792c633461bfadb834afd900885..a8a10bc998151d8a86da39f51911e2a7343fb2ee 100644
--- a/applications/knl/poisson_dg/verify.mini
+++ b/applications/knl/poisson_dg/verify.mini
@@ -19,6 +19,7 @@ vectorization_strategy = explicit
 vectorization_horizontal = 4
 vectorization_vertical = 2
 quadrature_order = 6
+geometry_mixins = sumfact_equidistant
 
 [formcompiler.ufl_variants]
 cell = hexahedron
diff --git a/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini b/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini
index 9d87f7eea1d29b61fc50ee460b8a1098b42cfc5a..176a9c7ced9f554197589f64e7eb7983a9e1faa0 100644
--- a/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini
+++ b/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini
@@ -52,6 +52,7 @@ vectorization_vertical = 2
 quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval
 matrix_free = 1
 generate_jacobians = 0
+geometry_mixins = sumfact_equidistant
 
 [formcompiler.ufl_variants]
 cell = hexahedron
diff --git a/applications/knl/poisson_dg_tensor/verify.mini b/applications/knl/poisson_dg_tensor/verify.mini
index cedf2fb3418dd92e5678ced1d20bbe0e73530d7d..125f4d422c003148b4cfc7256d242365cb4f531e 100644
--- a/applications/knl/poisson_dg_tensor/verify.mini
+++ b/applications/knl/poisson_dg_tensor/verify.mini
@@ -19,6 +19,7 @@ vectorization_strategy = explicit
 vectorization_horizontal = 4
 vectorization_vertical = 2
 quadrature_order = 6
+geometry_mixins = sumfact_equidistant
 
 [formcompiler.ufl_variants]
 cell = hexahedron
diff --git a/applications/poisson_dg/poisson_dg.mini b/applications/poisson_dg/poisson_dg.mini
index d031d8233611e2492ef17eb80c3ae5d24518183f..6fbe2e6aaa5d38918df096db4189bb64bacdab71 100644
--- a/applications/poisson_dg/poisson_dg.mini
+++ b/applications/poisson_dg/poisson_dg.mini
@@ -49,6 +49,7 @@ vectorization_strategy = explicit
 quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval
 matrix_free = 1
 generate_jacobians = 0
+geometry_mixins = sumfact_equidistant
 
 [formcompiler.ufl_variants]
 cell = hexahedron
diff --git a/applications/poisson_dg/verify.mini b/applications/poisson_dg/verify.mini
index 475cb4db8e0e93276ea797cef786ad3d0924ccb6..ab5189514ec3216fe43e83451766222fefcdc024 100644
--- a/applications/poisson_dg/verify.mini
+++ b/applications/poisson_dg/verify.mini
@@ -17,6 +17,7 @@ fastdg = 1
 sumfact = 1
 vectorization_quadloop = 1
 vectorization_strategy = explicit
+geometry_mixins = sumfact_equidistant
 
 [formcompiler.ufl_variants]
 cell = hexahedron
diff --git a/applications/poisson_dg_tensor/poisson_dg_tensor.mini b/applications/poisson_dg_tensor/poisson_dg_tensor.mini
index a5738a46a076588437d0cf2a509fa4623290af2f..d0f6d5dd86dc054f4e7fe90022d1b979df420b2f 100644
--- a/applications/poisson_dg_tensor/poisson_dg_tensor.mini
+++ b/applications/poisson_dg_tensor/poisson_dg_tensor.mini
@@ -49,6 +49,7 @@ vectorization_strategy = explicit
 quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval
 matrix_free = 1
 generate_jacobians = 0
+geometry_mixins = sumfact_equidistant
 
 [formcompiler.ufl_variants]
 cell = hexahedron
diff --git a/applications/poisson_dg_tensor/verify.mini b/applications/poisson_dg_tensor/verify.mini
index 537c202ea9f5a847a4c4f0225f0ca06bb007a196..b7906781eef74b7db58e0dad501fc5f0645a1352 100644
--- a/applications/poisson_dg_tensor/verify.mini
+++ b/applications/poisson_dg_tensor/verify.mini
@@ -17,6 +17,7 @@ sumfact = 1
 vectorization_quadloop = 1
 vectorization_strategy = model
 vectorization_jacobians = 0
+geometry_mixins = sumfact_equidistant
 
 [formcompiler.ufl_variants]
 cell = hexahedron
diff --git a/applications/stokes_dg/stokes_dg.mini b/applications/stokes_dg/stokes_dg.mini
index 6160ced2c164d0fb777f4777234bb30dd0d11768..5f14da6d77d18560ce1c595f5fcb502400881c0b 100644
--- a/applications/stokes_dg/stokes_dg.mini
+++ b/applications/stokes_dg/stokes_dg.mini
@@ -51,6 +51,7 @@ vectorization_allow_quadrature_changes = 1
 quadrature_order = {formcompiler.ufl_variants.v_degree} * 2 | eval
 matrix_free = 1
 generate_jacobians = 0
+geometry_mixins = sumfact_equidistant
 
 [formcompiler.ufl_variants]
 cell = hexahedron
diff --git a/python/dune/codegen/sumfact/basis.py b/python/dune/codegen/sumfact/basis.py
index d8194af77400fc26148263d367fde33f25ed2480..9fac39426df4339a5804237418e5edfcd6e092c6 100644
--- a/python/dune/codegen/sumfact/basis.py
+++ b/python/dune/codegen/sumfact/basis.py
@@ -34,7 +34,7 @@ from dune.codegen.sumfact.permutation import (permute_backward,
 from dune.codegen.sumfact.switch import (get_facedir,
                                          get_facemod,
                                          )
-from dune.codegen.pdelab.argument import name_coefficientcontainer
+from dune.codegen.pdelab.argument import name_coefficientcontainer, name_applycontainer
 from dune.codegen.pdelab.basis import GenericBasisMixin
 from dune.codegen.pdelab.geometry import (local_dimension,
                                           world_dimension,