diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
deleted file mode 100644
index 796b358..0000000
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
- java.util.Hashtable
-
- Hashtable
- System.Collections.Generic.Dictionary
-
-
- System.Collections.ICollection
- System.Collections.IDictionary
-
-
-
-
- ${this:16}.put(${key}, ${value})
-
-
- System.Object
- key
-
-
- System.Object
- value
-
-
- Add
- System.Int32
-
-
-
- ${this:16}.containsKey(${key})
-
-
- System.Object
- key
-
-
- Contains
- System.Boolean
-
-
-
- ${this:16}.containsKey(${key})
-
-
- System.Object
- key
-
-
- ContainsKey
- System.Boolean
-
-
-
- ${this:16}.get(${key})
-
-
- System.Object
- key
-
-
- get___idx
- System.Object
-
-
-
- ${this:16}.put(${key}, ${value})
-
-
- System.Object
- key
-
-
- System.Object
- value
-
-
- set___idx
- System.Void
-
-
-
-
-
- ${this:16}.size()
- System.Int32
- Count
- ${this:16}.size()
- ${this:16}.setCount(${value})
-
-
-
- ${this:16}.keySet()
- System.Collections.ICollection
- Keys
- ${this:16}.keySet()
- ${this:16}.setKeys(${value})
-
-
-
-
-
-
-
-
- System.Object
- key
-
-
- System.Object
- ${this:16}.get(${key})
- ${this:16}.put(${key}, ${value})
-
-
-
-
-
- java.util.Hashtable
-
- new Hashtable()
-
-
-
-
- java.util.Hashtable
-
- new Hashtable(${length})
-
-
- System.Int32
- length
-
-
-
-
-
- java.util.Hashtable
-
- new Hashtable(${collection})
-
-
- System.ICollection
- collection
-
-
-
-
-
-
-
-
-
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/ICollection'1.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/ICollection'1.xml
new file mode 100644
index 0000000..c8ad879
--- /dev/null
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/ICollection'1.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ java.util.Collection
+
+ Collection*[${T}]*
+ System.Collections.Generic.ICollection
+
+ T
+
+
+ T
+ ${expr}
+
+
+
+
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/IDictionary'2.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/IDictionary'2.xml
new file mode 100644
index 0000000..0dff17b
--- /dev/null
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/IDictionary'2.xml
@@ -0,0 +1,37 @@
+
+
+
+
+ java.util.Map
+
+ Map*[${K},${V}]*
+ System.Collections.Generic.IDictionary
+
+ K
+ V
+
+
+ System.Collections.Generic.KeyValuePair*[K,V]*
+ ${expr}.entrySet()
+
+
+
+
+ System.Collections.Generic.ICollection*[K]*
+ Keys
+ ${this:16}.keySet()
+
+
+
+ System.Collections.Generic.ICollection*[V]*
+ Values
+ ${this:16}.values()
+
+
+
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/KeyValuePair'2.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/KeyValuePair'2.xml
new file mode 100644
index 0000000..13c1aa5
--- /dev/null
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/KeyValuePair'2.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ java.util.Map.Entry
+
+ Entry*[${K},${V}]*
+ System.Collections.Generic.KeyValuePair
+
+ K
+ V
+
+