diff --git a/applications/solvers/cfdemSolverRecurrence/cfdemSolverRecurrence.C b/applications/solvers/cfdemSolverRecurrence/cfdemSolverRecurrence.C
index 63b4e8f8..e2140597 100644
--- a/applications/solvers/cfdemSolverRecurrence/cfdemSolverRecurrence.C
+++ b/applications/solvers/cfdemSolverRecurrence/cfdemSolverRecurrence.C
@@ -39,10 +39,11 @@ Rules
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
 #include "cfdemCloudRec.H"
+#include "cfdemCloud.H"
 #include "recBase.H"
 #include "recModel.H"
 #include "clockModel.H"
-#include "cfdemCloud.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
diff --git a/applications/solvers/tfmSolverRecurrence/Make/options b/applications/solvers/tfmSolverRecurrence/Make/options
index 333e8a48..55397228 100644
--- a/applications/solvers/tfmSolverRecurrence/Make/options
+++ b/applications/solvers/tfmSolverRecurrence/Make/options
@@ -10,9 +10,12 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
     -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
+    -I$(CFDEM_SRC_DIR)/recurrence/lnInclude \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/derived/cfdemCloudRec
 
 EXE_LIBS = \
     -L$(CFDEM_LIB_DIR)\
+    -lrecurrence \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
     -lincompressibleTransportModels \
diff --git a/applications/solvers/tfmSolverRecurrence/readFields.H b/applications/solvers/tfmSolverRecurrence/readFields.H
index 6060140a..7e541b7a 100644
--- a/applications/solvers/tfmSolverRecurrence/readFields.H
+++ b/applications/solvers/tfmSolverRecurrence/readFields.H
@@ -1,5 +1,5 @@
-alpha1Rec=*(particleCloud.recM().voidfraction());
+alpha1Rec=*(recurrenceBase.recM().voidfraction());
 alpha2Rec=1-alpha1Rec;
-U1Rec=*(particleCloud.recM().U());
-U2Rec=*(particleCloud.recM().Us());
-phi2Rec=*(particleCloud.recM().phiS());
+U1Rec=*(recurrenceBase.recM().U());
+U2Rec=*(recurrenceBase.recM().Us());
+phi2Rec=*(recurrenceBase.recM().phiS());
diff --git a/applications/solvers/tfmSolverRecurrence/tfmSolverRecurrence.C b/applications/solvers/tfmSolverRecurrence/tfmSolverRecurrence.C
index 4a7ab0a2..036d73b8 100644
--- a/applications/solvers/tfmSolverRecurrence/tfmSolverRecurrence.C
+++ b/applications/solvers/tfmSolverRecurrence/tfmSolverRecurrence.C
@@ -40,6 +40,9 @@ Rules
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
 #include "cfdemCloudRec.H"
+#include "cfdemCloud.H"
+#include "recBase.H"
+#include "recModel.H"
 #include "clockModel.H"
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,14 +53,15 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createFields.H"
     #include "createFvOptions.H"
-    cfdemCloudRec particleCloud(mesh);
+    cfdemCloudRec<cfdemCloud> particleCloud(mesh);
+    recBase recurrenceBase(mesh);
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nCalculating particle trajectories based on recurrence statistics\n" << endl;
     
     label recTimeIndex(0);
-    scalar recTimeStep_=particleCloud.recM().recTimeStep();
+    scalar recTimeStep_=recurrenceBase.recM().recTimeStep();
     
     while (runTime.run())
     {
@@ -77,7 +81,7 @@ int main(int argc, char *argv[])
         {
 	    Info << "Updating fields at run time " << runTime.timeOutputValue()
 	        << " corresponding to recurrence time " << (recTimeIndex+1)*recTimeStep_ << ".\n" << endl;
-            particleCloud.updateRecFields();
+            recurrenceBase.updateRecFields();
 	    #include "readFields.H"
             recTimeIndex++;
         }
diff --git a/src/lagrangian/cfdemParticle/derived/cfdemCloudRec/cfdemCloudRec.H b/src/lagrangian/cfdemParticle/derived/cfdemCloudRec/cfdemCloudRec.H
index 4e6bebf4..653a1156 100644
--- a/src/lagrangian/cfdemParticle/derived/cfdemCloudRec/cfdemCloudRec.H
+++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudRec/cfdemCloudRec.H
@@ -96,7 +96,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "cfdemCloudRec.TPP"
+#include "cfdemCloudRecI.H"
 
 #endif
 
diff --git a/src/lagrangian/cfdemParticle/derived/cfdemCloudRec/cfdemCloudRec.TPP b/src/lagrangian/cfdemParticle/derived/cfdemCloudRec/cfdemCloudRecI.H
similarity index 100%
rename from src/lagrangian/cfdemParticle/derived/cfdemCloudRec/cfdemCloudRec.TPP
rename to src/lagrangian/cfdemParticle/derived/cfdemCloudRec/cfdemCloudRecI.H