diff --git a/base/src/org/compiere/model/MCStage.java b/base/src/org/compiere/model/MCStage.java
index 07e9b830ea..6c1949134f 100644
--- a/base/src/org/compiere/model/MCStage.java
+++ b/base/src/org/compiere/model/MCStage.java
@@ -16,10 +16,15 @@
  *****************************************************************************/
 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.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Msg;
 
 /**
  * 	Container Stage Model
diff --git a/base/src/org/compiere/model/MCStageElement.java b/base/src/org/compiere/model/MCStageElement.java
index 7e6e9010dd..21a6b8b6ba 100644
--- a/base/src/org/compiere/model/MCStageElement.java
+++ b/base/src/org/compiere/model/MCStageElement.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  * CStage Element
diff --git a/base/src/org/compiere/model/MCalendar.java b/base/src/org/compiere/model/MCalendar.java
index 0426cfc6da..ae5aa0fee9 100644
--- a/base/src/org/compiere/model/MCalendar.java
+++ b/base/src/org/compiere/model/MCalendar.java
@@ -16,9 +16,13 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Locale;
+import java.util.Properties;
+
+import org.compiere.util.CCache;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  *	Calendar Model
diff --git a/base/src/org/compiere/model/MCampaign.java b/base/src/org/compiere/model/MCampaign.java
index 76fe6d1faa..95a528818b 100644
--- a/base/src/org/compiere/model/MCampaign.java
+++ b/base/src/org/compiere/model/MCampaign.java
@@ -16,8 +16,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/MCashBook.java b/base/src/org/compiere/model/MCashBook.java
index 6132a98f25..560b314b6a 100644
--- a/base/src/org/compiere/model/MCashBook.java
+++ b/base/src/org/compiere/model/MCashBook.java
@@ -16,10 +16,15 @@
  *****************************************************************************/
 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.Iterator;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  *	Cash Book Model
diff --git a/base/src/org/compiere/model/MCashLine.java b/base/src/org/compiere/model/MCashLine.java
index 2e30dd38f9..44adefdd0c 100644
--- a/base/src/org/compiere/model/MCashLine.java
+++ b/base/src/org/compiere/model/MCashLine.java
@@ -16,10 +16,14 @@
  *****************************************************************************/
 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;
+import org.compiere.util.Msg;
 
 /**
  *	Cash Line Model
diff --git a/base/src/org/compiere/model/MChangeNotice.java b/base/src/org/compiere/model/MChangeNotice.java
index 99437778e9..e09b79e816 100644
--- a/base/src/org/compiere/model/MChangeNotice.java
+++ b/base/src/org/compiere/model/MChangeNotice.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  * 	Change Notice Model
diff --git a/base/src/org/compiere/model/MCharge.java b/base/src/org/compiere/model/MCharge.java
index b57b6c9c87..67d3a180b5 100644
--- a/base/src/org/compiere/model/MCharge.java
+++ b/base/src/org/compiere/model/MCharge.java
@@ -16,11 +16,17 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+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.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Charge Model
diff --git a/base/src/org/compiere/model/MChatEntry.java b/base/src/org/compiere/model/MChatEntry.java
index 7b209c7973..241f5c3840 100644
--- a/base/src/org/compiere/model/MChatEntry.java
+++ b/base/src/org/compiere/model/MChatEntry.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  * 	Chat Entry Model
diff --git a/base/src/org/compiere/model/MChatType.java b/base/src/org/compiere/model/MChatType.java
index 5e5c653984..92b718f378 100644
--- a/base/src/org/compiere/model/MChatType.java
+++ b/base/src/org/compiere/model/MChatType.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.CCache;
 
 /**
  * 	Chat Type Model
diff --git a/base/src/org/compiere/model/MClick.java b/base/src/org/compiere/model/MClick.java
index d6ba740448..1cca1f679d 100644
--- a/base/src/org/compiere/model/MClick.java
+++ b/base/src/org/compiere/model/MClick.java
@@ -16,12 +16,17 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+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.*;
-import org.compiere.util.*;
+import org.compiere.Adempiere;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  * 	Actual Click
diff --git a/base/src/org/compiere/model/MClickCount.java b/base/src/org/compiere/model/MClickCount.java
index 03d7c6e08b..7a25c35a3d 100644
--- a/base/src/org/compiere/model/MClickCount.java
+++ b/base/src/org/compiere/model/MClickCount.java
@@ -16,11 +16,18 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.text.*;
-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.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.ValueNamePair;
 
 /**
  * 	Click Count (header)
diff --git a/base/src/org/compiere/model/MClient.java b/base/src/org/compiere/model/MClient.java
index 0e064782b9..32cb3166bd 100644
--- a/base/src/org/compiere/model/MClient.java
+++ b/base/src/org/compiere/model/MClient.java
@@ -18,7 +18,6 @@
 package org.compiere.model;
 
 import java.io.File;
-import java.rmi.RemoteException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -29,7 +28,7 @@ import java.util.Properties;
 import java.util.logging.Level;
 
 import javax.mail.internet.InternetAddress;
-
+
 import org.compiere.db.CConnection;
 import org.compiere.interfaces.Server;
 import org.compiere.util.CCache;
diff --git a/base/src/org/compiere/model/MClientInfo.java b/base/src/org/compiere/model/MClientInfo.java
index 86154ece9b..02522177e9 100644
--- a/base/src/org/compiere/model/MClientInfo.java
+++ b/base/src/org/compiere/model/MClientInfo.java
@@ -16,11 +16,16 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.util.*;
-import java.sql.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Client Info Model
diff --git a/base/src/org/compiere/model/MClientShare.java b/base/src/org/compiere/model/MClientShare.java
index 88ac05f4cf..23ba7d86a7 100644
--- a/base/src/org/compiere/model/MClientShare.java
+++ b/base/src/org/compiere/model/MClientShare.java
@@ -16,11 +16,14 @@
  *****************************************************************************/
 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.Properties;
+import java.util.logging.Level;
 
-import org.compiere.util.*;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  * 	Client Share Info
diff --git a/base/src/org/compiere/model/MColor.java b/base/src/org/compiere/model/MColor.java
index 7bcddec6c2..8d534b2a91 100644
--- a/base/src/org/compiere/model/MColor.java
+++ b/base/src/org/compiere/model/MColor.java
@@ -16,13 +16,16 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.awt.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.plaf.*;
-import org.compiere.util.*;
+import java.awt.Color;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.plaf.CompiereColor;
+import org.compiere.util.DB;
 
 /**
  *  Color Persistent Object Model
diff --git a/base/src/org/compiere/model/MColorSchema.java b/base/src/org/compiere/model/MColorSchema.java
index 031fe5cdb2..29ed7809f3 100644
--- a/base/src/org/compiere/model/MColorSchema.java
+++ b/base/src/org/compiere/model/MColorSchema.java
@@ -16,13 +16,14 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.awt.*;
-import java.sql.*;
-import java.util.*;
-import java.math.*;
+import java.awt.Color;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
 
-import org.compiere.util.*;
-import org.compiere.print.*;
+import org.compiere.print.MPrintColor;
+import org.compiere.util.CCache;
+import org.compiere.util.Env;
 
 /**
  * 	Performance Color Schema
diff --git a/base/src/org/compiere/model/MColumn.java b/base/src/org/compiere/model/MColumn.java
index e543f41f3a..b4e7ed86a3 100644
--- a/base/src/org/compiere/model/MColumn.java
+++ b/base/src/org/compiere/model/MColumn.java
@@ -16,11 +16,18 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+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.*;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  *	Persistent Column Model
diff --git a/base/src/org/compiere/model/MColumnAccess.java b/base/src/org/compiere/model/MColumnAccess.java
index f9c1ebabf7..66c7ad9ad7 100644
--- a/base/src/org/compiere/model/MColumnAccess.java
+++ b/base/src/org/compiere/model/MColumnAccess.java
@@ -16,11 +16,13 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.util.DB;
+import org.compiere.util.Msg;
 
 /**
  *	Column Access Model
diff --git a/base/src/org/compiere/model/MCommission.java b/base/src/org/compiere/model/MCommission.java
index a1cd04c544..a27c834076 100644
--- a/base/src/org/compiere/model/MCommission.java
+++ b/base/src/org/compiere/model/MCommission.java
@@ -16,10 +16,11 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.Level;
 
 /**
  *	Model for Commission.
diff --git a/base/src/org/compiere/model/MCommissionAmt.java b/base/src/org/compiere/model/MCommissionAmt.java
index 78aed700c1..d39f7d9e19 100644
--- a/base/src/org/compiere/model/MCommissionAmt.java
+++ b/base/src/org/compiere/model/MCommissionAmt.java
@@ -16,11 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+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.DB;
+import org.compiere.util.Env;
 
 /**
  *	Commission Run Amounts
diff --git a/base/src/org/compiere/model/MCommissionDetail.java b/base/src/org/compiere/model/MCommissionDetail.java
index 2440171051..5e2841a7a2 100644
--- a/base/src/org/compiere/model/MCommissionDetail.java
+++ b/base/src/org/compiere/model/MCommissionDetail.java
@@ -16,10 +16,12 @@
  *****************************************************************************/
 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.Env;
 
 /**
  *	Commission Run Amount Detail Model
diff --git a/base/src/org/compiere/model/MCommissionLine.java b/base/src/org/compiere/model/MCommissionLine.java
index 34cc42e14e..55a7946e46 100644
--- a/base/src/org/compiere/model/MCommissionLine.java
+++ b/base/src/org/compiere/model/MCommissionLine.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.Env;
 
 
 /**
diff --git a/base/src/org/compiere/model/MCommissionRun.java b/base/src/org/compiere/model/MCommissionRun.java
index 3b9d74e8e6..bb9dfcf0e3 100644
--- a/base/src/org/compiere/model/MCommissionRun.java
+++ b/base/src/org/compiere/model/MCommissionRun.java
@@ -16,11 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+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.DB;
+import org.compiere.util.Env;
 
 /**
  *	Commission Run
diff --git a/base/src/org/compiere/model/MContactInterest.java b/base/src/org/compiere/model/MContactInterest.java
index 568c9b302c..99e8f19139 100644
--- a/base/src/org/compiere/model/MContactInterest.java
+++ b/base/src/org/compiere/model/MContactInterest.java
@@ -16,10 +16,15 @@
  *****************************************************************************/
 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.Timestamp;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
  
 /**
  *  Business Partner Contact Interest.
diff --git a/base/src/org/compiere/model/MContainer.java b/base/src/org/compiere/model/MContainer.java
index 3916e81c8a..3318bffde2 100644
--- a/base/src/org/compiere/model/MContainer.java
+++ b/base/src/org/compiere/model/MContainer.java
@@ -16,10 +16,12 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.List;
+import java.util.Properties;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  * Container Model
diff --git a/base/src/org/compiere/model/MContainerElement.java b/base/src/org/compiere/model/MContainerElement.java
index ff859bcb80..1c27c8e835 100644
--- a/base/src/org/compiere/model/MContainerElement.java
+++ b/base/src/org/compiere/model/MContainerElement.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;
 
 /**
  * CStage Element
diff --git a/base/src/org/compiere/model/MConversionRate.java b/base/src/org/compiere/model/MConversionRate.java
index 4a3081fc43..508bb96a62 100644
--- a/base/src/org/compiere/model/MConversionRate.java
+++ b/base/src/org/compiere/model/MConversionRate.java
@@ -16,12 +16,20 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.text.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.TimeUtil;
 
 /**
  *	Currency Conversion Rate Model
diff --git a/base/src/org/compiere/model/MConversionType.java b/base/src/org/compiere/model/MConversionType.java
index 390b2d5e59..d696219892 100644
--- a/base/src/org/compiere/model/MConversionType.java
+++ b/base/src/org/compiere/model/MConversionType.java
@@ -16,9 +16,11 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.CCache;
+import org.compiere.util.DB;
 
 /**
  *	Currency Conversion Type Model
diff --git a/base/src/org/compiere/model/MCostElement.java b/base/src/org/compiere/model/MCostElement.java
index 0dc363c948..b2ab1a5971 100644
--- a/base/src/org/compiere/model/MCostElement.java
+++ b/base/src/org/compiere/model/MCostElement.java
@@ -16,11 +16,18 @@
  *****************************************************************************/
 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.List;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.util.*;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  * 	Cost Element Model
diff --git a/base/src/org/compiere/model/MCostQueue.java b/base/src/org/compiere/model/MCostQueue.java
index 8156512ca3..08775f3b4a 100644
--- a/base/src/org/compiere/model/MCostQueue.java
+++ b/base/src/org/compiere/model/MCostQueue.java
@@ -16,12 +16,16 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import java.math.*;
+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;
 
 /**
  * 	Cost Queue Model
diff --git a/base/src/org/compiere/model/MCostType.java b/base/src/org/compiere/model/MCostType.java
index 1ac3515616..8700050d52 100644
--- a/base/src/org/compiere/model/MCostType.java
+++ b/base/src/org/compiere/model/MCostType.java
@@ -16,10 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
-import org.compiere.util.*;
+import org.compiere.util.Msg;
 
 /**
  * 	Cost Type Model
diff --git a/base/src/org/compiere/model/MCounterCount.java b/base/src/org/compiere/model/MCounterCount.java
index f4ed83a276..520862d158 100644
--- a/base/src/org/compiere/model/MCounterCount.java
+++ b/base/src/org/compiere/model/MCounterCount.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.util.*;
-import java.sql.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  * 	Web Counter (header)
diff --git a/base/src/org/compiere/model/MCountry.java b/base/src/org/compiere/model/MCountry.java
index 35d1d1cff9..6d9907df80 100644
--- a/base/src/org/compiere/model/MCountry.java
+++ b/base/src/org/compiere/model/MCountry.java
@@ -16,11 +16,19 @@
  *****************************************************************************/
 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.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+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.Language;
 
 /**
  *	Location Country Model (Value Object)
diff --git a/base/src/org/compiere/model/MCurrencyAcct.java b/base/src/org/compiere/model/MCurrencyAcct.java
index ad527d6ceb..ff40b7b773 100644
--- a/base/src/org/compiere/model/MCurrencyAcct.java
+++ b/base/src/org/compiere/model/MCurrencyAcct.java
@@ -16,11 +16,13 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  *	Currency Account Model