diff --git a/srcs/Internals/JsonNode.h b/srcs/Internals/JsonNode.h
index 301ed67e..b521b812 100644
--- a/srcs/Internals/JsonNode.h
+++ b/srcs/Internals/JsonNode.h
@@ -19,16 +19,19 @@ enum JsonNodeType
 };
 
 class JsonWriter;
+class JsonNodeIterator;
 
-struct JsonNode
+class JsonNode
 {
+    friend class JsonNodeIterator;
+
+public:
     JsonNode()
         : type(JSON_UNDEFINED), next(0)
     {
         
     }
-
-    JsonNode* next;
+    
     void writeTo(JsonWriter&); // TODO: <- move in JsonNodeSerializer
 
     void setAsArray(JsonBuffer* buffer)
@@ -122,6 +125,7 @@ struct JsonNode
 
 private:
     JsonNodeType type; // <- TODO: hide
+    JsonNode* next;
 
     inline void writeArrayTo(JsonWriter&);// TODO: <- move in JsonNodeSerializer
     inline void writeObjectTo(JsonWriter&);// TODO: <- move in JsonNodeSerializer
diff --git a/srcs/JsonValue.h b/srcs/JsonValue.h
index 7d3c44a9..9a98be6f 100644
--- a/srcs/JsonValue.h
+++ b/srcs/JsonValue.h
@@ -3,7 +3,7 @@
 class JsonArray;
 class JsonContainer;
 class JsonObject;
-struct JsonNode;
+class JsonNode;
 
 class JsonValue
 {