diff --git a/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml b/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml
index 821f5e2..e755818 100644
--- a/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml
+++ b/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.zip.ZipEntry</Import>
   </Imports>
   <Java>ZipEntry</Java>
   <Name>ICSharpCode.SharpZipLib.Zip.ZipEntry</Name>
diff --git a/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipInputStream.xml b/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipInputStream.xml
index f40bfc8..ef6156f 100644
--- a/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipInputStream.xml
+++ b/CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipInputStream.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.zip.ZipInputStream</Import>
   </Imports>
   <Java>ZipInputStream</Java>
   <Name>ICSharpCode.SharpZipLib.Zip.ZipInputStream</Name>
@@ -26,7 +26,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.io.InputStream</string>
+        <Import>java.io.InputStream</Import>
       </Imports>
       <Java>new ZipInputStream(${baseInputStream})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/ArgumentException.xml b/CS2JLibrary/NetFramework/System/ArgumentException.xml
index 0286262..d9f6a7a 100644
--- a/CS2JLibrary/NetFramework/System/ArgumentException.xml
+++ b/CS2JLibrary/NetFramework/System/ArgumentException.xml
@@ -19,7 +19,7 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.ArgumentException</string>
+        <Import>RusticiSoftware.System.ArgumentException</Import>
       </Imports>
       <Java>new ArgumentException(${message})</Java>
       <Params>
@@ -45,7 +45,7 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.ArgumentException</string>
+        <Import>RusticiSoftware.System.ArgumentException</Import>
       </Imports>
       <Java>new ArgumentException(${message}, ${inner})</Java>
       <Params>
@@ -61,7 +61,7 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.ArgumentException</string>
+        <Import>RusticiSoftware.System.ArgumentException</Import>
       </Imports>
       <Java>new ArgumentException(${message}, ${paramName})</Java>
       <Params>
@@ -77,7 +77,7 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.ArgumentException</string>
+        <Import>RusticiSoftware.System.ArgumentException</Import>
       </Imports>
       <Java>new ArgumentException(${message}, ${paramName}, ${inner})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Array.xml b/CS2JLibrary/NetFramework/System/Array.xml
index 7e7618e..03791a7 100644
--- a/CS2JLibrary/NetFramework/System/Array.xml
+++ b/CS2JLibrary/NetFramework/System/Array.xml
@@ -11,7 +11,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>java.util.Arrays</string>
+        <Import>java.util.Arrays</Import>
       </Imports>
       <Java>Array.get(${this}, ${index})</Java>
       <Params>
@@ -25,7 +25,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.util.Arrays</string>
+        <Import>java.util.Arrays</Import>
       </Imports>
       <Java>Arrays.sort(${array})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
index 91c093e..39a5a81 100644
--- a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Collections.ArrayListSupport</Import>
   </Imports>
   <Java>ArrayListSupport</Java>
   <Name>System.Collections.ArrayList</Name>
diff --git a/CS2JLibrary/NetFramework/System/Collections/DictionaryEntry.xml b/CS2JLibrary/NetFramework/System/Collections/DictionaryEntry.xml
index 9d7d5d8..3fb7ed6 100644
--- a/CS2JLibrary/NetFramework/System/Collections/DictionaryEntry.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/DictionaryEntry.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.Map</Import>
   </Imports>
   <Java>Map.Entry</Java>
   <Name>System.Collections.DictionaryEntry</Name>
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
index 2ca2ab7..6ae9e27 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.Hashtable</Import>
   </Imports>
   <Java>Hashtable</Java>
   <Name>System.Collections.Generic.Dictionary</Name>
@@ -103,14 +103,14 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.util.Hashtable</string>
+        <Import>java.util.Hashtable</Import>
       </Imports>
       <Java>new Hashtable()</Java>
       <Params />
     </Constructor>
     <Constructor>
       <Imports>
-        <string>java.util.Hashtable</string>
+        <Import>java.util.Hashtable</Import>
       </Imports>
       <Java>new Hashtable(${length})</Java>
       <Params>
@@ -122,7 +122,7 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>java.util.Hashtable</string>
+        <Import>java.util.Hashtable</Import>
       </Imports>
       <Java>new Hashtable(${collection})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/List.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/List.xml
index fb88fe3..9a53870 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/List.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/List.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Collections.ArrayListSupport</Import>
   </Imports>
   <Java>ArrayListSupport</Java>
   <Name>System.Collections.Generic.List</Name>
diff --git a/CS2JLibrary/NetFramework/System/Collections/Hashtable.xml b/CS2JLibrary/NetFramework/System/Collections/Hashtable.xml
index 774852d..4233ad4 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Hashtable.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Hashtable.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.Hashtable</Import>
   </Imports>
   <Java>Hashtable</Java>
   <Name>System.Collections.Hashtable</Name>
@@ -111,14 +111,14 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.util.Hashtable</string>
+        <Import>java.util.Hashtable</Import>
       </Imports>
       <Java>new Hashtable()</Java>
       <Params />
     </Constructor>
     <Constructor>
       <Imports>
-        <string>java.util.Hashtable</string>
+        <Import>java.util.Hashtable</Import>
       </Imports>
       <Java>new Hashtable(${length})</Java>
       <Params>
@@ -130,7 +130,7 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>java.util.Hashtable</string>
+        <Import>java.util.Hashtable</Import>
       </Imports>
       <Java>new Hashtable(${collection})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Collections/IDictionary.xml b/CS2JLibrary/NetFramework/System/Collections/IDictionary.xml
index c4a93e0..6dba525 100644
--- a/CS2JLibrary/NetFramework/System/Collections/IDictionary.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/IDictionary.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.Map</Import>
   </Imports>
   <Java>Map</Java>
   <Name>System.Collections.IDictionary</Name>
diff --git a/CS2JLibrary/NetFramework/System/Collections/IList.xml b/CS2JLibrary/NetFramework/System/Collections/IList.xml
index edd9fcc..ef54aa8 100644
--- a/CS2JLibrary/NetFramework/System/Collections/IList.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/IList.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.List</Import>
   </Imports>
   <Java>List</Java>
   <Name>System.Collections.IList</Name>
diff --git a/CS2JLibrary/NetFramework/System/Collections/ObjectModel/Collection.xml b/CS2JLibrary/NetFramework/System/Collections/ObjectModel/Collection.xml
index b6db4f4..4fe8c80 100644
--- a/CS2JLibrary/NetFramework/System/Collections/ObjectModel/Collection.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/ObjectModel/Collection.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Collections.ArrayListSupport</Import>
   </Imports>
   <Java>ArrayListSupport</Java>
   <Name>System.Collections.ObjectModel.Collection</Name>
diff --git a/CS2JLibrary/NetFramework/System/Collections/SortedList.xml b/CS2JLibrary/NetFramework/System/Collections/SortedList.xml
index d4be1af..1096ce0 100644
--- a/CS2JLibrary/NetFramework/System/Collections/SortedList.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/SortedList.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.TreeMap</Import>
   </Imports>
   <Java>TreeMap</Java>
   <Name>System.Collections.SortedList</Name>
@@ -113,14 +113,14 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.util.TreeMap</string>
+        <Import>java.util.TreeMap</Import>
       </Imports>
       <Java>new TreeMap()</Java>
       <Params />
     </Constructor>
     <Constructor>
       <Imports>
-        <string>java.util.TreeMap</string>
+        <Import>java.util.TreeMap</Import>
       </Imports>
       <Java>new TreeMap()</Java>
       <Params>
@@ -132,7 +132,7 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>java.util.TreeMap</string>
+        <Import>java.util.TreeMap</Import>
       </Imports>
       <Java>new TreeMap(${collection})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Collections/Specialized/NameValueCollection.xml b/CS2JLibrary/NetFramework/System/Collections/Specialized/NameValueCollection.xml
index b8403ca..3be14be 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Specialized/NameValueCollection.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Specialized/NameValueCollection.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.Properties</Import>
   </Imports>
   <Java>Properties</Java>
   <Name>System.Collections.Specialized.NameValueCollection</Name>
diff --git a/CS2JLibrary/NetFramework/System/Configuration/ConfigurationManager.xml b/CS2JLibrary/NetFramework/System/Configuration/ConfigurationManager.xml
index b80ece6..1117af7 100644
--- a/CS2JLibrary/NetFramework/System/Configuration/ConfigurationManager.xml
+++ b/CS2JLibrary/NetFramework/System/Configuration/ConfigurationManager.xml
@@ -9,7 +9,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Configuration.ConfigurationManager</string>
+        <Import>RusticiSoftware.System.Configuration.ConfigurationManager</Import>
       </Imports>
       <Java>ConfigurationManager.getAppSettings()</Java>
       <Type>System.Collections.Specialized.NameValueCollection</Type>
diff --git a/CS2JLibrary/NetFramework/System/Configuration/ConfigurationSettings.xml b/CS2JLibrary/NetFramework/System/Configuration/ConfigurationSettings.xml
index 04f4a03..a11e169 100644
--- a/CS2JLibrary/NetFramework/System/Configuration/ConfigurationSettings.xml
+++ b/CS2JLibrary/NetFramework/System/Configuration/ConfigurationSettings.xml
@@ -9,7 +9,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Configuration.ConfigurationSettings</string>
+        <Import>RusticiSoftware.System.Configuration.ConfigurationSettings</Import>
       </Imports>
       <Java>ConfigurationSettings.getAppSettings()</Java>
       <Type>System.Collections.Specialized.NameValueCollection</Type>
diff --git a/CS2JLibrary/NetFramework/System/Console.xml b/CS2JLibrary/NetFramework/System/Console.xml
index fcb915f..3f99aed 100644
--- a/CS2JLibrary/NetFramework/System/Console.xml
+++ b/CS2JLibrary/NetFramework/System/Console.xml
@@ -20,7 +20,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.*</string>
+        <Import>RusticiSoftware.System.*</Import>
       </Imports>
       <Java>System.out.printf(ConsoleSupport.CSFmtStrToJFmtStr(${fmt}), ${arg})</Java>
       <Params>
@@ -38,7 +38,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.*</string>
+        <Import>RusticiSoftware.System.*</Import>
       </Imports>
       <Java>System.out.printf(ConsoleSupport.CSFmtStrToJFmtStr(${fmt}), ${arg1}, ${arg2})</Java>
       <Params>
@@ -79,7 +79,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.*</string>
+        <Import>RusticiSoftware.System.*</Import>
       </Imports>
       <Java>System.out.printf(ConsoleSupport.CSFmtStrToJFmtStr(${fmt}) + "\\n", ${arg})</Java>
       <Params>
@@ -97,7 +97,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.*</string>
+        <Import>RusticiSoftware.System.*</Import>
       </Imports>
       <Java>System.out.printf(ConsoleSupport.CSFmtStrToJFmtStr(${fmt}) + "\\n", ${arg1}, ${arg2})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Convert.xml b/CS2JLibrary/NetFramework/System/Convert.xml
index dc0d875..953d3a6 100644
--- a/CS2JLibrary/NetFramework/System/Convert.xml
+++ b/CS2JLibrary/NetFramework/System/Convert.xml
@@ -8,7 +8,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>org.apache.commons.codec.binary.Base64</string>
+        <Import>org.apache.commons.codec.binary.Base64</Import>
       </Imports>
       <Java>Base64.decodeBase64(${s})</Java>
       <Params>
@@ -22,7 +22,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>org.apache.commons.codec.binary.Base64</string>
+        <Import>org.apache.commons.codec.binary.Base64</Import>
       </Imports>
       <Java>Base64.encodeBase64String(${inArray})</Java>
       <Params>
@@ -108,7 +108,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
       </Imports>
       <Java>DateTimeSupport.parse(${value})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/DateTime.xml b/CS2JLibrary/NetFramework/System/DateTime.xml
index d474d05..bfbd2d7 100644
--- a/CS2JLibrary/NetFramework/System/DateTime.xml
+++ b/CS2JLibrary/NetFramework/System/DateTime.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.Date</Import>
   </Imports>
   <Java>Date</Java>
   <Name>System.DateTime</Name>
@@ -10,7 +10,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
       </Imports>
       <Java>DateTimeSupport.parse(${s})</Java>
       <Params>
@@ -24,7 +24,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
       </Imports>
       <Java>DateTimeSupport.parse(${s}, ${provider})</Java>
       <Params>
@@ -42,7 +42,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.*</string>
+        <Import>RusticiSoftware.System.*</Import>
       </Imports>
       <Java>DateTimeSupport.ToString(${this}, ${format})</Java>
       <Params>
@@ -56,7 +56,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
       </Imports>
       <Java>DateTimeSupport.ToString(${this}, ${format}, ${provider})</Java>
       <Params>
@@ -74,7 +74,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.text.SimpleDateFormat</string>
+        <Import>java.text.SimpleDateFormat</Import>
       </Imports>
       <Java>(new SimpleDateFormat("MM/dd/yyyy HH:mm:ss a")).format(${this})</Java>
       <Params />
@@ -83,7 +83,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.text.SimpleDateFormat</string>
+        <Import>java.text.SimpleDateFormat</Import>
       </Imports>
       <Java>(new SimpleDateFormat("MM/dd/yy")).format(${this})</Java>
       <Params />
@@ -120,8 +120,8 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTZ</string>
-        <string>java.util.TimeZone</string>
+        <Import>RusticiSoftware.System.DateTZ</Import>
+        <Import>java.util.TimeZone</Import>
       </Imports>
       <Java>(new DateTZ(${this}.getTime(), TimeZone.getTimeZone("UTC")))</Java>
       <Params />
@@ -130,8 +130,8 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
-        <string>java.util.Calendar</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
+        <Import>java.util.Calendar</Import>
       </Imports>
       <Java>DateTimeSupport.add(${this},Calendar.MINUTE,${amount})</Java>
       <Params>
@@ -145,8 +145,8 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
-        <string>java.util.Calendar</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
+        <Import>java.util.Calendar</Import>
       </Imports>
       <Java>DateTimeSupport.add(${this},Calendar.HOUR,${amount})</Java>
       <Params>
@@ -160,8 +160,8 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
-        <string>java.util.Calendar</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
+        <Import>java.util.Calendar</Import>
       </Imports>
       <Java>DateTimeSupport.add(${this},Calendar.MILLISECOND,${amount})</Java>
       <Params>
@@ -175,8 +175,8 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
-        <string>java.util.Calendar</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
+        <Import>java.util.Calendar</Import>
       </Imports>
       <Java>DateTimeSupport.add(${this},Calendar.SECOND,${amount})</Java>
       <Params>
@@ -190,8 +190,8 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
-        <string>java.util.Calendar</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
+        <Import>java.util.Calendar</Import>
       </Imports>
       <Java>DateTimeSupport.add(${this},Calendar.DAY_OF_YEAR,${amount})</Java>
       <Params>
@@ -205,8 +205,8 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
-        <string>java.util.Calendar</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
+        <Import>java.util.Calendar</Import>
       </Imports>
       <Java>DateTimeSupport.add(${this},Calendar.MONTH,${amount})</Java>
       <Params>
@@ -220,7 +220,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DateTimeSupport</string>
+        <Import>RusticiSoftware.System.DateTimeSupport</Import>
       </Imports>
       <Java>(new TimeSpan(Math.abs(${this}.getTime() - ${date2}.getTime())))</Java>
       <Params>
@@ -236,7 +236,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>java.util.Calendar</string>
+        <Import>java.util.Calendar</Import>
       </Imports>
       <Java>Calendar.getInstance().getTime()</Java>
       <Type>System.DateTime</Type>
@@ -246,7 +246,7 @@
     </Property>
     <Property>
       <Imports>
-        <string>java.util.Date</string>
+        <Import>java.util.Date</Import>
       </Imports>
       <Java>new Date()</Java>
       <Type>System.DateTime</Type>
@@ -260,7 +260,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.util.GregorianCalendar</string>
+        <Import>java.util.GregorianCalendar</Import>
       </Imports>
       <Java>new GregorianCalendar(${year}, ${month}-1, ${day}).getTime()</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Double.xml b/CS2JLibrary/NetFramework/System/Double.xml
index 28ded18..77e435b 100644
--- a/CS2JLibrary/NetFramework/System/Double.xml
+++ b/CS2JLibrary/NetFramework/System/Double.xml
@@ -37,7 +37,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.text.NumberFormat</string>
+        <Import>java.text.NumberFormat</Import>
       </Imports>
       <Java>NumberFormat.getInstance(${provider}).parse(${dStr}).doubleValue()</Java>
       <Params>
@@ -55,7 +55,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.*</string>
+        <Import>RusticiSoftware.System.*</Import>
       </Imports>
       <Java>DoubleSupport.parse(${dStr}, ${style}, ${provider})</Java>
       <Params>
@@ -77,7 +77,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.*</string>
+        <Import>RusticiSoftware.System.*</Import>
       </Imports>
       <Java>DoubleSupport.ToString(${this}, ${format})</Java>
       <Params>
@@ -98,7 +98,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.DoubleSupport</string>
+        <Import>RusticiSoftware.System.DoubleSupport</Import>
       </Imports>
       <Java>DoubleSupport.ToString(${this}, ${provider})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Enum.xml b/CS2JLibrary/NetFramework/System/Enum.xml
index 259bd00..4348f02 100644
--- a/CS2JLibrary/NetFramework/System/Enum.xml
+++ b/CS2JLibrary/NetFramework/System/Enum.xml
@@ -8,7 +8,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.EnumSupport</string>
+        <Import>RusticiSoftware.System.EnumSupport</Import>
       </Imports>
       <Java>EnumSupport.isDefined(${enumType}, ${value})</Java>
       <Params>
@@ -26,7 +26,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.EnumSupport</string>
+        <Import>RusticiSoftware.System.EnumSupport</Import>
       </Imports>
       <Java>EnumSupport.toString(${this}, ${modifier})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Environment.xml b/CS2JLibrary/NetFramework/System/Environment.xml
index 9e765e9..91e0acf 100644
--- a/CS2JLibrary/NetFramework/System/Environment.xml
+++ b/CS2JLibrary/NetFramework/System/Environment.xml
@@ -19,7 +19,7 @@
     </Property>
     <Property>
       <Imports>
-        <string>java.net.InetAddress</string>
+        <Import>java.net.InetAddress</Import>
       </Imports>
       <Java>InetAddress.getLocalHost().getHostName()</Java>
       <Type>System.String</Type>
diff --git a/CS2JLibrary/NetFramework/System/Exception.xml b/CS2JLibrary/NetFramework/System/Exception.xml
index af5a002..0dbabaa 100644
--- a/CS2JLibrary/NetFramework/System/Exception.xml
+++ b/CS2JLibrary/NetFramework/System/Exception.xml
@@ -19,7 +19,7 @@
     </Property>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.ExceptionSupport</string>
+        <Import>RusticiSoftware.System.ExceptionSupport</Import>
       </Imports>
       <Java>ExceptionSupport.getSource(${this})</Java>
       <Type>System.String</Type>
diff --git a/CS2JLibrary/NetFramework/System/Globalization/CultureInfo.xml b/CS2JLibrary/NetFramework/System/Globalization/CultureInfo.xml
index b21ca4f..f5872b6 100644
--- a/CS2JLibrary/NetFramework/System/Globalization/CultureInfo.xml
+++ b/CS2JLibrary/NetFramework/System/Globalization/CultureInfo.xml
@@ -12,7 +12,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>RusticiSoftware.JavaSupport.util.LocaleSupport</string>
+        <Import>RusticiSoftware.JavaSupport.util.LocaleSupport</Import>
       </Imports>
       <Java>LocaleSupport.INVARIANT</Java>
       <Type>System.Globalization.CultureInfo</Type>
diff --git a/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml b/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml
index a17bf23..2531873 100644
--- a/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml
+++ b/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml
@@ -12,7 +12,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>RusticiSoftware.JavaSupport.util.LocaleSupport</string>
+        <Import>RusticiSoftware.JavaSupport.util.LocaleSupport</Import>
       </Imports>
       <Java>LocaleSupport.INVARIANT</Java>
       <Type>System.Globalization.NumberFormatInfo</Type>
@@ -26,7 +26,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.JavaSupport.util.LocaleSupport</string>
+        <Import>RusticiSoftware.JavaSupport.util.LocaleSupport</Import>
       </Imports>
       <Java>LocaleSupport.INVARIANT</Java>
       <Params />
diff --git a/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml b/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml
index 373088f..4dbde04 100644
--- a/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml
+++ b/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml
@@ -9,7 +9,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Globalization.NumberStyles</string>
+        <Import>RusticiSoftware.System.Globalization.NumberStyles</Import>
       </Imports>
       <Java>NumberStyles.getInteger()</Java>
       <Type>System.Globalization.NumberStyles</Type>
@@ -19,7 +19,7 @@
     </Property>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Globalization.NumberStyles</string>
+        <Import>RusticiSoftware.System.Globalization.NumberStyles</Import>
       </Imports>
       <Java>NumberStyles.getHexNumber()</Java>
       <Type>System.Globalization.NumberStyles</Type>
@@ -29,7 +29,7 @@
     </Property>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Globalization.NumberStyles</string>
+        <Import>RusticiSoftware.System.Globalization.NumberStyles</Import>
       </Imports>
       <Java>NumberStyles.getAny()</Java>
       <Type>System.Globalization.NumberStyles</Type>
diff --git a/CS2JLibrary/NetFramework/System/Guid.xml b/CS2JLibrary/NetFramework/System/Guid.xml
index 142125c..dac04f0 100644
--- a/CS2JLibrary/NetFramework/System/Guid.xml
+++ b/CS2JLibrary/NetFramework/System/Guid.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.UUID</Import>
   </Imports>
   <Java>UUID</Java>
   <Name>System.Guid</Name>
@@ -12,7 +12,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>java.util.UUID</string>
+        <Import>java.util.UUID</Import>
       </Imports>
       <Java>UUID.randomUUID()</Java>
       <Params />
diff --git a/CS2JLibrary/NetFramework/System/ICloneable.xml b/CS2JLibrary/NetFramework/System/ICloneable.xml
index 205fceb..c617a78 100644
--- a/CS2JLibrary/NetFramework/System/ICloneable.xml
+++ b/CS2JLibrary/NetFramework/System/ICloneable.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.ScormContentPlayer.Util.ICloneable</Import>
   </Imports>
   <Java>ICloneable</Java>
   <Name>System.ICloneable</Name>
diff --git a/CS2JLibrary/NetFramework/System/IDisposable.xml b/CS2JLibrary/NetFramework/System/IDisposable.xml
index 8c0ceb3..333b71d 100644
--- a/CS2JLibrary/NetFramework/System/IDisposable.xml
+++ b/CS2JLibrary/NetFramework/System/IDisposable.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.IDisposable</Import>
   </Imports>
   <Java>IDisposable</Java>
   <Name>System.IDisposable</Name>
diff --git a/CS2JLibrary/NetFramework/System/IO/Directory.xml b/CS2JLibrary/NetFramework/System/IO/Directory.xml
index 65c3070..d3143ef 100644
--- a/CS2JLibrary/NetFramework/System/IO/Directory.xml
+++ b/CS2JLibrary/NetFramework/System/IO/Directory.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.File</Import>
   </Imports>
   <Java>File</Java>
   <Name>System.IO.Directory</Name>
@@ -10,7 +10,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${path})).exists()</Java>
       <Params>
@@ -24,7 +24,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${path})).mkdirs()</Java>
       <Params>
@@ -38,7 +38,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.IO.DirectorySupport</string>
+        <Import>RusticiSoftware.System.IO.DirectorySupport</Import>
       </Imports>
       <Java>DirectorySupport.delete(${path}, false)</Java>
       <Params>
@@ -52,7 +52,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.IO.DirectorySupport</string>
+        <Import>RusticiSoftware.System.IO.DirectorySupport</Import>
       </Imports>
       <Java>DirectorySupport.delete(${path}, ${recursive})</Java>
       <Params>
@@ -70,7 +70,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${sourceFileName})).renameTo(new File(${destFileName}))</Java>
       <Params>
@@ -88,7 +88,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${path})).list()</Java>
       <Params>
@@ -102,7 +102,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.IO.DirectorySupport</string>
+        <Import>RusticiSoftware.System.IO.DirectorySupport</Import>
       </Imports>
       <Java>DirectorySupport.getFiles(${path}, ${searchpattern})</Java>
       <Params>
@@ -120,7 +120,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.IO.DirectorySupport</string>
+        <Import>RusticiSoftware.System.IO.DirectorySupport</Import>
       </Imports>
       <Java>DirectorySupport.getDirectories(${path})</Java>
       <Params>
@@ -134,7 +134,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.IO.DirectorySupport</string>
+        <Import>RusticiSoftware.System.IO.DirectorySupport</Import>
       </Imports>
       <Java>DirectorySupport.getFiles(${path})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml b/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml
index 79e3ab8..0503ae0 100644
--- a/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml
+++ b/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.File</Import>
   </Imports>
   <Java>File</Java>
   <Name>System.IO.DirectoryInfo</Name>
@@ -12,7 +12,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>RusticiSoftware.JavaSupport.io.*</string>
+        <Import>RusticiSoftware.JavaSupport.io.*</Import>
       </Imports>
       <Java>${this}.listFiles(new FilterOnlyFiles())</Java>
       <Params />
@@ -21,7 +21,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.JavaSupport.io.*</string>
+        <Import>RusticiSoftware.JavaSupport.io.*</Import>
       </Imports>
       <Java>${this}.listFiles(new FilterOnlyDirs())</Java>
       <Params />
@@ -42,7 +42,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>new File(${path})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/File.xml b/CS2JLibrary/NetFramework/System/IO/File.xml
index 9a3334a..1f90896 100644
--- a/CS2JLibrary/NetFramework/System/IO/File.xml
+++ b/CS2JLibrary/NetFramework/System/IO/File.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.File</Import>
   </Imports>
   <Java>File</Java>
   <Name>System.IO.File</Name>
@@ -10,8 +10,8 @@
   <Methods>
     <Method>
       <Imports>
-        <string>java.io.*</string>
-        <string>java.nio.charset.Charset</string>
+        <Import>java.io.*</Import>
+        <Import>java.nio.charset.Charset</Import>
       </Imports>
       <Java>new BufferedWriter(new OutputStreamWriter(new FileOutputStream(${path}), Charset.forName("UTF-8")))</Java>
       <Params>
@@ -25,7 +25,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.*</string>
+        <Import>java.io.*</Import>
       </Imports>
       <Java>new BufferedOutputStream(new FileOutputStream(${path}))</Java>
       <Params>
@@ -39,7 +39,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.FileInputStream</string>
+        <Import>java.io.FileInputStream</Import>
       </Imports>
       <Java>new FileInputStream(${path})</Java>
       <Params>
@@ -53,7 +53,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${path})).delete()</Java>
       <Params>
@@ -67,7 +67,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${path})).exists()</Java>
       <Params>
@@ -81,7 +81,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.IO.FileSupport</string>
+        <Import>RusticiSoftware.System.IO.FileSupport</Import>
       </Imports>
       <Java>FileSupport.copyFile(${sourceFileName}, ${destFileName}, true)</Java>
       <Params>
@@ -99,7 +99,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.IO.FileSupport</string>
+        <Import>RusticiSoftware.System.IO.FileSupport</Import>
       </Imports>
       <Java>FileSupport.copyFile(${sourceFileName}, ${destFileName}, ${overwrite})</Java>
       <Params>
@@ -121,7 +121,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${sourceFileName})).renameTo(new File(${destFileName}))</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/FileInfo.xml b/CS2JLibrary/NetFramework/System/IO/FileInfo.xml
index 9494e92..e0e4b6b 100644
--- a/CS2JLibrary/NetFramework/System/IO/FileInfo.xml
+++ b/CS2JLibrary/NetFramework/System/IO/FileInfo.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.File</Import>
   </Imports>
   <Java>File</Java>
   <Name>System.IO.FileInfo</Name>
@@ -25,7 +25,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>new File(${fileName})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/FileNotFoundException.xml b/CS2JLibrary/NetFramework/System/IO/FileNotFoundException.xml
index c4ec416..01ad2cf 100644
--- a/CS2JLibrary/NetFramework/System/IO/FileNotFoundException.xml
+++ b/CS2JLibrary/NetFramework/System/IO/FileNotFoundException.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.IO.FileNotFoundException</Import>
   </Imports>
   <Java>FileNotFoundException</Java>
   <Name>System.IO.FileNotFoundException</Name>
@@ -16,7 +16,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.IO.FileNotFoundException</string>
+        <Import>RusticiSoftware.System.IO.FileNotFoundException</Import>
       </Imports>
       <Java>new FileNotFoundException(${message})</Java>
       <Params>
@@ -28,7 +28,7 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.IO.FileNotFoundException</string>
+        <Import>RusticiSoftware.System.IO.FileNotFoundException</Import>
       </Imports>
       <Java>new FileNotFoundException(${message}, ${fileName})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/FileStream.xml b/CS2JLibrary/NetFramework/System/IO/FileStream.xml
index d2910c1..c5bf621 100644
--- a/CS2JLibrary/NetFramework/System/IO/FileStream.xml
+++ b/CS2JLibrary/NetFramework/System/IO/FileStream.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.*</Import>
   </Imports>
   <Java>OutputStream</Java>
   <Name>System.IO.FileStream</Name>
diff --git a/CS2JLibrary/NetFramework/System/IO/FileSystemInfo.xml b/CS2JLibrary/NetFramework/System/IO/FileSystemInfo.xml
index 94264d0..02fc8b0 100644
--- a/CS2JLibrary/NetFramework/System/IO/FileSystemInfo.xml
+++ b/CS2JLibrary/NetFramework/System/IO/FileSystemInfo.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.File</Import>
   </Imports>
   <Java>File</Java>
   <Name>System.IO.FileSystemInfo</Name>
@@ -23,7 +23,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>new File(${fileName})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/Path.xml b/CS2JLibrary/NetFramework/System/IO/Path.xml
index 510a3e7..499dcae 100644
--- a/CS2JLibrary/NetFramework/System/IO/Path.xml
+++ b/CS2JLibrary/NetFramework/System/IO/Path.xml
@@ -8,7 +8,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${path})).getParent()</Java>
       <Params>
@@ -22,7 +22,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${path})).getName()</Java>
       <Params>
@@ -36,7 +36,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${path})).getCanonicalPath()</Java>
       <Params>
@@ -50,7 +50,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.IO.PathSupport</string>
+        <Import>RusticiSoftware.System.IO.PathSupport</Import>
       </Imports>
       <Java>PathSupport.getExtension(${path})</Java>
       <Params>
@@ -64,7 +64,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>(new File(${path1}, ${path2})).toString()</Java>
       <Params>
@@ -84,7 +84,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>java.io.File</string>
+        <Import>java.io.File</Import>
       </Imports>
       <Java>File.separatorChar</Java>
       <Type>System.Char</Type>
diff --git a/CS2JLibrary/NetFramework/System/IO/Stream.xml b/CS2JLibrary/NetFramework/System/IO/Stream.xml
index 4fb48d6..7bc48ac 100644
--- a/CS2JLibrary/NetFramework/System/IO/Stream.xml
+++ b/CS2JLibrary/NetFramework/System/IO/Stream.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.*</Import>
   </Imports>
   <Java>InputStream</Java>
   <Name>System.IO.Stream</Name>
@@ -61,7 +61,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>RusticiSoftware.JavaSupport.Unsupported</string>
+        <Import>RusticiSoftware.JavaSupport.Unsupported</Import>
       </Imports>
       <Java>Unsupported.throwUnsupported("${this}.Position")</Java>
       <Type>System.Int64</Type>
@@ -75,7 +75,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.io.*</string>
+        <Import>java.io.*</Import>
       </Imports>
       <Java>new FileInputStream(${path})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/StreamReader.xml b/CS2JLibrary/NetFramework/System/IO/StreamReader.xml
index b552c12..30a7918 100644
--- a/CS2JLibrary/NetFramework/System/IO/StreamReader.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StreamReader.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.*</Import>
   </Imports>
   <Java>BufferedReader</Java>
   <Name>System.IO.StreamReader</Name>
@@ -16,8 +16,8 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.IO.StreamReader</string>
-        <string>java.io.*</string>
+        <Import>RusticiSoftware.System.IO.StreamReader</Import>
+        <Import>java.io.*</Import>
       </Imports>
       <Java>new BufferedReader(StreamReader.make(new BufferedInputStream(new FileInputStream(${path}))))</Java>
       <Params>
@@ -29,8 +29,8 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.IO.StreamReader</string>
-        <string>java.io.*</string>
+        <Import>RusticiSoftware.System.IO.StreamReader</Import>
+        <Import>java.io.*</Import>
       </Imports>
       <Java>new BufferedReader(StreamReader.make(new BufferedInputStream(new FileInputStream(${path}), ${encoding})))</Java>
       <Params>
@@ -46,8 +46,8 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.IO.StreamReader</string>
-        <string>java.io.*</string>
+        <Import>RusticiSoftware.System.IO.StreamReader</Import>
+        <Import>java.io.*</Import>
       </Imports>
       <Java>new BufferedReader(StreamReader.make(new BufferedInputStream(${stream}), ${encoding}))</Java>
       <Params>
@@ -63,9 +63,9 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.IO.StreamReader</string>
-        <string>RusticiSoftware.System.Text.EncodingSupport</string>
-        <string>java.io.*</string>
+        <Import>RusticiSoftware.System.IO.StreamReader</Import>
+        <Import>RusticiSoftware.System.Text.EncodingSupport</Import>
+        <Import>java.io.*</Import>
       </Imports>
       <Java>new BufferedReader(StreamReader.make(new BufferedInputStream(${stream}), new EncodingSupport("UTF-8")))</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml b/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
index 2e75b99..72d87e4 100644
--- a/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.*</Import>
   </Imports>
   <Java>BufferedWriter</Java>
   <Name>System.IO.StreamWriter</Name>
@@ -16,7 +16,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.io.*</string>
+        <Import>java.io.*</Import>
       </Imports>
       <Java>new BufferedWriter(new FileWriter(${path}))</Java>
       <Params>
@@ -28,7 +28,7 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>java.io.*</string>
+        <Import>java.io.*</Import>
       </Imports>
       <Java>new BufferedWriter(new FileWriter(${path},${append}))</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/StringReader.xml b/CS2JLibrary/NetFramework/System/IO/StringReader.xml
index 20383d4..986baa8 100644
--- a/CS2JLibrary/NetFramework/System/IO/StringReader.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StringReader.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.*</Import>
   </Imports>
   <Java>StringReader</Java>
   <Name>System.IO.StringReader</Name>
@@ -16,7 +16,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.io.*</string>
+        <Import>java.io.*</Import>
       </Imports>
       <Java>new StringReader(${s})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/StringWriter.xml b/CS2JLibrary/NetFramework/System/IO/StringWriter.xml
index 79655ca..94682bf 100644
--- a/CS2JLibrary/NetFramework/System/IO/StringWriter.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StringWriter.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.StringWriter</Import>
   </Imports>
   <Java>StringWriter</Java>
   <Name>System.IO.StringWriter</Name>
@@ -16,7 +16,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.io.StringWriter</string>
+        <Import>java.io.StringWriter</Import>
       </Imports>
       <Java>new StringWriter(${s})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/TextReader.xml b/CS2JLibrary/NetFramework/System/IO/TextReader.xml
index 015bcbe..a473b68 100644
--- a/CS2JLibrary/NetFramework/System/IO/TextReader.xml
+++ b/CS2JLibrary/NetFramework/System/IO/TextReader.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.io.*</Import>
   </Imports>
   <Java>BufferedReader</Java>
   <Name>System.IO.TextReader</Name>
@@ -26,7 +26,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.IO.TextReaderSupport</string>
+        <Import>RusticiSoftware.System.IO.TextReaderSupport</Import>
       </Imports>
       <Java>TextReaderSupport.readToEnd(${this})</Java>
       <Params />
diff --git a/CS2JLibrary/NetFramework/System/Int32.xml b/CS2JLibrary/NetFramework/System/Int32.xml
index 00bc5ea..7e95e9a 100644
--- a/CS2JLibrary/NetFramework/System/Int32.xml
+++ b/CS2JLibrary/NetFramework/System/Int32.xml
@@ -44,7 +44,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.*</string>
+        <Import>RusticiSoftware.System.*</Import>
       </Imports>
       <Java>IntegerSupport.parse(${str}, ${style})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/InvalidCastException.xml b/CS2JLibrary/NetFramework/System/InvalidCastException.xml
index b64d7af..1a305dc 100644
--- a/CS2JLibrary/NetFramework/System/InvalidCastException.xml
+++ b/CS2JLibrary/NetFramework/System/InvalidCastException.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.InvalidCastException</Import>
   </Imports>
   <Java>InvalidCastException</Java>
   <Name>System.InvalidCastException</Name>
@@ -16,14 +16,14 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.InvalidCastException</string>
+        <Import>RusticiSoftware.System.InvalidCastException</Import>
       </Imports>
       <Java>new InvalidCastException()</Java>
       <Params />
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.InvalidCastException</string>
+        <Import>RusticiSoftware.System.InvalidCastException</Import>
       </Imports>
       <Java>new InvalidCastException(${message})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Net/CookieContainer.xml b/CS2JLibrary/NetFramework/System/Net/CookieContainer.xml
index f1babb0..1e29438 100644
--- a/CS2JLibrary/NetFramework/System/Net/CookieContainer.xml
+++ b/CS2JLibrary/NetFramework/System/Net/CookieContainer.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Net.CookieContainer</Import>
   </Imports>
   <Java>CookieContainer</Java>
   <Name>System.Net.CookieContainer</Name>
diff --git a/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml b/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml
index 15a2996..f9b83b7 100644
--- a/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml
+++ b/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.net.*</Import>
   </Imports>
   <Java>HttpURLConnection</Java>
   <Name>System.Net.HttpWebRequest</Name>
diff --git a/CS2JLibrary/NetFramework/System/Net/HttpWebResponse.xml b/CS2JLibrary/NetFramework/System/Net/HttpWebResponse.xml
index f636938..6f8f133 100644
--- a/CS2JLibrary/NetFramework/System/Net/HttpWebResponse.xml
+++ b/CS2JLibrary/NetFramework/System/Net/HttpWebResponse.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.net.*</Import>
   </Imports>
   <Java>HttpURLConnection</Java>
   <Name>System.Net.HttpWebResponse</Name>
diff --git a/CS2JLibrary/NetFramework/System/Net/Mail/MailAddress.xml b/CS2JLibrary/NetFramework/System/Net/Mail/MailAddress.xml
index dff0b47..8bc0b59 100644
--- a/CS2JLibrary/NetFramework/System/Net/Mail/MailAddress.xml
+++ b/CS2JLibrary/NetFramework/System/Net/Mail/MailAddress.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>javax.mail.internet.InternetAddress</Import>
   </Imports>
   <Java>InternetAddress</Java>
   <Name>System.Net.Mail.MailAddress</Name>
@@ -16,7 +16,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.io.*</string>
+        <Import>java.io.*</Import>
       </Imports>
       <Java>new InternetAddress(${address})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml b/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml
index 3bde544..ef309f6 100644
--- a/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml
+++ b/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.ScormContentPlayer.Util.MailMessage</Import>
   </Imports>
   <Java>MailMessage</Java>
   <Name>System.Net.Mail.MailMessage</Name>
@@ -37,8 +37,8 @@
     </Property>
     <Property>
       <Imports>
-        <string>javax.mail.internet.MimeMessage</string>
-        <string>javax.mail.internet.MimeMessage.RecipientType</string>
+        <Import>javax.mail.internet.MimeMessage</Import>
+        <Import>javax.mail.internet.MimeMessage.RecipientType</Import>
       </Imports>
       <Java>${this}.getTo()</Java>
       <Type>System.Net.Mail.MailAddressCollection</Type>
@@ -48,8 +48,8 @@
     </Property>
     <Property>
       <Imports>
-        <string>javax.mail.internet.MimeMessage</string>
-        <string>javax.mail.internet.MimeMessage.RecipientType</string>
+        <Import>javax.mail.internet.MimeMessage</Import>
+        <Import>javax.mail.internet.MimeMessage.RecipientType</Import>
       </Imports>
       <Java>${this}.getCC()</Java>
       <Type>System.Net.Mail.MailAddressCollection</Type>
diff --git a/CS2JLibrary/NetFramework/System/Net/WebRequest.xml b/CS2JLibrary/NetFramework/System/Net/WebRequest.xml
index 3dd8c8b..9e11566 100644
--- a/CS2JLibrary/NetFramework/System/Net/WebRequest.xml
+++ b/CS2JLibrary/NetFramework/System/Net/WebRequest.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.net.*</Import>
   </Imports>
   <Java>** NONE System.Net.WebRequest **</Java>
   <Name>System.Net.WebRequest</Name>
diff --git a/CS2JLibrary/NetFramework/System/NotImplementedException.xml b/CS2JLibrary/NetFramework/System/NotImplementedException.xml
index 8b32ed1..f635c62 100644
--- a/CS2JLibrary/NetFramework/System/NotImplementedException.xml
+++ b/CS2JLibrary/NetFramework/System/NotImplementedException.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.NotImplementedException</Import>
   </Imports>
   <Java>NotImplementedException</Java>
   <Name>System.NotImplementedException</Name>
@@ -16,14 +16,14 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.NotImplementedException</string>
+        <Import>RusticiSoftware.System.NotImplementedException</Import>
       </Imports>
       <Java>new NotImplementedException()</Java>
       <Params />
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.NotImplementedException</string>
+        <Import>RusticiSoftware.System.NotImplementedException</Import>
       </Imports>
       <Java>new NotImplementedException(${message})</Java>
       <Params>
@@ -35,7 +35,7 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.NotImplementedException</string>
+        <Import>RusticiSoftware.System.NotImplementedException</Import>
       </Imports>
       <Java>new NotImplementedException(${message}, ${inner})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Number.xml b/CS2JLibrary/NetFramework/System/Number.xml
index 4bbf8f7..6146c46 100644
--- a/CS2JLibrary/NetFramework/System/Number.xml
+++ b/CS2JLibrary/NetFramework/System/Number.xml
@@ -8,7 +8,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>java.text.NumberFormat</string>
+        <Import>java.text.NumberFormat</Import>
       </Imports>
       <Java>NumberFormat.getInstance(${provider}).format(${this})</Java>
       <Params>
@@ -22,7 +22,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.NumberSupport</string>
+        <Import>RusticiSoftware.System.NumberSupport</Import>
       </Imports>
       <Java>NumberSupport.format(${this}, ${format})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Reflection/Assembly.xml b/CS2JLibrary/NetFramework/System/Reflection/Assembly.xml
index 825b84a..31d40c8 100644
--- a/CS2JLibrary/NetFramework/System/Reflection/Assembly.xml
+++ b/CS2JLibrary/NetFramework/System/Reflection/Assembly.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Reflection.Assembly</Import>
   </Imports>
   <Java>Assembly</Java>
   <Name>System.Reflection.Assembly</Name>
@@ -10,7 +10,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.Reflection.Assembly</string>
+        <Import>RusticiSoftware.System.Reflection.Assembly</Import>
       </Imports>
       <Java>new Assembly(${assemblyString})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Reflection/BindingFlags.xml b/CS2JLibrary/NetFramework/System/Reflection/BindingFlags.xml
index 1a2f5c0..651341d 100644
--- a/CS2JLibrary/NetFramework/System/Reflection/BindingFlags.xml
+++ b/CS2JLibrary/NetFramework/System/Reflection/BindingFlags.xml
@@ -9,7 +9,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Reflection.BindingFlags</string>
+        <Import>RusticiSoftware.System.Reflection.BindingFlags</Import>
       </Imports>
       <Java>BindingFlags.getInstance()</Java>
       <Type>System.Reflection.BindingFlags</Type>
@@ -19,7 +19,7 @@
     </Property>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Reflection.BindingFlags</string>
+        <Import>RusticiSoftware.System.Reflection.BindingFlags</Import>
       </Imports>
       <Java>BindingFlags.getPublic()</Java>
       <Type>System.Reflection.BindingFlags</Type>
@@ -29,7 +29,7 @@
     </Property>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Reflection.BindingFlags</string>
+        <Import>RusticiSoftware.System.Reflection.BindingFlags</Import>
       </Imports>
       <Java>BindingFlags.getFlattenHierarchy()</Java>
       <Type>System.Reflection.BindingFlags</Type>
@@ -39,7 +39,7 @@
     </Property>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Reflection.BindingFlags</string>
+        <Import>RusticiSoftware.System.Reflection.BindingFlags</Import>
       </Imports>
       <Java>BindingFlags.getStatic()</Java>
       <Type>System.Reflection.BindingFlags</Type>
diff --git a/CS2JLibrary/NetFramework/System/Reflection/FieldInfo.xml b/CS2JLibrary/NetFramework/System/Reflection/FieldInfo.xml
index 6daf019..1ead984 100644
--- a/CS2JLibrary/NetFramework/System/Reflection/FieldInfo.xml
+++ b/CS2JLibrary/NetFramework/System/Reflection/FieldInfo.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.lang.reflect.Field</Import>
   </Imports>
   <Java>Field</Java>
   <Name>System.Reflection.FieldInfo</Name>
@@ -10,7 +10,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>RusticiSoftware.JavaSupport.reflect.FieldSupport</string>
+        <Import>RusticiSoftware.JavaSupport.reflect.FieldSupport</Import>
       </Imports>
       <Java>FieldSupport.getAnnotations(${this}, ${attributeType}, ${inherits})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Resources/ResourceManager.xml b/CS2JLibrary/NetFramework/System/Resources/ResourceManager.xml
index dac3194..210ea2f 100644
--- a/CS2JLibrary/NetFramework/System/Resources/ResourceManager.xml
+++ b/CS2JLibrary/NetFramework/System/Resources/ResourceManager.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Resources.ResourceManager</Import>
   </Imports>
   <Java>ResourceManager</Java>
   <Name>System.Resources.ResourceManager</Name>
@@ -27,7 +27,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.Resources.ResourceManager</string>
+        <Import>RusticiSoftware.System.Resources.ResourceManager</Import>
       </Imports>
       <Java>new ResourceManager(${baseName}, ${assembly)) /* ignored parameters */ </Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Security/Cryptography/X509Certificates/X509Certificate2.xml b/CS2JLibrary/NetFramework/System/Security/Cryptography/X509Certificates/X509Certificate2.xml
index b35936d..bceab0c 100644
--- a/CS2JLibrary/NetFramework/System/Security/Cryptography/X509Certificates/X509Certificate2.xml
+++ b/CS2JLibrary/NetFramework/System/Security/Cryptography/X509Certificates/X509Certificate2.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.security.cert.X509Certificate</Import>
   </Imports>
   <Java>X509Certificate</Java>
   <Name>System.Security.Cryptography.X509Certificates.X509Certificate2</Name>
diff --git a/CS2JLibrary/NetFramework/System/String.xml b/CS2JLibrary/NetFramework/System/String.xml
index 5753e37..506469e 100644
--- a/CS2JLibrary/NetFramework/System/String.xml
+++ b/CS2JLibrary/NetFramework/System/String.xml
@@ -8,7 +8,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.Compare(${arg1}, ${arg2})</Java>
       <Params>
@@ -26,7 +26,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.Compare(${arg1}, ${arg2}, ${isCaseSensitive})</Java>
       <Params>
@@ -144,7 +144,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.isNullOrEmpty(${arg})</Java>
       <Params>
@@ -158,7 +158,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.lastIndexOfAny(${this},${anyOf})</Java>
       <Params>
@@ -228,7 +228,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.PadLeft(${this}, ${totalWidth})</Java>
       <Params>
@@ -242,7 +242,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.PadLeft(${this}, ${totalWidth}, ${paddingChar})</Java>
       <Params>
@@ -260,7 +260,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.PadRight(${this}, ${totalWidth})</Java>
       <Params>
@@ -274,7 +274,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.PadRight(${this}, ${totalWidth}, ${paddingChar})</Java>
       <Params>
@@ -324,7 +324,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.Split(${this}, ${ch})</Java>
       <Params>
@@ -338,7 +338,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.Split(${this}, ${ch1}, ${ch2})</Java>
       <Params>
@@ -356,7 +356,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>${this}.split(StringSupport.charAltsToRegex(${cs}))</Java>
       <Params>
@@ -370,7 +370,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>${this}.split(StringSupport.charAltsToRegex(${cs}), ${count})</Java>
       <Params>
@@ -388,7 +388,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.Split(${this}, ${cs}, ${options})</Java>
       <Params>
@@ -497,7 +497,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.Trim(${this})</Java>
       <Params />
@@ -506,7 +506,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.Trim(${this}, ${trimChars})</Java>
       <Params>
@@ -520,7 +520,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.Trim(${this}, new char[] {${trimChar1}})</Java>
       <Params>
@@ -534,7 +534,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.Trim(${this}, new char[] {${trimChar1}, ${trimChar2}})</Java>
       <Params>
@@ -552,7 +552,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.TrimStart(${this}, null)</Java>
       <Params />
@@ -561,7 +561,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.TrimStart(${this}, ${trimChars})</Java>
       <Params>
@@ -575,7 +575,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.TrimStart(${this}, new char[] {${trimChar1}})</Java>
       <Params>
@@ -589,7 +589,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.TrimStart(${this}, new char[] {${trimChar1}, ${trimChar2}})</Java>
       <Params>
@@ -607,7 +607,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.TrimEnd(${this}, null)</Java>
       <Params />
@@ -616,7 +616,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.TrimEnd(${this}, ${trimChars})</Java>
       <Params>
@@ -630,7 +630,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.TrimEnd(${this}, new char[] {${trimChar1}})</Java>
       <Params>
@@ -644,7 +644,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.TrimEnd(${this}, new char[] {${trimChar1}, ${trimChar2}})</Java>
       <Params>
@@ -696,7 +696,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>RusticiSoftware.System.StringSupport</string>
+        <Import>RusticiSoftware.System.StringSupport</Import>
       </Imports>
       <Java>StringSupport.mkString(${char}, ${length})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/StringSplitOptions.xml b/CS2JLibrary/NetFramework/System/StringSplitOptions.xml
index e3536e0..dd3b661 100644
--- a/CS2JLibrary/NetFramework/System/StringSplitOptions.xml
+++ b/CS2JLibrary/NetFramework/System/StringSplitOptions.xml
@@ -9,7 +9,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.StringSplitOptions</string>
+        <Import>RusticiSoftware.System.StringSplitOptions</Import>
       </Imports>
       <Java>StringSplitOptions.None</Java>
       <Type>System.StringSplitOptions</Type>
@@ -19,7 +19,7 @@
     </Property>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.StringSplitOptions</string>
+        <Import>RusticiSoftware.System.StringSplitOptions</Import>
       </Imports>
       <Java>StringSplitOptions.RemoveEmptyEntries</Java>
       <Type>System.StringSplitOptions</Type>
diff --git a/CS2JLibrary/NetFramework/System/Text/Encoding.xml b/CS2JLibrary/NetFramework/System/Text/Encoding.xml
index 0611f4e..5946b12 100644
--- a/CS2JLibrary/NetFramework/System/Text/Encoding.xml
+++ b/CS2JLibrary/NetFramework/System/Text/Encoding.xml
@@ -22,7 +22,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Text.EncodingSupport</string>
+        <Import>RusticiSoftware.System.Text.EncodingSupport</Import>
       </Imports>
       <Java>(new EncodingSupport("UTF-8"))</Java>
       <Type>System.Text.Encoding</Type>
diff --git a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml
index 8baf29a..e7336df 100644
--- a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml
+++ b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.regex.*</Import>
   </Imports>
   <Java>NONE</Java>
   <Name>System.Text.RegularExpressions.Capture</Name>
diff --git a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Group.xml b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Group.xml
index 86be99b..fbc74a9 100644
--- a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Group.xml
+++ b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Group.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.regex.*</Import>
   </Imports>
   <Java>Pattern</Java>
   <Name>System.Text.RegularExpressions.Group</Name>
@@ -25,14 +25,14 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.util.regex.*</string>
+        <Import>java.util.regex.*</Import>
       </Imports>
       <Java>new Pattern()</Java>
       <Params />
     </Constructor>
     <Constructor>
       <Imports>
-        <string>java.util.regex.*</string>
+        <Import>java.util.regex.*</Import>
       </Imports>
       <Java>new Pattern(${pattern})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Match.xml b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Match.xml
index 991cefb..16f18c6 100644
--- a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Match.xml
+++ b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Match.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.regex.*</Import>
   </Imports>
   <Java>Matcher</Java>
   <Name>System.Text.RegularExpressions.Match</Name>
diff --git a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Regex.xml b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Regex.xml
index aefcf43..b102c1e 100644
--- a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Regex.xml
+++ b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Regex.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.util.regex.*</Import>
   </Imports>
   <Java>Pattern</Java>
   <Name>System.Text.RegularExpressions.Regex</Name>
@@ -34,7 +34,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.util.regex.*</string>
+        <Import>java.util.regex.*</Import>
       </Imports>
       <Java>Pattern.compile(${pattern}).matcher(${input}).matches()</Java>
       <Params>
@@ -52,7 +52,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>java.util.regex.*</string>
+        <Import>java.util.regex.*</Import>
       </Imports>
       <Java>Pattern.compile(${pattern}).matcher(${input}).replaceAll(${replacement})</Java>
       <Params>
@@ -79,14 +79,14 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <string>java.util.regex.*</string>
+        <Import>java.util.regex.*</Import>
       </Imports>
       <Java>new Pattern()</Java>
       <Params />
     </Constructor>
     <Constructor>
       <Imports>
-        <string>java.util.regex.*</string>
+        <Import>java.util.regex.*</Import>
       </Imports>
       <Java>Pattern.compile(${pattern})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Text/StringBuilder.xml b/CS2JLibrary/NetFramework/System/Text/StringBuilder.xml
index 9a0c9e6..0dde7be 100644
--- a/CS2JLibrary/NetFramework/System/Text/StringBuilder.xml
+++ b/CS2JLibrary/NetFramework/System/Text/StringBuilder.xml
@@ -32,7 +32,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.Text.StringBuilderSupport</string>
+        <Import>RusticiSoftware.System.Text.StringBuilderSupport</Import>
       </Imports>
       <Java>StringBuilderSupport.ensureCapacity(${this}, ${arg})</Java>
       <Params>
@@ -112,7 +112,7 @@
   <Properties>
     <Property>
       <Imports>
-        <string>RusticiSoftware.System.Text.StringBuilderSupport</string>
+        <Import>RusticiSoftware.System.Text.StringBuilderSupport</Import>
       </Imports>
       <Java>${this}.length()</Java>
       <Type>System.Int32</Type>
diff --git a/CS2JLibrary/NetFramework/System/TimeSpan.xml b/CS2JLibrary/NetFramework/System/TimeSpan.xml
index 2307670..fa744f5 100644
--- a/CS2JLibrary/NetFramework/System/TimeSpan.xml
+++ b/CS2JLibrary/NetFramework/System/TimeSpan.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.TimeSpan</Import>
   </Imports>
   <Java>TimeSpan</Java>
   <Name>System.TimeSpan</Name>
@@ -12,7 +12,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.TimeSpan</string>
+        <Import>RusticiSoftware.System.TimeSpan</Import>
       </Imports>
       <Java>TimeSpan.parse(${s})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Type.xml b/CS2JLibrary/NetFramework/System/Type.xml
index cc0931c..60b085f 100644
--- a/CS2JLibrary/NetFramework/System/Type.xml
+++ b/CS2JLibrary/NetFramework/System/Type.xml
@@ -8,7 +8,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.TypeSupport</string>
+        <Import>RusticiSoftware.System.TypeSupport</Import>
       </Imports>
       <Java>TypeSupport.GetFields(${this})</Java>
       <Params />
@@ -17,7 +17,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.TypeSupport</string>
+        <Import>RusticiSoftware.System.TypeSupport</Import>
       </Imports>
       <Java>TypeSupport.GetFields(${this},${flags})</Java>
       <Params>
@@ -31,7 +31,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.TypeSupport</string>
+        <Import>RusticiSoftware.System.TypeSupport</Import>
       </Imports>
       <Java>TypeSupport.GetField(${this},${name})</Java>
       <Params>
@@ -45,7 +45,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.TypeSupport</string>
+        <Import>RusticiSoftware.System.TypeSupport</Import>
       </Imports>
       <Java>TypeSupport.GetField(${this},${name},${flags})</Java>
       <Params>
@@ -63,7 +63,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.TypeSupport</string>
+        <Import>RusticiSoftware.System.TypeSupport</Import>
       </Imports>
       <Java>TypeSupport.InvokeMember(${this}, ${name}, ${target}, ${args})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Uri.xml b/CS2JLibrary/NetFramework/System/Uri.xml
index 0cd3c66..a701f80 100644
--- a/CS2JLibrary/NetFramework/System/Uri.xml
+++ b/CS2JLibrary/NetFramework/System/Uri.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.net.*</Import>
   </Imports>
   <Java>URI</Java>
   <Name>System.Uri</Name>
diff --git a/CS2JLibrary/NetFramework/System/Web/HttpRequest.xml b/CS2JLibrary/NetFramework/System/Web/HttpRequest.xml
index 786da2c..d66f985 100644
--- a/CS2JLibrary/NetFramework/System/Web/HttpRequest.xml
+++ b/CS2JLibrary/NetFramework/System/Web/HttpRequest.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>javax.servlet.http.*</Import>
   </Imports>
   <Java>HttpServletRequest</Java>
   <Name>System.Web.HttpRequest</Name>
diff --git a/CS2JLibrary/NetFramework/System/Web/HttpResponse.xml b/CS2JLibrary/NetFramework/System/Web/HttpResponse.xml
index 5889c0c..8afe826 100644
--- a/CS2JLibrary/NetFramework/System/Web/HttpResponse.xml
+++ b/CS2JLibrary/NetFramework/System/Web/HttpResponse.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>javax.servlet.http.*</Import>
   </Imports>
   <Java>HttpServletResponse</Java>
   <Name>System.Web.HttpResponse</Name>
diff --git a/CS2JLibrary/NetFramework/System/Web/HttpUtility.xml b/CS2JLibrary/NetFramework/System/Web/HttpUtility.xml
index 38bd47e..6f68d59 100644
--- a/CS2JLibrary/NetFramework/System/Web/HttpUtility.xml
+++ b/CS2JLibrary/NetFramework/System/Web/HttpUtility.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>java.net.*</Import>
   </Imports>
   <Java>URLEncoder</Java>
   <Name>System.Web.HttpUtility</Name>
@@ -12,7 +12,7 @@
   <Methods>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.Web.HttpUtilSupport</string>
+        <Import>RusticiSoftware.System.Web.HttpUtilSupport</Import>
       </Imports>
       <Java>HttpUtilSupport.HtmlEncode(${str})</Java>
       <Params>
@@ -26,7 +26,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.ScormContentPlayer.Util.HttpUtil</string>
+        <Import>RusticiSoftware.ScormContentPlayer.Util.HttpUtil</Import>
       </Imports>
       <Java>HttpUtil.UrlEncode(${str})</Java>
       <Params>
@@ -40,7 +40,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.ScormContentPlayer.Util.HttpUtil</string>
+        <Import>RusticiSoftware.ScormContentPlayer.Util.HttpUtil</Import>
       </Imports>
       <Java>HttpUtil.UrlDecode(${str})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapHttpClientProtocol.xml b/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapHttpClientProtocol.xml
index 0d2d979..4637b74 100644
--- a/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapHttpClientProtocol.xml
+++ b/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapHttpClientProtocol.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Web.Services.Protocols.SoapHttpClientProtocol</Import>
   </Imports>
   <Java>SoapHttpClientProtocol</Java>
   <Name>System.Web.Services.Protocols.SoapHttpClientProtocol</Name>
diff --git a/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapMessage.xml b/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapMessage.xml
index a8569eb..8fa1629 100644
--- a/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapMessage.xml
+++ b/CS2JLibrary/NetFramework/System/Web/Services/Protocols/SoapMessage.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Web.Services.Protocols.SoapMessage</Import>
   </Imports>
   <Java>SoapMessage</Java>
   <Name>System.Web.Services.Protocols.SoapMessage</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/Serialization/IXmlSerializable.xml b/CS2JLibrary/NetFramework/System/Xml/Serialization/IXmlSerializable.xml
index 009c1ae..ef12415 100644
--- a/CS2JLibrary/NetFramework/System/Xml/Serialization/IXmlSerializable.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/Serialization/IXmlSerializable.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.Serialization.IXmlSerializable</Import>
   </Imports>
   <Java>IXmlSerializable</Java>
   <Name>System.Xml.Serialization.IXmlSerializable</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlAttribute.xml b/CS2JLibrary/NetFramework/System/Xml/XmlAttribute.xml
index 57930f4..b7f07ba 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlAttribute.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlAttribute.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlAttribute</Import>
   </Imports>
   <Java>XmlAttribute</Java>
   <Name>System.Xml.XmlAttribute</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlAttributeCollection.xml b/CS2JLibrary/NetFramework/System/Xml/XmlAttributeCollection.xml
index 949bf12..ad765da 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlAttributeCollection.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlAttributeCollection.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlAttributeCollection</Import>
   </Imports>
   <Java>XmlAttributeCollection</Java>
   <Name>System.Xml.XmlAttributeCollection</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlCDataSection.xml b/CS2JLibrary/NetFramework/System/Xml/XmlCDataSection.xml
index ea858c7..981c747 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlCDataSection.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlCDataSection.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlCDataSection</Import>
   </Imports>
   <Java>XmlCDataSection</Java>
   <Name>System.Xml.XmlCDataSection</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlComment.xml b/CS2JLibrary/NetFramework/System/Xml/XmlComment.xml
index e378298..8738b6f 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlComment.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlComment.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlComment</Import>
   </Imports>
   <Java>XmlComment</Java>
   <Name>System.Xml.XmlComment</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlDeclaration.xml b/CS2JLibrary/NetFramework/System/Xml/XmlDeclaration.xml
index 7a5a432..9060200 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlDeclaration.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlDeclaration.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlDeclaration</Import>
   </Imports>
   <Java>XmlDeclaration</Java>
   <Name>System.Xml.XmlDeclaration</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlDocument.xml b/CS2JLibrary/NetFramework/System/Xml/XmlDocument.xml
index 43d9881..6e9421e 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlDocument.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlDocument.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlDocument</Import>
   </Imports>
   <Java>XmlDocument</Java>
   <Name>System.Xml.XmlDocument</Name>
@@ -192,7 +192,7 @@
     </Method>
     <Method>
       <Imports>
-        <string>RusticiSoftware.System.Xml.XmlDeclaration</string>
+        <Import>RusticiSoftware.System.Xml.XmlDeclaration</Import>
       </Imports>
       <Java>new XmlDeclaration(${version},${encoding},${standalone})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlElement.xml b/CS2JLibrary/NetFramework/System/Xml/XmlElement.xml
index 10679ac..b5ef5b4 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlElement.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlElement.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlElement</Import>
   </Imports>
   <Java>XmlElement</Java>
   <Name>System.Xml.XmlElement</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlLinkedNode.xml b/CS2JLibrary/NetFramework/System/Xml/XmlLinkedNode.xml
index ba15531..21655b7 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlLinkedNode.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlLinkedNode.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>org.w3c.dom.Node</Import>
   </Imports>
   <Java>Node</Java>
   <Name>System.Xml.XmlLinkedNode</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlNode.xml b/CS2JLibrary/NetFramework/System/Xml/XmlNode.xml
index f60f332..c4345f2 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlNode.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlNode.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlNode</Import>
   </Imports>
   <Java>XmlNode</Java>
   <Name>System.Xml.XmlNode</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlNodeList.xml b/CS2JLibrary/NetFramework/System/Xml/XmlNodeList.xml
index 99cfc4a..8338b8a 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlNodeList.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlNodeList.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlNodeList</Import>
   </Imports>
   <Java>XmlNodeList</Java>
   <Name>System.Xml.XmlNodeList</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlReader.xml b/CS2JLibrary/NetFramework/System/Xml/XmlReader.xml
index a31fbc8..d06af76 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlReader.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlReader.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlReader</Import>
   </Imports>
   <Java>XmlReader</Java>
   <Name>System.Xml.XmlReader</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlText.xml b/CS2JLibrary/NetFramework/System/Xml/XmlText.xml
index 8b81711..6375e03 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlText.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlText.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlText</Import>
   </Imports>
   <Java>XmlText</Java>
   <Name>System.Xml.XmlText</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlTextReader.xml b/CS2JLibrary/NetFramework/System/Xml/XmlTextReader.xml
index bd5a07e..85e19b1 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlTextReader.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlTextReader.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlTextReader</Import>
   </Imports>
   <Java>XmlTextReader</Java>
   <Name>System.Xml.XmlTextReader</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/XmlWriter.xml b/CS2JLibrary/NetFramework/System/Xml/XmlWriter.xml
index 37ced90..82bd195 100644
--- a/CS2JLibrary/NetFramework/System/Xml/XmlWriter.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/XmlWriter.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.XmlWriter</Import>
   </Imports>
   <Java>XmlWriter</Java>
   <Name>System.Xml.XmlWriter</Name>
diff --git a/CS2JLibrary/NetFramework/System/Xml/Xsl/XslCompiledTransform.xml b/CS2JLibrary/NetFramework/System/Xml/Xsl/XslCompiledTransform.xml
index 0d7a3e0..a8870e8 100644
--- a/CS2JLibrary/NetFramework/System/Xml/Xsl/XslCompiledTransform.xml
+++ b/CS2JLibrary/NetFramework/System/Xml/Xsl/XslCompiledTransform.xml
@@ -1,7 +1,7 @@
 <?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>
+    <Import>RusticiSoftware.System.Xml.Xsl.XslTransform</Import>
   </Imports>
   <Java>XslTransform</Java>
   <Name>System.Xml.Xsl.XslCompiledTransform</Name>
diff --git a/CSharpTranslator/antlr3/src/cs2j/CLR/TranslationTemplate.cs b/CSharpTranslator/antlr3/src/cs2j/CLR/TranslationTemplate.cs
index 7fde366..15491fc 100644
--- a/CSharpTranslator/antlr3/src/cs2j/CLR/TranslationTemplate.cs
+++ b/CSharpTranslator/antlr3/src/cs2j/CLR/TranslationTemplate.cs
@@ -156,9 +156,9 @@ namespace RusticiSoftware.Translator.CLR
 	// Never directly create a TranslationBase. Its a common root for translatable language entities
 	public abstract class TranslationBase : IEquatable<TranslationBase>
 	{
-		[XmlArrayItem("Import")]
 		// Java imports required to make Java translation run
 		private string[] _imports = null;
+		[XmlArrayItem("Import")]
 		public string[] Imports { 
 			get {
 				// if _java is not set then see if we have default imports, otherwise