Index: Tools/ObjectDumper/Dumper.cls.xml
===================================================================
diff -u -r500 -r502
--- Tools/ObjectDumper/Dumper.cls.xml	(.../Dumper.cls.xml)	(revision 500)
+++ Tools/ObjectDumper/Dumper.cls.xml	(.../Dumper.cls.xml)	(revision 502)
@@ -15,6 +15,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="AddArrayOfDataTypes">
+<FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	do ..AddCollectionOfDataTypes(List,PropertyName)
+]]></Implementation>
+</Method>
+
+<Method name="AddListOfDataTypes">
+<FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	do ..AddCollectionOfDataTypes(List,PropertyName)
+]]></Implementation>
+</Method>
+
 <Method name="AddCollectionOfDataTypes">
 <FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
 <Private>1</Private>
@@ -29,6 +43,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="AddArrayOfObjects">
+<FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	do ..AddCollectionOfObjects(List,PropertyName)
+]]></Implementation>
+</Method>
+
+<Method name="AddListOfObjects">
+<FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	do ..AddCollectionOfObjects(List,PropertyName)
+]]></Implementation>
+</Method>
+
 <Method name="AddCollectionOfObjects">
 <FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
 <Private>1</Private>
Index: Tools/ObjectDumper/dto/Command.cls.xml
===================================================================
diff -u
--- Tools/ObjectDumper/dto/Command.cls.xml	(revision 0)
+++ Tools/ObjectDumper/dto/Command.cls.xml	(revision 502)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.ObjectDumper.dto.Command">
+<Super>%RegisteredObject</Super>
+
+<Property name="Type">
+<Type>Tools.ObjectDumper.enu.CommandType</Type>
+</Property>
+
+<Property name="Line">
+<Type>%String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: Tools/ObjectDumper/CodeCreator.cls.xml
===================================================================
diff -u
--- Tools/ObjectDumper/CodeCreator.cls.xml	(revision 0)
+++ Tools/ObjectDumper/CodeCreator.cls.xml	(revision 502)
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.ObjectDumper.CodeCreator">
+<Super>Tools.ObjectDumper.Base</Super>
+
+<Property name="AddCommandToResult">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Object:%Library.Base,AddCommandToResult:%Boolean=1</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..AddCommandToResult = AddCommandToResult
+	set ..Object = Object 
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="AAADummyDefineMethod">
+<Implementation><![CDATA[
+	#define Set	##class(Tools.ObjectDumper.enu.CommandType).set()	
+	#define Do	##class(Tools.ObjectDumper.enu.CommandType).do()
+]]></Implementation>
+</Method>
+
+<Method name="FormatUnformattedList">
+<FormalSpec>List:%ListOfObjects(ELEMENTYPE="Tools.ObjectDumper.dto.Command")</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	set NewList = ##class(%ListOfDataTypes).%New()
+	set itCommands = ##class(TECH.ListIterator).%New(List)
+	while itCommands.HasNext() {
+		#dim Command As Tools.ObjectDumper.dto.Command = itCommands.Next()
+		if $IsObject(Command) {
+			#dim Line As %String = ""
+			if ..AddCommandToResult {
+				set Line = Command.Type_" "_ ..Object.%ClassName()_"."
+			}
+			set Line = Line _Command.Line
+		} else {
+			set Line = Command
+		}
+	do NewList.Insert(Line)
+	}
+	quit NewList
+]]></Implementation>
+</Method>
+
+<Method name="AddPropertyAsDataType">
+<FormalSpec>List:%ListOfObjects,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Value As %CacheString = $zobjproperty(..Object,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_""""))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AddListOfDataTypes">
+<FormalSpec>List:%ListOfObjects,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	do List.Insert(..GenCommand($$$Set,PropertyName_" = ##class(%ListOfDataTypes).%New()"))
+	#dim itItems As TECH.ListIterator = ##class(TECH.ListIterator).%New($zobjProperty(..Object,PropertyName))
+	while itItems.HasNext() {
+		#dim Value As %CacheString = itItems.Next()
+		#dim Key As %CacheString = itItems.Key()
+		do List.Insert(..GenCommand($$$Do,PropertyName_".Insert("""_Value_""")"))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AddArrayOfDataTypes">
+<FormalSpec>List:%ListOfObjects,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	do List.Insert(..GenCommand($$$Set,PropertyName_" = ##class(%ArrayOfDataTypes).%New()"))
+	#dim itItems As TECH.ListIterator = ##class(TECH.ListIterator).%New($zobjProperty(..Object,PropertyName))
+	while itItems.HasNext() {
+		#dim Value As %CacheString = itItems.Next()
+		#dim Key As %CacheString = itItems.Key()
+		do List.Insert(..GenCommand($$$Do,PropertyName_".SetAt("""_Value_""","""_Key_""")"))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AddArrayOfObjects">
+<FormalSpec>List:%ListOfObjects,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim itItems As TECH.ListIterator = ##class(TECH.ListIterator).%New($zobjProperty(..Object,PropertyName))
+	while itItems.HasNext() {
+		#dim Object As %Library.Base = itItems.Next()
+		#dim Key As %CacheString = itItems.Key()
+		if $IsObject(Object) { 
+			do List.Insert(..GenCommand($$$Do,PropertyName_".SetAt(##class("_Object.%ClassName(1)_").%New(),"""_Key_""")"))
+			set ObjectCreator = ##class(Tools.ObjectDumper.CodeCreator).%New(Object,0)
+			set itObjectResult = ##class(TECH.ListIterator).%New(ObjectCreator.GetResult())
+			while itObjectResult.HasNext() {
+				#dim Next As %String = itObjectResult.Next()
+				do List.Insert(..GenCommand($$$Set,PropertyName_".GetAt("""_Key_""")."_Next))
+			}	
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AddListOfObjects">
+<FormalSpec>List:%ListOfObjects,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim itItems As TECH.ListIterator = ##class(TECH.ListIterator).%New($zobjProperty(..Object,PropertyName))
+	while itItems.HasNext() {
+		#dim Object As %Library.Base = itItems.Next()
+		#dim Key As %CacheString = itItems.Key()
+		if $IsObject(Object) { 
+			do List.Insert(..GenCommand($$$Do,PropertyName_".Insert(##class("_Object.%ClassName(1)_").%New())"))
+			set ObjectCreator = ##class(Tools.ObjectDumper.CodeCreator).%New(Object,0)
+			set itObjectResult = ##class(TECH.ListIterator).%New(ObjectCreator.GetResult())
+			while itObjectResult.HasNext() {
+				do List.Insert(..GenCommand($$$Set,PropertyName_".GetAt("_Key_")."_itObjectResult.Next()))
+			}	
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AddObject">
+<FormalSpec>List:%ListOfObjects,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Object As %Library.Base = $zobjProperty(..Object,PropertyName)
+	if $IsObject(Object) {
+		do List.Insert(..GenCommand($$$Set,PropertyName_" = ##class("_Object.%ClassName(1)_").%New()"))
+		set ObjectDumper = ##class(Tools.ObjectDumper.CodeCreator).%New(Object,0)
+		set itObjectResult = ##class(TECH.ListIterator).%New(ObjectDumper.GetResult())
+		while itObjectResult.HasNext() {
+			do List.Insert(..GenCommand($$$Set,PropertyName_"."_itObjectResult.Next()))
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AddMultiDimensional">
+<FormalSpec>List:%ListOfObjects,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	new PropertyValues
+	new Code set Code = "merge @PropertyName = ..Object."_PropertyName xecute Code
+	new Subscript set Subscript = PropertyName
+	for { set Subscript = $query(@Subscript) quit:Subscript=""
+		do List.Insert(..GenCommand($$$Set,Subscript_" = """_@Subscript_""""))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GenCommand">
+<FormalSpec>CommandType:Tools.ObjectDumper.enu.CommandType,String:%String</FormalSpec>
+<ReturnType>Tools.ObjectDumper.dto.Command</ReturnType>
+<Implementation><![CDATA[
+	set Command = ##class(Tools.ObjectDumper.dto.Command).%New()
+	set Command.Type = CommandType
+	set Command.Line = String
+	quit Command
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: Tools/ObjectDumper/Base.cls.xml
===================================================================
diff -u -r500 -r502
--- Tools/ObjectDumper/Base.cls.xml	(.../Base.cls.xml)	(revision 500)
+++ Tools/ObjectDumper/Base.cls.xml	(.../Base.cls.xml)	(revision 502)
@@ -24,34 +24,52 @@
 <Final>1</Final>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	set Result = ##class(%ListOfDataTypes).%New()
+	#dim UnformattedList As %Collection.AbstractList = ..GetUnformattedResult()	
+	quit ..FormatUnformattedList(UnformattedList)
+]]></Implementation>
+</Method>
+
+<Method name="GetUnformattedResult">
+<Final>1</Final>
+<ReturnType>%Collection.AbstractList</ReturnType>
+<Implementation><![CDATA[
+	set UnformattedList = ##class(%ListOfDataTypes).%New()
 	
 	set itProperties = ##class(TECH.ListIterator).%New(..GetProperties())
 	while itProperties.HasNext() {
 		#dim Property As Tools.ObjectDumper.dto.Property = itProperties.Next()		
 		continue:..SkipProperty(Property.Name)
 		if Property.ClassType = ##class(Tools.ObjectDumper.enu.ClassType).DataType() {
 			if Property.MultiDimensional { 
-				do ..AddMultiDimensional(Result,Property.Name)
+				do ..AddMultiDimensional(UnformattedList,Property.Name)
 			} else {
-				do ..AddPropertyAsDataType(Result,Property.Name)
+				do ..AddPropertyAsDataType(UnformattedList,Property.Name)
 			}
 		} elseif Property.ClassType = ##class(Tools.ObjectDumper.enu.ClassType).ListOfDataTypes() {
-			do ..AddCollectionOfDataTypes(Result,Property.Name)
+			do ..AddListOfDataTypes(UnformattedList,Property.Name)
 		} elseif Property.ClassType = ##class(Tools.ObjectDumper.enu.ClassType).ArrayOfDataTypes() {
-			do ..AddCollectionOfDataTypes(Result,Property.Name)
+			do ..AddArrayOfDataTypes(UnformattedList,Property.Name)
 		} elseif Property.ClassType = ##class(Tools.ObjectDumper.enu.ClassType).Object() {
-			do ..AddObject(Result,Property.Name)
+			do ..AddObject(UnformattedList,Property.Name)
 		} elseif Property.ClassType = ##class(Tools.ObjectDumper.enu.ClassType).ArrayOfObjects() {
-			do ..AddCollectionOfObjects(Result,Property.Name)
+			do ..AddArrayOfObjects(UnformattedList,Property.Name)
 		} elseif Property.ClassType = ##class(Tools.ObjectDumper.enu.ClassType).ListOfObjects() {
-			do ..AddCollectionOfObjects(Result,Property.Name)
+			do ..AddListOfObjects(UnformattedList,Property.Name)
 		}
-	}		
-	quit Result
+	}
+	
+	quit UnformattedList
 ]]></Implementation>
 </Method>
 
+<Method name="FormatUnformattedList">
+<FormalSpec>List:%Collection.AbstractList</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	quit List
+]]></Implementation>
+</Method>
+
 <Method name="SkipProperty">
 <Final>1</Final>
 <FormalSpec>PropertyName:%String</FormalSpec>
@@ -81,31 +99,43 @@
 
 <Method name="AddPropertyAsDataType">
 <Abstract>1</Abstract>
-<FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
+<FormalSpec>List:%Collection.AbstractList,PropertyName:%String</FormalSpec>
 <Private>1</Private>
 </Method>
 
-<Method name="AddCollectionOfDataTypes">
+<Method name="AddArrayOfDataTypes">
 <Abstract>1</Abstract>
-<FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
+<FormalSpec>List:%Collection.AbstractList,PropertyName:%String</FormalSpec>
 <Private>1</Private>
 </Method>
 
-<Method name="AddCollectionOfObjects">
+<Method name="AddListOfDataTypes">
 <Abstract>1</Abstract>
-<FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
+<FormalSpec>List:%Collection.AbstractList,PropertyName:%String</FormalSpec>
 <Private>1</Private>
 </Method>
 
+<Method name="AddArrayOfObjects">
+<Abstract>1</Abstract>
+<FormalSpec>List:%Collection.AbstractList,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+</Method>
+
+<Method name="AddListOfObjects">
+<Abstract>1</Abstract>
+<FormalSpec>List:%Collection.AbstractList,PropertyName:%String</FormalSpec>
+<Private>1</Private>
+</Method>
+
 <Method name="AddMultiDimensional">
 <Abstract>1</Abstract>
-<FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
+<FormalSpec>List:%Collection.AbstractList,PropertyName:%String</FormalSpec>
 <Private>1</Private>
 </Method>
 
 <Method name="AddObject">
 <Abstract>1</Abstract>
-<FormalSpec>List:%ListOfDataTypes,PropertyName:%String</FormalSpec>
+<FormalSpec>List:%Collection.AbstractList,PropertyName:%String</FormalSpec>
 <Private>1</Private>
 </Method>
 
Index: Tools/ObjectDumper/enu/CommandType.cls.xml
===================================================================
diff -u
--- Tools/ObjectDumper/enu/CommandType.cls.xml	(revision 0)
+++ Tools/ObjectDumper/enu/CommandType.cls.xml	(revision 502)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.ObjectDumper.enu.CommandType">
+<ClassType>datatype</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Enumeration</Super>
+
+<Parameter name="VALUELIST">
+<Default>;set;do</Default>
+</Parameter>
+
+<Parameter name="DISPLAYLIST">
+<Default>;set;do</Default>
+</Parameter>
+
+<Method name="set">
+<ClassMethod>1</ClassMethod>
+<ReturnType>Tools.ObjectDumper.enu.CommandType</ReturnType>
+<Implementation><![CDATA[	Quit "set"
+]]></Implementation>
+</Method>
+
+<Method name="do">
+<ClassMethod>1</ClassMethod>
+<ReturnType>Tools.ObjectDumper.enu.CommandType</ReturnType>
+<Implementation><![CDATA[	Quit "do"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>