Index: Tools/ObjectDumper/CodeCreator.cls.xml
===================================================================
diff -u -r741 -r799
--- Tools/ObjectDumper/CodeCreator.cls.xml	(.../CodeCreator.cls.xml)	(revision 741)
+++ Tools/ObjectDumper/CodeCreator.cls.xml	(.../CodeCreator.cls.xml)	(revision 799)
@@ -53,15 +53,27 @@
 </Method>
 
 <Method name="AddPropertyAsDataType">
-<FormalSpec>List:%ListOfObjects,PropertyName:%String</FormalSpec>
+<FormalSpec>List:%ListOfObjects,Property:Tools.ObjectDumper.dto.Property</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	#dim PropertyName As %String = Property.Name
 	#dim Value As %CacheString = ..GetPropertyValue(PropertyName)
 	if $listvalid(Value) { 
 		set Value = $$LCVTXTDXTD^vhLib(Value,"$listbuild(",",",")","",1)
 		do List.Insert(..GenCommand($$$Set,PropertyName_" = "_Value))
 	} else {
-		do List.Insert(..GenCommand($$$Set,PropertyName_" = """_Value_""""))
+		#dim Line As %String = ""
+		if ##class(TECH.ClassUtils).IsEnumeratie(Property.ClassName) {
+			#dim EnumerationUtils As TECH.EnumerationUtils = ##class(TECH.EnumerationUtils).%New()
+			#dim MethodeNaam = EnumerationUtils.GeefMethodeNaamVoorWaarde(Property.ClassName,Value)
+			if $length(MethodeNaam) {
+				set Value = "##class("_Property.ClassName_")."_MethodeNaam_"()"
+				set Line = ..GenCommand($$$Set,PropertyName_" = "_Value_"")
+			}
+		} else {
+			set Line = ..GenCommand($$$Set,PropertyName_" = """_Value_"""")
+		}
+		do List.Insert(Line)
 	}
 ]]></Implementation>
 </Method>
Index: Tools/ObjectDumper/Base.cls.xml
===================================================================
diff -u -r756 -r799
--- Tools/ObjectDumper/Base.cls.xml	(.../Base.cls.xml)	(revision 756)
+++ Tools/ObjectDumper/Base.cls.xml	(.../Base.cls.xml)	(revision 799)
@@ -56,7 +56,7 @@
 				if Property.MultiDimensional { 
 					do ..AddMultiDimensional(UnformattedList,Property.Name)
 				} else {
-					do ..AddPropertyAsDataType(UnformattedList,Property.Name)
+					do ..AddPropertyAsDataType(UnformattedList,Property)
 				}
 			} elseif Property.ClassType = ##class(Tools.ObjectDumper.enu.ClassType).ListOfDataTypes() {
 				do ..AddListOfDataTypes(UnformattedList,Property.Name)
@@ -112,7 +112,7 @@
 
 <Method name="AddPropertyAsDataType">
 <Abstract>1</Abstract>
-<FormalSpec>List:%Collection.AbstractList,PropertyName:%String</FormalSpec>
+<FormalSpec>List:%Collection.AbstractList,Property:Tools.ObjectDumper.dto.Property</FormalSpec>
 <Private>1</Private>
 </Method>
 
Index: Tools/ObjectDumper/Dumper.cls.xml
===================================================================
diff -u -r534 -r799
--- Tools/ObjectDumper/Dumper.cls.xml	(.../Dumper.cls.xml)	(revision 534)
+++ Tools/ObjectDumper/Dumper.cls.xml	(.../Dumper.cls.xml)	(revision 799)
@@ -4,13 +4,13 @@
 <Super>Tools.ObjectDumper.Base</Super>
 
 <Method name="AddPropertyAsDataType">
-<FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
+<FormalSpec>List:%ListOfDataTypes,Property:Tools.ObjectDumper.dto.Property</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim Value As %CacheString = ..GetPropertyValue(PropertyName)
+	#dim Value As %CacheString = ..GetPropertyValue(Property.Name)
 	set Value = $$LCVT^vhLib(Value)
 	if $length(Value) {
-		do List.Insert(PropertyName_" = "_Value)	
+		do List.Insert(Property.Name_" = "_Value)	
 	}
 ]]></Implementation>
 </Method>
Index: TECH/Enumeration.cls.xml
===================================================================
diff -u -r589 -r799
--- TECH/Enumeration.cls.xml	(.../Enumeration.cls.xml)	(revision 589)
+++ TECH/Enumeration.cls.xml	(.../Enumeration.cls.xml)	(revision 799)
@@ -62,9 +62,10 @@
 <ReturnType>%ListOfDataTypes</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set List = ##class(%ListOfDataTypes).%New()
-	set Values = ..#DISPLAYLIST
-	set Delim = $extract(Values)
+	#dim Listbuild As %List = ""
+	#dim Values As %String = ..#DISPLAYLIST
+	#dim Delim As %String = $extract(Values)
+	#dim ctrItems As %Integer
 	for ctrItems = 2 : 1 : $length(Values,Delim) {
 		set Listbuild = Listbuild _ $listbuild($piece(Values,Delim,ctrItems))
 	}