diff --git a/src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 1b31de1e76..186f90fe12 100644
--- a/src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -274,7 +274,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         cloud,
         td,
         dt,
-        this->age_,
         Ts,
         d0,
         T0,
@@ -503,7 +502,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     TrackCloudType& cloud,
     trackingData& td,
     const scalar dt,
-    const scalar age,
     const scalar Ts,
     const scalar d,
     const scalar T,
@@ -557,12 +555,17 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     const CompositionModel<thermoCloudType>& composition =
         cloud.composition();
 
+    const typename TrackCloudType::parcelType& p =
+        static_cast<const typename TrackCloudType::parcelType&>(*this);
+    typename TrackCloudType::parcelType::trackingData& ttd =
+        static_cast<typename TrackCloudType::parcelType::trackingData&>(td);
 
     // Total mass of volatiles evolved
     cloud.devolatilisation().calculate
     (
+        p,
+        ttd,
         dt,
-        age,
         mass0,
         mass,
         T,
diff --git a/src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index ccc3147f0a..71db9197f9 100644
--- a/src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -225,7 +225,6 @@ protected:
             TrackCloudType& cloud,
             trackingData& td,
             const scalar dt,           // timestep
-            const scalar age,          // age
             const scalar Ts,           // surface temperature
             const scalar d,            // diameter
             const scalar T,            // temperature
diff --git a/src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcel.C
index bbd9f81e8a..c3c8b9f739 100644
--- a/src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -93,8 +93,8 @@ template<class ParcelType>
 template<class TrackCloudType>
 void Foam::ThermoParcel<ParcelType>::calcSurfaceValues
 (
-    TrackCloudType& cloud,
-    trackingData& td,
+    const TrackCloudType& cloud,
+    const trackingData& td,
     const scalar T,
     scalar& Ts,
     scalar& rhos,
diff --git a/src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcel.H
index 7f285c912b..c7b4fd6c55 100644
--- a/src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -414,8 +414,8 @@ public:
             template<class TrackCloudType>
             void calcSurfaceValues
             (
-                TrackCloudType& cloud,
-                trackingData& td,
+                const TrackCloudType& cloud,
+                const trackingData& td,
                 const scalar T,
                 scalar& Ts,
                 scalar& rhos,
diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
index 74a99c67f6..32f39d949f 100644
--- a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
+++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,8 +94,9 @@ Foam::ConstantRateDevolatilisation<CloudType>::~ConstantRateDevolatilisation()
 template<class CloudType>
 void Foam::ConstantRateDevolatilisation<CloudType>::calculate
 (
+    const typename CloudType::parcelType& p,
+    const typename CloudType::parcelType::trackingData& td,
     const scalar dt,
-    const scalar age,
     const scalar mass0,
     const scalar mass,
     const scalar T,
diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index 211df3868e..faf9f90630 100644
--- a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,8 +103,9 @@ public:
         //- Update model
         virtual void calculate
         (
+            const typename CloudType::parcelType& p,
+            const typename CloudType::parcelType::trackingData& td,
             const scalar dt,
-            const scalar age,
             const scalar mass0,
             const scalar mass,
             const scalar T,
diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index 4b800af71d..d5bcd44498 100644
--- a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,8 +119,9 @@ public:
         //- Update model
         virtual void calculate
         (
+            const typename CloudType::parcelType& p,
+            const typename CloudType::parcelType::trackingData& td,
             const scalar dt,
-            const scalar age,
             const scalar mass0,
             const scalar mass,
             const scalar T,
diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
index 711476aefd..0f1b0b508a 100644
--- a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
+++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
@@ -60,7 +60,8 @@ Foam::NoDevolatilisation<CloudType>::~NoDevolatilisation()
 template<class CloudType>
 void Foam::NoDevolatilisation<CloudType>::calculate
 (
-    const scalar,
+    const typename CloudType::parcelType&,
+    const typename CloudType::parcelType::trackingData&,
     const scalar,
     const scalar,
     const scalar,
diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index 1249e6a1b1..40475f7181 100644
--- a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
+++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -82,8 +82,9 @@ public:
         //- Update model
         virtual void calculate
         (
+            const typename CloudType::parcelType& p,
+            const typename CloudType::parcelType::trackingData& td,
             const scalar dt,
-            const scalar age,
             const scalar mass0,
             const scalar mass,
             const scalar T,
diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
index 96c9099321..c2430f95c1 100644
--- a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
+++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,8 +82,9 @@ Foam::SingleKineticRateDevolatilisation<CloudType>::
 template<class CloudType>
 void Foam::SingleKineticRateDevolatilisation<CloudType>::calculate
 (
+    const typename CloudType::parcelType& p,
+    const typename CloudType::parcelType::trackingData& td,
     const scalar dt,
-    const scalar age,
     const scalar mass0,
     const scalar mass,
     const scalar T,
diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index 5603fb4c6c..06727b52a6 100644
--- a/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -214,8 +214,9 @@ public:
         //- Update model
         virtual void calculate
         (
+            const typename CloudType::parcelType& p,
+            const typename CloudType::parcelType::trackingData& td,
             const scalar dt,
-            const scalar age,
             const scalar mass0,
             const scalar mass,
             const scalar T,