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>