Index: APPS/common/Rapport/impl/RapportVerwerker/HeaderBepaler.cls.xml
===================================================================
diff -u -r29059 -r40695
--- APPS/common/Rapport/impl/RapportVerwerker/HeaderBepaler.cls.xml	(.../HeaderBepaler.cls.xml)	(revision 29059)
+++ APPS/common/Rapport/impl/RapportVerwerker/HeaderBepaler.cls.xml	(.../HeaderBepaler.cls.xml)	(revision 40695)
@@ -4,15 +4,16 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Method name="Bepaal">
-<FormalSpec>Properties:TECH.KeyValue.List</FormalSpec>
+<FormalSpec>Properties:TECH.KeyValue.List,Headers:%ListOfDataTypes=##class(%ListOfDataTypes).%New()</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	Set Headers = ##class(%ListOfDataTypes).%New()
-	Set PropertiesIt = ##class(TECH.ListIterator).%New(Properties)
-	Set Vertaler = ##class(APPS.common.Rapport.impl.RapportVerwerker.PropertyHeaderVertaler).%New(##class(DOM.enu.Taal).Nederlands())
-	While PropertiesIt.HasNext() {
-		#dim Vertaling As %String = Vertaler.Vertaal(PropertiesIt.Next())
-		Do Headers.Insert(Vertaling)
+	if Headers.Count() = 0 {
+		Set PropertiesIt = ##class(TECH.ListIterator).%New(Properties)
+		Set Vertaler = ##class(APPS.common.Rapport.impl.RapportVerwerker.PropertyHeaderVertaler).%New(##class(DOM.enu.Taal).Nederlands())
+		While PropertiesIt.HasNext() {
+			#dim Vertaling As %String = Vertaler.Vertaal(PropertiesIt.Next())
+			Do Headers.Insert(Vertaling)
+		}
 	}
 	Quit Headers
 ]]></Implementation>
Index: APPS/common/Rapport/dto/BestandRapportDataObjectIteratorBased.cls.xml
===================================================================
diff -u -r34420 -r40695
--- APPS/common/Rapport/dto/BestandRapportDataObjectIteratorBased.cls.xml	(.../BestandRapportDataObjectIteratorBased.cls.xml)	(revision 34420)
+++ APPS/common/Rapport/dto/BestandRapportDataObjectIteratorBased.cls.xml	(.../BestandRapportDataObjectIteratorBased.cls.xml)	(revision 40695)
@@ -3,17 +3,9 @@
 <Class name="APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased">
 <Super>APPS.common.Rapport.dto.BestandRapportData</Super>
 
-<Property name="DataVelden">
-<Type>TECH.KeyValue.List</Type>
-</Property>
-
 <Property name="Iterator">
 <Type>TECH.Iterator</Type>
 </Property>
-
-<Property name="BestandVolledigeNaam">
-<Type>%String</Type>
-</Property>
 </Class>
 
 
Index: APPS/common/Rapport/impl/BestandGeneratorTemplate.cls.xml
===================================================================
diff -u -r40672 -r40695
--- APPS/common/Rapport/impl/BestandGeneratorTemplate.cls.xml	(.../BestandGeneratorTemplate.cls.xml)	(revision 40672)
+++ APPS/common/Rapport/impl/BestandGeneratorTemplate.cls.xml	(.../BestandGeneratorTemplate.cls.xml)	(revision 40695)
@@ -88,7 +88,7 @@
 <Implementation><![CDATA[
 	#dim Regel As %String = ""
 	Set HeaderBepaler = ##class(APPS.common.Rapport.impl.RapportVerwerker.HeaderBepaler).%New()
-	Set DataVeldenIterator = ##class(TECH.ListIterator).%New(HeaderBepaler.Bepaal(..Data.DataVelden))
+	Set DataVeldenIterator = ##class(TECH.ListIterator).%New(HeaderBepaler.Bepaal(..Data.DataVelden, ..Data.Headers))
 	While DataVeldenIterator.HasNext() {
 		#dim DataVeld As %String = DataVeldenIterator.Next()
 		set Regel = Regel _ DataVeld
Index: APPS/common/Rapport/dto/BestandRapportData.cls.xml
===================================================================
diff -u -r38320 -r40695
--- APPS/common/Rapport/dto/BestandRapportData.cls.xml	(.../BestandRapportData.cls.xml)	(revision 38320)
+++ APPS/common/Rapport/dto/BestandRapportData.cls.xml	(.../BestandRapportData.cls.xml)	(revision 40695)
@@ -4,6 +4,14 @@
 <Abstract>1</Abstract>
 <Super>TECH.DataTransferObject</Super>
 
+<Property name="Headers">
+<Type>%ListOfDataTypes</Type>
+</Property>
+
+<Property name="DataVelden">
+<Type>TECH.KeyValue.List</Type>
+</Property>
+
 <Property name="ScheidingsTeken">
 <Type>%String</Type>
 <InitialExpression>$$$TAB</InitialExpression>
@@ -12,6 +20,29 @@
 <Property name="VervangInRegel">
 <Type>%List</Type>
 </Property>
+
+<Property name="BestandVolledigeNaam">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..DataVelden = ##class(TECH.KeyValue.List).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeVeld">
+<FormalSpec>Classname:%String,PropertyName:%String,DisplayName:%String</FormalSpec>
+<Implementation><![CDATA[
+	do ..DataVelden.InsertKeyValue(Classname,PropertyName)
+	do ..Headers.Insert(DisplayName)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/common/Rapport/dto/BestandRapportDataDataTransferObjectBased.cls.xml
===================================================================
diff -u -r29059 -r40695
--- APPS/common/Rapport/dto/BestandRapportDataDataTransferObjectBased.cls.xml	(.../BestandRapportDataDataTransferObjectBased.cls.xml)	(revision 29059)
+++ APPS/common/Rapport/dto/BestandRapportDataDataTransferObjectBased.cls.xml	(.../BestandRapportDataDataTransferObjectBased.cls.xml)	(revision 40695)
@@ -3,27 +3,10 @@
 <Class name="APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased">
 <Super>APPS.common.Rapport.dto.BestandRapportData</Super>
 
-<Property name="DataVelden">
-<Type>TECH.KeyValue.List</Type>
-</Property>
-
 <Property name="DataTransferObjecten">
 <Type>TECH.DataTransferObject</Type>
 <Collection>list</Collection>
 </Property>
-
-<Property name="BestandVolledigeNaam">
-<Type>%String</Type>
-</Property>
-
-<Method name="%OnNew">
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/common/Rapport/dto/BestandRapportDataResultSetBased.cls.xml
===================================================================
diff -u -r29059 -r40695
--- APPS/common/Rapport/dto/BestandRapportDataResultSetBased.cls.xml	(.../BestandRapportDataResultSetBased.cls.xml)	(revision 29059)
+++ APPS/common/Rapport/dto/BestandRapportDataResultSetBased.cls.xml	(.../BestandRapportDataResultSetBased.cls.xml)	(revision 40695)
@@ -3,18 +3,10 @@
 <Class name="APPS.common.Rapport.dto.BestandRapportDataResultSetBased">
 <Super>APPS.common.Rapport.dto.BestandRapportData</Super>
 
-<Property name="DataVelden">
-<Type>TECH.KeyValue.List</Type>
-</Property>
-
 <Property name="ResultSet">
 <Type>TECH.ResultSet</Type>
 </Property>
 
-<Property name="BestandVolledigeNaam">
-<Type>%String</Type>
-</Property>
-
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>