diff --git a/exercises/exercise-basic/injection2p2cproblem.hh b/exercises/exercise-basic/injection2p2cproblem.hh
index c5a123e1b71477c01850e4476efbdc377947e2f2..e0957f7f4b437c172a371d4341c7b0599f243de0 100644
--- a/exercises/exercise-basic/injection2p2cproblem.hh
+++ b/exercises/exercise-basic/injection2p2cproblem.hh
@@ -53,7 +53,7 @@ SET_TYPE_PROP(Injection2p2cTypeTag, SpatialParams,
                                      typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Set fluid configuration
-SET_TYPE_PROP(Injection2p2cTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/ false>);
+SET_TYPE_PROP(Injection2p2cTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>);
 
 // Define whether mole(true) or mass (false) fractions are used
 SET_BOOL_PROP(Injection2p2cTypeTag, UseMoles, true);
diff --git a/exercises/exercise-basic/injection2pproblem.hh b/exercises/exercise-basic/injection2pproblem.hh
index e289798ccfda8972f0345a7e96fe2085291d531e..b2adb433b2c6e7ee2370a6cba23f13b01323ba70 100644
--- a/exercises/exercise-basic/injection2pproblem.hh
+++ b/exercises/exercise-basic/injection2pproblem.hh
@@ -55,7 +55,7 @@ SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
                                      typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Set fluid configuration
-SET_TYPE_PROP(Injection2pTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/ false>);
+SET_TYPE_PROP(Injection2pTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>);
 } // end namespace Properties
 
 /*!
diff --git a/exercises/exercise-grids/injection2pproblem.hh b/exercises/exercise-grids/injection2pproblem.hh
index 3ad82f25f5283365a79b879f7039803d28af1ee5..f1dd004c68bc75420de8cc3d7674a113f032b707 100644
--- a/exercises/exercise-grids/injection2pproblem.hh
+++ b/exercises/exercise-grids/injection2pproblem.hh
@@ -58,7 +58,7 @@ SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
                                      typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Set fluid configuration
-SET_TYPE_PROP(Injection2pTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/ false>);
+SET_TYPE_PROP(Injection2pTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>);
 } // end namespace Properties
 
 /*!
diff --git a/exercises/exercise-properties/injection2p2cproblem.hh b/exercises/exercise-properties/injection2p2cproblem.hh
index a765f8bb4676f84a949bbeddbb1253994d02cbea..3a9023f7a530ab9b9c6da6dacbd12c8e860e640c 100644
--- a/exercises/exercise-properties/injection2p2cproblem.hh
+++ b/exercises/exercise-properties/injection2p2cproblem.hh
@@ -62,7 +62,7 @@ SET_TYPE_PROP(Injection2p2cTypeTag, SpatialParams,
 // Set fluid configuration
 SET_TYPE_PROP(Injection2p2cTypeTag,
               FluidSystem,
-              FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false /*useComplexRelations*/>);
+              FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>);
 
 // Define whether mole(true) or mass (false) fractions are used
 SET_BOOL_PROP(Injection2p2cTypeTag, UseMoles, true);
diff --git a/exercises/exercise-runtimeparams/injection2pproblem.hh b/exercises/exercise-runtimeparams/injection2pproblem.hh
index 0b1ad6fc198e31cfd12c0798ac8dfea0cc734700..6ff493c969bf5974eadcc1ee00915e2aad4746b9 100644
--- a/exercises/exercise-runtimeparams/injection2pproblem.hh
+++ b/exercises/exercise-runtimeparams/injection2pproblem.hh
@@ -55,7 +55,7 @@ SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
                                      typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Set fluid configuration
-SET_TYPE_PROP(Injection2pTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/ false>);
+SET_TYPE_PROP(Injection2pTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>);
 } // end namespace Properties
 
 /*!
diff --git a/exercises/solution/ex2/injection2p2cproblem.hh b/exercises/solution/ex2/injection2p2cproblem.hh
index 8c62fdf59d81d85b551f7a3e1d38846657a70106..e6512829042c4cafe3bbf5dc2e6635d6ee5597b6 100644
--- a/exercises/solution/ex2/injection2p2cproblem.hh
+++ b/exercises/solution/ex2/injection2p2cproblem.hh
@@ -60,7 +60,7 @@ SET_TYPE_PROP(Injection2p2cTypeTag, LocalResidual, MyCompositionalLocalResidual<
 // Set fluid configuration
 SET_TYPE_PROP(Injection2p2cTypeTag,
               FluidSystem,
-              FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false /*useComplexRelations*/>);
+              FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>);
 
 // Define whether mole(true) or mass (false) fractions are used
 SET_BOOL_PROP(Injection2p2cTypeTag, UseMoles, true);
diff --git a/exercises/solution/exercise-grids/injection2pproblem.hh b/exercises/solution/exercise-grids/injection2pproblem.hh
index 5d785ab3b652d69b9ccb6e2b8a5e9f3e554dad16..91a384d58b99c7256d1132515759e23a4dacf5bd 100644
--- a/exercises/solution/exercise-grids/injection2pproblem.hh
+++ b/exercises/solution/exercise-grids/injection2pproblem.hh
@@ -63,7 +63,7 @@ SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
                                      typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Set fluid configuration
-SET_TYPE_PROP(Injection2pTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/ false>);
+SET_TYPE_PROP(Injection2pTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>);
 } // end namespace Properties
 
 /*!
diff --git a/exercises/solution/exercise-runtimeparams/injection2pproblem.hh b/exercises/solution/exercise-runtimeparams/injection2pproblem.hh
index 74c92c3e154dffea18c4ec00e39d8790853ca090..5fb19997ec6dac55701f558bc3ada1bb716351c3 100644
--- a/exercises/solution/exercise-runtimeparams/injection2pproblem.hh
+++ b/exercises/solution/exercise-runtimeparams/injection2pproblem.hh
@@ -55,7 +55,7 @@ SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
                                      typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Set fluid configuration
-SET_TYPE_PROP(Injection2pTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/ false>);
+SET_TYPE_PROP(Injection2pTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>);
 } // end namespace Properties
 
 /*!