diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java
index 261275993e..28dd701ff4 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java
@@ -92,7 +92,7 @@ public class CalloutAssignment extends CalloutEngine
 		if (log.isLoggable(Level.FINE)) log.fine("S_ResourceAssignment_ID=" + S_ResourceAssignment_ID + " - M_Product_ID=" + M_Product_ID);
 		if (M_Product_ID != 0)
 		{
-			mTab.setValue ("M_Product_ID", new Integer (M_Product_ID));
+			mTab.setValue ("M_Product_ID", Integer.valueOf(M_Product_ID));
 			if (Description != null)
 				Name += " (" + Description + ")";
 			if (!".".equals(Name))
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java
index 260a0de923..66e4dae9a4 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java
@@ -542,7 +542,7 @@ public class CalloutInOut extends CalloutEngine
 
 		//	Set UOM/Locator/Qty
 		MProduct product = MProduct.get(ctx, M_Product_ID.intValue());
-		mTab.setValue("C_UOM_ID", new Integer (product.getC_UOM_ID()));
+		mTab.setValue("C_UOM_ID", Integer.valueOf(product.getC_UOM_ID()));
 		BigDecimal QtyEntered = (BigDecimal)mTab.getValue("QtyEntered");
 		mTab.setValue("MovementQty", QtyEntered);
 		if (M_Locator_ID != 0)
@@ -551,7 +551,7 @@ public class CalloutInOut extends CalloutEngine
 		{
 			MLocator loc = MLocator.get(ctx, product.getM_Locator_ID());
 			if (M_Warehouse_ID == loc.getM_Warehouse_ID())
-				mTab.setValue("M_Locator_ID", new Integer (product.getM_Locator_ID()));
+				mTab.setValue("M_Locator_ID", Integer.valueOf(product.getM_Locator_ID()));
 			else
 				if (log.isLoggable(Level.FINE)) log.fine("No Locator for M_Product_ID=" + M_Product_ID + " and M_Warehouse_ID=" + M_Warehouse_ID);
 		}
@@ -704,7 +704,7 @@ public class CalloutInOut extends CalloutEngine
 			if (selectedM_Locator_ID != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Selected M_Locator_ID=" + selectedM_Locator_ID);
-				mTab.setValue("M_Locator_ID", new Integer (selectedM_Locator_ID));
+				mTab.setValue("M_Locator_ID", Integer.valueOf(selectedM_Locator_ID));
 			}
 		}
 		MAttributeSetInstance asi = MAttributeSetInstance.get(ctx, M_ASI_ID.intValue(), 0);
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java
index 34a5a9d048..746809fe8a 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java
@@ -94,9 +94,9 @@ public class CalloutPayment extends CalloutEngine
 			rs = pstmt.executeQuery ();
 			if (rs.next ())
 			{
-				mTab.setValue ("C_BPartner_ID", new Integer (rs.getInt (1)));
+				mTab.setValue ("C_BPartner_ID", Integer.valueOf(rs.getInt (1)));
 				int C_Currency_ID = rs.getInt (2); // Set Invoice Currency
-				mTab.setValue ("C_Currency_ID", new Integer (C_Currency_ID));
+				mTab.setValue ("C_Currency_ID", Integer.valueOf(C_Currency_ID));
 				//
 				BigDecimal InvoiceOpen = rs.getBigDecimal (3); // Set Invoice
 				// OPen Amount
@@ -170,9 +170,9 @@ public class CalloutPayment extends CalloutEngine
 			rs = pstmt.executeQuery ();
 			if (rs.next ())
 			{
-				mTab.setValue ("C_BPartner_ID", new Integer (rs.getInt (1)));
+				mTab.setValue ("C_BPartner_ID", Integer.valueOf(rs.getInt (1)));
 				int C_Currency_ID = rs.getInt (2); // Set Order Currency
-				mTab.setValue ("C_Currency_ID", new Integer (C_Currency_ID));
+				mTab.setValue ("C_Currency_ID", Integer.valueOf(C_Currency_ID));
 				//
 				BigDecimal GrandTotal = rs.getBigDecimal (3); // Set Pay
 				// Amount
diff --git a/org.adempiere.base.process/src/org/compiere/process/SendMailText.java b/org.adempiere.base.process/src/org/compiere/process/SendMailText.java
index de4e11b741..a5d8688831 100644
--- a/org.adempiere.base.process/src/org/compiere/process/SendMailText.java
+++ b/org.adempiere.base.process/src/org/compiere/process/SendMailText.java
@@ -252,7 +252,7 @@ public class SendMailText extends SvrProcess
 	private Boolean sendIndividualMail (String Name, int AD_User_ID, StringBuilder unsubscribe)
 	{
 		//	Prevent two email
-		Integer ii = new Integer (AD_User_ID);
+		Integer ii = Integer.valueOf(AD_User_ID);
 		if (m_list.contains(ii))
 			return null;
 		m_list.add(ii);
diff --git a/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java b/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java
index cd96218a8b..420f8857d4 100644
--- a/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java
+++ b/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java
@@ -368,7 +368,7 @@ public class RequestEventHandler extends AbstractEventHandler implements Managed
 				}
 
 				//	Check duplicate receivers
-				Integer ii = new Integer (AD_User_ID);
+				Integer ii = Integer.valueOf(AD_User_ID);
 				if (userList.contains(ii))
 					continue;
 				userList.add(ii);
diff --git a/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java b/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java
index 47c7bde908..7e48939ad3 100644
--- a/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java
+++ b/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java
@@ -57,7 +57,7 @@ public class MAcctSchemaElement extends X_C_AcctSchema_Element
 	 */
 	public static MAcctSchemaElement[] getAcctSchemaElements (MAcctSchema as)
 	{
-		Integer key = new Integer (as.getC_AcctSchema_ID());
+		Integer key = Integer.valueOf(as.getC_AcctSchema_ID());
 		MAcctSchemaElement[] retValue = (MAcctSchemaElement[]) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MAttributeSet.java b/org.adempiere.base/src/org/compiere/model/MAttributeSet.java
index 292a0071b8..a03dd23c34 100644
--- a/org.adempiere.base/src/org/compiere/model/MAttributeSet.java
+++ b/org.adempiere.base/src/org/compiere/model/MAttributeSet.java
@@ -51,7 +51,7 @@ public class MAttributeSet extends X_M_AttributeSet
 	 */
 	public static MAttributeSet get (Properties ctx, int M_AttributeSet_ID)
 	{
-		Integer key = new Integer (M_AttributeSet_ID);
+		Integer key = Integer.valueOf(M_AttributeSet_ID);
 		MAttributeSet retValue = (MAttributeSet) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MBOM.java b/org.adempiere.base/src/org/compiere/model/MBOM.java
index a011ddc982..e2ccd91c9e 100644
--- a/org.adempiere.base/src/org/compiere/model/MBOM.java
+++ b/org.adempiere.base/src/org/compiere/model/MBOM.java
@@ -45,7 +45,7 @@ public class MBOM extends X_M_BOM
 	 */
 	public static MBOM get (Properties ctx, int M_BOM_ID)
 	{
-		Integer key = new Integer (M_BOM_ID);
+		Integer key = Integer.valueOf(M_BOM_ID);
 		MBOM retValue = (MBOM) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MBPGroup.java b/org.adempiere.base/src/org/compiere/model/MBPGroup.java
index 9d8ae48efc..86813e92c9 100644
--- a/org.adempiere.base/src/org/compiere/model/MBPGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/MBPGroup.java
@@ -49,7 +49,7 @@ public class MBPGroup extends X_C_BP_Group
 	 */
 	public static MBPGroup get (Properties ctx, int C_BP_Group_ID)
 	{
-		Integer key = new Integer (C_BP_Group_ID);
+		Integer key = Integer.valueOf(C_BP_Group_ID);
 		MBPGroup retValue = (MBPGroup) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -82,7 +82,7 @@ public class MBPGroup extends X_C_BP_Group
 	public static MBPGroup getDefault (Properties ctx)
 	{
 		int AD_Client_ID = Env.getAD_Client_ID(ctx);
-		Integer key = new Integer (AD_Client_ID);
+		Integer key = Integer.valueOf(AD_Client_ID);
 		MBPGroup retValue = (MBPGroup) s_cacheDefault.get (key);
 		if (retValue != null)
 			return retValue;
@@ -141,7 +141,7 @@ public class MBPGroup extends X_C_BP_Group
 			if (rs.next ())
 			{
 				retValue = new MBPGroup (ctx, rs, null);
-				Integer key = new Integer (retValue.getC_BP_Group_ID());
+				Integer key = Integer.valueOf(retValue.getC_BP_Group_ID());
 				if (retValue.get_ID () != 0)
 					s_cache.put (key, retValue);
 			}
diff --git a/org.adempiere.base/src/org/compiere/model/MBPartner.java b/org.adempiere.base/src/org/compiere/model/MBPartner.java
index 7cdff9a3a9..d0df6787b8 100644
--- a/org.adempiere.base/src/org/compiere/model/MBPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/MBPartner.java
@@ -660,7 +660,7 @@ public class MBPartner extends X_C_BPartner
 	 */
 	public void setPrimaryC_BPartner_Location_ID(int C_BPartner_Location_ID)
 	{
-		m_primaryC_BPartner_Location_ID = new Integer (C_BPartner_Location_ID);
+		m_primaryC_BPartner_Location_ID = Integer.valueOf(C_BPartner_Location_ID);
 	}	//	setPrimaryC_BPartner_Location_ID
 	
 	/**
@@ -669,7 +669,7 @@ public class MBPartner extends X_C_BPartner
 	 */
 	public void setPrimaryAD_User_ID(int AD_User_ID)
 	{
-		m_primaryAD_User_ID = new Integer (AD_User_ID);
+		m_primaryAD_User_ID = Integer.valueOf(AD_User_ID);
 	}	//	setPrimaryAD_User_ID
 	
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MBank.java b/org.adempiere.base/src/org/compiere/model/MBank.java
index e3b8c9afc7..93e3c4ec04 100644
--- a/org.adempiere.base/src/org/compiere/model/MBank.java
+++ b/org.adempiere.base/src/org/compiere/model/MBank.java
@@ -43,7 +43,7 @@ public class MBank extends X_C_Bank
 	 */
 	public static MBank get (Properties ctx, int C_Bank_ID)
 	{
-		Integer key = new Integer (C_Bank_ID);
+		Integer key = Integer.valueOf(C_Bank_ID);
 		MBank retValue = (MBank)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MBankAccount.java b/org.adempiere.base/src/org/compiere/model/MBankAccount.java
index 9bb98fca78..086ef6f5b6 100644
--- a/org.adempiere.base/src/org/compiere/model/MBankAccount.java
+++ b/org.adempiere.base/src/org/compiere/model/MBankAccount.java
@@ -47,7 +47,7 @@ public class MBankAccount extends X_C_BankAccount
 	 */
 	public static MBankAccount get (Properties ctx, int C_BankAccount_ID)
 	{
-		Integer key = new Integer (C_BankAccount_ID);
+		Integer key = Integer.valueOf(C_BankAccount_ID);
 		MBankAccount retValue = (MBankAccount) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MCalendar.java b/org.adempiere.base/src/org/compiere/model/MCalendar.java
index 2f20ef7649..34f149e340 100644
--- a/org.adempiere.base/src/org/compiere/model/MCalendar.java
+++ b/org.adempiere.base/src/org/compiere/model/MCalendar.java
@@ -46,7 +46,7 @@ public class MCalendar extends X_C_Calendar
 	 */
 	public static MCalendar get (Properties ctx, int C_Calendar_ID)
 	{
-		Integer key = new Integer (C_Calendar_ID);
+		Integer key = Integer.valueOf(C_Calendar_ID);
 		MCalendar retValue = (MCalendar) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MCashBook.java b/org.adempiere.base/src/org/compiere/model/MCashBook.java
index d486d503e2..1a02dece78 100644
--- a/org.adempiere.base/src/org/compiere/model/MCashBook.java
+++ b/org.adempiere.base/src/org/compiere/model/MCashBook.java
@@ -57,7 +57,7 @@ public class MCashBook extends X_C_CashBook
 	 */
 	public static MCashBook get(Properties ctx, int C_CashBook_ID, String trxName)
 	{
-		Integer key = new Integer (C_CashBook_ID);
+		Integer key = Integer.valueOf(C_CashBook_ID);
 		MCashBook retValue = (MCashBook) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -93,7 +93,7 @@ public class MCashBook extends X_C_CashBook
 		.first();
 		if (retValue!=null)
 			{
-				Integer key = new Integer (retValue.getC_CashBook_ID());
+				Integer key = Integer.valueOf(retValue.getC_CashBook_ID());
 				s_cache.put (key, retValue);
 			}
 		return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MCharge.java b/org.adempiere.base/src/org/compiere/model/MCharge.java
index 2432e6a13e..9b3133053e 100644
--- a/org.adempiere.base/src/org/compiere/model/MCharge.java
+++ b/org.adempiere.base/src/org/compiere/model/MCharge.java
@@ -87,7 +87,7 @@ public class MCharge extends X_C_Charge
 	 */
 	public static MCharge get (Properties ctx, int C_Charge_ID)
 	{
-		Integer key = new Integer (C_Charge_ID);
+		Integer key = Integer.valueOf(C_Charge_ID);
 		MCharge retValue = (MCharge)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MChatType.java b/org.adempiere.base/src/org/compiere/model/MChatType.java
index 1dac912ea0..71a2daa810 100644
--- a/org.adempiere.base/src/org/compiere/model/MChatType.java
+++ b/org.adempiere.base/src/org/compiere/model/MChatType.java
@@ -42,7 +42,7 @@ public class MChatType extends X_CM_ChatType
 	 */
 	public static MChatType get (Properties ctx, int CM_ChatType_ID)
 	{
-		Integer key = new Integer (CM_ChatType_ID);
+		Integer key = Integer.valueOf(CM_ChatType_ID);
 		MChatType retValue = (MChatType)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MCity.java b/org.adempiere.base/src/org/compiere/model/MCity.java
index ada89eebbc..0cb3c8701c 100644
--- a/org.adempiere.base/src/org/compiere/model/MCity.java
+++ b/org.adempiere.base/src/org/compiere/model/MCity.java
@@ -46,7 +46,7 @@ public class MCity extends X_C_City
 	 */
 	public static MCity get (Properties ctx, int C_City_ID)
 	{
-		Integer key = new Integer (C_City_ID);
+		Integer key = Integer.valueOf(C_City_ID);
 		MCity r = s_Cities.get(key);
 		if (r != null)
 			return r;
diff --git a/org.adempiere.base/src/org/compiere/model/MClient.java b/org.adempiere.base/src/org/compiere/model/MClient.java
index 21589b1d96..569744b792 100644
--- a/org.adempiere.base/src/org/compiere/model/MClient.java
+++ b/org.adempiere.base/src/org/compiere/model/MClient.java
@@ -66,7 +66,7 @@ public class MClient extends X_AD_Client
 	 */
 	public static MClient get (Properties ctx, int AD_Client_ID)
 	{
-		Integer key = new Integer (AD_Client_ID);
+		Integer key = Integer.valueOf(AD_Client_ID);
 		MClient client = (MClient)s_cache.get(key);
 		if (client != null)
 			return client;
@@ -97,7 +97,7 @@ public class MClient extends X_AD_Client
 		.setOrderBy(orderBy)
 		.list();
 		for(MClient client:list ){
-			s_cache.put (new Integer (client.getAD_Client_ID()), client);
+			s_cache.put (Integer.valueOf(client.getAD_Client_ID()), client);
 		}
 		MClient[] retValue = new MClient[list.size ()];
 		list.toArray (retValue);
diff --git a/org.adempiere.base/src/org/compiere/model/MClientInfo.java b/org.adempiere.base/src/org/compiere/model/MClientInfo.java
index 49e44cd991..9e1fe9f94b 100644
--- a/org.adempiere.base/src/org/compiere/model/MClientInfo.java
+++ b/org.adempiere.base/src/org/compiere/model/MClientInfo.java
@@ -61,7 +61,7 @@ public class MClientInfo extends X_AD_ClientInfo
 	 */
 	public static MClientInfo get (Properties ctx, int AD_Client_ID, String trxName)
 	{
-		Integer key = new Integer (AD_Client_ID);
+		Integer key = Integer.valueOf(AD_Client_ID);
 		MClientInfo info = (MClientInfo)s_cache.get(key);
 		if (info != null)
 			return info;
diff --git a/org.adempiere.base/src/org/compiere/model/MColorSchema.java b/org.adempiere.base/src/org/compiere/model/MColorSchema.java
index e69810a679..efecf26977 100644
--- a/org.adempiere.base/src/org/compiere/model/MColorSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/MColorSchema.java
@@ -88,7 +88,7 @@ public class MColorSchema extends X_PA_ColorSchema
 			retValue.setDefault();
 			return retValue;
 		}
-		Integer key = new Integer (PA_ColorSchema_ID);
+		Integer key = Integer.valueOf(PA_ColorSchema_ID);
 		MColorSchema retValue = (MColorSchema)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MColumn.java b/org.adempiere.base/src/org/compiere/model/MColumn.java
index 54b99947d4..93dd0e0a67 100644
--- a/org.adempiere.base/src/org/compiere/model/MColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/MColumn.java
@@ -66,7 +66,7 @@ public class MColumn extends X_AD_Column
 	 */
 	public static MColumn get(Properties ctx, int AD_Column_ID, String trxName)
 	{
-		Integer key = new Integer (AD_Column_ID);
+		Integer key = Integer.valueOf(AD_Column_ID);
 		MColumn retValue = (MColumn) s_cache.get (key);
 		if (retValue != null) {
 			retValue.set_TrxName(trxName);
diff --git a/org.adempiere.base/src/org/compiere/model/MConversionType.java b/org.adempiere.base/src/org/compiere/model/MConversionType.java
index eff54e7928..1fc540b595 100644
--- a/org.adempiere.base/src/org/compiere/model/MConversionType.java
+++ b/org.adempiere.base/src/org/compiere/model/MConversionType.java
@@ -52,7 +52,7 @@ public class MConversionType extends X_C_ConversionType
 	public static int getDefault (int AD_Client_ID)
 	{
 		//	Try Cache
-		Integer key = new Integer (AD_Client_ID);
+		Integer key = Integer.valueOf(AD_Client_ID);
 		Integer ii = (Integer)s_cache.get(key);
 		if (ii != null)
 			return ii.intValue();
diff --git a/org.adempiere.base/src/org/compiere/model/MCostElement.java b/org.adempiere.base/src/org/compiere/model/MCostElement.java
index a6b840a5cd..f5ee4f7620 100644
--- a/org.adempiere.base/src/org/compiere/model/MCostElement.java
+++ b/org.adempiere.base/src/org/compiere/model/MCostElement.java
@@ -186,7 +186,7 @@ public class MCostElement extends X_M_CostElement
 	 */
 	public static MCostElement get (Properties ctx, int M_CostElement_ID)
 	{
-		Integer key = new Integer (M_CostElement_ID);
+		Integer key = Integer.valueOf(M_CostElement_ID);
 		MCostElement retValue = (MCostElement) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java b/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java
index 292baccabf..b17dfc06f5 100644
--- a/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java
@@ -50,7 +50,7 @@ public class MDiscountSchema extends X_M_DiscountSchema
 	 */
 	public static MDiscountSchema get (Properties ctx, int M_DiscountSchema_ID)
 	{
-		Integer key = new Integer (M_DiscountSchema_ID);
+		Integer key = Integer.valueOf(M_DiscountSchema_ID);
 		MDiscountSchema retValue = (MDiscountSchema) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MDistribution.java b/org.adempiere.base/src/org/compiere/model/MDistribution.java
index 963dc65f67..d3cb7d288e 100644
--- a/org.adempiere.base/src/org/compiere/model/MDistribution.java
+++ b/org.adempiere.base/src/org/compiere/model/MDistribution.java
@@ -153,7 +153,7 @@ public class MDistribution extends X_GL_Distribution
 	 */
 	public static MDistribution[] get (Properties ctx, int Account_ID)
 	{
-		Integer key = new Integer (Account_ID);
+		Integer key = Integer.valueOf(Account_ID);
 		MDistribution[] retValue = (MDistribution[])s_accounts.get(key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java b/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java
index 07e560db8c..c1514643d7 100644
--- a/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java
+++ b/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java
@@ -90,7 +90,7 @@ public class MDocTypeCounter extends X_C_DocTypeCounter
 	 */
 	public static MDocTypeCounter getCounterDocType (Properties ctx, int C_DocType_ID)
 	{
-		Integer key = new Integer (C_DocType_ID);
+		Integer key = Integer.valueOf(C_DocType_ID);
 		MDocTypeCounter retValue = (MDocTypeCounter)s_counter.get(key);
 		if (retValue != null)
 			return retValue;
@@ -141,7 +141,7 @@ public class MDocTypeCounter extends X_C_DocTypeCounter
 	 */
 	public static MDocTypeCounter get (Properties ctx, int C_DocTypeCounter_ID, String trxName)
 	{
-		Integer key = new Integer (C_DocTypeCounter_ID);
+		Integer key = Integer.valueOf(C_DocTypeCounter_ID);
 		MDocTypeCounter retValue = (MDocTypeCounter) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MGLCategory.java b/org.adempiere.base/src/org/compiere/model/MGLCategory.java
index af392f5d7e..cab8f91794 100644
--- a/org.adempiere.base/src/org/compiere/model/MGLCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/MGLCategory.java
@@ -48,7 +48,7 @@ public class MGLCategory extends X_GL_Category
 	 */
 	public static MGLCategory get (Properties ctx, int GL_Category_ID)
 	{
-		Integer key = new Integer (GL_Category_ID);
+		Integer key = Integer.valueOf(GL_Category_ID);
 		MGLCategory retValue = (MGLCategory)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MGroup.java b/org.adempiere.base/src/org/compiere/model/MGroup.java
index c2f602a7b1..1425a9c8e7 100644
--- a/org.adempiere.base/src/org/compiere/model/MGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/MGroup.java
@@ -42,7 +42,7 @@ public class MGroup extends X_R_Group
 	 */
 	public static MGroup get (Properties ctx, int R_Group_ID)
 	{
-		Integer key = new Integer (R_Group_ID);
+		Integer key = Integer.valueOf(R_Group_ID);
 		MGroup retValue = (MGroup) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MHierarchy.java b/org.adempiere.base/src/org/compiere/model/MHierarchy.java
index dd1120eb6f..9200d66ada 100644
--- a/org.adempiere.base/src/org/compiere/model/MHierarchy.java
+++ b/org.adempiere.base/src/org/compiere/model/MHierarchy.java
@@ -42,7 +42,7 @@ public class MHierarchy extends X_PA_Hierarchy
 	 */
 	public static MHierarchy get (Properties ctx, int PA_Hierarchy_ID)
 	{
-		Integer key = new Integer (PA_Hierarchy_ID);
+		Integer key = Integer.valueOf(PA_Hierarchy_ID);
 		MHierarchy retValue = (MHierarchy)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MImage.java b/org.adempiere.base/src/org/compiere/model/MImage.java
index 2f52c87d36..b0f965684a 100644
--- a/org.adempiere.base/src/org/compiere/model/MImage.java
+++ b/org.adempiere.base/src/org/compiere/model/MImage.java
@@ -60,7 +60,7 @@ public class MImage extends X_AD_Image
 		if (AD_Image_ID == 0)
 			return new MImage (ctx, AD_Image_ID, null);
 		//
-		Integer key = new Integer (AD_Image_ID);
+		Integer key = Integer.valueOf(AD_Image_ID);
 		MImage retValue = (MImage) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MInterestArea.java b/org.adempiere.base/src/org/compiere/model/MInterestArea.java
index d6eb1ff970..07f5019948 100644
--- a/org.adempiere.base/src/org/compiere/model/MInterestArea.java
+++ b/org.adempiere.base/src/org/compiere/model/MInterestArea.java
@@ -89,7 +89,7 @@ public class MInterestArea extends X_R_InterestArea
 	 */
 	public static MInterestArea get (Properties ctx, int R_InterestArea_ID)
 	{
-		Integer key = new Integer (R_InterestArea_ID);
+		Integer key = Integer.valueOf(R_InterestArea_ID);
 		MInterestArea retValue = (MInterestArea) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MInventory.java b/org.adempiere.base/src/org/compiere/model/MInventory.java
index 741788d345..586f8661ce 100644
--- a/org.adempiere.base/src/org/compiere/model/MInventory.java
+++ b/org.adempiere.base/src/org/compiere/model/MInventory.java
@@ -66,7 +66,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	 */
 	public static MInventory get (Properties ctx, int M_Inventory_ID)
 	{
-		Integer key = new Integer (M_Inventory_ID);
+		Integer key = Integer.valueOf(M_Inventory_ID);
 		MInventory retValue = (MInventory) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java
index 65aab2a5cb..242b4e1305 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoice.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java
@@ -247,7 +247,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
 	 */
 	public static MInvoice get (Properties ctx, int C_Invoice_ID)
 	{
-		Integer key = new Integer (C_Invoice_ID);
+		Integer key = Integer.valueOf(C_Invoice_ID);
 		MInvoice retValue = (MInvoice) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java b/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java
index ef18cc02c1..383b1fef46 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java
@@ -49,7 +49,7 @@ public class MInvoiceSchedule extends X_C_InvoiceSchedule
 	 */
 	public static MInvoiceSchedule get (Properties ctx, int C_InvoiceSchedule_ID, String trxName)
 	{
-		Integer key = new Integer (C_InvoiceSchedule_ID);
+		Integer key = Integer.valueOf(C_InvoiceSchedule_ID);
 		MInvoiceSchedule retValue = (MInvoiceSchedule) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MLocation.java b/org.adempiere.base/src/org/compiere/model/MLocation.java
index b29ad68f6f..e840425bb1 100644
--- a/org.adempiere.base/src/org/compiere/model/MLocation.java
+++ b/org.adempiere.base/src/org/compiere/model/MLocation.java
@@ -70,7 +70,7 @@ public class MLocation extends X_C_Location implements Comparator<Object>
 		if (C_Location_ID == 0)
 			return new MLocation(ctx, C_Location_ID, trxName);
 		//
-		Integer key = new Integer (C_Location_ID);
+		Integer key = Integer.valueOf(C_Location_ID);
 		MLocation retValue = null;
 		if (trxName == null)
 			retValue = (MLocation) s_cache.get (key);
diff --git a/org.adempiere.base/src/org/compiere/model/MLocator.java b/org.adempiere.base/src/org/compiere/model/MLocator.java
index 1fd76d5dc6..4f5b8f50c5 100644
--- a/org.adempiere.base/src/org/compiere/model/MLocator.java
+++ b/org.adempiere.base/src/org/compiere/model/MLocator.java
@@ -180,7 +180,7 @@ public class MLocator extends X_M_Locator
 	{
 		if (s_cache == null)
 			s_cache	= new CCache<Integer,MLocator>(Table_Name, 20);
-		Integer key = new Integer (M_Locator_ID);
+		Integer key = Integer.valueOf(M_Locator_ID);
 		MLocator retValue = (MLocator) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MLocatorType.java b/org.adempiere.base/src/org/compiere/model/MLocatorType.java
index a1d70ddfe5..3ec2e27e84 100644
--- a/org.adempiere.base/src/org/compiere/model/MLocatorType.java
+++ b/org.adempiere.base/src/org/compiere/model/MLocatorType.java
@@ -50,7 +50,7 @@ public class MLocatorType extends X_M_LocatorType {
 	public static MLocatorType get (Properties ctx, int M_LocatorType_ID) {
 		if (s_cache == null)
 			s_cache	= new CCache<Integer,MLocatorType>(Table_Name, 20);
-		Integer key = new Integer (M_LocatorType_ID);
+		Integer key = Integer.valueOf(M_LocatorType_ID);
 		MLocatorType retValue = (MLocatorType) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MMeasure.java b/org.adempiere.base/src/org/compiere/model/MMeasure.java
index aac86ad6d4..cd3ec08ab5 100644
--- a/org.adempiere.base/src/org/compiere/model/MMeasure.java
+++ b/org.adempiere.base/src/org/compiere/model/MMeasure.java
@@ -64,7 +64,7 @@ public class MMeasure extends X_PA_Measure
 	 */
 	public static MMeasure get (Properties ctx, int PA_Measure_ID)
 	{
-		Integer key = new Integer (PA_Measure_ID);
+		Integer key = Integer.valueOf(PA_Measure_ID);
 		MMeasure retValue = (MMeasure)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
index ccc13d6096..f61ca9bf9d 100644
--- a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
+++ b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
@@ -48,7 +48,7 @@ public class MMeasureCalc extends X_PA_MeasureCalc
 	 */
 	public static MMeasureCalc get (Properties ctx, int PA_MeasureCalc_ID)
 	{
-		Integer key = new Integer (PA_MeasureCalc_ID);
+		Integer key = Integer.valueOf(PA_MeasureCalc_ID);
 		MMeasureCalc retValue = (MMeasureCalc)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MOrderLine.java b/org.adempiere.base/src/org/compiere/model/MOrderLine.java
index 16e76eb6fb..7b6c81498b 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrderLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrderLine.java
@@ -401,7 +401,7 @@ public class MOrderLine extends X_C_OrderLine
 			MCurrency cur = MCurrency.get(getCtx(), getC_Currency_ID());
 			if (cur.get_ID() != 0)
 			{
-				m_precision = new Integer (cur.getStdPrecision());
+				m_precision = Integer.valueOf(cur.getStdPrecision());
 				return m_precision.intValue();
 			}
 		}
diff --git a/org.adempiere.base/src/org/compiere/model/MOrg.java b/org.adempiere.base/src/org/compiere/model/MOrg.java
index f0ed6d80a2..3847ddd09a 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrg.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrg.java
@@ -195,7 +195,7 @@ public class MOrg extends X_AD_Org
 				getAD_Org_ID());
 			if (C_BPartner_ID < 0)	//	not found = -1
 				C_BPartner_ID = 0;
-			m_linkedBPartner = new Integer (C_BPartner_ID);
+			m_linkedBPartner = Integer.valueOf(C_BPartner_ID);
 		}
 		return m_linkedBPartner.intValue();
 	}	//	getLinkedC_BPartner_ID
diff --git a/org.adempiere.base/src/org/compiere/model/MPOS.java b/org.adempiere.base/src/org/compiere/model/MPOS.java
index cd8bb144c3..f63c154ac1 100644
--- a/org.adempiere.base/src/org/compiere/model/MPOS.java
+++ b/org.adempiere.base/src/org/compiere/model/MPOS.java
@@ -46,7 +46,7 @@ public class MPOS extends X_C_POS
 	 */
 	public static MPOS get (Properties ctx, int C_POS_ID)
 	{
-		Integer key = new Integer (C_POS_ID);
+		Integer key = Integer.valueOf(C_POS_ID);
 		MPOS retValue = (MPOS) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java b/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java
index 7e39faa9fd..0b52b5e166 100644
--- a/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java
+++ b/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java
@@ -46,7 +46,7 @@ public class MPOSKeyLayout extends X_C_POSKeyLayout
 	 */
 	public static MPOSKeyLayout get (Properties ctx, int C_POSKeyLayout_ID)
 	{
-		Integer key = new Integer (C_POSKeyLayout_ID);
+		Integer key = Integer.valueOf(C_POSKeyLayout_ID);
 		MPOSKeyLayout retValue = (MPOSKeyLayout) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MPriceList.java b/org.adempiere.base/src/org/compiere/model/MPriceList.java
index b06188c463..4ff33827ef 100644
--- a/org.adempiere.base/src/org/compiere/model/MPriceList.java
+++ b/org.adempiere.base/src/org/compiere/model/MPriceList.java
@@ -50,7 +50,7 @@ public class MPriceList extends X_M_PriceList
 	 */
 	public static MPriceList get (Properties ctx, int M_PriceList_ID, String trxName)
 	{
-		Integer key = new Integer (M_PriceList_ID);
+		Integer key = Integer.valueOf(M_PriceList_ID);
 		MPriceList retValue = (MPriceList)s_cache.get(key);
 		if (retValue == null)
 		{
@@ -263,7 +263,7 @@ public class MPriceList extends X_M_PriceList
 		if (m_precision == null)
 		{
 			MCurrency c = MCurrency.get(getCtx(), getC_Currency_ID());
-			m_precision = new Integer (c.getStdPrecision());
+			m_precision = Integer.valueOf(c.getStdPrecision());
 		}
 		return m_precision.intValue();
 	}	//	getStandardPrecision
diff --git a/org.adempiere.base/src/org/compiere/model/MProcess.java b/org.adempiere.base/src/org/compiere/model/MProcess.java
index b4eda61350..8e07379176 100644
--- a/org.adempiere.base/src/org/compiere/model/MProcess.java
+++ b/org.adempiere.base/src/org/compiere/model/MProcess.java
@@ -54,7 +54,7 @@ public class MProcess extends X_AD_Process
 	 */
 	public static MProcess get (Properties ctx, int AD_Process_ID)
 	{
-		Integer key = new Integer (AD_Process_ID);
+		Integer key = Integer.valueOf(AD_Process_ID);
 		MProcess retValue = (MProcess) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MProcessPara.java b/org.adempiere.base/src/org/compiere/model/MProcessPara.java
index 2de67394bb..0451b51724 100644
--- a/org.adempiere.base/src/org/compiere/model/MProcessPara.java
+++ b/org.adempiere.base/src/org/compiere/model/MProcessPara.java
@@ -47,7 +47,7 @@ public class MProcessPara extends X_AD_Process_Para
 	 */
 	public static MProcessPara get (Properties ctx, int AD_Process_Para_ID)
 	{
-		Integer key = new Integer (AD_Process_Para_ID);
+		Integer key = Integer.valueOf(AD_Process_Para_ID);
 		MProcessPara retValue = (MProcessPara)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MProduct.java b/org.adempiere.base/src/org/compiere/model/MProduct.java
index fcd11091af..1e044332f4 100644
--- a/org.adempiere.base/src/org/compiere/model/MProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/MProduct.java
@@ -65,7 +65,7 @@ public class MProduct extends X_M_Product
 		{
 			return null;
 		}
-		Integer key = new Integer (M_Product_ID);
+		Integer key = Integer.valueOf(M_Product_ID);
 		MProduct retValue = (MProduct) s_cache.get (key);
 		if (retValue != null)
 		{
@@ -423,7 +423,7 @@ public class MProduct extends X_M_Product
 			int C_UOM_ID = getC_UOM_ID();
 			if (C_UOM_ID == 0)
 				return 0;	//	EA
-			m_precision = new Integer (MUOM.getPrecision(getCtx(), C_UOM_ID));
+			m_precision = Integer.valueOf(MUOM.getPrecision(getCtx(), C_UOM_ID));
 		}
 		return m_precision.intValue();
 	}	//	getUOMPrecision
diff --git a/org.adempiere.base/src/org/compiere/model/MProductCategory.java b/org.adempiere.base/src/org/compiere/model/MProductCategory.java
index d6296be2a1..505012bac0 100644
--- a/org.adempiere.base/src/org/compiere/model/MProductCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/MProductCategory.java
@@ -51,7 +51,7 @@ public class MProductCategory extends X_M_Product_Category
 	 */
 	public static MProductCategory get (Properties ctx, int M_Product_Category_ID)
 	{
-		Integer ii = new Integer (M_Product_Category_ID);
+		Integer ii = Integer.valueOf(M_Product_Category_ID);
 		MProductCategory retValue = (MProductCategory)s_cache.get(ii);
 		if (retValue != null)
 			return retValue;
@@ -72,7 +72,7 @@ public class MProductCategory extends X_M_Product_Category
 		if (M_Product_ID == 0 || M_Product_Category_ID == 0)
 			return false;
 		//	Look up
-		Integer product = new Integer (M_Product_ID);
+		Integer product = Integer.valueOf(M_Product_ID);
 		Integer category = (Integer)s_products.get(product);
 		if (category != null)
 			return category.intValue() == M_Product_Category_ID;
diff --git a/org.adempiere.base/src/org/compiere/model/MProjectType.java b/org.adempiere.base/src/org/compiere/model/MProjectType.java
index e86701589d..3b1edc7242 100644
--- a/org.adempiere.base/src/org/compiere/model/MProjectType.java
+++ b/org.adempiere.base/src/org/compiere/model/MProjectType.java
@@ -49,7 +49,7 @@ public class MProjectType extends X_C_ProjectType
 	 */
 	public static MProjectType get (Properties ctx, int C_ProjectType_ID)
 	{
-		Integer key = new Integer (C_ProjectType_ID);
+		Integer key = Integer.valueOf(C_ProjectType_ID);
 		MProjectType retValue = (MProjectType)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRequestCategory.java b/org.adempiere.base/src/org/compiere/model/MRequestCategory.java
index d398642d6e..0674802345 100644
--- a/org.adempiere.base/src/org/compiere/model/MRequestCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/MRequestCategory.java
@@ -42,7 +42,7 @@ public class MRequestCategory extends X_R_Category
 	 */
 	public static MRequestCategory get (Properties ctx, int R_Category_ID)
 	{
-		Integer key = new Integer (R_Category_ID);
+		Integer key = Integer.valueOf(R_Category_ID);
 		MRequestCategory retValue = (MRequestCategory) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRequestType.java b/org.adempiere.base/src/org/compiere/model/MRequestType.java
index fcabf19f4a..10c7bcc7cc 100644
--- a/org.adempiere.base/src/org/compiere/model/MRequestType.java
+++ b/org.adempiere.base/src/org/compiere/model/MRequestType.java
@@ -52,7 +52,7 @@ public class MRequestType extends X_R_RequestType
 	 */
 	public static MRequestType get (Properties ctx, int R_RequestType_ID)
 	{
-		Integer key = new Integer (R_RequestType_ID);
+		Integer key = Integer.valueOf(R_RequestType_ID);
 		MRequestType retValue = (MRequestType)s_cache.get(key);
 		if (retValue == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MResolution.java b/org.adempiere.base/src/org/compiere/model/MResolution.java
index 7aee211616..ec8ec38a8a 100644
--- a/org.adempiere.base/src/org/compiere/model/MResolution.java
+++ b/org.adempiere.base/src/org/compiere/model/MResolution.java
@@ -43,7 +43,7 @@ public class MResolution extends X_R_Resolution
 	 */
 	public static MResolution get (Properties ctx, int R_Resolution_ID)
 	{
-		Integer key = new Integer (R_Resolution_ID);
+		Integer key = Integer.valueOf(R_Resolution_ID);
 		MResolution retValue = (MResolution) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRfQ.java b/org.adempiere.base/src/org/compiere/model/MRfQ.java
index d5a5b5814b..1a6385c80a 100644
--- a/org.adempiere.base/src/org/compiere/model/MRfQ.java
+++ b/org.adempiere.base/src/org/compiere/model/MRfQ.java
@@ -50,7 +50,7 @@ public class MRfQ extends X_C_RfQ
 	 */
 	public static MRfQ get (Properties ctx, int C_RfQ_ID, String trxName)
 	{
-		Integer key = new Integer (C_RfQ_ID);
+		Integer key = Integer.valueOf(C_RfQ_ID);
 		MRfQ retValue = (MRfQ) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRfQLine.java b/org.adempiere.base/src/org/compiere/model/MRfQLine.java
index ab39cf0438..6508d90540 100644
--- a/org.adempiere.base/src/org/compiere/model/MRfQLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MRfQLine.java
@@ -48,7 +48,7 @@ public class MRfQLine extends X_C_RfQLine
 	 */
 	public static MRfQLine get (Properties ctx, int C_RfQLine_ID, String trxName)
 	{
-		Integer key = new Integer (C_RfQLine_ID);
+		Integer key = Integer.valueOf(C_RfQLine_ID);
 		MRfQLine retValue = (MRfQLine) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java b/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java
index 212c536174..3269807b41 100644
--- a/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java
+++ b/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java
@@ -48,7 +48,7 @@ public class MRfQLineQty extends X_C_RfQLineQty
 	 */
 	public static MRfQLineQty get (Properties ctx, int C_RfQLineQty_ID, String trxName)
 	{
-		Integer key = new Integer (C_RfQLineQty_ID);
+		Integer key = Integer.valueOf(C_RfQLineQty_ID);
 		MRfQLineQty retValue = (MRfQLineQty) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRule.java b/org.adempiere.base/src/org/compiere/model/MRule.java
index bb87a37f07..a2489408dc 100644
--- a/org.adempiere.base/src/org/compiere/model/MRule.java
+++ b/org.adempiere.base/src/org/compiere/model/MRule.java
@@ -65,7 +65,7 @@ public class MRule extends X_AD_Rule
 	 */
 	public static MRule get (Properties ctx, int AD_Rule_ID)
 	{
-		Integer key = new Integer (AD_Rule_ID);
+		Integer key = Integer.valueOf(AD_Rule_ID);
 		MRule retValue = (MRule) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -101,7 +101,7 @@ public class MRule extends X_AD_Rule
 		
 		if (retValue != null)
 		{
-			Integer key = new Integer (retValue.getAD_Rule_ID());
+			Integer key = Integer.valueOf(retValue.getAD_Rule_ID());
 			s_cache.put (key, retValue);
 		}
 		return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MSLACriteria.java b/org.adempiere.base/src/org/compiere/model/MSLACriteria.java
index 00f858f0b8..68439c8298 100644
--- a/org.adempiere.base/src/org/compiere/model/MSLACriteria.java
+++ b/org.adempiere.base/src/org/compiere/model/MSLACriteria.java
@@ -50,7 +50,7 @@ public class MSLACriteria extends X_PA_SLA_Criteria
 	 */
 	public static MSLACriteria get (Properties ctx, int PA_SLA_Criteria_ID, String trxName)
 	{
-		Integer key = new Integer (PA_SLA_Criteria_ID);
+		Integer key = Integer.valueOf(PA_SLA_Criteria_ID);
 		MSLACriteria retValue = (MSLACriteria) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MSalesRegion.java b/org.adempiere.base/src/org/compiere/model/MSalesRegion.java
index d7e79c60db..7c3b408b32 100644
--- a/org.adempiere.base/src/org/compiere/model/MSalesRegion.java
+++ b/org.adempiere.base/src/org/compiere/model/MSalesRegion.java
@@ -43,7 +43,7 @@ public class MSalesRegion extends X_C_SalesRegion
 	 */
 	public static MSalesRegion get (Properties ctx, int C_SalesRegion_ID)
 	{
-		Integer key = new Integer (C_SalesRegion_ID);
+		Integer key = Integer.valueOf(C_SalesRegion_ID);
 		MSalesRegion retValue = (MSalesRegion) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MSchedule.java b/org.adempiere.base/src/org/compiere/model/MSchedule.java
index 7562ff3ec3..b2a7a9fe9f 100644
--- a/org.adempiere.base/src/org/compiere/model/MSchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/MSchedule.java
@@ -145,7 +145,7 @@ public class MSchedule extends X_AD_Schedule
 
 	public static MSchedule get(Properties ctx, int AD_Schedule_ID) 
 	{
-		Integer key = new Integer (AD_Schedule_ID);
+		Integer key = Integer.valueOf(AD_Schedule_ID);
 		MSchedule retValue = (MSchedule)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MStatus.java b/org.adempiere.base/src/org/compiere/model/MStatus.java
index 88e5d6a11a..164ce26f8a 100644
--- a/org.adempiere.base/src/org/compiere/model/MStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/MStatus.java
@@ -51,7 +51,7 @@ public class MStatus extends X_R_Status
 	{
 		if (R_Status_ID == 0)
 			return null;
-		Integer key = new Integer (R_Status_ID);
+		Integer key = Integer.valueOf(R_Status_ID);
 		MStatus retValue = (MStatus)s_cache.get(key);
 		if (retValue == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MStatusCategory.java b/org.adempiere.base/src/org/compiere/model/MStatusCategory.java
index 3ec805e663..644c025c2d 100644
--- a/org.adempiere.base/src/org/compiere/model/MStatusCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/MStatusCategory.java
@@ -106,7 +106,7 @@ public class MStatusCategory extends X_R_StatusCategory
 	 */
 	public static MStatusCategory get (Properties ctx, int R_StatusCategory_ID)
 	{
-		Integer key = new Integer (R_StatusCategory_ID);
+		Integer key = Integer.valueOf(R_StatusCategory_ID);
 		MStatusCategory retValue = (MStatusCategory)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MStore.java b/org.adempiere.base/src/org/compiere/model/MStore.java
index 0b01c99b69..ec845d2583 100644
--- a/org.adempiere.base/src/org/compiere/model/MStore.java
+++ b/org.adempiere.base/src/org/compiere/model/MStore.java
@@ -52,7 +52,7 @@ public class MStore extends X_W_Store
 	 */
 	public static MStore get (Properties ctx, int W_Store_ID)
 	{
-		Integer key = new Integer (W_Store_ID);
+		Integer key = Integer.valueOf(W_Store_ID);
 		MStore retValue = (MStore) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -133,7 +133,7 @@ public class MStore extends X_W_Store
 			return null;
 		
 		//	Save
-		Integer key = new Integer (wstore.getW_Store_ID());
+		Integer key = Integer.valueOf(wstore.getW_Store_ID());
 		s_cache.put (key, wstore);
 		return wstore;
 	}	//	get
diff --git a/org.adempiere.base/src/org/compiere/model/MTax.java b/org.adempiere.base/src/org/compiere/model/MTax.java
index 04336ada00..5527cf3374 100644
--- a/org.adempiere.base/src/org/compiere/model/MTax.java
+++ b/org.adempiere.base/src/org/compiere/model/MTax.java
@@ -91,7 +91,7 @@ public class MTax extends X_C_Tax
 	 */
 	public static MTax get (Properties ctx, int C_Tax_ID)
 	{
-		Integer key = new Integer (C_Tax_ID);
+		Integer key = Integer.valueOf(C_Tax_ID);
 		MTax retValue = (MTax) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MTree_Base.java b/org.adempiere.base/src/org/compiere/model/MTree_Base.java
index c70411cae8..d6160b0ddc 100644
--- a/org.adempiere.base/src/org/compiere/model/MTree_Base.java
+++ b/org.adempiere.base/src/org/compiere/model/MTree_Base.java
@@ -204,7 +204,7 @@ public class MTree_Base extends X_AD_Tree
 	 */
 	public static MTree_Base get (Properties ctx, int AD_Tree_ID, String trxName)
 	{
-		Integer key = new Integer (AD_Tree_ID);
+		Integer key = Integer.valueOf(AD_Tree_ID);
 		MTree_Base retValue = (MTree_Base) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MUOMConversion.java b/org.adempiere.base/src/org/compiere/model/MUOMConversion.java
index d31902694a..58f1dd48a2 100644
--- a/org.adempiere.base/src/org/compiere/model/MUOMConversion.java
+++ b/org.adempiere.base/src/org/compiere/model/MUOMConversion.java
@@ -601,7 +601,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
 	{
 		if (M_Product_ID == 0)
 			return new MUOMConversion[0];
-		Integer key = new Integer (M_Product_ID);
+		Integer key = Integer.valueOf(M_Product_ID);
 		MUOMConversion[] result = (MUOMConversion[])s_conversionProduct.get(key);
 		if (result != null)
 			return result;
diff --git a/org.adempiere.base/src/org/compiere/model/MValRule.java b/org.adempiere.base/src/org/compiere/model/MValRule.java
index ef38c0bc07..672f79a37f 100644
--- a/org.adempiere.base/src/org/compiere/model/MValRule.java
+++ b/org.adempiere.base/src/org/compiere/model/MValRule.java
@@ -50,7 +50,7 @@ public class MValRule extends X_AD_Val_Rule
 	 */
 	public static MValRule get (Properties ctx, int AD_Val_Rule_ID)
 	{
-		Integer key = new Integer (AD_Val_Rule_ID);
+		Integer key = Integer.valueOf(AD_Val_Rule_ID);
 		MValRule retValue = (MValRule) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MWebProject.java b/org.adempiere.base/src/org/compiere/model/MWebProject.java
index 8f8ada66c4..1925fe3c47 100644
--- a/org.adempiere.base/src/org/compiere/model/MWebProject.java
+++ b/org.adempiere.base/src/org/compiere/model/MWebProject.java
@@ -43,7 +43,7 @@ public class MWebProject extends X_CM_WebProject
 	 */
 	public static MWebProject get (Properties ctx, int CM_WebProject_ID)
 	{
-		Integer key = new Integer (CM_WebProject_ID);
+		Integer key = Integer.valueOf(CM_WebProject_ID);
 		MWebProject retValue = (MWebProject)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java
index c0f4576511..737c496505 100644
--- a/org.adempiere.base/src/org/compiere/model/PO.java
+++ b/org.adempiere.base/src/org/compiere/model/PO.java
@@ -814,7 +814,7 @@ public abstract class PO
 			//  Integer can be set as BigDecimal
 			else if (value.getClass() == BigDecimal.class
 				&& p_info.getColumnClass(index) == Integer.class)
-				m_newValues[index] = new Integer (((BigDecimal)value).intValue());
+				m_newValues[index] = Integer.valueOf(((BigDecimal)value).intValue());
 			//	Set Boolean
 			else if (p_info.getColumnClass(index) == Boolean.class
 				&& ("Y".equals(value) || "N".equals(value)) )
@@ -1626,7 +1626,7 @@ public abstract class PO
 			String colName = p_info.getColumnName(i);
 			//  Set Standard Values
 			if (colName.endsWith("tedBy"))
-				m_newValues[i] = new Integer (Env.getContextAsInt(p_ctx, "#AD_User_ID"));
+				m_newValues[i] = Integer.valueOf(Env.getContextAsInt(p_ctx, "#AD_User_ID"));
 			else if (colName.equals("Created") || colName.equals("Updated"))
 				m_newValues[i] = new Timestamp (System.currentTimeMillis());
 			else if (colName.equals(p_info.getTableName() + "_ID"))    //  KeyColumn
diff --git a/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java b/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java
index 558ba699c8..50afc0c615 100644
--- a/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java
+++ b/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java
@@ -549,7 +549,7 @@ public class MPrintTableFormat extends X_AD_PrintTableFormat
 	 */
 	static public MPrintTableFormat get (Properties ctx, int AD_PrintTableFormat_ID, Font standard_font)
 	{
-		Integer ii = new Integer (AD_PrintTableFormat_ID);
+		Integer ii = Integer.valueOf(AD_PrintTableFormat_ID);
 		MPrintTableFormat tf = (MPrintTableFormat)s_cache.get(ii);
 		if (tf == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/process/ProcessInfo.java b/org.adempiere.base/src/org/compiere/process/ProcessInfo.java
index d8a52a03f9..a6566a4c32 100644
--- a/org.adempiere.base/src/org/compiere/process/ProcessInfo.java
+++ b/org.adempiere.base/src/org/compiere/process/ProcessInfo.java
@@ -547,7 +547,7 @@ public class ProcessInfo implements Serializable
 	 */
 	public void setAD_Client_ID (int AD_Client_ID)
 	{
-		m_AD_Client_ID = new Integer (AD_Client_ID);
+		m_AD_Client_ID = Integer.valueOf(AD_Client_ID);
 	}
 	/**
 	 * Method getAD_Client_ID
@@ -564,7 +564,7 @@ public class ProcessInfo implements Serializable
 	 */
 	public void setAD_User_ID (int AD_User_ID)
 	{
-		m_AD_User_ID = new Integer (AD_User_ID);
+		m_AD_User_ID = Integer.valueOf(AD_User_ID);
 	}
 	/**
 	 * Method getAD_User_ID
diff --git a/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java b/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java
index 83e7734d36..7176d5400a 100644
--- a/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java
+++ b/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java
@@ -267,7 +267,7 @@ public class WebSessionCtx implements Serializable
 		if (wstore == null)
 			return new Properties();
 		//
-		Integer key = new Integer (wstore.getW_Store_ID());
+		Integer key = Integer.valueOf(wstore.getW_Store_ID());
 		Properties newCtx = (Properties)s_cacheCtx.get(key);
 		
 		/**	Create New Context		*/
diff --git a/org.adempiere.base/src/org/compiere/wf/MWFBlock.java b/org.adempiere.base/src/org/compiere/wf/MWFBlock.java
index aad279f718..6b69e444e9 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWFBlock.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWFBlock.java
@@ -45,7 +45,7 @@ public class MWFBlock extends X_AD_WF_Block
 	 */
 	public static MWFBlock get (Properties ctx, int AD_WF_Block_ID)
 	{
-		Integer key = new Integer (AD_WF_Block_ID);
+		Integer key = Integer.valueOf(AD_WF_Block_ID);
 		MWFBlock retValue = (MWFBlock) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/wf/MWFNode.java b/org.adempiere.base/src/org/compiere/wf/MWFNode.java
index 042b441174..4cae4961eb 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWFNode.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWFNode.java
@@ -142,7 +142,7 @@ public class MWFNode extends X_AD_WF_Node
 		//	Save to Cache
 		String key = null;
 		try {
-			Integer wfnodeid = new Integer (rs.getInt("AD_WF_Node_ID"));
+			Integer wfnodeid = Integer.valueOf(rs.getInt("AD_WF_Node_ID"));
 			if (wfnodeid != null && wfnodeid.intValue() > 0)
 				key = Env.getAD_Language(ctx) + "_" + wfnodeid;
 		} catch (SQLException e) {
diff --git a/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java b/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java
index aeae1dccd2..9108911e02 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java
@@ -46,7 +46,7 @@ public class MWFResponsible extends X_AD_WF_Responsible
 	 */
 	public static MWFResponsible get (Properties ctx, int AD_WF_Responsible_ID)
 	{
-		Integer key = new Integer (AD_WF_Responsible_ID);
+		Integer key = Integer.valueOf(AD_WF_Responsible_ID);
 		MWFResponsible retValue = (MWFResponsible) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java b/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java
index fb88a8dc26..d5723d555b 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java
@@ -258,9 +258,9 @@ public class FieldRecordInfo extends CDialog
 			else if (column.getAD_Reference_ID() == DisplayType.Integer)
 			{
 				if (OldValue != null)
-					showOldValue = m_intFormat.format (new Integer (OldValue));
+					showOldValue = m_intFormat.format (Integer.valueOf(OldValue));
 				if (NewValue != null)
-					showNewValue = m_intFormat.format (new Integer (NewValue));
+					showNewValue = m_intFormat.format (Integer.valueOf(NewValue));
 			}
 			else if (DisplayType.isNumeric (column.getAD_Reference_ID ()))
 			{
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java b/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java
index 2c9dab5aa5..1c8fbe26be 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java
@@ -325,9 +325,9 @@ public class RecordInfo extends CDialog
 			else if (column.getAD_Reference_ID() == DisplayType.Integer)
 			{
 				if (OldValue != null)
-					showOldValue = m_intFormat.format (new Integer (OldValue));
+					showOldValue = m_intFormat.format (Integer.valueOf(OldValue));
 				if (NewValue != null)
-					showNewValue = m_intFormat.format (new Integer (NewValue));
+					showNewValue = m_intFormat.format (Integer.valueOf(NewValue));
 			}
 			else if (DisplayType.isNumeric (column.getAD_Reference_ID ()))
 			{
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java
index 50e120cb7e..23c1725e2f 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java
@@ -298,7 +298,7 @@ public final class VAccount extends JComponent
 	 */
 	public Object getValue()
 	{
-		return new Integer (m_mAccount.C_ValidCombination_ID);
+		return Integer.valueOf(m_mAccount.C_ValidCombination_ID);
 	}	//	getValue
 
 	/**
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java
index ab0d344a2c..15607409f2 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java
@@ -579,7 +579,7 @@ public final class VAccountDialog extends CDialog
 		if (rs.wasNull())
 			editor.setValue(null);
 		else
-			editor.setValue(new Integer (intValue));
+			editor.setValue(Integer.valueOf(intValue));
 	}	//	loadInfoOf
 
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java
index 1e6bc1b11a..35c3ee6673 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java
@@ -229,7 +229,7 @@ public class VImage extends JButton
 		int AD_Image_ID = vid.getAD_Image_ID();
 		Integer newValue = null;
 		if (AD_Image_ID != 0)
-			newValue = new Integer (AD_Image_ID);
+			newValue = Integer.valueOf(AD_Image_ID);
 		//
 		m_mImage = null;	//	force reload
 		setValue(newValue);	//	set explicitly
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java
index 32df02ba03..e3431e730e 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java
@@ -486,7 +486,7 @@ public class VLocatorDialog extends CDialog
 	{
 		MLocator l = (MLocator) fLocator.getSelectedItem();
 		if (l != null && l.getM_Locator_ID() != 0)
-			return new Integer (l.getM_Locator_ID());
+			return Integer.valueOf(l.getM_Locator_ID());
 		return null;
 	}	//	getValue
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
index bb8030727c..8b55c20837 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
@@ -87,7 +87,7 @@ public class WAccountEditor extends WEditor implements ContextMenuListener
 	{
 		if (m_mAccount.C_ValidCombination_ID == 0)
 			return null;
-		return new Integer (m_mAccount.C_ValidCombination_ID);
+		return Integer.valueOf(m_mAccount.C_ValidCombination_ID);
 	}
 
 	@Override
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
index 044bc78d6b..697e1afcc4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
@@ -171,7 +171,7 @@ public class WImageEditor extends WEditor
 						Object oldValue = getValue();
 						Integer newValue = null;
 						if (AD_Image_ID != 0)
-							newValue = new Integer (AD_Image_ID);
+							newValue = Integer.valueOf(AD_Image_ID);
 						//
 						m_mImage = null;	//	force reload
 						setValue(newValue);	//	set explicitly
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
index 01bfc9e6ff..ed559bc40f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
@@ -673,7 +673,7 @@ public final class WAccountDialog extends Window
 		if (rs.wasNull())
 			editor.setValue(null);
 		else
-			editor.setValue(new Integer (intValue));
+			editor.setValue(Integer.valueOf(intValue));
 	}	//	loadInfoOf
 
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
index 92c7ff6c10..73e826fd54 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
@@ -292,9 +292,9 @@ public class WFieldRecordInfo extends Window implements EventListener<Event>
 			else if (column.getAD_Reference_ID() == DisplayType.Integer)
 			{
 				if (OldValue != null)
-					showOldValue = m_intFormat.format (new Integer (OldValue));
+					showOldValue = m_intFormat.format (Integer.valueOf(OldValue));
 				if (NewValue != null)
-					showNewValue = m_intFormat.format (new Integer (NewValue));
+					showNewValue = m_intFormat.format (Integer.valueOf(NewValue));
 			}
 			else if (DisplayType.isNumeric (column.getAD_Reference_ID ()))
 			{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
index dfb732b49f..43034f1339 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
@@ -659,7 +659,7 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 		MLocator l = (MLocator) listitem.getValue();
 		
 		if (l != null && l.getM_Locator_ID() != 0)
-			return new Integer (l.getM_Locator_ID());
+			return Integer.valueOf(l.getM_Locator_ID());
 		
 		return null;
 	} // getValue
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
index 89c9fc55ec..b4e0ca569e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
@@ -423,9 +423,9 @@ public class WRecordInfo extends Window implements EventListener<Event>
 			else if (column.getAD_Reference_ID() == DisplayType.Integer)
 			{
 				if (OldValue != null)
-					showOldValue = m_intFormat.format (new Integer (OldValue));
+					showOldValue = m_intFormat.format (Integer.valueOf(OldValue));
 				if (NewValue != null)
-					showNewValue = m_intFormat.format (new Integer (NewValue));
+					showNewValue = m_intFormat.format (Integer.valueOf(NewValue));
 			}
 			else if (DisplayType.isNumeric (column.getAD_Reference_ID ()))
 			{
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java
index 45c82300c5..31c57634c9 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java
@@ -445,7 +445,7 @@ public class SearchServlet extends HttpServlet
 			while (rs.next ())
 			{
 				MBPartner partner = new MBPartner (ctx, rs, null);
-				//s_cache.put (new Integer (partner.getAD_Client_ID()), partner);
+				//s_cache.put (Integer.valueOf(partner.getAD_Client_ID()), partner);
 				list.add (partner);
 			}
 		}
diff --git a/org.idempiere.webservices/WEB-INF/src/org/compiere/model/MWebService.java b/org.idempiere.webservices/WEB-INF/src/org/compiere/model/MWebService.java
index f50feaa996..8c2384e64d 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/compiere/model/MWebService.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/compiere/model/MWebService.java
@@ -60,7 +60,7 @@ public class MWebService extends X_WS_WebService
 	 */
 	public static MWebService get (Properties ctx, int WS_WebService_ID)
 	{
-		Integer key = new Integer (WS_WebService_ID);
+		Integer key = Integer.valueOf(WS_WebService_ID);
 		MWebService retValue = (MWebService) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -112,7 +112,7 @@ public class MWebService extends X_WS_WebService
 		}
 		if (retValue != null)
 		{
-			Integer key = new Integer (retValue.getWS_WebService_ID());
+			Integer key = Integer.valueOf(retValue.getWS_WebService_ID());
 			s_cache.put (key, retValue);
 		}
 		return retValue;