diff --git a/ejson/internal/Array.cpp b/ejson/internal/Array.cpp
index 25df22e..82cb6e8 100644
--- a/ejson/internal/Array.cpp
+++ b/ejson/internal/Array.cpp
@@ -15,7 +15,7 @@
 #include <ejson/debug.hpp>
 
 ememory::SharedPtr<ejson::internal::Array> ejson::internal::Array::create() {
-	return ememory::SharedPtr<ejson::internal::Array>(new ejson::internal::Array());
+	return ememory::SharedPtr<ejson::internal::Array>(ETK_NEW(ejson::internal::Array));
 }
 
 void ejson::internal::Array::clear() {
diff --git a/ejson/internal/Boolean.cpp b/ejson/internal/Boolean.cpp
index e7deedb..9c46a73 100644
--- a/ejson/internal/Boolean.cpp
+++ b/ejson/internal/Boolean.cpp
@@ -9,7 +9,7 @@
 #include <ejson/internal/Document.hpp>
 
 ememory::SharedPtr<ejson::internal::Boolean> ejson::internal::Boolean::create(bool _value) {
-	return ememory::SharedPtr<ejson::internal::Boolean>(new ejson::internal::Boolean(_value));
+	return ememory::SharedPtr<ejson::internal::Boolean>(ETK_NEW(ejson::internal::Boolean, _value));
 }
 
 ejson::internal::Boolean::Boolean(bool _value) :
diff --git a/ejson/internal/Document.cpp b/ejson/internal/Document.cpp
index 1b6b2c4..6f3f9a3 100644
--- a/ejson/internal/Document.cpp
+++ b/ejson/internal/Document.cpp
@@ -16,7 +16,7 @@
 #include <ejson/internal/Boolean.hpp>
 
 ememory::SharedPtr<ejson::internal::Document> ejson::internal::Document::create() {
-	return ememory::SharedPtr<ejson::internal::Document>(new ejson::internal::Document());
+	return ememory::SharedPtr<ejson::internal::Document>(ETK_NEW(ejson::internal::Document));
 }
 
 ejson::internal::Document::Document() :
diff --git a/ejson/internal/Null.cpp b/ejson/internal/Null.cpp
index d431bfe..aac7ef6 100644
--- a/ejson/internal/Null.cpp
+++ b/ejson/internal/Null.cpp
@@ -9,7 +9,7 @@
 #include <ejson/internal/Document.hpp>
 
 ememory::SharedPtr<ejson::internal::Null> ejson::internal::Null::create() {
-	return ememory::SharedPtr<ejson::internal::Null>(new ejson::internal::Null());
+	return ememory::SharedPtr<ejson::internal::Null>(ETK_NEW(ejson::internal::Null));
 }
 
 ejson::internal::Null::Null() {
diff --git a/ejson/internal/Number.cpp b/ejson/internal/Number.cpp
index 698ad89..08a365b 100644
--- a/ejson/internal/Number.cpp
+++ b/ejson/internal/Number.cpp
@@ -10,13 +10,13 @@
 #include <ejson/internal/Document.hpp>
 
 ememory::SharedPtr<ejson::internal::Number> ejson::internal::Number::create(double _value) {
-	return ememory::SharedPtr<ejson::internal::Number>(new ejson::internal::Number(_value));
+	return ememory::SharedPtr<ejson::internal::Number>(ETK_NEW(ejson::internal::Number, _value));
 }
 ememory::SharedPtr<ejson::internal::Number> ejson::internal::Number::create(uint64_t _value) {
-	return ememory::SharedPtr<ejson::internal::Number>(new ejson::internal::Number(_value));
+	return ememory::SharedPtr<ejson::internal::Number>(ETK_NEW(ejson::internal::Number, _value));
 }
 ememory::SharedPtr<ejson::internal::Number> ejson::internal::Number::create(int64_t _value) {
-	return ememory::SharedPtr<ejson::internal::Number>(new ejson::internal::Number(_value));
+	return ememory::SharedPtr<ejson::internal::Number>(ETK_NEW(ejson::internal::Number, _value));
 }
 
 ejson::internal::Number::Number(double _value) :
diff --git a/ejson/internal/Object.cpp b/ejson/internal/Object.cpp
index 110464f..7a58098 100644
--- a/ejson/internal/Object.cpp
+++ b/ejson/internal/Object.cpp
@@ -16,7 +16,7 @@
 
 
 ememory::SharedPtr<ejson::internal::Object> ejson::internal::Object::create() {
-	return ememory::SharedPtr<ejson::internal::Object>(new ejson::internal::Object());
+	return ememory::SharedPtr<ejson::internal::Object>(ETK_NEW(ejson::internal::Object));
 }
 ememory::SharedPtr<ejson::internal::Object> ejson::internal::Object::create(const etk::String& _data) {
 	ejson::internal::Document doc;
diff --git a/ejson/internal/String.cpp b/ejson/internal/String.cpp
index 7122cc6..60acad4 100644
--- a/ejson/internal/String.cpp
+++ b/ejson/internal/String.cpp
@@ -12,7 +12,7 @@
 #include <ejson/debug.hpp>
 
 ememory::SharedPtr<ejson::internal::String> ejson::internal::String::create(const etk::String& _value) {
-	return ememory::SharedPtr<ejson::internal::String>(new ejson::internal::String(_value));
+	return ememory::SharedPtr<ejson::internal::String>(ETK_NEW(ejson::internal::String, _value));
 }
 
 ejson::internal::String::String(const etk::String& _value) :