diff --git a/FunctionSpace/FunctionSpace.cpp b/FunctionSpace/FunctionSpace.cpp
index f19ded802a9f13e9967b6dfe48ed46dc27450933..0f7ca6d6bf0636f782e9eaebed50f3a56a579b4d 100644
--- a/FunctionSpace/FunctionSpace.cpp
+++ b/FunctionSpace/FunctionSpace.cpp
@@ -42,7 +42,7 @@ FunctionSpace::~FunctionSpace(void){
     delete eToGod;
 }
 
-void FunctionSpace::build(const GroupOfElement& goe,
+void FunctionSpace::build(GroupOfElement& goe,
                           const Basis& basis){
 
   // Save GroupOfElement & Mesh //
diff --git a/FunctionSpace/FunctionSpace.h b/FunctionSpace/FunctionSpace.h
index 1978f54baf262c8e709dc8fe52ea21c73f5cee8e..2b513a4842bf097455887a6a07c0e79bc4d04652 100644
--- a/FunctionSpace/FunctionSpace.h
+++ b/FunctionSpace/FunctionSpace.h
@@ -40,8 +40,8 @@
 class FunctionSpace{
  protected:
   // Geometry //
-  const Mesh*           mesh;
-  const GroupOfElement* goe;
+  const Mesh*     mesh;
+  GroupOfElement* goe;
 
   // Basis //
   std::vector<const Basis*>* basis;
@@ -68,8 +68,8 @@ class FunctionSpace{
   const Basis&                     getBasis(unsigned int i) const;
   unsigned int                     getNBasis(void) const;
 
-  const GroupOfElement& getSupport(void) const;
-  bool                  isScalar(void) const;
+  GroupOfElement& getSupport(void) const;
+  bool            isScalar(void) const;
 
   std::vector<Dof> getKeys(const MElement& element) const;
   std::vector<Dof> getKeys(const MVertex& vertex) const;
@@ -88,7 +88,7 @@ class FunctionSpace{
   // Init
   FunctionSpace(void);
 
-  void build(const GroupOfElement& goe,
+  void build(GroupOfElement& goe,
 	     const Basis& basis);
 
   // Dof
@@ -187,7 +187,7 @@ inline unsigned int FunctionSpace::getNBasis(void) const{
   return nBasis;
 }
 
-inline const GroupOfElement& FunctionSpace::getSupport(void) const{
+inline GroupOfElement& FunctionSpace::getSupport(void) const{
   return *goe;
 }
 
diff --git a/FunctionSpace/FunctionSpaceScalar.cpp b/FunctionSpace/FunctionSpaceScalar.cpp
index c1fd8bcf0abc05281b67eeed641382504e2921f7..f65cd8a383c4564c868e8efd6804400b53a284be 100644
--- a/FunctionSpace/FunctionSpaceScalar.cpp
+++ b/FunctionSpace/FunctionSpaceScalar.cpp
@@ -1,6 +1,6 @@
 #include "FunctionSpaceScalar.h"
 
-FunctionSpaceScalar::FunctionSpaceScalar(const GroupOfElement& goe,
+FunctionSpaceScalar::FunctionSpaceScalar(GroupOfElement& goe,
                                          const Basis& basis){
   scalar = true;
   build(goe, basis);
diff --git a/FunctionSpace/FunctionSpaceScalar.h b/FunctionSpace/FunctionSpaceScalar.h
index b4eca1b792e06e37b620b0a277edf62b0ef0bc68..ec9979570b0e9e225c97bb72b91db7cdf01476a1 100644
--- a/FunctionSpace/FunctionSpaceScalar.h
+++ b/FunctionSpace/FunctionSpaceScalar.h
@@ -18,7 +18,7 @@
 
 class FunctionSpaceScalar : public FunctionSpace{
  public:
-  FunctionSpaceScalar(const GroupOfElement& goe, const Basis& basis);
+  FunctionSpaceScalar(GroupOfElement& goe, const Basis& basis);
   virtual ~FunctionSpaceScalar(void);
 
   double
diff --git a/FunctionSpace/FunctionSpaceVector.cpp b/FunctionSpace/FunctionSpaceVector.cpp
index 86fb96a70a12db74b44b07e291c1c4b151a7609b..5cbb3657f4575a56b4720b24f8158ee6f5c559ed 100644
--- a/FunctionSpace/FunctionSpaceVector.cpp
+++ b/FunctionSpace/FunctionSpaceVector.cpp
@@ -1,7 +1,7 @@
 #include "Mapper.h"
 #include "FunctionSpaceVector.h"
 
-FunctionSpaceVector::FunctionSpaceVector(const GroupOfElement& goe,
+FunctionSpaceVector::FunctionSpaceVector(GroupOfElement& goe,
                                          const Basis& basis){
   scalar = false;
   build(goe, basis);
diff --git a/FunctionSpace/FunctionSpaceVector.h b/FunctionSpace/FunctionSpaceVector.h
index 08efbd091e467a19cb02ef595902f5d77ef7d06f..df736855bb90bf4debb9f0cdb4c1c84805cf5983 100644
--- a/FunctionSpace/FunctionSpaceVector.h
+++ b/FunctionSpace/FunctionSpaceVector.h
@@ -19,7 +19,7 @@
 
 class FunctionSpaceVector : public FunctionSpace{
  public:
-  FunctionSpaceVector(const GroupOfElement& goe, const Basis& basis);
+  FunctionSpaceVector(GroupOfElement& goe, const Basis& basis);
   virtual ~FunctionSpaceVector(void);
 
   fullVector<double>