diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/solveFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/solveFluid.H
index d6df2d7535..4ac8c9bde4 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/solveFluid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/solveFluid.H
@@ -1,6 +1,6 @@
 if (finalIter)
 {
-    mesh.data().add("finalIteration", true);
+    mesh.data().setFinalIteration(true);
 }
 
 if (frozenFlow)
@@ -35,5 +35,5 @@ else
 
 if (finalIter)
 {
-    mesh.data().remove("finalIteration");
+    mesh.data().setFinalIteration(false);
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solveSolid.H
index d046d28521..165345f6ce 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solveSolid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solveSolid.H
@@ -1,6 +1,6 @@
 if (finalIter)
 {
-    mesh.data().add("finalIteration", true);
+    mesh.data().setFinalIteration(true);
 }
 
 {
@@ -35,5 +35,5 @@ if (finalIter)
 
 if (finalIter)
 {
-    mesh.data().remove("finalIteration");
+    mesh.data().setFinalIteration(false);
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
index ea3a7a808b..a38ae4ac44 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
@@ -1,6 +1,6 @@
 if (finalIter)
 {
-    mesh.data().add("finalIteration", true);
+    mesh.data().setFinalIteration(true);
 }
 
 if (frozenFlow)
@@ -36,5 +36,5 @@ else
 
 if (finalIter)
 {
-    mesh.data().remove("finalIteration");
+    mesh.data().setFinalIteration(false);
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
index c79a486657..2d11bfd21d 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
@@ -25,7 +25,7 @@
 
         if (finalIter)
         {
-            mesh.data().add("finalIteration", true);
+            mesh.data().setFinalIteration(true);
         }
 
         hEqn.solve(mesh.solver(h.select(finalIter)));
@@ -39,7 +39,7 @@
 
         if (finalIter)
         {
-            mesh.data().remove("finalIteration");
+            mesh.data().setFinalIteration(false);
         }
     }
 }
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 88ec19035f..41c0747fd3 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -1153,14 +1153,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::relax()
 {
     word name = this->name();
 
-    if
-    (
-        this->mesh().data().template getOrDefault<bool>
-        (
-            "finalIteration",
-            false
-        )
-    )
+    if (this->mesh().data().isFinalIteration())
     {
         name += "Final";
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
index 83a759352b..dd32325419 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
@@ -32,6 +32,7 @@ License
 #include "objectRegistry.H"
 #include "scalarIOField.H"
 #include "Time.H"
+#include "meshState.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -351,12 +352,11 @@ void Foam::lduMatrix::setResidualField
 
     if (residualPtr)
     {
-        const IOdictionary* dataPtr =
-            mesh().thisDb().findObject<IOdictionary>("data");
+        const auto* dataPtr = mesh().thisDb().findObject<meshState>("data");
 
         if (dataPtr)
         {
-            if (initial && dataPtr->found("firstIteration"))
+            if (initial && dataPtr->isFirstIteration())
             {
                 *residualPtr = residual;
                 DebugInfo
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
index 9c4a49104d..b126b90d51 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
@@ -219,7 +219,7 @@ bool Foam::pimpleControl::loop()
         }
 
         corr_ = 0;
-        mesh_.data().remove("finalIteration");
+        mesh_.data().setFinalIteration(false);
         return false;
     }
 
@@ -231,7 +231,7 @@ bool Foam::pimpleControl::loop()
             Info<< algorithmName_ << ": converged in " << corr_ - 1
                 << " iterations" << endl;
 
-            mesh_.data().remove("finalIteration");
+            mesh_.data().setFinalIteration(false);
             corr_ = 0;
             converged_ = false;
 
@@ -242,7 +242,7 @@ bool Foam::pimpleControl::loop()
             Info<< algorithmName_ << ": iteration " << corr_ << endl;
             storePrevIterFields();
 
-            mesh_.data().add("finalIteration", true);
+            mesh_.data().setFinalIteration(true);
             converged_ = true;
         }
     }
@@ -250,7 +250,7 @@ bool Foam::pimpleControl::loop()
     {
         if (finalIter())
         {
-            mesh_.data().add("finalIteration", true);
+            mesh_.data().setFinalIteration(true);
         }
 
         if (corr_ <= nCorrPIMPLE_)
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C
index b51b4b9c06..0fb9980e3d 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C
@@ -42,7 +42,7 @@ Foam::pisoControl::pisoControl(fvMesh& mesh, const word& dictName)
 :
     pimpleControl(mesh, dictName)
 {
-    // mesh_.data::add("finalIteration", true);
+    // mesh_.data().setFinalIteration(true);
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
index d9d456b8cf..a1630c9434 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
@@ -193,12 +193,12 @@ void Foam::solutionControl::setFirstIterFlag
     if (force || (check && corr_ <= 1 && corrNonOrtho_ == 0))
     {
         DebugInfo<< "solutionControl: set firstIteration flag" << endl;
-        mesh_.data().set("firstIteration", true);
+        mesh_.data().setFirstIteration(true);
     }
     else
     {
         DebugInfo<< "solutionControl: remove firstIteration flag" << endl;
-        mesh_.data().remove("firstIteration");
+        mesh_.data().setFirstIteration(false);
     }
 }
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 431553ac93..629651b442 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -1257,8 +1257,7 @@ void Foam::fvMatrix<Type>::relax()
 {
     word name = psi_.select
     (
-        psi_.mesh().data().template getOrDefault<bool>
-        ("finalIteration", false)
+        psi_.mesh().data().isFinalIteration()
     );
 
     if (psi_.mesh().relaxEquation(name))
@@ -1532,11 +1531,7 @@ const Foam::dictionary& Foam::fvMatrix<Type>::solverDict() const
 {
     return psi_.mesh().solverDict
     (
-        psi_.select
-        (
-            psi_.mesh().data().template getOrDefault<bool>
-            ("finalIteration", false)
-        )
+        psi_.select(psi_.mesh().data().isFinalIteration())
     );
 }
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index cf5d732806..63c0aa70af 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -935,11 +935,7 @@ void Foam::radiation::viewFactor::calculate()
             const dictionary& solverControls =
                 qr_.mesh().solverDict
                 (
-                    qr_.select
-                    (
-                        qr_.mesh().data::template getOrDefault<bool>
-                        ("finalIteration", false)
-                    )
+                    qr_.select(qr_.mesh().data().isFinalIteration())
                 );
 
             // Solver call