diff --git a/base/src/org/compiere/model/MIssue.java b/base/src/org/compiere/model/MIssue.java
index 4f4ab5385d..9b12abe352 100644
--- a/base/src/org/compiere/model/MIssue.java
+++ b/base/src/org/compiere/model/MIssue.java
@@ -16,14 +16,33 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
-import java.net.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.CharArrayWriter;
+import java.io.FileNotFoundException;
+import java.io.InputStreamReader;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.PrintWriter;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.sql.ResultSet;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
 
-import org.compiere.*;
-import org.compiere.util.*;
+import org.compiere.Adempiere;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Secure;
 
 /**
  * 	Issue Report Model
diff --git a/base/src/org/compiere/model/MIssueProject.java b/base/src/org/compiere/model/MIssueProject.java
index 1b574a301a..c59d886e2f 100644
--- a/base/src/org/compiere/model/MIssueProject.java
+++ b/base/src/org/compiere/model/MIssueProject.java
@@ -16,10 +16,13 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  * 	Issue Project (and Asset Link)
diff --git a/base/src/org/compiere/model/MIssueSystem.java b/base/src/org/compiere/model/MIssueSystem.java
index dac61725d2..31e380da5e 100644
--- a/base/src/org/compiere/model/MIssueSystem.java
+++ b/base/src/org/compiere/model/MIssueSystem.java
@@ -16,10 +16,13 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  * 	Issue System Model
diff --git a/base/src/org/compiere/model/MIssueUser.java b/base/src/org/compiere/model/MIssueUser.java
index 40a218189e..601dcb9456 100644
--- a/base/src/org/compiere/model/MIssueUser.java
+++ b/base/src/org/compiere/model/MIssueUser.java
@@ -16,10 +16,13 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  * 	Issue User Model
diff --git a/base/src/org/compiere/model/MJournal.java b/base/src/org/compiere/model/MJournal.java
index 1f8faf5b80..1046e7fb7d 100644
--- a/base/src/org/compiere/model/MJournal.java
+++ b/base/src/org/compiere/model/MJournal.java
@@ -16,13 +16,19 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
+import java.io.File;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.process.DocAction;
+import org.compiere.process.DocumentEngine;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  *  GL Journal Model
diff --git a/base/src/org/compiere/model/MJournalBatch.java b/base/src/org/compiere/model/MJournalBatch.java
index 9c1d08b2ad..ae039d5cce 100644
--- a/base/src/org/compiere/model/MJournalBatch.java
+++ b/base/src/org/compiere/model/MJournalBatch.java
@@ -16,13 +16,21 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
+import java.io.File;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.process.DocAction;
+import org.compiere.process.DocumentEngine;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  *  Journal Batch Model
diff --git a/base/src/org/compiere/model/MJournalLine.java b/base/src/org/compiere/model/MJournalLine.java
index 82b22822b8..42f0f3d62e 100644
--- a/base/src/org/compiere/model/MJournalLine.java
+++ b/base/src/org/compiere/model/MJournalLine.java
@@ -16,10 +16,13 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.Properties;
+
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Journal Line Model
diff --git a/base/src/org/compiere/model/MKCategory.java b/base/src/org/compiere/model/MKCategory.java
index c17defb8f7..91121e76d6 100644
--- a/base/src/org/compiere/model/MKCategory.java
+++ b/base/src/org/compiere/model/MKCategory.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 public class MKCategory extends X_K_Category
diff --git a/base/src/org/compiere/model/MLandedCost.java b/base/src/org/compiere/model/MLandedCost.java
index 92ceefc913..de132423ff 100644
--- a/base/src/org/compiere/model/MLandedCost.java
+++ b/base/src/org/compiere/model/MLandedCost.java
@@ -16,11 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Msg;
 
 /**
  * 	Landed Cost Model
diff --git a/base/src/org/compiere/model/MLandedCostAllocation.java b/base/src/org/compiere/model/MLandedCostAllocation.java
index 53dd54c823..6fcb128cd8 100644
--- a/base/src/org/compiere/model/MLandedCostAllocation.java
+++ b/base/src/org/compiere/model/MLandedCostAllocation.java
@@ -16,12 +16,16 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  * 	Landed Cost Allocation Model
diff --git a/base/src/org/compiere/model/MLdapAccess.java b/base/src/org/compiere/model/MLdapAccess.java
index 1f62ee6ebf..bd0ef48837 100755
--- a/base/src/org/compiere/model/MLdapAccess.java
+++ b/base/src/org/compiere/model/MLdapAccess.java
@@ -15,8 +15,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 /**
diff --git a/base/src/org/compiere/model/MLdapProcessorLog.java b/base/src/org/compiere/model/MLdapProcessorLog.java
index 7fcfdd3d5b..9c3f132490 100755
--- a/base/src/org/compiere/model/MLdapProcessorLog.java
+++ b/base/src/org/compiere/model/MLdapProcessorLog.java
@@ -15,8 +15,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 /**
diff --git a/base/src/org/compiere/model/MLocation.java b/base/src/org/compiere/model/MLocation.java
index 76f6fd4489..96bcfb540b 100644
--- a/base/src/org/compiere/model/MLocation.java
+++ b/base/src/org/compiere/model/MLocation.java
@@ -16,10 +16,18 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Comparator;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Util;
 
 /**
  *	Loaction (Address)
diff --git a/base/src/org/compiere/model/MLocationLookup.java b/base/src/org/compiere/model/MLocationLookup.java
index 654b24d7f7..c10609b884 100644
--- a/base/src/org/compiere/model/MLocationLookup.java
+++ b/base/src/org/compiere/model/MLocationLookup.java
@@ -16,11 +16,14 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.util.DisplayType;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.NamePair;
 
 /**
  *	Address Loaction Lookup Model.
diff --git a/base/src/org/compiere/model/MLookup.java b/base/src/org/compiere/model/MLookup.java
index c338bdfc1d..aee32c938f 100644
--- a/base/src/org/compiere/model/MLookup.java
+++ b/base/src/org/compiere/model/MLookup.java
@@ -16,12 +16,23 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.io.Serializable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.logging.Level;
 
-import org.compiere.util.*;
+import org.compiere.util.CLogMgt;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Ini;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.NamePair;
+import org.compiere.util.ValueNamePair;
 
 /**
  *	An intelligent MutableComboBoxModel, which determines what can be cached.
diff --git a/base/src/org/compiere/model/MLookupCache.java b/base/src/org/compiere/model/MLookupCache.java
index 8df4eed340..3f43993954 100644
--- a/base/src/org/compiere/model/MLookupCache.java
+++ b/base/src/org/compiere/model/MLookupCache.java
@@ -16,8 +16,12 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.util.*;
-import org.compiere.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
 
 /**
  *  MLookup Data Cache.
diff --git a/base/src/org/compiere/model/MLookupFactory.java b/base/src/org/compiere/model/MLookupFactory.java
index 04efa5c58b..182a4058f7 100644
--- a/base/src/org/compiere/model/MLookupFactory.java
+++ b/base/src/org/compiere/model/MLookupFactory.java
@@ -16,10 +16,20 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CCache;
+import org.compiere.util.CLogMgt;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Language;
 
 /**
  *  Create MLookups
diff --git a/base/src/org/compiere/model/MLookupInfo.java b/base/src/org/compiere/model/MLookupInfo.java
index b246cc5537..311fe97881 100644
--- a/base/src/org/compiere/model/MLookupInfo.java
+++ b/base/src/org/compiere/model/MLookupInfo.java
@@ -16,11 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.io.Serializable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  *  Info Class for Lookup SQL (ValueObject)
diff --git a/base/src/org/compiere/model/MLotCtl.java b/base/src/org/compiere/model/MLotCtl.java
index 09cef07cca..e4a156bd61 100644
--- a/base/src/org/compiere/model/MLotCtl.java
+++ b/base/src/org/compiere/model/MLotCtl.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  *	Lot Control Model