diff --git a/examples/modules/cfd/examples/backwardstep/backwardstep2d.cfg b/examples/modules/cfd/examples/backwardstep/backwardstep2d.cfg
index 0dfb8f19..0331d38e 100644
--- a/examples/modules/cfd/examples/backwardstep/backwardstep2d.cfg
+++ b/examples/modules/cfd/examples/backwardstep/backwardstep2d.cfg
@@ -1,10 +1,12 @@
-directory=toolboxes/fluid/backwardfacingstep/2d/P2P1G1
+directory=toolboxes/fluid/backwardstep/2d/P2P1G1
+
+case.dimension=2 
 
 [fluid]
-filename=$cfgdir/cfd2d.json
+filename=$cfgdir/backwardstep2d.json
 
-mesh.filename=$cfgdir/step-elmann-2009.geo
-gmsh.hsize=0.05
+# mesh.filename=$cfgdir/step-elmann-2009.geo
+# gmsh.hsize=0.05
 gmsh.geo-variables-list=L=5:dim=2
 # geo-variables-list=L=10:dim=2
 
diff --git a/examples/modules/cfd/examples/backwardstep/backwardstep2d.json b/examples/modules/cfd/examples/backwardstep/backwardstep2d.json
index 03973f30..ac3395d6 100644
--- a/examples/modules/cfd/examples/backwardstep/backwardstep2d.json
+++ b/examples/modules/cfd/examples/backwardstep/backwardstep2d.json
@@ -1,9 +1,31 @@
 {
     "Name": "Backward Facing Step 2d",
     "ShortName":"backwardfacingstep2d",
+    "Metadata":
+    {
+        "version": "1",
+        "author": [""],
+        "date": "23/09/2022",
+        "references":[""]
+    },
     "Models":
     {
-        "equations":"Navier-Stokes"
+        "fluid":
+        {
+            "equations":"Navier-Stokes"  
+        }
+
+    },
+    "Meshes":
+    {
+        "fluid":
+        {
+            "Import":
+            {
+                "filename":"$cfgdir/step-elmann-2009.geo",
+                "hsize":0.05
+            }
+        }
     },
     "Materials":
     {
@@ -17,9 +39,9 @@
     },
     "BoundaryConditions":
     {
-        "velocity":
+        "fluid":
         {
-            "Dirichlet":
+            "velocity":
             {
                 "inlet":
                 {
@@ -29,10 +51,7 @@
                 {
                     "expr":"{0,0}"
                 }
-            }
-        },
-        "fluid":
-        {
+            },
             "outlet":
             {
                 "outlet":
@@ -44,10 +63,13 @@
     },
     "PostProcess":
     {
-        "Exports":
+        "fluid":
         {
-            "fields":["velocity","pressure","pid"]
+            "Exports":
+            {
+                "fields":["velocity","pressure","pid"]
+            }
         }
     }
 
-}
+}
\ No newline at end of file
diff --git a/examples/modules/cfd/examples/backwardstep/backwardstep3d.cfg b/examples/modules/cfd/examples/backwardstep/backwardstep3d.cfg
index 269ffb17..0bca5d6f 100644
--- a/examples/modules/cfd/examples/backwardstep/backwardstep3d.cfg
+++ b/examples/modules/cfd/examples/backwardstep/backwardstep3d.cfg
@@ -6,8 +6,8 @@ discretization=P2P1G1
 [fluid]
 filename=$cfgdir/backwardstep3d.json
 
-mesh.filename=$cfgdir/step-elmann-2009.geo
-gmsh.hsize=0.2#0.1#0.15#0.2
+# mesh.filename=$cfgdir/step-elmann-2009.geo
+# gmsh.hsize=0.2#0.1#0.15#0.2
 gmsh.geo-variables-list=L=5:dim=3
 # gmsh.geo-variables-list=L=10:dim=3
 
diff --git a/examples/modules/cfd/examples/backwardstep/backwardstep3d.json b/examples/modules/cfd/examples/backwardstep/backwardstep3d.json
index d33a1794..3eb52f25 100644
--- a/examples/modules/cfd/examples/backwardstep/backwardstep3d.json
+++ b/examples/modules/cfd/examples/backwardstep/backwardstep3d.json
@@ -1,9 +1,30 @@
 {
     "Name": "Backward Facing Step 3d",
     "ShortName":"backwardfacingstep3d",
+    "Metadata":
+    {
+        "version": "1",
+        "author": [""],
+        "date": "23/09/2022",
+        "references":[""]
+    },
     "Models":
     {
-        "equations":"Navier-Stokes"
+        "fluid":
+        {
+            "equations":"Navier-Stokes"  
+        }
+    },
+    "Meshes":
+    {
+        "fluid":
+        {
+            "Import":
+            {
+                "filename":"$cfgdir/step-elmann-2009.geo",
+                "hsize":0.2
+            }
+        }
     },
     "Materials":
     {
@@ -18,9 +39,9 @@
     },
     "BoundaryConditions":
     {
-        "velocity":
+        "fluid":
         {
-            "Dirichlet":
+            "velocity":
             {
                 "inlet":
                 {
@@ -30,24 +51,25 @@
                 {
                     "expr":"{0,0,0}"
                 }
-            }
-        },
-        "fluid":
+            },
+        "outlet":
         {
             "outlet":
             {
-                "outlet":
-                {
-                    "expr":"0" 
-                }
+                "expr":"0" 
             }
         }
+    }
+    
     },
     "PostProcess":
     {
-        "Exports":
+        "fluid":
         {
-            "fields":["velocity","pressure","pid"]
+            "Exports":
+            {
+                "fields":["velocity","pressure","pid"]
+            }
         }
     }