diff --git a/src/geometry/geometry_map.rs b/src/geometry/geometry_map.rs
index 06e66c7..7aa1f77 100644
--- a/src/geometry/geometry_map.rs
+++ b/src/geometry/geometry_map.rs
@@ -1,6 +1,6 @@
 //! Geometry map
 use crate::{traits::GeometryMap as GeometryMapTrait, types::RealScalar};
-use ndelement::{reference_cell, traits::FiniteElement, types::ReferenceCellType};
+use ndelement::{reference_cell, traits::MappedFiniteElement, types::ReferenceCellType};
 use rlst::{Array, DynArray, RlstScalar, ValueArrayImpl};
 
 /// Single element geometry
@@ -48,7 +48,7 @@ impl<'a, T: RealScalar, B2D: ValueArrayImpl<T, 2>, C2D: ValueArrayImpl<usize, 2>
 {
     /// Create new
     pub fn new<A2D: ValueArrayImpl<T, 2>>(
-        element: &impl FiniteElement<CellType = ReferenceCellType, T = T>,
+        element: &impl MappedFiniteElement<CellType = ReferenceCellType, T = T>,
         points: &Array<A2D, 2>,
         geometry_points: &'a Array<B2D, 2>,
         entities: &'a Array<C2D, 2>,
diff --git a/src/geometry/mixed/entity_geometry.rs b/src/geometry/mixed/entity_geometry.rs
index a30c2a5..cd0e6ed 100644
--- a/src/geometry/mixed/entity_geometry.rs
+++ b/src/geometry/mixed/entity_geometry.rs
@@ -5,11 +5,11 @@ use crate::{
     traits::Geometry,
     types::RealScalar,
 };
-use ndelement::traits::FiniteElement;
+use ndelement::traits::MappedFiniteElement;
 
 /// Geometry of an entity
 #[derive(Debug)]
-pub struct MixedEntityGeometry<'a, T: RealScalar, E: FiniteElement> {
+pub struct MixedEntityGeometry<'a, T: RealScalar, E: MappedFiniteElement> {
     geometry: &'a MixedGeometry<T, E>,
     element_index: usize,
     cell_index: usize,
@@ -17,7 +17,7 @@ pub struct MixedEntityGeometry<'a, T: RealScalar, E: FiniteElement> {
     sub_entity_index: usize,
 }
 
-impl<'a, T: RealScalar, E: FiniteElement> MixedEntityGeometry<'a, T, E> {
+impl<'a, T: RealScalar, E: MappedFiniteElement> MixedEntityGeometry<'a, T, E> {
     /// Create new
     pub fn new(
         geometry: &'a MixedGeometry<T, E>,
@@ -36,7 +36,7 @@ impl<'a, T: RealScalar, E: FiniteElement> MixedEntityGeometry<'a, T, E> {
     }
 }
 
-impl<T: RealScalar, E: FiniteElement> Geometry for MixedEntityGeometry<'_, T, E> {
+impl<T: RealScalar, E: MappedFiniteElement> Geometry for MixedEntityGeometry<'_, T, E> {
     type T = T;
     type Point<'a>
         = Point<'a, T>
diff --git a/src/geometry/mixed/geometry.rs b/src/geometry/mixed/geometry.rs
index 8a5ba30..d349ce9 100644
--- a/src/geometry/mixed/geometry.rs
+++ b/src/geometry/mixed/geometry.rs
@@ -11,7 +11,7 @@ use ndelement::{
 };
 use ndelement::{
     reference_cell,
-    traits::{ElementFamily, FiniteElement},
+    traits::{ElementFamily, MappedFiniteElement},
     types::ReferenceCellType,
 };
 use rlst::{DynArray, rlst_dynamic_array};
@@ -19,7 +19,7 @@ use std::collections::HashMap;
 use std::fmt::{Debug, Formatter};
 
 /// Single element geometry
-pub struct MixedGeometry<T: RealScalar, E: FiniteElement> {
+pub struct MixedGeometry<T: RealScalar, E: MappedFiniteElement> {
     points: DynArray<T, 2>,
     cells: Vec<DynArray<usize, 2>>,
     elements: Vec<HashMap<ReferenceCellType, E>>,
@@ -27,7 +27,7 @@ pub struct MixedGeometry<T: RealScalar, E: FiniteElement> {
     pub(crate) insertion_indices_to_cell_indices: Vec<usize>,
 }
 
-impl<T: RealScalar, E: FiniteElement> Debug for MixedGeometry<T, E> {
+impl<T: RealScalar, E: MappedFiniteElement> Debug for MixedGeometry<T, E> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
         f.debug_struct("MixedGeometry")
             .field("points", &self.points)
@@ -115,7 +115,7 @@ where
     }
 }
 
-impl<T: RealScalar, E: FiniteElement> MixedGeometry<T, E> {
+impl<T: RealScalar, E: MappedFiniteElement> MixedGeometry<T, E> {
     /// Create single element geometry
     pub fn new(
         cell_types_in: &[ReferenceCellType],
diff --git a/src/geometry/single_element/entity_geometry.rs b/src/geometry/single_element/entity_geometry.rs
index 7fe6efa..4bcfca5 100644
--- a/src/geometry/single_element/entity_geometry.rs
+++ b/src/geometry/single_element/entity_geometry.rs
@@ -5,18 +5,18 @@ use crate::{
     traits::Geometry,
     types::RealScalar,
 };
-use ndelement::traits::FiniteElement;
+use ndelement::traits::MappedFiniteElement;
 
 /// Geometry of an entity
 #[derive(Debug)]
-pub struct SingleElementEntityGeometry<'a, T: RealScalar, E: FiniteElement> {
+pub struct SingleElementEntityGeometry<'a, T: RealScalar, E: MappedFiniteElement> {
     geometry: &'a SingleElementGeometry<T, E>,
     cell_index: usize,
     sub_entity_dimension: usize,
     sub_entity_index: usize,
 }
 
-impl<'a, T: RealScalar, E: FiniteElement> SingleElementEntityGeometry<'a, T, E> {
+impl<'a, T: RealScalar, E: MappedFiniteElement> SingleElementEntityGeometry<'a, T, E> {
     /// Create new
     pub fn new(
         geometry: &'a SingleElementGeometry<T, E>,
@@ -33,7 +33,7 @@ impl<'a, T: RealScalar, E: FiniteElement> SingleElementEntityGeometry<'a, T, E>
     }
 }
 
-impl<T: RealScalar, E: FiniteElement> Geometry for SingleElementEntityGeometry<'_, T, E> {
+impl<T: RealScalar, E: MappedFiniteElement> Geometry for SingleElementEntityGeometry<'_, T, E> {
     type T = T;
     type Point<'a>
         = Point<'a, T>
diff --git a/src/geometry/single_element/geometry.rs b/src/geometry/single_element/geometry.rs
index 29cc7e2..72c7ddf 100644
--- a/src/geometry/single_element/geometry.rs
+++ b/src/geometry/single_element/geometry.rs
@@ -6,24 +6,25 @@ use crate::types::RealScalar;
 use ndelement::{
     ciarlet::{CiarletElement, lagrange},
     map::IdentityMap,
+    traits::FiniteElement,
     types::Continuity,
 };
 use ndelement::{
     reference_cell,
-    traits::{ElementFamily, FiniteElement},
+    traits::{ElementFamily, MappedFiniteElement},
     types::ReferenceCellType,
 };
 use rlst::{DynArray, rlst_dynamic_array};
 use std::fmt::{Debug, Formatter};
 
 /// Single element geometry
-pub struct SingleElementGeometry<T: RealScalar, E: FiniteElement> {
+pub struct SingleElementGeometry<T: RealScalar, E: MappedFiniteElement> {
     points: DynArray<T, 2>,
     cells: DynArray<usize, 2>,
     elements: Vec<E>,
 }
 
-impl<T: RealScalar, E: FiniteElement> Debug for SingleElementGeometry<T, E> {
+impl<T: RealScalar, E: MappedFiniteElement> Debug for SingleElementGeometry<T, E> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
         f.debug_struct("SingleElementGeometry")
             .field("points", &self.points)
@@ -85,7 +86,7 @@ where
     }
 }
 
-impl<T: RealScalar, E: FiniteElement> SingleElementGeometry<T, E> {
+impl<T: RealScalar, E: MappedFiniteElement> SingleElementGeometry<T, E> {
     /// Create single element geometry
     pub fn new(
         cell_type: ReferenceCellType,
diff --git a/src/grid/local_grid/mixed/grid.rs b/src/grid/local_grid/mixed/grid.rs
index 3795a7a..793c294 100644
--- a/src/grid/local_grid/mixed/grid.rs
+++ b/src/grid/local_grid/mixed/grid.rs
@@ -25,7 +25,7 @@ use ndelement::{
     ciarlet::{CiarletElement, LagrangeElementFamily},
     map::IdentityMap,
     reference_cell,
-    traits::{ElementFamily, FiniteElement},
+    traits::{ElementFamily, FiniteElement, MappedFiniteElement},
     types::{Continuity, ReferenceCellType},
 };
 use rlst::dense::{base_array::BaseArray, data_container::VectorContainer};
@@ -34,8 +34,11 @@ use std::collections::HashMap;
 
 /// Mixed grid entity
 #[derive(Debug)]
-pub struct MixedGridEntity<'a, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>>
-{
+pub struct MixedGridEntity<
+    'a,
+    T: RealScalar,
+    E: MappedFiniteElement<CellType = ReferenceCellType, T = T>,
+> {
     grid: &'a MixedGrid<T, E>,
     cell_type: ReferenceCellType,
     cell_index: usize,
@@ -45,7 +48,7 @@ pub struct MixedGridEntity<'a, T: RealScalar, E: FiniteElement<CellType = Refere
     geometry_cell_index: usize,
 }
 
-impl<'e, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>>
+impl<'e, T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>>
     MixedGridEntity<'e, T, E>
 {
     /// Create new
@@ -69,7 +72,7 @@ impl<'e, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>>
         }
     }
 }
-impl<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> Entity
+impl<T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>> Entity
     for MixedGridEntity<'_, T, E>
 {
     type T = T;
@@ -123,14 +126,14 @@ impl<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> Entit
 pub struct MixedGridEntityIter<
     'a,
     T: RealScalar,
-    E: FiniteElement<CellType = ReferenceCellType, T = T>,
+    E: MappedFiniteElement<CellType = ReferenceCellType, T = T>,
 > {
     grid: &'a MixedGrid<T, E>,
     entity_type: ReferenceCellType,
     index: usize,
 }
 
-impl<'a, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>>
+impl<'a, T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>>
     MixedGridEntityIter<'a, T, E>
 {
     /// Create new
@@ -142,7 +145,7 @@ impl<'a, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>>
         }
     }
 }
-impl<'a, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> Iterator
+impl<'a, T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>> Iterator
     for MixedGridEntityIter<'a, T, E>
 {
     type Item = MixedGridEntity<'a, T, E>;
@@ -155,7 +158,7 @@ impl<'a, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> I
 
 /// Serial mixed element grid
 #[derive(Debug)]
-pub struct MixedGrid<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> {
+pub struct MixedGrid<T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>> {
     topology: MixedTopology,
     geometry: MixedGeometry<T, E>,
 }
@@ -190,7 +193,7 @@ impl<T: RealScalar + serde::Serialize> ConvertToSerializable
     }
 }
 
-impl<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> MixedGrid<T, E> {
+impl<T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>> MixedGrid<T, E> {
     /// Create new
     pub fn new(topology: MixedTopology, geometry: MixedGeometry<T, E>) -> Self {
         Self { topology, geometry }
@@ -249,7 +252,7 @@ impl<T: RealScalar> MixedGrid<T, CiarletElement<T, IdentityMap>> {
     }
 }
 
-impl<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> Grid
+impl<T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>> Grid
     for MixedGrid<T, E>
 {
     type T = T;
@@ -358,7 +361,7 @@ impl<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> Grid
 }
 
 #[cfg(feature = "mpi")]
-impl<T: RealScalar + Equivalence, E: FiniteElement<CellType = ReferenceCellType, T = T>>
+impl<T: RealScalar + Equivalence, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>>
     DistributableGrid for MixedGrid<T, E>
 {
     type ParallelGrid<'a, C: Communicator + 'a> =
diff --git a/src/grid/local_grid/single_element/grid.rs b/src/grid/local_grid/single_element/grid.rs
index 4cd1569..bf9294b 100644
--- a/src/grid/local_grid/single_element/grid.rs
+++ b/src/grid/local_grid/single_element/grid.rs
@@ -24,7 +24,7 @@ use ndelement::{
     ciarlet::{CiarletElement, LagrangeElementFamily},
     map::IdentityMap,
     reference_cell,
-    traits::{ElementFamily, FiniteElement},
+    traits::{ElementFamily, FiniteElement, MappedFiniteElement},
     types::{Continuity, ReferenceCellType},
 };
 use rlst::dense::{base_array::BaseArray, data_container::VectorContainer};
@@ -35,7 +35,7 @@ use rlst::{SliceArray, rlst_dynamic_array};
 pub struct SingleElementGridEntity<
     'a,
     T: RealScalar,
-    E: FiniteElement<CellType = ReferenceCellType, T = T>,
+    E: MappedFiniteElement<CellType = ReferenceCellType, T = T>,
 > {
     grid: &'a SingleElementGrid<T, E>,
     cell_index: usize,
@@ -43,7 +43,7 @@ pub struct SingleElementGridEntity<
     entity_index: usize,
 }
 
-impl<'e, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>>
+impl<'e, T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>>
     SingleElementGridEntity<'e, T, E>
 {
     /// Create new
@@ -61,7 +61,7 @@ impl<'e, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>>
         }
     }
 }
-impl<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> Entity
+impl<T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>> Entity
     for SingleElementGridEntity<'_, T, E>
 {
     type T = T;
@@ -111,14 +111,14 @@ impl<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> Entit
 pub struct SingleElementGridEntityIter<
     'a,
     T: RealScalar,
-    E: FiniteElement<CellType = ReferenceCellType, T = T>,
+    E: MappedFiniteElement<CellType = ReferenceCellType, T = T>,
 > {
     grid: &'a SingleElementGrid<T, E>,
     entity_type: ReferenceCellType,
     index: usize,
 }
 
-impl<'a, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>>
+impl<'a, T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>>
     SingleElementGridEntityIter<'a, T, E>
 {
     /// Create new
@@ -130,7 +130,7 @@ impl<'a, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>>
         }
     }
 }
-impl<'a, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> Iterator
+impl<'a, T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>> Iterator
     for SingleElementGridEntityIter<'a, T, E>
 {
     type Item = SingleElementGridEntity<'a, T, E>;
@@ -143,7 +143,10 @@ impl<'a, T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> I
 
 /// Serial single element grid
 #[derive(Debug)]
-pub struct SingleElementGrid<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> {
+pub struct SingleElementGrid<
+    T: RealScalar,
+    E: MappedFiniteElement<CellType = ReferenceCellType, T = T>,
+> {
     topology: SingleTypeTopology,
     geometry: SingleElementGeometry<T, E>,
 }
@@ -178,7 +181,9 @@ impl<T: RealScalar + serde::Serialize> ConvertToSerializable
     }
 }
 
-impl<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> SingleElementGrid<T, E> {
+impl<T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>>
+    SingleElementGrid<T, E>
+{
     /// Create new
     pub fn new(topology: SingleTypeTopology, geometry: SingleElementGeometry<T, E>) -> Self {
         Self { topology, geometry }
@@ -221,7 +226,7 @@ impl<T: RealScalar> SingleElementGrid<T, CiarletElement<T, IdentityMap>> {
     }
 }
 
-impl<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> Grid
+impl<T: RealScalar, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>> Grid
     for SingleElementGrid<T, E>
 {
     type T = T;
@@ -320,7 +325,7 @@ impl<T: RealScalar, E: FiniteElement<CellType = ReferenceCellType, T = T>> Grid
 }
 
 #[cfg(feature = "mpi")]
-impl<T: RealScalar + Equivalence, E: FiniteElement<CellType = ReferenceCellType, T = T>>
+impl<T: RealScalar + Equivalence, E: MappedFiniteElement<CellType = ReferenceCellType, T = T>>
     DistributableGrid for SingleElementGrid<T, E>
 {
     type ParallelGrid<'a, C: Communicator + 'a> =