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>