diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C
index ad866cfbe..ab4cd0ab2 100644
--- a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C
+++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C
@@ -49,14 +49,7 @@ Foam::functionObjects::FUNCTIONOBJECT::FUNCTIONOBJECT
     const dictionary& dict
 )
 :
-    functionObject(name),
-    obr_
-    (
-        runTime.lookupObject<objectRegistry>
-        (
-            dict.lookupOrDefault("region", polyMesh::defaultRegion)
-        )
-    ),
+    fvMeshFunctionObject(name, runTime, dict),
     wordData_(dict.lookupOrDefault<word>("wordData", "defaultWord")),
     scalarData_(readScalar(dict.lookup("scalarData"))),
     labelData_(readLabel(dict.lookup("labelData")))
diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
index dac326842..c2954a4de 100644
--- a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
+++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
@@ -59,16 +59,12 @@ SourceFiles
 #ifndef FUNCTIONOBJECT_H
 #define FUNCTIONOBJECT_H
 
-#include "functionObject.H"
+#include "fvMeshFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// Forward declaration of classes
-class objectRegistry;
-
 namespace functionObjects
 {
 
@@ -78,23 +74,18 @@ namespace functionObjects
 
 class FUNCTIONOBJECT
 :
-    public functionObject
+    public fvMeshFunctionObject
 {
     // Private data
 
-        //- Refererence to the objectRegistry
-        const objectRegistry& obr_;
+        //- word
+        word wordData_;
 
-        // Read from dictionary
+        //- scalar
+        scalar scalarData_;
 
-            //- word
-            word wordData_;
-
-            //- scalar
-            scalar scalarData_;
-
-            //- label
-            label labelData_;
+        //- label
+        label labelData_;
 
 
     // Private Member Functions