Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/DwarsverdelingValidator.cls.xml
===================================================================
diff -u -r36233 -r36238
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/DwarsverdelingValidator.cls.xml	(.../DwarsverdelingValidator.cls.xml)	(revision 36233)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/DwarsverdelingValidator.cls.xml	(.../DwarsverdelingValidator.cls.xml)	(revision 36238)
@@ -1,54 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.DwarsverdelingValidator">
-<Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
+<Super>TECH.RegisteredObject</Super>
 
-<Property name="Product">
-<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Exceptions">
-<Type>TECH.Exceptions</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Product = Product
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="IsValid">
+<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&Exceptions:TECH.ExceptionList]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	If ((..Product.HeeftDwarsverdeling)&&(..Product.AantalDwarsverdelingen="")) || ($$$Not(..Product.HeeftDwarsverdeling)&&$$$HasLength(..Product.AantalDwarsverdelingen)){
+	If ((Product.HeeftDwarsverdeling)&&(Product.AantalDwarsverdelingen="")) || ($$$Not(Product.HeeftDwarsverdeling)&&$$$HasLength(Product.AantalDwarsverdelingen)){
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"HeeftDwarsverdeling",..Product.HeeftDwarsverdeling)
-		Do Exception.AddCombination($classname(..Product),"AantalDwarsverdelingen",..Product.AantalDwarsverdelingen)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"HeeftDwarsverdeling",Product.HeeftDwarsverdeling)
+		Do Exception.AddCombination($classname(Product),"AantalDwarsverdelingen",Product.AantalDwarsverdelingen)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If (..Product.HeeftDwarsverdeling &&(..Product.AantalDwarsverdelingen>3)&&($$$Not(..Product.Klasse="SP2")||$$$Not(..Product.RugHoogte="C"))){
+	If (Product.HeeftDwarsverdeling &&(Product.AantalDwarsverdelingen>3)&&($$$Not(Product.Klasse="SP2")||$$$Not(Product.RugHoogte="C"))){
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"HeeftDwarsverdeling",..Product.HeeftDwarsverdeling)
-		Do Exception.AddCombination($classname(..Product),"AantalDwarsverdelingen",..Product.AantalDwarsverdelingen)
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do Exception.AddCombination($classname(..Product),"RugHoogte",..Product.RugHoogte)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"HeeftDwarsverdeling",Product.HeeftDwarsverdeling)
+		Do Exception.AddCombination($classname(Product),"AantalDwarsverdelingen",Product.AantalDwarsverdelingen)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exception.AddCombination($classname(Product),"RugHoogte",Product.RugHoogte)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If (..Product.HeeftDwarsverdeling &&(..Product.AantalDwarsverdelingen>4)) {
-		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(..Product), "AantalDwarsverdelingen", ..Product.AantalDwarsverdelingen,"","")
-		Do ..Exceptions.Insert(Exception)
+	If (Product.HeeftDwarsverdeling &&(Product.AantalDwarsverdelingen>4)) {
+		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(Product), "AantalDwarsverdelingen", Product.AantalDwarsverdelingen,"","")
+		Do Exceptions.Insert(Exception)
 	}
 	
-	Quit $$$If(..Exceptions.Count()>0,$$$false,$$$true)
+	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductValidator.cls.xml
===================================================================
diff -u -r36091 -r36238
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductValidator.cls.xml	(.../ProductValidator.cls.xml)	(revision 36091)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductValidator.cls.xml	(.../ProductValidator.cls.xml)	(revision 36238)
@@ -53,30 +53,40 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Exceptions">
+<Type>TECH.Exceptions</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
 <Method name="IsValid">
 <FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set ..Product = Product
-	Set ..CorpusWandDikteValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.CorpusWandDikteValidator).%New(..Product)
-	Set ..OpvullijstValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator).%New(..Product)
-	Set ..FrontOndersteuningValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.FrontOndersteuningValidator).%New(..Product)
-	Set ..GreepEnMeenemerValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.GreepEnMeenemerValidator).%New(..Product)
-	Set ..InschuifElementValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New(..Product)
-	Set ..MatValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.MatValidator).%New(..Product)
-	Set ..DwarsverdelingValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.DwarsverdelingValidator).%New(..Product)
-	Set ..UitsparingValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator).%New(..Product)
-	Set ..ZijkantHoogteValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.ZijkantHoogteValidator).%New(..Product)
+	Set ..CorpusWandDikteValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.CorpusWandDikteValidator).%New()
+	Set ..OpvullijstValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator).%New()
+	Set ..FrontOndersteuningValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.FrontOndersteuningValidator).%New()
+	Set ..GreepEnMeenemerValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.GreepEnMeenemerValidator).%New()
+	Set ..InschuifElementValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New()
+	Set ..MatValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.MatValidator).%New()
+	Set ..DwarsverdelingValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.DwarsverdelingValidator).%New()
+	Set ..UitsparingValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator).%New()
+	Set ..ZijkantHoogteValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.ZijkantHoogteValidator).%New()
 	
-	Quit ..CorpusWandDikteValidator.IsValid() && 
-		 ..OpvullijstValidator.IsValid() && 
-		 ..FrontOndersteuningValidator.IsValid() && 
-		 ..GreepEnMeenemerValidator.IsValid() && 
-		 ..InschuifElementValidator.IsValid() && 
-		 ..MatValidator.IsValid() && 
-		 ..DwarsverdelingValidator.IsValid() &&
-		 ..UitsparingValidator.IsValid() &&
-		 ..ZijkantHoogteValidator.IsValid()
+	Set ..Exceptions = ##class(TECH.ExceptionList).%New()
+	
+	Do ..CorpusWandDikteValidator.IsValid(..Product, ..Exceptions)
+	Do ..OpvullijstValidator.IsValid(..Product, ..Exceptions)
+	Do ..FrontOndersteuningValidator.IsValid(..Product, ..Exceptions)
+	Do ..GreepEnMeenemerValidator.IsValid(..Product, ..Exceptions)
+	Do ..InschuifElementValidator.IsValid(..Product, ..Exceptions)
+	Do ..MatValidator.IsValid(..Product, ..Exceptions)
+	Do ..DwarsverdelingValidator.IsValid(..Product, ..Exceptions)
+	Do ..UitsparingValidator.IsValid(..Product, ..Exceptions)
+	Do ..ZijkantHoogteValidator.IsValid(..Product, ..Exceptions)
+	
+	Quit $$$If(..Exceptions.Count()>0,$$$false,$$$true)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/GreepEnMeenemerValidator.cls.xml
===================================================================
diff -u -r36233 -r36238
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/GreepEnMeenemerValidator.cls.xml	(.../GreepEnMeenemerValidator.cls.xml)	(revision 36233)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/GreepEnMeenemerValidator.cls.xml	(.../GreepEnMeenemerValidator.cls.xml)	(revision 36238)
@@ -3,40 +3,20 @@
 <Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.GreepEnMeenemerValidator">
 <Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
 
-<Property name="Product">
-<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Exceptions">
-<Type>TECH.Exceptions</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Product = Product
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="IsValid">
+<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&Exceptions:TECH.ExceptionList]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Quit:..Product.HeeftGreepEnMeenemer="No" $$$True
+	Quit:Product.HeeftGreepEnMeenemer="No" $$$True
 	
-	If $$$Not((##class(TECH.StringUtils).Equals(..Product.RugHoogte, "K","B","M")) && (##class(TECH.StringUtils).Equals(..Product.HeeftGreepEnMeenemer,"Handle","HandleAndLatch"))) {
+	If $$$Not((##class(TECH.StringUtils).Equals(Product.RugHoogte, "K","B","M")) && (##class(TECH.StringUtils).Equals(Product.HeeftGreepEnMeenemer,"Handle","HandleAndLatch"))) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"RugHoogte",..Product.RugHoogte)
-		Do Exception.AddCombination($classname(..Product),"HeeftGreepEnMeenemer",..Product.HeeftGreepEnMeenemer)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"RugHoogte",Product.RugHoogte)
+		Do Exception.AddCombination($classname(Product),"HeeftGreepEnMeenemer",Product.HeeftGreepEnMeenemer)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	Quit $$$If(..Exceptions.Count()>0,$$$false,$$$true)
+	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/OpvullijstValidator.cls.xml
===================================================================
diff -u -r36233 -r36238
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/OpvullijstValidator.cls.xml	(.../OpvullijstValidator.cls.xml)	(revision 36233)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/OpvullijstValidator.cls.xml	(.../OpvullijstValidator.cls.xml)	(revision 36238)
@@ -3,40 +3,20 @@
 <Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator">
 <Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
 
-<Property name="Product">
-<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Exceptions">
-<Type>TECH.Exceptions</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Product = Product
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="IsValid">
+<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&Exceptions:TECH.ExceptionList]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	If ($$$Not(..Product.HeeftOpvullijstLinks) && $$$Not(..Product.HeeftOpvullijstRechts) && $$$HasLength(..Product.OpvullijstKleur)) || 
-	    ((..Product.HeeftOpvullijstLinks || ..Product.HeeftOpvullijstRechts) && (..Product.OpvullijstKleur="")){
+	If ($$$Not(Product.HeeftOpvullijstLinks) && $$$Not(Product.HeeftOpvullijstRechts) && $$$HasLength(Product.OpvullijstKleur)) || 
+	    ((Product.HeeftOpvullijstLinks || Product.HeeftOpvullijstRechts) && (Product.OpvullijstKleur="")){
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"HeeftOpvullijstLinks",..Product.ZijwandVerhogingType)
-		Do Exception.AddCombination($classname(..Product),"HeeftOpvullijstRechts",..Product.ZijwandVerhogingMateriaal)
-		Do Exception.AddCombination($classname(..Product),"OpvullijstKleur",..Product.ZijwandVerhogingKleur)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"HeeftOpvullijstLinks",Product.ZijwandVerhogingType)
+		Do Exception.AddCombination($classname(Product),"HeeftOpvullijstRechts",Product.ZijwandVerhogingMateriaal)
+		Do Exception.AddCombination($classname(Product),"OpvullijstKleur",Product.ZijwandVerhogingKleur)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	Quit $$$If(..Exceptions.Count()>0,$$$false,$$$true)
+	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/MatValidator.cls.xml
===================================================================
diff -u -r36233 -r36238
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/MatValidator.cls.xml	(.../MatValidator.cls.xml)	(revision 36233)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/MatValidator.cls.xml	(.../MatValidator.cls.xml)	(revision 36238)
@@ -3,48 +3,28 @@
 <Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.MatValidator">
 <Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
 
-<Property name="Product">
-<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Exceptions">
-<Type>TECH.Exceptions</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Product = Product
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="IsValid">
+<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&Exceptions:TECH.ExceptionList]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	If $$$Not((..Product.HeeftMat && $$$HasLength(..Product.MatKleur) && $$$HasLength(..Product.MatMateriaal)) || $$$Not(..Product.HeeftMat || $$$HasLength(..Product.MatKleur) || $$$HasLength(..Product.MatMateriaal))){	
+	If $$$Not((Product.HeeftMat && $$$HasLength(Product.MatKleur) && $$$HasLength(Product.MatMateriaal)) || $$$Not(Product.HeeftMat || $$$HasLength(Product.MatKleur) || $$$HasLength(Product.MatMateriaal))){	
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New() 
-		Do Exception.AddCombination($classname(..Product),"HeeftMat",..Product.HeeftMat)
-		Do Exception.AddCombination($classname(..Product),"MatKleur",..Product.MatKleur)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"HeeftMat",Product.HeeftMat)
+		Do Exception.AddCombination($classname(Product),"MatKleur",Product.MatKleur)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If ..Product.HeeftMat && $$$Not(..Product.MatMateriaal=##class(DOM.PM.enu.MATMateriaal).Antislip()) {
-		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(..Product), "MatMateriaal", ..Product.MatMateriaal,"","")
-		Do ..Exceptions.Insert(Exception)
+	If Product.HeeftMat && $$$Not(Product.MatMateriaal=##class(DOM.PM.enu.MATMateriaal).Antislip()) {
+		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(Product), "MatMateriaal", Product.MatMateriaal,"","")
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If ..Product.HeeftMat && $$$Not(##class(TECH.StringUtils).Equals(..Product.MatKleur,"S","ANTR")) {
-		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(..Product), "MatKleur", ..Product.MatKleur,"","")
-		Do ..Exceptions.Insert(Exception)
+	If Product.HeeftMat && $$$Not(##class(TECH.StringUtils).Equals(Product.MatKleur,"S","ANTR")) {
+		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(Product), "MatKleur", Product.MatKleur,"","")
+		Do Exceptions.Insert(Exception)
 	}
 	
-	Quit $$$If(..Exceptions.Count()>0,$$$false,$$$true)
+	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/CorpusWandDikteValidator.cls.xml
===================================================================
diff -u -r36233 -r36238
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/CorpusWandDikteValidator.cls.xml	(.../CorpusWandDikteValidator.cls.xml)	(revision 36233)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/CorpusWandDikteValidator.cls.xml	(.../CorpusWandDikteValidator.cls.xml)	(revision 36238)
@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.CorpusWandDikteValidator">
-<Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
+<Super>TECH.RegisteredObject</Super>
 
-<Property name="Product">
-<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Exceptions">
-<Type>TECH.Exceptions</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Product = Product
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="IsValid">
+<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&Exceptions:TECH.ExceptionList]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	If ($$$Not(##class(TECH.StringUtils).Equals(..Product.CorpusWandDikte, 16,18,19))) {
-		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(..Product), "CorpusWandDikte", ..Product.CorpusWandDikte,"","")
-		Do ..Exceptions.Insert(Exception)
+	If ($$$Not(##class(TECH.StringUtils).Equals(Product.CorpusWandDikte, 16,18,19))) {
+		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(Product), "CorpusWandDikte", Product.CorpusWandDikte,"","")
+		Do Exceptions.Insert(Exception)
 	}
 	
-	Quit $$$If(..Exceptions.Count()>0,$$$false,$$$true)
+	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/ZijkantHoogteValidator.cls.xml
===================================================================
diff -u -r36233 -r36238
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/ZijkantHoogteValidator.cls.xml	(.../ZijkantHoogteValidator.cls.xml)	(revision 36233)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/ZijkantHoogteValidator.cls.xml	(.../ZijkantHoogteValidator.cls.xml)	(revision 36238)
@@ -3,43 +3,23 @@
 <Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.ZijkantHoogteValidator">
 <Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
 
-<Property name="Product">
-<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Exceptions">
-<Type>TECH.Exceptions</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Product = Product
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="IsValid">
+<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&Exceptions:TECH.ExceptionList]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	If ..Product.ZijkantHoogte="" {
-		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(..Product), "ZijkantHoogte", ..Product.ZijkantHoogte,"","")
-		Do ..Exceptions.Insert(Exception)
+	If Product.ZijkantHoogte="" {
+		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(Product), "ZijkantHoogte", Product.ZijkantHoogte,"","")
+		Do Exceptions.Insert(Exception)
 	}
 
-	If ##class(TECH.StringUtils).Equals(..Product.ZijkantHoogte,"N","K")&&##class(TECH.StringUtils).Equals(..Product.Klasse,"SP2","SY2") {
+	If ##class(TECH.StringUtils).Equals(Product.ZijkantHoogte,"N","K")&&##class(TECH.StringUtils).Equals(Product.Klasse,"SP2","SY2") {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"ZijkantHoogte",..Product.ZijkantHoogte)
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"ZijkantHoogte",Product.ZijkantHoogte)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	Quit $$$If(..Exceptions.Count()>0,$$$false,$$$true)
+	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml
===================================================================
diff -u -r36233 -r36238
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml	(.../InschuifElementValidator.cls.xml)	(revision 36233)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml	(.../InschuifElementValidator.cls.xml)	(revision 36238)
@@ -3,52 +3,32 @@
 <Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator">
 <Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
 
-<Property name="Product">
-<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Exceptions">
-<Type>TECH.Exceptions</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Product = Product
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="IsValid">
+<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&Exceptions:TECH.ExceptionList]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	If (($$$Not(##class(TECH.StringUtils).Equals(..Product.RugHoogte, "C","D")))&&($$$Not(..Product.ZijwandVerhogingType="NoGallery"))) {
+	If (($$$Not(##class(TECH.StringUtils).Equals(Product.RugHoogte, "C","D")))&&($$$Not(Product.ZijwandVerhogingType="NoGallery"))) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"RugHoogte",..Product.RugHoogte)
-		Do Exception.AddCombination($classname(..Product),"ZijwandVerhogingType",..Product.ZijwandVerhogingType)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"RugHoogte",Product.RugHoogte)
+		Do Exception.AddCombination($classname(Product),"ZijwandVerhogingType",Product.ZijwandVerhogingType)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If ($$$Not(##class(TECH.StringUtils).Equals(..Product.ZijwandVerhogingType, "NoGallery","SimpleGallery","DesignElement"))) {
-		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(..Product), "ZijwandVerhogingType", ..Product.ZijwandVerhogingType,"","")
-		Do ..Exceptions.Insert(Exception)
+	If ($$$Not(##class(TECH.StringUtils).Equals(Product.ZijwandVerhogingType, "NoGallery","SimpleGallery","DesignElement"))) {
+		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("Input", $classname(Product), "ZijwandVerhogingType", Product.ZijwandVerhogingType,"","")
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If (((..Product.ZijwandVerhogingType="NoGallery")&&($$$HasLength(..Product.ZijwandVerhogingMateriaal) || $$$HasLength(..Product.ZijwandVerhogingKleur))) || 
-	    ($$$Not(..Product.ZijwandVerhogingType="NoGallery")&&($$$Not($$$HasLength(..Product.ZijwandVerhogingMateriaal) && $$$HasLength(..Product.ZijwandVerhogingKleur))))){
+	If (((Product.ZijwandVerhogingType="NoGallery")&&($$$HasLength(Product.ZijwandVerhogingMateriaal) || $$$HasLength(Product.ZijwandVerhogingKleur))) || 
+	    ($$$Not(Product.ZijwandVerhogingType="NoGallery")&&($$$Not($$$HasLength(Product.ZijwandVerhogingMateriaal) && $$$HasLength(Product.ZijwandVerhogingKleur))))){
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"ZijwandVerhogingType",..Product.ZijwandVerhogingType)
-		Do Exception.AddCombination($classname(..Product),"ZijwandVerhogingMateriaal",..Product.ZijwandVerhogingMateriaal)
-		Do Exception.AddCombination($classname(..Product),"ZijwandVerhogingKleur",..Product.ZijwandVerhogingKleur)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"ZijwandVerhogingType",Product.ZijwandVerhogingType)
+		Do Exception.AddCombination($classname(Product),"ZijwandVerhogingMateriaal",Product.ZijwandVerhogingMateriaal)
+		Do Exception.AddCombination($classname(Product),"ZijwandVerhogingKleur",Product.ZijwandVerhogingKleur)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	Quit $$$If(..Exceptions.Count()>0,$$$false,$$$true)
+	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/FrontOndersteuningValidator.cls.xml
===================================================================
diff -u -r36233 -r36238
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/FrontOndersteuningValidator.cls.xml	(.../FrontOndersteuningValidator.cls.xml)	(revision 36233)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/FrontOndersteuningValidator.cls.xml	(.../FrontOndersteuningValidator.cls.xml)	(revision 36238)
@@ -3,38 +3,18 @@
 <Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.FrontOndersteuningValidator">
 <Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
 
-<Property name="Product">
-<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Exceptions">
-<Type>TECH.Exceptions</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Product = Product
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="IsValid">
+<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&Exceptions:TECH.ExceptionList]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	If $$$Not($$$Not((..Product.Klasse = ##class(DOM.PM.enu.TBXKlas).Spoelbak()) || (..Product.Klasse = ##class(DOM.PM.enu.TBXKlas).SifonTypeBlum())) && (..Product.FrontOndersteuningAantal <= 3)){
+	If $$$Not($$$Not((Product.Klasse = ##class(DOM.PM.enu.TBXKlas).Spoelbak()) || (Product.Klasse = ##class(DOM.PM.enu.TBXKlas).SifonTypeBlum())) && (Product.FrontOndersteuningAantal <= 3)){
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do Exception.AddCombination($classname(..Product),"FrontOndersteuningAantal",..Product.FrontOndersteuningAantal)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exception.AddCombination($classname(Product),"FrontOndersteuningAantal",Product.FrontOndersteuningAantal)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	Quit $$$If(..Exceptions.Count()>0,$$$false,$$$true)
+	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/UitsparingValidator.cls.xml
===================================================================
diff -u -r36233 -r36238
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/UitsparingValidator.cls.xml	(.../UitsparingValidator.cls.xml)	(revision 36233)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/UitsparingValidator.cls.xml	(.../UitsparingValidator.cls.xml)	(revision 36238)
@@ -3,106 +3,86 @@
 <Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator">
 <Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
 
-<Property name="Product">
-<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Exceptions">
-<Type>TECH.Exceptions</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Product = Product
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="IsValid">
+<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&Exceptions:TECH.ExceptionList]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim HeeftUitsparingData As %Boolean = $$$HasLength(..Product.UitsparingDataBreedteM_..Product.UitsparingDataBreedteX_..Product.UitsparingDataBreedteY_..Product.UitsparingDataBreedteZ1_..Product.UitsparingDataBreedteZ2)
+	#dim HeeftUitsparingData As %Boolean = $$$HasLength(Product.UitsparingDataBreedteM_Product.UitsparingDataBreedteX_Product.UitsparingDataBreedteY_Product.UitsparingDataBreedteZ1_Product.UitsparingDataBreedteZ2)
 	Quit:$$$Not(HeeftUitsparingData) $$$True	
 	
-	If (..Product.Klasse="L")&&(HeeftUitsparingData) {
+	If (Product.Klasse="L")&&(HeeftUitsparingData) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataAantalUitsparingen",..Product.UitsparingDataAantalUitsparingen)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteM",+..Product.UitsparingDataBreedteM)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteX",+..Product.UitsparingDataBreedteX)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteY",+..Product.UitsparingDataBreedteY)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteZ1",+..Product.UitsparingDataBreedteZ1)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteZ2",+..Product.UitsparingDataBreedteZ2)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataAantalUitsparingen",Product.UitsparingDataAantalUitsparingen)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteM",+Product.UitsparingDataBreedteM)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteX",+Product.UitsparingDataBreedteX)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteY",+Product.UitsparingDataBreedteY)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteZ1",+Product.UitsparingDataBreedteZ1)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteZ2",+Product.UitsparingDataBreedteZ2)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If (..Product.Klasse="SP2")&&$$$HasLength(..Product.UitsparingDataBreedteM_..Product.UitsparingDataBreedteZ2) {
+	If (Product.Klasse="SP2")&&$$$HasLength(Product.UitsparingDataBreedteM_Product.UitsparingDataBreedteZ2) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteM",+..Product.UitsparingDataBreedteM)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteZ2",+..Product.UitsparingDataBreedteZ2)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteM",+Product.UitsparingDataBreedteM)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteZ2",+Product.UitsparingDataBreedteZ2)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If (..Product.Klasse="SY2")&&(..Product.UitsparingDataAantalUitsparingen=1)&&$$$HasLength(..Product.UitsparingDataBreedteM_..Product.UitsparingDataBreedteZ2) {
+	If (Product.Klasse="SY2")&&(Product.UitsparingDataAantalUitsparingen=1)&&$$$HasLength(Product.UitsparingDataBreedteM_Product.UitsparingDataBreedteZ2) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataAantalUitsparingen",..Product.UitsparingDataAantalUitsparingen)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteM",+..Product.UitsparingDataBreedteM)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteZ2",+..Product.UitsparingDataBreedteZ2)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataAantalUitsparingen",Product.UitsparingDataAantalUitsparingen)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteM",+Product.UitsparingDataBreedteM)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteZ2",+Product.UitsparingDataBreedteZ2)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If (..Product.Klasse="SY2")&&(..Product.UitsparingDataAantalUitsparingen=2)&&((+..Product.UitsparingDataBreedteM=0)||(+..Product.UitsparingDataBreedteX=0)||(+..Product.UitsparingDataBreedteY=0)||(+..Product.UitsparingDataBreedteZ1=0)||(+..Product.UitsparingDataBreedteZ2=0)) {
+	If (Product.Klasse="SY2")&&(Product.UitsparingDataAantalUitsparingen=2)&&((+Product.UitsparingDataBreedteM=0)||(+Product.UitsparingDataBreedteX=0)||(+Product.UitsparingDataBreedteY=0)||(+Product.UitsparingDataBreedteZ1=0)||(+Product.UitsparingDataBreedteZ2=0)) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataAantalUitsparingen",..Product.UitsparingDataAantalUitsparingen)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteM",+..Product.UitsparingDataBreedteM)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteX",+..Product.UitsparingDataBreedteX)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteY",+..Product.UitsparingDataBreedteY)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteZ1",+..Product.UitsparingDataBreedteZ1)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteZ2",+..Product.UitsparingDataBreedteZ2)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataAantalUitsparingen",Product.UitsparingDataAantalUitsparingen)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteM",+Product.UitsparingDataBreedteM)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteX",+Product.UitsparingDataBreedteX)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteY",+Product.UitsparingDataBreedteY)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteZ1",+Product.UitsparingDataBreedteZ1)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteZ2",+Product.UitsparingDataBreedteZ2)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If (..Product.Klasse="SY2")&&(..Product.TussenrugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal())&&$$$Not(##class(TECH.StringUtils).Equals(..Product.UitsparingDataBreedteZ1,"150","250")&&##class(TECH.StringUtils).Equals(..Product.UitsparingDataBreedteZ2,"150","250")) {
+	If (Product.Klasse="SY2")&&(Product.TussenrugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal())&&$$$Not(##class(TECH.StringUtils).Equals(Product.UitsparingDataBreedteZ1,"150","250")&&##class(TECH.StringUtils).Equals(Product.UitsparingDataBreedteZ2,"150","250")) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do Exception.AddCombination($classname(..Product),"TussenrugMateriaal",..Product.TussenrugMateriaal)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteZ1",..Product.UitsparingDataBreedteZ1)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteZ2",..Product.UitsparingDataBreedteZ2)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exception.AddCombination($classname(Product),"TussenrugMateriaal",Product.TussenrugMateriaal)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteZ1",Product.UitsparingDataBreedteZ1)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteZ2",Product.UitsparingDataBreedteZ2)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If (..Product.Klasse="SP2")&&(..Product.TussenrugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal())&&$$$Not(##class(TECH.StringUtils).Equals(..Product.UitsparingDataBreedteZ1,"150","250")) {
+	If (Product.Klasse="SP2")&&(Product.TussenrugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal())&&$$$Not(##class(TECH.StringUtils).Equals(Product.UitsparingDataBreedteZ1,"150","250")) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do Exception.AddCombination($classname(..Product),"TussenrugMateriaal",..Product.TussenrugMateriaal)
-		Do Exception.AddCombination($classname(..Product),"UitsparingDataBreedteZ1",..Product.UitsparingDataBreedteZ1)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exception.AddCombination($classname(Product),"TussenrugMateriaal",Product.TussenrugMateriaal)
+		Do Exception.AddCombination($classname(Product),"UitsparingDataBreedteZ1",Product.UitsparingDataBreedteZ1)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If ($$$Not(..Product.Klasse="SY2"))&&($$$HasLength(..Product.TussenrugMateriaal)) {
+	If ($$$Not(Product.Klasse="SY2"))&&($$$HasLength(Product.TussenrugMateriaal)) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do Exception.AddCombination($classname(..Product),"TussenrugMateriaal",..Product.TussenrugMateriaal)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exception.AddCombination($classname(Product),"TussenrugMateriaal",Product.TussenrugMateriaal)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	If ($$$Not(..Product.Klasse="SP2"))&&($$$HasLength(..Product.RugwandMateriaal)) {
+	If ($$$Not(Product.Klasse="SP2"))&&($$$HasLength(Product.RugwandMateriaal)) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(..Product),"Klasse",..Product.Klasse)
-		Do Exception.AddCombination($classname(..Product),"RugwandMateriaal",..Product.RugwandMateriaal)
-		Do ..Exceptions.Insert(Exception)
+		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
+		Do Exception.AddCombination($classname(Product),"RugwandMateriaal",Product.RugwandMateriaal)
+		Do Exceptions.Insert(Exception)
 	}
 	
-	Quit $$$If(..Exceptions.Count()>0,$$$false,$$$true)
+	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
 ]]></Implementation>
 </Method>
 </Class>