Beautified source code again

52 files changed, 2604 insertions, 2596 deletions

diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
index c190e3b..dfa8585 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
@@ -111,13 +111,13 @@ void V8DataModel::setEvent(const Event& event) {
 	v8::Handle<v8::Object> global = _contexts.front()->Global();
 
 	v8::Handle<v8::Function> eventCtor = Arabica::DOM::V8SCXMLEvent::getTmpl()->GetFunction();
-  v8::Persistent<v8::Object> eventObj = v8::Persistent<v8::Object>::New(eventCtor->NewInstance());
+	v8::Persistent<v8::Object> eventObj = v8::Persistent<v8::Object>::New(eventCtor->NewInstance());
 
 	Arabica::DOM::V8SCXMLEvent::V8SCXMLEventPrivate* privData = new Arabica::DOM::V8SCXMLEvent::V8SCXMLEventPrivate();
 	privData->nativeObj = new Event(event);
 	privData->dom = _dom;
 	eventObj->SetInternalField(0, Arabica::DOM::V8DOM::toExternal(privData));
-  eventObj.MakeWeak(0, Arabica::DOM::V8SCXMLEvent::jsDestructor);
+	eventObj.MakeWeak(0, Arabica::DOM::V8SCXMLEvent::jsDestructor);
 
 	eventObj->Set(v8::String::New("data"), getDataAsValue(event.data)); // set data part of _event
 	global->Set(v8::String::New("_event"), eventObj);
@@ -185,7 +185,7 @@ Data V8DataModel::getValueAsData(const v8::Handle<v8::Value>& value) {
 	} else if(value->IsUint32()) {
 		LOG(ERROR) << "IsUint32 is unimplemented" << std::endl;
 	} else if(value->IsUndefined()) {
-    data.atom = "undefined";
+		data.atom = "undefined";
 	}
 	return data;
 }
@@ -271,10 +271,10 @@ std::string V8DataModel::evalAsString(const std::string& expr) {
 	v8::HandleScope handleScope;
 	v8::Context::Scope contextScope(_contexts.back());
 	v8::Handle<v8::Value> result = evalAsValue(expr);
-  if (result->IsObject()) {
-    Data data = getValueAsData(result);
-    return toStr(data);
-  }
+	if (result->IsObject()) {
+		Data data = getValueAsData(result);
+		return toStr(data);
+	}
 	v8::String::AsciiValue data(result->ToString());
 	return std::string(*data);
 }
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.cpp
index d16f81b..bee6042 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;
-    
-    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-    arbaicaRetObj.MakeWeak(0, V8Element::jsDestructor);
-    return arbaicaRetObj;
+	struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = arbaicaRet;
 
-  }
-  bool V8Attr::hasInstance(v8::Handle<v8::Value> value) {
-    return getTmpl()->HasInstance(value);
-  }
+	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);
+}
+
+}
+}
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.h
index e317698..9829023 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Attr.h
@@ -33,50 +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();
-            (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;
-    }
+	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 90495f4..a9e5ac9 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 f9767a0..3b95b84 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CDATASection.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CDATASection.h
@@ -33,37 +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();
-            (void)prototype; // surpress unused warnings
-            
-            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 74c80ea..459cf96 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 fe93896..6c51ca7 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CharacterData.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8CharacterData.h
@@ -33,59 +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();
-            (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;
-    }
+	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 e470a70..f754ea7 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 c659150..074da74 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Comment.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Comment.h
@@ -33,37 +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();
-            (void)prototype; // surpress unused warnings
-            
-            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 0f81958..f7a7575 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 6fb8c7e..5c58e22 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOMImplementation.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DOMImplementation.h
@@ -32,45 +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();
-            (void)prototype; // surpress unused warnings
-            
-            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 d9d123a..06191ea 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;
-    
-    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-    arbaicaRetObj.MakeWeak(0, V8DocumentType::jsDestructor);
-    return arbaicaRetObj;
+	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;
 
-  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());
+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::Function> arbaicaRetCtor = V8DOMImplementation::getTmpl()->GetFunction();
-    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+	if (!privData->nativeObj->getImplementation()) return v8::Undefined();
+	Arabica::DOM::DOMImplementation<std::string>* arbaicaRet = new Arabica::DOM::DOMImplementation<std::string>(privData->nativeObj->getImplementation());
 
-    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::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;
 
-  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));
+	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	arbaicaRetObj.MakeWeak(0, V8DOMImplementation::jsDestructor);
+	return arbaicaRetObj;
 
-    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::Function> arbaicaRetCtor = V8Element::getTmpl()->GetFunction();
-    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+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));
 
-    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;
+	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::createElementCallback(const v8::Arguments& args) {
-    if (args.Length() < 1)
-        throw V8Exception("Wrong number of arguments in createElement");
+	v8::Handle<v8::Function> arbaicaRetCtor = V8Element::getTmpl()->GetFunction();
+	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-    v8::String::AsciiValue localTagName(args[0]);
+	struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = arbaicaRet;
 
-    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());
+	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	arbaicaRetObj.MakeWeak(0, V8Element::jsDestructor);
+	return arbaicaRetObj;
 
-    struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+}
+v8::Handle<v8::Value> V8Document::createElementCallback(const v8::Arguments& args) {
+	if (args.Length() < 1)
+		throw V8Exception("Wrong number of arguments in createElement");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	v8::Local<v8::Object> self = args.Holder();
+	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+	v8::String::AsciiValue localTagName(args[0]);
 
-    retObj.MakeWeak(0, V8Element::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::createDocumentFragmentCallback(const v8::Arguments& args) {
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+	retObj.MakeWeak(0, V8Element::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8DocumentFragment::V8DocumentFragmentPrivate* retPrivData = new V8DocumentFragment::V8DocumentFragmentPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::createDocumentFragmentCallback(const v8::Arguments& args) {
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	v8::Local<v8::Object> self = args.Holder();
+	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
 
-    retObj.MakeWeak(0, V8DocumentFragment::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8DocumentFragment::V8DocumentFragmentPrivate* retPrivData = new V8DocumentFragment::V8DocumentFragmentPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::createTextNodeCallback(const v8::Arguments& args) {
-    if (args.Length() < 1)
-        throw V8Exception("Wrong number of arguments in createTextNode");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-    v8::String::AsciiValue localData(args[0]);
+	retObj.MakeWeak(0, V8DocumentFragment::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8Text::V8TextPrivate* retPrivData = new V8Text::V8TextPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::createTextNodeCallback(const v8::Arguments& args) {
+	if (args.Length() < 1)
+		throw V8Exception("Wrong number of arguments in createTextNode");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	v8::Local<v8::Object> self = args.Holder();
+	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+	v8::String::AsciiValue localData(args[0]);
 
-    retObj.MakeWeak(0, V8Text::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8Text::V8TextPrivate* retPrivData = new V8Text::V8TextPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::createCommentCallback(const v8::Arguments& args) {
-    if (args.Length() < 1)
-        throw V8Exception("Wrong number of arguments in createComment");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-    v8::String::AsciiValue localData(args[0]);
+	retObj.MakeWeak(0, V8Text::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8Comment::V8CommentPrivate* retPrivData = new V8Comment::V8CommentPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::createCommentCallback(const v8::Arguments& args) {
+	if (args.Length() < 1)
+		throw V8Exception("Wrong number of arguments in createComment");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	v8::Local<v8::Object> self = args.Holder();
+	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+	v8::String::AsciiValue localData(args[0]);
 
-    retObj.MakeWeak(0, V8Comment::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8Comment::V8CommentPrivate* retPrivData = new V8Comment::V8CommentPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::createCDATASectionCallback(const v8::Arguments& args) {
-    if (args.Length() < 1)
-        throw V8Exception("Wrong number of arguments in createCDATASection");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-    v8::String::AsciiValue localData(args[0]);
+	retObj.MakeWeak(0, V8Comment::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8CDATASection::V8CDATASectionPrivate* retPrivData = new V8CDATASection::V8CDATASectionPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::createCDATASectionCallback(const v8::Arguments& args) {
+	if (args.Length() < 1)
+		throw V8Exception("Wrong number of arguments in createCDATASection");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	v8::Local<v8::Object> self = args.Holder();
+	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+	v8::String::AsciiValue localData(args[0]);
 
-    retObj.MakeWeak(0, V8CDATASection::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8CDATASection::V8CDATASectionPrivate* retPrivData = new V8CDATASection::V8CDATASectionPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::createProcessingInstructionCallback(const v8::Arguments& args) {
-    if (args.Length() < 2)
-        throw V8Exception("Wrong number of arguments in createProcessingInstruction");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    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.MakeWeak(0, V8CDATASection::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8ProcessingInstruction::V8ProcessingInstructionPrivate* retPrivData = new V8ProcessingInstruction::V8ProcessingInstructionPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::createProcessingInstructionCallback(const v8::Arguments& args) {
+	if (args.Length() < 2)
+		throw V8Exception("Wrong number of arguments in createProcessingInstruction");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	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.MakeWeak(0, V8ProcessingInstruction::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8ProcessingInstruction::V8ProcessingInstructionPrivate* retPrivData = new V8ProcessingInstruction::V8ProcessingInstructionPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::createAttributeCallback(const v8::Arguments& args) {
-    if (args.Length() < 1)
-        throw V8Exception("Wrong number of arguments in createAttribute");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-    v8::String::AsciiValue localName(args[0]);
+	retObj.MakeWeak(0, V8ProcessingInstruction::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::createAttributeCallback(const v8::Arguments& args) {
+	if (args.Length() < 1)
+		throw V8Exception("Wrong number of arguments in createAttribute");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	v8::Local<v8::Object> self = args.Holder();
+	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+	v8::String::AsciiValue localName(args[0]);
 
-    retObj.MakeWeak(0, V8Attr::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::createEntityReferenceCallback(const v8::Arguments& args) {
-    if (args.Length() < 1)
-        throw V8Exception("Wrong number of arguments in createEntityReference");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-    v8::String::AsciiValue localName(args[0]);
+	retObj.MakeWeak(0, V8Attr::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8EntityReference::V8EntityReferencePrivate* retPrivData = new V8EntityReference::V8EntityReferencePrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::createEntityReferenceCallback(const v8::Arguments& args) {
+	if (args.Length() < 1)
+		throw V8Exception("Wrong number of arguments in createEntityReference");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	v8::Local<v8::Object> self = args.Holder();
+	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+	v8::String::AsciiValue localName(args[0]);
 
-    retObj.MakeWeak(0, V8EntityReference::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8EntityReference::V8EntityReferencePrivate* retPrivData = new V8EntityReference::V8EntityReferencePrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::getElementsByTagNameCallback(const v8::Arguments& args) {
-    if (args.Length() < 1)
-        throw V8Exception("Wrong number of arguments in getElementsByTagName");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-    v8::String::AsciiValue localTagname(args[0]);
+	retObj.MakeWeak(0, V8EntityReference::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::getElementsByTagNameCallback(const v8::Arguments& args) {
+	if (args.Length() < 1)
+		throw V8Exception("Wrong number of arguments in getElementsByTagName");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	v8::Local<v8::Object> self = args.Holder();
+	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+	v8::String::AsciiValue localTagname(args[0]);
 
-    retObj.MakeWeak(0, V8NodeList::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  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->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    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.MakeWeak(0, V8NodeList::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+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->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	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.MakeWeak(0, V8Node::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::createElementNSCallback(const v8::Arguments& args) {
-    if (args.Length() < 2)
-        throw V8Exception("Wrong number of arguments in createElementNS");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    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.MakeWeak(0, V8Node::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::createElementNSCallback(const v8::Arguments& args) {
+	if (args.Length() < 2)
+		throw V8Exception("Wrong number of arguments in createElementNS");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	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.MakeWeak(0, V8Element::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::createAttributeNSCallback(const v8::Arguments& args) {
-    if (args.Length() < 2)
-        throw V8Exception("Wrong number of arguments in createAttributeNS");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    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.MakeWeak(0, V8Element::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::createAttributeNSCallback(const v8::Arguments& args) {
+	if (args.Length() < 2)
+		throw V8Exception("Wrong number of arguments in createAttributeNS");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	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.MakeWeak(0, V8Attr::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8Attr::V8AttrPrivate* retPrivData = new V8Attr::V8AttrPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Document::getElementsByTagNameNSCallback(const v8::Arguments& args) {
-    if (args.Length() < 2)
-        throw V8Exception("Wrong number of arguments in getElementsByTagNameNS");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    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.MakeWeak(0, V8Attr::jsDestructor);
+	return retObj;
 
-    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;
+v8::Handle<v8::Value> V8Document::getElementsByTagNameNSCallback(const v8::Arguments& args) {
+	if (args.Length() < 2)
+		throw V8Exception("Wrong number of arguments in getElementsByTagNameNS");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	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.MakeWeak(0, V8NodeList::jsDestructor);
-    return retObj;
+	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;
 
-  v8::Handle<v8::Value> V8Document::getElementByIdCallback(const v8::Arguments& args) {
-    if (args.Length() < 1)
-        throw V8Exception("Wrong number of arguments in getElementById");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
-    v8::String::AsciiValue localElementId(args[0]);
+	retObj.MakeWeak(0, V8NodeList::jsDestructor);
+	return retObj;
 
-    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());
+}
 
-    struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+v8::Handle<v8::Value> V8Document::getElementByIdCallback(const v8::Arguments& args) {
+	if (args.Length() < 1)
+		throw V8Exception("Wrong number of arguments in getElementById");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	v8::Local<v8::Object> self = args.Holder();
+	struct V8DocumentPrivate* privData = V8DOM::toClassPtr<V8DocumentPrivate >(self->GetInternalField(0));
+	v8::String::AsciiValue localElementId(args[0]);
 
-    retObj.MakeWeak(0, V8Element::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  bool V8Document::hasInstance(v8::Handle<v8::Value> value) {
-    return getTmpl()->HasInstance(value);
-  }
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-} 
-} 
+	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 c12e0dc..2db4b54 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Document.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Document.h
@@ -33,91 +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();
-            (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;
-    }
+	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 e6bec84..1403574 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 cf7f6ba..c669b05 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentFragment.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentFragment.h
@@ -33,37 +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();
-            (void)prototype; // surpress unused warnings
-            
-            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 a2098f2..6b9a7b0 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());
 
-    v8::Handle<v8::Function> arbaicaRetCtor = V8NamedNodeMap::getTmpl()->GetFunction();
-    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+	Arabica::DOM::NamedNodeMap<std::string>* arbaicaRet = new Arabica::DOM::NamedNodeMap<std::string>(privData->nativeObj->getEntities());
 
-    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::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;
 
-  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));
+	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::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));
 
-    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::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::Function> arbaicaRetCtor = V8NamedNodeMap::getTmpl()->GetFunction();
+	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-    return v8::String::New(privData->nativeObj->getPublicId().c_str());
-  }
+	struct V8NamedNodeMap::V8NamedNodeMapPrivate* retPrivData = new V8NamedNodeMap::V8NamedNodeMapPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = arbaicaRet;
 
-  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));
+	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	arbaicaRetObj.MakeWeak(0, V8NamedNodeMap::jsDestructor);
+	return arbaicaRetObj;
 
-    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));
+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));
 
-    return v8::String::New(privData->nativeObj->getInternalSubset().c_str());
-  }
-  bool V8DocumentType::hasInstance(v8::Handle<v8::Value> value) {
-    return getTmpl()->HasInstance(value);
-  }
+	return v8::String::New(privData->nativeObj->getPublicId().c_str());
+}
 
-} 
-} 
+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 65ce30c..59c2607 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentType.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8DocumentType.h
@@ -33,55 +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();
-            (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;
-    }
+	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 d476daa..680dd5e 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 499ae0e..e5a52bf 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Element.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Element.h
@@ -33,85 +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();
-            (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;
-    }
+	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 6db7b15..f3ce21d 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 acea6ea..6e85585 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Entity.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Entity.h
@@ -33,46 +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();
-            (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;
-    }
+	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 95ceee8..197fadd 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 9bfb86d..86dd61b 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8EntityReference.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8EntityReference.h
@@ -33,37 +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();
-            (void)prototype; // surpress unused warnings
-            
-            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 e09bbb8..037d651 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 a98c5ee..be89037 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NamedNodeMap.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NamedNodeMap.h
@@ -32,60 +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();
-            (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;
-    }
+	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 7de50f6..b77f38e 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;
-    
-    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-    arbaicaRetObj.MakeWeak(0, V8Node::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::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::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::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;
-    
-    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-    arbaicaRetObj.MakeWeak(0, V8NodeList::jsDestructor);
-    return arbaicaRetObj;
+	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());
 
-  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 V8NodeList::V8NodeListPrivate* retPrivData = new V8NodeList::V8NodeListPrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = arbaicaRet;
 
-    if (!privData->nativeObj->getFirstChild()) return v8::Undefined();
-    Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getFirstChild());
+	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	arbaicaRetObj.MakeWeak(0, V8NodeList::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::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));
 
-  }
+	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::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::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
+	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-    if (!privData->nativeObj->getLastChild()) return v8::Undefined();
-    Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getLastChild());
+	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = arbaicaRet;
 
-    v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
-    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	arbaicaRetObj.MakeWeak(0, V8Node::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::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;
+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));
 
-  }
+	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::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));
+	v8::Handle<v8::Function> arbaicaRetCtor = V8Node::getTmpl()->GetFunction();
+	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-    
-    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;
+	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::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));
+}
 
-    if (!privData->nativeObj->getOwnerDocument()) return v8::Undefined();
-    Arabica::DOM::Document<std::string>* arbaicaRet = new Arabica::DOM::Document<std::string>(privData->nativeObj->getOwnerDocument());
+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));
 
-    v8::Handle<v8::Function> arbaicaRetCtor = V8Document::getTmpl()->GetFunction();
-    v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
+	if (!privData->nativeObj->getPreviousSibling()) return v8::Undefined();
+	Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getPreviousSibling());
 
-    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;
+	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;
 
-  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));
+	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
+	return arbaicaRetObj;
 
-    return v8::String::New(privData->nativeObj->getNamespaceURI().c_str());
-  }
+}
 
-  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));
+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));
 
-    return v8::String::New(privData->nativeObj->getPrefix().c_str());
-  }
+	if (!privData->nativeObj->getNextSibling()) return v8::Undefined();
+	Arabica::DOM::Node<std::string>* arbaicaRet = new Arabica::DOM::Node<std::string>(privData->nativeObj->getNextSibling());
 
-  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);
-  }
+	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::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));
+	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = arbaicaRet;
 
-    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");
+	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	arbaicaRetObj.MakeWeak(0, V8Node::jsDestructor);
+	return arbaicaRetObj;
 
-    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;
+}
 
-    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());
+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 = retVal;
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	Arabica::DOM::NamedNodeMap<std::string>* arbaicaRet = new Arabica::DOM::NamedNodeMap<std::string>(privData->nativeObj->getAttributes());
 
-    retObj.MakeWeak(0, V8Node::jsDestructor);
-    return retObj;
+	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;
 
-  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");
+	arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	arbaicaRetObj.MakeWeak(0, V8NamedNodeMap::jsDestructor);
+	return arbaicaRetObj;
 
-    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;
+}
 
-    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());
+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));
 
-    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+	if (!privData->nativeObj->getOwnerDocument()) return v8::Undefined();
+	Arabica::DOM::Document<std::string>* arbaicaRet = new Arabica::DOM::Document<std::string>(privData->nativeObj->getOwnerDocument());
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	v8::Handle<v8::Function> arbaicaRetCtor = V8Document::getTmpl()->GetFunction();
+	v8::Persistent<v8::Object> arbaicaRetObj = v8::Persistent<v8::Object>::New(arbaicaRetCtor->NewInstance());
 
-    retObj.MakeWeak(0, V8Node::jsDestructor);
-    return retObj;
+	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;
 
-  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::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;
+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));
 
-    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());
+	return v8::String::New(privData->nativeObj->getNamespaceURI().c_str());
+}
 
-    struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-    retPrivData->dom = privData->dom;
-    retPrivData->nativeObj = retVal;
+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));
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	return v8::String::New(privData->nativeObj->getPrefix().c_str());
+}
 
-    retObj.MakeWeak(0, V8Node::jsDestructor);
-    return retObj;
+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);
+}
 
-  }
+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));
 
-  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::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;
+	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;
 
-    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());
+	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;
+	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::hasChildNodesCallback(const v8::Arguments& args) {
+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));
+	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;
 
-    bool retVal = privData->nativeObj->hasChildNodes();
+	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());
 
-    return v8::Boolean::New(retVal);
-  }
+	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Node::cloneNodeCallback(const v8::Arguments& args) {
-    if (args.Length() < 1)
-        throw V8Exception("Wrong number of arguments in cloneNode");
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
-    bool localDeep = args[0]->ToBoolean()->BooleanValue();
+	retObj.MakeWeak(0, V8Node::jsDestructor);
+	return retObj;
 
-    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;
+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");
 
-    retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	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.MakeWeak(0, V8Node::jsDestructor);
-    return retObj;
+	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());
 
-  }
+	struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
+	retPrivData->dom = privData->dom;
+	retPrivData->nativeObj = retVal;
 
-  v8::Handle<v8::Value> V8Node::normalizeCallback(const v8::Arguments& args) {
+	retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
 
-    v8::Local<v8::Object> self = args.Holder();
-    struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
+	retObj.MakeWeak(0, V8Node::jsDestructor);
+	return retObj;
 
-    privData->nativeObj->normalize();
+}
 
-    return v8::Undefined();
-  }
+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::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));
+	Arabica::DOM::Node<std::string>* localNewChild = V8DOM::toClassPtr<V8Node::V8NodePrivate >(args[0]->ToObject()->GetInternalField(0))->nativeObj;
 
-    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]);
+	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());
 
-    bool retVal = privData->nativeObj->isSupported(*localFeature, *localVersion);
+	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::hasAttributesCallback(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));
+}
 
-    bool retVal = privData->nativeObj->hasAttributes();
+v8::Handle<v8::Value> V8Node::hasChildNodesCallback(const v8::Arguments& args) {
 
-    return v8::Boolean::New(retVal);
-  }
+	v8::Local<v8::Object> self = args.Holder();
+	struct V8NodePrivate* privData = V8DOM::toClassPtr<V8NodePrivate >(self->GetInternalField(0));
 
-  bool V8Node::hasInstance(v8::Handle<v8::Value> value) {
-    return getTmpl()->HasInstance(value);
-  }
+	bool retVal = privData->nativeObj->hasChildNodes();
 
-} 
-} 
+	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 cd427e5..bb6bbd2 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Node.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Node.h
@@ -32,131 +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();
-            (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;
-    }
+	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 bc2afb5..bee706e 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 667af40..fb1b510 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeList.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeList.h
@@ -32,42 +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();
-            (void)prototype; // surpress unused warnings
-            
-            instance->SetInternalFieldCount(1);
+			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+			(void)prototype; // surpress unused warnings
 
-            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->SetInternalFieldCount(1);
 
-            prototype->Set(v8::String::NewSymbol("item"),
-                           v8::FunctionTemplate::New(V8NodeList::itemCallback, v8::Undefined()), static_cast<v8::PropertyAttribute>(v8::DontDelete));
+			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));
 
-            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 6f59a90..fade729 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 78e4410..97b5d4f 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeSet.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8NodeSet.h
@@ -32,47 +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();
-            (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;
-    }
+	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 5ecdd10..129563d 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 2102a24..0745728 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Notation.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Notation.h
@@ -33,43 +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();
-            (void)prototype; // surpress unused warnings
-            
-            instance->SetInternalFieldCount(1);
+			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+			(void)prototype; // surpress unused warnings
 
-            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->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));
 
 
-            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 f28a56d..c6d2b28 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 a588b1f..56b61eb 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8ProcessingInstruction.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8ProcessingInstruction.h
@@ -33,44 +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();
-            (void)prototype; // surpress unused warnings
-            
-            instance->SetInternalFieldCount(1);
+			v8::Local<v8::ObjectTemplate> instance = tmpl->InstanceTemplate();
+			v8::Local<v8::ObjectTemplate> prototype = tmpl->PrototypeTemplate();
+			(void)prototype; // surpress unused warnings
 
-            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->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));
 
 
-            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 72c0651..ed6133a 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;
-    
-    arbaicaRetObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
-    arbaicaRetObj.MakeWeak(0, V8Node::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> 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());
-  }
+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::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->sendid.c_str());
+}
 
-    return v8::String::New(privData->nativeObj->invokeid.c_str());
-  }
-  bool V8SCXMLEvent::hasInstance(v8::Handle<v8::Value> value) {
-    return getTmpl()->HasInstance(value);
-  }
+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);
+}
+
+}
+}
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.h b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.h
index a1c76c1..62495cf 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8SCXMLEvent.h
@@ -32,63 +32,63 @@ namespace DOM {
 
 class V8SCXMLEvent {
 public:
-    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;
-    }
+	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 fb027d5..42b298a 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 bbf2577..61b92fb 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Text.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8Text.h
@@ -33,40 +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();
-            (void)prototype; // surpress unused warnings
-            
-            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 38f69ae..968e53d 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 1fae618..f6a2d10 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8XPathResult.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/dom/V8XPathResult.h
@@ -32,60 +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();
-            (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;
-    }
+	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;
+	}
 
 
 };
diff --git a/src/uscxml/plugins/element/fetch/FetchElement.cpp b/src/uscxml/plugins/element/fetch/FetchElement.cpp
index 33cb76e..eabe0a2 100644
--- a/src/uscxml/plugins/element/fetch/FetchElement.cpp
+++ b/src/uscxml/plugins/element/fetch/FetchElement.cpp
@@ -19,90 +19,90 @@ bool connect(pluma::Host& host) {
 #endif
 
 boost::shared_ptr<ExecutableContentImpl> FetchElement::create(Interpreter* interpreter) {
-  boost::shared_ptr<FetchElement> invoker = boost::shared_ptr<FetchElement>(new FetchElement());
+	boost::shared_ptr<FetchElement> invoker = boost::shared_ptr<FetchElement>(new FetchElement());
 	invoker->_interpreter = interpreter;
 	return invoker;
 }
 
 FetchElement::~FetchElement() {
-  URLFetcher::breakURL(_targetUrl);
+	URLFetcher::breakURL(_targetUrl);
 }
-  
+
 void FetchElement::downloadCompleted(const URL& url) {
-  Event event;
-  event.name = _callback;
-  
-  std::string content = url.getInContent();
-  std::map<std::string, std::string> headerFields = url.getInHeaderFields();
-  
-  if (false) {
-  } else if (boost::iequals(_type, "text")) {
-    event.data.atom = content;
-    event.data.type = Data::VERBATIM;
-  } else if (boost::iequals(_type, "url")) {
-  } else if (boost::iequals(_type, "json")) {
-    event.data = Data::fromJSON(content);
-  } else if (boost::iequals(_type, "xml")) {
-    event = Event::fromXML(content);
-  }
-  
-  _interpreter->receive(event);
+	Event event;
+	event.name = _callback;
+
+	std::string content = url.getInContent();
+	std::map<std::string, std::string> headerFields = url.getInHeaderFields();
+
+	if (false) {
+	} else if (boost::iequals(_type, "text")) {
+		event.data.atom = content;
+		event.data.type = Data::VERBATIM;
+	} else if (boost::iequals(_type, "url")) {
+	} else if (boost::iequals(_type, "json")) {
+		event.data = Data::fromJSON(content);
+	} else if (boost::iequals(_type, "xml")) {
+		event = Event::fromXML(content);
+	}
+
+	_interpreter->receive(event);
 
 }
-  
+
 void FetchElement::downloadFailed(const URL& url, int errorCode) {
-  Event event;
-  event.name = _callback + ".failed";
-  
-  _interpreter->receive(event);
+	Event event;
+	event.name = _callback + ".failed";
+
+	_interpreter->receive(event);
 
 }
 
 void FetchElement::enterElement(const Arabica::DOM::Node<std::string>& node) {
-  if (!HAS_ATTR(node, "target") && !HAS_ATTR(node, "targetexpr")) {
-    LOG(ERROR) << "Fetch element requires target or targetexpr";
-    return;
-  }
-  if (HAS_ATTR(node, "targetexpr") && !_interpreter->getDataModel()) {
-    LOG(ERROR) << "Fetch element with targetexpr requires datamodel";
-    return;
-  }
-  _target = (HAS_ATTR(node, "target") ? ATTR(node, "target") : _interpreter->getDataModel().evalAsString(ATTR(node, "targetexpr")));
-
-  if (!HAS_ATTR(node, "callback") && !HAS_ATTR(node, "callbackexpr")) {
-    LOG(ERROR) << "Fetch element requires callback or callbackexpr";
-    return;
-  }
-  if (HAS_ATTR(node, "callbackexpr") && !_interpreter->getDataModel()) {
-    LOG(ERROR) << "Fetch element with callbackexpr requires datamodel";
-    return;
-  }
-  _callback = (HAS_ATTR(node, "callback") ? ATTR(node, "callback") : _interpreter->getDataModel().evalAsString(ATTR(node, "callbackexpr")));
-
-  _type = (HAS_ATTR(node, "type") ? ATTR(node, "type") : "text");
-  if (!boost::iequals(_type, "text") &&
-      !boost::iequals(_type, "url") &&
-      !boost::iequals(_type, "json") &&
-      !boost::iequals(_type, "xml")) {
-    LOG(ERROR) << "Fetch element type attribute not one of text, url, json, xml.";
-    return;
-  }
-  
-  _targetUrl = URL(_target);
-  if (!_targetUrl.isAbsolute()) {
-    if (!_interpreter->toAbsoluteURI(_targetUrl)) {
-      LOG(ERROR) << "Cannot transform " << _target << " into absolute URL";
-      return;
-    }
-  }
-
-  _targetUrl.addMonitor(this);
-  URLFetcher::fetchURL(_targetUrl);
-  
+	if (!HAS_ATTR(node, "target") && !HAS_ATTR(node, "targetexpr")) {
+		LOG(ERROR) << "Fetch element requires target or targetexpr";
+		return;
+	}
+	if (HAS_ATTR(node, "targetexpr") && !_interpreter->getDataModel()) {
+		LOG(ERROR) << "Fetch element with targetexpr requires datamodel";
+		return;
+	}
+	_target = (HAS_ATTR(node, "target") ? ATTR(node, "target") : _interpreter->getDataModel().evalAsString(ATTR(node, "targetexpr")));
+
+	if (!HAS_ATTR(node, "callback") && !HAS_ATTR(node, "callbackexpr")) {
+		LOG(ERROR) << "Fetch element requires callback or callbackexpr";
+		return;
+	}
+	if (HAS_ATTR(node, "callbackexpr") && !_interpreter->getDataModel()) {
+		LOG(ERROR) << "Fetch element with callbackexpr requires datamodel";
+		return;
+	}
+	_callback = (HAS_ATTR(node, "callback") ? ATTR(node, "callback") : _interpreter->getDataModel().evalAsString(ATTR(node, "callbackexpr")));
+
+	_type = (HAS_ATTR(node, "type") ? ATTR(node, "type") : "text");
+	if (!boost::iequals(_type, "text") &&
+	        !boost::iequals(_type, "url") &&
+	        !boost::iequals(_type, "json") &&
+	        !boost::iequals(_type, "xml")) {
+		LOG(ERROR) << "Fetch element type attribute not one of text, url, json, xml.";
+		return;
+	}
+
+	_targetUrl = URL(_target);
+	if (!_targetUrl.isAbsolute()) {
+		if (!_interpreter->toAbsoluteURI(_targetUrl)) {
+			LOG(ERROR) << "Cannot transform " << _target << " into absolute URL";
+			return;
+		}
+	}
+
+	_targetUrl.addMonitor(this);
+	URLFetcher::fetchURL(_targetUrl);
+
 }
 
 void FetchElement::exitElement(const Arabica::DOM::Node<std::string>& node) {
-  
+
 }
 
 }
\ No newline at end of file
diff --git a/src/uscxml/plugins/element/fetch/FetchElement.h b/src/uscxml/plugins/element/fetch/FetchElement.h
index 0229048..aadbb7c 100644
--- a/src/uscxml/plugins/element/fetch/FetchElement.h
+++ b/src/uscxml/plugins/element/fetch/FetchElement.h
@@ -8,7 +8,7 @@
 #endif
 
 namespace uscxml {
-	
+
 class FetchElement : public ExecutableContentImpl, public URLMonitor {
 public:
 	FetchElement() {}
@@ -22,23 +22,23 @@ public:
 	std::string getNamespace() {
 		return "http://www.w3.org/2005/07/scxml";
 	}
-	
+
 	bool processChildren() {
 		return false;
 	}
-	
+
 	void enterElement(const Arabica::DOM::Node<std::string>& node);
 	void exitElement(const Arabica::DOM::Node<std::string>& node);
-  void downloadCompleted(const URL& url);
-  void downloadFailed(const URL& url, int errorCode);
+	void downloadCompleted(const URL& url);
+	void downloadFailed(const URL& url, int errorCode);
 
 protected:
-  URL _targetUrl;
-  std::string _target;
-  std::string _callback;
-  std::string _type;
+	URL _targetUrl;
+	std::string _target;
+	std::string _callback;
+	std::string _type;
 };
-	
+
 #ifdef BUILD_AS_PLUGINS
 PLUMA_INHERIT_PROVIDER(FetchElement, Element);
 #endif
diff --git a/src/uscxml/plugins/element/response/ResponseElement.cpp b/src/uscxml/plugins/element/response/ResponseElement.cpp
index ce25036..814f726 100644
--- a/src/uscxml/plugins/element/response/ResponseElement.cpp
+++ b/src/uscxml/plugins/element/response/ResponseElement.cpp
@@ -17,52 +17,52 @@ bool connect(pluma::Host& host) {
 #endif
 
 boost::shared_ptr<ExecutableContentImpl> ResponseElement::create(Interpreter* interpreter) {
-  boost::shared_ptr<ResponseElement> invoker = boost::shared_ptr<ResponseElement>(new ResponseElement());
+	boost::shared_ptr<ResponseElement> invoker = boost::shared_ptr<ResponseElement>(new ResponseElement());
 	invoker->_interpreter = interpreter;
 	return invoker;
 }
 
 void ResponseElement::enterElement(const Arabica::DOM::Node<std::string>& node) {
-  if (!HAS_ATTR(node, "request") && !HAS_ATTR(node, "requestexpr")) {
-    LOG(ERROR) << "Response element requires request or requestexpr";
-    return;
-  }
-  if (HAS_ATTR(node, "requestexpr") && !_interpreter->getDataModel()) {
-    LOG(ERROR) << "Response element with requestexpr requires datamodel";
-    return;
-  }
-  if (HAS_ATTR(node, "close")) {
-    
-  }
-  
-  std::string requestId = (HAS_ATTR(node, "request") ? ATTR(node, "request") : _interpreter->getDataModel().evalAsString(ATTR(node, "requestexpr")));
-
-  HTTPServletInvoker* servlet = _interpreter->getHTTPServlet();
-  tthread::lock_guard<tthread::recursive_mutex> lock(servlet->getMutex());
-  
-  if (servlet->getRequests().find(requestId) == servlet->getRequests().end()) {
-    LOG(ERROR) << "No matching HTTP request for response element";
-    return;
-  }
-  
-  std::string statusStr = (HAS_ATTR(node, "status") ? ATTR(node, "status") : "200");
-  if (!isNumeric(statusStr.c_str(), 10)) {
-    LOG(ERROR) << "Response element with non-numeric status " << statusStr;
-    return;
-  }
-  int status = strTo<int>(statusStr);
-
-  HTTPServer::Request httpReq = servlet->getRequests()[requestId];
-
-  HTTPServer::Reply httpReply(httpReq);
-  httpReply.status = status;
-  
-  HTTPServer::reply(httpReply);
-  servlet->getRequests().erase(requestId);
+	if (!HAS_ATTR(node, "request") && !HAS_ATTR(node, "requestexpr")) {
+		LOG(ERROR) << "Response element requires request or requestexpr";
+		return;
+	}
+	if (HAS_ATTR(node, "requestexpr") && !_interpreter->getDataModel()) {
+		LOG(ERROR) << "Response element with requestexpr requires datamodel";
+		return;
+	}
+	if (HAS_ATTR(node, "close")) {
+
+	}
+
+	std::string requestId = (HAS_ATTR(node, "request") ? ATTR(node, "request") : _interpreter->getDataModel().evalAsString(ATTR(node, "requestexpr")));
+
+	HTTPServletInvoker* servlet = _interpreter->getHTTPServlet();
+	tthread::lock_guard<tthread::recursive_mutex> lock(servlet->getMutex());
+
+	if (servlet->getRequests().find(requestId) == servlet->getRequests().end()) {
+		LOG(ERROR) << "No matching HTTP request for response element";
+		return;
+	}
+
+	std::string statusStr = (HAS_ATTR(node, "status") ? ATTR(node, "status") : "200");
+	if (!isNumeric(statusStr.c_str(), 10)) {
+		LOG(ERROR) << "Response element with non-numeric status " << statusStr;
+		return;
+	}
+	int status = strTo<int>(statusStr);
+
+	HTTPServer::Request httpReq = servlet->getRequests()[requestId];
+
+	HTTPServer::Reply httpReply(httpReq);
+	httpReply.status = status;
+
+	HTTPServer::reply(httpReply);
+	servlet->getRequests().erase(requestId);
 }
 
 void ResponseElement::exitElement(const Arabica::DOM::Node<std::string>& node) {
-  
+
 }
 
 }
\ No newline at end of file
diff --git a/src/uscxml/plugins/element/response/ResponseElement.h b/src/uscxml/plugins/element/response/ResponseElement.h
index 97ff9db..9b3ce61 100644
--- a/src/uscxml/plugins/element/response/ResponseElement.h
+++ b/src/uscxml/plugins/element/response/ResponseElement.h
@@ -8,7 +8,7 @@
 #endif
 
 namespace uscxml {
-	
+
 class ResponseElement : public ExecutableContentImpl {
 public:
 	ResponseElement() {}
@@ -22,16 +22,16 @@ public:
 	std::string getNamespace() {
 		return "http://www.w3.org/2005/07/scxml";
 	}
-	
+
 	bool processChildren() {
 		return false;
 	}
-	
+
 	void enterElement(const Arabica::DOM::Node<std::string>& node);
 	void exitElement(const Arabica::DOM::Node<std::string>& node);
-	
+
 };
-	
+
 #ifdef BUILD_AS_PLUGINS
 PLUMA_INHERIT_PROVIDER(ResponseElement, Element);
 #endif
diff --git a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp
index 2d308ce..9486de3 100644
--- a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp
+++ b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp
@@ -158,7 +158,7 @@ void DirMonInvoker::reportExistingIn(const std::string dir, FW::WatchID watchid)
 		if (boost::iequals(dname, ".") || boost::iequals(dname, ".."))
 			continue;
 
-    char* filename = (char*)malloc(dir.size() + dname.size() + 2);
+		char* filename = (char*)malloc(dir.size() + dname.size() + 2);
 		sprintf(filename, "%s/%s", dir.c_str(), dname.c_str());
 
 		struct stat fileStat;
diff --git a/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGConverter.cpp b/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGConverter.cpp
index eb3d810..49c9ccb 100644
--- a/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGConverter.cpp
+++ b/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGConverter.cpp
@@ -33,10 +33,10 @@ Data OSGConverter::getDataModelVariables() {
 }
 
 void OSGConverter::send(const SendRequest& req) {
-  std::cout << req << std::endl;
-  Event event;
-  event.name = "error";
-  returnEvent(event);
+	std::cout << req << std::endl;
+	Event event;
+	event.name = "error";
+	returnEvent(event);
 }
 
 void OSGConverter::cancel(const std::string sendId) {
diff --git a/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp b/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp
index 0272ca8..f89c1b0 100644
--- a/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp
+++ b/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp
@@ -19,7 +19,7 @@ HeartbeatInvoker::HeartbeatInvoker() {
 }
 
 HeartbeatInvoker::~HeartbeatInvoker() {
-  cancel("");
+	cancel("");
 };
 
 boost::shared_ptr<IOProcessorImpl> HeartbeatInvoker::create(Interpreter* interpreter) {
diff --git a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp
index 40f8b66..78e3bea 100644
--- a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp
+++ b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp
@@ -16,24 +16,24 @@ bool connect(pluma::Host& host) {
 #endif
 
 HTTPServletInvoker::HTTPServletInvoker() {
-  _isInterpreterGlobal = false;
+	_isInterpreterGlobal = false;
 }
 
 HTTPServletInvoker::HTTPServletInvoker(Interpreter* interpreter) {
-  _isInterpreterGlobal = true;
-  _interpreter = interpreter;
-  std::stringstream path;
-  path << _interpreter->getName();
-  int i = 2;
-  while(!HTTPServer::registerServlet(path.str(), this)) {
-    path.clear();
-    path.str();
-    path << _interpreter->getName() << toStr(i++);
-  }
+	_isInterpreterGlobal = true;
+	_interpreter = interpreter;
+	std::stringstream path;
+	path << _interpreter->getName();
+	int i = 2;
+	while(!HTTPServer::registerServlet(path.str(), this)) {
+		path.clear();
+		path.str();
+		path << _interpreter->getName() << toStr(i++);
+	}
 }
 
 HTTPServletInvoker::~HTTPServletInvoker() {
-  HTTPServer::unregisterServlet(this);
+	HTTPServer::unregisterServlet(this);
 
 };
 
@@ -51,97 +51,97 @@ Data HTTPServletInvoker::getDataModelVariables() {
 }
 
 void HTTPServletInvoker::send(const SendRequest& req) {
-  assert(!_isInterpreterGlobal);
-  
-  if (req.name.find("reply.", 0, req.name.length())) {
-    // this is a reply
-    const std::string requestId = req.name.substr(6);
-    if (_requests.find(requestId) == _requests.end()) {
-      LOG(ERROR) << "Replying to non existing request " << requestId;
-      return;
-    }
-      
-    HTTPServer::Request httpRequest = _requests[requestId];
-    HTTPServer::Reply httpReply(httpRequest);
-    httpReply.content = req.content;
-
-    std::map<std::string, std::string>::const_iterator nameListIter = req.namelist.begin();
-    while(nameListIter != req.namelist.end()) {
-      httpReply.headers[nameListIter->first] = nameListIter->second;
-      nameListIter++;
-    }
-
-    std::multimap<std::string, std::string>::const_iterator paramIter = req.params.begin();
-    while(paramIter != req.params.end()) {
-      httpReply.headers[paramIter->first] = paramIter->second;
-      paramIter++;
-    }
-
-    HTTPServer::reply(httpReply);
-    return;
-  }
+	assert(!_isInterpreterGlobal);
+
+	if (req.name.find("reply.", 0, req.name.length())) {
+		// this is a reply
+		const std::string requestId = req.name.substr(6);
+		if (_requests.find(requestId) == _requests.end()) {
+			LOG(ERROR) << "Replying to non existing request " << requestId;
+			return;
+		}
+
+		HTTPServer::Request httpRequest = _requests[requestId];
+		HTTPServer::Reply httpReply(httpRequest);
+		httpReply.content = req.content;
+
+		std::map<std::string, std::string>::const_iterator nameListIter = req.namelist.begin();
+		while(nameListIter != req.namelist.end()) {
+			httpReply.headers[nameListIter->first] = nameListIter->second;
+			nameListIter++;
+		}
+
+		std::multimap<std::string, std::string>::const_iterator paramIter = req.params.begin();
+		while(paramIter != req.params.end()) {
+			httpReply.headers[paramIter->first] = paramIter->second;
+			paramIter++;
+		}
+
+		HTTPServer::reply(httpReply);
+		return;
+	}
 }
 
 void HTTPServletInvoker::cancel(const std::string sendId) {
-  assert(!_isInterpreterGlobal);
+	assert(!_isInterpreterGlobal);
 }
 
 void HTTPServletInvoker::invoke(const InvokeRequest& req) {
-  assert(!_isInterpreterGlobal);
-
-  _invokeId = req.invokeid;
-  if (req.params.find("path") == req.params.end()) {
-    LOG(ERROR) << "Path parameter required with httpserver";
-  }
-  _path = (*req.params.find("path")).second;
-  
-  if (req.params.find("callback") != req.params.end()) {
-    _callback = (*req.params.find("callback")).second;
-  } else {
-    _callback = _path;
-    std::replace(_callback.begin(), _callback.end(), '/', '.');
-  }
-
-  if (!HTTPServer::registerServlet(_path, this)) {
-    LOG(ERROR) << "Cannot register http servlet at " << _path << ": " << " already taken";
-  }
+	assert(!_isInterpreterGlobal);
+
+	_invokeId = req.invokeid;
+	if (req.params.find("path") == req.params.end()) {
+		LOG(ERROR) << "Path parameter required with httpserver";
+	}
+	_path = (*req.params.find("path")).second;
+
+	if (req.params.find("callback") != req.params.end()) {
+		_callback = (*req.params.find("callback")).second;
+	} else {
+		_callback = _path;
+		std::replace(_callback.begin(), _callback.end(), '/', '.');
+	}
+
+	if (!HTTPServer::registerServlet(_path, this)) {
+		LOG(ERROR) << "Cannot register http servlet at " << _path << ": " << " already taken";
+	}
 }
 
 /**
  * Receive a request and deliver it to the interpreter
  */
 void HTTPServletInvoker::httpRecvRequest(const HTTPServer::Request& req) {
-  tthread::lock_guard<tthread::recursive_mutex> lock(_mutex);
-  
+	tthread::lock_guard<tthread::recursive_mutex> lock(_mutex);
+
 //  evhttp_request_own(req.curlReq);
 
-  _requests[toStr((uintptr_t)req.curlReq)] = req;
-  
-  Event event;
-  
-  if (_isInterpreterGlobal) {
-    event.name = "http." + req.type;
-    event.origin = toStr((uintptr_t)req.curlReq);
-  } else {
-    event.name = _callback;
-    event.data.compound["reqId"] = Data(toStr((uintptr_t)req.curlReq), Data::VERBATIM);
-  }
-  
-  std::map<std::string, std::string>::const_iterator headerIter = req.headers.begin();
-  while(headerIter != req.headers.end()) {
-    event.data.compound["headers"].compound[headerIter->first] = Data(headerIter->second, Data::VERBATIM);
-    headerIter++;
-  }
-
-  event.data.compound["content"] = Data(req.content, Data::VERBATIM);
-  event.data.compound["type"] = Data(req.type, Data::VERBATIM);
-  
-  returnEvent(event);
+	_requests[toStr((uintptr_t)req.curlReq)] = req;
+
+	Event event;
+
+	if (_isInterpreterGlobal) {
+		event.name = "http." + req.type;
+		event.origin = toStr((uintptr_t)req.curlReq);
+	} else {
+		event.name = _callback;
+		event.data.compound["reqId"] = Data(toStr((uintptr_t)req.curlReq), Data::VERBATIM);
+	}
+
+	std::map<std::string, std::string>::const_iterator headerIter = req.headers.begin();
+	while(headerIter != req.headers.end()) {
+		event.data.compound["headers"].compound[headerIter->first] = Data(headerIter->second, Data::VERBATIM);
+		headerIter++;
+	}
+
+	event.data.compound["content"] = Data(req.content, Data::VERBATIM);
+	event.data.compound["type"] = Data(req.type, Data::VERBATIM);
+
+	returnEvent(event);
 
 }
-  
+
 std::string HTTPServletInvoker::getPath() {
-  return _path;
+	return _path;
 }
 
 }
\ No newline at end of file
diff --git a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h
index 1d667de..4ac87e0 100644
--- a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h
+++ b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h
@@ -13,7 +13,7 @@ namespace uscxml {
 class HTTPServletInvoker : public InvokerImpl, public HTTPServlet {
 public:
 	HTTPServletInvoker();
-  HTTPServletInvoker(Interpreter* interpreter);
+	HTTPServletInvoker(Interpreter* interpreter);
 	virtual ~HTTPServletInvoker();
 	virtual boost::shared_ptr<IOProcessorImpl> create(Interpreter* interpreter);
 
@@ -29,21 +29,27 @@ public:
 	virtual void cancel(const std::string sendId);
 	virtual void invoke(const InvokeRequest& req);
 
-  // HTTPServlet
-  virtual void httpRecvRequest(const HTTPServer::Request& req);
-  virtual std::string getPath();
-  virtual void setURL(const std::string& url) { _url = url; }
+	// HTTPServlet
+	virtual void httpRecvRequest(const HTTPServer::Request& req);
+	virtual std::string getPath();
+	virtual void setURL(const std::string& url) {
+		_url = url;
+	}
+
+	tthread::recursive_mutex& getMutex() {
+		return _mutex;
+	}
+	std::map<std::string, HTTPServer::Request>& getRequests() {
+		return _requests;
+	}
 
-  tthread::recursive_mutex& getMutex() { return _mutex; }
-  std::map<std::string, HTTPServer::Request>& getRequests() { return _requests; }
-  
 protected:
-  tthread::recursive_mutex _mutex;
-  std::map<std::string, HTTPServer::Request> _requests;
-  std::string _path;
-  std::string _callback;
-  std::string _url;
-  bool _isInterpreterGlobal;
+	tthread::recursive_mutex _mutex;
+	std::map<std::string, HTTPServer::Request> _requests;
+	std::string _path;
+	std::string _callback;
+	std::string _url;
+	bool _isInterpreterGlobal;
 };
 
 #ifdef BUILD_AS_PLUGINS
diff --git a/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.cpp
index ed51ef8..1b58785 100644
--- a/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.cpp
+++ b/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.cpp
@@ -50,11 +50,11 @@ boost::shared_ptr<IOProcessorImpl> EventIOProcessor::create(Interpreter* interpr
 	io->_interpreter = interpreter;
 
 	// register at http server
-  std::string path = interpreter->getName();
-  path += "/basichttp";
-  if (!HTTPServer::registerServlet(path, io.get())) {
-    LOG(ERROR) << "Cannot register basichttp ioprocessor at " << path << ": " << " already taken";
-  }
+	std::string path = interpreter->getName();
+	path += "/basichttp";
+	if (!HTTPServer::registerServlet(path, io.get())) {
+		LOG(ERROR) << "Cannot register basichttp ioprocessor at " << path << ": " << " already taken";
+	}
 
 	return io;
 }
@@ -67,13 +67,13 @@ Data EventIOProcessor::getDataModelVariables() {
 }
 
 void EventIOProcessor::httpRecvRequest(const HTTPServer::Request& req) {
-  Event reqEvent;
+	Event reqEvent;
 	reqEvent.type = Event::EXTERNAL;
 	bool scxmlStructFound = false;
-  
-  std::map<std::string, std::string>::const_iterator headerIter = req.headers.begin();
-  while(headerIter != req.headers.end()) {
-    if (boost::iequals("_scxmleventstruct", headerIter->first)) {
+
+	std::map<std::string, std::string>::const_iterator headerIter = req.headers.begin();
+	while(headerIter != req.headers.end()) {
+		if (boost::iequals("_scxmleventstruct", headerIter->first)) {
 			reqEvent = Event::fromXML(evhttp_decode_uri(headerIter->second.c_str()));
 			scxmlStructFound = true;
 			break;
@@ -81,33 +81,33 @@ void EventIOProcessor::httpRecvRequest(const HTTPServer::Request& req) {
 			reqEvent.name = evhttp_decode_uri(headerIter->second.c_str());
 		} else {
 			reqEvent.data.compound[headerIter->first] = Data(evhttp_decode_uri(headerIter->second.c_str()), Data::VERBATIM);
-    }
-    headerIter++;
-  }
-  
+		}
+		headerIter++;
+	}
+
 	if (reqEvent.name.length() == 0)
 		reqEvent.name = req.type;
-  
+
 	if (!scxmlStructFound) {
 		// get content into event
 		reqEvent.data.compound["content"] = Data(req.content, Data::VERBATIM);
 	}
-  
+
 	returnEvent(reqEvent);
 	evhttp_send_reply(req.curlReq, 200, "OK", NULL);
 }
 
 void EventIOProcessor::send(const SendRequest& req) {
 
-  std::string target = req.target;
-  URL targetURL(target);
+	std::string target = req.target;
+	URL targetURL(target);
 
-  // event name
+	// event name
 	if (req.name.size() > 0) {
-    targetURL.addOutHeader("_scxmleventname", evhttp_encode_uri(req.name.c_str()));
+		targetURL.addOutHeader("_scxmleventname", evhttp_encode_uri(req.name.c_str()));
 	}
 
-  // event namelist
+	// event namelist
 	if (req.namelist.size() > 0) {
 		std::map<std::string, std::string>::const_iterator namelistIter = req.namelist.begin();
 		while (namelistIter != req.namelist.end()) {
@@ -116,7 +116,7 @@ void EventIOProcessor::send(const SendRequest& req) {
 		}
 	}
 
-  // event params
+	// event params
 	if (req.params.size() > 0) {
 		std::multimap<std::string, std::string>::const_iterator paramIter = req.params.begin();
 		while (paramIter != req.params.end()) {
@@ -124,47 +124,47 @@ void EventIOProcessor::send(const SendRequest& req) {
 			paramIter++;
 		}
 	}
-  
+
 	// content
 	if (req.content.size() > 0)
-    targetURL.setOutContent(req.content);
+		targetURL.setOutContent(req.content);
 
-  targetURL.setRequestType("post");
-  targetURL.addMonitor(this);
-  
-  _sendRequests[req.sendid] = std::make_pair(targetURL, req);
-  URLFetcher::fetchURL(targetURL);
+	targetURL.setRequestType("post");
+	targetURL.addMonitor(this);
+
+	_sendRequests[req.sendid] = std::make_pair(targetURL, req);
+	URLFetcher::fetchURL(targetURL);
 }
- 
+
 void EventIOProcessor::downloadStarted(const URL& url) {}
 
 void EventIOProcessor::downloadCompleted(const URL& url) {
-  std::map<std::string, std::pair<URL, SendRequest> >::iterator reqIter = _sendRequests.begin();
-  while(reqIter != _sendRequests.end()) {
-    if (reqIter->second.first == url) {
-      _sendRequests.erase(reqIter);
-      return;
-    }
-    reqIter++;
-  }
-  assert(false);
+	std::map<std::string, std::pair<URL, SendRequest> >::iterator reqIter = _sendRequests.begin();
+	while(reqIter != _sendRequests.end()) {
+		if (reqIter->second.first == url) {
+			_sendRequests.erase(reqIter);
+			return;
+		}
+		reqIter++;
+	}
+	assert(false);
 }
 
 void EventIOProcessor::downloadFailed(const URL& url, int errorCode) {
-  
-  std::map<std::string, std::pair<URL, SendRequest> >::iterator reqIter = _sendRequests.begin();
-  while(reqIter != _sendRequests.end()) {
-    if (reqIter->second.first == url) {
-      Event failEvent;
-      failEvent.name = "error.communication";
-      returnEvent(failEvent);
-
-      _sendRequests.erase(reqIter);
-      return;
-    }
-    reqIter++;
-  }
-  assert(false);
+
+	std::map<std::string, std::pair<URL, SendRequest> >::iterator reqIter = _sendRequests.begin();
+	while(reqIter != _sendRequests.end()) {
+		if (reqIter->second.first == url) {
+			Event failEvent;
+			failEvent.name = "error.communication";
+			returnEvent(failEvent);
+
+			_sendRequests.erase(reqIter);
+			return;
+		}
+		reqIter++;
+	}
+	assert(false);
 
 }
 
diff --git a/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.h b/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.h
index 416761f..70c6bea 100644
--- a/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.h
+++ b/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.h
@@ -37,18 +37,20 @@ public:
 
 	Data getDataModelVariables();
 
-  /// HTTPServlet
+	/// HTTPServlet
 	void httpRecvRequest(const HTTPServer::Request& req);
-	void setURL(const std::string& url) { _url = url; }
+	void setURL(const std::string& url) {
+		_url = url;
+	}
 
-  // URLMonitor
-  void downloadStarted(const URL& url);
-  void downloadCompleted(const URL& url);
-  void downloadFailed(const URL& url, int errorCode);
+	// URLMonitor
+	void downloadStarted(const URL& url);
+	void downloadCompleted(const URL& url);
+	void downloadFailed(const URL& url, int errorCode);
 
 protected:
 	std::string _url;
-  std::map<std::string, std::pair<URL, SendRequest> > _sendRequests;
+	std::map<std::string, std::pair<URL, SendRequest> > _sendRequests;
 };
 
 #ifdef BUILD_AS_PLUGINS