diff --git a/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml b/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml
index 7087ce1..821f5e2 100644
--- a/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml
+++ b/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.zip.ZipEntry</string>
+  </Imports>
   <Java>ZipEntry</Java>
   <Name>ICSharpCode.SharpZipLib.Zip.ZipEntry</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipInputStream.xml b/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipInputStream.xml
index 85157fd..f40bfc8 100644
--- a/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipInputStream.xml
+++ b/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipInputStream.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.zip.ZipInputStream</string>
+  </Imports>
   <Java>ZipInputStream</Java>
   <Name>ICSharpCode.SharpZipLib.Zip.ZipInputStream</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Activator.xml b/CS2JLibrary/NetFramework/System/Activator.xml
index 14bb476..c0f2cc2 100644
--- a/CS2JLibrary/NetFramework/System/Activator.xml
+++ b/CS2JLibrary/NetFramework/System/Activator.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Activator</string>
-  </Imports>
+  <Imports />
   <Java>Activator</Java>
   <Name>System.Activator</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/ApplicationException.xml b/CS2JLibrary/NetFramework/System/ApplicationException.xml
index 2c77c1c..0b28554 100644
--- a/CS2JLibrary/NetFramework/System/ApplicationException.xml
+++ b/CS2JLibrary/NetFramework/System/ApplicationException.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>RuntimeException</Java>
   <Name>System.ApplicationException</Name>
   <Uses />
@@ -27,9 +28,7 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports>
-        <string>CS2JNet.System.ApplicationException</string>
-      </Imports>
+      <Imports />
       <Java>new ApplicationException(${info},${ctxt})</Java>
       <Params>
         <Param>
diff --git a/CS2JLibrary/NetFramework/System/ArgumentException.xml b/CS2JLibrary/NetFramework/System/ArgumentException.xml
index 2384f14..0286262 100644
--- a/CS2JLibrary/NetFramework/System/ArgumentException.xml
+++ b/CS2JLibrary/NetFramework/System/ArgumentException.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>ArgumentException</Java>
   <Name>System.ArgumentException</Name>
   <Uses />
@@ -29,9 +30,7 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports>
-        <string>CS2JNet.System.ArgumentException</string>
-      </Imports>
+      <Imports />
       <Java>new ArgumentException(${info},${ctxt})</Java>
       <Params>
         <Param>
diff --git a/CS2JLibrary/NetFramework/System/ArithmeticException.xml b/CS2JLibrary/NetFramework/System/ArithmeticException.xml
index 7dd626d..09ef250 100644
--- a/CS2JLibrary/NetFramework/System/ArithmeticException.xml
+++ b/CS2JLibrary/NetFramework/System/ArithmeticException.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>ArithmeticException</Java>
   <Name>System.ArithmeticException</Name>
   <Uses />
@@ -27,9 +28,7 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports>
-        <string>CS2JNet.System.ArithmeticException</string>
-      </Imports>
+      <Imports />
       <Java>new ArithmeticException(${info},${ctxt})</Java>
       <Params>
         <Param>
diff --git a/CS2JLibrary/NetFramework/System/Array.xml b/CS2JLibrary/NetFramework/System/Array.xml
index 1cfe6c2..7e7618e 100644
--- a/CS2JLibrary/NetFramework/System/Array.xml
+++ b/CS2JLibrary/NetFramework/System/Array.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Array</string>
-  </Imports>
+  <Imports />
   <Java>Array</Java>
   <Name>System.Array</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Attribute.xml b/CS2JLibrary/NetFramework/System/Attribute.xml
index 4e2d98f..cfad385 100644
--- a/CS2JLibrary/NetFramework/System/Attribute.xml
+++ b/CS2JLibrary/NetFramework/System/Attribute.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Class</Java>
   <Name>System.Attribute</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Boolean.xml b/CS2JLibrary/NetFramework/System/Boolean.xml
index b5589dc..956533f 100644
--- a/CS2JLibrary/NetFramework/System/Boolean.xml
+++ b/CS2JLibrary/NetFramework/System/Boolean.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>boolean</Java>
   <Name>System.Boolean</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Byte.xml b/CS2JLibrary/NetFramework/System/Byte.xml
index dbfa58f..022e923 100644
--- a/CS2JLibrary/NetFramework/System/Byte.xml
+++ b/CS2JLibrary/NetFramework/System/Byte.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>byte</Java>
   <Name>System.Byte</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Char.xml b/CS2JLibrary/NetFramework/System/Char.xml
index 0d5c797..e464e8f 100644
--- a/CS2JLibrary/NetFramework/System/Char.xml
+++ b/CS2JLibrary/NetFramework/System/Char.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>char</Java>
   <Name>System.Char</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
index d8adb25..91c093e 100644
--- a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Collections.ArrayListSupport</string>
+  </Imports>
   <Java>ArrayListSupport</Java>
   <Name>System.Collections.ArrayList</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/DictionaryEntry.xml b/CS2JLibrary/NetFramework/System/Collections/DictionaryEntry.xml
index 05327e2..9d7d5d8 100644
--- a/CS2JLibrary/NetFramework/System/Collections/DictionaryEntry.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/DictionaryEntry.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.Map</string>
+  </Imports>
   <Java>Map.Entry</Java>
   <Name>System.Collections.DictionaryEntry</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
index 4bff5ae..2ca2ab7 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.Hashtable</string>
+  </Imports>
   <Java>Hashtable</Java>
   <Name>System.Collections.Generic.Dictionary</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/List.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/List.xml
index c2c1a94..fb88fe3 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/List.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/List.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Collections.ArrayListSupport</string>
+  </Imports>
   <Java>ArrayListSupport</Java>
   <Name>System.Collections.Generic.List</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/Hashtable.xml b/CS2JLibrary/NetFramework/System/Collections/Hashtable.xml
index 6849b38..774852d 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Hashtable.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Hashtable.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.Hashtable</string>
+  </Imports>
   <Java>Hashtable</Java>
   <Name>System.Collections.Hashtable</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/ICollection.xml b/CS2JLibrary/NetFramework/System/Collections/ICollection.xml
index 790f8b0..9b75aa5 100644
--- a/CS2JLibrary/NetFramework/System/Collections/ICollection.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/ICollection.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Interface xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Iterable</Java>
   <Name>System.Collections.ICollection</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/IDictionary.xml b/CS2JLibrary/NetFramework/System/Collections/IDictionary.xml
index 75b2bba..c4a93e0 100644
--- a/CS2JLibrary/NetFramework/System/Collections/IDictionary.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/IDictionary.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Interface xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.Map</string>
+  </Imports>
   <Java>Map</Java>
   <Name>System.Collections.IDictionary</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/IEnumerable.xml b/CS2JLibrary/NetFramework/System/Collections/IEnumerable.xml
index b303830..53c06ee 100644
--- a/CS2JLibrary/NetFramework/System/Collections/IEnumerable.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/IEnumerable.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Interface xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Iterable</Java>
   <Name>System.Collections.IEnumerable</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/IList.xml b/CS2JLibrary/NetFramework/System/Collections/IList.xml
index 8b98d62..edd9fcc 100644
--- a/CS2JLibrary/NetFramework/System/Collections/IList.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/IList.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.List</string>
+  </Imports>
   <Java>List</Java>
   <Name>System.Collections.IList</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/ObjectModel/Collection.xml b/CS2JLibrary/NetFramework/System/Collections/ObjectModel/Collection.xml
index e645d2d..b6db4f4 100644
--- a/CS2JLibrary/NetFramework/System/Collections/ObjectModel/Collection.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/ObjectModel/Collection.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Collections.ArrayListSupport</string>
+  </Imports>
   <Java>ArrayListSupport</Java>
   <Name>System.Collections.ObjectModel.Collection</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/SortedList.xml b/CS2JLibrary/NetFramework/System/Collections/SortedList.xml
index 25aea3f..d4be1af 100644
--- a/CS2JLibrary/NetFramework/System/Collections/SortedList.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/SortedList.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.TreeMap</string>
+  </Imports>
   <Java>TreeMap</Java>
   <Name>System.Collections.SortedList</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Collections/Specialized/NameValueCollection.xml b/CS2JLibrary/NetFramework/System/Collections/Specialized/NameValueCollection.xml
index 3623af8..b8403ca 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Specialized/NameValueCollection.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Specialized/NameValueCollection.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.Properties</string>
+  </Imports>
   <Java>Properties</Java>
   <Name>System.Collections.Specialized.NameValueCollection</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Configuration/ConfigurationManager.xml b/CS2JLibrary/NetFramework/System/Configuration/ConfigurationManager.xml
index aa77383..b80ece6 100644
--- a/CS2JLibrary/NetFramework/System/Configuration/ConfigurationManager.xml
+++ b/CS2JLibrary/NetFramework/System/Configuration/ConfigurationManager.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>NONE</Java>
   <Name>System.Configuration.ConfigurationManager</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Configuration/ConfigurationSettings.xml b/CS2JLibrary/NetFramework/System/Configuration/ConfigurationSettings.xml
index fadeca4..04f4a03 100644
--- a/CS2JLibrary/NetFramework/System/Configuration/ConfigurationSettings.xml
+++ b/CS2JLibrary/NetFramework/System/Configuration/ConfigurationSettings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>NONE</Java>
   <Name>System.Configuration.ConfigurationSettings</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Console.xml b/CS2JLibrary/NetFramework/System/Console.xml
index 929827f..fcb915f 100644
--- a/CS2JLibrary/NetFramework/System/Console.xml
+++ b/CS2JLibrary/NetFramework/System/Console.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Console</string>
-  </Imports>
+  <Imports />
   <Java>Console</Java>
   <Name>System.Console</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Convert.xml b/CS2JLibrary/NetFramework/System/Convert.xml
index 1ec4b39..dc0d875 100644
--- a/CS2JLibrary/NetFramework/System/Convert.xml
+++ b/CS2JLibrary/NetFramework/System/Convert.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Convert</string>
-  </Imports>
+  <Imports />
   <Java>Convert</Java>
   <Name>System.Convert</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/DBNull.xml b/CS2JLibrary/NetFramework/System/DBNull.xml
index 8166859..f4975d4 100644
--- a/CS2JLibrary/NetFramework/System/DBNull.xml
+++ b/CS2JLibrary/NetFramework/System/DBNull.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.DBNull</string>
-  </Imports>
+  <Imports />
   <Java>DBNull</Java>
   <Name>System.DBNull</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/DateTime.xml b/CS2JLibrary/NetFramework/System/DateTime.xml
index 461c7ab..d474d05 100644
--- a/CS2JLibrary/NetFramework/System/DateTime.xml
+++ b/CS2JLibrary/NetFramework/System/DateTime.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.Date</string>
+  </Imports>
   <Java>Date</Java>
   <Name>System.DateTime</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Decimal.xml b/CS2JLibrary/NetFramework/System/Decimal.xml
index 845929b..3398d22 100644
--- a/CS2JLibrary/NetFramework/System/Decimal.xml
+++ b/CS2JLibrary/NetFramework/System/Decimal.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>double</Java>
   <Name>System.Decimal</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Double.xml b/CS2JLibrary/NetFramework/System/Double.xml
index 8e9a609..28ded18 100644
--- a/CS2JLibrary/NetFramework/System/Double.xml
+++ b/CS2JLibrary/NetFramework/System/Double.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>double</Java>
   <Name>System.Double</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Enum.xml b/CS2JLibrary/NetFramework/System/Enum.xml
index 14829ee..259bd00 100644
--- a/CS2JLibrary/NetFramework/System/Enum.xml
+++ b/CS2JLibrary/NetFramework/System/Enum.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Enum</Java>
   <Name>System.Enum</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Environment.xml b/CS2JLibrary/NetFramework/System/Environment.xml
index 290892d..9e765e9 100644
--- a/CS2JLibrary/NetFramework/System/Environment.xml
+++ b/CS2JLibrary/NetFramework/System/Environment.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Environment</string>
-  </Imports>
+  <Imports />
   <Java>Environment</Java>
   <Name>System.Environment</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Exception.xml b/CS2JLibrary/NetFramework/System/Exception.xml
index 23c4ab1..af5a002 100644
--- a/CS2JLibrary/NetFramework/System/Exception.xml
+++ b/CS2JLibrary/NetFramework/System/Exception.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Exception</Java>
   <Name>System.Exception</Name>
   <Uses />
@@ -62,9 +63,7 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports>
-        <string>CS2JNet.System.Exception</string>
-      </Imports>
+      <Imports />
       <Java>new Exception(${info},${ctxt})</Java>
       <Params>
         <Param>
diff --git a/CS2JLibrary/NetFramework/System/Globalization/CultureInfo.xml b/CS2JLibrary/NetFramework/System/Globalization/CultureInfo.xml
index f5e62c7..b21ca4f 100644
--- a/CS2JLibrary/NetFramework/System/Globalization/CultureInfo.xml
+++ b/CS2JLibrary/NetFramework/System/Globalization/CultureInfo.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>TODO</Java>
   <Name>System.Globalization.CultureInfo</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml b/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml
index 386afc7..a17bf23 100644
--- a/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml
+++ b/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Globalization.NumberFormatInfo</string>
-  </Imports>
+  <Imports />
   <Java>NumberFormatInfo</Java>
   <Name>System.Globalization.NumberFormatInfo</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml b/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml
index c7e0d13..373088f 100644
--- a/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml
+++ b/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Globalization.NumberStyles</string>
-  </Imports>
+  <Imports />
   <Java>NumberStyles</Java>
   <Name>System.Globalization.NumberStyles</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Guid.xml b/CS2JLibrary/NetFramework/System/Guid.xml
index 44ad2f0..142125c 100644
--- a/CS2JLibrary/NetFramework/System/Guid.xml
+++ b/CS2JLibrary/NetFramework/System/Guid.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.UUID</string>
+  </Imports>
   <Java>UUID</Java>
   <Name>System.Guid</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/ICloneable.xml b/CS2JLibrary/NetFramework/System/ICloneable.xml
index eb11d23..205fceb 100644
--- a/CS2JLibrary/NetFramework/System/ICloneable.xml
+++ b/CS2JLibrary/NetFramework/System/ICloneable.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Interface xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.ScormContentPlayer.Util.ICloneable</string>
+  </Imports>
   <Java>ICloneable</Java>
   <Name>System.ICloneable</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IComparable.xml b/CS2JLibrary/NetFramework/System/IComparable.xml
index 2adfb9b..2a2552f 100644
--- a/CS2JLibrary/NetFramework/System/IComparable.xml
+++ b/CS2JLibrary/NetFramework/System/IComparable.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Interface xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.IComparable</string>
-  </Imports>
+  <Imports />
   <Java>IComparable</Java>
   <Name>System.IComparable</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IDisposable.xml b/CS2JLibrary/NetFramework/System/IDisposable.xml
index ef7ec68..8c0ceb3 100644
--- a/CS2JLibrary/NetFramework/System/IDisposable.xml
+++ b/CS2JLibrary/NetFramework/System/IDisposable.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Interface xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.IDisposable</string>
+  </Imports>
   <Java>IDisposable</Java>
   <Name>System.IDisposable</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/Directory.xml b/CS2JLibrary/NetFramework/System/IO/Directory.xml
index 1bec1d8..65c3070 100644
--- a/CS2JLibrary/NetFramework/System/IO/Directory.xml
+++ b/CS2JLibrary/NetFramework/System/IO/Directory.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.File</string>
+  </Imports>
   <Java>File</Java>
   <Name>System.IO.Directory</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml b/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml
index 05f4da5..79e3ab8 100644
--- a/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml
+++ b/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.File</string>
+  </Imports>
   <Java>File</Java>
   <Name>System.IO.DirectoryInfo</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/File.xml b/CS2JLibrary/NetFramework/System/IO/File.xml
index 998e511..9a3334a 100644
--- a/CS2JLibrary/NetFramework/System/IO/File.xml
+++ b/CS2JLibrary/NetFramework/System/IO/File.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.File</string>
+  </Imports>
   <Java>File</Java>
   <Name>System.IO.File</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/FileAttributes.xml b/CS2JLibrary/NetFramework/System/IO/FileAttributes.xml
index d787304..5946f18 100644
--- a/CS2JLibrary/NetFramework/System/IO/FileAttributes.xml
+++ b/CS2JLibrary/NetFramework/System/IO/FileAttributes.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Integer</Java>
   <Name>System.IO.FileAttributes</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/FileInfo.xml b/CS2JLibrary/NetFramework/System/IO/FileInfo.xml
index 12fed01..9494e92 100644
--- a/CS2JLibrary/NetFramework/System/IO/FileInfo.xml
+++ b/CS2JLibrary/NetFramework/System/IO/FileInfo.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.File</string>
+  </Imports>
   <Java>File</Java>
   <Name>System.IO.FileInfo</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/FileNotFoundException.xml b/CS2JLibrary/NetFramework/System/IO/FileNotFoundException.xml
index 4786bd3..c4ec416 100644
--- a/CS2JLibrary/NetFramework/System/IO/FileNotFoundException.xml
+++ b/CS2JLibrary/NetFramework/System/IO/FileNotFoundException.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.IO.FileNotFoundException</string>
+  </Imports>
   <Java>FileNotFoundException</Java>
   <Name>System.IO.FileNotFoundException</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/FileStream.xml b/CS2JLibrary/NetFramework/System/IO/FileStream.xml
index 16f8141..d2910c1 100644
--- a/CS2JLibrary/NetFramework/System/IO/FileStream.xml
+++ b/CS2JLibrary/NetFramework/System/IO/FileStream.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.*</string>
+  </Imports>
   <Java>OutputStream</Java>
   <Name>System.IO.FileStream</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/FileSystemInfo.xml b/CS2JLibrary/NetFramework/System/IO/FileSystemInfo.xml
index 62cb908..94264d0 100644
--- a/CS2JLibrary/NetFramework/System/IO/FileSystemInfo.xml
+++ b/CS2JLibrary/NetFramework/System/IO/FileSystemInfo.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.File</string>
+  </Imports>
   <Java>File</Java>
   <Name>System.IO.FileSystemInfo</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/IOException.xml b/CS2JLibrary/NetFramework/System/IO/IOException.xml
index afb772d..3577d3b 100644
--- a/CS2JLibrary/NetFramework/System/IO/IOException.xml
+++ b/CS2JLibrary/NetFramework/System/IO/IOException.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Throwable</Java>
   <Name>System.IO.IOException</Name>
   <Uses />
@@ -27,9 +28,7 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports>
-        <string>CS2JNet.System.IO.IOException</string>
-      </Imports>
+      <Imports />
       <Java>new IOException(${info},${ctxt})</Java>
       <Params>
         <Param>
diff --git a/CS2JLibrary/NetFramework/System/IO/Path.xml b/CS2JLibrary/NetFramework/System/IO/Path.xml
index f382075..510a3e7 100644
--- a/CS2JLibrary/NetFramework/System/IO/Path.xml
+++ b/CS2JLibrary/NetFramework/System/IO/Path.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.IO.Path</string>
-  </Imports>
+  <Imports />
   <Java>Path</Java>
   <Name>System.IO.Path</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/Stream.xml b/CS2JLibrary/NetFramework/System/IO/Stream.xml
index b22d7fe..4fb48d6 100644
--- a/CS2JLibrary/NetFramework/System/IO/Stream.xml
+++ b/CS2JLibrary/NetFramework/System/IO/Stream.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.*</string>
+  </Imports>
   <Java>InputStream</Java>
   <Name>System.IO.Stream</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/StreamReader.xml b/CS2JLibrary/NetFramework/System/IO/StreamReader.xml
index e264048..b552c12 100644
--- a/CS2JLibrary/NetFramework/System/IO/StreamReader.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StreamReader.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.*</string>
+  </Imports>
   <Java>BufferedReader</Java>
   <Name>System.IO.StreamReader</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml b/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
index 18bed55..2e75b99 100644
--- a/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.*</string>
+  </Imports>
   <Java>BufferedWriter</Java>
   <Name>System.IO.StreamWriter</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/StringReader.xml b/CS2JLibrary/NetFramework/System/IO/StringReader.xml
index 8cdae9e..20383d4 100644
--- a/CS2JLibrary/NetFramework/System/IO/StringReader.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StringReader.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.*</string>
+  </Imports>
   <Java>StringReader</Java>
   <Name>System.IO.StringReader</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/StringWriter.xml b/CS2JLibrary/NetFramework/System/IO/StringWriter.xml
index 1c6b6ab..79655ca 100644
--- a/CS2JLibrary/NetFramework/System/IO/StringWriter.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StringWriter.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.StringWriter</string>
+  </Imports>
   <Java>StringWriter</Java>
   <Name>System.IO.StringWriter</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/TextReader.xml b/CS2JLibrary/NetFramework/System/IO/TextReader.xml
index 32bb7c7..015bcbe 100644
--- a/CS2JLibrary/NetFramework/System/IO/TextReader.xml
+++ b/CS2JLibrary/NetFramework/System/IO/TextReader.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.io.*</string>
+  </Imports>
   <Java>BufferedReader</Java>
   <Name>System.IO.TextReader</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/IO/TextWriter.xml b/CS2JLibrary/NetFramework/System/IO/TextWriter.xml
index dfa32e6..65420d2 100644
--- a/CS2JLibrary/NetFramework/System/IO/TextWriter.xml
+++ b/CS2JLibrary/NetFramework/System/IO/TextWriter.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.IO.TextWriter</string>
-  </Imports>
+  <Imports />
   <Java>TextWriter</Java>
   <Name>System.IO.TextWriter</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Int16.xml b/CS2JLibrary/NetFramework/System/Int16.xml
index 2078680..e58b6e1 100644
--- a/CS2JLibrary/NetFramework/System/Int16.xml
+++ b/CS2JLibrary/NetFramework/System/Int16.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>int</Java>
   <Name>System.Int16</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Int32.xml b/CS2JLibrary/NetFramework/System/Int32.xml
index 88decad..00bc5ea 100644
--- a/CS2JLibrary/NetFramework/System/Int32.xml
+++ b/CS2JLibrary/NetFramework/System/Int32.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>int</Java>
   <Name>System.Int32</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Int64.xml b/CS2JLibrary/NetFramework/System/Int64.xml
index 5af0d39..75b1475 100644
--- a/CS2JLibrary/NetFramework/System/Int64.xml
+++ b/CS2JLibrary/NetFramework/System/Int64.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>long</Java>
   <Name>System.Int64</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/InvalidCastException.xml b/CS2JLibrary/NetFramework/System/InvalidCastException.xml
index 1e46369..b64d7af 100644
--- a/CS2JLibrary/NetFramework/System/InvalidCastException.xml
+++ b/CS2JLibrary/NetFramework/System/InvalidCastException.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.InvalidCastException</string>
+  </Imports>
   <Java>InvalidCastException</Java>
   <Name>System.InvalidCastException</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Math.xml b/CS2JLibrary/NetFramework/System/Math.xml
index 3e75148..fcc8e93 100644
--- a/CS2JLibrary/NetFramework/System/Math.xml
+++ b/CS2JLibrary/NetFramework/System/Math.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Math</string>
-  </Imports>
+  <Imports />
   <Java>Math</Java>
   <Name>System.Math</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Net/CookieContainer.xml b/CS2JLibrary/NetFramework/System/Net/CookieContainer.xml
index 031e1a2..f1babb0 100644
--- a/CS2JLibrary/NetFramework/System/Net/CookieContainer.xml
+++ b/CS2JLibrary/NetFramework/System/Net/CookieContainer.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Net.CookieContainer</string>
+  </Imports>
   <Java>CookieContainer</Java>
   <Name>System.Net.CookieContainer</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml b/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml
index 500a57b..15a2996 100644
--- a/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml
+++ b/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.net.*</string>
+  </Imports>
   <Java>HttpURLConnection</Java>
   <Name>System.Net.HttpWebRequest</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Net/HttpWebResponse.xml b/CS2JLibrary/NetFramework/System/Net/HttpWebResponse.xml
index 960da52..f636938 100644
--- a/CS2JLibrary/NetFramework/System/Net/HttpWebResponse.xml
+++ b/CS2JLibrary/NetFramework/System/Net/HttpWebResponse.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.net.*</string>
+  </Imports>
   <Java>HttpURLConnection</Java>
   <Name>System.Net.HttpWebResponse</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Net/Mail/MailAddress.xml b/CS2JLibrary/NetFramework/System/Net/Mail/MailAddress.xml
index d54b884..dff0b47 100644
--- a/CS2JLibrary/NetFramework/System/Net/Mail/MailAddress.xml
+++ b/CS2JLibrary/NetFramework/System/Net/Mail/MailAddress.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>javax.mail.internet.InternetAddress</string>
+  </Imports>
   <Java>InternetAddress</Java>
   <Name>System.Net.Mail.MailAddress</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Net/Mail/MailAddressCollection.xml b/CS2JLibrary/NetFramework/System/Net/Mail/MailAddressCollection.xml
index 62800ac..0fda1d7 100644
--- a/CS2JLibrary/NetFramework/System/Net/Mail/MailAddressCollection.xml
+++ b/CS2JLibrary/NetFramework/System/Net/Mail/MailAddressCollection.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Net.Mail.MailAddressCollection</string>
-  </Imports>
+  <Imports />
   <Java>MailAddressCollection</Java>
   <Name>System.Net.Mail.MailAddressCollection</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml b/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml
index 5ecfd0f..3bde544 100644
--- a/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml
+++ b/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.ScormContentPlayer.Util.MailMessage</string>
+  </Imports>
   <Java>MailMessage</Java>
   <Name>System.Net.Mail.MailMessage</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Net/WebRequest.xml b/CS2JLibrary/NetFramework/System/Net/WebRequest.xml
index 7c79188..3dd8c8b 100644
--- a/CS2JLibrary/NetFramework/System/Net/WebRequest.xml
+++ b/CS2JLibrary/NetFramework/System/Net/WebRequest.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.net.*</string>
+  </Imports>
   <Java>** NONE System.Net.WebRequest **</Java>
   <Name>System.Net.WebRequest</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/NotImplementedException.xml b/CS2JLibrary/NetFramework/System/NotImplementedException.xml
index ff9c6ab..8b32ed1 100644
--- a/CS2JLibrary/NetFramework/System/NotImplementedException.xml
+++ b/CS2JLibrary/NetFramework/System/NotImplementedException.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.NotImplementedException</string>
+  </Imports>
   <Java>NotImplementedException</Java>
   <Name>System.NotImplementedException</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Number.xml b/CS2JLibrary/NetFramework/System/Number.xml
index 2ad60d6..4bbf8f7 100644
--- a/CS2JLibrary/NetFramework/System/Number.xml
+++ b/CS2JLibrary/NetFramework/System/Number.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Number</string>
-  </Imports>
+  <Imports />
   <Java>Number</Java>
   <Name>System.Number</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Object.xml b/CS2JLibrary/NetFramework/System/Object.xml
index b3a01a4..c147ec6 100644
--- a/CS2JLibrary/NetFramework/System/Object.xml
+++ b/CS2JLibrary/NetFramework/System/Object.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Object</Java>
   <Name>System.Object</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/OverflowException.xml b/CS2JLibrary/NetFramework/System/OverflowException.xml
index 7e73dd6..741ec13 100644
--- a/CS2JLibrary/NetFramework/System/OverflowException.xml
+++ b/CS2JLibrary/NetFramework/System/OverflowException.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>ArithmeticException</Java>
   <Name>System.OverflowException</Name>
   <Uses />
@@ -27,9 +28,7 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports>
-        <string>CS2JNet.System.OverflowException</string>
-      </Imports>
+      <Imports />
       <Java>new OverflowException(${info},${ctxt})</Java>
       <Params>
         <Param>
diff --git a/CS2JLibrary/NetFramework/System/Reflection/Assembly.xml b/CS2JLibrary/NetFramework/System/Reflection/Assembly.xml
index d8d314d..825b84a 100644
--- a/CS2JLibrary/NetFramework/System/Reflection/Assembly.xml
+++ b/CS2JLibrary/NetFramework/System/Reflection/Assembly.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Reflection.Assembly</string>
+  </Imports>
   <Java>Assembly</Java>
   <Name>System.Reflection.Assembly</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Reflection/BindingFlags.xml b/CS2JLibrary/NetFramework/System/Reflection/BindingFlags.xml
index c352608..1a2f5c0 100644
--- a/CS2JLibrary/NetFramework/System/Reflection/BindingFlags.xml
+++ b/CS2JLibrary/NetFramework/System/Reflection/BindingFlags.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Reflection.BindingFlags</string>
-  </Imports>
+  <Imports />
   <Java>BindingFlags</Java>
   <Name>System.Reflection.BindingFlags</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Reflection/FieldInfo.xml b/CS2JLibrary/NetFramework/System/Reflection/FieldInfo.xml
index 32960c1..6daf019 100644
--- a/CS2JLibrary/NetFramework/System/Reflection/FieldInfo.xml
+++ b/CS2JLibrary/NetFramework/System/Reflection/FieldInfo.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.lang.reflect.Field</string>
+  </Imports>
   <Java>Field</Java>
   <Name>System.Reflection.FieldInfo</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Resources/ResourceManager.xml b/CS2JLibrary/NetFramework/System/Resources/ResourceManager.xml
index 54b7cb0..dac3194 100644
--- a/CS2JLibrary/NetFramework/System/Resources/ResourceManager.xml
+++ b/CS2JLibrary/NetFramework/System/Resources/ResourceManager.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Resources.ResourceManager</string>
+  </Imports>
   <Java>ResourceManager</Java>
   <Name>System.Resources.ResourceManager</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Security/Cryptography/X509Certificates/X509Certificate2.xml b/CS2JLibrary/NetFramework/System/Security/Cryptography/X509Certificates/X509Certificate2.xml
index cd8a211..b35936d 100644
--- a/CS2JLibrary/NetFramework/System/Security/Cryptography/X509Certificates/X509Certificate2.xml
+++ b/CS2JLibrary/NetFramework/System/Security/Cryptography/X509Certificates/X509Certificate2.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.security.cert.X509Certificate</string>
+  </Imports>
   <Java>X509Certificate</Java>
   <Name>System.Security.Cryptography.X509Certificates.X509Certificate2</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Single.xml b/CS2JLibrary/NetFramework/System/Single.xml
index 2d05c62..206fbb5 100644
--- a/CS2JLibrary/NetFramework/System/Single.xml
+++ b/CS2JLibrary/NetFramework/System/Single.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>float</Java>
   <Name>System.Single</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/String.xml b/CS2JLibrary/NetFramework/System/String.xml
index 104ed67..5753e37 100644
--- a/CS2JLibrary/NetFramework/System/String.xml
+++ b/CS2JLibrary/NetFramework/System/String.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>String</Java>
   <Name>System.String</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/StringSplitOptions.xml b/CS2JLibrary/NetFramework/System/StringSplitOptions.xml
index c362716..e3536e0 100644
--- a/CS2JLibrary/NetFramework/System/StringSplitOptions.xml
+++ b/CS2JLibrary/NetFramework/System/StringSplitOptions.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.StringSplitOptions</string>
-  </Imports>
+  <Imports />
   <Java>StringSplitOptions</Java>
   <Name>System.StringSplitOptions</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/SystemException.xml b/CS2JLibrary/NetFramework/System/SystemException.xml
index 640c50b..fe215c5 100644
--- a/CS2JLibrary/NetFramework/System/SystemException.xml
+++ b/CS2JLibrary/NetFramework/System/SystemException.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Throwable</Java>
   <Name>System.SystemException</Name>
   <Uses />
@@ -27,9 +28,7 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports>
-        <string>CS2JNet.System.SystemException</string>
-      </Imports>
+      <Imports />
       <Java>new SystemException(${info},${ctxt})</Java>
       <Params>
         <Param>
diff --git a/CS2JLibrary/NetFramework/System/Text/Encoding.xml b/CS2JLibrary/NetFramework/System/Text/Encoding.xml
index 3b90b4b..0611f4e 100644
--- a/CS2JLibrary/NetFramework/System/Text/Encoding.xml
+++ b/CS2JLibrary/NetFramework/System/Text/Encoding.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Text.Encoding</string>
-  </Imports>
+  <Imports />
   <Java>Encoding</Java>
   <Name>System.Text.Encoding</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml
index dff233a..8baf29a 100644
--- a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml
+++ b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.regex.*</string>
+  </Imports>
   <Java>NONE</Java>
   <Name>System.Text.RegularExpressions.Capture</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Group.xml b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Group.xml
index 55849db..86be99b 100644
--- a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Group.xml
+++ b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Group.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.regex.*</string>
+  </Imports>
   <Java>Pattern</Java>
   <Name>System.Text.RegularExpressions.Group</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Match.xml b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Match.xml
index 520a3a4..991cefb 100644
--- a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Match.xml
+++ b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Match.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.regex.*</string>
+  </Imports>
   <Java>Matcher</Java>
   <Name>System.Text.RegularExpressions.Match</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Regex.xml b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Regex.xml
index 57608a2..aefcf43 100644
--- a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Regex.xml
+++ b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Regex.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.util.regex.*</string>
+  </Imports>
   <Java>Pattern</Java>
   <Name>System.Text.RegularExpressions.Regex</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Text/StringBuilder.xml b/CS2JLibrary/NetFramework/System/Text/StringBuilder.xml
index a306b9e..9a0c9e6 100644
--- a/CS2JLibrary/NetFramework/System/Text/StringBuilder.xml
+++ b/CS2JLibrary/NetFramework/System/Text/StringBuilder.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>StringBuilder</Java>
   <Name>System.Text.StringBuilder</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Threading/Thread.xml b/CS2JLibrary/NetFramework/System/Threading/Thread.xml
index ea0ba42..ef50ca4 100644
--- a/CS2JLibrary/NetFramework/System/Threading/Thread.xml
+++ b/CS2JLibrary/NetFramework/System/Threading/Thread.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Thread</Java>
   <Name>System.Threading.Thread</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/TimeSpan.xml b/CS2JLibrary/NetFramework/System/TimeSpan.xml
index ab2db12..2307670 100644
--- a/CS2JLibrary/NetFramework/System/TimeSpan.xml
+++ b/CS2JLibrary/NetFramework/System/TimeSpan.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.TimeSpan</string>
+  </Imports>
   <Java>TimeSpan</Java>
   <Name>System.TimeSpan</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Type.xml b/CS2JLibrary/NetFramework/System/Type.xml
index 525b8dc..cc0931c 100644
--- a/CS2JLibrary/NetFramework/System/Type.xml
+++ b/CS2JLibrary/NetFramework/System/Type.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Class</Java>
   <Name>System.Type</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/UInt32.xml b/CS2JLibrary/NetFramework/System/UInt32.xml
index b33ab8e..e069a7b 100644
--- a/CS2JLibrary/NetFramework/System/UInt32.xml
+++ b/CS2JLibrary/NetFramework/System/UInt32.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>long</Java>
   <Name>System.UInt32</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Uri.xml b/CS2JLibrary/NetFramework/System/Uri.xml
index eda6d70..0cd3c66 100644
--- a/CS2JLibrary/NetFramework/System/Uri.xml
+++ b/CS2JLibrary/NetFramework/System/Uri.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.net.*</string>
+  </Imports>
   <Java>URI</Java>
   <Name>System.Uri</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Void.xml b/CS2JLibrary/NetFramework/System/Void.xml
index 35373fc..5cf4f94 100644
--- a/CS2JLibrary/NetFramework/System/Void.xml
+++ b/CS2JLibrary/NetFramework/System/Void.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>void</Java>
   <Name>System.Void</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Web/HttpRequest.xml b/CS2JLibrary/NetFramework/System/Web/HttpRequest.xml
index e0f7748..786da2c 100644
--- a/CS2JLibrary/NetFramework/System/Web/HttpRequest.xml
+++ b/CS2JLibrary/NetFramework/System/Web/HttpRequest.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>javax.servlet.http.*</string>
+  </Imports>
   <Java>HttpServletRequest</Java>
   <Name>System.Web.HttpRequest</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Web/HttpResponse.xml b/CS2JLibrary/NetFramework/System/Web/HttpResponse.xml
index 36855e9..5889c0c 100644
--- a/CS2JLibrary/NetFramework/System/Web/HttpResponse.xml
+++ b/CS2JLibrary/NetFramework/System/Web/HttpResponse.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>javax.servlet.http.*</string>
+  </Imports>
   <Java>HttpServletResponse</Java>
   <Name>System.Web.HttpResponse</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Web/HttpUtility.xml b/CS2JLibrary/NetFramework/System/Web/HttpUtility.xml
index e51f68e..38bd47e 100644
--- a/CS2JLibrary/NetFramework/System/Web/HttpUtility.xml
+++ b/CS2JLibrary/NetFramework/System/Web/HttpUtility.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>java.net.*</string>
+  </Imports>
   <Java>URLEncoder</Java>
   <Name>System.Web.HttpUtility</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapHttpClientProtocol.xml b/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapHttpClientProtocol.xml
index d6cdf84..0d2d979 100644
--- a/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapHttpClientProtocol.xml
+++ b/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapHttpClientProtocol.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Web.Services.Protocols.SoapHttpClientProtocol</string>
+  </Imports>
   <Java>SoapHttpClientProtocol</Java>
   <Name>System.Web.Services.Protocols.SoapHttpClientProtocol</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapMessage.xml b/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapMessage.xml
index ab99450..a8569eb 100644
--- a/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapMessage.xml
+++ b/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapMessage.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Web.Services.Protocols.SoapMessage</string>
+  </Imports>
   <Java>SoapMessage</Java>
   <Name>System.Web.Services.Protocols.SoapMessage</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Windows/Forms/Application.xml b/CS2JLibrary/NetFramework/System/Windows/Forms/Application.xml
index 984d305..3def6ba 100644
--- a/CS2JLibrary/NetFramework/System/Windows/Forms/Application.xml
+++ b/CS2JLibrary/NetFramework/System/Windows/Forms/Application.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>System.Object</Java>
   <Name>System.Windows.Forms.Application</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/Schema/XmlSchema.xml b/CS2JLibrary/NetFramework/System/Xml/Schema/XmlSchema.xml
index 85b6b5a..3181152 100644
--- a/CS2JLibrary/NetFramework/System/Xml/Schema/XmlSchema.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/Schema/XmlSchema.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Object</Java>
   <Name>System.Xml.Schema.XmlSchema</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/Schema/XmlSchemaObject.xml b/CS2JLibrary/NetFramework/System/Xml/Schema/XmlSchemaObject.xml
index bc48657..0062a06 100644
--- a/CS2JLibrary/NetFramework/System/Xml/Schema/XmlSchemaObject.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/Schema/XmlSchemaObject.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports>
-    <string>CS2JNet.System.Xml.Schema.XmlSchemaObject</string>
-  </Imports>
+  <Imports />
   <Java>XmlSchemaObject</Java>
   <Name>System.Xml.Schema.XmlSchemaObject</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/Serialization/IXmlSerializable.xml b/CS2JLibrary/NetFramework/System/Xml/Serialization/IXmlSerializable.xml
index ff7d2fc..009c1ae 100644
--- a/CS2JLibrary/NetFramework/System/Xml/Serialization/IXmlSerializable.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/Serialization/IXmlSerializable.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Interface xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.Serialization.IXmlSerializable</string>
+  </Imports>
   <Java>IXmlSerializable</Java>
   <Name>System.Xml.Serialization.IXmlSerializable</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlAttribute.xml b/CS2JLibrary/NetFramework/System/Xml/XmlAttribute.xml
index 86f2138..57930f4 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlAttribute.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlAttribute.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlAttribute</string>
+  </Imports>
   <Java>XmlAttribute</Java>
   <Name>System.Xml.XmlAttribute</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlAttributeCollection.xml b/CS2JLibrary/NetFramework/System/Xml/XmlAttributeCollection.xml
index 3a8bdae..949bf12 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlAttributeCollection.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlAttributeCollection.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlAttributeCollection</string>
+  </Imports>
   <Java>XmlAttributeCollection</Java>
   <Name>System.Xml.XmlAttributeCollection</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlCDataSection.xml b/CS2JLibrary/NetFramework/System/Xml/XmlCDataSection.xml
index 5f91e2f..ea858c7 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlCDataSection.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlCDataSection.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlCDataSection</string>
+  </Imports>
   <Java>XmlCDataSection</Java>
   <Name>System.Xml.XmlCDataSection</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlComment.xml b/CS2JLibrary/NetFramework/System/Xml/XmlComment.xml
index 4ba2244..e378298 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlComment.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlComment.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlComment</string>
+  </Imports>
   <Java>XmlComment</Java>
   <Name>System.Xml.XmlComment</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlDeclaration.xml b/CS2JLibrary/NetFramework/System/Xml/XmlDeclaration.xml
index 2a982fa..7a5a432 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlDeclaration.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlDeclaration.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlDeclaration</string>
+  </Imports>
   <Java>XmlDeclaration</Java>
   <Name>System.Xml.XmlDeclaration</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlDocument.xml b/CS2JLibrary/NetFramework/System/Xml/XmlDocument.xml
index ab49ee2..43d9881 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlDocument.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlDocument.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlDocument</string>
+  </Imports>
   <Java>XmlDocument</Java>
   <Name>System.Xml.XmlDocument</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlElement.xml b/CS2JLibrary/NetFramework/System/Xml/XmlElement.xml
index d06c9b9..10679ac 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlElement.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlElement.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlElement</string>
+  </Imports>
   <Java>XmlElement</Java>
   <Name>System.Xml.XmlElement</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlException.xml b/CS2JLibrary/NetFramework/System/Xml/XmlException.xml
index b70b986..fb8a7bf 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlException.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlException.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>Exception</Java>
   <Name>System.Xml.XmlException</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlLinkedNode.xml b/CS2JLibrary/NetFramework/System/Xml/XmlLinkedNode.xml
index 29a97f0..ba15531 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlLinkedNode.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlLinkedNode.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>org.w3c.dom.Node</string>
+  </Imports>
   <Java>Node</Java>
   <Name>System.Xml.XmlLinkedNode</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlNode.xml b/CS2JLibrary/NetFramework/System/Xml/XmlNode.xml
index 03421f4..f60f332 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlNode.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlNode.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlNode</string>
+  </Imports>
   <Java>XmlNode</Java>
   <Name>System.Xml.XmlNode</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlNodeList.xml b/CS2JLibrary/NetFramework/System/Xml/XmlNodeList.xml
index 92d7a2f..99cfc4a 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlNodeList.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlNodeList.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlNodeList</string>
+  </Imports>
   <Java>XmlNodeList</Java>
   <Name>System.Xml.XmlNodeList</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlNodeType.xml b/CS2JLibrary/NetFramework/System/Xml/XmlNodeType.xml
index a13dd89..d20a684 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlNodeType.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlNodeType.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports />
   <Java>short</Java>
   <Name>System.Xml.XmlNodeType</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlReader.xml b/CS2JLibrary/NetFramework/System/Xml/XmlReader.xml
index be6568d..a31fbc8 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlReader.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlReader.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlReader</string>
+  </Imports>
   <Java>XmlReader</Java>
   <Name>System.Xml.XmlReader</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlText.xml b/CS2JLibrary/NetFramework/System/Xml/XmlText.xml
index a063937..8b81711 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlText.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlText.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlText</string>
+  </Imports>
   <Java>XmlText</Java>
   <Name>System.Xml.XmlText</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlTextReader.xml b/CS2JLibrary/NetFramework/System/Xml/XmlTextReader.xml
index 7021205..bd5a07e 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlTextReader.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlTextReader.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlTextReader</string>
+  </Imports>
   <Java>XmlTextReader</Java>
   <Name>System.Xml.XmlTextReader</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlWriter.xml b/CS2JLibrary/NetFramework/System/Xml/XmlWriter.xml
index 54c3ddb..37ced90 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlWriter.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlWriter.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.XmlWriter</string>
+  </Imports>
   <Java>XmlWriter</Java>
   <Name>System.Xml.XmlWriter</Name>
   <Uses />
diff --git a/CS2JLibrary/NetFramework/System/Xml/Xsl/XslCompiledTransform.xml b/CS2JLibrary/NetFramework/System/Xml/Xsl/XslCompiledTransform.xml
index 275a7ce..0d7a3e0 100644
--- a/CS2JLibrary/NetFramework/System/Xml/Xsl/XslCompiledTransform.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/Xsl/XslCompiledTransform.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <string>RusticiSoftware.System.Xml.Xsl.XslTransform</string>
+  </Imports>
   <Java>XslTransform</Java>
   <Name>System.Xml.Xsl.XslCompiledTransform</Name>
   <Uses />