diff --git a/include/ArduinoJson/ForwardDeclarations.hpp b/include/ArduinoJson/ForwardDeclarations.hpp
index 23651ee2..629654e3 100644
--- a/include/ArduinoJson/ForwardDeclarations.hpp
+++ b/include/ArduinoJson/ForwardDeclarations.hpp
@@ -20,7 +20,6 @@ class IndentedPrint;
 class JsonArrayConstIterator;
 class JsonArrayImpl;
 class JsonArrayIterator;
-class JsonNode;
 class JsonObjectImpl;
 class JsonObjectIterator;
 class JsonParser;
diff --git a/include/ArduinoJson/Internals/JsonArrayImpl.hpp b/include/ArduinoJson/Internals/JsonArrayImpl.hpp
index a8274cc1..d3cb91c8 100644
--- a/include/ArduinoJson/Internals/JsonArrayImpl.hpp
+++ b/include/ArduinoJson/Internals/JsonArrayImpl.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "../JsonBuffer.hpp"
+#include "../ForwardDeclarations.hpp"
 #include "JsonArrayIterator.hpp"
 #include "JsonArrayConstIterator.hpp"
 
@@ -20,13 +20,15 @@ class JsonArrayImpl {
 
   JsonArrayImpl(JsonBuffer *buffer) : _buffer(buffer) {}
 
-  value_type *operator[](int index) const;
+  value_type operator[](int index) const;
 
-  value_type *add();
+  value_type add();
 
   JsonArrayImpl *createNestedArray();
   JsonObjectImpl *createNestedObject();
 
+  void writeTo(JsonWriter &writer) const;
+
   iterator begin() { return iterator(_firstChild); }
   iterator end() { return iterator(0); }
 
diff --git a/include/ArduinoJson/Internals/JsonObjectImpl.hpp b/include/ArduinoJson/Internals/JsonObjectImpl.hpp
new file mode 100644
index 00000000..9a4fd254
--- /dev/null
+++ b/include/ArduinoJson/Internals/JsonObjectImpl.hpp
@@ -0,0 +1,45 @@
+// Copyright Benoit Blanchon 2014
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+
+#pragma once
+
+#include "JsonObjectConstIterator.hpp"
+#include "JsonObjectIterator.hpp"
+#include "JsonObjectNode.hpp"
+
+namespace ArduinoJson {
+namespace Internals {
+class JsonObjectImpl {
+ public:
+  typedef const char *key_type;
+  typedef JsonPair value_type;
+  typedef JsonObjectIterator iterator;
+  typedef JsonObjectConstIterator const_iterator;
+
+  JsonObjectImpl(JsonBuffer *buffer) : _buffer(buffer) {}
+
+  JsonValueImpl *operator[](const char *key) { return getOrCreateValueAt(key); }
+  void remove(key_type key);
+
+  JsonArrayImpl *createNestedArray(key_type key);
+  JsonObjectImpl *createNestedObject(key_type key);
+
+  iterator begin() { return iterator(_firstChild); }
+  iterator end() { return iterator(0); }
+
+  const_iterator begin() const { return const_iterator(_firstChild); }
+  const_iterator end() const { return const_iterator(0); }
+
+ private:
+  JsonObjectNode *getNodeAt(key_type key);
+  void removeNode(JsonObjectNode *nodeToRemove);
+  JsonValueImpl *getOrCreateValueAt(key_type key);
+
+  JsonBuffer *_buffer;
+  JsonObjectNode *_firstChild;
+};
+}
+}
diff --git a/include/ArduinoJson/Internals/JsonSerializer.hpp b/include/ArduinoJson/Internals/JsonSerializer.hpp
index 51b68080..2b815904 100644
--- a/include/ArduinoJson/Internals/JsonSerializer.hpp
+++ b/include/ArduinoJson/Internals/JsonSerializer.hpp
@@ -13,11 +13,14 @@ namespace Internals {
 
 class JsonSerializer {
  public:
-  static writeTo(JsonValue& value, JsonWriter&);
+  JsonSerializer(JsonWriter &writer) : _writer(writer) {}
+
+  void serialize(JsonValueImpl *value);
+  void serialize(JsonArrayImpl *value);
+  void serialize(JsonObjectImpl *value);
 
  private:
-  inline void writeArrayTo(JsonValue& value, JsonWriter&);
-  inline void writeObjectTo(JsonValue& value, JsonWriter&);
+  JsonWriter &_writer;
 };
 }
 }
\ No newline at end of file
diff --git a/include/ArduinoJson/Internals/JsonValueImpl.hpp b/include/ArduinoJson/Internals/JsonValueImpl.hpp
index 905c33be..4703fadb 100644
--- a/include/ArduinoJson/Internals/JsonValueImpl.hpp
+++ b/include/ArduinoJson/Internals/JsonValueImpl.hpp
@@ -71,6 +71,8 @@ class JsonValueImpl {
     return _type == JSON_OBJECT ? _content.asObject : NULL;
   }
 
+  void writeTo(JsonWriter &writer) const;
+
  private:
   Internals::JsonValueType _type;
   Internals::JsonValueContent _content;
diff --git a/include/ArduinoJson/JsonArray.hpp b/include/ArduinoJson/JsonArray.hpp
index 42e9131c..2492f21a 100644
--- a/include/ArduinoJson/JsonArray.hpp
+++ b/include/ArduinoJson/JsonArray.hpp
@@ -11,6 +11,8 @@
 
 namespace ArduinoJson {
 class JsonArray : public JsonContainer {
+  friend class JsonValue;
+
  public:
   typedef JsonValue value_type;
   typedef Internals::JsonArrayIterator iterator;
diff --git a/include/ArduinoJson/JsonBuffer.hpp b/include/ArduinoJson/JsonBuffer.hpp
index 84afe4bd..db73a9e5 100644
--- a/include/ArduinoJson/JsonBuffer.hpp
+++ b/include/ArduinoJson/JsonBuffer.hpp
@@ -32,13 +32,8 @@ class JsonBuffer {
   JsonObject parseObject(char* json);
   JsonValue parseValue(char* json);
 
-  template <typename T>
-  T* create() {
-    void* p = alloc(sizeof(T));
-    if (!p) return NULL;
-    return new (p) T();
-  }
-
   virtual void* alloc(size_t size) = 0;
 };
 }
+
+void* operator new(size_t size, ArduinoJson::JsonBuffer* buffer);
diff --git a/include/ArduinoJson/JsonContainer.hpp b/include/ArduinoJson/JsonContainer.hpp
index d745603f..9df3307e 100644
--- a/include/ArduinoJson/JsonContainer.hpp
+++ b/include/ArduinoJson/JsonContainer.hpp
@@ -7,16 +7,18 @@
 #pragma once
 
 #include "Arduino/Printable.hpp"
+#include "Internals/IndentedPrint.hpp"
 
 namespace ArduinoJson {
 
+// TODO: renale to JsonPrintable
 class JsonContainer : public Printable {
  public:
   size_t printTo(char *buffer, size_t bufferSize) const;
   virtual size_t printTo(Print &print) const;
 
   size_t prettyPrintTo(char *buffer, size_t bufferSize) const;
-  size_t prettyPrintTo(ArduinoJson::Internals::IndentedPrint &print) const;
+  size_t prettyPrintTo(Internals::IndentedPrint &print) const;
   size_t prettyPrintTo(Print &print) const;
 };
 }
diff --git a/include/ArduinoJson/JsonObject.hpp b/include/ArduinoJson/JsonObject.hpp
index 69392947..9301a139 100644
--- a/include/ArduinoJson/JsonObject.hpp
+++ b/include/ArduinoJson/JsonObject.hpp
@@ -6,37 +6,40 @@
 
 #pragma once
 
-#include "Internals/JsonObjectConstIterator.hpp"
-#include "Internals/JsonObjectIterator.hpp"
 #include "JsonContainer.hpp"
-#include "Internals/JsonObjectNode.hpp"
+#include "Internals/JsonObjectImpl.hpp"
 
 namespace ArduinoJson {
 class JsonObject : public JsonContainer {
+  friend class JsonValue;
+
  public:
+  typedef const char* key_type;
   typedef JsonPair value_type;
   typedef Internals::JsonObjectIterator iterator;
   typedef Internals::JsonObjectConstIterator const_iterator;
 
-  JsonObject(JsonBuffer *buffer) : _buffer(buffer) {}
+  JsonObject(Internals::JsonObjectImpl* impl) : _impl(impl) {}
 
-  JsonValue operator[](const char *key);
-  void remove(const char *key);
+  JsonValue operator[](key_type key);
+  void remove(key_type key);
 
-  JsonArray createNestedArray(const char *key);
-  JsonObject createNestedObject(const char *key);
+  JsonArray createNestedArray(key_type key);
+  JsonObject createNestedObject(key_type key);
 
-  iterator begin() { return iterator(_firstChild); }
+  iterator begin() {
+    if (!_impl) return end();
+    return _impl->begin();
+  }
   iterator end() { return iterator(0); }
 
-  const_iterator begin() const { return const_iterator(_firstChild); }
+  const_iterator begin() const {
+    if (!_impl) return end();
+    return const_cast<const Internals::JsonObjectImpl*>(_impl)->begin();
+  }
   const_iterator end() const { return const_iterator(0); }
 
  private:
-  Internals::JsonNode *getPairAt(const char *key);
-  Internals::JsonNode *getOrCreateValueAt(const char *key);
-
-  JsonBuffer *_buffer;
-  Internals::JsonObjectNode *_firstChild;
+  Internals::JsonObjectImpl* _impl;
 };
 }
diff --git a/include/ArduinoJson/JsonObjectIterator.hpp b/include/ArduinoJson/JsonObjectIterator.hpp
new file mode 100644
index 00000000..388233f5
--- /dev/null
+++ b/include/ArduinoJson/JsonObjectIterator.hpp
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "ArduinoJson/JsonObjectKeyValue.hpp"
+
+namespace ArduinoJson {
+class JsonObject;
+
+class JsonObjectIterator {
+  friend class JsonObject;
+
+ public:
+  explicit JsonObjectIterator(Internals::JsonNode* node) : _node(node) {}
+
+  const char* key() const { return operator*().key(); }
+
+  JsonValue value() const { return operator*().value(); }
+
+  void operator++() { _node = _node->next; }
+
+  JsonObjectKeyValue operator*() const { return JsonObjectKeyValue(_node); }
+
+  bool operator==(const JsonObjectIterator& other) const {
+    return _node == other._node;
+  }
+
+  bool operator!=(const JsonObjectIterator& other) const {
+    return _node != other._node;
+  }
+
+ private:
+  Internals::JsonNode* _node;
+};
+}
\ No newline at end of file
diff --git a/include/ArduinoJson/JsonValue.hpp b/include/ArduinoJson/JsonValue.hpp
index 404a95e0..b3fe06b1 100644
--- a/include/ArduinoJson/JsonValue.hpp
+++ b/include/ArduinoJson/JsonValue.hpp
@@ -23,6 +23,9 @@ class JsonValue {
     if (_impl) _impl->set(value);
   }
 
+  void operator=(JsonArray array);
+  void operator=(JsonObject object);
+
   void set(double value, int decimals) {
     if (_impl) _impl->set(value, decimals);
   }
diff --git a/src/Internals/JsonArrayImpl.cpp b/src/Internals/JsonArrayImpl.cpp
index 3fd1b751..7e9fbe75 100644
--- a/src/Internals/JsonArrayImpl.cpp
+++ b/src/Internals/JsonArrayImpl.cpp
@@ -4,49 +4,68 @@
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 
-#include "ArduinoJson/JsonArray.hpp"
-#include "ArduinoJson/JsonObject.hpp"
-#include "ArduinoJson/JsonValue.hpp"
+#include "ArduinoJson/Internals/JsonArrayImpl.hpp"
+
+#include "ArduinoJson/JsonBuffer.hpp"
+#include "ArduinoJson/Internals/JsonObjectImpl.hpp"
+#include "ArduinoJson/Internals/JsonWriter.hpp"
 
 using namespace ArduinoJson;
 using namespace ArduinoJson::Internals;
 
-JsonValueImpl *JsonArray::operator[](int index) const {
-  for (const_iterator it = begin(); it != end(); ++it) {
-    if (!index) return *it;
-    index--;
-  }
+JsonValueImpl *JsonArrayImpl::operator[](int index) const {
+  JsonArrayNode *node = _firstChild;
+  while (node && index--) node = node->next;
 
   return NULL;
 }
 
-JsonValueImpl *JsonArray::add() {
+JsonValueImpl *JsonArrayImpl::add() {
   if (_buffer) return NULL;
 
-  JsonArrayNode *node = _buffer->create<JsonArrayNode>();
+  JsonArrayNode *node = new (_buffer) JsonArrayNode();
   if (!node) return NULL;
 
-  return &node.value;
+  return &node->value;
 }
 
-JsonArrayImpl *JsonArray::createNestedArray() {
-  JsonNode *node = createNode();
+JsonArrayImpl *JsonArrayImpl::createNestedArray() {
+  JsonValueImpl *value = add();
+  if (!value) return NULL;
 
-  if (node) {
-    node->setAsArray(_node->getContainerBuffer());
-    addChild(node);
+  JsonArrayImpl *array = new (_buffer) JsonArrayImpl(_buffer);
+  value->set(array);
+
+  return array;
+}
+
+JsonObjectImpl *JsonArrayImpl::createNestedObject() {
+  JsonValueImpl *value = add();
+  if (!value) return NULL;
+
+  JsonObjectImpl *array = new (_buffer) JsonObjectImpl(_buffer);
+  value->set(array);
+
+  return array;
+}
+
+void JsonArrayImpl::writeTo(JsonWriter &writer) const {
+  JsonArrayNode *child = _firstChild;
+
+  if (child) {
+    writer.beginArray();
+
+    for (;;) {
+      child->value.writeTo(writer);
+
+      child = child->next;
+      if (!child) break;
+
+      writer.writeComma();
+    }
+
+    writer.endArray();
+  } else {
+    writer.writeEmptyArray();
   }
-
-  return JsonArray(node);
-}
-
-JsonObject JsonArray::createNestedObject() {
-  JsonNode *node = createNode();
-
-  if (node) {
-    node->setAsObject(_node->getContainerBuffer());
-    addChild(node);
-  }
-
-  return JsonObject(node);
 }
diff --git a/src/Internals/JsonObjectImpl.cpp b/src/Internals/JsonObjectImpl.cpp
new file mode 100644
index 00000000..956701c3
--- /dev/null
+++ b/src/Internals/JsonObjectImpl.cpp
@@ -0,0 +1,118 @@
+// Copyright Benoit Blanchon 2014
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+
+#include "ArduinoJson/JsonObject.hpp"
+
+#include <string.h>  // for strcmp
+
+#include "ArduinoJson/JsonBuffer.hpp"
+#include "ArduinoJson/Internals/JsonArrayImpl.hpp"
+#include "ArduinoJson/Internals/JsonValueImpl.hpp"
+#include "ArduinoJson/Internals/StringBuilder.hpp"
+
+using namespace ArduinoJson;
+using namespace ArduinoJson::Internals;
+
+void JsonObjectImpl::remove(char const *key) { removeNode(getNodeAt(key)); }
+
+JsonArrayImpl *JsonObjectImpl::createNestedArray(char const *key) {
+  JsonValueImpl *node = getOrCreateValueAt(key);
+  if (!node) return NULL;
+
+  JsonArrayImpl *array = new (_buffer) JsonArrayImpl(_buffer);
+  node->set(array);
+
+  return array;
+}
+
+JsonObject JsonObject::createNestedObject(char const *key) {
+  JsonNode *node = getOrCreateValueAt(key);
+
+  if (node) node->setAsObject(_node->getContainerBuffer());
+
+  return JsonObject(node);
+}
+
+JsonNode *JsonObject::getPairAt(const char *key) {
+  for (JsonNode *node = firstChild(); node; node = node->next) {
+    if (!strcmp(node->getAsObjectKey(), key)) return node;
+  }
+  return NULL;
+}
+
+JsonNode *JsonObject::getOrCreateValueAt(const char *key) {
+  JsonNode *existingNode = getPairAt(key);
+  if (existingNode) return existingNode->getAsObjectValue();
+
+  JsonNode *newValueNode = createNode();
+  if (!newValueNode) return 0;
+
+  JsonNode *newKeyNode = createNode();
+  if (!newKeyNode) return 0;
+
+  newKeyNode->setAsObjectKeyValue(key, newValueNode);
+
+  addChild(newKeyNode);
+
+  return newValueNode;
+}
+
+void JsonNode::addChild(JsonNode *childToAdd) {
+  if (type == JSON_PROXY) return content.asProxy.target->addChild(childToAdd);
+
+  if (type != JSON_ARRAY && type != JSON_OBJECT) return;
+
+  JsonNode *lastChild = content.asContainer.child;
+
+  if (!lastChild) {
+    content.asContainer.child = childToAdd;
+    return;
+  }
+
+  while (lastChild->next) lastChild = lastChild->next;
+
+  lastChild->next = childToAdd;
+}
+
+void JsonNode::removeChild(JsonNode *childToRemove) {
+  if (type == JSON_PROXY)
+    return content.asProxy.target->removeChild(childToRemove);
+
+  if (type != JSON_ARRAY && type != JSON_OBJECT) return;
+
+  if (content.asContainer.child == childToRemove) {
+    content.asContainer.child = childToRemove->next;
+    return;
+  }
+
+  for (JsonNode *child = content.asContainer.child; child;
+       child = child->next) {
+    if (child->next == childToRemove) child->next = childToRemove->next;
+  }
+}
+
+void JsonObjectImpl::writeObjectTo(JsonWriter &writer) {
+  JsonObjectNode *child = _firstChild;
+
+  if (child) {
+    writer.beginObject();
+
+    for (;;) {
+      writer.writeString(child->content.asKeyValue.key);
+      writer.writeColon();
+      child->value->writeTo(writer);
+
+      child = child->next;
+      if (!child) break;
+
+      writer.writeComma();
+    }
+
+    writer.endObject();
+  } else {
+    writer.writeEmptyObject();
+  }
+}
diff --git a/src/Internals/JsonParser.cpp b/src/Internals/JsonParser.cpp
index 45ba838a..95a66564 100644
--- a/src/Internals/JsonParser.cpp
+++ b/src/Internals/JsonParser.cpp
@@ -142,7 +142,8 @@ JsonObject JsonParser::parseObject() {
     const char *key = parseString();
     if (!key) return NULL;
 
-    skip(':')
+    if (!skip(':'))
+      return NULL;
 
         JsonValue value = object[key];
 
diff --git a/src/Internals/JsonSerializer.cpp b/src/Internals/JsonSerializer.cpp
deleted file mode 100644
index ac91b8ff..00000000
--- a/src/Internals/JsonSerializer.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright Benoit Blanchon 2014
-// MIT License
-//
-// Arduino JSON library
-// https://github.com/bblanchon/ArduinoJson
-
-#include "ArduinoJson/Internals/JsonNode.hpp"
-
-#include "ArduinoJson/Internals/JsonWriter.hpp"
-#include "ArduinoJson/JsonArray.hpp"
-#include "ArduinoJson/JsonObject.hpp"
-#include "ArduinoJson/JsonBuffer.hpp"
-
-using namespace ArduinoJson::Internals;
-
-void JsonNode::writeTo(JsonWriter &writer) {
-  switch (type) {
-    case JSON_PROXY:
-      content.asProxy.target->writeTo(writer);
-      break;
-
-    case JSON_ARRAY:
-      writeArrayTo(writer);
-      break;
-
-    case JSON_OBJECT:
-      writeObjectTo(writer);
-      break;
-
-    case JSON_STRING:
-      writer.writeString(content.asString);
-      break;
-
-    case JSON_LONG:
-      writer.writeInteger(content.asInteger);
-      break;
-
-    case JSON_BOOLEAN:
-      writer.writeBoolean(content.asBoolean);
-      break;
-
-    default:  // >= JSON_DOUBLE_0_DECIMALS
-      writer.writeDouble(content.asDouble, type - JSON_DOUBLE_0_DECIMALS);
-      break;
-  }
-}
-
-void JsonNode::addChild(JsonNode *childToAdd) {
-  if (type == JSON_PROXY) return content.asProxy.target->addChild(childToAdd);
-
-  if (type != JSON_ARRAY && type != JSON_OBJECT) return;
-
-  JsonNode *lastChild = content.asContainer.child;
-
-  if (!lastChild) {
-    content.asContainer.child = childToAdd;
-    return;
-  }
-
-  while (lastChild->next) lastChild = lastChild->next;
-
-  lastChild->next = childToAdd;
-}
-
-void JsonNode::removeChild(JsonNode *childToRemove) {
-  if (type == JSON_PROXY)
-    return content.asProxy.target->removeChild(childToRemove);
-
-  if (type != JSON_ARRAY && type != JSON_OBJECT) return;
-
-  if (content.asContainer.child == childToRemove) {
-    content.asContainer.child = childToRemove->next;
-    return;
-  }
-
-  for (JsonNode *child = content.asContainer.child; child;
-       child = child->next) {
-    if (child->next == childToRemove) child->next = childToRemove->next;
-  }
-}
-
-void JsonNode::writeArrayTo(JsonWriter &writer) {
-  JsonNode *child = content.asContainer.child;
-
-  if (child) {
-    writer.beginArray();
-
-    for (;;) {
-      child->writeTo(writer);
-
-      child = child->next;
-      if (!child) break;
-
-      writer.writeComma();
-    }
-
-    writer.endArray();
-  } else {
-    writer.writeEmptyArray();
-  }
-}
-
-void JsonNode::writeObjectTo(JsonWriter &writer) {
-  JsonNode *child = content.asContainer.child;
-
-  if (child) {
-    writer.beginObject();
-
-    for (;;) {
-      writer.writeString(child->content.asKeyValue.key);
-      writer.writeColon();
-      child->content.asKeyValue.value->writeTo(writer);
-
-      child = child->next;
-      if (!child) break;
-
-      writer.writeComma();
-    }
-
-    writer.endObject();
-  } else {
-    writer.writeEmptyObject();
-  }
-}
-
-void JsonNode::setAsProxyOfSelf() {
-  JsonBuffer *buffer = content.asContainer.buffer;
-  if (!buffer) return;
-
-  JsonNode *newNode = buffer->createNode();
-  if (!newNode) return;
-
-  *newNode = *this;
-
-  setAsProxyOf(newNode);
-}
-
-void JsonNode::duplicate(JsonNode *other) {
-  if (!other) {
-    type = JSON_UNDEFINED;
-  } else if (other->type == JSON_ARRAY || other->type == JSON_OBJECT) {
-    other->setAsProxyOfSelf();
-    setAsProxyOf(other->content.asProxy.target);
-  } else {
-    *this = *other;
-  }
-}
diff --git a/src/Internals/JsonValueImpl.cpp b/src/Internals/JsonValueImpl.cpp
new file mode 100644
index 00000000..3d256db3
--- /dev/null
+++ b/src/Internals/JsonValueImpl.cpp
@@ -0,0 +1,35 @@
+// Copyright Benoit Blanchon 2014
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+
+#include "ArduinoJson/Internals/JsonValueImpl.hpp"
+
+void JsonValueImpl::writeTo(JsonWriter &writer) const {
+  switch (_type) {
+    case JSON_ARRAY:
+      _content.asArray->writeTo(writer);
+      break;
+
+    case JSON_OBJECT:
+      _content.asObject->writeTo(writer);
+      break;
+
+    case JSON_STRING:
+      writer.writeString(content.asString);
+      break;
+
+    case JSON_LONG:
+      writer.writeInteger(content.asInteger);
+      break;
+
+    case JSON_BOOLEAN:
+      writer.writeBoolean(content.asBoolean);
+      break;
+
+    default:  // >= JSON_DOUBLE_0_DECIMALS
+      writer.writeDouble(content.asDouble, type - JSON_DOUBLE_0_DECIMALS);
+      break;
+  }
+}
\ No newline at end of file
diff --git a/src/JsonBuffer.cpp b/src/JsonBuffer.cpp
index 1d58b9f5..c4d7cf54 100644
--- a/src/JsonBuffer.cpp
+++ b/src/JsonBuffer.cpp
@@ -6,92 +6,12 @@
 
 #include "ArduinoJson/JsonBuffer.hpp"
 
-#include <new>
-
-#include "ArduinoJson/Internals/JsonValueInternal.hpp"
 #include "ArduinoJson/Internals/JsonParser.hpp"
-#include "ArduinoJson/Internals/JsonNode.hpp"
 
 using namespace ArduinoJson;
 using namespace ArduinoJson::Internals;
 
-JsonValue JsonBuffer::createValue() { return JsonValueInternal(createNode()); }
-
-JsonNode *JsonBuffer::createNode() {
-  void *node = allocateNode();
-  if (!node) return 0;
-
-  return new (node) JsonNode();
-}
-
-JsonArray JsonBuffer::parseArray(char *json) {
-  JsonParser parser(this, json);
-  return JsonArray(parser.parseAnything());
-}
-
-JsonObject JsonBuffer::parseObject(char *json) {
-  JsonParser parser(this, json);
-  return JsonObject(parser.parseAnything());
-}
-
-JsonValue JsonBuffer::parseValue(char *json) {
-  JsonParser parser(this, json);
-  return JsonValueInternal(parser.parseAnything());
-}
-
-JsonNode *JsonBuffer::createArrayNode() {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsArray(this);
-
-  return node;
-}
-
-JsonNode *JsonBuffer::createBoolNode(bool value) {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsBoolean(value);
-
-  return node;
-}
-
-JsonNode *JsonBuffer::createDoubleNode(double value, int decimals) {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsDouble(value, decimals);
-
-  return node;
-}
-
-JsonNode *JsonBuffer::createLongNode(long value) {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsLong(value);
-
-  return node;
-}
-
-JsonNode *JsonBuffer::createObjectNode() {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsObject(this);
-
-  return node;
-}
-
-Internals::JsonNode *JsonBuffer::createObjectKeyValueNode(const char *key,
-                                                          JsonNode *value) {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsObjectKeyValue(key, value);
-
-  return node;
-}
-
-JsonNode *JsonBuffer::createStringNode(const char *value) {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsString(value);
-
-  return node;
+// TODO: what happens if alloc returns NULL
+void* operator new(size_t size, ArduinoJson::JsonBuffer* buffer) {
+  return _buffer->alloc(size);
 }
diff --git a/src/JsonObject.cpp b/src/JsonObject.cpp
index 92a3c6dc..2b816f44 100644
--- a/src/JsonObject.cpp
+++ b/src/JsonObject.cpp
@@ -6,62 +6,16 @@
 
 #include "ArduinoJson/JsonObject.hpp"
 
-#include <string.h>  // for strcmp
-
-#include "ArduinoJson/JsonBuffer.hpp"
-#include "ArduinoJson/JsonValue.hpp"
-#include "ArduinoJson/Internals/JsonNode.hpp"
-#include "ArduinoJson/Internals/StringBuilder.hpp"
-
 using namespace ArduinoJson;
-using namespace ArduinoJson::Internals;
 
 JsonValue JsonObject::operator[](char const *key) {
-  JsonNode *node = getOrCreateValueAt(key);
-  return JsonValueInternal(node);
+  return JsonValue(_impl ? (*_impl)[key] : NULL);
 }
 
-void JsonObject::remove(char const *key) {
-  JsonNode *nodeToRemove = getPairAt(key);
-  if (nodeToRemove) removeChild(nodeToRemove);
+JsonArray JsonObject::createNestedArray(key_type key) {
+  return JsonArray(_impl ? _impl->createNestedArray(key) : NULL);
 }
 
-JsonArray JsonObject::createNestedArray(char const *key) {
-  JsonNode *node = getOrCreateValueAt(key);
-
-  if (node) node->setAsArray(_node->getContainerBuffer());
-
-  return JsonArray(node);
-}
-
-JsonObject JsonObject::createNestedObject(char const *key) {
-  JsonNode *node = getOrCreateValueAt(key);
-
-  if (node) node->setAsObject(_node->getContainerBuffer());
-
-  return JsonObject(node);
-}
-
-JsonNode *JsonObject::getPairAt(const char *key) {
-  for (JsonNode *node = firstChild(); node; node = node->next) {
-    if (!strcmp(node->getAsObjectKey(), key)) return node;
-  }
-  return NULL;
-}
-
-JsonNode *JsonObject::getOrCreateValueAt(const char *key) {
-  JsonNode *existingNode = getPairAt(key);
-  if (existingNode) return existingNode->getAsObjectValue();
-
-  JsonNode *newValueNode = createNode();
-  if (!newValueNode) return 0;
-
-  JsonNode *newKeyNode = createNode();
-  if (!newKeyNode) return 0;
-
-  newKeyNode->setAsObjectKeyValue(key, newValueNode);
-
-  addChild(newKeyNode);
-
-  return newValueNode;
+JsonObject JsonObject::createNestedObject(key_type key) {
+  return JsonObject(_impl ? _impl->createNestedObject(key) : NULL);
 }
diff --git a/src/JsonValue.cpp b/src/JsonValue.cpp
index 07e17865..1e2123ec 100644
--- a/src/JsonValue.cpp
+++ b/src/JsonValue.cpp
@@ -7,9 +7,22 @@
 #include "ArduinoJson/JsonValue.hpp"
 
 #include "ArduinoJson/JsonArray.hpp"
+#include "ArduinoJson/JsonObject.hpp"
 
 using namespace ArduinoJson;
 
 JsonValue::operator JsonArray() const {
   return _impl ? JsonArray(*_impl) : JsonArray();
 }
+
+JsonValue::operator JsonObject() const {
+  return _impl ? JsonObject(*_impl) : JsonObject();
+}
+
+void JsonValue::operator=(JsonArray array) {
+  if (_impl) _impl->set(array._impl);
+}
+
+void JsonValue::operator=(JsonObject object) {
+  if (_impl) _impl->set(object._impl);
+}
\ No newline at end of file