See detailled log

- Builds on windows again
- All HTTP requests are no passed into interpreter
- New response element to reply with data
- Moved basichttp URL
- New HTTP servlet invoker to register additional URLs
- More bugfixes than I care to mention

40 files changed, 2343 insertions, 2263 deletions

diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.cpp
index bee6042..d16f81b 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.cpp
@@ -5,59 +5,59 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8Attr::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8Attr::Tmpl;
 
 
-v8::Handle<v8::Value> V8Attr::nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8AttrPrivate* privData = V8DOM::toClassPtr<V8AttrPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Attr::nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8AttrPrivate* privData = V8DOM::toClassPtr<V8AttrPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getName().c_str());
-}
+    return v8::String::New(privData->nativeObj->getName().c_str());
+  }
 
-v8::Handle<v8::Value> V8Attr::specifiedAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8AttrPrivate* privData = V8DOM::toClassPtr<V8AttrPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Attr::specifiedAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8AttrPrivate* privData = V8DOM::toClassPtr<V8AttrPrivate >(self->GetInternalField(0));
 
-	return v8::Boolean::New(privData->nativeObj->getSpecified());
-}
+    return v8::Boolean::New(privData->nativeObj->getSpecified());
+  }
 
-v8::Handle<v8::Value> V8Attr::valueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8AttrPrivate* privData = V8DOM::toClassPtr<V8AttrPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Attr::valueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8AttrPrivate* privData = V8DOM::toClassPtr<V8AttrPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getValue().c_str());
-}
+    return v8::String::New(privData->nativeObj->getValue().c_str());
+  }
 
-void V8Attr::valueAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8AttrPrivate* privData = V8DOM::toClassPtr<V8AttrPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localValue(value);
-	privData->nativeObj->setValue(*localValue);
-}
+  void V8Attr::valueAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8AttrPrivate* privData = V8DOM::toClassPtr<V8AttrPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localValue(value);
+    privData->nativeObj->setValue(*localValue);
+  }
 
-v8::Handle<v8::Value> V8Attr::ownerElementAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8AttrPrivate* privData = V8DOM::toClassPtr<V8AttrPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Attr::ownerElementAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8AttrPrivate* privData = V8DOM::toClassPtr<V8AttrPrivate >(self->GetInternalField(0));
 
-	if (!privData->nativeObj->getOwnerElement()) return v8::Undefined();
-	Arabica::DOM::Element<std::string>* arbaicaRet = new Arabica::DOM::Element<std::string>(privData->nativeObj->getOwnerElement());
+    if (!privData->nativeObj->getOwnerElement()) return v8::Undefined();
+    Arabica::DOM::Element<std::string>* arbaicaRet = new Arabica::DOM::Element<std::string>(privData->nativeObj->getOwnerElement());
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8Element::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+    v8::Handle<v8::Function> arbaicaRetCtor = V8Element::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-	struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+    struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8Element::jsDestructor);
+    return arbaicaRetObj;
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8Element::jsDestructor);
-	return arbaicaRetObj;
+  }
+  bool V8Attr::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-bool V8Attr::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
-
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.h
index e290415..e317698 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.h
@@ -21,8 +21,10 @@
 #ifndef V8Attr_h
 #define V8Attr_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Node.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,48 +33,50 @@ namespace DOM {
 
 class V8Attr {
 public:
-	struct V8AttrPrivate {
-		V8DOM* dom;
-		Arabica::DOM::Attr<std::string>* nativeObj;
-	};
-
-	V8_DESTRUCTOR(V8AttrPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-
-	static v8::Handle<v8::Value> nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> specifiedAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> valueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static void valueAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> ownerElementAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("Attr"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("name"), V8Attr::nameAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("specified"), V8Attr::specifiedAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("value"), V8Attr::valueAttrGetter, V8Attr::valueAttrSetter,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("ownerElement"), V8Attr::ownerElementAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-
-
-			tmpl->Inherit(V8Node::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8AttrPrivate {
+      V8DOM* dom;
+      Arabica::DOM::Attr<std::string>* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8AttrPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+
+    static v8::Handle<v8::Value> nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> specifiedAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> valueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static void valueAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> ownerElementAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("Attr"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("name"), V8Attr::nameAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("specified"), V8Attr::specifiedAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("value"), V8Attr::valueAttrGetter, V8Attr::valueAttrSetter,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("ownerElement"), V8Attr::ownerElementAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+
+
+            tmpl->Inherit(V8Node::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CDATASection.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CDATASection.cpp
index a9e5ac9..90495f4 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CDATASection.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CDATASection.cpp
@@ -4,11 +4,11 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8CDATASection::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8CDATASection::Tmpl;
 
-bool V8CDATASection::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8CDATASection::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CDATASection.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CDATASection.h
index a0b5ced..f9767a0 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CDATASection.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CDATASection.h
@@ -21,8 +21,10 @@
 #ifndef V8CDATASection_h
 #define V8CDATASection_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Text.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,35 +33,37 @@ namespace DOM {
 
 class V8CDATASection {
 public:
-	struct V8CDATASectionPrivate {
-		V8DOM* dom;
-		Arabica::DOM::CDATASection<std::string>* nativeObj;
-	};
+    struct V8CDATASectionPrivate {
+      V8DOM* dom;
+      Arabica::DOM::CDATASection<std::string>* nativeObj;
+    };
 
-	V8_DESTRUCTOR(V8CDATASectionPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
+    V8_DESTRUCTOR(V8CDATASectionPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
 
 
 
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("CDATASection"));
-			tmpl->ReadOnlyPrototype();
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("CDATASection"));
+            tmpl->ReadOnlyPrototype();
 
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
 
 
 
 
-			tmpl->Inherit(V8Text::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+            tmpl->Inherit(V8Text::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CharacterData.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CharacterData.cpp
index 459cf96..74c80ea 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CharacterData.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CharacterData.cpp
@@ -4,102 +4,102 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8CharacterData::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8CharacterData::Tmpl;
 
 
-v8::Handle<v8::Value> V8CharacterData::dataAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8CharacterData::dataAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getData().c_str());
-}
+    return v8::String::New(privData->nativeObj->getData().c_str());
+  }
 
-void V8CharacterData::dataAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localData(value);
-	privData->nativeObj->setData(*localData);
-}
+  void V8CharacterData::dataAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localData(value);
+    privData->nativeObj->setData(*localData);
+  }
 
-v8::Handle<v8::Value> V8CharacterData::lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8CharacterData::lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
 
-	return v8::Integer::New(privData->nativeObj->getLength());
-}
-v8::Handle<v8::Value> V8CharacterData::substringDataCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in substringData");
+    return v8::Integer::New(privData->nativeObj->getLength());
+  }
+  v8::Handle<v8::Value> V8CharacterData::substringDataCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in substringData");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
-	unsigned long localOffset = args[0]->ToNumber()->Uint32Value();
-	unsigned long localCount = args[1]->ToNumber()->Uint32Value();
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
+    unsigned long localOffset = args[0]->ToNumber()->Uint32Value();
+    unsigned long localCount = args[1]->ToNumber()->Uint32Value();
 
-	std::string retVal = privData->nativeObj->substringData(localOffset, localCount);
+    std::string retVal = privData->nativeObj->substringData(localOffset, localCount);
 
-	return v8::String::New(retVal.c_str());
-}
+    return v8::String::New(retVal.c_str());
+  }
 
-v8::Handle<v8::Value> V8CharacterData::appendDataCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in appendData");
+  v8::Handle<v8::Value> V8CharacterData::appendDataCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in appendData");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localArg(args[0]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localArg(args[0]);
 
-	privData->nativeObj->appendData(*localArg);
+    privData->nativeObj->appendData(*localArg);
 
-	return v8::Undefined();
-}
+    return v8::Undefined();
+  }
 
-v8::Handle<v8::Value> V8CharacterData::insertDataCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in insertData");
+  v8::Handle<v8::Value> V8CharacterData::insertDataCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in insertData");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
-	unsigned long localOffset = args[0]->ToNumber()->Uint32Value();
-	v8::String::AsciiValue localArg(args[1]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
+    unsigned long localOffset = args[0]->ToNumber()->Uint32Value();
+    v8::String::AsciiValue localArg(args[1]);
 
-	privData->nativeObj->insertData(localOffset, *localArg);
+    privData->nativeObj->insertData(localOffset, *localArg);
 
-	return v8::Undefined();
-}
+    return v8::Undefined();
+  }
 
-v8::Handle<v8::Value> V8CharacterData::deleteDataCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in deleteData");
+  v8::Handle<v8::Value> V8CharacterData::deleteDataCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in deleteData");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
-	unsigned long localOffset = args[0]->ToNumber()->Uint32Value();
-	unsigned long localCount = args[1]->ToNumber()->Uint32Value();
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
+    unsigned long localOffset = args[0]->ToNumber()->Uint32Value();
+    unsigned long localCount = args[1]->ToNumber()->Uint32Value();
 
-	privData->nativeObj->deleteData(localOffset, localCount);
+    privData->nativeObj->deleteData(localOffset, localCount);
 
-	return v8::Undefined();
-}
+    return v8::Undefined();
+  }
 
-v8::Handle<v8::Value> V8CharacterData::replaceDataCallback(const v8::Arguments& args) {
-	if (args.Length() < 3)
-		throw V8Exception("Wrong number of arguments in replaceData");
+  v8::Handle<v8::Value> V8CharacterData::replaceDataCallback(const v8::Arguments& args) {
+    if (args.Length() < 3)
+        throw V8Exception("Wrong number of arguments in replaceData");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
-	unsigned long localOffset = args[0]->ToNumber()->Uint32Value();
-	unsigned long localCount = args[1]->ToNumber()->Uint32Value();
-	v8::String::AsciiValue localArg(args[2]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8CharacterDataPrivate* privData = V8DOM::toClassPtr<V8CharacterDataPrivate >(self->GetInternalField(0));
+    unsigned long localOffset = args[0]->ToNumber()->Uint32Value();
+    unsigned long localCount = args[1]->ToNumber()->Uint32Value();
+    v8::String::AsciiValue localArg(args[2]);
 
-	privData->nativeObj->replaceData(localOffset, localCount, *localArg);
+    privData->nativeObj->replaceData(localOffset, localCount, *localArg);
 
-	return v8::Undefined();
-}
+    return v8::Undefined();
+  }
 
-bool V8CharacterData::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8CharacterData::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CharacterData.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CharacterData.h
index a86519b..fe93896 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CharacterData.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CharacterData.h
@@ -21,8 +21,10 @@
 #ifndef V8CharacterData_h
 #define V8CharacterData_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Node.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,57 +33,59 @@ namespace DOM {
 
 class V8CharacterData {
 public:
-	struct V8CharacterDataPrivate {
-		V8DOM* dom;
-		Arabica::DOM::CharacterData<std::string>* nativeObj;
-	};
-
-	V8_DESTRUCTOR(V8CharacterDataPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-	static v8::Handle<v8::Value> substringDataCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> appendDataCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> insertDataCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> deleteDataCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> replaceDataCallback(const v8::Arguments&);
-
-	static v8::Handle<v8::Value> dataAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static void dataAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("CharacterData"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("data"), V8CharacterData::dataAttrGetter, V8CharacterData::dataAttrSetter,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("length"), V8CharacterData::lengthAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-			prototype->Set(v8::String::NewSymbol("substringData"),
-			               v8::FunctionTemplate::New(V8CharacterData::substringDataCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("appendData"),
-			               v8::FunctionTemplate::New(V8CharacterData::appendDataCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("insertData"),
-			               v8::FunctionTemplate::New(V8CharacterData::insertDataCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("deleteData"),
-			               v8::FunctionTemplate::New(V8CharacterData::deleteDataCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("replaceData"),
-			               v8::FunctionTemplate::New(V8CharacterData::replaceDataCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-
-
-			tmpl->Inherit(V8Node::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8CharacterDataPrivate {
+      V8DOM* dom;
+      Arabica::DOM::CharacterData<std::string>* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8CharacterDataPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+    static v8::Handle<v8::Value> substringDataCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> appendDataCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> insertDataCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> deleteDataCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> replaceDataCallback(const v8::Arguments&);
+
+    static v8::Handle<v8::Value> dataAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static void dataAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("CharacterData"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("data"), V8CharacterData::dataAttrGetter, V8CharacterData::dataAttrSetter,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("length"), V8CharacterData::lengthAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+            prototype->Set(v8::String::NewSymbol("substringData"),
+                           v8::FunctionTemplate::New(V8CharacterData::substringDataCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("appendData"),
+                           v8::FunctionTemplate::New(V8CharacterData::appendDataCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("insertData"),
+                           v8::FunctionTemplate::New(V8CharacterData::insertDataCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("deleteData"),
+                           v8::FunctionTemplate::New(V8CharacterData::deleteDataCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("replaceData"),
+                           v8::FunctionTemplate::New(V8CharacterData::replaceDataCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+
+
+            tmpl->Inherit(V8Node::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Comment.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Comment.cpp
index f754ea7..e470a70 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Comment.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Comment.cpp
@@ -4,11 +4,11 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8Comment::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8Comment::Tmpl;
 
-bool V8Comment::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8Comment::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Comment.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Comment.h
index b07bf19..c659150 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Comment.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Comment.h
@@ -21,8 +21,10 @@
 #ifndef V8Comment_h
 #define V8Comment_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8CharacterData.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,35 +33,37 @@ namespace DOM {
 
 class V8Comment {
 public:
-	struct V8CommentPrivate {
-		V8DOM* dom;
-		Arabica::DOM::Comment<std::string>* nativeObj;
-	};
+    struct V8CommentPrivate {
+      V8DOM* dom;
+      Arabica::DOM::Comment<std::string>* nativeObj;
+    };
 
-	V8_DESTRUCTOR(V8CommentPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
+    V8_DESTRUCTOR(V8CommentPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
 
 
 
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("Comment"));
-			tmpl->ReadOnlyPrototype();
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("Comment"));
+            tmpl->ReadOnlyPrototype();
 
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
 
 
 
 
-			tmpl->Inherit(V8CharacterData::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+            tmpl->Inherit(V8CharacterData::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOMImplementation.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOMImplementation.cpp
index f7a7575..0f81958 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOMImplementation.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOMImplementation.cpp
@@ -5,77 +5,77 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8DOMImplementation::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8DOMImplementation::Tmpl;
 
-v8::Handle<v8::Value> V8DOMImplementation::hasFeatureCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in hasFeature");
+  v8::Handle<v8::Value> V8DOMImplementation::hasFeatureCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in hasFeature");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DOMImplementationPrivate* privData = V8DOM::toClassPtr<V8DOMImplementationPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localFeature(args[0]);
-	v8::String::AsciiValue localVersion(args[1]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DOMImplementationPrivate* privData = V8DOM::toClassPtr<V8DOMImplementationPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localFeature(args[0]);
+    v8::String::AsciiValue localVersion(args[1]);
 
-	bool retVal = privData->nativeObj->hasFeature(*localFeature, *localVersion);
+    bool retVal = privData->nativeObj->hasFeature(*localFeature, *localVersion);
 
-	return v8::Boolean::New(retVal);
-}
+    return v8::Boolean::New(retVal);
+  }
 
-v8::Handle<v8::Value> V8DOMImplementation::createDocumentTypeCallback(const v8::Arguments& args) {
-	if (args.Length() < 3)
-		throw V8Exception("Wrong number of arguments in createDocumentType");
+  v8::Handle<v8::Value> V8DOMImplementation::createDocumentTypeCallback(const v8::Arguments& args) {
+    if (args.Length() < 3)
+        throw V8Exception("Wrong number of arguments in createDocumentType");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DOMImplementationPrivate* privData = V8DOM::toClassPtr<V8DOMImplementationPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localQualifiedName(args[0]);
-	v8::String::AsciiValue localPublicId(args[1]);
-	v8::String::AsciiValue localSystemId(args[2]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DOMImplementationPrivate* privData = V8DOM::toClassPtr<V8DOMImplementationPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localQualifiedName(args[0]);
+    v8::String::AsciiValue localPublicId(args[1]);
+    v8::String::AsciiValue localSystemId(args[2]);
 
-	Arabica::DOM::DocumentType<std::string>* retVal = new Arabica::DOM::DocumentType<std::string>(privData->nativeObj->createDocumentType(*localQualifiedName, *localPublicId, *localSystemId));
-	v8::Handle<v8::Function> retCtor = V8DocumentType::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::DocumentType<std::string>* retVal = new Arabica::DOM::DocumentType<std::string>(privData->nativeObj->createDocumentType(*localQualifiedName, *localPublicId, *localSystemId));
+    v8::Handle<v8::Function> retCtor = V8DocumentType::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8DocumentType::V8DocumentTypePrivate* retPrivData = new V8DocumentType::V8DocumentTypePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8DocumentType::V8DocumentTypePrivate* retPrivData = new V8DocumentType::V8DocumentTypePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8DocumentType::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8DocumentType::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8DOMImplementation::createDocumentCallback(const v8::Arguments& args) {
-	if (args.Length() < 3)
-		throw V8Exception("Wrong number of arguments in createDocument");
-	if (!(V8DocumentType::hasInstance(args[2])))
-		throw V8Exception("Parameter mismatch while calling createDocument");
+  v8::Handle<v8::Value> V8DOMImplementation::createDocumentCallback(const v8::Arguments& args) {
+    if (args.Length() < 3)
+        throw V8Exception("Wrong number of arguments in createDocument");
+    if (!(V8DocumentType::hasInstance(args[2])))
+      throw V8Exception("Parameter mismatch while calling createDocument");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DOMImplementationPrivate* privData = V8DOM::toClassPtr<V8DOMImplementationPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localQualifiedName(args[1]);
-	Arabica::DOM::DocumentType<std::string>* localDoctype = V8DOM::toClassPtr<V8DocumentType::V8DocumentTypePrivate >(args[2]->ToObject()->GetInternalField(0))->nativeObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DOMImplementationPrivate* privData = V8DOM::toClassPtr<V8DOMImplementationPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localQualifiedName(args[1]);
+    Arabica::DOM::DocumentType<std::string>* localDoctype = V8DOM::toClassPtr<V8DocumentType::V8DocumentTypePrivate >(args[2]->ToObject()->GetInternalField(0))->nativeObj;
 
-	Arabica::DOM::Document<std::string>* retVal = new Arabica::DOM::Document<std::string>(privData->nativeObj->createDocument(*localNamespaceURI, *localQualifiedName, *localDoctype));
-	v8::Handle<v8::Function> retCtor = V8Document::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Document<std::string>* retVal = new Arabica::DOM::Document<std::string>(privData->nativeObj->createDocument(*localNamespaceURI, *localQualifiedName, *localDoctype));
+    v8::Handle<v8::Function> retCtor = V8Document::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Document::V8DocumentPrivate* retPrivData = new V8Document::V8DocumentPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Document::V8DocumentPrivate* retPrivData = new V8Document::V8DocumentPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Document::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Document::jsDestructor);
+    return retObj;
 
-}
+  }
 
-bool V8DOMImplementation::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8DOMImplementation::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOMImplementation.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOMImplementation.h
index 5a4c9d3..6fb8c7e 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOMImplementation.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOMImplementation.h
@@ -21,7 +21,9 @@
 #ifndef V8DOMImplementation_h
 #define V8DOMImplementation_h
 
+#include <string>
 #include "DOM/Node.hpp"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -30,43 +32,45 @@ namespace DOM {
 
 class V8DOMImplementation {
 public:
-	struct V8DOMImplementationPrivate {
-		V8DOM* dom;
-		Arabica::DOM::DOMImplementation<std::string>* nativeObj;
-	};
+    struct V8DOMImplementationPrivate {
+      V8DOM* dom;
+      Arabica::DOM::DOMImplementation<std::string>* nativeObj;
+    };
 
-	V8_DESTRUCTOR(V8DOMImplementationPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
+    V8_DESTRUCTOR(V8DOMImplementationPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
 
-	static v8::Handle<v8::Value> hasFeatureCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createDocumentTypeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createDocumentCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> hasFeatureCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createDocumentTypeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createDocumentCallback(const v8::Arguments&);
 
 
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("DOMImplementation"));
-			tmpl->ReadOnlyPrototype();
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("DOMImplementation"));
+            tmpl->ReadOnlyPrototype();
 
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
 
 
-			prototype->Set(v8::String::NewSymbol("hasFeature"),
-			               v8::FunctionTemplate::New(V8DOMImplementation::hasFeatureCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createDocumentType"),
-			               v8::FunctionTemplate::New(V8DOMImplementation::createDocumentTypeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createDocument"),
-			               v8::FunctionTemplate::New(V8DOMImplementation::createDocumentCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("hasFeature"),
+                           v8::FunctionTemplate::New(V8DOMImplementation::hasFeatureCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createDocumentType"),
+                           v8::FunctionTemplate::New(V8DOMImplementation::createDocumentTypeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createDocument"),
+                           v8::FunctionTemplate::New(V8DOMImplementation::createDocumentCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
 
 
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Document.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Document.cpp
index 06191ea..d9d123a 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Document.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Document.cpp
@@ -15,397 +15,397 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8Document::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8Document::Tmpl;
 
 
-v8::Handle<v8::Value> V8Document::doctypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Document::doctypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
 
-	if (!privData->nativeObj->getDoctype()) return v8::Undefined();
-	Arabica::DOM::DocumentType<std::string>* arbaicaRet = new Arabica::DOM::DocumentType<std::string>(privData->nativeObj->getDoctype());
+    if (!privData->nativeObj->getDoctype()) return v8::Undefined();
+    Arabica::DOM::DocumentType<std::string>* arbaicaRet = new Arabica::DOM::DocumentType<std::string>(privData->nativeObj->getDoctype());
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8DocumentType::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+    v8::Handle<v8::Function> arbaicaRetCtor = V8DocumentType::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-	struct V8DocumentType::V8DocumentTypePrivate* retPrivData = new V8DocumentType::V8DocumentTypePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+    struct V8DocumentType::V8DocumentTypePrivate* retPrivData = new V8DocumentType::V8DocumentTypePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8DocumentType::jsDestructor);
+    return arbaicaRetObj;
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8DocumentType::jsDestructor);
-	return arbaicaRetObj;
+  }
 
-}
+  v8::Handle<v8::Value> V8Document::implementationAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
 
-v8::Handle<v8::Value> V8Document::implementationAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    if (!privData->nativeObj->getImplementation()) return v8::Undefined();
+    Arabica::DOM::DOMImplementation<std::string>* arbaicaRet = new Arabica::DOM::DOMImplementation<std::string>(privData->nativeObj->getImplementation());
 
-	if (!privData->nativeObj->getImplementation()) return v8::Undefined();
-	Arabica::DOM::DOMImplementation<std::string>* arbaicaRet = new Arabica::DOM::DOMImplementation<std::string>(privData->nativeObj->getImplementation());
+    v8::Handle<v8::Function> arbaicaRetCtor = V8DOMImplementation::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8DOMImplementation::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+    struct V8DOMImplementation::V8DOMImplementationPrivate* retPrivData = new V8DOMImplementation::V8DOMImplementationPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8DOMImplementation::jsDestructor);
+    return arbaicaRetObj;
 
-	struct V8DOMImplementation::V8DOMImplementationPrivate* retPrivData = new V8DOMImplementation::V8DOMImplementationPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+  }
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8DOMImplementation::jsDestructor);
-	return arbaicaRetObj;
+  v8::Handle<v8::Value> V8Document::documentElementAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
 
-}
+    if (!privData->nativeObj->getDocumentElement()) return v8::Undefined();
+    Arabica::DOM::Element<std::string>* arbaicaRet = new Arabica::DOM::Element<std::string>(privData->nativeObj->getDocumentElement());
 
-v8::Handle<v8::Value> V8Document::documentElementAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::Handle<v8::Function> arbaicaRetCtor = V8Element::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-	if (!privData->nativeObj->getDocumentElement()) return v8::Undefined();
-	Arabica::DOM::Element<std::string>* arbaicaRet = new Arabica::DOM::Element<std::string>(privData->nativeObj->getDocumentElement());
+    struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8Element::jsDestructor);
+    return arbaicaRetObj;
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8Element::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+  }
+  v8::Handle<v8::Value> V8Document::createElementCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in createElement");
 
-	struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localTagName(args[0]);
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8Element::jsDestructor);
-	return arbaicaRetObj;
+    Arabica::DOM::Element<std::string>* retVal = new Arabica::DOM::Element<std::string>(privData->nativeObj->createElement(*localTagName));
+    v8::Handle<v8::Function> retCtor = V8Element::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-}
-v8::Handle<v8::Value> V8Document::createElementCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in createElement");
+    struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localTagName(args[0]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::Element<std::string>* retVal = new Arabica::DOM::Element<std::string>(privData->nativeObj->createElement(*localTagName));
-	v8::Handle<v8::Function> retCtor = V8Element::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8Element::jsDestructor);
+    return retObj;
 
-	struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::createDocumentFragmentCallback(const v8::Arguments& args) {
 
-	retObj.MakeWeak(0, V8Element::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
 
-}
+    Arabica::DOM::DocumentFragment<std::string>* retVal = new Arabica::DOM::DocumentFragment<std::string>(privData->nativeObj->createDocumentFragment());
+    v8::Handle<v8::Function> retCtor = V8DocumentFragment::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::createDocumentFragmentCallback(const v8::Arguments& args) {
+    struct V8DocumentFragment::V8DocumentFragmentPrivate* retPrivData = new V8DocumentFragment::V8DocumentFragmentPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::DocumentFragment<std::string>* retVal = new Arabica::DOM::DocumentFragment<std::string>(privData->nativeObj->createDocumentFragment());
-	v8::Handle<v8::Function> retCtor = V8DocumentFragment::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8DocumentFragment::jsDestructor);
+    return retObj;
 
-	struct V8DocumentFragment::V8DocumentFragmentPrivate* retPrivData = new V8DocumentFragment::V8DocumentFragmentPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::createTextNodeCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in createTextNode");
 
-	retObj.MakeWeak(0, V8DocumentFragment::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localData(args[0]);
 
-}
+    Arabica::DOM::Text<std::string>* retVal = new Arabica::DOM::Text<std::string>(privData->nativeObj->createTextNode(*localData));
+    v8::Handle<v8::Function> retCtor = V8Text::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::createTextNodeCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in createTextNode");
+    struct V8Text::V8TextPrivate* retPrivData = new V8Text::V8TextPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localData(args[0]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::Text<std::string>* retVal = new Arabica::DOM::Text<std::string>(privData->nativeObj->createTextNode(*localData));
-	v8::Handle<v8::Function> retCtor = V8Text::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8Text::jsDestructor);
+    return retObj;
 
-	struct V8Text::V8TextPrivate* retPrivData = new V8Text::V8TextPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::createCommentCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in createComment");
 
-	retObj.MakeWeak(0, V8Text::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localData(args[0]);
 
-}
+    Arabica::DOM::Comment<std::string>* retVal = new Arabica::DOM::Comment<std::string>(privData->nativeObj->createComment(*localData));
+    v8::Handle<v8::Function> retCtor = V8Comment::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::createCommentCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in createComment");
+    struct V8Comment::V8CommentPrivate* retPrivData = new V8Comment::V8CommentPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localData(args[0]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::Comment<std::string>* retVal = new Arabica::DOM::Comment<std::string>(privData->nativeObj->createComment(*localData));
-	v8::Handle<v8::Function> retCtor = V8Comment::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8Comment::jsDestructor);
+    return retObj;
 
-	struct V8Comment::V8CommentPrivate* retPrivData = new V8Comment::V8CommentPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::createCDATASectionCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in createCDATASection");
 
-	retObj.MakeWeak(0, V8Comment::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localData(args[0]);
 
-}
+    Arabica::DOM::CDATASection<std::string>* retVal = new Arabica::DOM::CDATASection<std::string>(privData->nativeObj->createCDATASection(*localData));
+    v8::Handle<v8::Function> retCtor = V8CDATASection::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::createCDATASectionCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in createCDATASection");
+    struct V8CDATASection::V8CDATASectionPrivate* retPrivData = new V8CDATASection::V8CDATASectionPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localData(args[0]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::CDATASection<std::string>* retVal = new Arabica::DOM::CDATASection<std::string>(privData->nativeObj->createCDATASection(*localData));
-	v8::Handle<v8::Function> retCtor = V8CDATASection::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8CDATASection::jsDestructor);
+    return retObj;
 
-	struct V8CDATASection::V8CDATASectionPrivate* retPrivData = new V8CDATASection::V8CDATASectionPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::createProcessingInstructionCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in createProcessingInstruction");
 
-	retObj.MakeWeak(0, V8CDATASection::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localTarget(args[0]);
+    v8::String::AsciiValue localData(args[1]);
 
-}
+    Arabica::DOM::ProcessingInstruction<std::string>* retVal = new Arabica::DOM::ProcessingInstruction<std::string>(privData->nativeObj->createProcessingInstruction(*localTarget, *localData));
+    v8::Handle<v8::Function> retCtor = V8ProcessingInstruction::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::createProcessingInstructionCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in createProcessingInstruction");
+    struct V8ProcessingInstruction::V8ProcessingInstructionPrivate* retPrivData = new V8ProcessingInstruction::V8ProcessingInstructionPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localTarget(args[0]);
-	v8::String::AsciiValue localData(args[1]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::ProcessingInstruction<std::string>* retVal = new Arabica::DOM::ProcessingInstruction<std::string>(privData->nativeObj->createProcessingInstruction(*localTarget, *localData));
-	v8::Handle<v8::Function> retCtor = V8ProcessingInstruction::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8ProcessingInstruction::jsDestructor);
+    return retObj;
 
-	struct V8ProcessingInstruction::V8ProcessingInstructionPrivate* retPrivData = new V8ProcessingInstruction::V8ProcessingInstructionPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::createAttributeCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in createAttribute");
 
-	retObj.MakeWeak(0, V8ProcessingInstruction::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localName(args[0]);
 
-}
+    Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->createAttribute(*localName));
+    v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::createAttributeCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in createAttribute");
+    struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localName(args[0]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->createAttribute(*localName));
-	v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8Attr::jsDestructor);
+    return retObj;
 
-	struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::createEntityReferenceCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in createEntityReference");
 
-	retObj.MakeWeak(0, V8Attr::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localName(args[0]);
 
-}
+    Arabica::DOM::EntityReference<std::string>* retVal = new Arabica::DOM::EntityReference<std::string>(privData->nativeObj->createEntityReference(*localName));
+    v8::Handle<v8::Function> retCtor = V8EntityReference::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::createEntityReferenceCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in createEntityReference");
+    struct V8EntityReference::V8EntityReferencePrivate* retPrivData = new V8EntityReference::V8EntityReferencePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localName(args[0]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::EntityReference<std::string>* retVal = new Arabica::DOM::EntityReference<std::string>(privData->nativeObj->createEntityReference(*localName));
-	v8::Handle<v8::Function> retCtor = V8EntityReference::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8EntityReference::jsDestructor);
+    return retObj;
 
-	struct V8EntityReference::V8EntityReferencePrivate* retPrivData = new V8EntityReference::V8EntityReferencePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::getElementsByTagNameCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in getElementsByTagName");
 
-	retObj.MakeWeak(0, V8EntityReference::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localTagname(args[0]);
 
-}
+    Arabica::DOM::NodeList<std::string>* retVal = new Arabica::DOM::NodeList<std::string>(privData->nativeObj->getElementsByTagName(*localTagname));
+    v8::Handle<v8::Function> retCtor = V8NodeList::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::getElementsByTagNameCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in getElementsByTagName");
+    struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localTagname(args[0]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::NodeList<std::string>* retVal = new Arabica::DOM::NodeList<std::string>(privData->nativeObj->getElementsByTagName(*localTagname));
-	v8::Handle<v8::Function> retCtor = V8NodeList::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8NodeList::jsDestructor);
+    return retObj;
 
-	struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::importNodeCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in importNode");
+    if (!(V8Node::hasInstance(args[0])))
+      throw V8Exception("Parameter mismatch while calling importNode");
 
-	retObj.MakeWeak(0, V8NodeList::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    Arabica::DOM::Node<std::string>* localImportedNode = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
+    bool localDeep = args[1]->ToBoolean()->BooleanValue();
 
-}
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->importNode(*localImportedNode, localDeep));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::importNodeCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in importNode");
-	if (!(V8Node::hasInstance(args[0])))
-		throw V8Exception("Parameter mismatch while calling importNode");
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	Arabica::DOM::Node<std::string>* localImportedNode = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
-	bool localDeep = args[1]->ToBoolean()->BooleanValue();
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->importNode(*localImportedNode, localDeep));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::createElementNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in createElementNS");
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localQualifiedName(args[1]);
 
-}
+    Arabica::DOM::Element<std::string>* retVal = new Arabica::DOM::Element<std::string>(privData->nativeObj->createElementNS(*localNamespaceURI, *localQualifiedName));
+    v8::Handle<v8::Function> retCtor = V8Element::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::createElementNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in createElementNS");
+    struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localQualifiedName(args[1]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::Element<std::string>* retVal = new Arabica::DOM::Element<std::string>(privData->nativeObj->createElementNS(*localNamespaceURI, *localQualifiedName));
-	v8::Handle<v8::Function> retCtor = V8Element::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8Element::jsDestructor);
+    return retObj;
 
-	struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::createAttributeNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in createAttributeNS");
 
-	retObj.MakeWeak(0, V8Element::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localQualifiedName(args[1]);
 
-}
+    Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->createAttributeNS(*localNamespaceURI, *localQualifiedName));
+    v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::createAttributeNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in createAttributeNS");
+    struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localQualifiedName(args[1]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->createAttributeNS(*localNamespaceURI, *localQualifiedName));
-	v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8Attr::jsDestructor);
+    return retObj;
 
-	struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::getElementsByTagNameNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in getElementsByTagNameNS");
 
-	retObj.MakeWeak(0, V8Attr::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localLocalName(args[1]);
 
-}
+    Arabica::DOM::NodeList<std::string>* retVal = new Arabica::DOM::NodeList<std::string>(privData->nativeObj->getElementsByTagNameNS(*localNamespaceURI, *localLocalName));
+    v8::Handle<v8::Function> retCtor = V8NodeList::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::getElementsByTagNameNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in getElementsByTagNameNS");
+    struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localLocalName(args[1]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::NodeList<std::string>* retVal = new Arabica::DOM::NodeList<std::string>(privData->nativeObj->getElementsByTagNameNS(*localNamespaceURI, *localLocalName));
-	v8::Handle<v8::Function> retCtor = V8NodeList::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8NodeList::jsDestructor);
+    return retObj;
 
-	struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Document::getElementByIdCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in getElementById");
 
-	retObj.MakeWeak(0, V8NodeList::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localElementId(args[0]);
 
-}
+    Arabica::DOM::Element<std::string>* retVal = new Arabica::DOM::Element<std::string>(privData->nativeObj->getElementById(*localElementId));
+    v8::Handle<v8::Function> retCtor = V8Element::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Document::getElementByIdCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in getElementById");
+    struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localElementId(args[0]);
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::Element<std::string>* retVal = new Arabica::DOM::Element<std::string>(privData->nativeObj->getElementById(*localElementId));
-	v8::Handle<v8::Function> retCtor = V8Element::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8Element::jsDestructor);
+    return retObj;
 
-	struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  bool V8Document::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-	retObj.MakeWeak(0, V8Element::jsDestructor);
-	return retObj;
-
-}
-
-bool V8Document::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
-
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Document.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Document.h
index da61876..c12e0dc 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Document.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Document.h
@@ -21,8 +21,10 @@
 #ifndef V8Document_h
 #define V8Document_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Node.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,89 +33,91 @@ namespace DOM {
 
 class V8Document {
 public:
-	struct V8DocumentPrivate {
-		V8DOM* dom;
-		Arabica::DOM::Document<std::string>* nativeObj;
-	};
-
-	V8_DESTRUCTOR(V8DocumentPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-	static v8::Handle<v8::Value> createElementCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createDocumentFragmentCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createTextNodeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createCommentCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createCDATASectionCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createProcessingInstructionCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createAttributeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createEntityReferenceCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> getElementsByTagNameCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> importNodeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createElementNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> createAttributeNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> getElementsByTagNameNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> getElementByIdCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> evaluateCustomCallback(const v8::Arguments&);
-
-	static v8::Handle<v8::Value> doctypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> implementationAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> documentElementAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("Document"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("doctype"), V8Document::doctypeAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("implementation"), V8Document::implementationAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("documentElement"), V8Document::documentElementAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-			prototype->Set(v8::String::NewSymbol("createElement"),
-			               v8::FunctionTemplate::New(V8Document::createElementCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createDocumentFragment"),
-			               v8::FunctionTemplate::New(V8Document::createDocumentFragmentCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createTextNode"),
-			               v8::FunctionTemplate::New(V8Document::createTextNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createComment"),
-			               v8::FunctionTemplate::New(V8Document::createCommentCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createCDATASection"),
-			               v8::FunctionTemplate::New(V8Document::createCDATASectionCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createProcessingInstruction"),
-			               v8::FunctionTemplate::New(V8Document::createProcessingInstructionCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createAttribute"),
-			               v8::FunctionTemplate::New(V8Document::createAttributeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createEntityReference"),
-			               v8::FunctionTemplate::New(V8Document::createEntityReferenceCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("getElementsByTagName"),
-			               v8::FunctionTemplate::New(V8Document::getElementsByTagNameCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("importNode"),
-			               v8::FunctionTemplate::New(V8Document::importNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createElementNS"),
-			               v8::FunctionTemplate::New(V8Document::createElementNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("createAttributeNS"),
-			               v8::FunctionTemplate::New(V8Document::createAttributeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("getElementsByTagNameNS"),
-			               v8::FunctionTemplate::New(V8Document::getElementsByTagNameNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("getElementById"),
-			               v8::FunctionTemplate::New(V8Document::getElementByIdCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("evaluate"),
-			               v8::FunctionTemplate::New(V8Document::evaluateCustomCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-
-
-			tmpl->Inherit(V8Node::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8DocumentPrivate {
+      V8DOM* dom;
+      Arabica::DOM::Document<std::string>* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8DocumentPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+    static v8::Handle<v8::Value> createElementCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createDocumentFragmentCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createTextNodeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createCommentCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createCDATASectionCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createProcessingInstructionCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createAttributeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createEntityReferenceCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> getElementsByTagNameCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> importNodeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createElementNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> createAttributeNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> getElementsByTagNameNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> getElementByIdCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> evaluateCustomCallback(const v8::Arguments&);
+
+    static v8::Handle<v8::Value> doctypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> implementationAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> documentElementAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("Document"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("doctype"), V8Document::doctypeAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("implementation"), V8Document::implementationAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("documentElement"), V8Document::documentElementAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+            prototype->Set(v8::String::NewSymbol("createElement"),
+                           v8::FunctionTemplate::New(V8Document::createElementCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createDocumentFragment"),
+                           v8::FunctionTemplate::New(V8Document::createDocumentFragmentCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createTextNode"),
+                           v8::FunctionTemplate::New(V8Document::createTextNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createComment"),
+                           v8::FunctionTemplate::New(V8Document::createCommentCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createCDATASection"),
+                           v8::FunctionTemplate::New(V8Document::createCDATASectionCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createProcessingInstruction"),
+                           v8::FunctionTemplate::New(V8Document::createProcessingInstructionCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createAttribute"),
+                           v8::FunctionTemplate::New(V8Document::createAttributeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createEntityReference"),
+                           v8::FunctionTemplate::New(V8Document::createEntityReferenceCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("getElementsByTagName"),
+                           v8::FunctionTemplate::New(V8Document::getElementsByTagNameCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("importNode"),
+                           v8::FunctionTemplate::New(V8Document::importNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createElementNS"),
+                           v8::FunctionTemplate::New(V8Document::createElementNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("createAttributeNS"),
+                           v8::FunctionTemplate::New(V8Document::createAttributeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("getElementsByTagNameNS"),
+                           v8::FunctionTemplate::New(V8Document::getElementsByTagNameNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("getElementById"),
+                           v8::FunctionTemplate::New(V8Document::getElementByIdCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("evaluate"),
+                           v8::FunctionTemplate::New(V8Document::evaluateCustomCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+
+
+            tmpl->Inherit(V8Node::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentFragment.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentFragment.cpp
index 1403574..e6bec84 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentFragment.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentFragment.cpp
@@ -4,11 +4,11 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8DocumentFragment::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8DocumentFragment::Tmpl;
 
-bool V8DocumentFragment::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8DocumentFragment::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentFragment.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentFragment.h
index 62dc58d..cf7f6ba 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentFragment.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentFragment.h
@@ -21,8 +21,10 @@
 #ifndef V8DocumentFragment_h
 #define V8DocumentFragment_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Node.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,35 +33,37 @@ namespace DOM {
 
 class V8DocumentFragment {
 public:
-	struct V8DocumentFragmentPrivate {
-		V8DOM* dom;
-		Arabica::DOM::DocumentFragment<std::string>* nativeObj;
-	};
+    struct V8DocumentFragmentPrivate {
+      V8DOM* dom;
+      Arabica::DOM::DocumentFragment<std::string>* nativeObj;
+    };
 
-	V8_DESTRUCTOR(V8DocumentFragmentPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
+    V8_DESTRUCTOR(V8DocumentFragmentPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
 
 
 
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("DocumentFragment"));
-			tmpl->ReadOnlyPrototype();
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("DocumentFragment"));
+            tmpl->ReadOnlyPrototype();
 
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
 
 
 
 
-			tmpl->Inherit(V8Node::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+            tmpl->Inherit(V8Node::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentType.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentType.cpp
index 6b9a7b0..a2098f2 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentType.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentType.cpp
@@ -5,79 +5,79 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8DocumentType::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8DocumentType::Tmpl;
 
 
-v8::Handle<v8::Value> V8DocumentType::nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8DocumentType::nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getName().c_str());
-}
+    return v8::String::New(privData->nativeObj->getName().c_str());
+  }
 
-v8::Handle<v8::Value> V8DocumentType::entitiesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8DocumentType::entitiesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
 
+    
+    Arabica::DOM::NamedNodeMap<std::string>* arbaicaRet = new Arabica::DOM::NamedNodeMap<std::string>(privData->nativeObj->getEntities());
 
-	Arabica::DOM::NamedNodeMap<std::string>* arbaicaRet = new Arabica::DOM::NamedNodeMap<std::string>(privData->nativeObj->getEntities());
+    v8::Handle<v8::Function> arbaicaRetCtor = V8NamedNodeMap::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8NamedNodeMap::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+    struct V8NamedNodeMap::V8NamedNodeMapPrivate* retPrivData = new V8NamedNodeMap::V8NamedNodeMapPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8NamedNodeMap::jsDestructor);
+    return arbaicaRetObj;
 
-	struct V8NamedNodeMap::V8NamedNodeMapPrivate* retPrivData = new V8NamedNodeMap::V8NamedNodeMapPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+  }
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8NamedNodeMap::jsDestructor);
-	return arbaicaRetObj;
+  v8::Handle<v8::Value> V8DocumentType::notationsAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
 
-}
+    
+    Arabica::DOM::NamedNodeMap<std::string>* arbaicaRet = new Arabica::DOM::NamedNodeMap<std::string>(privData->nativeObj->getNotations());
 
-v8::Handle<v8::Value> V8DocumentType::notationsAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
+    v8::Handle<v8::Function> arbaicaRetCtor = V8NamedNodeMap::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
+    struct V8NamedNodeMap::V8NamedNodeMapPrivate* retPrivData = new V8NamedNodeMap::V8NamedNodeMapPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8NamedNodeMap::jsDestructor);
+    return arbaicaRetObj;
 
-	Arabica::DOM::NamedNodeMap<std::string>* arbaicaRet = new Arabica::DOM::NamedNodeMap<std::string>(privData->nativeObj->getNotations());
+  }
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8NamedNodeMap::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+  v8::Handle<v8::Value> V8DocumentType::publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
 
-	struct V8NamedNodeMap::V8NamedNodeMapPrivate* retPrivData = new V8NamedNodeMap::V8NamedNodeMapPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+    return v8::String::New(privData->nativeObj->getPublicId().c_str());
+  }
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8NamedNodeMap::jsDestructor);
-	return arbaicaRetObj;
+  v8::Handle<v8::Value> V8DocumentType::systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
 
-}
+    return v8::String::New(privData->nativeObj->getSystemId().c_str());
+  }
 
-v8::Handle<v8::Value> V8DocumentType::publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8DocumentType::internalSubsetAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getPublicId().c_str());
-}
+    return v8::String::New(privData->nativeObj->getInternalSubset().c_str());
+  }
+  bool V8DocumentType::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-v8::Handle<v8::Value> V8DocumentType::systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
-
-	return v8::String::New(privData->nativeObj->getSystemId().c_str());
-}
-
-v8::Handle<v8::Value> V8DocumentType::internalSubsetAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8DocumentTypePrivate* privData = V8DOM::toClassPtr<V8DocumentTypePrivate >(self->GetInternalField(0));
-
-	return v8::String::New(privData->nativeObj->getInternalSubset().c_str());
-}
-bool V8DocumentType::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
-
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentType.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentType.h
index f4d0c15..65ce30c 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentType.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentType.h
@@ -21,8 +21,10 @@
 #ifndef V8DocumentType_h
 #define V8DocumentType_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Node.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,53 +33,55 @@ namespace DOM {
 
 class V8DocumentType {
 public:
-	struct V8DocumentTypePrivate {
-		V8DOM* dom;
-		Arabica::DOM::DocumentType<std::string>* nativeObj;
-	};
-
-	V8_DESTRUCTOR(V8DocumentTypePrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-
-	static v8::Handle<v8::Value> nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> entitiesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> notationsAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> internalSubsetAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("DocumentType"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("name"), V8DocumentType::nameAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("entities"), V8DocumentType::entitiesAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("notations"), V8DocumentType::notationsAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("publicId"), V8DocumentType::publicIdAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("systemId"), V8DocumentType::systemIdAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("internalSubset"), V8DocumentType::internalSubsetAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-
-
-			tmpl->Inherit(V8Node::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8DocumentTypePrivate {
+      V8DOM* dom;
+      Arabica::DOM::DocumentType<std::string>* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8DocumentTypePrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+
+    static v8::Handle<v8::Value> nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> entitiesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> notationsAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> internalSubsetAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("DocumentType"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("name"), V8DocumentType::nameAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("entities"), V8DocumentType::entitiesAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("notations"), V8DocumentType::notationsAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("publicId"), V8DocumentType::publicIdAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("systemId"), V8DocumentType::systemIdAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("internalSubset"), V8DocumentType::internalSubsetAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+
+
+            tmpl->Inherit(V8Node::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Element.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Element.cpp
index 680dd5e..d476daa 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Element.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Element.cpp
@@ -6,297 +6,297 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8Element::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8Element::Tmpl;
 
 
-v8::Handle<v8::Value> V8Element::tagNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Element::tagNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getTagName().c_str());
-}
-v8::Handle<v8::Value> V8Element::getAttributeCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in getAttribute");
+    return v8::String::New(privData->nativeObj->getTagName().c_str());
+  }
+  v8::Handle<v8::Value> V8Element::getAttributeCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in getAttribute");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localName(args[0]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localName(args[0]);
 
-	std::string retVal = privData->nativeObj->getAttribute(*localName);
+    std::string retVal = privData->nativeObj->getAttribute(*localName);
 
-	return v8::String::New(retVal.c_str());
-}
+    return v8::String::New(retVal.c_str());
+  }
 
-v8::Handle<v8::Value> V8Element::setAttributeCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in setAttribute");
+  v8::Handle<v8::Value> V8Element::setAttributeCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in setAttribute");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localName(args[0]);
-	v8::String::AsciiValue localValue(args[1]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localName(args[0]);
+    v8::String::AsciiValue localValue(args[1]);
 
-	privData->nativeObj->setAttribute(*localName, *localValue);
+    privData->nativeObj->setAttribute(*localName, *localValue);
 
-	return v8::Undefined();
-}
+    return v8::Undefined();
+  }
 
-v8::Handle<v8::Value> V8Element::removeAttributeCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in removeAttribute");
+  v8::Handle<v8::Value> V8Element::removeAttributeCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in removeAttribute");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localName(args[0]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localName(args[0]);
 
-	privData->nativeObj->removeAttribute(*localName);
+    privData->nativeObj->removeAttribute(*localName);
 
-	return v8::Undefined();
-}
+    return v8::Undefined();
+  }
 
-v8::Handle<v8::Value> V8Element::getAttributeNodeCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in getAttributeNode");
+  v8::Handle<v8::Value> V8Element::getAttributeNodeCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in getAttributeNode");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localName(args[0]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localName(args[0]);
 
-	Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->getAttributeNode(*localName));
-	v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->getAttributeNode(*localName));
+    v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Attr::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Attr::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8Element::setAttributeNodeCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in setAttributeNode");
-	if (!(V8Attr::hasInstance(args[0])))
-		throw V8Exception("Parameter mismatch while calling setAttributeNode");
+  v8::Handle<v8::Value> V8Element::setAttributeNodeCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in setAttributeNode");
+    if (!(V8Attr::hasInstance(args[0])))
+      throw V8Exception("Parameter mismatch while calling setAttributeNode");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	Arabica::DOM::Attr<std::string>* localNewAttr = V8DOM::toClassPtr<V8Attr::V8AttrPrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    Arabica::DOM::Attr<std::string>* localNewAttr = V8DOM::toClassPtr<V8Attr::V8AttrPrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
 
-	Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->setAttributeNode(*localNewAttr));
-	v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->setAttributeNode(*localNewAttr));
+    v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Attr::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Attr::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8Element::removeAttributeNodeCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in removeAttributeNode");
-	if (!(V8Attr::hasInstance(args[0])))
-		throw V8Exception("Parameter mismatch while calling removeAttributeNode");
+  v8::Handle<v8::Value> V8Element::removeAttributeNodeCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in removeAttributeNode");
+    if (!(V8Attr::hasInstance(args[0])))
+      throw V8Exception("Parameter mismatch while calling removeAttributeNode");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	Arabica::DOM::Attr<std::string>* localOldAttr = V8DOM::toClassPtr<V8Attr::V8AttrPrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    Arabica::DOM::Attr<std::string>* localOldAttr = V8DOM::toClassPtr<V8Attr::V8AttrPrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
 
-	Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->removeAttributeNode(*localOldAttr));
-	v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->removeAttributeNode(*localOldAttr));
+    v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Attr::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Attr::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8Element::getElementsByTagNameCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in getElementsByTagName");
+  v8::Handle<v8::Value> V8Element::getElementsByTagNameCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in getElementsByTagName");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localName(args[0]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localName(args[0]);
 
-	Arabica::DOM::NodeList<std::string>* retVal = new Arabica::DOM::NodeList<std::string>(privData->nativeObj->getElementsByTagName(*localName));
-	v8::Handle<v8::Function> retCtor = V8NodeList::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::NodeList<std::string>* retVal = new Arabica::DOM::NodeList<std::string>(privData->nativeObj->getElementsByTagName(*localName));
+    v8::Handle<v8::Function> retCtor = V8NodeList::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8NodeList::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8NodeList::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8Element::getAttributeNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in getAttributeNS");
+  v8::Handle<v8::Value> V8Element::getAttributeNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in getAttributeNS");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localLocalName(args[1]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localLocalName(args[1]);
 
-	std::string retVal = privData->nativeObj->getAttributeNS(*localNamespaceURI, *localLocalName);
+    std::string retVal = privData->nativeObj->getAttributeNS(*localNamespaceURI, *localLocalName);
 
-	return v8::String::New(retVal.c_str());
-}
+    return v8::String::New(retVal.c_str());
+  }
 
-v8::Handle<v8::Value> V8Element::setAttributeNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 3)
-		throw V8Exception("Wrong number of arguments in setAttributeNS");
+  v8::Handle<v8::Value> V8Element::setAttributeNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 3)
+        throw V8Exception("Wrong number of arguments in setAttributeNS");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localQualifiedName(args[1]);
-	v8::String::AsciiValue localValue(args[2]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localQualifiedName(args[1]);
+    v8::String::AsciiValue localValue(args[2]);
 
-	privData->nativeObj->setAttributeNS(*localNamespaceURI, *localQualifiedName, *localValue);
+    privData->nativeObj->setAttributeNS(*localNamespaceURI, *localQualifiedName, *localValue);
 
-	return v8::Undefined();
-}
+    return v8::Undefined();
+  }
 
-v8::Handle<v8::Value> V8Element::removeAttributeNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in removeAttributeNS");
+  v8::Handle<v8::Value> V8Element::removeAttributeNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in removeAttributeNS");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localLocalName(args[1]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localLocalName(args[1]);
 
-	privData->nativeObj->removeAttributeNS(*localNamespaceURI, *localLocalName);
+    privData->nativeObj->removeAttributeNS(*localNamespaceURI, *localLocalName);
 
-	return v8::Undefined();
-}
+    return v8::Undefined();
+  }
 
-v8::Handle<v8::Value> V8Element::getAttributeNodeNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in getAttributeNodeNS");
+  v8::Handle<v8::Value> V8Element::getAttributeNodeNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in getAttributeNodeNS");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localLocalName(args[1]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localLocalName(args[1]);
 
-	Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->getAttributeNodeNS(*localNamespaceURI, *localLocalName));
-	v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->getAttributeNodeNS(*localNamespaceURI, *localLocalName));
+    v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Attr::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Attr::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8Element::setAttributeNodeNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in setAttributeNodeNS");
-	if (!(V8Attr::hasInstance(args[0])))
-		throw V8Exception("Parameter mismatch while calling setAttributeNodeNS");
+  v8::Handle<v8::Value> V8Element::setAttributeNodeNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in setAttributeNodeNS");
+    if (!(V8Attr::hasInstance(args[0])))
+      throw V8Exception("Parameter mismatch while calling setAttributeNodeNS");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	Arabica::DOM::Attr<std::string>* localNewAttr = V8DOM::toClassPtr<V8Attr::V8AttrPrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    Arabica::DOM::Attr<std::string>* localNewAttr = V8DOM::toClassPtr<V8Attr::V8AttrPrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
 
-	Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->setAttributeNodeNS(*localNewAttr));
-	v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Attr<std::string>* retVal = new Arabica::DOM::Attr<std::string>(privData->nativeObj->setAttributeNodeNS(*localNewAttr));
+    v8::Handle<v8::Function> retCtor = V8Attr::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Attr::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Attr::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8Element::getElementsByTagNameNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in getElementsByTagNameNS");
+  v8::Handle<v8::Value> V8Element::getElementsByTagNameNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in getElementsByTagNameNS");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localLocalName(args[1]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localLocalName(args[1]);
 
-	Arabica::DOM::NodeList<std::string>* retVal = new Arabica::DOM::NodeList<std::string>(privData->nativeObj->getElementsByTagNameNS(*localNamespaceURI, *localLocalName));
-	v8::Handle<v8::Function> retCtor = V8NodeList::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::NodeList<std::string>* retVal = new Arabica::DOM::NodeList<std::string>(privData->nativeObj->getElementsByTagNameNS(*localNamespaceURI, *localLocalName));
+    v8::Handle<v8::Function> retCtor = V8NodeList::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8NodeList::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8NodeList::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8Element::hasAttributeCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in hasAttribute");
+  v8::Handle<v8::Value> V8Element::hasAttributeCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in hasAttribute");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localName(args[0]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localName(args[0]);
 
-	bool retVal = privData->nativeObj->hasAttribute(*localName);
+    bool retVal = privData->nativeObj->hasAttribute(*localName);
 
-	return v8::Boolean::New(retVal);
-}
+    return v8::Boolean::New(retVal);
+  }
 
-v8::Handle<v8::Value> V8Element::hasAttributeNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in hasAttributeNS");
+  v8::Handle<v8::Value> V8Element::hasAttributeNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in hasAttributeNS");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localLocalName(args[1]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8ElementPrivate* privData = V8DOM::toClassPtr<V8ElementPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localLocalName(args[1]);
 
-	bool retVal = privData->nativeObj->hasAttributeNS(*localNamespaceURI, *localLocalName);
+    bool retVal = privData->nativeObj->hasAttributeNS(*localNamespaceURI, *localLocalName);
 
-	return v8::Boolean::New(retVal);
-}
+    return v8::Boolean::New(retVal);
+  }
 
-bool V8Element::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8Element::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Element.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Element.h
index 338c249..499ae0e 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Element.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Element.h
@@ -21,8 +21,10 @@
 #ifndef V8Element_h
 #define V8Element_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Node.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,83 +33,85 @@ namespace DOM {
 
 class V8Element {
 public:
-	struct V8ElementPrivate {
-		V8DOM* dom;
-		Arabica::DOM::Element<std::string>* nativeObj;
-	};
-
-	V8_DESTRUCTOR(V8ElementPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-	static v8::Handle<v8::Value> getAttributeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> setAttributeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> removeAttributeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> getAttributeNodeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> setAttributeNodeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> removeAttributeNodeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> getElementsByTagNameCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> getAttributeNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> setAttributeNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> removeAttributeNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> getAttributeNodeNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> setAttributeNodeNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> getElementsByTagNameNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> hasAttributeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> hasAttributeNSCallback(const v8::Arguments&);
-
-	static v8::Handle<v8::Value> tagNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("Element"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("tagName"), V8Element::tagNameAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-			prototype->Set(v8::String::NewSymbol("getAttribute"),
-			               v8::FunctionTemplate::New(V8Element::getAttributeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("setAttribute"),
-			               v8::FunctionTemplate::New(V8Element::setAttributeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("removeAttribute"),
-			               v8::FunctionTemplate::New(V8Element::removeAttributeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("getAttributeNode"),
-			               v8::FunctionTemplate::New(V8Element::getAttributeNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("setAttributeNode"),
-			               v8::FunctionTemplate::New(V8Element::setAttributeNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("removeAttributeNode"),
-			               v8::FunctionTemplate::New(V8Element::removeAttributeNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("getElementsByTagName"),
-			               v8::FunctionTemplate::New(V8Element::getElementsByTagNameCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("getAttributeNS"),
-			               v8::FunctionTemplate::New(V8Element::getAttributeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("setAttributeNS"),
-			               v8::FunctionTemplate::New(V8Element::setAttributeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("removeAttributeNS"),
-			               v8::FunctionTemplate::New(V8Element::removeAttributeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("getAttributeNodeNS"),
-			               v8::FunctionTemplate::New(V8Element::getAttributeNodeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("setAttributeNodeNS"),
-			               v8::FunctionTemplate::New(V8Element::setAttributeNodeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("getElementsByTagNameNS"),
-			               v8::FunctionTemplate::New(V8Element::getElementsByTagNameNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("hasAttribute"),
-			               v8::FunctionTemplate::New(V8Element::hasAttributeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("hasAttributeNS"),
-			               v8::FunctionTemplate::New(V8Element::hasAttributeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-
-
-			tmpl->Inherit(V8Node::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8ElementPrivate {
+      V8DOM* dom;
+      Arabica::DOM::Element<std::string>* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8ElementPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+    static v8::Handle<v8::Value> getAttributeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> setAttributeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> removeAttributeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> getAttributeNodeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> setAttributeNodeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> removeAttributeNodeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> getElementsByTagNameCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> getAttributeNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> setAttributeNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> removeAttributeNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> getAttributeNodeNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> setAttributeNodeNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> getElementsByTagNameNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> hasAttributeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> hasAttributeNSCallback(const v8::Arguments&);
+
+    static v8::Handle<v8::Value> tagNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("Element"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("tagName"), V8Element::tagNameAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+            prototype->Set(v8::String::NewSymbol("getAttribute"),
+                           v8::FunctionTemplate::New(V8Element::getAttributeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("setAttribute"),
+                           v8::FunctionTemplate::New(V8Element::setAttributeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("removeAttribute"),
+                           v8::FunctionTemplate::New(V8Element::removeAttributeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("getAttributeNode"),
+                           v8::FunctionTemplate::New(V8Element::getAttributeNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("setAttributeNode"),
+                           v8::FunctionTemplate::New(V8Element::setAttributeNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("removeAttributeNode"),
+                           v8::FunctionTemplate::New(V8Element::removeAttributeNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("getElementsByTagName"),
+                           v8::FunctionTemplate::New(V8Element::getElementsByTagNameCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("getAttributeNS"),
+                           v8::FunctionTemplate::New(V8Element::getAttributeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("setAttributeNS"),
+                           v8::FunctionTemplate::New(V8Element::setAttributeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("removeAttributeNS"),
+                           v8::FunctionTemplate::New(V8Element::removeAttributeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("getAttributeNodeNS"),
+                           v8::FunctionTemplate::New(V8Element::getAttributeNodeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("setAttributeNodeNS"),
+                           v8::FunctionTemplate::New(V8Element::setAttributeNodeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("getElementsByTagNameNS"),
+                           v8::FunctionTemplate::New(V8Element::getElementsByTagNameNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("hasAttribute"),
+                           v8::FunctionTemplate::New(V8Element::hasAttributeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("hasAttributeNS"),
+                           v8::FunctionTemplate::New(V8Element::hasAttributeNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+
+
+            tmpl->Inherit(V8Node::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Entity.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Entity.cpp
index f3ce21d..6db7b15 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Entity.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Entity.cpp
@@ -4,32 +4,32 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8Entity::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8Entity::Tmpl;
 
 
-v8::Handle<v8::Value> V8Entity::publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8EntityPrivate* privData = V8DOM::toClassPtr<V8EntityPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Entity::publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8EntityPrivate* privData = V8DOM::toClassPtr<V8EntityPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getPublicId().c_str());
-}
+    return v8::String::New(privData->nativeObj->getPublicId().c_str());
+  }
 
-v8::Handle<v8::Value> V8Entity::systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8EntityPrivate* privData = V8DOM::toClassPtr<V8EntityPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Entity::systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8EntityPrivate* privData = V8DOM::toClassPtr<V8EntityPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getSystemId().c_str());
-}
+    return v8::String::New(privData->nativeObj->getSystemId().c_str());
+  }
 
-v8::Handle<v8::Value> V8Entity::notationNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8EntityPrivate* privData = V8DOM::toClassPtr<V8EntityPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Entity::notationNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8EntityPrivate* privData = V8DOM::toClassPtr<V8EntityPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getNotationName().c_str());
-}
-bool V8Entity::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+    return v8::String::New(privData->nativeObj->getNotationName().c_str());
+  }
+  bool V8Entity::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Entity.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Entity.h
index c8e0eaf..acea6ea 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Entity.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Entity.h
@@ -21,8 +21,10 @@
 #ifndef V8Entity_h
 #define V8Entity_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Node.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,44 +33,46 @@ namespace DOM {
 
 class V8Entity {
 public:
-	struct V8EntityPrivate {
-		V8DOM* dom;
-		Arabica::DOM::Entity<std::string>* nativeObj;
-	};
-
-	V8_DESTRUCTOR(V8EntityPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-
-	static v8::Handle<v8::Value> publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> notationNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("Entity"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("publicId"), V8Entity::publicIdAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("systemId"), V8Entity::systemIdAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("notationName"), V8Entity::notationNameAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-
-
-			tmpl->Inherit(V8Node::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8EntityPrivate {
+      V8DOM* dom;
+      Arabica::DOM::Entity<std::string>* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8EntityPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+
+    static v8::Handle<v8::Value> publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> notationNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("Entity"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("publicId"), V8Entity::publicIdAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("systemId"), V8Entity::systemIdAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("notationName"), V8Entity::notationNameAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+
+
+            tmpl->Inherit(V8Node::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8EntityReference.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8EntityReference.cpp
index 197fadd..95ceee8 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8EntityReference.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8EntityReference.cpp
@@ -4,11 +4,11 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8EntityReference::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8EntityReference::Tmpl;
 
-bool V8EntityReference::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8EntityReference::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8EntityReference.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8EntityReference.h
index 85cc7cc..9bfb86d 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8EntityReference.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8EntityReference.h
@@ -21,8 +21,10 @@
 #ifndef V8EntityReference_h
 #define V8EntityReference_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Node.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,35 +33,37 @@ namespace DOM {
 
 class V8EntityReference {
 public:
-	struct V8EntityReferencePrivate {
-		V8DOM* dom;
-		Arabica::DOM::EntityReference<std::string>* nativeObj;
-	};
+    struct V8EntityReferencePrivate {
+      V8DOM* dom;
+      Arabica::DOM::EntityReference<std::string>* nativeObj;
+    };
 
-	V8_DESTRUCTOR(V8EntityReferencePrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
+    V8_DESTRUCTOR(V8EntityReferencePrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
 
 
 
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("EntityReference"));
-			tmpl->ReadOnlyPrototype();
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("EntityReference"));
+            tmpl->ReadOnlyPrototype();
 
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
 
 
 
 
-			tmpl->Inherit(V8Node::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+            tmpl->Inherit(V8Node::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NamedNodeMap.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NamedNodeMap.cpp
index 037d651..e09bbb8 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NamedNodeMap.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NamedNodeMap.cpp
@@ -4,185 +4,185 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8NamedNodeMap::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8NamedNodeMap::Tmpl;
 
 
-v8::Handle<v8::Value> V8NamedNodeMap::lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8NamedNodeMap::lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
 
-	return v8::Integer::New(privData->nativeObj->getLength());
-}
-v8::Handle<v8::Value> V8NamedNodeMap::getNamedItemCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in getNamedItem");
+    return v8::Integer::New(privData->nativeObj->getLength());
+  }
+  v8::Handle<v8::Value> V8NamedNodeMap::getNamedItemCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in getNamedItem");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localName(args[0]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localName(args[0]);
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->getNamedItem(*localName));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->getNamedItem(*localName));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8NamedNodeMap::setNamedItemCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in setNamedItem");
-	if (!(V8Node::hasInstance(args[0])))
-		throw V8Exception("Parameter mismatch while calling setNamedItem");
+  v8::Handle<v8::Value> V8NamedNodeMap::setNamedItemCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in setNamedItem");
+    if (!(V8Node::hasInstance(args[0])))
+      throw V8Exception("Parameter mismatch while calling setNamedItem");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
-	Arabica::DOM::Node<std::string>* localArg = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
+    Arabica::DOM::Node<std::string>* localArg = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->setNamedItem(*localArg));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->setNamedItem(*localArg));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8NamedNodeMap::removeNamedItemCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in removeNamedItem");
+  v8::Handle<v8::Value> V8NamedNodeMap::removeNamedItemCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in removeNamedItem");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localName(args[0]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localName(args[0]);
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->removeNamedItem(*localName));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->removeNamedItem(*localName));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8NamedNodeMap::itemCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in item");
+  v8::Handle<v8::Value> V8NamedNodeMap::itemCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in item");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
-	unsigned long localIndex = args[0]->ToNumber()->Uint32Value();
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
+    unsigned long localIndex = args[0]->ToNumber()->Uint32Value();
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->item(localIndex));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->item(localIndex));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8NamedNodeMap::getNamedItemNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in getNamedItemNS");
+  v8::Handle<v8::Value> V8NamedNodeMap::getNamedItemNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in getNamedItemNS");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localLocalName(args[1]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localLocalName(args[1]);
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->getNamedItemNS(*localNamespaceURI, *localLocalName));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->getNamedItemNS(*localNamespaceURI, *localLocalName));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8NamedNodeMap::setNamedItemNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in setNamedItemNS");
-	if (!(V8Node::hasInstance(args[0])))
-		throw V8Exception("Parameter mismatch while calling setNamedItemNS");
+  v8::Handle<v8::Value> V8NamedNodeMap::setNamedItemNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in setNamedItemNS");
+    if (!(V8Node::hasInstance(args[0])))
+      throw V8Exception("Parameter mismatch while calling setNamedItemNS");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
-	Arabica::DOM::Node<std::string>* localArg = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
+    Arabica::DOM::Node<std::string>* localArg = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->setNamedItemNS(*localArg));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->setNamedItemNS(*localArg));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8NamedNodeMap::removeNamedItemNSCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in removeNamedItemNS");
+  v8::Handle<v8::Value> V8NamedNodeMap::removeNamedItemNSCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in removeNamedItemNS");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNamespaceURI(args[0]);
-	v8::String::AsciiValue localLocalName(args[1]);
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NamedNodeMapPrivate* privData = V8DOM::toClassPtr<V8NamedNodeMapPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNamespaceURI(args[0]);
+    v8::String::AsciiValue localLocalName(args[1]);
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->removeNamedItemNS(*localNamespaceURI, *localLocalName));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->removeNamedItemNS(*localNamespaceURI, *localLocalName));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-}
+  }
 
-bool V8NamedNodeMap::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8NamedNodeMap::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NamedNodeMap.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NamedNodeMap.h
index b8bc873..a98c5ee 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NamedNodeMap.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NamedNodeMap.h
@@ -21,7 +21,9 @@
 #ifndef V8NamedNodeMap_h
 #define V8NamedNodeMap_h
 
+#include <string>
 #include "DOM/Node.hpp"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -30,58 +32,60 @@ namespace DOM {
 
 class V8NamedNodeMap {
 public:
-	struct V8NamedNodeMapPrivate {
-		V8DOM* dom;
-		Arabica::DOM::NamedNodeMap<std::string>* nativeObj;
-	};
-
-	V8_DESTRUCTOR(V8NamedNodeMapPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-	static v8::Handle<v8::Value> getNamedItemCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> setNamedItemCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> removeNamedItemCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> itemCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> getNamedItemNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> setNamedItemNSCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> removeNamedItemNSCallback(const v8::Arguments&);
-
-	static v8::Handle<v8::Value> lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("NamedNodeMap"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("length"), V8NamedNodeMap::lengthAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-			prototype->Set(v8::String::NewSymbol("getNamedItem"),
-			               v8::FunctionTemplate::New(V8NamedNodeMap::getNamedItemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("setNamedItem"),
-			               v8::FunctionTemplate::New(V8NamedNodeMap::setNamedItemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("removeNamedItem"),
-			               v8::FunctionTemplate::New(V8NamedNodeMap::removeNamedItemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("item"),
-			               v8::FunctionTemplate::New(V8NamedNodeMap::itemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("getNamedItemNS"),
-			               v8::FunctionTemplate::New(V8NamedNodeMap::getNamedItemNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("setNamedItemNS"),
-			               v8::FunctionTemplate::New(V8NamedNodeMap::setNamedItemNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("removeNamedItemNS"),
-			               v8::FunctionTemplate::New(V8NamedNodeMap::removeNamedItemNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-
-
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8NamedNodeMapPrivate {
+      V8DOM* dom;
+      Arabica::DOM::NamedNodeMap<std::string>* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8NamedNodeMapPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+    static v8::Handle<v8::Value> getNamedItemCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> setNamedItemCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> removeNamedItemCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> itemCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> getNamedItemNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> setNamedItemNSCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> removeNamedItemNSCallback(const v8::Arguments&);
+
+    static v8::Handle<v8::Value> lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("NamedNodeMap"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("length"), V8NamedNodeMap::lengthAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+            prototype->Set(v8::String::NewSymbol("getNamedItem"),
+                           v8::FunctionTemplate::New(V8NamedNodeMap::getNamedItemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("setNamedItem"),
+                           v8::FunctionTemplate::New(V8NamedNodeMap::setNamedItemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("removeNamedItem"),
+                           v8::FunctionTemplate::New(V8NamedNodeMap::removeNamedItemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("item"),
+                           v8::FunctionTemplate::New(V8NamedNodeMap::itemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("getNamedItemNS"),
+                           v8::FunctionTemplate::New(V8NamedNodeMap::getNamedItemNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("setNamedItemNS"),
+                           v8::FunctionTemplate::New(V8NamedNodeMap::setNamedItemNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("removeNamedItemNS"),
+                           v8::FunctionTemplate::New(V8NamedNodeMap::removeNamedItemNSCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+
+
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Node.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Node.cpp
index b77f38e..7de50f6 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Node.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Node.cpp
@@ -6,396 +6,396 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8Node::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8Node::Tmpl;
 
 
-v8::Handle<v8::Value> V8Node::nodeNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Node::nodeNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getNodeName().c_str());
-}
+    return v8::String::New(privData->nativeObj->getNodeName().c_str());
+  }
 
-v8::Handle<v8::Value> V8Node::nodeValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Node::nodeValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getNodeValue().c_str());
-}
+    return v8::String::New(privData->nativeObj->getNodeValue().c_str());
+  }
 
-void V8Node::nodeValueAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localNodeValue(value);
-	privData->nativeObj->setNodeValue(*localNodeValue);
-}
+  void V8Node::nodeValueAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localNodeValue(value);
+    privData->nativeObj->setNodeValue(*localNodeValue);
+  }
 
-v8::Handle<v8::Value> V8Node::nodeTypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Node::nodeTypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-	return v8::Integer::New(privData->nativeObj->getNodeType());
-}
+    return v8::Integer::New(privData->nativeObj->getNodeType());
+  }
 
-v8::Handle<v8::Value> V8Node::parentNodeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Node::parentNodeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-	if (!privData->nativeObj->getParentNode()) return v8::Undefined();
-	Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getParentNode());
+    if (!privData->nativeObj->getParentNode()) return v8::Undefined();
+    Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getParentNode());
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+    v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
+    return arbaicaRetObj;
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
-	return arbaicaRetObj;
+  }
 
-}
+  v8::Handle<v8::Value> V8Node::childNodesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-v8::Handle<v8::Value> V8Node::childNodesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    
+    Arabica::DOM::NodeList<std::string>* arbaicaRet = new Arabica::DOM::NodeList<std::string>(privData->nativeObj->getChildNodes());
 
+    v8::Handle<v8::Function> arbaicaRetCtor = V8NodeList::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-	Arabica::DOM::NodeList<std::string>* arbaicaRet = new Arabica::DOM::NodeList<std::string>(privData->nativeObj->getChildNodes());
+    struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8NodeList::jsDestructor);
+    return arbaicaRetObj;
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8NodeList::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+  }
 
-	struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+  v8::Handle<v8::Value> V8Node::firstChildAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8NodeList::jsDestructor);
-	return arbaicaRetObj;
+    if (!privData->nativeObj->getFirstChild()) return v8::Undefined();
+    Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getFirstChild());
 
-}
+    v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Node::firstChildAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
+    return arbaicaRetObj;
 
-	if (!privData->nativeObj->getFirstChild()) return v8::Undefined();
-	Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getFirstChild());
+  }
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+  v8::Handle<v8::Value> V8Node::lastChildAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+    if (!privData->nativeObj->getLastChild()) return v8::Undefined();
+    Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getLastChild());
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
-	return arbaicaRetObj;
+    v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-}
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
+    return arbaicaRetObj;
 
-v8::Handle<v8::Value> V8Node::lastChildAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+  }
+
+  v8::Handle<v8::Value> V8Node::previousSiblingAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+
+    if (!privData->nativeObj->getPreviousSibling()) return v8::Undefined();
+    Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getPreviousSibling());
+
+    v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
+    return arbaicaRetObj;
+
+  }
+
+  v8::Handle<v8::Value> V8Node::nextSiblingAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+
+    if (!privData->nativeObj->getNextSibling()) return v8::Undefined();
+    Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getNextSibling());
+
+    v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
+    return arbaicaRetObj;
 
-	if (!privData->nativeObj->getLastChild()) return v8::Undefined();
-	Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getLastChild());
+  }
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+  v8::Handle<v8::Value> V8Node::attributesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+    
+    Arabica::DOM::NamedNodeMap<std::string>* arbaicaRet = new Arabica::DOM::NamedNodeMap<std::string>(privData->nativeObj->getAttributes());
+
+    v8::Handle<v8::Function> arbaicaRetCtor = V8NamedNodeMap::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+
+    struct V8NamedNodeMap::V8NamedNodeMapPrivate* retPrivData = new V8NamedNodeMap::V8NamedNodeMapPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8NamedNodeMap::jsDestructor);
+    return arbaicaRetObj;
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
-	return arbaicaRetObj;
+  }
 
-}
+  v8::Handle<v8::Value> V8Node::ownerDocumentAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-v8::Handle<v8::Value> V8Node::previousSiblingAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    if (!privData->nativeObj->getOwnerDocument()) return v8::Undefined();
+    Arabica::DOM::Document<std::string>* arbaicaRet = new Arabica::DOM::Document<std::string>(privData->nativeObj->getOwnerDocument());
 
-	if (!privData->nativeObj->getPreviousSibling()) return v8::Undefined();
-	Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getPreviousSibling());
+    v8::Handle<v8::Function> arbaicaRetCtor = V8Document::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+    struct V8Document::V8DocumentPrivate* retPrivData = new V8Document::V8DocumentPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8Document::jsDestructor);
+    return arbaicaRetObj;
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+  }
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
-	return arbaicaRetObj;
+  v8::Handle<v8::Value> V8Node::namespaceURIAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-}
+    return v8::String::New(privData->nativeObj->getNamespaceURI().c_str());
+  }
 
-v8::Handle<v8::Value> V8Node::nextSiblingAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Node::prefixAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-	if (!privData->nativeObj->getNextSibling()) return v8::Undefined();
-	Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getNextSibling());
+    return v8::String::New(privData->nativeObj->getPrefix().c_str());
+  }
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+  void V8Node::prefixAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localPrefix(value);
+    privData->nativeObj->setPrefix(*localPrefix);
+  }
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+  v8::Handle<v8::Value> V8Node::localNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
-	return arbaicaRetObj;
+    return v8::String::New(privData->nativeObj->getLocalName().c_str());
+  }
+  v8::Handle<v8::Value> V8Node::insertBeforeCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in insertBefore");
+    if (!((V8Node::hasInstance(args[0])) && (V8Node::hasInstance(args[1]))))
+      throw V8Exception("Parameter mismatch while calling insertBefore");
 
-}
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    Arabica::DOM::Node<std::string>* localNewChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
+    Arabica::DOM::Node<std::string>* localRefChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[1]->ToObject()->GetInternalField(0))->nativeObj;
 
-v8::Handle<v8::Value> V8Node::attributesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->insertBefore(*localNewChild, *localRefChild));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	Arabica::DOM::NamedNodeMap<std::string>* arbaicaRet = new Arabica::DOM::NamedNodeMap<std::string>(privData->nativeObj->getAttributes());
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8NamedNodeMap::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-	struct V8NamedNodeMap::V8NamedNodeMapPrivate* retPrivData = new V8NamedNodeMap::V8NamedNodeMapPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+  }
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8NamedNodeMap::jsDestructor);
-	return arbaicaRetObj;
+  v8::Handle<v8::Value> V8Node::replaceChildCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in replaceChild");
+    if (!((V8Node::hasInstance(args[0])) && (V8Node::hasInstance(args[1]))))
+      throw V8Exception("Parameter mismatch while calling replaceChild");
 
-}
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    Arabica::DOM::Node<std::string>* localNewChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
+    Arabica::DOM::Node<std::string>* localOldChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[1]->ToObject()->GetInternalField(0))->nativeObj;
 
-v8::Handle<v8::Value> V8Node::ownerDocumentAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->replaceChild(*localNewChild, *localOldChild));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	if (!privData->nativeObj->getOwnerDocument()) return v8::Undefined();
-	Arabica::DOM::Document<std::string>* arbaicaRet = new Arabica::DOM::Document<std::string>(privData->nativeObj->getOwnerDocument());
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8Document::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	struct V8Document::V8DocumentPrivate* retPrivData = new V8Document::V8DocumentPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8Document::jsDestructor);
-	return arbaicaRetObj;
+  }
 
-}
+  v8::Handle<v8::Value> V8Node::removeChildCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in removeChild");
+    if (!(V8Node::hasInstance(args[0])))
+      throw V8Exception("Parameter mismatch while calling removeChild");
 
-v8::Handle<v8::Value> V8Node::namespaceURIAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    Arabica::DOM::Node<std::string>* localOldChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
 
-	return v8::String::New(privData->nativeObj->getNamespaceURI().c_str());
-}
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->removeChild(*localOldChild));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Node::prefixAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	return v8::String::New(privData->nativeObj->getPrefix().c_str());
-}
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-void V8Node::prefixAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localPrefix(value);
-	privData->nativeObj->setPrefix(*localPrefix);
-}
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-v8::Handle<v8::Value> V8Node::localNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+  }
 
-	return v8::String::New(privData->nativeObj->getLocalName().c_str());
-}
-v8::Handle<v8::Value> V8Node::insertBeforeCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in insertBefore");
-	if (!((V8Node::hasInstance(args[0])) && (V8Node::hasInstance(args[1]))))
-		throw V8Exception("Parameter mismatch while calling insertBefore");
+  v8::Handle<v8::Value> V8Node::appendChildCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in appendChild");
+    if (!(V8Node::hasInstance(args[0])))
+      throw V8Exception("Parameter mismatch while calling appendChild");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-	Arabica::DOM::Node<std::string>* localNewChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
-	Arabica::DOM::Node<std::string>* localRefChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[1]->ToObject()->GetInternalField(0))->nativeObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    Arabica::DOM::Node<std::string>* localNewChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->insertBefore(*localNewChild, *localRefChild));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->appendChild(*localNewChild));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8Node::replaceChildCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in replaceChild");
-	if (!((V8Node::hasInstance(args[0])) && (V8Node::hasInstance(args[1]))))
-		throw V8Exception("Parameter mismatch while calling replaceChild");
+  v8::Handle<v8::Value> V8Node::hasChildNodesCallback(const v8::Arguments& args) {
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-	Arabica::DOM::Node<std::string>* localNewChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
-	Arabica::DOM::Node<std::string>* localOldChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[1]->ToObject()->GetInternalField(0))->nativeObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->replaceChild(*localNewChild, *localOldChild));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    bool retVal = privData->nativeObj->hasChildNodes();
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    return v8::Boolean::New(retVal);
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Node::cloneNodeCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in cloneNode");
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    bool localDeep = args[0]->ToBoolean()->BooleanValue();
 
-}
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->cloneNode(localDeep));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-v8::Handle<v8::Value> V8Node::removeChildCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in removeChild");
-	if (!(V8Node::hasInstance(args[0])))
-		throw V8Exception("Parameter mismatch while calling removeChild");
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-	Arabica::DOM::Node<std::string>* localOldChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->removeChild(*localOldChild));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+  }
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+  v8::Handle<v8::Value> V8Node::normalizeCallback(const v8::Arguments& args) {
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-}
+    privData->nativeObj->normalize();
 
-v8::Handle<v8::Value> V8Node::appendChildCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in appendChild");
-	if (!(V8Node::hasInstance(args[0])))
-		throw V8Exception("Parameter mismatch while calling appendChild");
+    return v8::Undefined();
+  }
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-	Arabica::DOM::Node<std::string>* localNewChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
+  v8::Handle<v8::Value> V8Node::isSupportedCallback(const v8::Arguments& args) {
+    if (args.Length() < 2)
+        throw V8Exception("Wrong number of arguments in isSupported");
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->appendChild(*localNewChild));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localFeature(args[0]);
+    v8::String::AsciiValue localVersion(args[1]);
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    bool retVal = privData->nativeObj->isSupported(*localFeature, *localVersion);
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    return v8::Boolean::New(retVal);
+  }
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+  v8::Handle<v8::Value> V8Node::hasAttributesCallback(const v8::Arguments& args) {
 
-}
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-v8::Handle<v8::Value> V8Node::hasChildNodesCallback(const v8::Arguments& args) {
+    bool retVal = privData->nativeObj->hasAttributes();
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+    return v8::Boolean::New(retVal);
+  }
 
-	bool retVal = privData->nativeObj->hasChildNodes();
+  bool V8Node::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-	return v8::Boolean::New(retVal);
-}
-
-v8::Handle<v8::Value> V8Node::cloneNodeCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in cloneNode");
-
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-	bool localDeep = args[0]->ToBoolean()->BooleanValue();
-
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->cloneNode(localDeep));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
-
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
-
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
-
-}
-
-v8::Handle<v8::Value> V8Node::normalizeCallback(const v8::Arguments& args) {
-
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-
-	privData->nativeObj->normalize();
-
-	return v8::Undefined();
-}
-
-v8::Handle<v8::Value> V8Node::isSupportedCallback(const v8::Arguments& args) {
-	if (args.Length() < 2)
-		throw V8Exception("Wrong number of arguments in isSupported");
-
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localFeature(args[0]);
-	v8::String::AsciiValue localVersion(args[1]);
-
-	bool retVal = privData->nativeObj->isSupported(*localFeature, *localVersion);
-
-	return v8::Boolean::New(retVal);
-}
-
-v8::Handle<v8::Value> V8Node::hasAttributesCallback(const v8::Arguments& args) {
-
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-
-	bool retVal = privData->nativeObj->hasAttributes();
-
-	return v8::Boolean::New(retVal);
-}
-
-bool V8Node::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
-
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Node.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Node.h
index a15a676..cd427e5 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Node.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Node.h
@@ -21,7 +21,9 @@
 #ifndef V8Node_h
 #define V8Node_h
 
+#include <string>
 #include "DOM/Node.hpp"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -30,129 +32,131 @@ namespace DOM {
 
 class V8Node {
 public:
-	struct V8NodePrivate {
-		V8DOM* dom;
-		Arabica::DOM::Node<std::string>* nativeObj;
-	};
-
-	V8_DESTRUCTOR(V8NodePrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-	static v8::Handle<v8::Value> insertBeforeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> replaceChildCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> removeChildCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> appendChildCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> hasChildNodesCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> cloneNodeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> normalizeCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> isSupportedCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> hasAttributesCallback(const v8::Arguments&);
-
-	static v8::Handle<v8::Value> nodeNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> nodeValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static void nodeValueAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> nodeTypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> parentNodeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> childNodesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> firstChildAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> lastChildAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> previousSiblingAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> nextSiblingAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> attributesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> ownerDocumentAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> namespaceURIAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> prefixAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static void prefixAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> localNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("Node"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("nodeName"), V8Node::nodeNameAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("nodeValue"), V8Node::nodeValueAttrGetter, V8Node::nodeValueAttrSetter,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("nodeType"), V8Node::nodeTypeAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("parentNode"), V8Node::parentNodeAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("childNodes"), V8Node::childNodesAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("firstChild"), V8Node::firstChildAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("lastChild"), V8Node::lastChildAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("previousSibling"), V8Node::previousSiblingAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("nextSibling"), V8Node::nextSiblingAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("attributes"), V8Node::attributesAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("ownerDocument"), V8Node::ownerDocumentAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("namespaceURI"), V8Node::namespaceURIAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("prefix"), V8Node::prefixAttrGetter, V8Node::prefixAttrSetter,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("localName"), V8Node::localNameAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-			prototype->Set(v8::String::NewSymbol("insertBefore"),
-			               v8::FunctionTemplate::New(V8Node::insertBeforeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("replaceChild"),
-			               v8::FunctionTemplate::New(V8Node::replaceChildCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("removeChild"),
-			               v8::FunctionTemplate::New(V8Node::removeChildCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("appendChild"),
-			               v8::FunctionTemplate::New(V8Node::appendChildCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("hasChildNodes"),
-			               v8::FunctionTemplate::New(V8Node::hasChildNodesCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("cloneNode"),
-			               v8::FunctionTemplate::New(V8Node::cloneNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("normalize"),
-			               v8::FunctionTemplate::New(V8Node::normalizeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("isSupported"),
-			               v8::FunctionTemplate::New(V8Node::isSupportedCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("hasAttributes"),
-			               v8::FunctionTemplate::New(V8Node::hasAttributesCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-
-			tmpl->Set(v8::String::NewSymbol("ELEMENT_NODE"), v8::Integer::New(1), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("ELEMENT_NODE"), v8::Integer::New(1), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("ATTRIBUTE_NODE"), v8::Integer::New(2), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("ATTRIBUTE_NODE"), v8::Integer::New(2), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("TEXT_NODE"), v8::Integer::New(3), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("TEXT_NODE"), v8::Integer::New(3), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("CDATA_SECTION_NODE"), v8::Integer::New(4), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("CDATA_SECTION_NODE"), v8::Integer::New(4), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("ENTITY_REFERENCE_NODE"), v8::Integer::New(5), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("ENTITY_REFERENCE_NODE"), v8::Integer::New(5), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("ENTITY_NODE"), v8::Integer::New(6), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("ENTITY_NODE"), v8::Integer::New(6), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("PROCESSING_INSTRUCTION_NODE"), v8::Integer::New(7), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("PROCESSING_INSTRUCTION_NODE"), v8::Integer::New(7), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("COMMENT_NODE"), v8::Integer::New(8), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("COMMENT_NODE"), v8::Integer::New(8), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("DOCUMENT_NODE"), v8::Integer::New(9), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("DOCUMENT_NODE"), v8::Integer::New(9), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("DOCUMENT_TYPE_NODE"), v8::Integer::New(10), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("DOCUMENT_TYPE_NODE"), v8::Integer::New(10), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("DOCUMENT_FRAGMENT_NODE"), v8::Integer::New(11), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("DOCUMENT_FRAGMENT_NODE"), v8::Integer::New(11), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("NOTATION_NODE"), v8::Integer::New(12), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("NOTATION_NODE"), v8::Integer::New(12), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8NodePrivate {
+      V8DOM* dom;
+      Arabica::DOM::Node<std::string>* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8NodePrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+    static v8::Handle<v8::Value> insertBeforeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> replaceChildCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> removeChildCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> appendChildCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> hasChildNodesCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> cloneNodeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> normalizeCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> isSupportedCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> hasAttributesCallback(const v8::Arguments&);
+
+    static v8::Handle<v8::Value> nodeNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> nodeValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static void nodeValueAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> nodeTypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> parentNodeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> childNodesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> firstChildAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> lastChildAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> previousSiblingAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> nextSiblingAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> attributesAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> ownerDocumentAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> namespaceURIAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> prefixAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static void prefixAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> localNameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("Node"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("nodeName"), V8Node::nodeNameAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("nodeValue"), V8Node::nodeValueAttrGetter, V8Node::nodeValueAttrSetter,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("nodeType"), V8Node::nodeTypeAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("parentNode"), V8Node::parentNodeAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("childNodes"), V8Node::childNodesAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("firstChild"), V8Node::firstChildAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("lastChild"), V8Node::lastChildAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("previousSibling"), V8Node::previousSiblingAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("nextSibling"), V8Node::nextSiblingAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("attributes"), V8Node::attributesAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("ownerDocument"), V8Node::ownerDocumentAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("namespaceURI"), V8Node::namespaceURIAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("prefix"), V8Node::prefixAttrGetter, V8Node::prefixAttrSetter,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("localName"), V8Node::localNameAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+            prototype->Set(v8::String::NewSymbol("insertBefore"),
+                           v8::FunctionTemplate::New(V8Node::insertBeforeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("replaceChild"),
+                           v8::FunctionTemplate::New(V8Node::replaceChildCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("removeChild"),
+                           v8::FunctionTemplate::New(V8Node::removeChildCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("appendChild"),
+                           v8::FunctionTemplate::New(V8Node::appendChildCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("hasChildNodes"),
+                           v8::FunctionTemplate::New(V8Node::hasChildNodesCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("cloneNode"),
+                           v8::FunctionTemplate::New(V8Node::cloneNodeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("normalize"),
+                           v8::FunctionTemplate::New(V8Node::normalizeCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("isSupported"),
+                           v8::FunctionTemplate::New(V8Node::isSupportedCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("hasAttributes"),
+                           v8::FunctionTemplate::New(V8Node::hasAttributesCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+
+            tmpl->Set(v8::String::NewSymbol("ELEMENT_NODE"), v8::Integer::New(1), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("ELEMENT_NODE"), v8::Integer::New(1), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("ATTRIBUTE_NODE"), v8::Integer::New(2), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("ATTRIBUTE_NODE"), v8::Integer::New(2), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("TEXT_NODE"), v8::Integer::New(3), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("TEXT_NODE"), v8::Integer::New(3), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("CDATA_SECTION_NODE"), v8::Integer::New(4), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("CDATA_SECTION_NODE"), v8::Integer::New(4), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("ENTITY_REFERENCE_NODE"), v8::Integer::New(5), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("ENTITY_REFERENCE_NODE"), v8::Integer::New(5), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("ENTITY_NODE"), v8::Integer::New(6), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("ENTITY_NODE"), v8::Integer::New(6), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("PROCESSING_INSTRUCTION_NODE"), v8::Integer::New(7), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("PROCESSING_INSTRUCTION_NODE"), v8::Integer::New(7), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("COMMENT_NODE"), v8::Integer::New(8), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("COMMENT_NODE"), v8::Integer::New(8), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("DOCUMENT_NODE"), v8::Integer::New(9), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("DOCUMENT_NODE"), v8::Integer::New(9), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("DOCUMENT_TYPE_NODE"), v8::Integer::New(10), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("DOCUMENT_TYPE_NODE"), v8::Integer::New(10), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("DOCUMENT_FRAGMENT_NODE"), v8::Integer::New(11), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("DOCUMENT_FRAGMENT_NODE"), v8::Integer::New(11), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("NOTATION_NODE"), v8::Integer::New(12), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("NOTATION_NODE"), v8::Integer::New(12), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeList.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeList.cpp
index bee706e..bc2afb5 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeList.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeList.cpp
@@ -4,41 +4,41 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8NodeList::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8NodeList::Tmpl;
 
 
-v8::Handle<v8::Value> V8NodeList::lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodeListPrivate* privData = V8DOM::toClassPtr<V8NodeListPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8NodeList::lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodeListPrivate* privData = V8DOM::toClassPtr<V8NodeListPrivate >(self->GetInternalField(0));
 
-	return v8::Integer::New(privData->nativeObj->getLength());
-}
-v8::Handle<v8::Value> V8NodeList::itemCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in item");
+    return v8::Integer::New(privData->nativeObj->getLength());
+  }
+  v8::Handle<v8::Value> V8NodeList::itemCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in item");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodeListPrivate* privData = V8DOM::toClassPtr<V8NodeListPrivate >(self->GetInternalField(0));
-	unsigned long localIndex = args[0]->ToNumber()->Uint32Value();
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodeListPrivate* privData = V8DOM::toClassPtr<V8NodeListPrivate >(self->GetInternalField(0));
+    unsigned long localIndex = args[0]->ToNumber()->Uint32Value();
 
-	Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->item(localIndex));
-	v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>(privData->nativeObj->item(localIndex));
+    v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Node::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Node::jsDestructor);
+    return retObj;
 
-}
+  }
 
-bool V8NodeList::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8NodeList::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeList.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeList.h
index 771d82c..667af40 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeList.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeList.h
@@ -21,7 +21,9 @@
 #ifndef V8NodeList_h
 #define V8NodeList_h
 
+#include <string>
 #include "DOM/Node.hpp"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -30,40 +32,42 @@ namespace DOM {
 
 class V8NodeList {
 public:
-	struct V8NodeListPrivate {
-		V8DOM* dom;
-		Arabica::DOM::NodeList<std::string>* nativeObj;
-	};
+    struct V8NodeListPrivate {
+      V8DOM* dom;
+      Arabica::DOM::NodeList<std::string>* nativeObj;
+    };
 
-	V8_DESTRUCTOR(V8NodeListPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
+    V8_DESTRUCTOR(V8NodeListPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
 
-	static v8::Handle<v8::Value> itemCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> itemCallback(const v8::Arguments&);
 
-	static v8::Handle<v8::Value> lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> lengthAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
 
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("NodeList"));
-			tmpl->ReadOnlyPrototype();
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("NodeList"));
+            tmpl->ReadOnlyPrototype();
 
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
 
-			instance->SetAccessor(v8::String::NewSymbol("length"), V8NodeList::lengthAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("length"), V8NodeList::lengthAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
 
-			prototype->Set(v8::String::NewSymbol("item"),
-			               v8::FunctionTemplate::New(V8NodeList::itemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("item"),
+                           v8::FunctionTemplate::New(V8NodeList::itemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
 
 
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeSet.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeSet.cpp
index fade729..6f59a90 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeSet.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeSet.cpp
@@ -3,35 +3,35 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8NodeSet::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8NodeSet::Tmpl;
 
 
-v8::Handle<v8::Value> V8NodeSet::sizeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodeSetPrivate* privData = V8DOM::toClassPtr<V8NodeSetPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8NodeSet::sizeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodeSetPrivate* privData = V8DOM::toClassPtr<V8NodeSetPrivate >(self->GetInternalField(0));
 
-	return v8::Integer::New(privData->nativeObj->size());
-}
+    return v8::Integer::New(privData->nativeObj->size());
+  }
 
-v8::Handle<v8::Value> V8NodeSet::emptyAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NodeSetPrivate* privData = V8DOM::toClassPtr<V8NodeSetPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8NodeSet::emptyAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NodeSetPrivate* privData = V8DOM::toClassPtr<V8NodeSetPrivate >(self->GetInternalField(0));
 
-	return v8::Boolean::New(privData->nativeObj->empty());
-}
-v8::Handle<v8::Value> V8NodeSet::toDocumentOrderCallback(const v8::Arguments& args) {
+    return v8::Boolean::New(privData->nativeObj->empty());
+  }
+  v8::Handle<v8::Value> V8NodeSet::toDocumentOrderCallback(const v8::Arguments& args) {
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8NodeSetPrivate* privData = V8DOM::toClassPtr<V8NodeSetPrivate >(self->GetInternalField(0));
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8NodeSetPrivate* privData = V8DOM::toClassPtr<V8NodeSetPrivate >(self->GetInternalField(0));
 
-	privData->nativeObj->to_document_order();
+    privData->nativeObj->to_document_order();
 
-	return v8::Undefined();
-}
+    return v8::Undefined();
+  }
 
-bool V8NodeSet::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8NodeSet::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeSet.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeSet.h
index 294d851..78e4410 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeSet.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeSet.h
@@ -21,7 +21,9 @@
 #ifndef V8NodeSet_h
 #define V8NodeSet_h
 
+#include <string>
 #include "DOM/Node.hpp"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -30,45 +32,47 @@ namespace DOM {
 
 class V8NodeSet {
 public:
-	struct V8NodeSetPrivate {
-		V8DOM* dom;
-		Arabica::XPath::NodeSet<std::string>* nativeObj;
-	};
-
-	V8_DESTRUCTOR(V8NodeSetPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-	static v8::Handle<v8::Value> toDocumentOrderCallback(const v8::Arguments&);
-
-	static v8::Handle<v8::Value> sizeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> emptyAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> indexedPropertyCustomGetter(uint32_t, const v8::AccessorInfo&);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("NodeSet"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("size"), V8NodeSet::sizeAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("empty"), V8NodeSet::emptyAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-			instance->SetIndexedPropertyHandler(V8NodeSet::indexedPropertyCustomGetter, 0);
-			prototype->Set(v8::String::NewSymbol("toDocumentOrder"),
-			               v8::FunctionTemplate::New(V8NodeSet::toDocumentOrderCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-
-
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8NodeSetPrivate {
+      V8DOM* dom;
+      Arabica::XPath::NodeSet<std::string>* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8NodeSetPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+    static v8::Handle<v8::Value> toDocumentOrderCallback(const v8::Arguments&);
+
+    static v8::Handle<v8::Value> sizeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> emptyAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> indexedPropertyCustomGetter(uint32_t, const v8::AccessorInfo&);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("NodeSet"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("size"), V8NodeSet::sizeAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("empty"), V8NodeSet::emptyAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+            instance->SetIndexedPropertyHandler(V8NodeSet::indexedPropertyCustomGetter, 0);
+            prototype->Set(v8::String::NewSymbol("toDocumentOrder"),
+                           v8::FunctionTemplate::New(V8NodeSet::toDocumentOrderCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+
+
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Notation.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Notation.cpp
index 129563d..5ecdd10 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Notation.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Notation.cpp
@@ -4,25 +4,25 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8Notation::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8Notation::Tmpl;
 
 
-v8::Handle<v8::Value> V8Notation::publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NotationPrivate* privData = V8DOM::toClassPtr<V8NotationPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Notation::publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NotationPrivate* privData = V8DOM::toClassPtr<V8NotationPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getPublicId().c_str());
-}
+    return v8::String::New(privData->nativeObj->getPublicId().c_str());
+  }
 
-v8::Handle<v8::Value> V8Notation::systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8NotationPrivate* privData = V8DOM::toClassPtr<V8NotationPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8Notation::systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8NotationPrivate* privData = V8DOM::toClassPtr<V8NotationPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getSystemId().c_str());
-}
-bool V8Notation::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+    return v8::String::New(privData->nativeObj->getSystemId().c_str());
+  }
+  bool V8Notation::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Notation.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Notation.h
index ba90056..2102a24 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Notation.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Notation.h
@@ -21,8 +21,10 @@
 #ifndef V8Notation_h
 #define V8Notation_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Node.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,41 +33,43 @@ namespace DOM {
 
 class V8Notation {
 public:
-	struct V8NotationPrivate {
-		V8DOM* dom;
-		Arabica::DOM::Notation<std::string>* nativeObj;
-	};
+    struct V8NotationPrivate {
+      V8DOM* dom;
+      Arabica::DOM::Notation<std::string>* nativeObj;
+    };
 
-	V8_DESTRUCTOR(V8NotationPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
+    V8_DESTRUCTOR(V8NotationPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
 
 
-	static v8::Handle<v8::Value> publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> publicIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> systemIdAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
 
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("Notation"));
-			tmpl->ReadOnlyPrototype();
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("Notation"));
+            tmpl->ReadOnlyPrototype();
 
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
 
-			instance->SetAccessor(v8::String::NewSymbol("publicId"), V8Notation::publicIdAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("systemId"), V8Notation::systemIdAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("publicId"), V8Notation::publicIdAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("systemId"), V8Notation::systemIdAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
 
 
 
-			tmpl->Inherit(V8Node::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+            tmpl->Inherit(V8Node::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8ProcessingInstruction.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8ProcessingInstruction.cpp
index c6d2b28..f28a56d 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8ProcessingInstruction.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8ProcessingInstruction.cpp
@@ -4,32 +4,32 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8ProcessingInstruction::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8ProcessingInstruction::Tmpl;
 
 
-v8::Handle<v8::Value> V8ProcessingInstruction::targetAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8ProcessingInstructionPrivate* privData = V8DOM::toClassPtr<V8ProcessingInstructionPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8ProcessingInstruction::targetAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8ProcessingInstructionPrivate* privData = V8DOM::toClassPtr<V8ProcessingInstructionPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getTarget().c_str());
-}
+    return v8::String::New(privData->nativeObj->getTarget().c_str());
+  }
 
-v8::Handle<v8::Value> V8ProcessingInstruction::dataAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8ProcessingInstructionPrivate* privData = V8DOM::toClassPtr<V8ProcessingInstructionPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8ProcessingInstruction::dataAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8ProcessingInstructionPrivate* privData = V8DOM::toClassPtr<V8ProcessingInstructionPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->getData().c_str());
-}
+    return v8::String::New(privData->nativeObj->getData().c_str());
+  }
 
-void V8ProcessingInstruction::dataAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8ProcessingInstructionPrivate* privData = V8DOM::toClassPtr<V8ProcessingInstructionPrivate >(self->GetInternalField(0));
-	v8::String::AsciiValue localData(value);
-	privData->nativeObj->setData(*localData);
-}
-bool V8ProcessingInstruction::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  void V8ProcessingInstruction::dataAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8ProcessingInstructionPrivate* privData = V8DOM::toClassPtr<V8ProcessingInstructionPrivate >(self->GetInternalField(0));
+    v8::String::AsciiValue localData(value);
+    privData->nativeObj->setData(*localData);
+  }
+  bool V8ProcessingInstruction::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8ProcessingInstruction.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8ProcessingInstruction.h
index 995d066..a588b1f 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8ProcessingInstruction.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8ProcessingInstruction.h
@@ -21,8 +21,10 @@
 #ifndef V8ProcessingInstruction_h
 #define V8ProcessingInstruction_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8Node.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,42 +33,44 @@ namespace DOM {
 
 class V8ProcessingInstruction {
 public:
-	struct V8ProcessingInstructionPrivate {
-		V8DOM* dom;
-		Arabica::DOM::ProcessingInstruction<std::string>* nativeObj;
-	};
+    struct V8ProcessingInstructionPrivate {
+      V8DOM* dom;
+      Arabica::DOM::ProcessingInstruction<std::string>* nativeObj;
+    };
 
-	V8_DESTRUCTOR(V8ProcessingInstructionPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
+    V8_DESTRUCTOR(V8ProcessingInstructionPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
 
 
-	static v8::Handle<v8::Value> targetAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> dataAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static void dataAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> targetAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> dataAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static void dataAttrSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
 
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("ProcessingInstruction"));
-			tmpl->ReadOnlyPrototype();
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("ProcessingInstruction"));
+            tmpl->ReadOnlyPrototype();
 
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
 
-			instance->SetAccessor(v8::String::NewSymbol("target"), V8ProcessingInstruction::targetAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("data"), V8ProcessingInstruction::dataAttrGetter, V8ProcessingInstruction::dataAttrSetter,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("target"), V8ProcessingInstruction::targetAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("data"), V8ProcessingInstruction::dataAttrGetter, V8ProcessingInstruction::dataAttrSetter,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
 
 
 
-			tmpl->Inherit(V8Node::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+            tmpl->Inherit(V8Node::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.cpp
index ed6133a..72c0651 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.cpp
@@ -4,73 +4,73 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8SCXMLEvent::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8SCXMLEvent::Tmpl;
 
 
-v8::Handle<v8::Value> V8SCXMLEvent::typeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8SCXMLEvent::typeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
 
-	return v8::Integer::New(privData->nativeObj->type);
-}
+    return v8::Integer::New(privData->nativeObj->type);
+  }
 
-v8::Handle<v8::Value> V8SCXMLEvent::nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8SCXMLEvent::nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->name.c_str());
-}
+    return v8::String::New(privData->nativeObj->name.c_str());
+  }
 
-v8::Handle<v8::Value> V8SCXMLEvent::originAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8SCXMLEvent::originAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->origin.c_str());
-}
+    return v8::String::New(privData->nativeObj->origin.c_str());
+  }
 
-v8::Handle<v8::Value> V8SCXMLEvent::origintypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8SCXMLEvent::origintypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->origintype.c_str());
-}
+    return v8::String::New(privData->nativeObj->origintype.c_str());
+  }
 
-v8::Handle<v8::Value> V8SCXMLEvent::domAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8SCXMLEvent::domAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
 
-	if (!privData->nativeObj->dom) return v8::Undefined();
-	Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->dom);
+    if (!privData->nativeObj->dom) return v8::Undefined();
+    Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->dom);
 
-	v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+    v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = arbaicaRet;
+    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = arbaicaRet;
+    
+    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
+    return arbaicaRetObj;
 
-	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-	arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
-	return arbaicaRetObj;
+  }
 
-}
+  v8::Handle<v8::Value> V8SCXMLEvent::sendidAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
 
-v8::Handle<v8::Value> V8SCXMLEvent::sendidAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
+    return v8::String::New(privData->nativeObj->sendid.c_str());
+  }
 
-	return v8::String::New(privData->nativeObj->sendid.c_str());
-}
+  v8::Handle<v8::Value> V8SCXMLEvent::invokeidAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
 
-v8::Handle<v8::Value> V8SCXMLEvent::invokeidAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8SCXMLEventPrivate* privData = V8DOM::toClassPtr<V8SCXMLEventPrivate >(self->GetInternalField(0));
+    return v8::String::New(privData->nativeObj->invokeid.c_str());
+  }
+  bool V8SCXMLEvent::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-	return v8::String::New(privData->nativeObj->invokeid.c_str());
-}
-bool V8SCXMLEvent::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
-
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.h
index 26ac8b6..a1c76c1 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.h
@@ -21,7 +21,9 @@
 #ifndef V8SCXMLEvent_h
 #define V8SCXMLEvent_h
 
+#include <string>
 #include "DOM/Node.hpp"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -30,61 +32,63 @@ namespace DOM {
 
 class V8SCXMLEvent {
 public:
-	struct V8SCXMLEventPrivate {
-		V8DOM* dom;
-		uscxml::Event* nativeObj;
-	};
-
-	V8_DESTRUCTOR_KEEP_WRAPPED(V8SCXMLEventPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-
-	static v8::Handle<v8::Value> typeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> originAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> origintypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> domAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> sendidAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> invokeidAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("SCXMLEvent"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("type"), V8SCXMLEvent::typeAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("name"), V8SCXMLEvent::nameAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("origin"), V8SCXMLEvent::originAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("origintype"), V8SCXMLEvent::origintypeAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("dom"), V8SCXMLEvent::domAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("sendid"), V8SCXMLEvent::sendidAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("invokeid"), V8SCXMLEvent::invokeidAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-
-			tmpl->Set(v8::String::NewSymbol("INTERNAL"), v8::Integer::New(1), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("INTERNAL"), v8::Integer::New(1), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("EXTERNAL"), v8::Integer::New(2), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("EXTERNAL"), v8::Integer::New(2), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			tmpl->Set(v8::String::NewSymbol("PLATFORM"), v8::Integer::New(3), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-			prototype->Set(v8::String::NewSymbol("PLATFORM"), v8::Integer::New(3), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
-
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8SCXMLEventPrivate {
+      V8DOM* dom;
+      uscxml::Event* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8SCXMLEventPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+
+    static v8::Handle<v8::Value> typeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> nameAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> originAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> origintypeAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> domAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> sendidAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> invokeidAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("SCXMLEvent"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("type"), V8SCXMLEvent::typeAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("name"), V8SCXMLEvent::nameAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("origin"), V8SCXMLEvent::originAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("origintype"), V8SCXMLEvent::origintypeAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("dom"), V8SCXMLEvent::domAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("sendid"), V8SCXMLEvent::sendidAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("invokeid"), V8SCXMLEvent::invokeidAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+
+            tmpl->Set(v8::String::NewSymbol("INTERNAL"), v8::Integer::New(1), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("INTERNAL"), v8::Integer::New(1), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("EXTERNAL"), v8::Integer::New(2), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("EXTERNAL"), v8::Integer::New(2), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            tmpl->Set(v8::String::NewSymbol("PLATFORM"), v8::Integer::New(3), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+            prototype->Set(v8::String::NewSymbol("PLATFORM"), v8::Integer::New(3), static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
+
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Text.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Text.cpp
index 42b298a..fb027d5 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Text.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Text.cpp
@@ -4,34 +4,34 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8Text::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8Text::Tmpl;
 
-v8::Handle<v8::Value> V8Text::splitTextCallback(const v8::Arguments& args) {
-	if (args.Length() < 1)
-		throw V8Exception("Wrong number of arguments in splitText");
+  v8::Handle<v8::Value> V8Text::splitTextCallback(const v8::Arguments& args) {
+    if (args.Length() < 1)
+        throw V8Exception("Wrong number of arguments in splitText");
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8TextPrivate* privData = V8DOM::toClassPtr<V8TextPrivate >(self->GetInternalField(0));
-	unsigned long localOffset = args[0]->ToNumber()->Uint32Value();
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8TextPrivate* privData = V8DOM::toClassPtr<V8TextPrivate >(self->GetInternalField(0));
+    unsigned long localOffset = args[0]->ToNumber()->Uint32Value();
 
-	Arabica::DOM::Text<std::string>* retVal = new Arabica::DOM::Text<std::string>(privData->nativeObj->splitText(localOffset));
-	v8::Handle<v8::Function> retCtor = V8Text::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::DOM::Text<std::string>* retVal = new Arabica::DOM::Text<std::string>(privData->nativeObj->splitText(localOffset));
+    v8::Handle<v8::Function> retCtor = V8Text::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8Text::V8TextPrivate* retPrivData = new V8Text::V8TextPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8Text::V8TextPrivate* retPrivData = new V8Text::V8TextPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8Text::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8Text::jsDestructor);
+    return retObj;
 
-}
+  }
 
-bool V8Text::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8Text::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Text.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Text.h
index 4861dc8..bbf2577 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Text.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Text.h
@@ -21,8 +21,10 @@
 #ifndef V8Text_h
 #define V8Text_h
 
+#include <string>
 #include "DOM/Node.hpp"
 #include "V8CharacterData.h"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -31,38 +33,40 @@ namespace DOM {
 
 class V8Text {
 public:
-	struct V8TextPrivate {
-		V8DOM* dom;
-		Arabica::DOM::Text<std::string>* nativeObj;
-	};
+    struct V8TextPrivate {
+      V8DOM* dom;
+      Arabica::DOM::Text<std::string>* nativeObj;
+    };
 
-	V8_DESTRUCTOR(V8TextPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
+    V8_DESTRUCTOR(V8TextPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
 
-	static v8::Handle<v8::Value> splitTextCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> splitTextCallback(const v8::Arguments&);
 
 
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("Text"));
-			tmpl->ReadOnlyPrototype();
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("Text"));
+            tmpl->ReadOnlyPrototype();
 
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
 
 
-			prototype->Set(v8::String::NewSymbol("splitText"),
-			               v8::FunctionTemplate::New(V8Text::splitTextCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("splitText"),
+                           v8::FunctionTemplate::New(V8Text::splitTextCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
 
 
-			tmpl->Inherit(V8CharacterData::getTmpl());
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+            tmpl->Inherit(V8CharacterData::getTmpl());
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8XPathResult.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8XPathResult.cpp
index 968e53d..38f69ae 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8XPathResult.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8XPathResult.cpp
@@ -4,82 +4,82 @@
 namespace Arabica {
 namespace DOM {
 
-v8::Persistent<v8::FunctionTemplate> V8XPathResult::Tmpl;
+  v8::Persistent<v8::FunctionTemplate> V8XPathResult::Tmpl;
 
 
-v8::Handle<v8::Value> V8XPathResult::numberValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8XPathResult::numberValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
 
-	return v8::Number::New(privData->nativeObj->asNumber());
-}
+    return v8::Number::New(privData->nativeObj->asNumber());
+  }
 
-v8::Handle<v8::Value> V8XPathResult::stringValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8XPathResult::stringValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
 
-	return v8::String::New(privData->nativeObj->asString().c_str());
-}
+    return v8::String::New(privData->nativeObj->asString().c_str());
+  }
 
-v8::Handle<v8::Value> V8XPathResult::booleanValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
-	v8::Local<v8::Object> self = info.Holder();
-	struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
+  v8::Handle<v8::Value> V8XPathResult::booleanValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info) {
+    v8::Local<v8::Object> self = info.Holder();
+    struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
 
-	return v8::Boolean::New(privData->nativeObj->asBool());
-}
-v8::Handle<v8::Value> V8XPathResult::asNodeSetCallback(const v8::Arguments& args) {
+    return v8::Boolean::New(privData->nativeObj->asBool());
+  }
+  v8::Handle<v8::Value> V8XPathResult::asNodeSetCallback(const v8::Arguments& args) {
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
 
-	Arabica::XPath::NodeSet<std::string>* retVal = new Arabica::XPath::NodeSet<std::string>(privData->nativeObj->asNodeSet());
-	v8::Handle<v8::Function> retCtor = V8NodeSet::getTmpl()->GetFunction();
-	v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+    Arabica::XPath::NodeSet<std::string>* retVal = new Arabica::XPath::NodeSet<std::string>(privData->nativeObj->asNodeSet());
+    v8::Handle<v8::Function> retCtor = V8NodeSet::getTmpl()->GetFunction();
+    v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
 
-	struct V8NodeSet::V8NodeSetPrivate* retPrivData = new V8NodeSet::V8NodeSetPrivate();
-	retPrivData->dom = privData->dom;
-	retPrivData->nativeObj = retVal;
+    struct V8NodeSet::V8NodeSetPrivate* retPrivData = new V8NodeSet::V8NodeSetPrivate();
+    retPrivData->dom = privData->dom;
+    retPrivData->nativeObj = retVal;
 
-	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-	retObj.MakeWeak(0, V8NodeSet::jsDestructor);
-	return retObj;
+    retObj.MakeWeak(0, V8NodeSet::jsDestructor);
+    return retObj;
 
-}
+  }
 
-v8::Handle<v8::Value> V8XPathResult::asBoolCallback(const v8::Arguments& args) {
+  v8::Handle<v8::Value> V8XPathResult::asBoolCallback(const v8::Arguments& args) {
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
 
-	bool retVal = privData->nativeObj->asBool();
+    bool retVal = privData->nativeObj->asBool();
 
-	return v8::Boolean::New(retVal);
-}
+    return v8::Boolean::New(retVal);
+  }
 
-v8::Handle<v8::Value> V8XPathResult::asStringCallback(const v8::Arguments& args) {
+  v8::Handle<v8::Value> V8XPathResult::asStringCallback(const v8::Arguments& args) {
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
 
-	std::string retVal = privData->nativeObj->asString();
+    std::string retVal = privData->nativeObj->asString();
 
-	return v8::String::New(retVal.c_str());
-}
+    return v8::String::New(retVal.c_str());
+  }
 
-v8::Handle<v8::Value> V8XPathResult::asNumberCallback(const v8::Arguments& args) {
+  v8::Handle<v8::Value> V8XPathResult::asNumberCallback(const v8::Arguments& args) {
 
-	v8::Local<v8::Object> self = args.Holder();
-	struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
+    v8::Local<v8::Object> self = args.Holder();
+    struct V8XPathResultPrivate* privData = V8DOM::toClassPtr<V8XPathResultPrivate >(self->GetInternalField(0));
 
-	double retVal = privData->nativeObj->asNumber();
+    double retVal = privData->nativeObj->asNumber();
 
-	return v8::Number::New(retVal);
-}
+    return v8::Number::New(retVal);
+  }
 
-bool V8XPathResult::hasInstance(v8::Handle<v8::Value> value) {
-	return getTmpl()->HasInstance(value);
-}
+  bool V8XPathResult::hasInstance(v8::Handle<v8::Value> value) {
+    return getTmpl()->HasInstance(value);
+  }
 
-}
-}
+} 
+} 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8XPathResult.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8XPathResult.h
index 9a3bf4d..1fae618 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8XPathResult.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8XPathResult.h
@@ -21,7 +21,9 @@
 #ifndef V8XPathResult_h
 #define V8XPathResult_h
 
+#include <string>
 #include "DOM/Node.hpp"
+#include "string"
 #include "uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOM.h"
 #include <v8.h>
 
@@ -30,58 +32,60 @@ namespace DOM {
 
 class V8XPathResult {
 public:
-	struct V8XPathResultPrivate {
-		V8DOM* dom;
-		Arabica::XPath::XPathValue<std::string>* nativeObj;
-	};
-
-	V8_DESTRUCTOR(V8XPathResultPrivate);
-	static bool hasInstance(v8::Handle<v8::Value>);
-
-	static v8::Handle<v8::Value> asNodeSetCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> asBoolCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> asStringCallback(const v8::Arguments&);
-	static v8::Handle<v8::Value> asNumberCallback(const v8::Arguments&);
-
-	static v8::Handle<v8::Value> numberValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> stringValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> booleanValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-	static v8::Handle<v8::Value> singleNodeValueCustomAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
-
-	static v8::Persistent<v8::FunctionTemplate> Tmpl;
-	static v8::Handle<v8::FunctionTemplate> getTmpl() {
-		if (Tmpl.IsEmpty()) {
-			v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
-			tmpl->SetClassName(v8::String::New("XPathResult"));
-			tmpl->ReadOnlyPrototype();
-
-			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
-			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
-			instance->SetInternalFieldCount(1);
-
-			instance->SetAccessor(v8::String::NewSymbol("numberValue"), V8XPathResult::numberValueAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("stringValue"), V8XPathResult::stringValueAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("booleanValue"), V8XPathResult::booleanValueAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-			instance->SetAccessor(v8::String::NewSymbol("singleNodeValue"), V8XPathResult::singleNodeValueCustomAttrGetter, 0,
-			                      v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
-
-			prototype->Set(v8::String::NewSymbol("asNodeSet"),
-			               v8::FunctionTemplate::New(V8XPathResult::asNodeSetCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("asBool"),
-			               v8::FunctionTemplate::New(V8XPathResult::asBoolCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("asString"),
-			               v8::FunctionTemplate::New(V8XPathResult::asStringCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-			prototype->Set(v8::String::NewSymbol("asNumber"),
-			               v8::FunctionTemplate::New(V8XPathResult::asNumberCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
-
-
-			Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
-		}
-		return Tmpl;
-	}
+    struct V8XPathResultPrivate {
+      V8DOM* dom;
+      Arabica::XPath::XPathValue<std::string>* nativeObj;
+    };
+
+    V8_DESTRUCTOR(V8XPathResultPrivate);
+    static bool hasInstance(v8::Handle<v8::Value>);
+
+    static v8::Handle<v8::Value> asNodeSetCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> asBoolCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> asStringCallback(const v8::Arguments&);
+    static v8::Handle<v8::Value> asNumberCallback(const v8::Arguments&);
+
+    static v8::Handle<v8::Value> numberValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> stringValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> booleanValueAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+    static v8::Handle<v8::Value> singleNodeValueCustomAttrGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
+
+    static v8::Persistent<v8::FunctionTemplate> Tmpl;
+    static v8::Handle<v8::FunctionTemplate> getTmpl() {
+        if (Tmpl.IsEmpty()) {
+            v8::Handle<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();
+            tmpl->SetClassName(v8::String::New("XPathResult"));
+            tmpl->ReadOnlyPrototype();
+
+            v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+            v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+            (void)prototype; // surpress unused warnings
+            
+            instance->SetInternalFieldCount(1);
+
+            instance->SetAccessor(v8::String::NewSymbol("numberValue"), V8XPathResult::numberValueAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("stringValue"), V8XPathResult::stringValueAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("booleanValue"), V8XPathResult::booleanValueAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+            instance->SetAccessor(v8::String::NewSymbol("singleNodeValue"), V8XPathResult::singleNodeValueCustomAttrGetter, 0,
+                                  v8::External::New(0), static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None));
+
+            prototype->Set(v8::String::NewSymbol("asNodeSet"),
+                           v8::FunctionTemplate::New(V8XPathResult::asNodeSetCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("asBool"),
+                           v8::FunctionTemplate::New(V8XPathResult::asBoolCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("asString"),
+                           v8::FunctionTemplate::New(V8XPathResult::asStringCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+            prototype->Set(v8::String::NewSymbol("asNumber"),
+                           v8::FunctionTemplate::New(V8XPathResult::asNumberCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+
+
+            Tmpl = v8::Persistent<v8::FunctionTemplate>::New(tmpl);
+        }
+        return Tmpl;
+    }
 
 
 };