Index: WSimpl/AX/CalculatedProduct/Converter.cls.xml
===================================================================
diff -u -r44751 -r44839
--- WSimpl/AX/CalculatedProduct/Converter.cls.xml	(.../Converter.cls.xml)	(revision 44751)
+++ WSimpl/AX/CalculatedProduct/Converter.cls.xml	(.../Converter.cls.xml)	(revision 44839)
@@ -31,6 +31,8 @@
 	While (RequestIterator.HasNext()) {
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = RequestIterator.Next()				
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(Request, MessageId)
+			
+		Set ConfigVariant.class = "entity"
 		
 		Do CalculatedProductOut.ConfigVariant.Insert(ConfigVariant)
 	}
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/Test.cls.xml
===================================================================
diff -u -r43322 -r44839
--- vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 43322)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 44839)
@@ -38,6 +38,7 @@
 	Do $$$AssertTrue(VariantDescription.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityVariantDescription"))
 	Do $$$AssertEquals(VariantDescription.LanguageId, LanguageId)
 	Do $$$AssertEquals(VariantDescription.Description, Description)
+	Do $$$AssertEquals(VariantDescription.class, "entity")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/BouwsteenConverter/Test.cls.xml
===================================================================
diff -u -r44059 -r44839
--- vhUnitTest/WSimpl/AX/CalculatedProduct/BouwsteenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 44059)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/BouwsteenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 44839)
@@ -76,6 +76,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: BouwsteenConverter vult class in voor elke BomLine">
+<Implementation><![CDATA[
+	#dim Converter As WSimpl.AX.CalculatedProduct.BouwsteenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwsteenConverter).%New()
+	#dim BomLine As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine = Converter.Convert(..HalffabricaatBouwsteenDummy)
+	
+	Do $$$AssertEquals(BomLine.class, "entity")
+]]></Implementation>
+</Method>
+
 <Method name="MaakHalffabricaatBouwsteenDummy">
 <Private>1</Private>
 <ReturnType>DOM.PM.Bouwstenen.BouwsteenHalfFabr</ReturnType>
Index: WSimpl/AX/CalculatedProduct/BouwsteenConverter.cls.xml
===================================================================
diff -u -r44059 -r44839
--- WSimpl/AX/CalculatedProduct/BouwsteenConverter.cls.xml	(.../BouwsteenConverter.cls.xml)	(revision 44059)
+++ WSimpl/AX/CalculatedProduct/BouwsteenConverter.cls.xml	(.../BouwsteenConverter.cls.xml)	(revision 44839)
@@ -12,6 +12,7 @@
 	Set BomLine.ItemId = HalffabricaatBouwsteen.KindProduct.IdentNummer
 	Set BomLine.BOMQty = HalffabricaatBouwsteen.Aantal
 	Set BomLine.BOMQtySerie = 1
+	Set BomLine.class = "entity"
 	
 	Quit BomLine
 ]]></Implementation>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TBX/777573.xml
===================================================================
diff -u -r44768 -r44839
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TBX/777573.xml	(.../777573.xml)	(revision 44768)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TBX/777573.xml	(.../777573.xml)	(revision 44839)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
-  <ConfigVariant>
+  <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
     <ConfigVariantId>DummyItemId</ConfigVariantId>
     <CostPrice>23.750000</CostPrice>
@@ -9,100 +9,100 @@
     <MessageId>DummyMessageId</MessageId>
     <ProductName>TB8MAI.A45F500x564   TSBZ</ProductName>
     <SalesId>DummySalesId</SalesId>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>1</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.866.026.4</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>8.681.245.5</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.814.542.9</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>4</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.833.811.9</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.663.357.6</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>6</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.662.791.6</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>7</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>8.681.326.5</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>8</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.767.370.4</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>9</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.767.388.4</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>10</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.130.915.1</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>11</BOMLine>
       <BOMQty>4</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.741.604.3</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>12</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.537.438.3</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>13</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.605.085.3</ItemId>
     </BOMLine>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>Tandembox lade M D:500xB:564;bodem:Terrazwart zijkant:Terrazwart;Antaro bevat: gemont. lade;glijder 30kg blumotion int.;frontbevest. INSERTA afdekkappen verpakt: karton</Description>
       <LanguageId>nl-be</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>Tiroir M Tandembox P:500xL:564;Fond:Noir;côté:Terranoir;Antaro contient: tiroir monté;extension totale 30kg blumotion i.;attache façade INSERTA;caches emballé: carton</Description>
       <LanguageId>fr</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>Drawer M Tandembox D:500xW:564;Chipboard:Black;side:Terrablack Antaro contains: premounted drawer Full extension 30kg;blumotion i. fixation Inserta;coverplate packed: box</Description>
       <LanguageId>en-us</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>Schubkasten M Tandembox D:500xB:564;Fachenboden:Schwarz side:Terraschwarz;Antaro beinhaltet: fertigschubkasten Vollauszug 30kg;blumotion int. frontbefest. INSERTA;abdeckkappe verpackt: karton</Description>
       <LanguageId>de</LanguageId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/LBX/1014463.xml
===================================================================
diff -u -r44768 -r44839
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/LBX/1014463.xml	(.../1014463.xml)	(revision 44768)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/LBX/1014463.xml	(.../1014463.xml)	(revision 44839)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
-  <ConfigVariant>
+  <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
     <ConfigVariantId>DummyItemId</ConfigVariantId>
     <CostPrice>28.150000</CostPrice>
@@ -9,124 +9,124 @@
     <MessageId>DummyMessageId</MessageId>
     <ProductName>LB4M/E ABAC500x564 X SWWI</ProductName>
     <SalesId>DummySalesId</SalesId>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>1</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.832.215.7</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.636.342.9</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.473.845.0</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>4</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.978.059.9</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.988.294.15</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>6</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.312.061.6</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>7</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.304.851.3</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>8</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.705.488.1</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>9</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.644.092.6</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>10</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.647.871.7</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>11</BOMLine>
       <BOMQty>.1456</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.656.267.6</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>12</BOMLine>
       <BOMQty>.11312</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.098.256.7</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>13</BOMLine>
       <BOMQty>.084</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.046.558.16</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>14</BOMLine>
       <BOMQty>.25</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.537.454.3</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>15</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.988.367.15</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>16</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.130.915.1</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>17</BOMLine>
       <BOMQty>4</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.061.808.9</ItemId>
     </BOMLine>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>LEGRABOX lade M D:500xB:564; bodem:Wit; ladezijkant:Zijdewit; bevat: gemont. lade; corpusprofiel 40kg; BLUMOTION; frontbevest. EXPANDO verpakt: Probox</Description>
       <LanguageId>nl-be</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>LEGRABOX tiroir M P:500xL:564; fond:Blanc; côté de tiroir:Blanc soie; contient: tiroir monté; coulisses corps de meuble 40kg; BLUMOTION; attache façade EXPANDO emballé: Probox</Description>
       <LanguageId>fr</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>LEGRABOX drawer M D:500xW:564; base:White; drawer side:Silk white; contains: premounted drawer; cabinet profiles 40kg; BLUMOTION; fixation expando packed: Probox</Description>
       <LanguageId>en-us</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>LEGRABOX Schubkasten M T:500xB:564; Boden:Weiss; Zarge:Seidenweiss; beinhaltet: fertigschubkasten; Korpusschienen 40kg; BLUMOTION; frontbefest EXPANDO verpackt: Probox</Description>
       <LanguageId>de</LanguageId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/OL/64938.xml
===================================================================
diff -u -r44768 -r44839
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/OL/64938.xml	(.../64938.xml)	(revision 44768)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/OL/64938.xml	(.../64938.xml)	(revision 44839)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
-  <ConfigVariant>
+  <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
     <ConfigVariantId>DummyItemId</ConfigVariantId>
     <CostPrice>40.820000</CostPrice>
@@ -10,52 +10,52 @@
     <MessageId>DummyMessageId</MessageId>
     <ProductName>OO.VLFV30INVLAKVERD</ProductName>
     <SalesId>DummySalesId</SalesId>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>1</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.537.390.3</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.405.044.0</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>4</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.638.498.4</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>4</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.840.535.0</ItemId>
       <ParentBOMLine>3</ParentBOMLine>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>8</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.296.807.3</ItemId>
     </BOMLine>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>Verdeling flessen met inox schaal, korpus 30, inox, L = 50 cm</Description>
       <LanguageId>nl-be</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>Pièce de séparation pour tiroir à bouteilles,K=30,inox,L=50 cm</Description>
       <LanguageId>fr</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <LanguageId>en-us</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <LanguageId>de</LanguageId>
     </VariantDescription>
Index: WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml
===================================================================
diff -u -r43322 -r44839
--- WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml	(.../VariantDescriptionBepaler.cls.xml)	(revision 43322)
+++ WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml	(.../VariantDescriptionBepaler.cls.xml)	(revision 44839)
@@ -46,6 +46,7 @@
 	Set VariantDescription.Description = Product.GeefLangtekst(Taal)
 	Set VariantDescription.LanguageId = ..Formatter.FormatLanguageId(Taal)
 	Set VariantDescription.ConfigVariantId = ConfigVariantId
+	Set VariantDescription.class = "entity"
 	
 	Quit VariantDescription
 ]]></Implementation>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/OnbestaandProduct/OnbestaandProduct.xml
===================================================================
diff -u -r44768 -r44839
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/OnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 44768)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/OnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 44839)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
-  <ConfigVariant>
+  <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
     <ConfigVariantId>DummyItemId</ConfigVariantId>
     <ErrorText>NotFound</ErrorText>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/Converter/Test.cls.xml
===================================================================
diff -u -r44751 -r44839
--- vhUnitTest/WSimpl/AX/CalculatedProduct/Converter/Test.cls.xml	(.../Test.cls.xml)	(revision 44751)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/Converter/Test.cls.xml	(.../Test.cls.xml)	(revision 44839)
@@ -11,19 +11,19 @@
 <Method name="Test: RequestConverter wordt voor elke Request opgeroepen">
 <Implementation><![CDATA[
 	#dim RandomMessageId As %String = "RandomMessageId"
-	#dim DummyRequest1 As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	#dim DummyRequest2 As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	#dim DummyRequest3 As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	#dim DummyRequest1 As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..GeefRequest()
+	#dim DummyRequest2 As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..GeefRequest()
+	#dim DummyRequest3 As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..GeefRequest()
 	#dim DummyBOMBOLOutQuery As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery).%New()
 	
 	Do DummyBOMBOLOutQuery.Request.Insert(DummyRequest1)
 	Do DummyBOMBOLOutQuery.Request.Insert(DummyRequest2)
 	Do DummyBOMBOLOutQuery.Request.Insert(DummyRequest3)
 	
 	#dim RequestConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.RequestConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.RequestConverter).%New()
-	Do RequestConverterMock.VerwachtMethodCall("Convert", DummyRequest1, RandomMessageId).ExactAantalKeer(1)
-	Do RequestConverterMock.VerwachtMethodCall("Convert", DummyRequest2, RandomMessageId).ExactAantalKeer(1)
-	Do RequestConverterMock.VerwachtMethodCall("Convert", DummyRequest3, RandomMessageId).ExactAantalKeer(1)
+	Do RequestConverterMock.VerwachtMethodCall("Convert", DummyRequest1, RandomMessageId).DanReturn(..GeefConfigVariant()).ExactAantalKeer(1)
+	Do RequestConverterMock.VerwachtMethodCall("Convert", DummyRequest2, RandomMessageId).DanReturn(..GeefConfigVariant()).ExactAantalKeer(1)
+	Do RequestConverterMock.VerwachtMethodCall("Convert", DummyRequest3, RandomMessageId).DanReturn(..GeefConfigVariant()).ExactAantalKeer(1)
 	
 	Set ..Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New(RequestConverterMock)
 	
@@ -34,6 +34,36 @@
 	Do RequestConverterMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: RequestConverter vult class in voor elk ConfigVariant resultaat">
+<Implementation><![CDATA[
+	#dim RandomMessageId As %String = "RandomMessageId"
+	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	#dim DummyBOMBOLOutQuery As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery).%New()
+	
+	Do DummyBOMBOLOutQuery.Request.Insert(DummyRequest)
+	
+	Set ..Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New()
+	
+	#dim BOMBOLInQuery As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery = ..Converter.Convert(DummyBOMBOLOutQuery, RandomMessageId)
+	
+	Do $$$AssertEquals(BOMBOLInQuery.ConfigVariant.GetAt(1).class, "entity")
+]]></Implementation>
+</Method>
+
+<Method name="GeefRequest">
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</ReturnType>
+<Implementation><![CDATA[	Quit ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+]]></Implementation>
+</Method>
+
+<Method name="GeefConfigVariant">
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant</ReturnType>
+<Implementation><![CDATA[	Quit ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant).%New()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WS/AX/CalculatedProduct/CalculatedProductService.cls.xml
===================================================================
diff -u -r44751 -r44839
--- WS/AX/CalculatedProduct/CalculatedProductService.cls.xml	(.../CalculatedProductService.cls.xml)	(revision 44751)
+++ WS/AX/CalculatedProduct/CalculatedProductService.cls.xml	(.../CalculatedProductService.cls.xml)	(revision 44839)
@@ -18,9 +18,10 @@
 <Implementation><![CDATA[
 	#dim Converter As WSimpl.AX.CalculatedProduct.Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New()
 	#dim XmlCorrelater As TECH.XMLCorrelater = ##class(TECH.XMLCorrelater).%New()
+	#dim GUID As %String = ##class(AXimpl.MessageManager).%New().GenerateID()
 	
 	#dim BOMBOLOutQuery As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery = XmlCorrelater.FromStream(In, "AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery", "ADUMsgBOMBOLOutQuery")
-	#dim BOMBOLInQuery As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery = Converter.Convert(BOMBOLOutQuery, "DummyMessageId")
+	#dim BOMBOLInQuery As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery = Converter.Convert(BOMBOLOutQuery, GUID)
 
 	Quit ##class(TECH.XmlObjectUtils).GeefXMLStream(BOMBOLInQuery)
 ]]></Implementation>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TAX/1648504.xml
===================================================================
diff -u -r44768 -r44839
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TAX/1648504.xml	(.../1648504.xml)	(revision 44768)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TAX/1648504.xml	(.../1648504.xml)	(revision 44839)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
-  <ConfigVariant>
+  <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
     <ConfigVariantId>DummyItemId</ConfigVariantId>
     <CostPrice>39.443200</CostPrice>
@@ -9,148 +9,148 @@
     <MessageId>DummyMessageId</MessageId>
     <ProductName>TA4M/E CDRR500x564    W W</ProductName>
     <SalesId>DummySalesId</SalesId>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>1</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.677.094.10</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.677.141.10</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.346.098.12</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>4</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.369.650.8</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.098.027.11</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>6</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.678.350.12</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>7</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.678.350.12</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>8</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.247.731.11</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>9</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.705.488.1</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>10</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.494.388.1</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>11</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.644.998.3</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>12</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.661.673.8</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>13</BOMLine>
       <BOMQty>4</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.683.698.11</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>14</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.457.396.10</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>15</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.383.007.12</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>16</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>0.376.199.2</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>17</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.537.438.3</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>18</BOMLine>
       <BOMQty>1</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.605.085.3</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>19</BOMLine>
       <BOMQty>2</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.964.581.11</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>20</BOMLine>
       <BOMQty>10</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.181.528.11</ItemId>
     </BOMLine>
-    <BOMLine>
+    <BOMLine class="entity">
       <BOMLine>21</BOMLine>
       <BOMQty>4</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ItemId>9.346.098.12</ItemId>
     </BOMLine>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>TA'OR BOX lade M D:500xB:564 ladezijkant:Wit kantenband:Wit bodem:Wit rug:Wit eindkap ladezijkant:Aluminium look bevat: gemont. lade;corpusprofiel Movento 40kg;BLUMOTION;frontbevest. EXPANDO verpakt: karton</Description>
       <LanguageId>nl-be</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>TA'OR BOX tiroir M P:500xL:564 côté de tiroir:Blanc chant à coller:Blanc fond:Blanc dos:Blanc caches côté de tiroir:Finition Alu contient: tiroir monté;coulisses corps de meuble Movento 40kg;BLUMOTION;attache façade EXPANDO emballé: carton</Description>
       <LanguageId>fr</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>TA'OR BOX drawer M D:500xW:564 drawer side:White edge-band:White base:White back:White end cover caps drawer side:Aluminium look contains: premounted drawer;cabinet profiles Movento 40kg;BLUMOTION;fixation expando packed: box</Description>
       <LanguageId>en-us</LanguageId>
     </VariantDescription>
-    <VariantDescription>
+    <VariantDescription class="entity">
       <ConfigVariantId>DummyItemId</ConfigVariantId>
       <Description>TA'OR BOX Schubkasten M T:500xB:564 Zarge:Weiss Kantenband:Weiss Boden:Weiss Rückwand:Weiss Endkappe Zarge:Alu look beinhaltet: fertigschubkasten;Korpusschienen Movento 40kg;BLUMOTION;frontbefest EXPANDO verpackt: karton</Description>
       <LanguageId>de</LanguageId>