Index: WS/Transsmart/impl/LoggingTboxServicePort.cls.xml
===================================================================
diff -u -r59489 -r59578
--- WS/Transsmart/impl/LoggingTboxServicePort.cls.xml	(.../LoggingTboxServicePort.cls.xml)	(revision 59489)
+++ WS/Transsmart/impl/LoggingTboxServicePort.cls.xml	(.../LoggingTboxServicePort.cls.xml)	(revision 59578)
@@ -16,11 +16,18 @@
 <Type>%String</Type>
 </Property>
 
+<Method name="ZetLocationVoorOmgeving">
+<FormalSpec>Omgeving:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..Logger.Info(..%ClassName(),"Webservice location zetten voor omgeving " _ Omgeving)
+]]></Implementation>
+</Method>
+
 <Method name="doBooking">
 <FormalSpec>doBooking:WS.Transsmart.tns.doBooking</FormalSpec>
 <ReturnType>WS.Transsmart.tns.getStatusResponse</ReturnType>
 <ReturnTypeParams>XMLNAME="getStatusResponse"</ReturnTypeParams>
 <Implementation><![CDATA[
+	Do ..LogHeaders("Transsmart doBooking headers")	
 	Do ..LogXmlAsStream("Transsmart doBooking request",doBooking)
 	#dim Response as WS.Transsmart.tns.getStatusResponse = ##class(WS.Transsmart.tns.getStatusResponse).%New()
 	Do ..LogXmlAsStream("Transsmart doBooking response",Response)
@@ -64,6 +71,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="LogHeaders">
+<FormalSpec>Actie:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	do ..Logger.Info(Actie _ " url " , ..Location _ $$$CRLF _ "SSLConfiguration :" _ $Select($Length(..SSLConfiguration):..SSLConfiguration,1:"Geen"))
+	
+	Set it = ##class(TECH.ListIterator).%New(..HeadersOut)
+	#dim Header As WS.Transsmart.tns.authentication
+	While(it.HasNext()){
+		Set Header = it.Next()
+		Do ..LogXmlAsStream("Transsmart doBooking headers",Header)	
+	}
+]]></Implementation>
+</Method>
+
 <UDLText name="T">
 <Content><![CDATA[
 /*
Index: vhTest/Mock/WS/Transsmart/TboxServicePort.cls.xml
===================================================================
diff -u -r59489 -r59578
--- vhTest/Mock/WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 59489)
+++ vhTest/Mock/WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 59578)
@@ -8,6 +8,12 @@
 <Super>WS.Transsmart.TboxServicePort,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="ZetLocationVoorOmgeving">
+<FormalSpec>Omgeving:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLocationVoorOmgeving",Omgeving)
+]]></Implementation>
+</Method>
+
 <Method name="doBooking">
 <FormalSpec>doBooking:WS.Transsmart.tns.doBooking</FormalSpec>
 <ReturnType>WS.Transsmart.tns.getStatusResponse</ReturnType>
Index: WS/Transsmart/TboxServicePort.cls.xml
===================================================================
diff -u -r59489 -r59578
--- WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 59489)
+++ WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 59578)
@@ -4,6 +4,11 @@
 <Abstract>1</Abstract>
 <Super>TECH.Interface</Super>
 
+<Method name="ZetLocationVoorOmgeving">
+<Abstract>1</Abstract>
+<FormalSpec>Omgeving:%String</FormalSpec>
+</Method>
+
 <Method name="doBooking">
 <Abstract>1</Abstract>
 <FormalSpec>doBooking:WS.Transsmart.tns.doBooking</FormalSpec>
Index: WS/Transsmart/impl/TboxServicePortBase.cls.xml
===================================================================
diff -u -r59489 -r59578
--- WS/Transsmart/impl/TboxServicePortBase.cls.xml	(.../TboxServicePortBase.cls.xml)	(revision 59489)
+++ WS/Transsmart/impl/TboxServicePortBase.cls.xml	(.../TboxServicePortBase.cls.xml)	(revision 59578)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="WS.Transsmart.impl.TboxServicePortBase">
+<Abstract>1</Abstract>
 <Super>TECH.RegisteredObject</Super>
 
 <Property name="Logger">
@@ -29,13 +30,14 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefUrl">
-<ReturnType>%String</ReturnType>
+<Method name="ZetLocation">
+<FormalSpec>Omgeving:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	if ##class(TECH.Config.ConfigMgr).Instance().GeefOmgeving()="PROD"{
-		Quit "https://connect.transsmart.com/TboxService/2_0"
+	if Omgeving="PROD"{
+		Set ..Location  = "https://connect.transsmart.com/TboxService/2_0"
 	} else {
-		Quit "https://accept-connect.transsmart.com/TboxService/2_0"
+		set ..Location = "https://accept-connect.transsmart.com/TboxService/2_0"
 	}
 ]]></Implementation>
 </Method>
Index: WS/Transsmart/impl/TboxServicePort.cls.xml
===================================================================
diff -u -r59489 -r59578
--- WS/Transsmart/impl/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 59489)
+++ WS/Transsmart/impl/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 59578)
@@ -48,11 +48,16 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Do ##super(Logger)
-	Set ..Location = ..GeefUrl()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="ZetLocationVoorOmgeving">
+<FormalSpec>Omgeving:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..ZetLocation(Omgeving)
+]]></Implementation>
+</Method>
+
 <Method name="doBooking">
 <Final>1</Final>
 <FormalSpec>doBooking:WS.Transsmart.tns.doBooking</FormalSpec>
@@ -81,6 +86,7 @@
 <SoapBodyUse>literal</SoapBodyUse>
 <ReturnTypeParams>XMLNAME="getStatusResponse"</ReturnTypeParams>
 <Implementation><![CDATA[
+	Do ..LogHeaders("Transsmart doBooking headers")	
 	Do ..LogXmlAsStream("Transsmart doDelete request",doDelete)
 	#dim Response as WS.Transsmart.tns.getStatusResponse = ..WebMethod("doDelete").Invoke($this,"",.doDelete)
 	Do ..LogXmlAsStream("Transsmart doDelete response",Response)
@@ -98,6 +104,7 @@
 <SoapBodyUse>literal</SoapBodyUse>
 <ReturnTypeParams>XMLNAME="getDocsResponse"</ReturnTypeParams>
 <Implementation><![CDATA[
+	Do ..LogHeaders("Transsmart doBooking headers")	
 	Do ..LogXmlAsStream("Transsmart getDocs request",getDocs)
 	#dim Response as WS.Transsmart.tns.getDocsResponse = ..WebMethod("getDocs").Invoke($this,"",.getDocs)
 	Do ..LogXmlAsStream("Transsmart getDocs response",Response)
@@ -115,6 +122,7 @@
 <SoapBodyUse>literal</SoapBodyUse>
 <ReturnTypeParams>XMLNAME="getLabelResponse"</ReturnTypeParams>
 <Implementation><![CDATA[
+	Do ..LogHeaders("Transsmart doBooking headers")	
 	Do ..LogXmlAsStream("Transsmart getLabel request",getLabel)
 	#dim Response as WS.Transsmart.tns.getLabelResponse = ..WebMethod("getLabel").Invoke($this,"",.getLabel)
 	Do ..LogXmlAsStream("Transsmart getLabel response",Response)
@@ -126,6 +134,8 @@
 <FormalSpec>Actie:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	do ..Logger.Info(Actie _ " url " , ..Location _ $$$CRLF _ "SSLConfiguration :" _ $Select($Length(..SSLConfiguration):..SSLConfiguration,1:"Geen"))
+	
 	Set it = ##class(TECH.ListIterator).%New(..HeadersOut)
 	#dim Header As WS.Transsmart.tns.authentication
 	While(it.HasNext()){