Index: TECH/KeyValueList.cls.xml
===================================================================
diff -u -r995 -r1769
--- TECH/KeyValueList.cls.xml	(.../KeyValueList.cls.xml)	(revision 995)
+++ TECH/KeyValueList.cls.xml	(.../KeyValueList.cls.xml)	(revision 1769)
@@ -9,7 +9,15 @@
 
 <Method name="InsertKeyValuePair">
 <FormalSpec>Key:%CacheString="",Value:%CacheString=""</FormalSpec>
-<Implementation><![CDATA[	Do ..Insert(##class(TECH.KeyValuePair).%New(Key,Value))
+<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))
+	}
+	
+	Quit $this
 ]]></Implementation>
 </Method>
 
@@ -18,14 +26,56 @@
 <Implementation><![CDATA[
 	Set Stream = ##class(%GlobalCharacterStream).%New()
 	Set ListIterator = ##class(TECH.ListIterator).%New($this)
+	
 	While ListIterator.HasNext() {
-		#dim KeyValuePair As TECH.KeyValuePair = ListIterator.Next()
-		Do Stream.WriteLine("Key:"_KeyValuePair.Key_", Value:"_KeyValuePair.Value)
+		#Dim KeyValuePair As TECH.KeyValuePair = ListIterator.Next()
+		Do Stream.WriteLine("Key:" _ KeyValuePair.Key _ ", Value:" _ KeyValuePair.Value)
 	}
+	
 	Quit Stream
 ]]></Implementation>
 </Method>
 
+<Method name="GetKeys">
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	set Keys = ##class(%ListOfDataTypes).%New()
+	Set ListIterator = ##class(TECH.ListIterator).%New($this)
+	
+	While ListIterator.HasNext() {
+		do Keys.Insert(ListIterator.Next().Key)
+	}
+	
+	Quit Keys
+]]></Implementation>
+</Method>
+
+<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)
+	}
+	quit Values
+]]></Implementation>
+</Method>
+
+<Method name="FindByKey">
+<FormalSpec>Key:%CacheString</FormalSpec>
+<ReturnType>TECH.KeyValuePair</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
+	}
+	quit KeyValuePair
+]]></Implementation>
+</Method>
+
 <Storage name="Custom">
 <Type>%Library.CompleteCustomStorage</Type>
 </Storage>