diff --git a/CS2JLibrary/NetFramework/System/DateTime.xml b/CS2JLibrary/NetFramework/System/DateTime.xml
index cd1d33b..8c7c21b 100644
--- a/CS2JLibrary/NetFramework/System/DateTime.xml
+++ b/CS2JLibrary/NetFramework/System/DateTime.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -52,7 +52,7 @@
     </Method>
     <Method>
       <Imports>
-        <Import>CS2JNet.System.*</Import>
+        <Import>CS2JNet.System.DateTimeSupport</Import>
       </Imports>
       <Java>DateTimeSupport.ToString(${this}, ${format})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Double.xml b/CS2JLibrary/NetFramework/System/Double.xml
index 28a40e9..2938d81 100644
--- a/CS2JLibrary/NetFramework/System/Double.xml
+++ b/CS2JLibrary/NetFramework/System/Double.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -107,7 +107,7 @@
     </Method>
     <Method>
       <Imports>
-        <Import>CS2JNet.System.*</Import>
+        <Import>CS2JNet.System.DoubleSupport</Import>
       </Imports>
       <Java>DoubleSupport.parse(${dStr}, ${style}, ${provider})</Java>
       <Params>
@@ -129,7 +129,7 @@
     </Method>
     <Method>
       <Imports>
-        <Import>CS2JNet.System.*</Import>
+        <Import>CS2JNet.System.DoubleSupport</Import>
       </Imports>
       <Java>DoubleSupport.ToString(${this}, ${format})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml b/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml
index fda363b..ec4b515 100644
--- a/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml
+++ b/CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -20,7 +20,7 @@
   <Methods>
     <Method>
       <Imports>
-        <Import>CS2JNet.JavaSupport.io.*</Import>
+        <Import>CS2JNet.JavaSupport.io.FilterOnlyFiles</Import>
       </Imports>
       <Java>${this:16}.listFiles(new FilterOnlyFiles())</Java>
       <Params />
@@ -29,7 +29,7 @@
     </Method>
     <Method>
       <Imports>
-        <Import>CS2JNet.JavaSupport.io.*</Import>
+        <Import>CS2JNet.JavaSupport.io.FilterOnlyDirs</Import>
       </Imports>
       <Java>${this:16}.listFiles(new FilterOnlyDirs())</Java>
       <Params />
diff --git a/CS2JLibrary/NetFramework/System/IO/File.xml b/CS2JLibrary/NetFramework/System/IO/File.xml
index 8c230ee..0a52a21 100644
--- a/CS2JLibrary/NetFramework/System/IO/File.xml
+++ b/CS2JLibrary/NetFramework/System/IO/File.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -18,7 +18,9 @@
   <Methods>
     <Method>
       <Imports>
-        <Import>java.io.*</Import>
+        <Import>java.io.BufferedWriter</Import>
+        <Import>java.io.OutputStreamWriter</Import>
+        <Import>java.io.FileOutputStream</Import>
         <Import>java.nio.charset.Charset</Import>
       </Imports>
       <Java>new BufferedWriter(new OutputStreamWriter(new FileOutputStream(${path}), Charset.forName("UTF-8")))</Java>
@@ -33,7 +35,8 @@
     </Method>
     <Method>
       <Imports>
-        <Import>java.io.*</Import>
+        <Import>java.io.FileOutputStream</Import>
+        <Import>java.io.BufferedOutputStream</Import>
       </Imports>
       <Java>new BufferedOutputStream(new FileOutputStream(${path}))</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/Stream.xml b/CS2JLibrary/NetFramework/System/IO/Stream.xml
index 3834a40..3328741 100644
--- a/CS2JLibrary/NetFramework/System/IO/Stream.xml
+++ b/CS2JLibrary/NetFramework/System/IO/Stream.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>java.io.*</Import>
+    <Import>java.io.InputStream</Import>
   </Imports>
   <Java>InputStream</Java>
   <Name>System.IO.Stream</Name>
@@ -83,7 +83,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <Import>java.io.*</Import>
+        <Import>java.io.FileInputStream</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 ed1f6e1..7306c28 100644
--- a/CS2JLibrary/NetFramework/System/IO/StreamReader.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StreamReader.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>java.io.*</Import>
+    <Import>java.io.BufferedReader</Import>
   </Imports>
   <Java>BufferedReader</Java>
   <Name>System.IO.StreamReader</Name>
@@ -25,7 +25,9 @@
     <Constructor>
       <Imports>
         <Import>CS2JNet.System.IO.StreamReader</Import>
-        <Import>java.io.*</Import>
+        <Import>java.io.BufferedReader</Import>
+        <Import>java.io.BufferedInputStream</Import>
+        <Import>java.io.FileInputStream</Import>
       </Imports>
       <Java>new BufferedReader(StreamReader.make(new BufferedInputStream(new FileInputStream(${path}))))</Java>
       <Params>
@@ -38,7 +40,9 @@
     <Constructor>
       <Imports>
         <Import>CS2JNet.System.IO.StreamReader</Import>
-        <Import>java.io.*</Import>
+        <Import>java.io.BufferedReader</Import>
+        <Import>java.io.BufferedInputStream</Import>
+        <Import>java.io.FileInputStream</Import>
       </Imports>
       <Java>new BufferedReader(StreamReader.make(new BufferedInputStream(new FileInputStream(${path}), ${encoding})))</Java>
       <Params>
@@ -55,7 +59,8 @@
     <Constructor>
       <Imports>
         <Import>CS2JNet.System.IO.StreamReader</Import>
-        <Import>java.io.*</Import>
+        <Import>java.io.BufferedReader</Import>
+        <Import>java.io.BufferedInputStream</Import>
       </Imports>
       <Java>new BufferedReader(StreamReader.make(new BufferedInputStream(${stream}), ${encoding}))</Java>
       <Params>
@@ -73,7 +78,8 @@
       <Imports>
         <Import>CS2JNet.System.IO.StreamReader</Import>
         <Import>CS2JNet.System.Text.EncodingSupport</Import>
-        <Import>java.io.*</Import>
+        <Import>java.io.BufferedReader</Import>
+        <Import>java.io.BufferedInputStream</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 bf9a8e5..96e3ade 100644
--- a/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -25,6 +25,7 @@
     <Constructor>
       <Imports>
         <Import>java.io.BufferedWriter</Import>
+        <Import>java.io.FileWriter</Import>
       </Imports>
       <Java>new BufferedWriter(new FileWriter(${path}))</Java>
       <Params>
@@ -37,6 +38,7 @@
     <Constructor>
       <Imports>
         <Import>java.io.BufferedWriter</Import>
+        <Import>java.io.FileWriter</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 fdb7ca2..48a3c55 100644
--- a/CS2JLibrary/NetFramework/System/IO/StringReader.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StringReader.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>java.io.*</Import>
+    <Import>java.io.StringReader</Import>
   </Imports>
   <Java>StringReader</Java>
   <Name>System.IO.StringReader</Name>
@@ -24,7 +24,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <Import>java.io.*</Import>
+        <Import>java.io.StringReader</Import>
       </Imports>
       <Java>new StringReader(${s})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/IO/TextReader.xml b/CS2JLibrary/NetFramework/System/IO/TextReader.xml
index 885d487..6b33502 100644
--- a/CS2JLibrary/NetFramework/System/IO/TextReader.xml
+++ b/CS2JLibrary/NetFramework/System/IO/TextReader.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>java.io.*</Import>
+    <Import>java.io.BufferedReader</Import>
   </Imports>
   <Java>BufferedReader</Java>
   <Name>System.IO.TextReader</Name>
diff --git a/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml b/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml
index a87a29b..5d3ff03 100644
--- a/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml
+++ b/CS2JLibrary/NetFramework/System/Net/HttpWebRequest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>java.net.*</Import>
+    <Import>java.net.HttpURLConnection</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 75ba932..959821e 100644
--- a/CS2JLibrary/NetFramework/System/Net/HttpWebResponse.xml
+++ b/CS2JLibrary/NetFramework/System/Net/HttpWebResponse.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>java.net.*</Import>
+    <Import>java.net.HttpURLConnection</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 cc7191c..f2b661a 100644
--- a/CS2JLibrary/NetFramework/System/Net/Mail/MailAddress.xml
+++ b/CS2JLibrary/NetFramework/System/Net/Mail/MailAddress.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -24,7 +24,7 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <Import>java.io.*</Import>
+        <Import>javax.mail.internet.InternetAddress</Import>
       </Imports>
       <Java>new InternetAddress(${address})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Net/WebRequest.xml b/CS2JLibrary/NetFramework/System/Net/WebRequest.xml
index d400a62..7d470c4 100644
--- a/CS2JLibrary/NetFramework/System/Net/WebRequest.xml
+++ b/CS2JLibrary/NetFramework/System/Net/WebRequest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,6 @@
 -->
 <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>
-    <Import>java.net.*</Import>
   </Imports>
   <Java>** NONE System.Net.WebRequest **</Java>
   <Name>System.Net.WebRequest</Name>
diff --git a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml
index 8dce62b..4d1430c 100644
--- a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml
+++ b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Capture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,6 @@
 -->
 <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>
-    <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 58f8348..1b7e373 100644
--- a/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Group.xml
+++ b/CS2JLibrary/NetFramework/System/Text/RegularExpressions/Group.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>java.util.regex.*</Import>
+    <Import>java.util.regex.Pattern</Import>
   </Imports>
   <Java>Pattern</Java>
   <Name>System.Text.RegularExpressions.Group</Name>
@@ -39,14 +39,14 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <Import>java.util.regex.*</Import>
+        <Import>java.util.regex.Pattern</Import>
       </Imports>
       <Java>new Pattern()</Java>
       <Params />
     </Constructor>
     <Constructor>
       <Imports>
-        <Import>java.util.regex.*</Import>
+        <Import>java.util.regex.Pattern</Import>
       </Imports>
       <Java>new Pattern(${pattern})</Java>
       <Params>
diff --git a/CS2JLibrary/NetFramework/System/Uri.xml b/CS2JLibrary/NetFramework/System/Uri.xml
index bf04fdf..d22e746 100644
--- a/CS2JLibrary/NetFramework/System/Uri.xml
+++ b/CS2JLibrary/NetFramework/System/Uri.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>java.net.*</Import>
+    <Import>java.net.URI</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 47700e7..bc7dc37 100644
--- a/CS2JLibrary/NetFramework/System/Web/HttpRequest.xml
+++ b/CS2JLibrary/NetFramework/System/Web/HttpRequest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>javax.servlet.http.*</Import>
+    <Import>javax.servlet.http.HttpServletRequest</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 5eab231..95e4e31 100644
--- a/CS2JLibrary/NetFramework/System/Web/HttpResponse.xml
+++ b/CS2JLibrary/NetFramework/System/Web/HttpResponse.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>javax.servlet.http.*</Import>
+    <Import>javax.servlet.http.HttpServletResponse</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 53728fa..b56266b 100644
--- a/CS2JLibrary/NetFramework/System/Web/HttpUtility.xml
+++ b/CS2JLibrary/NetFramework/System/Web/HttpUtility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,7 +9,7 @@
 -->
 <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>
-    <Import>java.net.*</Import>
+    <Import>java.net.URLEncoder</Import>
   </Imports>
   <Java>URLEncoder</Java>
   <Name>System.Web.HttpUtility</Name>