Index: AXimpl/BizTalkMessage/Converter/GeolocationUpsertConverter.cls.xml
===================================================================
diff -u -r38384 -r38397
--- AXimpl/BizTalkMessage/Converter/GeolocationUpsertConverter.cls.xml	(.../GeolocationUpsertConverter.cls.xml)	(revision 38384)
+++ AXimpl/BizTalkMessage/Converter/GeolocationUpsertConverter.cls.xml	(.../GeolocationUpsertConverter.cls.xml)	(revision 38397)
@@ -7,8 +7,13 @@
 <FormalSpec>Command:AXBizTalk.Crm.Geolocation.Request</FormalSpec>
 <ReturnType>AXBizTalk.Crm.Geolocation.MessageParts</ReturnType>
 <Implementation><![CDATA[
+	Set Agenda = ##class(Derde.Agenda.Agenda).%OpenId(Command.SubjectId)
 	
+	Set Location=##class(AXBizTalk.Crm.Geolocation.Location).%New()
+	Do Location.Fill(Agenda)
+	
 	Set MessageParts = ##class(AXBizTalk.Crm.Geolocation.MessageParts).%New()
+	Set MessageParts.Location = Location
 	
 	Quit MessageParts
 ]]></Implementation>
Index: BL/Derde/Agenda/GeoMobile.cls.xml
===================================================================
diff -u -r38383 -r38397
--- BL/Derde/Agenda/GeoMobile.cls.xml	(.../GeoMobile.cls.xml)	(revision 38383)
+++ BL/Derde/Agenda/GeoMobile.cls.xml	(.../GeoMobile.cls.xml)	(revision 38397)
@@ -679,7 +679,7 @@
 	Set OK=Agenda.%Save()
 	;w $$ParseStatus^vhLib(OK),!
 	Quit:OK'=$$$OK OK
-	Do ##class(BL.Derde.Agenda.CRMExport).%New().SendXML(Agenda)
+	Do ##class(AX.Uitgaand.common.impl.AifGenerator).%New().Generate(##class(AXimpl.AifMessage.Request).%New("Crm/GeolocationUpsert",Agenda.%Id()))
 
 	Quit $$$OK
 ]]></Implementation>
Index: BL/Derde/Agenda/GeoDynamicsImport.cls.xml
===================================================================
diff -u -r38383 -r38397
--- BL/Derde/Agenda/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 38383)
+++ BL/Derde/Agenda/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 38397)
@@ -206,7 +206,7 @@
 	. .	If $isObject(Agenda)&&(Agenda.Afstand'=Afstand) Do
 	. . . Set Agenda.Afstand=Afstand
 	. . . Set sc=Agenda.%Save()
-	. . . Do ##class(BL.Derde.Agenda.CRMExport).%New().SendXML(Agenda)
+	. . . Do ##class(AX.Uitgaand.common.impl.AifGenerator).%New().Generate(##class(AXimpl.AifMessage.Request).%New("Crm/GeolocationUpsert",Agenda.%Id()))
 	
  	&sql(CLOSE UPDAFST)
 ]]></Implementation>