Index: TECH/KeyValueList.cls.xml
===================================================================
diff -u -r1769 -r1776
--- TECH/KeyValueList.cls.xml	(.../KeyValueList.cls.xml)	(revision 1769)
+++ TECH/KeyValueList.cls.xml	(.../KeyValueList.cls.xml)	(revision 1776)
@@ -11,11 +11,7 @@
 <FormalSpec>Key:%CacheString="",Value:%CacheString=""</FormalSpec>
 <ReturnType>TECH.KeyValueList</ReturnType>
 <Implementation><![CDATA[
-	If ('$IsObject(..FindByKey(Key))) {
-		Do ..Insert(##class(TECH.KeyValuePair).%New(Key, Value))
-	} Else {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Key already exists : " _ Key))
-	}
+	Do ..Insert(##class(TECH.KeyValuePair).%New(Key, Value))
 	
 	Quit $this
 ]]></Implementation>
@@ -24,11 +20,12 @@
 <Method name="ToStream">
 <ReturnType>%GlobalCharacterStream</ReturnType>
 <Implementation><![CDATA[
-	Set Stream = ##class(%GlobalCharacterStream).%New()
-	Set ListIterator = ##class(TECH.ListIterator).%New($this)
+	#Dim Stream As %GlobalCharacterStream = ##class(%GlobalCharacterStream).%New()
+	#Dim ListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New($this)
 	
-	While ListIterator.HasNext() {
+	While (ListIterator.HasNext()) {
 		#Dim KeyValuePair As TECH.KeyValuePair = ListIterator.Next()
+		
 		Do Stream.WriteLine("Key:" _ KeyValuePair.Key _ ", Value:" _ KeyValuePair.Value)
 	}
 	
@@ -39,11 +36,11 @@
 <Method name="GetKeys">
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	set Keys = ##class(%ListOfDataTypes).%New()
-	Set ListIterator = ##class(TECH.ListIterator).%New($this)
+	#Dim Keys As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#Dim ListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New($this)
 	
-	While ListIterator.HasNext() {
-		do Keys.Insert(ListIterator.Next().Key)
+	While (ListIterator.HasNext()) {
+		Do Keys.Insert(ListIterator.Next().Key)
 	}
 	
 	Quit Keys
@@ -53,26 +50,29 @@
 <Method name="GetValues">
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	set Values = ##class(%ListOfDataTypes).%New()
-	Set ListIterator = ##class(TECH.ListIterator).%New($this)
-	While ListIterator.HasNext() {
-		do Values.Insert(ListIterator.Next().Value)
+	#Dim Values As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#Dim ListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New($this)
+	
+	While (ListIterator.HasNext()) {
+		Do Values.Insert(ListIterator.Next().Value)
 	}
-	quit Values
+	
+	Quit Values
 ]]></Implementation>
 </Method>
 
 <Method name="FindByKey">
 <FormalSpec>Key:%CacheString</FormalSpec>
-<ReturnType>TECH.KeyValuePair</ReturnType>
+<ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	#dim KeyValuePair As TECH.KeyValuePair = ""
-	Set ListIterator = ##class(TECH.ListIterator).%New($this)
-	While ListIterator.HasNext() && '($IsObject(KeyValuePair)) {
-		#Dim CurrentKeyValuePair As TECH.KeyValuePair = ListIterator.Next()
-		set:(Key=CurrentKeyValuePair.Key) KeyValuePair = CurrentKeyValuePair
+	#Dim KeyValuePairs As %ListOfObjects = ##class(%ListOfObjects).%New()
+	#Dim ListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New($this)
+	
+	While (ListIterator.HasNext()) {
+		Do KeyValuePairs.Insert(ListIterator.Next())
 	}
-	quit KeyValuePair
+	
+	Quit KeyValuePairs
 ]]></Implementation>
 </Method>