diff --git a/org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java b/org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java
new file mode 100644
index 0000000000..6e088c8185
--- /dev/null
+++ b/org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java
@@ -0,0 +1,258 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 2010 Heng Sin Low                							  *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.process;
+
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
+
+import org.adempiere.exceptions.DBException;
+import org.compiere.model.MColumn;
+import org.compiere.model.MTable;
+import org.compiere.model.M_Element;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.AdempiereUserError;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Trx;
+import org.compiere.util.ValueNamePair;
+
+/**
+ * Add UUID column (tableName_UU) to table and update existing records with new UUID.
+ * Warning: this process is only safe to run if it have exclusive access to database.
+ * @author hengsin
+ *
+ */
+public class UUIDGenerator extends SvrProcess {
+
+	private String tableName;
+
+	/**
+	 * @see org.compiere.process.SvrProcess#prepare()
+	 */
+	@Override
+	protected void prepare() {
+		ProcessInfoParameter[] parameters = getProcessInfo().getParameter();
+		if (parameters == null || parameters.length == 0)
+			return;
+		for(ProcessInfoParameter param : parameters) {
+			if (param.getParameterName().equals("TableName")) {
+				tableName = param.getParameter().toString();
+				break;
+			}
+		}
+
+	}
+
+	/**
+	 * @see org.compiere.process.SvrProcess#doIt()
+	 */
+	@Override
+	protected String doIt() throws Exception {
+		if (tableName == null || tableName.trim().length() == 0)
+			tableName = "%";
+		else
+			tableName = tableName.trim();
+		if (!tableName.endsWith("%"))
+			tableName = tableName + "%";
+		String sql = "SELECT AD_Table_ID, TableName FROM AD_Table WHERE TableName like ? AND IsView = 'N' AND IsActive='Y'";
+		PreparedStatement stmt = null;
+		ResultSet rs = null;
+		int count = 0;
+		try  {
+			stmt = DB.prepareStatement(sql, null);
+			stmt.setString(1, tableName);
+			rs = stmt.executeQuery();
+			while(rs.next()) {
+				int AD_Table_ID = rs.getInt(1);
+				String cTableName = rs.getString(2);
+				//skip import and translation table
+				if (cTableName.startsWith("I_") || cTableName.endsWith("_Trl"))
+					continue;
+				String columnName = cTableName + "_UU";
+				int AD_Column_ID = DB.getSQLValue(null, "SELECT AD_Column_ID FROM AD_Column Where AD_Table_ID = ? AND ColumnName = ?", AD_Table_ID, columnName);
+				if (AD_Column_ID <= 0) {
+					System.out.println("Adding UUID to " + cTableName);
+					count++;
+					//create column
+					MColumn mColumn = new MColumn(getCtx(), 0, null);
+					mColumn.setAD_Table_ID(AD_Table_ID);
+					int AD_Element_ID = DB.getSQLValue(null, "SELECT AD_Element_ID FROM AD_Element WHERE ColumnName=?",columnName);
+					if (AD_Element_ID <= 0) {
+						M_Element adElement = new M_Element(getCtx(), 0, null);
+						adElement.setColumnName(columnName);
+						adElement.setName(columnName);
+						adElement.setPrintName(columnName);
+						adElement.setEntityType("U");
+						adElement.saveEx();
+						AD_Element_ID = adElement.getAD_Element_ID();
+					}
+					mColumn.setAD_Element_ID(AD_Element_ID);
+					mColumn.setColumnName(columnName);
+					mColumn.setAD_Reference_ID(DisplayType.String);
+					mColumn.setEntityType("U");
+					mColumn.setFieldLength(36);
+					mColumn.setName(columnName);
+					mColumn.setVersion(new BigDecimal("1.00"));
+					mColumn.saveEx();
+
+					syncColumn(mColumn);
+
+					//update db
+					updateUUID(mColumn);
+				}
+			}
+		} finally {
+			DB.close(rs,stmt);
+		}
+		return count + " table altered";
+	}
+
+	private void updateUUID(MColumn column) {
+		MTable table = (MTable) column.getAD_Table();
+		int AD_Column_ID = DB.getSQLValue(null, "SELECT AD_Column_ID FROM AD_Column WHERE AD_Table_ID=? AND ColumnName=?", table.getAD_Table_ID(), table.getTableName()+"_ID");
+		StringBuffer sql = new StringBuffer("SELECT ");
+		String keyColumn = null;
+		if (AD_Column_ID > 0) {
+			keyColumn = table.getTableName()+"_ID";
+		} else if (DB.isOracle()) {
+			keyColumn = "rowid";
+		} else if (DB.isPostgreSQL()) {
+			keyColumn = "ctid";
+		}
+		sql.append(keyColumn).append(" FROM ").append(table.getTableName());
+		String updateSQL = "UPDATE "+table.getTableName()+" SET "+column.getColumnName()+"=? WHERE "+keyColumn+"=";
+		PreparedStatement stmt = null;
+		ResultSet rs = null;
+		Trx trx = null;
+		try {
+			trx = Trx.get(Trx.createTrxName(), true);
+			trx.start();
+			stmt = DB.prepareStatement(sql.toString(), trx.getTrxName());
+			stmt.setFetchSize(100);
+			rs = stmt.executeQuery();
+			while (rs.next()) {
+				UUID uuid = UUID.randomUUID();
+				if (AD_Column_ID > 0) {
+					int recordId = rs.getInt(1);
+					DB.executeUpdateEx(updateSQL+recordId,new Object[]{uuid.toString()},null);
+				} else {
+					String rowId = rs.getString(1);
+					DB.executeUpdateEx(updateSQL+"'"+rowId+"'",new Object[]{uuid.toString()},null);
+				}
+			}
+		} catch (SQLException e) {
+			throw new DBException(e);
+		} finally {
+			DB.close(rs, stmt);
+			if (trx != null)
+				trx.close();
+		}
+	}
+
+	private void syncColumn(MColumn column) {
+		//	Find Column in Database
+		Connection conn = null;
+		try {
+			conn = DB.getConnectionRO();
+			DatabaseMetaData md = conn.getMetaData();
+			String catalog = DB.getDatabase().getCatalog();
+			String schema = DB.getDatabase().getSchema();
+			MTable table = (MTable) column.getAD_Table();
+			String tableName = table.getTableName();
+			if (md.storesUpperCaseIdentifiers())
+			{
+				tableName = tableName.toUpperCase();
+			}
+			else if (md.storesLowerCaseIdentifiers())
+			{
+				tableName = tableName.toLowerCase();
+			}
+			int noColumns = 0;
+			String sql = null;
+			//
+			ResultSet rs = null;
+			try
+			{
+				rs = md.getColumns(catalog, schema, tableName, null);
+				while (rs.next())
+				{
+					noColumns++;
+					String columnName = rs.getString ("COLUMN_NAME");
+					if (!columnName.equalsIgnoreCase(column.getColumnName()))
+						continue;
+
+					//	update existing column
+					boolean notNull = DatabaseMetaData.columnNoNulls == rs.getInt("NULLABLE");
+					sql = column.getSQLModify(table, column.isMandatory() != notNull);
+					break;
+				}
+			}
+			finally
+			{
+				DB.close(rs);
+			}
+
+			//	No Table
+			if (noColumns == 0)
+				sql = table.getSQLCreate ();
+			//	No existing column
+			else if (sql == null)
+				sql = column.getSQLAdd(table);
+
+			int no = 0;
+			if (sql.indexOf(DB.SQLSTATEMENT_SEPARATOR) == -1)
+			{
+				no = DB.executeUpdate(sql, false, null);
+				addLog (0, null, new BigDecimal(no), sql);
+			}
+			else
+			{
+				String statements[] = sql.split(DB.SQLSTATEMENT_SEPARATOR);
+				for (int i = 0; i < statements.length; i++)
+				{
+					int count = DB.executeUpdate(statements[i], false, null);
+					addLog (0, null, new BigDecimal(count), statements[i]);
+					no += count;
+				}
+			}
+
+			if (no == -1)
+			{
+				String msg = "@Error@ ";
+				ValueNamePair pp = CLogger.retrieveError();
+				if (pp != null)
+					msg = pp.getName() + " - ";
+				msg += sql;
+				throw new AdempiereUserError (msg);
+			}
+
+			//TODO: create unique index
+		} catch (SQLException e) {
+			throw new DBException(e);
+		} finally {
+			if (conn != null) {
+				try {
+					conn.close();
+				} catch (Exception e) {}
+			}
+		}
+	}
+}