diff --git a/examples/problems/co2ptflashproblem.hh b/examples/problems/co2ptflashproblem.hh
index 69590fe656..8a9a25083e 100644
--- a/examples/problems/co2ptflashproblem.hh
+++ b/examples/problems/co2ptflashproblem.hh
@@ -131,7 +131,9 @@ private:
     using Traits = Opm::ThreePhaseMaterialTraits<Scalar,
                                                /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
                                                /*nonWettingPhaseIdx=*/FluidSystem::oilPhaseIdx,
-                                               /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
+                                               /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx,
+                                               /* hysteresis */ false,
+                                               /* endpointscaling */ false>;
 
     // define the material law which is parameterized by effective saturation
     using EffMaterialLaw = Opm::NullMaterial<Traits>;
diff --git a/examples/problems/cuvetteproblem.hh b/examples/problems/cuvetteproblem.hh
index f23442a668..1a627f5106 100644
--- a/examples/problems/cuvetteproblem.hh
+++ b/examples/problems/cuvetteproblem.hh
@@ -88,7 +88,9 @@ private:
         Scalar,
         /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
         /*nonWettingPhaseIdx=*/FluidSystem::naplPhaseIdx,
-        /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
+        /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx,
+        /* hysteresis */ false,
+        /* endpointscaling */ false>;
 
 public:
     using type = Opm::ThreePhaseParkerVanGenuchten<Traits>;
diff --git a/examples/problems/infiltrationproblem.hh b/examples/problems/infiltrationproblem.hh
index 0e7a454f91..d7bc446ed9 100644
--- a/examples/problems/infiltrationproblem.hh
+++ b/examples/problems/infiltrationproblem.hh
@@ -86,7 +86,9 @@ private:
         Scalar,
         /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
         /*nonWettingPhaseIdx=*/FluidSystem::naplPhaseIdx,
-        /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
+        /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx,
+        /* hysteresis */ false,
+        /* endpointscaling */ false>;
 
 public:
     using type = Opm::ThreePhaseParkerVanGenuchten<Traits>;
diff --git a/examples/problems/reservoirproblem.hh b/examples/problems/reservoirproblem.hh
index 437e3c2ce8..dc204d00fa 100644
--- a/examples/problems/reservoirproblem.hh
+++ b/examples/problems/reservoirproblem.hh
@@ -93,7 +93,9 @@ private:
         ThreePhaseMaterialTraits<Scalar,
                                  /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
                                  /*nonWettingPhaseIdx=*/FluidSystem::oilPhaseIdx,
-                                 /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
+                                 /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx,
+                                 /* hysteresis */ false,
+                                 /* endpointscaling */ false>;
 
 public:
     using type = Opm::LinearMaterial<Traits>;
diff --git a/opm/simulators/flow/FlowBaseProblemProperties.hpp b/opm/simulators/flow/FlowBaseProblemProperties.hpp
index f20c1dcbf9..a25eb27e9f 100644
--- a/opm/simulators/flow/FlowBaseProblemProperties.hpp
+++ b/opm/simulators/flow/FlowBaseProblemProperties.hpp
@@ -77,6 +77,12 @@ struct EnableApiTracking { using type = UndefinedProperty; };
 template<class TypeTag, class MyTypeTag>
 struct EnableDebuggingChecks { using type = Properties::UndefinedProperty; };
 
+template<class TypeTag, class MyTypeTag>
+struct EnableHysteresis { using type = Properties::UndefinedProperty; };
+
+template<class TypeTag, class MyTypeTag>
+struct EnableEndpointScaling { using type = Properties::UndefinedProperty; };
+
 // Avoid using ElementContext-based code if possible.
 template<class TypeTag, class MyTypeTag>
 struct AvoidElementContext { using type = Properties::UndefinedProperty; };
@@ -245,6 +251,14 @@ template<class TypeTag>
 struct EnableDebuggingChecks<TypeTag, TTag::FlowBaseProblem>
 { static constexpr bool value = true; };
 
+template<class TypeTag>
+struct EnableHysteresis<TypeTag, TTag::FlowBaseProblem>
+{ static constexpr bool value = true; };
+
+template<class TypeTag>
+struct EnableEndpointScaling<TypeTag, TTag::FlowBaseProblem>
+{ static constexpr bool value = true; };
+
 // Most modules are implemented only in terms of element contexts,
 // so this must default to false.
 template<class TypeTag>
diff --git a/opm/simulators/flow/FlowProblemBlackoilProperties.hpp b/opm/simulators/flow/FlowProblemBlackoilProperties.hpp
index d527577f76..8f58a50fd6 100644
--- a/opm/simulators/flow/FlowProblemBlackoilProperties.hpp
+++ b/opm/simulators/flow/FlowProblemBlackoilProperties.hpp
@@ -82,7 +82,9 @@ private:
     using Traits = ThreePhaseMaterialTraits<Scalar,
                                             /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
                                             /*nonWettingPhaseIdx=*/FluidSystem::oilPhaseIdx,
-                                            /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
+                                            /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx,
+                                            getPropValue<TypeTag, Properties::EnableHysteresis>(),
+                                            getPropValue<TypeTag, Properties::EnableEndpointScaling>()>;
 
 public:
     using EclMaterialLawManager = ::Opm::EclMaterialLaw::Manager<Traits>;
diff --git a/opm/simulators/flow/FlowProblemCompProperties.hpp b/opm/simulators/flow/FlowProblemCompProperties.hpp
index 5e16092d00..fb4a8849ce 100644
--- a/opm/simulators/flow/FlowProblemCompProperties.hpp
+++ b/opm/simulators/flow/FlowProblemCompProperties.hpp
@@ -72,7 +72,9 @@ private:
     using Traits = ThreePhaseMaterialTraits<Scalar,
                                             /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
                                             /*nonWettingPhaseIdx=*/FluidSystem::oilPhaseIdx,
-                                            /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
+                                            /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx,
+                                            /* hysteresis */ true,
+                                            /* endpointscaling */ true>;
 
 public:
     using EclMaterialLawManager = ::Opm::EclMaterialLaw::Manager<Traits>;
diff --git a/opm/simulators/flow/equil/EquilibrationHelpers.cpp b/opm/simulators/flow/equil/EquilibrationHelpers.cpp
index 821771f175..35927cb985 100644
--- a/opm/simulators/flow/equil/EquilibrationHelpers.cpp
+++ b/opm/simulators/flow/equil/EquilibrationHelpers.cpp
@@ -28,7 +28,7 @@ namespace Opm {
 namespace EQUIL {
 
 template<class Scalar>
-using MatLaw = EclMaterialLaw::Manager<ThreePhaseMaterialTraits<Scalar,0,1,2>>;
+using MatLaw = EclMaterialLaw::Manager<ThreePhaseMaterialTraits<Scalar,0,1,2,true,true>>;
 template<class Scalar> using FS = BlackOilFluidSystem<Scalar>;
 
 #define INSTANTIATE_TYPE(T) \
diff --git a/opm/simulators/flow/equil/InitStateEquil.cpp b/opm/simulators/flow/equil/InitStateEquil.cpp
index 438135d3ce..f3c329f016 100644
--- a/opm/simulators/flow/equil/InitStateEquil.cpp
+++ b/opm/simulators/flow/equil/InitStateEquil.cpp
@@ -35,7 +35,7 @@
 namespace Opm {
 
 template<class Scalar>
-using MatLaw = EclMaterialLaw::Manager<ThreePhaseMaterialTraits<Scalar,0,1,2>>;
+using MatLaw = EclMaterialLaw::Manager<ThreePhaseMaterialTraits<Scalar,0,1,2,true,true>>;
 
 namespace EQUIL {
 namespace DeckDependent {