diff --git a/org.adempiere.base/src/org/compiere/model/MRegistration.java b/org.adempiere.base/src/org/compiere/model/MRegistration.java
index b3dfe6e5d3..c71dea230c 100644
--- a/org.adempiere.base/src/org/compiere/model/MRegistration.java
+++ b/org.adempiere.base/src/org/compiere/model/MRegistration.java
@@ -40,7 +40,7 @@ public class MRegistration extends X_A_Registration
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -5178339895228217372L;
+	private static final long serialVersionUID = -2301393326847864746L;
 
 	/**
 	 * 	Standard Constructor
@@ -91,7 +91,7 @@ public class MRegistration extends X_A_Registration
 	 * 	Get All Attributes
 	 *	@return Registration Attributes
 	 */
-	public MRegistrationAttribute[] getAttributes()
+	public MRegistrationAttribute[] getRegistrationAttributes()
 	{
 		if (m_allAttributes == null)
 			m_allAttributes = MRegistrationAttribute.getAll(getCtx());
@@ -201,7 +201,7 @@ public class MRegistration extends X_A_Registration
 			saveEx();
 		int count = 0;
 		//	read values for all attributes
-		MRegistrationAttribute[] attributes = getAttributes();
+		MRegistrationAttribute[] attributes = getRegistrationAttributes();
 		for (int i = 0; i < attributes.length; i++)
 		{
 			MRegistrationAttribute attribute = attributes[i];
diff --git a/org.adempiere.base/src/org/compiere/model/MShippingTransaction.java b/org.adempiere.base/src/org/compiere/model/MShippingTransaction.java
index a3019a78e0..6be13af42b 100644
--- a/org.adempiere.base/src/org/compiere/model/MShippingTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/MShippingTransaction.java
@@ -319,7 +319,7 @@ public class MShippingTransaction extends X_M_ShippingTransaction
 		
 /*		StringBuilder sql = new StringBuilder();
 		sql.append("SELECT CompanyName, ContactName, PhoneNumber, EMail, C_Location_ID ");
-		sql.append("FROM X_ShippingSenderInfo_V ");
+		sql.append("FROM M_ShippingSenderInfo_V ");
 		sql.append("WHERE M_ShippingTransaction_ID = ?");
 		
 		PreparedStatement pstmt = null;
@@ -355,8 +355,8 @@ public class MShippingTransaction extends X_M_ShippingTransaction
 		    MWarehouse warehouse = new MWarehouse(getCtx(), getM_Warehouse_ID(), get_TrxName());
 		    
 			partyInfo = new PartyInfo();
-			partyInfo.setCompanyName(sender.getDescription());						
-		    partyInfo.setContactName(senderContact.getDescription());
+			partyInfo.setCompanyName(sender.getName());						
+		    partyInfo.setContactName(senderContact.getName());
 		    partyInfo.setPhoneNumber(sender.getInfo().getPhone());
 			partyInfo.setEmail(senderContact.getEMail());
 			partyInfo.setLocationId(warehouse.getC_Location_ID());
@@ -376,7 +376,7 @@ public class MShippingTransaction extends X_M_ShippingTransaction
 		
 /*		StringBuilder sql = new StringBuilder();
 		sql.append("SELECT CompanyName, ContactName, PhoneNumber, EMail, C_Location_ID ");
-		sql.append("FROM X_ShippingRecipientInfo_V ");
+		sql.append("FROM M_ShippingRecipientInfo_V ");
 		sql.append("WHERE M_ShippingTransaction_ID = ?");
 		
 		PreparedStatement pstmt = null;
diff --git a/org.adempiere.base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java
index b315c158f0..87f5a1d338 100644
--- a/org.adempiere.base/src/org/compiere/model/PO.java
+++ b/org.adempiere.base/src/org/compiere/model/PO.java
@@ -105,7 +105,7 @@ public abstract class PO
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 8742545079591136114L;
+	private static final long serialVersionUID = -341748204028700040L;
 
 	public static final String LOCAL_TRX_PREFIX = "POSave";
 
@@ -251,7 +251,9 @@ public abstract class PO
 	private int					m_idOld = 0;
 	/** Custom Columns 				*/
 	private HashMap<String,String>	m_custom = null;
-
+	/** Attributes	 				*/
+	private HashMap<String,Object>	m_attributes = null;
+	
 	/** Zero Integer				*/
 	protected static final Integer I_ZERO = new Integer(0);
 	/** Accounting Columns			*/
@@ -4515,4 +4517,20 @@ public abstract class PO
 	    ois.defaultReadObject();
 	    log = CLogger.getCLogger(getClass());
 	}
+	
+	public void setAttribute(String columnName, Object value) {
+		if (m_attributes == null)
+			m_attributes = new HashMap<String, Object>();
+		m_attributes.put(columnName, value);
+	}
+	
+	public Object getAttribute(String columnName) {
+		if (m_attributes != null)
+			return m_attributes.get(columnName);
+		return null;
+	}
+	
+	public HashMap<String,Object> getAttributes() {
+		return m_attributes;
+	}
 }   //  PO