diff --git a/src/TNL/Meshes/GridDetails/Grid1D.h b/src/TNL/Meshes/GridDetails/Grid1D.h
index fee2cf52a335b836820d733d7e8f2b3dff93c3b5..cead5c51a974558bb3d4f4def076958c8a4f9375 100644
--- a/src/TNL/Meshes/GridDetails/Grid1D.h
+++ b/src/TNL/Meshes/GridDetails/Grid1D.h
@@ -90,13 +90,6 @@ class Grid< 1, Real, Device, Index > : public Object
    __cuda_callable__
    inline Index getEntityIndex( const Entity& entity ) const;
  
-   template< typename Entity >
-   __cuda_callable__
-   RealType getEntityMeasure( const Entity& entity ) const;
- 
-   __cuda_callable__
-   inline const RealType& getCellMeasure() const;
- 
    __cuda_callable__
    inline const PointType& getSpaceSteps() const;
 
@@ -105,7 +98,10 @@ class Grid< 1, Real, Device, Index > : public Object
    const RealType& getSpaceStepsProducts() const;
    
    __cuda_callable__
-   RealType getSmallestSpaceStep() const;
+   inline const RealType& getCellMeasure() const;
+ 
+   __cuda_callable__
+   inline RealType getSmallestSpaceStep() const;
 
 
    template< typename GridFunction >
diff --git a/src/TNL/Meshes/GridDetails/Grid1D_impl.h b/src/TNL/Meshes/GridDetails/Grid1D_impl.h
index 89ceaab3edeb6350c7baae48e7721e9fc2bd660d..3c388fff332f6a8717f4e8e063e1c16e63a5da1e 100644
--- a/src/TNL/Meshes/GridDetails/Grid1D_impl.h
+++ b/src/TNL/Meshes/GridDetails/Grid1D_impl.h
@@ -211,29 +211,6 @@ getEntityIndex( const Entity& entity ) const
    return GridEntityGetter< ThisType, Entity >::getEntityIndex( *this, entity );
 }
 
-template< typename Real,
-          typename Device,
-          typename Index >
-   template< typename Entity >
-__cuda_callable__
-Real
-Grid< 1, Real, Device, Index >::
-getEntityMeasure( const Entity& entity ) const
-{
-   return GridEntityMeasureGetter< ThisType, Entity::getEntityDimension() >::getMeasure( *this, entity );
-}
-
-template< typename Real,
-          typename Device,
-          typename Index >
-__cuda_callable__
-const Real&
-Grid< 1, Real, Device, Index >::
-getCellMeasure() const
-{
-   return this->template getSpaceStepsProducts< 1 >();
-}
-
 template< typename Real,
           typename Device,
           typename Index >
@@ -259,6 +236,17 @@ getSpaceStepsProducts() const
    return this->spaceStepsProducts[ xPow + 2 ];
 }
 
+template< typename Real,
+          typename Device,
+          typename Index >
+__cuda_callable__
+const Real&
+Grid< 1, Real, Device, Index >::
+getCellMeasure() const
+{
+   return this->template getSpaceStepsProducts< 1 >();
+}
+
 template< typename Real,
           typename Device,
           typename Index >
diff --git a/src/TNL/Meshes/GridDetails/Grid2D.h b/src/TNL/Meshes/GridDetails/Grid2D.h
index 96eea08e155ca4c4c0c465c5e3afe04b7b24ad51..e56b50a40473881ddf65949db20736634d389622 100644
--- a/src/TNL/Meshes/GridDetails/Grid2D.h
+++ b/src/TNL/Meshes/GridDetails/Grid2D.h
@@ -95,13 +95,6 @@ class Grid< 2, Real, Device, Index > : public Object
    __cuda_callable__
    inline Index getEntityIndex( const Entity& entity ) const;
 
-   template< typename Entity >
-   __cuda_callable__
-   RealType getEntityMeasure( const Entity& entity ) const;
- 
-   __cuda_callable__
-   inline const RealType& getCellMeasure() const;
- 
    __cuda_callable__
    inline const PointType& getSpaceSteps() const;
 
@@ -110,7 +103,10 @@ class Grid< 2, Real, Device, Index > : public Object
    const RealType& getSpaceStepsProducts() const;
    
    __cuda_callable__
-   RealType getSmallestSpaceStep() const;
+   inline const RealType& getCellMeasure() const;
+ 
+   __cuda_callable__
+   inline RealType getSmallestSpaceStep() const;
 
  
    template< typename GridFunction >
diff --git a/src/TNL/Meshes/GridDetails/Grid2D_impl.h b/src/TNL/Meshes/GridDetails/Grid2D_impl.h
index 336c118292ebe0f3fe5b316062514d4c74642661..90a1ae99bbc931afd6aa38ac4cb838b0ce4b18a5 100644
--- a/src/TNL/Meshes/GridDetails/Grid2D_impl.h
+++ b/src/TNL/Meshes/GridDetails/Grid2D_impl.h
@@ -264,30 +264,6 @@ getEntityIndex( const Entity& entity ) const
    return GridEntityGetter< ThisType, Entity >::getEntityIndex( *this, entity );
 }
 
-template< typename Real,
-          typename Device,
-          typename Index >
-   template< typename Entity >
-__cuda_callable__
-Real
-Grid< 2, Real, Device, Index >::
-getEntityMeasure( const Entity& entity ) const
-{
-   return GridEntityMeasureGetter< ThisType, Entity::getEntityDimension() >::getMeasure( *this, entity );
-}
-
-template< typename Real,
-          typename Device,
-          typename Index >
-__cuda_callable__
-const Real&
-Grid< 2, Real, Device, Index >::
-getCellMeasure() const
-{
-   return this->template getSpaceStepsProducts< 1, 1 >();
-}
-
-
 template< typename Real,
           typename Device,
           typename Index >
@@ -316,6 +292,17 @@ getSpaceStepsProducts() const
    return this->spaceStepsProducts[ xPow + 2 ][ yPow + 2 ];
 }
 
+template< typename Real,
+          typename Device,
+          typename Index >
+__cuda_callable__
+const Real&
+Grid< 2, Real, Device, Index >::
+getCellMeasure() const
+{
+   return this->template getSpaceStepsProducts< 1, 1 >();
+}
+
 template< typename Real,
           typename Device,
           typename Index >
diff --git a/src/TNL/Meshes/GridDetails/Grid3D.h b/src/TNL/Meshes/GridDetails/Grid3D.h
index c319fa3b7f9b42729e34798db10906263353d82e..b9cf126353586d4d107f0588874633bdd17b67e0 100644
--- a/src/TNL/Meshes/GridDetails/Grid3D.h
+++ b/src/TNL/Meshes/GridDetails/Grid3D.h
@@ -88,13 +88,6 @@ class Grid< 3, Real, Device, Index > : public Object
    __cuda_callable__
    inline Index getEntityIndex( const Entity& entity ) const;
  
-   template< typename Entity >
-   __cuda_callable__
-   RealType getEntityMeasure( const Entity& entity ) const;
- 
-   __cuda_callable__
-   inline const RealType& getCellMeasure() const;
-
    __cuda_callable__
    inline const PointType& getSpaceSteps() const;
  
@@ -102,6 +95,9 @@ class Grid< 3, Real, Device, Index > : public Object
    __cuda_callable__
    const RealType& getSpaceStepsProducts() const;
 
+   __cuda_callable__
+   inline const RealType& getCellMeasure() const;
+
  
    __cuda_callable__
    RealType getSmallestSpaceStep() const;
diff --git a/src/TNL/Meshes/GridDetails/Grid3D_impl.h b/src/TNL/Meshes/GridDetails/Grid3D_impl.h
index de59b9aab432377d44cd1ab313e4d53d1e11e528..ee3e10d4b106ffa119f2059ac2a62e892b0ab87e 100644
--- a/src/TNL/Meshes/GridDetails/Grid3D_impl.h
+++ b/src/TNL/Meshes/GridDetails/Grid3D_impl.h
@@ -311,29 +311,6 @@ getEntityIndex( const Entity& entity ) const
    return GridEntityGetter< ThisType, Entity >::getEntityIndex( *this, entity );
 }
 
-template< typename Real,
-          typename Device,
-          typename Index >
-   template< typename Entity >
-__cuda_callable__
-Real
-Grid< 3, Real, Device, Index >::
-getEntityMeasure( const Entity& entity ) const
-{
-   return GridEntityMeasureGetter< ThisType, Entity::getEntityDimension() >::getMeasure( *this, entity );
-}
-
-template< typename Real,
-          typename Device,
-          typename Index >
-__cuda_callable__
-const Real&
-Grid< 3, Real, Device, Index >::
-getCellMeasure() const
-{
-   return this->template getSpaceStepsProducts< 1, 1, 1 >();
-}
-
 template< typename Real,
           typename Device,
           typename Index >
@@ -364,6 +341,17 @@ getSpaceStepsProducts() const
    return this->spaceStepsProducts[ xPow + 2 ][ yPow + 2 ][ zPow + 2 ];
 }
 
+template< typename Real,
+          typename Device,
+          typename Index >
+__cuda_callable__
+const Real&
+Grid< 3, Real, Device, Index >::
+getCellMeasure() const
+{
+   return this->template getSpaceStepsProducts< 1, 1, 1 >();
+}
+
 template< typename Real,
           typename Device,
           typename Index >