Index: TECH/PubSub/impl/EventDispatcher.cls.xml
===================================================================
diff -u -r1125 -r2508
--- TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 1125)
+++ TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 2508)
@@ -100,16 +100,19 @@
 	#dim LogDetail As %String = ""
 
 	Try {
+		#dim EventDataClassname As %String = $classname(Event.Data)
 		#dim SerializedObject As %String = ..GeefGeserializeerdeString(Event)
 		#dim SerializedData As %String = $System.Encryption.Base64Encode(SerializedObject)
-		#dim MaakEventCode As %String = "Set EventData = ##class(%SerialObject).%Open($System.Encryption.Base64Decode("""_SerializedData_"""))"
-		Set MaakEventCode = MaakEventCode _$C(13,10)_ "Set Event = ##class("_Event.%ClassName(1)_").%New(EventData)"
-		Set MaakEventCode = MaakEventCode _$C(13,10)_ "Do $ZOBJCLASSMETHOD("""_Subscription.RespondingClass_""", """_Subscription.RespondingMethod_""", Event)"
+		#dim MaakEventCode As %String = ""
+		Set MaakEventCode = "Set DataString = $System.Encryption.Base64Decode("""_SerializedData_""")"
+		Set MaakEventCode = "Set EventData = ##class(TECH.XMLCorrelater).%New().FromString(DataString,"""_EventDataClassname_""","""_EventDataClassname_""")"
+		Set MaakEventCode = MaakEventCode _$$$CRLF_ "Set Event = ##class("_Event.%ClassName(1)_").%New(EventData)"
+		Set MaakEventCode = MaakEventCode _$$$CRLF_ "Do $ZOBJCLASSMETHOD("""_Subscription.RespondingClass_""", """_Subscription.RespondingMethod_""", Event)"
 
 		Set LogDetail = "Event: "_Event.Type_", Class: "_Subscription.RespondingClass_", Method: "_Subscription.RespondingMethod_", Data:"_$$LCVT^vhLib(SerializedObject)
-		Set LogDetail=LogDetail_$C(13,10,13,10)_"Reinvoke:"_$C(13,10)_MaakEventCode
-		Set LogDetail=LogDetail_$C(13,10,13,10)_"Error: "_$C(13,10)_Exception.ToString()
-		Set LogDetail=LogDetail_$C(13,10,13,10)_"Stack: "_$E(Exception.GeefStack(),1,25000)
+		Set LogDetail=LogDetail_$$$CRLF_$$$CRLF_"Reinvoke:"_$$$CRLF_MaakEventCode
+		Set LogDetail=LogDetail_$$$CRLF_$$$CRLF_"Error: "_$$$CRLF_Exception.ToString()
+		Set LogDetail=LogDetail_$$$CRLF_$$$CRLF_"Stack: "_$E(Exception.GeefStack(),1,25000)
 	}
 	Catch {
 		#dim LogDetailException As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -125,8 +128,8 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim SerializedObject As %String = ""
-	Do Event.Data.%SerializeObject(.SerializedObject)
-	Quit SerializedObject
+	do Event.Data.XMLExportToString(.SerializedObject)
+	quit SerializedObject
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/XMLCorrelater.cls.xml
===================================================================
diff -u -r2255 -r2508
--- TECH/XMLCorrelater.cls.xml	(.../XMLCorrelater.cls.xml)	(revision 2255)
+++ TECH/XMLCorrelater.cls.xml	(.../XMLCorrelater.cls.xml)	(revision 2508)
@@ -22,6 +22,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="FromString">
+<FormalSpec>String:%String,Classname:%String,XmlRootTag:%String=""</FormalSpec>
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[
+	#dim Object As %CacheString
+	Set XMLReader = ##class(%XML.Reader).%New()
+	Do XMLReader.OpenString(String)
+	Do XMLReader.Correlate(XmlRootTag,Classname)
+	Do XMLReader.Next(.Object)
+	Do XMLReader.Close()
+	Quit Object
+]]></Implementation>
+</Method>
+
 <Method name="ControleerStatusOK">
 <FormalSpec>Status:%Status,Message:%String,Stream:%GlobalCharacterStream=##class(%GlobalCharacterStream).%New()</FormalSpec>
 <Private>1</Private>
Index: vhTest/Fake/TECH/XMLCorrelater.cls.xml
===================================================================
diff -u -r2401 -r2508
--- vhTest/Fake/TECH/XMLCorrelater.cls.xml	(.../XMLCorrelater.cls.xml)	(revision 2401)
+++ vhTest/Fake/TECH/XMLCorrelater.cls.xml	(.../XMLCorrelater.cls.xml)	(revision 2508)
@@ -13,6 +13,13 @@
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="FromString">
+<FormalSpec>String:%String,Classname:%String,XmlRootTag:%String=""</FormalSpec>
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/TECH/XMLCorrelater.cls.xml
===================================================================
diff -u -r2401 -r2508
--- vhTest/Mock/TECH/XMLCorrelater.cls.xml	(.../XMLCorrelater.cls.xml)	(revision 2401)
+++ vhTest/Mock/TECH/XMLCorrelater.cls.xml	(.../XMLCorrelater.cls.xml)	(revision 2508)
@@ -9,6 +9,13 @@
 <Super>TECH.XMLCorrelater,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="FromString">
+<FormalSpec>String:%String,Classname:%String,XmlRootTag:%String=""</FormalSpec>
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("FromString",String,Classname,XmlRootTag)
+]]></Implementation>
+</Method>
+
 <Method name="GeefObjectVanBestand">
 <FormalSpec>BestandNaam:%String,ObjectKlasseNaam:%String,XMLRootTag:%String=""</FormalSpec>
 <ReturnType>%CacheString</ReturnType>