diff --git a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
index 60c20ba681d8f466e2c4388be8e45996b87d9486..aeb2e3b7760cd5153705883a9d38a19b3db7bf61 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
@@ -28,6 +28,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -71,7 +72,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag>
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     enum {
         H2OIdx = FluidSystem::compIdx(FluidSystem::MultiPhaseFluidSystem::H2OIdx),
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
index 5ce9064b59392c31c76202adf24446c72c682f8d..c4718204a4bf2aff372e7c270429ae8ac9b50875 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
@@ -28,6 +28,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -71,7 +72,7 @@ class LensTwoPTwoCProblem: public PorousMediumFlowProblem<TypeTag>
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
     using Element = typename GridView::template Codim<0>::Entity;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     static constexpr int dim = GridView::dimension;
     static constexpr int dimWorld = GridView::dimensionworld;
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
index ee095fb4864f5b094a30b39a0a1c7a26f4399dc4..b070beaba60ea7c10277d24795bea37dd1860bfa 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
@@ -28,6 +28,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux{
@@ -69,7 +70,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
 
 public:
     /*!
diff --git a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
index ee0e542cf8d87933112cc375c538a917875b75df..601b44a02ac0fdb213fd8608d27c795414a05f03 100644
--- a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
+++ b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
@@ -30,6 +30,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -71,7 +72,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag>
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     static constexpr int dim = GridView::dimension;
diff --git a/lecture/efm/1p2cvs2p/lens2pproblem.hh b/lecture/efm/1p2cvs2p/lens2pproblem.hh
index ad062ba60144b25d4a0663946525bd4ef2c65aff..63158c7c8b9ab224df1e74b6ee91fd26132adf62 100644
--- a/lecture/efm/1p2cvs2p/lens2pproblem.hh
+++ b/lecture/efm/1p2cvs2p/lens2pproblem.hh
@@ -30,6 +30,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/timeloop.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -83,7 +84,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     // primary variable indices
     static constexpr int pressureIdx = Indices::pressureIdx;
diff --git a/lecture/efm/2p/lens2pproblem.hh b/lecture/efm/2p/lens2pproblem.hh
index 1ec7e23df4020dbf2c9bd5efddaa9bce1e899e3f..c2761f12283644fdeeef6113e0d261af57758358 100644
--- a/lecture/efm/2p/lens2pproblem.hh
+++ b/lecture/efm/2p/lens2pproblem.hh
@@ -30,6 +30,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/timeloop.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -75,8 +76,8 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using FluidState = GetPropType<TypeTag, Properties::FluidState>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     // primary variable indices
     static constexpr int pressureIdx = Indices::pressureIdx;
     static constexpr int saturationIdx = Indices::saturationIdx;
diff --git a/lecture/mm/co2plume/co2plumeshapeproblem.hh b/lecture/mm/co2plume/co2plumeshapeproblem.hh
index 7faea949320bba7b658eb7f58e25fef1f02c343b..0d71c76f352d17228d3da225094ee3b1e08d36d4 100644
--- a/lecture/mm/co2plume/co2plumeshapeproblem.hh
+++ b/lecture/mm/co2plume/co2plumeshapeproblem.hh
@@ -26,6 +26,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include <dumux/material/fluidsystems/brineco2.hh>
@@ -104,7 +105,7 @@ class PlumeShapeProblem : public PorousMediumFlowProblem<TypeTag>
 #endif
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
diff --git a/lecture/mm/columnxylene/columnxyleneproblem.hh b/lecture/mm/columnxylene/columnxyleneproblem.hh
index 59cb58f6f8bf5b5b9b174b18590cb9a57b9e9741..a251d3f0d22aa8760e0a4ca8571986e00644ac8e 100644
--- a/lecture/mm/columnxylene/columnxyleneproblem.hh
+++ b/lecture/mm/columnxylene/columnxyleneproblem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #define ISOTHERMAL 0
@@ -87,7 +88,7 @@ class ColumnProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
diff --git a/lecture/mm/convectivemixing/convmixproblem.hh b/lecture/mm/convectivemixing/convmixproblem.hh
index 0000480bece195fd87252e980bd7fb125b1a31be..07c72d8a4d3fe1dfdbf0cc11732f14e40c10febc 100644
--- a/lecture/mm/convectivemixing/convmixproblem.hh
+++ b/lecture/mm/convectivemixing/convmixproblem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include <dumux/material/fluidsystems/brineco2.hh>
@@ -53,7 +54,7 @@ class ConvmixProblem : public PorousMediumFlowProblem<TypeTag>
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
     using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/lecture/mm/fractures/fractureproblem.hh b/lecture/mm/fractures/fractureproblem.hh
index 8f19fe2af093da6964951e55ee2ed387bb741d79..7f32eacfea1ad8d3685f88816e8808d03d50957c 100644
--- a/lecture/mm/fractures/fractureproblem.hh
+++ b/lecture/mm/fractures/fractureproblem.hh
@@ -26,6 +26,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 // include the base problem we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 
@@ -41,10 +42,10 @@ class FractureSubProblem : public PorousMediumFlowProblem<TypeTag>
 
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
-    using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
     using PrimaryVariables = typename GridVariables::PrimaryVariables;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+    using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
     using Scalar = typename GridVariables::Scalar;
 
     using FVGridGeometry = typename GridVariables::GridGeometry;
diff --git a/lecture/mm/fractures/matrixproblem.hh b/lecture/mm/fractures/matrixproblem.hh
index b3986a9ba38caa3f50f2ea0d0cfb04699282eb75..bb556bfb69ad625fc38c067f43d0eb70e0c76bdf 100644
--- a/lecture/mm/fractures/matrixproblem.hh
+++ b/lecture/mm/fractures/matrixproblem.hh
@@ -29,6 +29,7 @@
 #include <dumux/common/boundarytypes.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
 
 // include the base problem we inherit from
 #include <dumux/porousmediumflow/problem.hh>
@@ -45,9 +46,9 @@ class MatrixSubProblem : public PorousMediumFlowProblem<TypeTag>
 
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using PrimaryVariables = typename GridVariables::PrimaryVariables;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using Scalar = typename GridVariables::Scalar;
 
     using FVGridGeometry = typename GridVariables::GridGeometry;
diff --git a/lecture/mm/fuelcell/fuelcellproblem.hh b/lecture/mm/fuelcell/fuelcellproblem.hh
index f52a42780ee3faf259869b02fdb99cebedbb8481..2c3e82af19ad1913648a4999c1f655f384971991 100644
--- a/lecture/mm/fuelcell/fuelcellproblem.hh
+++ b/lecture/mm/fuelcell/fuelcellproblem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #if !ISOTHERMAL
@@ -53,7 +54,8 @@ class FuelCellLectureProblem : public PorousMediumFlowProblem<TypeTag>
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     static constexpr int dim = GridView::dimension;
     static constexpr int numComponents = GetPropType<TypeTag, Properties::ModelTraits>::numFluidComponents();
 #if !ISOTHERMAL
@@ -66,7 +68,6 @@ class FuelCellLectureProblem : public PorousMediumFlowProblem<TypeTag>
 #endif
     static constexpr int conti0EqIdx = Indices::conti0EqIdx;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
-    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
diff --git a/lecture/mm/heatpipe/heatpipeproblem.hh b/lecture/mm/heatpipe/heatpipeproblem.hh
index 877e8397d28c969f755746a2ebf1cea53e3a44fd..5748ef203f69ed62018080669c8e41c48e6e6807 100644
--- a/lecture/mm/heatpipe/heatpipeproblem.hh
+++ b/lecture/mm/heatpipe/heatpipeproblem.hh
@@ -22,6 +22,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux
@@ -41,7 +42,7 @@ class HeatPipeProblem : public PorousMediumFlowProblem<TypeTag>
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
 
 public:
diff --git a/lecture/mm/heavyoil/sagd/problem.hh b/lecture/mm/heavyoil/sagd/problem.hh
index eba1af43bfbd22dc610e43af72559325f46c2df4..781517e290d4b45c9ea8e8608702207d0fc39d6e 100644
--- a/lecture/mm/heavyoil/sagd/problem.hh
+++ b/lecture/mm/heavyoil/sagd/problem.hh
@@ -26,6 +26,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -66,7 +67,7 @@ class SagdProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
     using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/lecture/mm/heavyoil/sagdcyclic/problem.hh b/lecture/mm/heavyoil/sagdcyclic/problem.hh
index 30a3607de4dea92aa27e712d375f028f5fad7155..c006c05ddecf510e3c9e90100147ee21c77701f1 100644
--- a/lecture/mm/heavyoil/sagdcyclic/problem.hh
+++ b/lecture/mm/heavyoil/sagdcyclic/problem.hh
@@ -26,6 +26,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -66,7 +67,7 @@ class SagdCyclicProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
diff --git a/lecture/mm/heavyoil/sagdcyclichyst/problem.hh b/lecture/mm/heavyoil/sagdcyclichyst/problem.hh
index 40bd7bfcd7ddd0d1566bb8a587ff631bb1eb6554..a7c6b0077a12866925310114be6eadbb588fd7b2 100644
--- a/lecture/mm/heavyoil/sagdcyclichyst/problem.hh
+++ b/lecture/mm/heavyoil/sagdcyclichyst/problem.hh
@@ -26,6 +26,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -66,7 +67,7 @@ class SagdCyclicHystProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
diff --git a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
index dcbe493a9e2edae45f79200c9a914ebb0b6f25b8..2c0a22ba377f7d72eba1a9cd510296fb6fda5e95 100644
--- a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
+++ b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -43,7 +44,7 @@ class Henry1p2cProblem : public PorousMediumFlowProblem<TypeTag>
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using Element = typename GridView::template Codim<0>::Entity;
     using ElementIterator = typename GridView::template Codim<0>::Iterator;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using ParentType = PorousMediumFlowProblem<TypeTag>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
diff --git a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
index 72a7048023dd3153db1af6b3ed3dc949432a228a..ecaebbac76b402bcb8eaca4e8c9c8df810e905cd 100644
--- a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
+++ b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
@@ -29,6 +29,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -41,7 +42,8 @@ class Henry2pProblem : public PorousMediumFlowProblem<TypeTag>
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     // primary variable indices
     static constexpr int pressureIdx = Indices::pressureIdx;
@@ -51,7 +53,6 @@ class Henry2pProblem : public PorousMediumFlowProblem<TypeTag>
     // Grid and world dimension
     static constexpr int dim = GridView::dimension;
     static constexpr int dimWorld = GridView::dimensionworld;
-    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
diff --git a/lecture/mm/naplinfiltration/3p/problem.hh b/lecture/mm/naplinfiltration/3p/problem.hh
index bb3fd9db0a5570429dc314345b6dff440d2dafd3..6bc6273e2573a481fd270fe8988bc4f8707fad2b 100644
--- a/lecture/mm/naplinfiltration/3p/problem.hh
+++ b/lecture/mm/naplinfiltration/3p/problem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux
@@ -78,7 +79,7 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/lecture/mm/naplinfiltration/3p3c/problem.hh b/lecture/mm/naplinfiltration/3p3c/problem.hh
index a5c129107dc29ebae1ad2e5c22682304c5dae01a..3139c392e9708478662726235db211ad8faeb065 100644
--- a/lecture/mm/naplinfiltration/3p3c/problem.hh
+++ b/lecture/mm/naplinfiltration/3p3c/problem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux
@@ -89,7 +90,7 @@ class InfiltrationThreePThreeCProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
 
diff --git a/lecture/mm/remediationscenarios/remediationscenariosproblem.hh b/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
index 4735516b661969e310dc6f3b12a214a492357775..b14e88c6fd31819c46e0694f3334fb0a4e0578ff 100644
--- a/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
+++ b/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
@@ -29,6 +29,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -95,7 +96,7 @@ class KuevetteProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;