Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml
===================================================================
diff -u -r72881 -r72963
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 72881)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 72963)
@@ -10,13 +10,15 @@
 	#dim DummyMaatwerkDetailsRequestJsonStream As %Stream.GlobalBinary = " { ""CID"": """ _ DummyCID _ """} "
 	#dim DummyResponse As %Stream.GlobalBinary = "{""CID"": null, ""VhConfig"": {""isValid"": ""null"", ""MaatwerkDetails"": { ""Halffabrikaten"": {}, ""Kosten"": [], ""VerwijderdeHalffabItems"": [] }, ""Kenmerken"": {}, ""Model"": null, ""BerekendeKenmerken"": {} }}"
 	Set DummyResponse = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse).%New()
+	Set DummyResponse.isValid = $$$True
+	Set DummyResponse.isCalculated = $$$True
 	
 	Set EncowayJsonConverterMock = ##class(vhTest.Mock.WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
 	Do EncowayJsonConverterMock.VerwachtMethodCall("Stringify", $$$ElkeWaarde).DanReturn(DummyMaatwerkDetailsRequestJsonStream)
 	Do EncowayJsonConverterMock.VerwachtMethodCall("ParseMaatwerkDetailsResponse", DummyResponse).DanReturn(DummyResponse)
 	
 	Set EncowayHttpClientMock = ##class(vhTest.Mock.WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient).%New()
-	Do EncowayHttpClientMock.VerwachtMethodCall("HaalOpVhConfig", DummyMaatwerkDetailsRequestJsonStream).DanReturn(DummyResponse)
+	Do EncowayHttpClientMock.VerwachtMethodCall("BerekenVhConfig", DummyMaatwerkDetailsRequestJsonStream).DanReturn(DummyResponse)
 	
 	Set VhConfigRepositoryMock = ##class(vhTest.Mock.APPS.PM.Maatwerk.impl.VhConfigRepository).%New()
 	Do VhConfigRepositoryMock.VerwachtMethodCall("BestaatVhConfigVoorCID", DummyCID, $$$True).DanReturn($$$False)
Index: vhTest/Fake/WSimpl/PM/Maatwerk/MaatwerkService/EncowayHttpClient.cls.xml
===================================================================
diff -u -r72788 -r72963
--- vhTest/Fake/WSimpl/PM/Maatwerk/MaatwerkService/EncowayHttpClient.cls.xml	(.../EncowayHttpClient.cls.xml)	(revision 72788)
+++ vhTest/Fake/WSimpl/PM/Maatwerk/MaatwerkService/EncowayHttpClient.cls.xml	(.../EncowayHttpClient.cls.xml)	(revision 72963)
@@ -13,6 +13,20 @@
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="BerekenConfig">
+<FormalSpec>JsonStream:%Stream.GlobalBinary</FormalSpec>
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="BerekenVhConfig">
+<FormalSpec>JsonStream:%Stream.GlobalBinary</FormalSpec>
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml
===================================================================
diff -u -r72855 -r72963
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml	(.../Test.cls.xml)	(revision 72855)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml	(.../Test.cls.xml)	(revision 72963)
@@ -61,7 +61,6 @@
   {
 	"CID": "abc-123",
 	"VhConfig": {
-	    "isValid": null,
 	    "MaatwerkDetails": null,
 	    "Kenmerken": null,
 	    "Model": null,
@@ -95,8 +94,6 @@
 			}
 			Do $$$AssertEquals(VhConfig.MaatwerkDetails,"")
 			Do $$$AssertEquals(VhConfig.BerekendeKenmerken,"")
-			Do $$$AssertEquals(VhConfig.isValid,"")
-			Do $$$AssertEquals(VhConfig.isCalculated,"")
 		}
 	}
 ]]></Implementation>
@@ -110,7 +107,6 @@
   {
 	"CID": "abc-123",
 	"VhConfig": {
-		"isValid": null,
 	    "MaatwerkDetails": {
 	    	Halffabrikaten: {},
 	        "Kosten": [],
@@ -152,7 +148,6 @@
 				Do $$$AssertEquals(VhConfig.MaatwerkDetails.VerwijderdeHalffabItems.Count(), 0)
 			}
 			Do $$$AssertTrue($IsObject(VhConfig.BerekendeKenmerken))
-			Do $$$AssertEquals(VhConfig.isValid,"")
 		}
 	}
 ]]></Implementation>
@@ -166,7 +161,6 @@
   {
 	"CID": "abc-123",
 	"VhConfig": {
-		"isValid": true,
 	    "MaatwerkDetails": {
 	        "Halffabrikaten": {
 	            "Verpakking.V1DoosMetDeksel": {
@@ -257,7 +251,6 @@
 				Do $$$AssertEquals(V1DoosMetDekselBewerkingDimensiesKeyValuePair.Count(), 1)
 				Do ..AssertKeyValuePair(V1DoosMetDekselBewerkingDimensiesKeyValuePair.GetAt(1), "Lengte", 1244.6)
 			}
-			Do $$$AssertEquals(VhConfig.isValid, $$$True)
 		}
 	}
 ]]></Implementation>
@@ -271,7 +264,6 @@
   {
 	"CID": "abc-123",
 	"VhConfig": {
-		"isValid": true,
 	    "MaatwerkDetails": {
 	        "Halffabrikaten": {},
 	        "Kosten": [
@@ -360,7 +352,6 @@
   {
 	  "CID": "abc-123",
 	  "VhConfig": {
-		  "isValid": true,
 		    "MaatwerkDetails": {
 		        "Halffabrikaten": {},
 		        "Kosten": [],
@@ -417,7 +408,6 @@
   {
 	"CID": "abc-123",
 	"VhConfig": {
-		"isValid": true,
 	    "MaatwerkDetails": {
 	        "Halffabrikaten": {},
 	        "Kosten": [],
Index: vhTest/Mock/WSimpl/PM/Maatwerk/MaatwerkService/EncowayHttpClient.cls.xml
===================================================================
diff -u -r72788 -r72963
--- vhTest/Mock/WSimpl/PM/Maatwerk/MaatwerkService/EncowayHttpClient.cls.xml	(.../EncowayHttpClient.cls.xml)	(revision 72788)
+++ vhTest/Mock/WSimpl/PM/Maatwerk/MaatwerkService/EncowayHttpClient.cls.xml	(.../EncowayHttpClient.cls.xml)	(revision 72963)
@@ -14,10 +14,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="HaalOpVhConfig">
+<Method name="BerekenVhConfig">
 <FormalSpec>JsonStream:%Stream.GlobalBinary</FormalSpec>
 <ReturnType>%CacheString</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("HaalOpVhConfig",JsonStream)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("BerekenVhConfig",JsonStream)
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml
===================================================================
diff -u -r72962 -r72963
--- WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 72962)
+++ WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 72963)
@@ -65,7 +65,7 @@
 			#dim GeefMaatwerkDetailsRequestJsonStream As %Stream.GlobalBinary = ..EncowayJsonConverter.Stringify(..GeefMaatwerkDetailsRequest(CID, IngegevenKenmerken))
 			Set MaatwerkDetailsResponseJsonString = ..EncowayHttpClient.BerekenVhConfig(GeefMaatwerkDetailsRequestJsonStream)
 			
-			#dim MaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = ..EncowayJsonConverter.ParseMaatwerkDetailsResponse(MaatwerkDetailsResponseJsonString).VhConfig
+			#dim MaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = ..EncowayJsonConverter.ParseMaatwerkDetailsResponse(MaatwerkDetailsResponseJsonString)
 			
 			If ((MaatwerkDetailsResponse.isValid) && (MaatwerkDetailsResponse.isCalculated)) {
 				Set VhConfig = MaatwerkDetailsResponse.VhConfig