Index: AX/AifMessage/event/RequestSendEventData.cls.xml
===================================================================
diff -u -r35049 -r35232
--- AX/AifMessage/event/RequestSendEventData.cls.xml	(.../RequestSendEventData.cls.xml)	(revision 35049)
+++ AX/AifMessage/event/RequestSendEventData.cls.xml	(.../RequestSendEventData.cls.xml)	(revision 35232)
@@ -12,7 +12,7 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="Id">
+<Property name="SubjectId">
 <Type>%String</Type>
 </Property>
 
@@ -29,13 +29,12 @@
 <State>RequestSendEventDataState</State>
 <StreamLocation>^AX.AifMess6D74.RequestSendB850S</StreamLocation>
 <Data name="RequestSendEventDataState">
-<Structure>listnode</Structure>
 <Subscript>"RequestSendEventData"</Subscript>
 <Value name="1">
 <Value>Command</Value>
 </Value>
 <Value name="2">
-<Value>Id</Value>
+<Value>SubjectId</Value>
 </Value>
 <Value name="3">
 <Value>MessageStream</Value>
Index: AX/AifMessage/event/CorruptedResponseReceivedEventData.cls.xml
===================================================================
diff -u
--- AX/AifMessage/event/CorruptedResponseReceivedEventData.cls.xml	(revision 0)
+++ AX/AifMessage/event/CorruptedResponseReceivedEventData.cls.xml	(revision 35232)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.AifMessage.event.CorruptedResponseReceivedEventData">
+<Super>TECH.PubSub.EventData</Super>
+
+<Parameter name="XMLTYPE">
+<Type>%String</Type>
+<Default>AX.AifMessage.event.CorruptedResponseReceivedEventData</Default>
+</Parameter>
+
+<Property name="Filename">
+<Type>%String</Type>
+</Property>
+
+<Property name="MessageStream">
+<Type>%GlobalCharacterStream</Type>
+</Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>CorruptedResponseReceivedEventDataState</State>
+<Data name="CorruptedResponseReceivedEventDataState">
+<Subscript>"CorruptedResponseReceivedEventData"</Subscript>
+<Value name="1">
+<Value>Filename</Value>
+</Value>
+<Value name="2">
+<Value>MessageStream</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: AX/AifMessage/event/ResponseReceivedEventData.cls.xml
===================================================================
diff -u
--- AX/AifMessage/event/ResponseReceivedEventData.cls.xml	(revision 0)
+++ AX/AifMessage/event/ResponseReceivedEventData.cls.xml	(revision 35232)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.AifMessage.event.ResponseReceivedEventData">
+<Super>TECH.PubSub.EventData</Super>
+
+<Parameter name="XMLTYPE">
+<Type>%String</Type>
+<Default>AX.AifMessage.event.ResponseReceivedEventData</Default>
+</Parameter>
+
+<Property name="MessageStream">
+<Type>%GlobalCharacterStream</Type>
+</Property>
+
+<Property name="Message">
+<Type>AXaif.Message.Envelope</Type>
+</Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>ResponseReceivedEventDataState</State>
+<Data name="ResponseReceivedEventDataState">
+<Subscript>"ResponseReceivedEventData"</Subscript>
+<Value name="1">
+<Value>MessageStream</Value>
+</Value>
+<Value name="2">
+<Value>Message</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/AifMessage/EventRaiser/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/AifMessage/EventRaiser/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/AifMessage/EventRaiser/Test.cls.xml	(revision 35232)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.AifMessage.EventRaiser.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: RaiseRequestSendEvent">
+<Implementation><![CDATA[
+	set PubSubEventRaiserSpy = ##class(vhTest.Spy.TECH.PubSub.EventRaiser).%New()
+	
+	set EventRaiser = ##class(AXimpl.AifMessage.EventRaiser).%New(PubSubEventRaiserSpy)
+	
+	set Message = ##class(AXaif.Message.Envelope).%New()
+	set Stream = ##class(%GlobalCharacterStream).%New()
+	do Stream.Write("SomeStreamData")
+	do EventRaiser.RaiseRequestSendEvent("Customer/Read","K||1000",Message,Stream)
+	
+	#dim Events As %ListOfObjects = PubSubEventRaiserSpy.GeefAsynchroneEvents()
+	
+	if $$$AssertEquals(Events.Count(),1) {
+		do $$$AssertEquals(Events.GetAt(1).Data.Message,Message)
+		do $$$AssertEquals(Events.GetAt(1).Data.MessageStream.Read(),Stream.Read())
+		do $$$AssertEquals(Events.GetAt(1).Data.Command,"Customer/Read")
+		do $$$AssertEquals(Events.GetAt(1).Data.SubjectId,"K||1000")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: RaiseResponseReceivedEvent">
+<Implementation><![CDATA[
+	set PubSubEventRaiserSpy = ##class(vhTest.Spy.TECH.PubSub.EventRaiser).%New()
+	
+	set EventRaiser = ##class(AXimpl.AifMessage.EventRaiser).%New(PubSubEventRaiserSpy)
+	
+	set Message = ##class(AXaif.Message.Envelope).%New()
+	set Stream = ##class(%GlobalCharacterStream).%New()
+	do Stream.Write("SomeStreamData")
+	do EventRaiser.RaiseResponseReceivedEvent(Message,Stream)
+	
+	#dim Events As %ListOfObjects = PubSubEventRaiserSpy.GeefAsynchroneEvents()
+	
+	if $$$AssertEquals(Events.Count(),1) {
+		do $$$AssertEquals(Events.GetAt(1).Data.Message,Message)
+		do $$$AssertEquals(Events.GetAt(1).Data.MessageStream.Read(),Stream.Read())
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: RaiseCorruptedResponseReceivedEvent">
+<Implementation><![CDATA[
+	set PubSubEventRaiserSpy = ##class(vhTest.Spy.TECH.PubSub.EventRaiser).%New()
+	
+	set EventRaiser = ##class(AXimpl.AifMessage.EventRaiser).%New(PubSubEventRaiserSpy)
+	
+	set Message = ##class(AXaif.Message.Envelope).%New()
+	set Stream = ##class(%GlobalCharacterStream).%New()
+	do Stream.Write("SomeStreamData")
+	do EventRaiser.RaiseCorruptedResponseReceivedEvent("E:\File.xml",Stream)
+	
+	#dim Events As %ListOfObjects = PubSubEventRaiserSpy.GeefAsynchroneEvents()
+	
+	if $$$AssertEquals(Events.Count(),1) {
+		do $$$AssertEquals(Events.GetAt(1).Data.Filename,"E:\File.xml")
+		do $$$AssertEquals(Events.GetAt(1).Data.MessageStream.Read(),Stream.Read())
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/AifMessage/event/CorruptedResponseReceivedEvent.cls.xml
===================================================================
diff -u
--- AX/AifMessage/event/CorruptedResponseReceivedEvent.cls.xml	(revision 0)
+++ AX/AifMessage/event/CorruptedResponseReceivedEvent.cls.xml	(revision 35232)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.AifMessage.event.CorruptedResponseReceivedEvent">
+<Super>TECH.PubSub.Event</Super>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: AX/AifMessage/event/ResponseReceivedEvent.cls.xml
===================================================================
diff -u
--- AX/AifMessage/event/ResponseReceivedEvent.cls.xml	(revision 0)
+++ AX/AifMessage/event/ResponseReceivedEvent.cls.xml	(revision 35232)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.AifMessage.event.ResponseReceivedEvent">
+<Super>TECH.PubSub.Event</Super>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: AXimpl/AifMessage/EventRaiser.cls.xml
===================================================================
diff -u -r35231 -r35232
--- AXimpl/AifMessage/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 35231)
+++ AXimpl/AifMessage/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 35232)
@@ -14,7 +14,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..EventRaiser = ##class(TECH.Context).Instance().GeefPubSubAPI().GeefEventRaiser()
+	set ..EventRaiser = $$$Inject(EventRaiser,##class(TECH.Context).Instance().GeefPubSubAPI().GeefEventRaiser())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -25,7 +25,7 @@
 	set EventData = ##class(AX.AifMessage.event.RequestSendEventData).%New()
 	
 	set EventData.Command = Command
-	set EventData.Id = Id
+	set EventData.SubjectId = Id
 	set EventData.Message = Message
 	do EventData.MessageStream.CopyFrom(MessageStream)
 	
@@ -36,10 +36,26 @@
 
 <Method name="RaiseResponseReceivedEvent">
 <FormalSpec>Message:AXaif.Message.Envelope,MessageStream:%GlobalCharacterStream</FormalSpec>
+<Implementation><![CDATA[
+	set EventData = ##class(AX.AifMessage.event.ResponseReceivedEventData).%New()
+	set EventData.Message = Message
+	do EventData.MessageStream.CopyFrom(MessageStream)
+	
+	set Event = ##class(AX.AifMessage.event.ResponseReceivedEvent).%New(EventData)
+	do ..EventRaiser.RaiseEventAsync(Event)
+]]></Implementation>
 </Method>
 
 <Method name="RaiseCorruptedResponseReceivedEvent">
 <FormalSpec>FullFilename:%String,MessageStream:%GlobalCharacterStream</FormalSpec>
+<Implementation><![CDATA[
+	set EventData = ##class(AX.AifMessage.event.CorruptedResponseReceivedEventData).%New()
+	set EventData.Filename = FullFilename
+	do EventData.MessageStream.CopyFrom(MessageStream)
+	
+	set Event = ##class(AX.AifMessage.event.CorruptedResponseReceivedEvent).%New(EventData)
+	do ..EventRaiser.RaiseEventAsync(Event)
+]]></Implementation>
 </Method>
 </Class>