diff --git a/ejson/Object.hpp b/ejson/Object.hpp
index 4be613d..2170969 100644
--- a/ejson/Object.hpp
+++ b/ejson/Object.hpp
@@ -6,8 +6,7 @@
 #pragma once
 
 #include <etk/types.hpp>
-#include <etk/Hash.hpp>
-#include <algorithm>
+#include <etk/Map.hpp>
 #include <ejson/Value.hpp>
 #include <ejson/iterator.hpp>
 
diff --git a/ejson/internal/Object.cpp b/ejson/internal/Object.cpp
index afef41c..fbb54cb 100644
--- a/ejson/internal/Object.cpp
+++ b/ejson/internal/Object.cpp
@@ -342,11 +342,11 @@ bool ejson::internal::Object::add(const etk::String& _name, ememory::SharedPtr<e
 }
 
 void ejson::internal::Object::remove(const etk::String& _name) {
-	m_value.remove(_name);
+	m_value.erase(_name);
 }
 
 void ejson::internal::Object::remove(size_t _id) {
-	m_value.remove(getKey(_id));
+	m_value.erase(getKey(_id));
 }
 
 bool ejson::internal::Object::transfertIn(ememory::SharedPtr<ejson::internal::Value> _obj) {
diff --git a/ejson/internal/Object.hpp b/ejson/internal/Object.hpp
index 50db9da..e51bd96 100644
--- a/ejson/internal/Object.hpp
+++ b/ejson/internal/Object.hpp
@@ -6,8 +6,7 @@
 #pragma once
 
 #include <etk/types.hpp>
-#include <etk/Hash.hpp>
-#include <algorithm>
+#include <etk/Map.hpp>
 #include <ejson/internal/Value.hpp>
 
 namespace ejson {
@@ -20,7 +19,8 @@ namespace ejson {
 				/**
 				 * @brief basic element of a xml structure
 				 */
-				Object() {
+				Object() :
+				  m_value(0, false) { // Force unorder map
 					m_type = ejson::valueType::object;
 				};
 			public:
@@ -36,8 +36,7 @@ namespace ejson {
 				 */
 				static ememory::SharedPtr<Object> create(const etk::String& _data);
 			protected:
-				// TODO : Change this with a generic methode ...
-				etk::Hash<ememory::SharedPtr<ejson::internal::Value> > m_value; //!< value of the node (for element this is the name, for text it is the inside text ...)
+				etk::Map<etk::String, ememory::SharedPtr<ejson::internal::Value>> m_value; //!< value of the node (for element this is the name, for text it is the inside text ...)
 			public:
 				/**
 				 * @brief check if an element exist.