diff --git a/dumux/common/geometry/geometricentityset.hh b/dumux/common/geometry/geometricentityset.hh
index ac96e57c60ff8727982b5e61cfef918821f33ad1..9dcebc0afe1c387ad5a4dbf37e50100347f7ed99 100644
--- a/dumux/common/geometry/geometricentityset.hh
+++ b/dumux/common/geometry/geometricentityset.hh
@@ -39,25 +39,23 @@ namespace Dumux {
 template <class GridView, int codim = 0, class Mapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>>
 class GridViewGeometricEntitySet
 {
+    using EntityMap = Dumux::EntityMap<GridView, codim>;
 public:
     using Entity = typename GridView::template Codim<codim>::Entity;
 
     GridViewGeometricEntitySet(const GridView& gridView)
-    : gridView_(gridView)
-    , mapper_(gridView, Dune::mcmgLayout(Dune::Codim<codim>()))
-    , entityMap_(std::make_shared<EntityMap<GridView, codim>>(gridView.grid(), mapper_))
+    : GridViewGeometricEntitySet(gridView, Dune::mcmgLayout(Dune::Codim<codim>()))
     {}
 
-    GridViewGeometricEntitySet(const GridView& gridView,
-                               const Mapper& mapper)
+    GridViewGeometricEntitySet(const GridView& gridView, const Mapper& mapper)
     : gridView_(gridView)
     , mapper_(mapper)
-    , entityMap_(std::make_shared<EntityMap<GridView, codim>>(gridView.grid(), mapper_))
+    , entityMap_(std::make_shared<EntityMap>(gridView.grid(), mapper_))
     {}
 
     GridViewGeometricEntitySet(const GridView& gridView,
                                const Mapper& mapper,
-                               std::shared_ptr<const EntityMap<GridView, codim>> entityMap)
+                               std::shared_ptr<const EntityMap> entityMap)
     : gridView_(gridView)
     , mapper_(mapper)
     , entityMap_(entityMap)
@@ -106,7 +104,7 @@ public:
 private:
     GridView gridView_;
     Mapper mapper_;
-    std::shared_ptr<const EntityMap<GridView, codim>> entityMap_;
+    std::shared_ptr<const EntityMap> entityMap_;
 
 };