diff --git a/workflow/engine/classes/model/map/EventMapBuilder.php b/workflow/engine/classes/model/map/EventMapBuilder.php
index 10026c5f4..29e8d9128 100644
--- a/workflow/engine/classes/model/map/EventMapBuilder.php
+++ b/workflow/engine/classes/model/map/EventMapBuilder.php
@@ -94,6 +94,14 @@ class EventMapBuilder {
 
 		$tMap->addColumn('TRI_UID', 'TriUid', 'string', CreoleTypes::VARCHAR, false, 32);
 
+		$tMap->addColumn('EVN_POSX', 'EvnPosx', 'int', CreoleTypes::INTEGER, true, null);
+
+		$tMap->addColumn('EVN_POSY', 'EvnPosy', 'int', CreoleTypes::INTEGER, true, null);
+
+		$tMap->addColumn('EVN_TYPE', 'EvnType', 'string', CreoleTypes::VARCHAR, false, 32);
+
+		$tMap->addColumn('TAS_EVN_UID', 'TasEvnUid', 'string', CreoleTypes::VARCHAR, false, 32);
+
 	} // doBuild()
 
 } // EventMapBuilder
diff --git a/workflow/engine/classes/model/map/RouteMapBuilder.php b/workflow/engine/classes/model/map/RouteMapBuilder.php
index e4a154a1f..0114f592d 100644
--- a/workflow/engine/classes/model/map/RouteMapBuilder.php
+++ b/workflow/engine/classes/model/map/RouteMapBuilder.php
@@ -90,6 +90,12 @@ class RouteMapBuilder {
 
 		$tMap->addColumn('ROU_TARGETANCHOR', 'RouTargetanchor', 'int', CreoleTypes::INTEGER, false, null);
 
+		$tMap->addColumn('ROU_TO_PORT', 'RouToPort', 'int', CreoleTypes::INTEGER, true, null);
+
+		$tMap->addColumn('ROU_FROM_PORT', 'RouFromPort', 'int', CreoleTypes::INTEGER, true, null);
+
+		$tMap->addColumn('ROU_EVN_UID', 'RouEvnUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
 		$tMap->addValidator('ROU_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Route UID can be no larger than 32 in size');
 
 		$tMap->addValidator('ROU_UID', 'required', 'propel.validator.RequiredValidator', '', 'Route UID is required.');
@@ -104,7 +110,7 @@ class RouteMapBuilder {
 
 		$tMap->addValidator('ROU_NEXT_TASK', 'required', 'propel.validator.RequiredValidator', '', 'Next Task UID is required.');
 
-		$tMap->addValidator('ROU_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'SEQUENTIAL|EVALUATE|SELECT|PARALLEL|PARALLEL-BY-EVALUATION|SEC-JOIN', 'Please select a valid Route Type.');
+		$tMap->addValidator('ROU_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'SEQUENTIAL|EVALUATE|SELECT|PARALLEL|PARALLEL-BY-EVALUATION|SEC-JOIN|DISCRIMINATOR', 'Please select a valid Route Type.');
 
 		$tMap->addValidator('ROU_TYPE', 'required', 'propel.validator.RequiredValidator', '', 'Route type is required.');
 
diff --git a/workflow/engine/classes/model/map/SwimlanesElementsMapBuilder.php b/workflow/engine/classes/model/map/SwimlanesElementsMapBuilder.php
index e4023d96c..130b8c105 100644
--- a/workflow/engine/classes/model/map/SwimlanesElementsMapBuilder.php
+++ b/workflow/engine/classes/model/map/SwimlanesElementsMapBuilder.php
@@ -74,6 +74,10 @@ class SwimlanesElementsMapBuilder {
 
 		$tMap->addColumn('SWI_Y', 'SwiY', 'int', CreoleTypes::INTEGER, true, null);
 
+		$tMap->addColumn('SWI_WIDTH', 'SwiWidth', 'int', CreoleTypes::INTEGER, true, null);
+
+		$tMap->addColumn('SWI_HEIGHT', 'SwiHeight', 'int', CreoleTypes::INTEGER, true, null);
+
 		$tMap->addValidator('SWI_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Swimlane Element UID can be no larger than 32 in size');
 
 		$tMap->addValidator('SWI_UID', 'required', 'propel.validator.RequiredValidator', '', 'Swimlane Element UID is required.');
diff --git a/workflow/engine/classes/model/map/TaskMapBuilder.php b/workflow/engine/classes/model/map/TaskMapBuilder.php
index 003e47de9..66dec821d 100644
--- a/workflow/engine/classes/model/map/TaskMapBuilder.php
+++ b/workflow/engine/classes/model/map/TaskMapBuilder.php
@@ -88,6 +88,10 @@ class TaskMapBuilder {
 
 		$tMap->addColumn('TAS_ASSIGN_VARIABLE', 'TasAssignVariable', 'string', CreoleTypes::VARCHAR, true, 100);
 
+		$tMap->addColumn('TAS_MI_INSTANCE_VARIABLE', 'TasMiInstanceVariable', 'string', CreoleTypes::VARCHAR, true, 100);
+
+		$tMap->addColumn('TAS_MI_COMPLETE_VARIABLE', 'TasMiCompleteVariable', 'string', CreoleTypes::VARCHAR, true, 100);
+
 		$tMap->addColumn('TAS_ASSIGN_LOCATION', 'TasAssignLocation', 'string', CreoleTypes::VARCHAR, true, 20);
 
 		$tMap->addColumn('TAS_ASSIGN_LOCATION_ADHOC', 'TasAssignLocationAdhoc', 'string', CreoleTypes::VARCHAR, true, 20);
@@ -130,15 +134,23 @@ class TaskMapBuilder {
 
 		$tMap->addColumn('TAS_POSY', 'TasPosy', 'int', CreoleTypes::INTEGER, true, null);
 
+		$tMap->addColumn('TAS_WIDTH', 'TasWidth', 'int', CreoleTypes::INTEGER, true, null);
+
+		$tMap->addColumn('TAS_HEIGHT', 'TasHeight', 'int', CreoleTypes::INTEGER, true, null);
+
 		$tMap->addColumn('TAS_COLOR', 'TasColor', 'string', CreoleTypes::VARCHAR, true, 32);
 
+		$tMap->addColumn('TAS_EVN_UID', 'TasEvnUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
+		$tMap->addColumn('TAS_BOUNDARY', 'TasBoundary', 'string', CreoleTypes::VARCHAR, true, 32);
+
 		$tMap->addValidator('TAS_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL|ADHOC|SUBPROCESS', 'Please select a valid value for TAS_TYPE.');
 
 		$tMap->addValidator('TAS_TIMEUNIT', 'validValues', 'propel.validator.ValidValuesValidator', 'MINUTES|HOURS|DAYS|WEEKS|MONTHS', 'Please select a valid value for TAS_TIMEUNIT.');
 
 		$tMap->addValidator('TAS_ALERT', 'validValues', 'propel.validator.ValidValuesValidator', 'TRUE|FALSE', 'Please select a valid value for TAS_ALERT.');
 
-		$tMap->addValidator('TAS_ASSIGN_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'BALANCED|MANUAL|EVALUATE|REPORT_TO|SELF_SERVICE', 'Please select a valid value for TAS_ASSIGN_TYPE.');
+		$tMap->addValidator('TAS_ASSIGN_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'BALANCED|MANUAL|EVALUATE|REPORT_TO|SELF_SERVICE|STATIC_MI|CANCEL_MI', 'Please select a valid value for TAS_ASSIGN_TYPE.');
 
 		$tMap->addValidator('TAS_ASSIGN_LOCATION', 'validValues', 'propel.validator.ValidValuesValidator', 'TRUE|FALSE', 'Please select a valid value for TAS_ASSIGN_LOCATION.');
 
diff --git a/workflow/engine/classes/model/om/BaseEvent.php b/workflow/engine/classes/model/om/BaseEvent.php
index 2b2067faf..f60303aeb 100644
--- a/workflow/engine/classes/model/om/BaseEvent.php
+++ b/workflow/engine/classes/model/om/BaseEvent.php
@@ -132,6 +132,34 @@ abstract class BaseEvent extends BaseObject  implements Persistent {
 	 */
 	protected $tri_uid = '';
 
+
+	/**
+	 * The value for the evn_posx field.
+	 * @var        int
+	 */
+	protected $evn_posx = 0;
+
+
+	/**
+	 * The value for the evn_posy field.
+	 * @var        int
+	 */
+	protected $evn_posy = 0;
+
+
+	/**
+	 * The value for the evn_type field.
+	 * @var        string
+	 */
+	protected $evn_type = '';
+
+
+	/**
+	 * The value for the tas_evn_uid field.
+	 * @var        string
+	 */
+	protected $tas_evn_uid = '';
+
 	/**
 	 * Flag to prevent endless save loop, if this object is referenced
 	 * by another object which falls in this transaction.
@@ -311,6 +339,50 @@ abstract class BaseEvent extends BaseObject  implements Persistent {
 		return $this->tri_uid;
 	}
 
+	/**
+	 * Get the [evn_posx] column value.
+	 * 
+	 * @return     int
+	 */
+	public function getEvnPosx()
+	{
+
+		return $this->evn_posx;
+	}
+
+	/**
+	 * Get the [evn_posy] column value.
+	 * 
+	 * @return     int
+	 */
+	public function getEvnPosy()
+	{
+
+		return $this->evn_posy;
+	}
+
+	/**
+	 * Get the [evn_type] column value.
+	 * 
+	 * @return     string
+	 */
+	public function getEvnType()
+	{
+
+		return $this->evn_type;
+	}
+
+	/**
+	 * Get the [tas_evn_uid] column value.
+	 * 
+	 * @return     string
+	 */
+	public function getTasEvnUid()
+	{
+
+		return $this->tas_evn_uid;
+	}
+
 	/**
 	 * Set the value of [evn_uid] column.
 	 * 
@@ -629,6 +701,94 @@ abstract class BaseEvent extends BaseObject  implements Persistent {
 
 	} // setTriUid()
 
+	/**
+	 * Set the value of [evn_posx] column.
+	 * 
+	 * @param      int $v new value
+	 * @return     void
+	 */
+	public function setEvnPosx($v)
+	{
+
+		// Since the native PHP type for this column is integer,
+		// we will cast the input value to an int (if it is not).
+		if ($v !== null && !is_int($v) && is_numeric($v)) {
+			$v = (int) $v;
+		}
+
+		if ($this->evn_posx !== $v || $v === 0) {
+			$this->evn_posx = $v;
+			$this->modifiedColumns[] = EventPeer::EVN_POSX;
+		}
+
+	} // setEvnPosx()
+
+	/**
+	 * Set the value of [evn_posy] column.
+	 * 
+	 * @param      int $v new value
+	 * @return     void
+	 */
+	public function setEvnPosy($v)
+	{
+
+		// Since the native PHP type for this column is integer,
+		// we will cast the input value to an int (if it is not).
+		if ($v !== null && !is_int($v) && is_numeric($v)) {
+			$v = (int) $v;
+		}
+
+		if ($this->evn_posy !== $v || $v === 0) {
+			$this->evn_posy = $v;
+			$this->modifiedColumns[] = EventPeer::EVN_POSY;
+		}
+
+	} // setEvnPosy()
+
+	/**
+	 * Set the value of [evn_type] column.
+	 * 
+	 * @param      string $v new value
+	 * @return     void
+	 */
+	public function setEvnType($v)
+	{
+
+		// Since the native PHP type for this column is string,
+		// we will cast the input to a string (if it is not).
+		if ($v !== null && !is_string($v)) {
+			$v = (string) $v; 
+		}
+
+		if ($this->evn_type !== $v || $v === '') {
+			$this->evn_type = $v;
+			$this->modifiedColumns[] = EventPeer::EVN_TYPE;
+		}
+
+	} // setEvnType()
+
+	/**
+	 * Set the value of [tas_evn_uid] column.
+	 * 
+	 * @param      string $v new value
+	 * @return     void
+	 */
+	public function setTasEvnUid($v)
+	{
+
+		// Since the native PHP type for this column is string,
+		// we will cast the input to a string (if it is not).
+		if ($v !== null && !is_string($v)) {
+			$v = (string) $v; 
+		}
+
+		if ($this->tas_evn_uid !== $v || $v === '') {
+			$this->tas_evn_uid = $v;
+			$this->modifiedColumns[] = EventPeer::TAS_EVN_UID;
+		}
+
+	} // setTasEvnUid()
+
 	/**
 	 * Hydrates (populates) the object variables with values from the database resultset.
 	 *
@@ -676,12 +836,20 @@ abstract class BaseEvent extends BaseObject  implements Persistent {
 
 			$this->tri_uid = $rs->getString($startcol + 14);
 
+			$this->evn_posx = $rs->getInt($startcol + 15);
+
+			$this->evn_posy = $rs->getInt($startcol + 16);
+
+			$this->evn_type = $rs->getString($startcol + 17);
+
+			$this->tas_evn_uid = $rs->getString($startcol + 18);
+
 			$this->resetModified();
 
 			$this->setNew(false);
 
 			// FIXME - using NUM_COLUMNS may be clearer.
-			return $startcol + 15; // 15 = EventPeer::NUM_COLUMNS - EventPeer::NUM_LAZY_LOAD_COLUMNS).
+			return $startcol + 19; // 19 = EventPeer::NUM_COLUMNS - EventPeer::NUM_LAZY_LOAD_COLUMNS).
 
 		} catch (Exception $e) {
 			throw new PropelException("Error populating Event object", $e);
@@ -929,6 +1097,18 @@ abstract class BaseEvent extends BaseObject  implements Persistent {
 			case 14:
 				return $this->getTriUid();
 				break;
+			case 15:
+				return $this->getEvnPosx();
+				break;
+			case 16:
+				return $this->getEvnPosy();
+				break;
+			case 17:
+				return $this->getEvnType();
+				break;
+			case 18:
+				return $this->getTasEvnUid();
+				break;
 			default:
 				return null;
 				break;
@@ -964,6 +1144,10 @@ abstract class BaseEvent extends BaseObject  implements Persistent {
 			$keys[12] => $this->getEvnConditions(),
 			$keys[13] => $this->getEvnActionParameters(),
 			$keys[14] => $this->getTriUid(),
+			$keys[15] => $this->getEvnPosx(),
+			$keys[16] => $this->getEvnPosy(),
+			$keys[17] => $this->getEvnType(),
+			$keys[18] => $this->getTasEvnUid(),
 		);
 		return $result;
 	}
@@ -1040,6 +1224,18 @@ abstract class BaseEvent extends BaseObject  implements Persistent {
 			case 14:
 				$this->setTriUid($value);
 				break;
+			case 15:
+				$this->setEvnPosx($value);
+				break;
+			case 16:
+				$this->setEvnPosy($value);
+				break;
+			case 17:
+				$this->setEvnType($value);
+				break;
+			case 18:
+				$this->setTasEvnUid($value);
+				break;
 		} // switch()
 	}
 
@@ -1078,6 +1274,10 @@ abstract class BaseEvent extends BaseObject  implements Persistent {
 		if (array_key_exists($keys[12], $arr)) $this->setEvnConditions($arr[$keys[12]]);
 		if (array_key_exists($keys[13], $arr)) $this->setEvnActionParameters($arr[$keys[13]]);
 		if (array_key_exists($keys[14], $arr)) $this->setTriUid($arr[$keys[14]]);
+		if (array_key_exists($keys[15], $arr)) $this->setEvnPosx($arr[$keys[15]]);
+		if (array_key_exists($keys[16], $arr)) $this->setEvnPosy($arr[$keys[16]]);
+		if (array_key_exists($keys[17], $arr)) $this->setEvnType($arr[$keys[17]]);
+		if (array_key_exists($keys[18], $arr)) $this->setTasEvnUid($arr[$keys[18]]);
 	}
 
 	/**
@@ -1104,6 +1304,10 @@ abstract class BaseEvent extends BaseObject  implements Persistent {
 		if ($this->isColumnModified(EventPeer::EVN_CONDITIONS)) $criteria->add(EventPeer::EVN_CONDITIONS, $this->evn_conditions);
 		if ($this->isColumnModified(EventPeer::EVN_ACTION_PARAMETERS)) $criteria->add(EventPeer::EVN_ACTION_PARAMETERS, $this->evn_action_parameters);
 		if ($this->isColumnModified(EventPeer::TRI_UID)) $criteria->add(EventPeer::TRI_UID, $this->tri_uid);
+		if ($this->isColumnModified(EventPeer::EVN_POSX)) $criteria->add(EventPeer::EVN_POSX, $this->evn_posx);
+		if ($this->isColumnModified(EventPeer::EVN_POSY)) $criteria->add(EventPeer::EVN_POSY, $this->evn_posy);
+		if ($this->isColumnModified(EventPeer::EVN_TYPE)) $criteria->add(EventPeer::EVN_TYPE, $this->evn_type);
+		if ($this->isColumnModified(EventPeer::TAS_EVN_UID)) $criteria->add(EventPeer::TAS_EVN_UID, $this->tas_evn_uid);
 
 		return $criteria;
 	}
@@ -1186,6 +1390,14 @@ abstract class BaseEvent extends BaseObject  implements Persistent {
 
 		$copyObj->setTriUid($this->tri_uid);
 
+		$copyObj->setEvnPosx($this->evn_posx);
+
+		$copyObj->setEvnPosy($this->evn_posy);
+
+		$copyObj->setEvnType($this->evn_type);
+
+		$copyObj->setTasEvnUid($this->tas_evn_uid);
+
 
 		$copyObj->setNew(true);
 
diff --git a/workflow/engine/classes/model/om/BaseEventPeer.php b/workflow/engine/classes/model/om/BaseEventPeer.php
index d1d7ad7e6..3f59462ef 100644
--- a/workflow/engine/classes/model/om/BaseEventPeer.php
+++ b/workflow/engine/classes/model/om/BaseEventPeer.php
@@ -24,7 +24,7 @@ abstract class BaseEventPeer {
 	const CLASS_DEFAULT = 'classes.model.Event';
 
 	/** The total number of columns. */
-	const NUM_COLUMNS = 15;
+	const NUM_COLUMNS = 19;
 
 	/** The number of lazy-loaded columns. */
 	const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -75,6 +75,18 @@ abstract class BaseEventPeer {
 	/** the column name for the TRI_UID field */
 	const TRI_UID = 'EVENT.TRI_UID';
 
+	/** the column name for the EVN_POSX field */
+	const EVN_POSX = 'EVENT.EVN_POSX';
+
+	/** the column name for the EVN_POSY field */
+	const EVN_POSY = 'EVENT.EVN_POSY';
+
+	/** the column name for the EVN_TYPE field */
+	const EVN_TYPE = 'EVENT.EVN_TYPE';
+
+	/** the column name for the TAS_EVN_UID field */
+	const TAS_EVN_UID = 'EVENT.TAS_EVN_UID';
+
 	/** The PHP to DB Name Mapping */
 	private static $phpNameMap = null;
 
@@ -86,10 +98,10 @@ abstract class BaseEventPeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('EvnUid', 'ProUid', 'EvnStatus', 'EvnWhenOccurs', 'EvnRelatedTo', 'TasUid', 'EvnTasUidFrom', 'EvnTasUidTo', 'EvnTasEstimatedDuration', 'EvnWhen', 'EvnMaxAttempts', 'EvnAction', 'EvnConditions', 'EvnActionParameters', 'TriUid', ),
-		BasePeer::TYPE_COLNAME => array (EventPeer::EVN_UID, EventPeer::PRO_UID, EventPeer::EVN_STATUS, EventPeer::EVN_WHEN_OCCURS, EventPeer::EVN_RELATED_TO, EventPeer::TAS_UID, EventPeer::EVN_TAS_UID_FROM, EventPeer::EVN_TAS_UID_TO, EventPeer::EVN_TAS_ESTIMATED_DURATION, EventPeer::EVN_WHEN, EventPeer::EVN_MAX_ATTEMPTS, EventPeer::EVN_ACTION, EventPeer::EVN_CONDITIONS, EventPeer::EVN_ACTION_PARAMETERS, EventPeer::TRI_UID, ),
-		BasePeer::TYPE_FIELDNAME => array ('EVN_UID', 'PRO_UID', 'EVN_STATUS', 'EVN_WHEN_OCCURS', 'EVN_RELATED_TO', 'TAS_UID', 'EVN_TAS_UID_FROM', 'EVN_TAS_UID_TO', 'EVN_TAS_ESTIMATED_DURATION', 'EVN_WHEN', 'EVN_MAX_ATTEMPTS', 'EVN_ACTION', 'EVN_CONDITIONS', 'EVN_ACTION_PARAMETERS', 'TRI_UID', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
+		BasePeer::TYPE_PHPNAME => array ('EvnUid', 'ProUid', 'EvnStatus', 'EvnWhenOccurs', 'EvnRelatedTo', 'TasUid', 'EvnTasUidFrom', 'EvnTasUidTo', 'EvnTasEstimatedDuration', 'EvnWhen', 'EvnMaxAttempts', 'EvnAction', 'EvnConditions', 'EvnActionParameters', 'TriUid', 'EvnPosx', 'EvnPosy', 'EvnType', 'TasEvnUid', ),
+		BasePeer::TYPE_COLNAME => array (EventPeer::EVN_UID, EventPeer::PRO_UID, EventPeer::EVN_STATUS, EventPeer::EVN_WHEN_OCCURS, EventPeer::EVN_RELATED_TO, EventPeer::TAS_UID, EventPeer::EVN_TAS_UID_FROM, EventPeer::EVN_TAS_UID_TO, EventPeer::EVN_TAS_ESTIMATED_DURATION, EventPeer::EVN_WHEN, EventPeer::EVN_MAX_ATTEMPTS, EventPeer::EVN_ACTION, EventPeer::EVN_CONDITIONS, EventPeer::EVN_ACTION_PARAMETERS, EventPeer::TRI_UID, EventPeer::EVN_POSX, EventPeer::EVN_POSY, EventPeer::EVN_TYPE, EventPeer::TAS_EVN_UID, ),
+		BasePeer::TYPE_FIELDNAME => array ('EVN_UID', 'PRO_UID', 'EVN_STATUS', 'EVN_WHEN_OCCURS', 'EVN_RELATED_TO', 'TAS_UID', 'EVN_TAS_UID_FROM', 'EVN_TAS_UID_TO', 'EVN_TAS_ESTIMATED_DURATION', 'EVN_WHEN', 'EVN_MAX_ATTEMPTS', 'EVN_ACTION', 'EVN_CONDITIONS', 'EVN_ACTION_PARAMETERS', 'TRI_UID', 'EVN_POSX', 'EVN_POSY', 'EVN_TYPE', 'TAS_EVN_UID', ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
 	);
 
 	/**
@@ -99,10 +111,10 @@ abstract class BaseEventPeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('EvnUid' => 0, 'ProUid' => 1, 'EvnStatus' => 2, 'EvnWhenOccurs' => 3, 'EvnRelatedTo' => 4, 'TasUid' => 5, 'EvnTasUidFrom' => 6, 'EvnTasUidTo' => 7, 'EvnTasEstimatedDuration' => 8, 'EvnWhen' => 9, 'EvnMaxAttempts' => 10, 'EvnAction' => 11, 'EvnConditions' => 12, 'EvnActionParameters' => 13, 'TriUid' => 14, ),
-		BasePeer::TYPE_COLNAME => array (EventPeer::EVN_UID => 0, EventPeer::PRO_UID => 1, EventPeer::EVN_STATUS => 2, EventPeer::EVN_WHEN_OCCURS => 3, EventPeer::EVN_RELATED_TO => 4, EventPeer::TAS_UID => 5, EventPeer::EVN_TAS_UID_FROM => 6, EventPeer::EVN_TAS_UID_TO => 7, EventPeer::EVN_TAS_ESTIMATED_DURATION => 8, EventPeer::EVN_WHEN => 9, EventPeer::EVN_MAX_ATTEMPTS => 10, EventPeer::EVN_ACTION => 11, EventPeer::EVN_CONDITIONS => 12, EventPeer::EVN_ACTION_PARAMETERS => 13, EventPeer::TRI_UID => 14, ),
-		BasePeer::TYPE_FIELDNAME => array ('EVN_UID' => 0, 'PRO_UID' => 1, 'EVN_STATUS' => 2, 'EVN_WHEN_OCCURS' => 3, 'EVN_RELATED_TO' => 4, 'TAS_UID' => 5, 'EVN_TAS_UID_FROM' => 6, 'EVN_TAS_UID_TO' => 7, 'EVN_TAS_ESTIMATED_DURATION' => 8, 'EVN_WHEN' => 9, 'EVN_MAX_ATTEMPTS' => 10, 'EVN_ACTION' => 11, 'EVN_CONDITIONS' => 12, 'EVN_ACTION_PARAMETERS' => 13, 'TRI_UID' => 14, ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
+		BasePeer::TYPE_PHPNAME => array ('EvnUid' => 0, 'ProUid' => 1, 'EvnStatus' => 2, 'EvnWhenOccurs' => 3, 'EvnRelatedTo' => 4, 'TasUid' => 5, 'EvnTasUidFrom' => 6, 'EvnTasUidTo' => 7, 'EvnTasEstimatedDuration' => 8, 'EvnWhen' => 9, 'EvnMaxAttempts' => 10, 'EvnAction' => 11, 'EvnConditions' => 12, 'EvnActionParameters' => 13, 'TriUid' => 14, 'EvnPosx' => 15, 'EvnPosy' => 16, 'EvnType' => 17, 'TasEvnUid' => 18, ),
+		BasePeer::TYPE_COLNAME => array (EventPeer::EVN_UID => 0, EventPeer::PRO_UID => 1, EventPeer::EVN_STATUS => 2, EventPeer::EVN_WHEN_OCCURS => 3, EventPeer::EVN_RELATED_TO => 4, EventPeer::TAS_UID => 5, EventPeer::EVN_TAS_UID_FROM => 6, EventPeer::EVN_TAS_UID_TO => 7, EventPeer::EVN_TAS_ESTIMATED_DURATION => 8, EventPeer::EVN_WHEN => 9, EventPeer::EVN_MAX_ATTEMPTS => 10, EventPeer::EVN_ACTION => 11, EventPeer::EVN_CONDITIONS => 12, EventPeer::EVN_ACTION_PARAMETERS => 13, EventPeer::TRI_UID => 14, EventPeer::EVN_POSX => 15, EventPeer::EVN_POSY => 16, EventPeer::EVN_TYPE => 17, EventPeer::TAS_EVN_UID => 18, ),
+		BasePeer::TYPE_FIELDNAME => array ('EVN_UID' => 0, 'PRO_UID' => 1, 'EVN_STATUS' => 2, 'EVN_WHEN_OCCURS' => 3, 'EVN_RELATED_TO' => 4, 'TAS_UID' => 5, 'EVN_TAS_UID_FROM' => 6, 'EVN_TAS_UID_TO' => 7, 'EVN_TAS_ESTIMATED_DURATION' => 8, 'EVN_WHEN' => 9, 'EVN_MAX_ATTEMPTS' => 10, 'EVN_ACTION' => 11, 'EVN_CONDITIONS' => 12, 'EVN_ACTION_PARAMETERS' => 13, 'TRI_UID' => 14, 'EVN_POSX' => 15, 'EVN_POSY' => 16, 'EVN_TYPE' => 17, 'TAS_EVN_UID' => 18, ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
 	);
 
 	/**
@@ -233,6 +245,14 @@ abstract class BaseEventPeer {
 
 		$criteria->addSelectColumn(EventPeer::TRI_UID);
 
+		$criteria->addSelectColumn(EventPeer::EVN_POSX);
+
+		$criteria->addSelectColumn(EventPeer::EVN_POSY);
+
+		$criteria->addSelectColumn(EventPeer::EVN_TYPE);
+
+		$criteria->addSelectColumn(EventPeer::TAS_EVN_UID);
+
 	}
 
 	const COUNT = 'COUNT(EVENT.EVN_UID)';
diff --git a/workflow/engine/classes/model/om/BaseRoute.php b/workflow/engine/classes/model/om/BaseRoute.php
index 2686efc23..0ade35235 100644
--- a/workflow/engine/classes/model/om/BaseRoute.php
+++ b/workflow/engine/classes/model/om/BaseRoute.php
@@ -118,6 +118,27 @@ abstract class BaseRoute extends BaseObject  implements Persistent {
 	 */
 	protected $rou_targetanchor = 0;
 
+
+	/**
+	 * The value for the rou_to_port field.
+	 * @var        int
+	 */
+	protected $rou_to_port = 1;
+
+
+	/**
+	 * The value for the rou_from_port field.
+	 * @var        int
+	 */
+	protected $rou_from_port = 2;
+
+
+	/**
+	 * The value for the rou_evn_uid field.
+	 * @var        string
+	 */
+	protected $rou_evn_uid = '';
+
 	/**
 	 * Flag to prevent endless save loop, if this object is referenced
 	 * by another object which falls in this transaction.
@@ -275,6 +296,39 @@ abstract class BaseRoute extends BaseObject  implements Persistent {
 		return $this->rou_targetanchor;
 	}
 
+	/**
+	 * Get the [rou_to_port] column value.
+	 * 
+	 * @return     int
+	 */
+	public function getRouToPort()
+	{
+
+		return $this->rou_to_port;
+	}
+
+	/**
+	 * Get the [rou_from_port] column value.
+	 * 
+	 * @return     int
+	 */
+	public function getRouFromPort()
+	{
+
+		return $this->rou_from_port;
+	}
+
+	/**
+	 * Get the [rou_evn_uid] column value.
+	 * 
+	 * @return     string
+	 */
+	public function getRouEvnUid()
+	{
+
+		return $this->rou_evn_uid;
+	}
+
 	/**
 	 * Set the value of [rou_uid] column.
 	 * 
@@ -561,6 +615,72 @@ abstract class BaseRoute extends BaseObject  implements Persistent {
 
 	} // setRouTargetanchor()
 
+	/**
+	 * Set the value of [rou_to_port] column.
+	 * 
+	 * @param      int $v new value
+	 * @return     void
+	 */
+	public function setRouToPort($v)
+	{
+
+		// Since the native PHP type for this column is integer,
+		// we will cast the input value to an int (if it is not).
+		if ($v !== null && !is_int($v) && is_numeric($v)) {
+			$v = (int) $v;
+		}
+
+		if ($this->rou_to_port !== $v || $v === 1) {
+			$this->rou_to_port = $v;
+			$this->modifiedColumns[] = RoutePeer::ROU_TO_PORT;
+		}
+
+	} // setRouToPort()
+
+	/**
+	 * Set the value of [rou_from_port] column.
+	 * 
+	 * @param      int $v new value
+	 * @return     void
+	 */
+	public function setRouFromPort($v)
+	{
+
+		// Since the native PHP type for this column is integer,
+		// we will cast the input value to an int (if it is not).
+		if ($v !== null && !is_int($v) && is_numeric($v)) {
+			$v = (int) $v;
+		}
+
+		if ($this->rou_from_port !== $v || $v === 2) {
+			$this->rou_from_port = $v;
+			$this->modifiedColumns[] = RoutePeer::ROU_FROM_PORT;
+		}
+
+	} // setRouFromPort()
+
+	/**
+	 * Set the value of [rou_evn_uid] column.
+	 * 
+	 * @param      string $v new value
+	 * @return     void
+	 */
+	public function setRouEvnUid($v)
+	{
+
+		// Since the native PHP type for this column is string,
+		// we will cast the input to a string (if it is not).
+		if ($v !== null && !is_string($v)) {
+			$v = (string) $v; 
+		}
+
+		if ($this->rou_evn_uid !== $v || $v === '') {
+			$this->rou_evn_uid = $v;
+			$this->modifiedColumns[] = RoutePeer::ROU_EVN_UID;
+		}
+
+	} // setRouEvnUid()
+
 	/**
 	 * Hydrates (populates) the object variables with values from the database resultset.
 	 *
@@ -604,12 +724,18 @@ abstract class BaseRoute extends BaseObject  implements Persistent {
 
 			$this->rou_targetanchor = $rs->getInt($startcol + 12);
 
+			$this->rou_to_port = $rs->getInt($startcol + 13);
+
+			$this->rou_from_port = $rs->getInt($startcol + 14);
+
+			$this->rou_evn_uid = $rs->getString($startcol + 15);
+
 			$this->resetModified();
 
 			$this->setNew(false);
 
 			// FIXME - using NUM_COLUMNS may be clearer.
-			return $startcol + 13; // 13 = RoutePeer::NUM_COLUMNS - RoutePeer::NUM_LAZY_LOAD_COLUMNS).
+			return $startcol + 16; // 16 = RoutePeer::NUM_COLUMNS - RoutePeer::NUM_LAZY_LOAD_COLUMNS).
 
 		} catch (Exception $e) {
 			throw new PropelException("Error populating Route object", $e);
@@ -851,6 +977,15 @@ abstract class BaseRoute extends BaseObject  implements Persistent {
 			case 12:
 				return $this->getRouTargetanchor();
 				break;
+			case 13:
+				return $this->getRouToPort();
+				break;
+			case 14:
+				return $this->getRouFromPort();
+				break;
+			case 15:
+				return $this->getRouEvnUid();
+				break;
 			default:
 				return null;
 				break;
@@ -884,6 +1019,9 @@ abstract class BaseRoute extends BaseObject  implements Persistent {
 			$keys[10] => $this->getRouSendEmail(),
 			$keys[11] => $this->getRouSourceanchor(),
 			$keys[12] => $this->getRouTargetanchor(),
+			$keys[13] => $this->getRouToPort(),
+			$keys[14] => $this->getRouFromPort(),
+			$keys[15] => $this->getRouEvnUid(),
 		);
 		return $result;
 	}
@@ -954,6 +1092,15 @@ abstract class BaseRoute extends BaseObject  implements Persistent {
 			case 12:
 				$this->setRouTargetanchor($value);
 				break;
+			case 13:
+				$this->setRouToPort($value);
+				break;
+			case 14:
+				$this->setRouFromPort($value);
+				break;
+			case 15:
+				$this->setRouEvnUid($value);
+				break;
 		} // switch()
 	}
 
@@ -990,6 +1137,9 @@ abstract class BaseRoute extends BaseObject  implements Persistent {
 		if (array_key_exists($keys[10], $arr)) $this->setRouSendEmail($arr[$keys[10]]);
 		if (array_key_exists($keys[11], $arr)) $this->setRouSourceanchor($arr[$keys[11]]);
 		if (array_key_exists($keys[12], $arr)) $this->setRouTargetanchor($arr[$keys[12]]);
+		if (array_key_exists($keys[13], $arr)) $this->setRouToPort($arr[$keys[13]]);
+		if (array_key_exists($keys[14], $arr)) $this->setRouFromPort($arr[$keys[14]]);
+		if (array_key_exists($keys[15], $arr)) $this->setRouEvnUid($arr[$keys[15]]);
 	}
 
 	/**
@@ -1014,6 +1164,9 @@ abstract class BaseRoute extends BaseObject  implements Persistent {
 		if ($this->isColumnModified(RoutePeer::ROU_SEND_EMAIL)) $criteria->add(RoutePeer::ROU_SEND_EMAIL, $this->rou_send_email);
 		if ($this->isColumnModified(RoutePeer::ROU_SOURCEANCHOR)) $criteria->add(RoutePeer::ROU_SOURCEANCHOR, $this->rou_sourceanchor);
 		if ($this->isColumnModified(RoutePeer::ROU_TARGETANCHOR)) $criteria->add(RoutePeer::ROU_TARGETANCHOR, $this->rou_targetanchor);
+		if ($this->isColumnModified(RoutePeer::ROU_TO_PORT)) $criteria->add(RoutePeer::ROU_TO_PORT, $this->rou_to_port);
+		if ($this->isColumnModified(RoutePeer::ROU_FROM_PORT)) $criteria->add(RoutePeer::ROU_FROM_PORT, $this->rou_from_port);
+		if ($this->isColumnModified(RoutePeer::ROU_EVN_UID)) $criteria->add(RoutePeer::ROU_EVN_UID, $this->rou_evn_uid);
 
 		return $criteria;
 	}
@@ -1092,6 +1245,12 @@ abstract class BaseRoute extends BaseObject  implements Persistent {
 
 		$copyObj->setRouTargetanchor($this->rou_targetanchor);
 
+		$copyObj->setRouToPort($this->rou_to_port);
+
+		$copyObj->setRouFromPort($this->rou_from_port);
+
+		$copyObj->setRouEvnUid($this->rou_evn_uid);
+
 
 		$copyObj->setNew(true);
 
diff --git a/workflow/engine/classes/model/om/BaseRoutePeer.php b/workflow/engine/classes/model/om/BaseRoutePeer.php
index 7d4c24ddb..25300022d 100644
--- a/workflow/engine/classes/model/om/BaseRoutePeer.php
+++ b/workflow/engine/classes/model/om/BaseRoutePeer.php
@@ -24,7 +24,7 @@ abstract class BaseRoutePeer {
 	const CLASS_DEFAULT = 'classes.model.Route';
 
 	/** The total number of columns. */
-	const NUM_COLUMNS = 13;
+	const NUM_COLUMNS = 16;
 
 	/** The number of lazy-loaded columns. */
 	const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -69,6 +69,15 @@ abstract class BaseRoutePeer {
 	/** the column name for the ROU_TARGETANCHOR field */
 	const ROU_TARGETANCHOR = 'ROUTE.ROU_TARGETANCHOR';
 
+	/** the column name for the ROU_TO_PORT field */
+	const ROU_TO_PORT = 'ROUTE.ROU_TO_PORT';
+
+	/** the column name for the ROU_FROM_PORT field */
+	const ROU_FROM_PORT = 'ROUTE.ROU_FROM_PORT';
+
+	/** the column name for the ROU_EVN_UID field */
+	const ROU_EVN_UID = 'ROUTE.ROU_EVN_UID';
+
 	/** The PHP to DB Name Mapping */
 	private static $phpNameMap = null;
 
@@ -80,10 +89,10 @@ abstract class BaseRoutePeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('RouUid', 'RouParent', 'ProUid', 'TasUid', 'RouNextTask', 'RouCase', 'RouType', 'RouCondition', 'RouToLastUser', 'RouOptional', 'RouSendEmail', 'RouSourceanchor', 'RouTargetanchor', ),
-		BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID, RoutePeer::ROU_PARENT, RoutePeer::PRO_UID, RoutePeer::TAS_UID, RoutePeer::ROU_NEXT_TASK, RoutePeer::ROU_CASE, RoutePeer::ROU_TYPE, RoutePeer::ROU_CONDITION, RoutePeer::ROU_TO_LAST_USER, RoutePeer::ROU_OPTIONAL, RoutePeer::ROU_SEND_EMAIL, RoutePeer::ROU_SOURCEANCHOR, RoutePeer::ROU_TARGETANCHOR, ),
-		BasePeer::TYPE_FIELDNAME => array ('ROU_UID', 'ROU_PARENT', 'PRO_UID', 'TAS_UID', 'ROU_NEXT_TASK', 'ROU_CASE', 'ROU_TYPE', 'ROU_CONDITION', 'ROU_TO_LAST_USER', 'ROU_OPTIONAL', 'ROU_SEND_EMAIL', 'ROU_SOURCEANCHOR', 'ROU_TARGETANCHOR', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
+		BasePeer::TYPE_PHPNAME => array ('RouUid', 'RouParent', 'ProUid', 'TasUid', 'RouNextTask', 'RouCase', 'RouType', 'RouCondition', 'RouToLastUser', 'RouOptional', 'RouSendEmail', 'RouSourceanchor', 'RouTargetanchor', 'RouToPort', 'RouFromPort', 'RouEvnUid', ),
+		BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID, RoutePeer::ROU_PARENT, RoutePeer::PRO_UID, RoutePeer::TAS_UID, RoutePeer::ROU_NEXT_TASK, RoutePeer::ROU_CASE, RoutePeer::ROU_TYPE, RoutePeer::ROU_CONDITION, RoutePeer::ROU_TO_LAST_USER, RoutePeer::ROU_OPTIONAL, RoutePeer::ROU_SEND_EMAIL, RoutePeer::ROU_SOURCEANCHOR, RoutePeer::ROU_TARGETANCHOR, RoutePeer::ROU_TO_PORT, RoutePeer::ROU_FROM_PORT, RoutePeer::ROU_EVN_UID, ),
+		BasePeer::TYPE_FIELDNAME => array ('ROU_UID', 'ROU_PARENT', 'PRO_UID', 'TAS_UID', 'ROU_NEXT_TASK', 'ROU_CASE', 'ROU_TYPE', 'ROU_CONDITION', 'ROU_TO_LAST_USER', 'ROU_OPTIONAL', 'ROU_SEND_EMAIL', 'ROU_SOURCEANCHOR', 'ROU_TARGETANCHOR', 'ROU_TO_PORT', 'ROU_FROM_PORT', 'ROU_EVN_UID', ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
 	);
 
 	/**
@@ -93,10 +102,10 @@ abstract class BaseRoutePeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('RouUid' => 0, 'RouParent' => 1, 'ProUid' => 2, 'TasUid' => 3, 'RouNextTask' => 4, 'RouCase' => 5, 'RouType' => 6, 'RouCondition' => 7, 'RouToLastUser' => 8, 'RouOptional' => 9, 'RouSendEmail' => 10, 'RouSourceanchor' => 11, 'RouTargetanchor' => 12, ),
-		BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID => 0, RoutePeer::ROU_PARENT => 1, RoutePeer::PRO_UID => 2, RoutePeer::TAS_UID => 3, RoutePeer::ROU_NEXT_TASK => 4, RoutePeer::ROU_CASE => 5, RoutePeer::ROU_TYPE => 6, RoutePeer::ROU_CONDITION => 7, RoutePeer::ROU_TO_LAST_USER => 8, RoutePeer::ROU_OPTIONAL => 9, RoutePeer::ROU_SEND_EMAIL => 10, RoutePeer::ROU_SOURCEANCHOR => 11, RoutePeer::ROU_TARGETANCHOR => 12, ),
-		BasePeer::TYPE_FIELDNAME => array ('ROU_UID' => 0, 'ROU_PARENT' => 1, 'PRO_UID' => 2, 'TAS_UID' => 3, 'ROU_NEXT_TASK' => 4, 'ROU_CASE' => 5, 'ROU_TYPE' => 6, 'ROU_CONDITION' => 7, 'ROU_TO_LAST_USER' => 8, 'ROU_OPTIONAL' => 9, 'ROU_SEND_EMAIL' => 10, 'ROU_SOURCEANCHOR' => 11, 'ROU_TARGETANCHOR' => 12, ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
+		BasePeer::TYPE_PHPNAME => array ('RouUid' => 0, 'RouParent' => 1, 'ProUid' => 2, 'TasUid' => 3, 'RouNextTask' => 4, 'RouCase' => 5, 'RouType' => 6, 'RouCondition' => 7, 'RouToLastUser' => 8, 'RouOptional' => 9, 'RouSendEmail' => 10, 'RouSourceanchor' => 11, 'RouTargetanchor' => 12, 'RouToPort' => 13, 'RouFromPort' => 14, 'RouEvnUid' => 15, ),
+		BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID => 0, RoutePeer::ROU_PARENT => 1, RoutePeer::PRO_UID => 2, RoutePeer::TAS_UID => 3, RoutePeer::ROU_NEXT_TASK => 4, RoutePeer::ROU_CASE => 5, RoutePeer::ROU_TYPE => 6, RoutePeer::ROU_CONDITION => 7, RoutePeer::ROU_TO_LAST_USER => 8, RoutePeer::ROU_OPTIONAL => 9, RoutePeer::ROU_SEND_EMAIL => 10, RoutePeer::ROU_SOURCEANCHOR => 11, RoutePeer::ROU_TARGETANCHOR => 12, RoutePeer::ROU_TO_PORT => 13, RoutePeer::ROU_FROM_PORT => 14, RoutePeer::ROU_EVN_UID => 15, ),
+		BasePeer::TYPE_FIELDNAME => array ('ROU_UID' => 0, 'ROU_PARENT' => 1, 'PRO_UID' => 2, 'TAS_UID' => 3, 'ROU_NEXT_TASK' => 4, 'ROU_CASE' => 5, 'ROU_TYPE' => 6, 'ROU_CONDITION' => 7, 'ROU_TO_LAST_USER' => 8, 'ROU_OPTIONAL' => 9, 'ROU_SEND_EMAIL' => 10, 'ROU_SOURCEANCHOR' => 11, 'ROU_TARGETANCHOR' => 12, 'ROU_TO_PORT' => 13, 'ROU_FROM_PORT' => 14, 'ROU_EVN_UID' => 15, ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
 	);
 
 	/**
@@ -223,6 +232,12 @@ abstract class BaseRoutePeer {
 
 		$criteria->addSelectColumn(RoutePeer::ROU_TARGETANCHOR);
 
+		$criteria->addSelectColumn(RoutePeer::ROU_TO_PORT);
+
+		$criteria->addSelectColumn(RoutePeer::ROU_FROM_PORT);
+
+		$criteria->addSelectColumn(RoutePeer::ROU_EVN_UID);
+
 	}
 
 	const COUNT = 'COUNT(ROUTE.ROU_UID)';
diff --git a/workflow/engine/classes/model/om/BaseSwimlanesElements.php b/workflow/engine/classes/model/om/BaseSwimlanesElements.php
index 45bce5cce..35a4e1be7 100644
--- a/workflow/engine/classes/model/om/BaseSwimlanesElements.php
+++ b/workflow/engine/classes/model/om/BaseSwimlanesElements.php
@@ -62,6 +62,20 @@ abstract class BaseSwimlanesElements extends BaseObject  implements Persistent {
 	 */
 	protected $swi_y = 0;
 
+
+	/**
+	 * The value for the swi_width field.
+	 * @var        int
+	 */
+	protected $swi_width = 0;
+
+
+	/**
+	 * The value for the swi_height field.
+	 * @var        int
+	 */
+	protected $swi_height = 0;
+
 	/**
 	 * Flag to prevent endless save loop, if this object is referenced
 	 * by another object which falls in this transaction.
@@ -131,6 +145,28 @@ abstract class BaseSwimlanesElements extends BaseObject  implements Persistent {
 		return $this->swi_y;
 	}
 
+	/**
+	 * Get the [swi_width] column value.
+	 * 
+	 * @return     int
+	 */
+	public function getSwiWidth()
+	{
+
+		return $this->swi_width;
+	}
+
+	/**
+	 * Get the [swi_height] column value.
+	 * 
+	 * @return     int
+	 */
+	public function getSwiHeight()
+	{
+
+		return $this->swi_height;
+	}
+
 	/**
 	 * Set the value of [swi_uid] column.
 	 * 
@@ -241,6 +277,50 @@ abstract class BaseSwimlanesElements extends BaseObject  implements Persistent {
 
 	} // setSwiY()
 
+	/**
+	 * Set the value of [swi_width] column.
+	 * 
+	 * @param      int $v new value
+	 * @return     void
+	 */
+	public function setSwiWidth($v)
+	{
+
+		// Since the native PHP type for this column is integer,
+		// we will cast the input value to an int (if it is not).
+		if ($v !== null && !is_int($v) && is_numeric($v)) {
+			$v = (int) $v;
+		}
+
+		if ($this->swi_width !== $v || $v === 0) {
+			$this->swi_width = $v;
+			$this->modifiedColumns[] = SwimlanesElementsPeer::SWI_WIDTH;
+		}
+
+	} // setSwiWidth()
+
+	/**
+	 * Set the value of [swi_height] column.
+	 * 
+	 * @param      int $v new value
+	 * @return     void
+	 */
+	public function setSwiHeight($v)
+	{
+
+		// Since the native PHP type for this column is integer,
+		// we will cast the input value to an int (if it is not).
+		if ($v !== null && !is_int($v) && is_numeric($v)) {
+			$v = (int) $v;
+		}
+
+		if ($this->swi_height !== $v || $v === 0) {
+			$this->swi_height = $v;
+			$this->modifiedColumns[] = SwimlanesElementsPeer::SWI_HEIGHT;
+		}
+
+	} // setSwiHeight()
+
 	/**
 	 * Hydrates (populates) the object variables with values from the database resultset.
 	 *
@@ -268,12 +348,16 @@ abstract class BaseSwimlanesElements extends BaseObject  implements Persistent {
 
 			$this->swi_y = $rs->getInt($startcol + 4);
 
+			$this->swi_width = $rs->getInt($startcol + 5);
+
+			$this->swi_height = $rs->getInt($startcol + 6);
+
 			$this->resetModified();
 
 			$this->setNew(false);
 
 			// FIXME - using NUM_COLUMNS may be clearer.
-			return $startcol + 5; // 5 = SwimlanesElementsPeer::NUM_COLUMNS - SwimlanesElementsPeer::NUM_LAZY_LOAD_COLUMNS).
+			return $startcol + 7; // 7 = SwimlanesElementsPeer::NUM_COLUMNS - SwimlanesElementsPeer::NUM_LAZY_LOAD_COLUMNS).
 
 		} catch (Exception $e) {
 			throw new PropelException("Error populating SwimlanesElements object", $e);
@@ -491,6 +575,12 @@ abstract class BaseSwimlanesElements extends BaseObject  implements Persistent {
 			case 4:
 				return $this->getSwiY();
 				break;
+			case 5:
+				return $this->getSwiWidth();
+				break;
+			case 6:
+				return $this->getSwiHeight();
+				break;
 			default:
 				return null;
 				break;
@@ -516,6 +606,8 @@ abstract class BaseSwimlanesElements extends BaseObject  implements Persistent {
 			$keys[2] => $this->getSwiType(),
 			$keys[3] => $this->getSwiX(),
 			$keys[4] => $this->getSwiY(),
+			$keys[5] => $this->getSwiWidth(),
+			$keys[6] => $this->getSwiHeight(),
 		);
 		return $result;
 	}
@@ -562,6 +654,12 @@ abstract class BaseSwimlanesElements extends BaseObject  implements Persistent {
 			case 4:
 				$this->setSwiY($value);
 				break;
+			case 5:
+				$this->setSwiWidth($value);
+				break;
+			case 6:
+				$this->setSwiHeight($value);
+				break;
 		} // switch()
 	}
 
@@ -590,6 +688,8 @@ abstract class BaseSwimlanesElements extends BaseObject  implements Persistent {
 		if (array_key_exists($keys[2], $arr)) $this->setSwiType($arr[$keys[2]]);
 		if (array_key_exists($keys[3], $arr)) $this->setSwiX($arr[$keys[3]]);
 		if (array_key_exists($keys[4], $arr)) $this->setSwiY($arr[$keys[4]]);
+		if (array_key_exists($keys[5], $arr)) $this->setSwiWidth($arr[$keys[5]]);
+		if (array_key_exists($keys[6], $arr)) $this->setSwiHeight($arr[$keys[6]]);
 	}
 
 	/**
@@ -606,6 +706,8 @@ abstract class BaseSwimlanesElements extends BaseObject  implements Persistent {
 		if ($this->isColumnModified(SwimlanesElementsPeer::SWI_TYPE)) $criteria->add(SwimlanesElementsPeer::SWI_TYPE, $this->swi_type);
 		if ($this->isColumnModified(SwimlanesElementsPeer::SWI_X)) $criteria->add(SwimlanesElementsPeer::SWI_X, $this->swi_x);
 		if ($this->isColumnModified(SwimlanesElementsPeer::SWI_Y)) $criteria->add(SwimlanesElementsPeer::SWI_Y, $this->swi_y);
+		if ($this->isColumnModified(SwimlanesElementsPeer::SWI_WIDTH)) $criteria->add(SwimlanesElementsPeer::SWI_WIDTH, $this->swi_width);
+		if ($this->isColumnModified(SwimlanesElementsPeer::SWI_HEIGHT)) $criteria->add(SwimlanesElementsPeer::SWI_HEIGHT, $this->swi_height);
 
 		return $criteria;
 	}
@@ -668,6 +770,10 @@ abstract class BaseSwimlanesElements extends BaseObject  implements Persistent {
 
 		$copyObj->setSwiY($this->swi_y);
 
+		$copyObj->setSwiWidth($this->swi_width);
+
+		$copyObj->setSwiHeight($this->swi_height);
+
 
 		$copyObj->setNew(true);
 
diff --git a/workflow/engine/classes/model/om/BaseSwimlanesElementsPeer.php b/workflow/engine/classes/model/om/BaseSwimlanesElementsPeer.php
index f6d11d9cc..e5f30c5c4 100644
--- a/workflow/engine/classes/model/om/BaseSwimlanesElementsPeer.php
+++ b/workflow/engine/classes/model/om/BaseSwimlanesElementsPeer.php
@@ -24,7 +24,7 @@ abstract class BaseSwimlanesElementsPeer {
 	const CLASS_DEFAULT = 'classes.model.SwimlanesElements';
 
 	/** The total number of columns. */
-	const NUM_COLUMNS = 5;
+	const NUM_COLUMNS = 7;
 
 	/** The number of lazy-loaded columns. */
 	const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -45,6 +45,12 @@ abstract class BaseSwimlanesElementsPeer {
 	/** the column name for the SWI_Y field */
 	const SWI_Y = 'SWIMLANES_ELEMENTS.SWI_Y';
 
+	/** the column name for the SWI_WIDTH field */
+	const SWI_WIDTH = 'SWIMLANES_ELEMENTS.SWI_WIDTH';
+
+	/** the column name for the SWI_HEIGHT field */
+	const SWI_HEIGHT = 'SWIMLANES_ELEMENTS.SWI_HEIGHT';
+
 	/** The PHP to DB Name Mapping */
 	private static $phpNameMap = null;
 
@@ -56,10 +62,10 @@ abstract class BaseSwimlanesElementsPeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('SwiUid', 'ProUid', 'SwiType', 'SwiX', 'SwiY', ),
-		BasePeer::TYPE_COLNAME => array (SwimlanesElementsPeer::SWI_UID, SwimlanesElementsPeer::PRO_UID, SwimlanesElementsPeer::SWI_TYPE, SwimlanesElementsPeer::SWI_X, SwimlanesElementsPeer::SWI_Y, ),
-		BasePeer::TYPE_FIELDNAME => array ('SWI_UID', 'PRO_UID', 'SWI_TYPE', 'SWI_X', 'SWI_Y', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
+		BasePeer::TYPE_PHPNAME => array ('SwiUid', 'ProUid', 'SwiType', 'SwiX', 'SwiY', 'SwiWidth', 'SwiHeight', ),
+		BasePeer::TYPE_COLNAME => array (SwimlanesElementsPeer::SWI_UID, SwimlanesElementsPeer::PRO_UID, SwimlanesElementsPeer::SWI_TYPE, SwimlanesElementsPeer::SWI_X, SwimlanesElementsPeer::SWI_Y, SwimlanesElementsPeer::SWI_WIDTH, SwimlanesElementsPeer::SWI_HEIGHT, ),
+		BasePeer::TYPE_FIELDNAME => array ('SWI_UID', 'PRO_UID', 'SWI_TYPE', 'SWI_X', 'SWI_Y', 'SWI_WIDTH', 'SWI_HEIGHT', ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
 	);
 
 	/**
@@ -69,10 +75,10 @@ abstract class BaseSwimlanesElementsPeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('SwiUid' => 0, 'ProUid' => 1, 'SwiType' => 2, 'SwiX' => 3, 'SwiY' => 4, ),
-		BasePeer::TYPE_COLNAME => array (SwimlanesElementsPeer::SWI_UID => 0, SwimlanesElementsPeer::PRO_UID => 1, SwimlanesElementsPeer::SWI_TYPE => 2, SwimlanesElementsPeer::SWI_X => 3, SwimlanesElementsPeer::SWI_Y => 4, ),
-		BasePeer::TYPE_FIELDNAME => array ('SWI_UID' => 0, 'PRO_UID' => 1, 'SWI_TYPE' => 2, 'SWI_X' => 3, 'SWI_Y' => 4, ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
+		BasePeer::TYPE_PHPNAME => array ('SwiUid' => 0, 'ProUid' => 1, 'SwiType' => 2, 'SwiX' => 3, 'SwiY' => 4, 'SwiWidth' => 5, 'SwiHeight' => 6, ),
+		BasePeer::TYPE_COLNAME => array (SwimlanesElementsPeer::SWI_UID => 0, SwimlanesElementsPeer::PRO_UID => 1, SwimlanesElementsPeer::SWI_TYPE => 2, SwimlanesElementsPeer::SWI_X => 3, SwimlanesElementsPeer::SWI_Y => 4, SwimlanesElementsPeer::SWI_WIDTH => 5, SwimlanesElementsPeer::SWI_HEIGHT => 6, ),
+		BasePeer::TYPE_FIELDNAME => array ('SWI_UID' => 0, 'PRO_UID' => 1, 'SWI_TYPE' => 2, 'SWI_X' => 3, 'SWI_Y' => 4, 'SWI_WIDTH' => 5, 'SWI_HEIGHT' => 6, ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
 	);
 
 	/**
@@ -183,6 +189,10 @@ abstract class BaseSwimlanesElementsPeer {
 
 		$criteria->addSelectColumn(SwimlanesElementsPeer::SWI_Y);
 
+		$criteria->addSelectColumn(SwimlanesElementsPeer::SWI_WIDTH);
+
+		$criteria->addSelectColumn(SwimlanesElementsPeer::SWI_HEIGHT);
+
 	}
 
 	const COUNT = 'COUNT(SWIMLANES_ELEMENTS.SWI_UID)';
diff --git a/workflow/engine/classes/model/om/BaseTask.php b/workflow/engine/classes/model/om/BaseTask.php
index 4f0103e3e..7576d3007 100644
--- a/workflow/engine/classes/model/om/BaseTask.php
+++ b/workflow/engine/classes/model/om/BaseTask.php
@@ -112,6 +112,20 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 	protected $tas_assign_variable = '@@SYS_NEXT_USER_TO_BE_ASSIGNED';
 
 
+	/**
+	 * The value for the tas_mi_instance_variable field.
+	 * @var        string
+	 */
+	protected $tas_mi_instance_variable = '@@SYS_VAR_TOTAL_INSTANCE';
+
+
+	/**
+	 * The value for the tas_mi_complete_variable field.
+	 * @var        string
+	 */
+	protected $tas_mi_complete_variable = '@@SYS_VAR_TOTAL_INSTANCES_COMPLETE';
+
+
 	/**
 	 * The value for the tas_assign_location field.
 	 * @var        string
@@ -259,12 +273,40 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 	protected $tas_posy = 0;
 
 
+	/**
+	 * The value for the tas_width field.
+	 * @var        int
+	 */
+	protected $tas_width = 110;
+
+
+	/**
+	 * The value for the tas_height field.
+	 * @var        int
+	 */
+	protected $tas_height = 60;
+
+
 	/**
 	 * The value for the tas_color field.
 	 * @var        string
 	 */
 	protected $tas_color = '';
 
+
+	/**
+	 * The value for the tas_evn_uid field.
+	 * @var        string
+	 */
+	protected $tas_evn_uid = '';
+
+
+	/**
+	 * The value for the tas_boundary field.
+	 * @var        string
+	 */
+	protected $tas_boundary = '';
+
 	/**
 	 * Flag to prevent endless save loop, if this object is referenced
 	 * by another object which falls in this transaction.
@@ -411,6 +453,28 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 		return $this->tas_assign_variable;
 	}
 
+	/**
+	 * Get the [tas_mi_instance_variable] column value.
+	 * 
+	 * @return     string
+	 */
+	public function getTasMiInstanceVariable()
+	{
+
+		return $this->tas_mi_instance_variable;
+	}
+
+	/**
+	 * Get the [tas_mi_complete_variable] column value.
+	 * 
+	 * @return     string
+	 */
+	public function getTasMiCompleteVariable()
+	{
+
+		return $this->tas_mi_complete_variable;
+	}
+
 	/**
 	 * Get the [tas_assign_location] column value.
 	 * 
@@ -642,6 +706,28 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 		return $this->tas_posy;
 	}
 
+	/**
+	 * Get the [tas_width] column value.
+	 * 
+	 * @return     int
+	 */
+	public function getTasWidth()
+	{
+
+		return $this->tas_width;
+	}
+
+	/**
+	 * Get the [tas_height] column value.
+	 * 
+	 * @return     int
+	 */
+	public function getTasHeight()
+	{
+
+		return $this->tas_height;
+	}
+
 	/**
 	 * Get the [tas_color] column value.
 	 * 
@@ -653,6 +739,28 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 		return $this->tas_color;
 	}
 
+	/**
+	 * Get the [tas_evn_uid] column value.
+	 * 
+	 * @return     string
+	 */
+	public function getTasEvnUid()
+	{
+
+		return $this->tas_evn_uid;
+	}
+
+	/**
+	 * Get the [tas_boundary] column value.
+	 * 
+	 * @return     string
+	 */
+	public function getTasBoundary()
+	{
+
+		return $this->tas_boundary;
+	}
+
 	/**
 	 * Set the value of [pro_uid] column.
 	 * 
@@ -905,6 +1013,50 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 
 	} // setTasAssignVariable()
 
+	/**
+	 * Set the value of [tas_mi_instance_variable] column.
+	 * 
+	 * @param      string $v new value
+	 * @return     void
+	 */
+	public function setTasMiInstanceVariable($v)
+	{
+
+		// Since the native PHP type for this column is string,
+		// we will cast the input to a string (if it is not).
+		if ($v !== null && !is_string($v)) {
+			$v = (string) $v; 
+		}
+
+		if ($this->tas_mi_instance_variable !== $v || $v === '@@SYS_VAR_TOTAL_INSTANCE') {
+			$this->tas_mi_instance_variable = $v;
+			$this->modifiedColumns[] = TaskPeer::TAS_MI_INSTANCE_VARIABLE;
+		}
+
+	} // setTasMiInstanceVariable()
+
+	/**
+	 * Set the value of [tas_mi_complete_variable] column.
+	 * 
+	 * @param      string $v new value
+	 * @return     void
+	 */
+	public function setTasMiCompleteVariable($v)
+	{
+
+		// Since the native PHP type for this column is string,
+		// we will cast the input to a string (if it is not).
+		if ($v !== null && !is_string($v)) {
+			$v = (string) $v; 
+		}
+
+		if ($this->tas_mi_complete_variable !== $v || $v === '@@SYS_VAR_TOTAL_INSTANCES_COMPLETE') {
+			$this->tas_mi_complete_variable = $v;
+			$this->modifiedColumns[] = TaskPeer::TAS_MI_COMPLETE_VARIABLE;
+		}
+
+	} // setTasMiCompleteVariable()
+
 	/**
 	 * Set the value of [tas_assign_location] column.
 	 * 
@@ -1367,6 +1519,50 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 
 	} // setTasPosy()
 
+	/**
+	 * Set the value of [tas_width] column.
+	 * 
+	 * @param      int $v new value
+	 * @return     void
+	 */
+	public function setTasWidth($v)
+	{
+
+		// Since the native PHP type for this column is integer,
+		// we will cast the input value to an int (if it is not).
+		if ($v !== null && !is_int($v) && is_numeric($v)) {
+			$v = (int) $v;
+		}
+
+		if ($this->tas_width !== $v || $v === 110) {
+			$this->tas_width = $v;
+			$this->modifiedColumns[] = TaskPeer::TAS_WIDTH;
+		}
+
+	} // setTasWidth()
+
+	/**
+	 * Set the value of [tas_height] column.
+	 * 
+	 * @param      int $v new value
+	 * @return     void
+	 */
+	public function setTasHeight($v)
+	{
+
+		// Since the native PHP type for this column is integer,
+		// we will cast the input value to an int (if it is not).
+		if ($v !== null && !is_int($v) && is_numeric($v)) {
+			$v = (int) $v;
+		}
+
+		if ($this->tas_height !== $v || $v === 60) {
+			$this->tas_height = $v;
+			$this->modifiedColumns[] = TaskPeer::TAS_HEIGHT;
+		}
+
+	} // setTasHeight()
+
 	/**
 	 * Set the value of [tas_color] column.
 	 * 
@@ -1389,6 +1585,50 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 
 	} // setTasColor()
 
+	/**
+	 * Set the value of [tas_evn_uid] column.
+	 * 
+	 * @param      string $v new value
+	 * @return     void
+	 */
+	public function setTasEvnUid($v)
+	{
+
+		// Since the native PHP type for this column is string,
+		// we will cast the input to a string (if it is not).
+		if ($v !== null && !is_string($v)) {
+			$v = (string) $v; 
+		}
+
+		if ($this->tas_evn_uid !== $v || $v === '') {
+			$this->tas_evn_uid = $v;
+			$this->modifiedColumns[] = TaskPeer::TAS_EVN_UID;
+		}
+
+	} // setTasEvnUid()
+
+	/**
+	 * Set the value of [tas_boundary] column.
+	 * 
+	 * @param      string $v new value
+	 * @return     void
+	 */
+	public function setTasBoundary($v)
+	{
+
+		// Since the native PHP type for this column is string,
+		// we will cast the input to a string (if it is not).
+		if ($v !== null && !is_string($v)) {
+			$v = (string) $v; 
+		}
+
+		if ($this->tas_boundary !== $v || $v === '') {
+			$this->tas_boundary = $v;
+			$this->modifiedColumns[] = TaskPeer::TAS_BOUNDARY;
+		}
+
+	} // setTasBoundary()
+
 	/**
 	 * Hydrates (populates) the object variables with values from the database resultset.
 	 *
@@ -1430,56 +1670,68 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 
 			$this->tas_assign_variable = $rs->getString($startcol + 11);
 
-			$this->tas_assign_location = $rs->getString($startcol + 12);
+			$this->tas_mi_instance_variable = $rs->getString($startcol + 12);
 
-			$this->tas_assign_location_adhoc = $rs->getString($startcol + 13);
+			$this->tas_mi_complete_variable = $rs->getString($startcol + 13);
 
-			$this->tas_transfer_fly = $rs->getString($startcol + 14);
+			$this->tas_assign_location = $rs->getString($startcol + 14);
 
-			$this->tas_last_assigned = $rs->getString($startcol + 15);
+			$this->tas_assign_location_adhoc = $rs->getString($startcol + 15);
 
-			$this->tas_user = $rs->getString($startcol + 16);
+			$this->tas_transfer_fly = $rs->getString($startcol + 16);
 
-			$this->tas_can_upload = $rs->getString($startcol + 17);
+			$this->tas_last_assigned = $rs->getString($startcol + 17);
 
-			$this->tas_view_upload = $rs->getString($startcol + 18);
+			$this->tas_user = $rs->getString($startcol + 18);
 
-			$this->tas_view_additional_documentation = $rs->getString($startcol + 19);
+			$this->tas_can_upload = $rs->getString($startcol + 19);
 
-			$this->tas_can_cancel = $rs->getString($startcol + 20);
+			$this->tas_view_upload = $rs->getString($startcol + 20);
 
-			$this->tas_owner_app = $rs->getString($startcol + 21);
+			$this->tas_view_additional_documentation = $rs->getString($startcol + 21);
 
-			$this->stg_uid = $rs->getString($startcol + 22);
+			$this->tas_can_cancel = $rs->getString($startcol + 22);
 
-			$this->tas_can_pause = $rs->getString($startcol + 23);
+			$this->tas_owner_app = $rs->getString($startcol + 23);
 
-			$this->tas_can_send_message = $rs->getString($startcol + 24);
+			$this->stg_uid = $rs->getString($startcol + 24);
 
-			$this->tas_can_delete_docs = $rs->getString($startcol + 25);
+			$this->tas_can_pause = $rs->getString($startcol + 25);
 
-			$this->tas_self_service = $rs->getString($startcol + 26);
+			$this->tas_can_send_message = $rs->getString($startcol + 26);
 
-			$this->tas_start = $rs->getString($startcol + 27);
+			$this->tas_can_delete_docs = $rs->getString($startcol + 27);
 
-			$this->tas_to_last_user = $rs->getString($startcol + 28);
+			$this->tas_self_service = $rs->getString($startcol + 28);
 
-			$this->tas_send_last_email = $rs->getString($startcol + 29);
+			$this->tas_start = $rs->getString($startcol + 29);
 
-			$this->tas_derivation = $rs->getString($startcol + 30);
+			$this->tas_to_last_user = $rs->getString($startcol + 30);
 
-			$this->tas_posx = $rs->getInt($startcol + 31);
+			$this->tas_send_last_email = $rs->getString($startcol + 31);
 
-			$this->tas_posy = $rs->getInt($startcol + 32);
+			$this->tas_derivation = $rs->getString($startcol + 32);
 
-			$this->tas_color = $rs->getString($startcol + 33);
+			$this->tas_posx = $rs->getInt($startcol + 33);
+
+			$this->tas_posy = $rs->getInt($startcol + 34);
+
+			$this->tas_width = $rs->getInt($startcol + 35);
+
+			$this->tas_height = $rs->getInt($startcol + 36);
+
+			$this->tas_color = $rs->getString($startcol + 37);
+
+			$this->tas_evn_uid = $rs->getString($startcol + 38);
+
+			$this->tas_boundary = $rs->getString($startcol + 39);
 
 			$this->resetModified();
 
 			$this->setNew(false);
 
 			// FIXME - using NUM_COLUMNS may be clearer.
-			return $startcol + 34; // 34 = TaskPeer::NUM_COLUMNS - TaskPeer::NUM_LAZY_LOAD_COLUMNS).
+			return $startcol + 40; // 40 = TaskPeer::NUM_COLUMNS - TaskPeer::NUM_LAZY_LOAD_COLUMNS).
 
 		} catch (Exception $e) {
 			throw new PropelException("Error populating Task object", $e);
@@ -1719,71 +1971,89 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 				return $this->getTasAssignVariable();
 				break;
 			case 12:
-				return $this->getTasAssignLocation();
+				return $this->getTasMiInstanceVariable();
 				break;
 			case 13:
-				return $this->getTasAssignLocationAdhoc();
+				return $this->getTasMiCompleteVariable();
 				break;
 			case 14:
-				return $this->getTasTransferFly();
+				return $this->getTasAssignLocation();
 				break;
 			case 15:
-				return $this->getTasLastAssigned();
+				return $this->getTasAssignLocationAdhoc();
 				break;
 			case 16:
-				return $this->getTasUser();
+				return $this->getTasTransferFly();
 				break;
 			case 17:
-				return $this->getTasCanUpload();
+				return $this->getTasLastAssigned();
 				break;
 			case 18:
-				return $this->getTasViewUpload();
+				return $this->getTasUser();
 				break;
 			case 19:
-				return $this->getTasViewAdditionalDocumentation();
+				return $this->getTasCanUpload();
 				break;
 			case 20:
-				return $this->getTasCanCancel();
+				return $this->getTasViewUpload();
 				break;
 			case 21:
-				return $this->getTasOwnerApp();
+				return $this->getTasViewAdditionalDocumentation();
 				break;
 			case 22:
-				return $this->getStgUid();
+				return $this->getTasCanCancel();
 				break;
 			case 23:
-				return $this->getTasCanPause();
+				return $this->getTasOwnerApp();
 				break;
 			case 24:
-				return $this->getTasCanSendMessage();
+				return $this->getStgUid();
 				break;
 			case 25:
-				return $this->getTasCanDeleteDocs();
+				return $this->getTasCanPause();
 				break;
 			case 26:
-				return $this->getTasSelfService();
+				return $this->getTasCanSendMessage();
 				break;
 			case 27:
-				return $this->getTasStart();
+				return $this->getTasCanDeleteDocs();
 				break;
 			case 28:
-				return $this->getTasToLastUser();
+				return $this->getTasSelfService();
 				break;
 			case 29:
-				return $this->getTasSendLastEmail();
+				return $this->getTasStart();
 				break;
 			case 30:
-				return $this->getTasDerivation();
+				return $this->getTasToLastUser();
 				break;
 			case 31:
-				return $this->getTasPosx();
+				return $this->getTasSendLastEmail();
 				break;
 			case 32:
-				return $this->getTasPosy();
+				return $this->getTasDerivation();
 				break;
 			case 33:
+				return $this->getTasPosx();
+				break;
+			case 34:
+				return $this->getTasPosy();
+				break;
+			case 35:
+				return $this->getTasWidth();
+				break;
+			case 36:
+				return $this->getTasHeight();
+				break;
+			case 37:
 				return $this->getTasColor();
 				break;
+			case 38:
+				return $this->getTasEvnUid();
+				break;
+			case 39:
+				return $this->getTasBoundary();
+				break;
 			default:
 				return null;
 				break;
@@ -1816,28 +2086,34 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 			$keys[9] => $this->getTasPriorityVariable(),
 			$keys[10] => $this->getTasAssignType(),
 			$keys[11] => $this->getTasAssignVariable(),
-			$keys[12] => $this->getTasAssignLocation(),
-			$keys[13] => $this->getTasAssignLocationAdhoc(),
-			$keys[14] => $this->getTasTransferFly(),
-			$keys[15] => $this->getTasLastAssigned(),
-			$keys[16] => $this->getTasUser(),
-			$keys[17] => $this->getTasCanUpload(),
-			$keys[18] => $this->getTasViewUpload(),
-			$keys[19] => $this->getTasViewAdditionalDocumentation(),
-			$keys[20] => $this->getTasCanCancel(),
-			$keys[21] => $this->getTasOwnerApp(),
-			$keys[22] => $this->getStgUid(),
-			$keys[23] => $this->getTasCanPause(),
-			$keys[24] => $this->getTasCanSendMessage(),
-			$keys[25] => $this->getTasCanDeleteDocs(),
-			$keys[26] => $this->getTasSelfService(),
-			$keys[27] => $this->getTasStart(),
-			$keys[28] => $this->getTasToLastUser(),
-			$keys[29] => $this->getTasSendLastEmail(),
-			$keys[30] => $this->getTasDerivation(),
-			$keys[31] => $this->getTasPosx(),
-			$keys[32] => $this->getTasPosy(),
-			$keys[33] => $this->getTasColor(),
+			$keys[12] => $this->getTasMiInstanceVariable(),
+			$keys[13] => $this->getTasMiCompleteVariable(),
+			$keys[14] => $this->getTasAssignLocation(),
+			$keys[15] => $this->getTasAssignLocationAdhoc(),
+			$keys[16] => $this->getTasTransferFly(),
+			$keys[17] => $this->getTasLastAssigned(),
+			$keys[18] => $this->getTasUser(),
+			$keys[19] => $this->getTasCanUpload(),
+			$keys[20] => $this->getTasViewUpload(),
+			$keys[21] => $this->getTasViewAdditionalDocumentation(),
+			$keys[22] => $this->getTasCanCancel(),
+			$keys[23] => $this->getTasOwnerApp(),
+			$keys[24] => $this->getStgUid(),
+			$keys[25] => $this->getTasCanPause(),
+			$keys[26] => $this->getTasCanSendMessage(),
+			$keys[27] => $this->getTasCanDeleteDocs(),
+			$keys[28] => $this->getTasSelfService(),
+			$keys[29] => $this->getTasStart(),
+			$keys[30] => $this->getTasToLastUser(),
+			$keys[31] => $this->getTasSendLastEmail(),
+			$keys[32] => $this->getTasDerivation(),
+			$keys[33] => $this->getTasPosx(),
+			$keys[34] => $this->getTasPosy(),
+			$keys[35] => $this->getTasWidth(),
+			$keys[36] => $this->getTasHeight(),
+			$keys[37] => $this->getTasColor(),
+			$keys[38] => $this->getTasEvnUid(),
+			$keys[39] => $this->getTasBoundary(),
 		);
 		return $result;
 	}
@@ -1906,71 +2182,89 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 				$this->setTasAssignVariable($value);
 				break;
 			case 12:
-				$this->setTasAssignLocation($value);
+				$this->setTasMiInstanceVariable($value);
 				break;
 			case 13:
-				$this->setTasAssignLocationAdhoc($value);
+				$this->setTasMiCompleteVariable($value);
 				break;
 			case 14:
-				$this->setTasTransferFly($value);
+				$this->setTasAssignLocation($value);
 				break;
 			case 15:
-				$this->setTasLastAssigned($value);
+				$this->setTasAssignLocationAdhoc($value);
 				break;
 			case 16:
-				$this->setTasUser($value);
+				$this->setTasTransferFly($value);
 				break;
 			case 17:
-				$this->setTasCanUpload($value);
+				$this->setTasLastAssigned($value);
 				break;
 			case 18:
-				$this->setTasViewUpload($value);
+				$this->setTasUser($value);
 				break;
 			case 19:
-				$this->setTasViewAdditionalDocumentation($value);
+				$this->setTasCanUpload($value);
 				break;
 			case 20:
-				$this->setTasCanCancel($value);
+				$this->setTasViewUpload($value);
 				break;
 			case 21:
-				$this->setTasOwnerApp($value);
+				$this->setTasViewAdditionalDocumentation($value);
 				break;
 			case 22:
-				$this->setStgUid($value);
+				$this->setTasCanCancel($value);
 				break;
 			case 23:
-				$this->setTasCanPause($value);
+				$this->setTasOwnerApp($value);
 				break;
 			case 24:
-				$this->setTasCanSendMessage($value);
+				$this->setStgUid($value);
 				break;
 			case 25:
-				$this->setTasCanDeleteDocs($value);
+				$this->setTasCanPause($value);
 				break;
 			case 26:
-				$this->setTasSelfService($value);
+				$this->setTasCanSendMessage($value);
 				break;
 			case 27:
-				$this->setTasStart($value);
+				$this->setTasCanDeleteDocs($value);
 				break;
 			case 28:
-				$this->setTasToLastUser($value);
+				$this->setTasSelfService($value);
 				break;
 			case 29:
-				$this->setTasSendLastEmail($value);
+				$this->setTasStart($value);
 				break;
 			case 30:
-				$this->setTasDerivation($value);
+				$this->setTasToLastUser($value);
 				break;
 			case 31:
-				$this->setTasPosx($value);
+				$this->setTasSendLastEmail($value);
 				break;
 			case 32:
-				$this->setTasPosy($value);
+				$this->setTasDerivation($value);
 				break;
 			case 33:
+				$this->setTasPosx($value);
+				break;
+			case 34:
+				$this->setTasPosy($value);
+				break;
+			case 35:
+				$this->setTasWidth($value);
+				break;
+			case 36:
+				$this->setTasHeight($value);
+				break;
+			case 37:
 				$this->setTasColor($value);
 				break;
+			case 38:
+				$this->setTasEvnUid($value);
+				break;
+			case 39:
+				$this->setTasBoundary($value);
+				break;
 		} // switch()
 	}
 
@@ -2006,28 +2300,34 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 		if (array_key_exists($keys[9], $arr)) $this->setTasPriorityVariable($arr[$keys[9]]);
 		if (array_key_exists($keys[10], $arr)) $this->setTasAssignType($arr[$keys[10]]);
 		if (array_key_exists($keys[11], $arr)) $this->setTasAssignVariable($arr[$keys[11]]);
-		if (array_key_exists($keys[12], $arr)) $this->setTasAssignLocation($arr[$keys[12]]);
-		if (array_key_exists($keys[13], $arr)) $this->setTasAssignLocationAdhoc($arr[$keys[13]]);
-		if (array_key_exists($keys[14], $arr)) $this->setTasTransferFly($arr[$keys[14]]);
-		if (array_key_exists($keys[15], $arr)) $this->setTasLastAssigned($arr[$keys[15]]);
-		if (array_key_exists($keys[16], $arr)) $this->setTasUser($arr[$keys[16]]);
-		if (array_key_exists($keys[17], $arr)) $this->setTasCanUpload($arr[$keys[17]]);
-		if (array_key_exists($keys[18], $arr)) $this->setTasViewUpload($arr[$keys[18]]);
-		if (array_key_exists($keys[19], $arr)) $this->setTasViewAdditionalDocumentation($arr[$keys[19]]);
-		if (array_key_exists($keys[20], $arr)) $this->setTasCanCancel($arr[$keys[20]]);
-		if (array_key_exists($keys[21], $arr)) $this->setTasOwnerApp($arr[$keys[21]]);
-		if (array_key_exists($keys[22], $arr)) $this->setStgUid($arr[$keys[22]]);
-		if (array_key_exists($keys[23], $arr)) $this->setTasCanPause($arr[$keys[23]]);
-		if (array_key_exists($keys[24], $arr)) $this->setTasCanSendMessage($arr[$keys[24]]);
-		if (array_key_exists($keys[25], $arr)) $this->setTasCanDeleteDocs($arr[$keys[25]]);
-		if (array_key_exists($keys[26], $arr)) $this->setTasSelfService($arr[$keys[26]]);
-		if (array_key_exists($keys[27], $arr)) $this->setTasStart($arr[$keys[27]]);
-		if (array_key_exists($keys[28], $arr)) $this->setTasToLastUser($arr[$keys[28]]);
-		if (array_key_exists($keys[29], $arr)) $this->setTasSendLastEmail($arr[$keys[29]]);
-		if (array_key_exists($keys[30], $arr)) $this->setTasDerivation($arr[$keys[30]]);
-		if (array_key_exists($keys[31], $arr)) $this->setTasPosx($arr[$keys[31]]);
-		if (array_key_exists($keys[32], $arr)) $this->setTasPosy($arr[$keys[32]]);
-		if (array_key_exists($keys[33], $arr)) $this->setTasColor($arr[$keys[33]]);
+		if (array_key_exists($keys[12], $arr)) $this->setTasMiInstanceVariable($arr[$keys[12]]);
+		if (array_key_exists($keys[13], $arr)) $this->setTasMiCompleteVariable($arr[$keys[13]]);
+		if (array_key_exists($keys[14], $arr)) $this->setTasAssignLocation($arr[$keys[14]]);
+		if (array_key_exists($keys[15], $arr)) $this->setTasAssignLocationAdhoc($arr[$keys[15]]);
+		if (array_key_exists($keys[16], $arr)) $this->setTasTransferFly($arr[$keys[16]]);
+		if (array_key_exists($keys[17], $arr)) $this->setTasLastAssigned($arr[$keys[17]]);
+		if (array_key_exists($keys[18], $arr)) $this->setTasUser($arr[$keys[18]]);
+		if (array_key_exists($keys[19], $arr)) $this->setTasCanUpload($arr[$keys[19]]);
+		if (array_key_exists($keys[20], $arr)) $this->setTasViewUpload($arr[$keys[20]]);
+		if (array_key_exists($keys[21], $arr)) $this->setTasViewAdditionalDocumentation($arr[$keys[21]]);
+		if (array_key_exists($keys[22], $arr)) $this->setTasCanCancel($arr[$keys[22]]);
+		if (array_key_exists($keys[23], $arr)) $this->setTasOwnerApp($arr[$keys[23]]);
+		if (array_key_exists($keys[24], $arr)) $this->setStgUid($arr[$keys[24]]);
+		if (array_key_exists($keys[25], $arr)) $this->setTasCanPause($arr[$keys[25]]);
+		if (array_key_exists($keys[26], $arr)) $this->setTasCanSendMessage($arr[$keys[26]]);
+		if (array_key_exists($keys[27], $arr)) $this->setTasCanDeleteDocs($arr[$keys[27]]);
+		if (array_key_exists($keys[28], $arr)) $this->setTasSelfService($arr[$keys[28]]);
+		if (array_key_exists($keys[29], $arr)) $this->setTasStart($arr[$keys[29]]);
+		if (array_key_exists($keys[30], $arr)) $this->setTasToLastUser($arr[$keys[30]]);
+		if (array_key_exists($keys[31], $arr)) $this->setTasSendLastEmail($arr[$keys[31]]);
+		if (array_key_exists($keys[32], $arr)) $this->setTasDerivation($arr[$keys[32]]);
+		if (array_key_exists($keys[33], $arr)) $this->setTasPosx($arr[$keys[33]]);
+		if (array_key_exists($keys[34], $arr)) $this->setTasPosy($arr[$keys[34]]);
+		if (array_key_exists($keys[35], $arr)) $this->setTasWidth($arr[$keys[35]]);
+		if (array_key_exists($keys[36], $arr)) $this->setTasHeight($arr[$keys[36]]);
+		if (array_key_exists($keys[37], $arr)) $this->setTasColor($arr[$keys[37]]);
+		if (array_key_exists($keys[38], $arr)) $this->setTasEvnUid($arr[$keys[38]]);
+		if (array_key_exists($keys[39], $arr)) $this->setTasBoundary($arr[$keys[39]]);
 	}
 
 	/**
@@ -2051,6 +2351,8 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 		if ($this->isColumnModified(TaskPeer::TAS_PRIORITY_VARIABLE)) $criteria->add(TaskPeer::TAS_PRIORITY_VARIABLE, $this->tas_priority_variable);
 		if ($this->isColumnModified(TaskPeer::TAS_ASSIGN_TYPE)) $criteria->add(TaskPeer::TAS_ASSIGN_TYPE, $this->tas_assign_type);
 		if ($this->isColumnModified(TaskPeer::TAS_ASSIGN_VARIABLE)) $criteria->add(TaskPeer::TAS_ASSIGN_VARIABLE, $this->tas_assign_variable);
+		if ($this->isColumnModified(TaskPeer::TAS_MI_INSTANCE_VARIABLE)) $criteria->add(TaskPeer::TAS_MI_INSTANCE_VARIABLE, $this->tas_mi_instance_variable);
+		if ($this->isColumnModified(TaskPeer::TAS_MI_COMPLETE_VARIABLE)) $criteria->add(TaskPeer::TAS_MI_COMPLETE_VARIABLE, $this->tas_mi_complete_variable);
 		if ($this->isColumnModified(TaskPeer::TAS_ASSIGN_LOCATION)) $criteria->add(TaskPeer::TAS_ASSIGN_LOCATION, $this->tas_assign_location);
 		if ($this->isColumnModified(TaskPeer::TAS_ASSIGN_LOCATION_ADHOC)) $criteria->add(TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, $this->tas_assign_location_adhoc);
 		if ($this->isColumnModified(TaskPeer::TAS_TRANSFER_FLY)) $criteria->add(TaskPeer::TAS_TRANSFER_FLY, $this->tas_transfer_fly);
@@ -2072,7 +2374,11 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 		if ($this->isColumnModified(TaskPeer::TAS_DERIVATION)) $criteria->add(TaskPeer::TAS_DERIVATION, $this->tas_derivation);
 		if ($this->isColumnModified(TaskPeer::TAS_POSX)) $criteria->add(TaskPeer::TAS_POSX, $this->tas_posx);
 		if ($this->isColumnModified(TaskPeer::TAS_POSY)) $criteria->add(TaskPeer::TAS_POSY, $this->tas_posy);
+		if ($this->isColumnModified(TaskPeer::TAS_WIDTH)) $criteria->add(TaskPeer::TAS_WIDTH, $this->tas_width);
+		if ($this->isColumnModified(TaskPeer::TAS_HEIGHT)) $criteria->add(TaskPeer::TAS_HEIGHT, $this->tas_height);
 		if ($this->isColumnModified(TaskPeer::TAS_COLOR)) $criteria->add(TaskPeer::TAS_COLOR, $this->tas_color);
+		if ($this->isColumnModified(TaskPeer::TAS_EVN_UID)) $criteria->add(TaskPeer::TAS_EVN_UID, $this->tas_evn_uid);
+		if ($this->isColumnModified(TaskPeer::TAS_BOUNDARY)) $criteria->add(TaskPeer::TAS_BOUNDARY, $this->tas_boundary);
 
 		return $criteria;
 	}
@@ -2149,6 +2455,10 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 
 		$copyObj->setTasAssignVariable($this->tas_assign_variable);
 
+		$copyObj->setTasMiInstanceVariable($this->tas_mi_instance_variable);
+
+		$copyObj->setTasMiCompleteVariable($this->tas_mi_complete_variable);
+
 		$copyObj->setTasAssignLocation($this->tas_assign_location);
 
 		$copyObj->setTasAssignLocationAdhoc($this->tas_assign_location_adhoc);
@@ -2191,8 +2501,16 @@ abstract class BaseTask extends BaseObject  implements Persistent {
 
 		$copyObj->setTasPosy($this->tas_posy);
 
+		$copyObj->setTasWidth($this->tas_width);
+
+		$copyObj->setTasHeight($this->tas_height);
+
 		$copyObj->setTasColor($this->tas_color);
 
+		$copyObj->setTasEvnUid($this->tas_evn_uid);
+
+		$copyObj->setTasBoundary($this->tas_boundary);
+
 
 		$copyObj->setNew(true);
 
diff --git a/workflow/engine/classes/model/om/BaseTaskPeer.php b/workflow/engine/classes/model/om/BaseTaskPeer.php
index 562bcb6bc..fa190f16c 100644
--- a/workflow/engine/classes/model/om/BaseTaskPeer.php
+++ b/workflow/engine/classes/model/om/BaseTaskPeer.php
@@ -24,7 +24,7 @@ abstract class BaseTaskPeer {
 	const CLASS_DEFAULT = 'classes.model.Task';
 
 	/** The total number of columns. */
-	const NUM_COLUMNS = 34;
+	const NUM_COLUMNS = 40;
 
 	/** The number of lazy-loaded columns. */
 	const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -66,6 +66,12 @@ abstract class BaseTaskPeer {
 	/** the column name for the TAS_ASSIGN_VARIABLE field */
 	const TAS_ASSIGN_VARIABLE = 'TASK.TAS_ASSIGN_VARIABLE';
 
+	/** the column name for the TAS_MI_INSTANCE_VARIABLE field */
+	const TAS_MI_INSTANCE_VARIABLE = 'TASK.TAS_MI_INSTANCE_VARIABLE';
+
+	/** the column name for the TAS_MI_COMPLETE_VARIABLE field */
+	const TAS_MI_COMPLETE_VARIABLE = 'TASK.TAS_MI_COMPLETE_VARIABLE';
+
 	/** the column name for the TAS_ASSIGN_LOCATION field */
 	const TAS_ASSIGN_LOCATION = 'TASK.TAS_ASSIGN_LOCATION';
 
@@ -129,9 +135,21 @@ abstract class BaseTaskPeer {
 	/** the column name for the TAS_POSY field */
 	const TAS_POSY = 'TASK.TAS_POSY';
 
+	/** the column name for the TAS_WIDTH field */
+	const TAS_WIDTH = 'TASK.TAS_WIDTH';
+
+	/** the column name for the TAS_HEIGHT field */
+	const TAS_HEIGHT = 'TASK.TAS_HEIGHT';
+
 	/** the column name for the TAS_COLOR field */
 	const TAS_COLOR = 'TASK.TAS_COLOR';
 
+	/** the column name for the TAS_EVN_UID field */
+	const TAS_EVN_UID = 'TASK.TAS_EVN_UID';
+
+	/** the column name for the TAS_BOUNDARY field */
+	const TAS_BOUNDARY = 'TASK.TAS_BOUNDARY';
+
 	/** The PHP to DB Name Mapping */
 	private static $phpNameMap = null;
 
@@ -143,10 +161,10 @@ abstract class BaseTaskPeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('ProUid', 'TasUid', 'TasType', 'TasDuration', 'TasDelayType', 'TasTemporizer', 'TasTypeDay', 'TasTimeunit', 'TasAlert', 'TasPriorityVariable', 'TasAssignType', 'TasAssignVariable', 'TasAssignLocation', 'TasAssignLocationAdhoc', 'TasTransferFly', 'TasLastAssigned', 'TasUser', 'TasCanUpload', 'TasViewUpload', 'TasViewAdditionalDocumentation', 'TasCanCancel', 'TasOwnerApp', 'StgUid', 'TasCanPause', 'TasCanSendMessage', 'TasCanDeleteDocs', 'TasSelfService', 'TasStart', 'TasToLastUser', 'TasSendLastEmail', 'TasDerivation', 'TasPosx', 'TasPosy', 'TasColor', ),
-		BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID, TaskPeer::TAS_UID, TaskPeer::TAS_TYPE, TaskPeer::TAS_DURATION, TaskPeer::TAS_DELAY_TYPE, TaskPeer::TAS_TEMPORIZER, TaskPeer::TAS_TYPE_DAY, TaskPeer::TAS_TIMEUNIT, TaskPeer::TAS_ALERT, TaskPeer::TAS_PRIORITY_VARIABLE, TaskPeer::TAS_ASSIGN_TYPE, TaskPeer::TAS_ASSIGN_VARIABLE, TaskPeer::TAS_ASSIGN_LOCATION, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, TaskPeer::TAS_TRANSFER_FLY, TaskPeer::TAS_LAST_ASSIGNED, TaskPeer::TAS_USER, TaskPeer::TAS_CAN_UPLOAD, TaskPeer::TAS_VIEW_UPLOAD, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION, TaskPeer::TAS_CAN_CANCEL, TaskPeer::TAS_OWNER_APP, TaskPeer::STG_UID, TaskPeer::TAS_CAN_PAUSE, TaskPeer::TAS_CAN_SEND_MESSAGE, TaskPeer::TAS_CAN_DELETE_DOCS, TaskPeer::TAS_SELF_SERVICE, TaskPeer::TAS_START, TaskPeer::TAS_TO_LAST_USER, TaskPeer::TAS_SEND_LAST_EMAIL, TaskPeer::TAS_DERIVATION, TaskPeer::TAS_POSX, TaskPeer::TAS_POSY, TaskPeer::TAS_COLOR, ),
-		BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'TAS_UID', 'TAS_TYPE', 'TAS_DURATION', 'TAS_DELAY_TYPE', 'TAS_TEMPORIZER', 'TAS_TYPE_DAY', 'TAS_TIMEUNIT', 'TAS_ALERT', 'TAS_PRIORITY_VARIABLE', 'TAS_ASSIGN_TYPE', 'TAS_ASSIGN_VARIABLE', 'TAS_ASSIGN_LOCATION', 'TAS_ASSIGN_LOCATION_ADHOC', 'TAS_TRANSFER_FLY', 'TAS_LAST_ASSIGNED', 'TAS_USER', 'TAS_CAN_UPLOAD', 'TAS_VIEW_UPLOAD', 'TAS_VIEW_ADDITIONAL_DOCUMENTATION', 'TAS_CAN_CANCEL', 'TAS_OWNER_APP', 'STG_UID', 'TAS_CAN_PAUSE', 'TAS_CAN_SEND_MESSAGE', 'TAS_CAN_DELETE_DOCS', 'TAS_SELF_SERVICE', 'TAS_START', 'TAS_TO_LAST_USER', 'TAS_SEND_LAST_EMAIL', 'TAS_DERIVATION', 'TAS_POSX', 'TAS_POSY', 'TAS_COLOR', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, )
+		BasePeer::TYPE_PHPNAME => array ('ProUid', 'TasUid', 'TasType', 'TasDuration', 'TasDelayType', 'TasTemporizer', 'TasTypeDay', 'TasTimeunit', 'TasAlert', 'TasPriorityVariable', 'TasAssignType', 'TasAssignVariable', 'TasMiInstanceVariable', 'TasMiCompleteVariable', 'TasAssignLocation', 'TasAssignLocationAdhoc', 'TasTransferFly', 'TasLastAssigned', 'TasUser', 'TasCanUpload', 'TasViewUpload', 'TasViewAdditionalDocumentation', 'TasCanCancel', 'TasOwnerApp', 'StgUid', 'TasCanPause', 'TasCanSendMessage', 'TasCanDeleteDocs', 'TasSelfService', 'TasStart', 'TasToLastUser', 'TasSendLastEmail', 'TasDerivation', 'TasPosx', 'TasPosy', 'TasWidth', 'TasHeight', 'TasColor', 'TasEvnUid', 'TasBoundary', ),
+		BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID, TaskPeer::TAS_UID, TaskPeer::TAS_TYPE, TaskPeer::TAS_DURATION, TaskPeer::TAS_DELAY_TYPE, TaskPeer::TAS_TEMPORIZER, TaskPeer::TAS_TYPE_DAY, TaskPeer::TAS_TIMEUNIT, TaskPeer::TAS_ALERT, TaskPeer::TAS_PRIORITY_VARIABLE, TaskPeer::TAS_ASSIGN_TYPE, TaskPeer::TAS_ASSIGN_VARIABLE, TaskPeer::TAS_MI_INSTANCE_VARIABLE, TaskPeer::TAS_MI_COMPLETE_VARIABLE, TaskPeer::TAS_ASSIGN_LOCATION, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, TaskPeer::TAS_TRANSFER_FLY, TaskPeer::TAS_LAST_ASSIGNED, TaskPeer::TAS_USER, TaskPeer::TAS_CAN_UPLOAD, TaskPeer::TAS_VIEW_UPLOAD, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION, TaskPeer::TAS_CAN_CANCEL, TaskPeer::TAS_OWNER_APP, TaskPeer::STG_UID, TaskPeer::TAS_CAN_PAUSE, TaskPeer::TAS_CAN_SEND_MESSAGE, TaskPeer::TAS_CAN_DELETE_DOCS, TaskPeer::TAS_SELF_SERVICE, TaskPeer::TAS_START, TaskPeer::TAS_TO_LAST_USER, TaskPeer::TAS_SEND_LAST_EMAIL, TaskPeer::TAS_DERIVATION, TaskPeer::TAS_POSX, TaskPeer::TAS_POSY, TaskPeer::TAS_WIDTH, TaskPeer::TAS_HEIGHT, TaskPeer::TAS_COLOR, TaskPeer::TAS_EVN_UID, TaskPeer::TAS_BOUNDARY, ),
+		BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'TAS_UID', 'TAS_TYPE', 'TAS_DURATION', 'TAS_DELAY_TYPE', 'TAS_TEMPORIZER', 'TAS_TYPE_DAY', 'TAS_TIMEUNIT', 'TAS_ALERT', 'TAS_PRIORITY_VARIABLE', 'TAS_ASSIGN_TYPE', 'TAS_ASSIGN_VARIABLE', 'TAS_MI_INSTANCE_VARIABLE', 'TAS_MI_COMPLETE_VARIABLE', 'TAS_ASSIGN_LOCATION', 'TAS_ASSIGN_LOCATION_ADHOC', 'TAS_TRANSFER_FLY', 'TAS_LAST_ASSIGNED', 'TAS_USER', 'TAS_CAN_UPLOAD', 'TAS_VIEW_UPLOAD', 'TAS_VIEW_ADDITIONAL_DOCUMENTATION', 'TAS_CAN_CANCEL', 'TAS_OWNER_APP', 'STG_UID', 'TAS_CAN_PAUSE', 'TAS_CAN_SEND_MESSAGE', 'TAS_CAN_DELETE_DOCS', 'TAS_SELF_SERVICE', 'TAS_START', 'TAS_TO_LAST_USER', 'TAS_SEND_LAST_EMAIL', 'TAS_DERIVATION', 'TAS_POSX', 'TAS_POSY', 'TAS_WIDTH', 'TAS_HEIGHT', 'TAS_COLOR', 'TAS_EVN_UID', 'TAS_BOUNDARY', ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, )
 	);
 
 	/**
@@ -156,10 +174,10 @@ abstract class BaseTaskPeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'TasUid' => 1, 'TasType' => 2, 'TasDuration' => 3, 'TasDelayType' => 4, 'TasTemporizer' => 5, 'TasTypeDay' => 6, 'TasTimeunit' => 7, 'TasAlert' => 8, 'TasPriorityVariable' => 9, 'TasAssignType' => 10, 'TasAssignVariable' => 11, 'TasAssignLocation' => 12, 'TasAssignLocationAdhoc' => 13, 'TasTransferFly' => 14, 'TasLastAssigned' => 15, 'TasUser' => 16, 'TasCanUpload' => 17, 'TasViewUpload' => 18, 'TasViewAdditionalDocumentation' => 19, 'TasCanCancel' => 20, 'TasOwnerApp' => 21, 'StgUid' => 22, 'TasCanPause' => 23, 'TasCanSendMessage' => 24, 'TasCanDeleteDocs' => 25, 'TasSelfService' => 26, 'TasStart' => 27, 'TasToLastUser' => 28, 'TasSendLastEmail' => 29, 'TasDerivation' => 30, 'TasPosx' => 31, 'TasPosy' => 32, 'TasColor' => 33, ),
-		BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID => 0, TaskPeer::TAS_UID => 1, TaskPeer::TAS_TYPE => 2, TaskPeer::TAS_DURATION => 3, TaskPeer::TAS_DELAY_TYPE => 4, TaskPeer::TAS_TEMPORIZER => 5, TaskPeer::TAS_TYPE_DAY => 6, TaskPeer::TAS_TIMEUNIT => 7, TaskPeer::TAS_ALERT => 8, TaskPeer::TAS_PRIORITY_VARIABLE => 9, TaskPeer::TAS_ASSIGN_TYPE => 10, TaskPeer::TAS_ASSIGN_VARIABLE => 11, TaskPeer::TAS_ASSIGN_LOCATION => 12, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC => 13, TaskPeer::TAS_TRANSFER_FLY => 14, TaskPeer::TAS_LAST_ASSIGNED => 15, TaskPeer::TAS_USER => 16, TaskPeer::TAS_CAN_UPLOAD => 17, TaskPeer::TAS_VIEW_UPLOAD => 18, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION => 19, TaskPeer::TAS_CAN_CANCEL => 20, TaskPeer::TAS_OWNER_APP => 21, TaskPeer::STG_UID => 22, TaskPeer::TAS_CAN_PAUSE => 23, TaskPeer::TAS_CAN_SEND_MESSAGE => 24, TaskPeer::TAS_CAN_DELETE_DOCS => 25, TaskPeer::TAS_SELF_SERVICE => 26, TaskPeer::TAS_START => 27, TaskPeer::TAS_TO_LAST_USER => 28, TaskPeer::TAS_SEND_LAST_EMAIL => 29, TaskPeer::TAS_DERIVATION => 30, TaskPeer::TAS_POSX => 31, TaskPeer::TAS_POSY => 32, TaskPeer::TAS_COLOR => 33, ),
-		BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'TAS_UID' => 1, 'TAS_TYPE' => 2, 'TAS_DURATION' => 3, 'TAS_DELAY_TYPE' => 4, 'TAS_TEMPORIZER' => 5, 'TAS_TYPE_DAY' => 6, 'TAS_TIMEUNIT' => 7, 'TAS_ALERT' => 8, 'TAS_PRIORITY_VARIABLE' => 9, 'TAS_ASSIGN_TYPE' => 10, 'TAS_ASSIGN_VARIABLE' => 11, 'TAS_ASSIGN_LOCATION' => 12, 'TAS_ASSIGN_LOCATION_ADHOC' => 13, 'TAS_TRANSFER_FLY' => 14, 'TAS_LAST_ASSIGNED' => 15, 'TAS_USER' => 16, 'TAS_CAN_UPLOAD' => 17, 'TAS_VIEW_UPLOAD' => 18, 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 19, 'TAS_CAN_CANCEL' => 20, 'TAS_OWNER_APP' => 21, 'STG_UID' => 22, 'TAS_CAN_PAUSE' => 23, 'TAS_CAN_SEND_MESSAGE' => 24, 'TAS_CAN_DELETE_DOCS' => 25, 'TAS_SELF_SERVICE' => 26, 'TAS_START' => 27, 'TAS_TO_LAST_USER' => 28, 'TAS_SEND_LAST_EMAIL' => 29, 'TAS_DERIVATION' => 30, 'TAS_POSX' => 31, 'TAS_POSY' => 32, 'TAS_COLOR' => 33, ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, )
+		BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'TasUid' => 1, 'TasType' => 2, 'TasDuration' => 3, 'TasDelayType' => 4, 'TasTemporizer' => 5, 'TasTypeDay' => 6, 'TasTimeunit' => 7, 'TasAlert' => 8, 'TasPriorityVariable' => 9, 'TasAssignType' => 10, 'TasAssignVariable' => 11, 'TasMiInstanceVariable' => 12, 'TasMiCompleteVariable' => 13, 'TasAssignLocation' => 14, 'TasAssignLocationAdhoc' => 15, 'TasTransferFly' => 16, 'TasLastAssigned' => 17, 'TasUser' => 18, 'TasCanUpload' => 19, 'TasViewUpload' => 20, 'TasViewAdditionalDocumentation' => 21, 'TasCanCancel' => 22, 'TasOwnerApp' => 23, 'StgUid' => 24, 'TasCanPause' => 25, 'TasCanSendMessage' => 26, 'TasCanDeleteDocs' => 27, 'TasSelfService' => 28, 'TasStart' => 29, 'TasToLastUser' => 30, 'TasSendLastEmail' => 31, 'TasDerivation' => 32, 'TasPosx' => 33, 'TasPosy' => 34, 'TasWidth' => 35, 'TasHeight' => 36, 'TasColor' => 37, 'TasEvnUid' => 38, 'TasBoundary' => 39, ),
+		BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID => 0, TaskPeer::TAS_UID => 1, TaskPeer::TAS_TYPE => 2, TaskPeer::TAS_DURATION => 3, TaskPeer::TAS_DELAY_TYPE => 4, TaskPeer::TAS_TEMPORIZER => 5, TaskPeer::TAS_TYPE_DAY => 6, TaskPeer::TAS_TIMEUNIT => 7, TaskPeer::TAS_ALERT => 8, TaskPeer::TAS_PRIORITY_VARIABLE => 9, TaskPeer::TAS_ASSIGN_TYPE => 10, TaskPeer::TAS_ASSIGN_VARIABLE => 11, TaskPeer::TAS_MI_INSTANCE_VARIABLE => 12, TaskPeer::TAS_MI_COMPLETE_VARIABLE => 13, TaskPeer::TAS_ASSIGN_LOCATION => 14, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC => 15, TaskPeer::TAS_TRANSFER_FLY => 16, TaskPeer::TAS_LAST_ASSIGNED => 17, TaskPeer::TAS_USER => 18, TaskPeer::TAS_CAN_UPLOAD => 19, TaskPeer::TAS_VIEW_UPLOAD => 20, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION => 21, TaskPeer::TAS_CAN_CANCEL => 22, TaskPeer::TAS_OWNER_APP => 23, TaskPeer::STG_UID => 24, TaskPeer::TAS_CAN_PAUSE => 25, TaskPeer::TAS_CAN_SEND_MESSAGE => 26, TaskPeer::TAS_CAN_DELETE_DOCS => 27, TaskPeer::TAS_SELF_SERVICE => 28, TaskPeer::TAS_START => 29, TaskPeer::TAS_TO_LAST_USER => 30, TaskPeer::TAS_SEND_LAST_EMAIL => 31, TaskPeer::TAS_DERIVATION => 32, TaskPeer::TAS_POSX => 33, TaskPeer::TAS_POSY => 34, TaskPeer::TAS_WIDTH => 35, TaskPeer::TAS_HEIGHT => 36, TaskPeer::TAS_COLOR => 37, TaskPeer::TAS_EVN_UID => 38, TaskPeer::TAS_BOUNDARY => 39, ),
+		BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'TAS_UID' => 1, 'TAS_TYPE' => 2, 'TAS_DURATION' => 3, 'TAS_DELAY_TYPE' => 4, 'TAS_TEMPORIZER' => 5, 'TAS_TYPE_DAY' => 6, 'TAS_TIMEUNIT' => 7, 'TAS_ALERT' => 8, 'TAS_PRIORITY_VARIABLE' => 9, 'TAS_ASSIGN_TYPE' => 10, 'TAS_ASSIGN_VARIABLE' => 11, 'TAS_MI_INSTANCE_VARIABLE' => 12, 'TAS_MI_COMPLETE_VARIABLE' => 13, 'TAS_ASSIGN_LOCATION' => 14, 'TAS_ASSIGN_LOCATION_ADHOC' => 15, 'TAS_TRANSFER_FLY' => 16, 'TAS_LAST_ASSIGNED' => 17, 'TAS_USER' => 18, 'TAS_CAN_UPLOAD' => 19, 'TAS_VIEW_UPLOAD' => 20, 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 21, 'TAS_CAN_CANCEL' => 22, 'TAS_OWNER_APP' => 23, 'STG_UID' => 24, 'TAS_CAN_PAUSE' => 25, 'TAS_CAN_SEND_MESSAGE' => 26, 'TAS_CAN_DELETE_DOCS' => 27, 'TAS_SELF_SERVICE' => 28, 'TAS_START' => 29, 'TAS_TO_LAST_USER' => 30, 'TAS_SEND_LAST_EMAIL' => 31, 'TAS_DERIVATION' => 32, 'TAS_POSX' => 33, 'TAS_POSY' => 34, 'TAS_WIDTH' => 35, 'TAS_HEIGHT' => 36, 'TAS_COLOR' => 37, 'TAS_EVN_UID' => 38, 'TAS_BOUNDARY' => 39, ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, )
 	);
 
 	/**
@@ -284,6 +302,10 @@ abstract class BaseTaskPeer {
 
 		$criteria->addSelectColumn(TaskPeer::TAS_ASSIGN_VARIABLE);
 
+		$criteria->addSelectColumn(TaskPeer::TAS_MI_INSTANCE_VARIABLE);
+
+		$criteria->addSelectColumn(TaskPeer::TAS_MI_COMPLETE_VARIABLE);
+
 		$criteria->addSelectColumn(TaskPeer::TAS_ASSIGN_LOCATION);
 
 		$criteria->addSelectColumn(TaskPeer::TAS_ASSIGN_LOCATION_ADHOC);
@@ -326,8 +348,16 @@ abstract class BaseTaskPeer {
 
 		$criteria->addSelectColumn(TaskPeer::TAS_POSY);
 
+		$criteria->addSelectColumn(TaskPeer::TAS_WIDTH);
+
+		$criteria->addSelectColumn(TaskPeer::TAS_HEIGHT);
+
 		$criteria->addSelectColumn(TaskPeer::TAS_COLOR);
 
+		$criteria->addSelectColumn(TaskPeer::TAS_EVN_UID);
+
+		$criteria->addSelectColumn(TaskPeer::TAS_BOUNDARY);
+
 	}
 
 	const COUNT = 'COUNT(TASK.TAS_UID)';
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 1707ce2ce..e2f2cdca3 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -2714,6 +2714,36 @@
         <parameter name="Extra" value=""/>
       </vendor>
     </column>
+    <column name="ROU_TO_PORT" type="INTEGER" required="true" default="1">
+      <vendor type="mysql">
+        <parameter name="Field" value="ROU_CASE"/>
+        <parameter name="Type" value="int(11)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value="1"/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
+    <column name="ROU_FROM_PORT" type="INTEGER" required="true" default="2">
+      <vendor type="mysql">
+        <parameter name="Field" value="ROU_CASE"/>
+        <parameter name="Type" value="int(11)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value="2"/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
+    <column name="ROU_EVN_UID" type="VARCHAR" size="32" required="true" default="">
+      <vendor type="mysql">
+        <parameter name="Field" value="ROU_EVN_UID"/>
+        <parameter name="Type" value="varchar(32)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value=""/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
     <validator column="ROU_UID">
       <rule name="maxLength" value="32" message="Route UID can be no larger than ${value} in size" />
       <rule name="required" message="Route UID is required." />
@@ -2730,7 +2760,7 @@
       <rule name="required" message="Next Task UID is required." />
     </validator>
     <validator column="ROU_TYPE">
-      <rule name="validValues" value="SEQUENTIAL|EVALUATE|SELECT|PARALLEL|PARALLEL-BY-EVALUATION|SEC-JOIN" message="Please select a valid Route Type." />
+      <rule name="validValues" value="SEQUENTIAL|EVALUATE|SELECT|PARALLEL|PARALLEL-BY-EVALUATION|SEC-JOIN|DISCRIMINATOR" message="Please select a valid Route Type." />
       <rule name="required" message="Route type is required." />
     </validator>
     <validator column="ROU_TO_LAST_USER">
@@ -3004,6 +3034,26 @@
         <parameter name="Extra" value=""/>
       </vendor>
     </column>
+    <column name="SWI_WIDTH" type="INTEGER" required="true" default="0">
+      <vendor type="mysql">
+        <parameter name="Field" value="SWI_WIDTH"/>
+        <parameter name="Type" value="int(11)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value="0"/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
+    <column name="SWI_HEIGHT" type="INTEGER" required="true" default="0">
+      <vendor type="mysql">
+        <parameter name="Field" value="SWI_HEIGHT"/>
+        <parameter name="Type" value="int(11)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value="0"/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
     <validator column="SWI_UID">
       <rule name="maxLength" value="32" message="Swimlane Element UID can be no larger than ${value} in size" />
       <rule name="required" message="Swimlane Element UID is required." />
@@ -3158,6 +3208,26 @@
         <parameter name="Extra" value=""/>
       </vendor>
     </column>
+    <column name="TAS_MI_INSTANCE_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_VAR_TOTAL_INSTANCE">
+      <vendor type="mysql">
+        <parameter name="Field" value="TAS_MI_INSTANCE_VARIABLE"/>
+        <parameter name="Type" value="varchar(100)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value="@@SYS_VAR_TOTAL_INSTANCE"/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
+    <column name="TAS_MI_COMPLETE_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_VAR_TOTAL_INSTANCES_COMPLETE">
+      <vendor type="mysql">
+        <parameter name="Field" value="	TAS_MI_COMPLETE_VARIABLE"/>
+        <parameter name="Type" value="varchar(100)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value="@@SYS_VAR_TOTAL_INSTANCES_COMPLETE"/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
     <column name="TAS_ASSIGN_LOCATION" type="VARCHAR" size="20" required="true" default="FALSE">
       <vendor type="mysql">
         <parameter name="Field" value="TAS_ASSIGN_LOCATION"/>
@@ -3368,6 +3438,26 @@
         <parameter name="Extra" value=""/>
       </vendor>
     </column>
+    <column name="TAS_WIDTH" type="INTEGER" required="true" default="110">
+      <vendor type="mysql">
+        <parameter name="Field" value="TAS_WIDTH"/>
+        <parameter name="Type" value="int(11)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value="0"/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
+    <column name="TAS_HEIGHT" type="INTEGER" required="true" default="60">
+      <vendor type="mysql">
+        <parameter name="Field" value="TAS_HEIGHT"/>
+        <parameter name="Type" value="int(11)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value="0"/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
     <column name="TAS_COLOR" type="VARCHAR" size="32" required="true" default="">
       <vendor type="mysql">
         <parameter name="Field" value="TAS_COLOR"/>
@@ -3378,6 +3468,26 @@
         <parameter name="Extra" value=""/>
       </vendor>
     </column>
+    <column name="TAS_EVN_UID" type="VARCHAR" size="32" required="true" default="">
+      <vendor type="mysql">
+        <parameter name="Field" value="TAS_EVN_UID"/>
+        <parameter name="Type" value="varchar(32)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value=""/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
+    <column name="TAS_BOUNDARY" type="VARCHAR" size="32" required="true" default="">
+      <vendor type="mysql">
+        <parameter name="Field" value="TAS_BOUNDARY"/>
+        <parameter name="Type" value="varchar(32)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value=""/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
     <validator column="TAS_TYPE">
       <rule name="validValues" value="NORMAL|ADHOC|SUBPROCESS" message="Please select a valid value for TAS_TYPE." />
     </validator>
@@ -3388,7 +3498,7 @@
       <rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ALERT." />
     </validator>
     <validator column="TAS_ASSIGN_TYPE">
-      <rule name="validValues" value="BALANCED|MANUAL|EVALUATE|REPORT_TO|SELF_SERVICE" message="Please select a valid value for TAS_ASSIGN_TYPE." />
+      <rule name="validValues" value="BALANCED|MANUAL|EVALUATE|REPORT_TO|SELF_SERVICE|STATIC_MI|CANCEL_MI" message="Please select a valid value for TAS_ASSIGN_TYPE." />
     </validator>
     <validator column="TAS_ASSIGN_LOCATION">
       <rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ASSIGN_LOCATION." />
@@ -6058,6 +6168,46 @@
         <parameter name="Extra" value=""/>
       </vendor>
     </column>
+    <column name="EVN_POSX" type="INTEGER" required="true" default="0">
+      <vendor type="mysql">
+        <parameter name="Field" value="EVN_POSX"/>
+        <parameter name="Type" value="int(11)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value="0"/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
+    <column name="EVN_POSY" type="INTEGER" required="true" default="0">
+      <vendor type="mysql">
+        <parameter name="Field" value="EVN_POSY"/>
+        <parameter name="Type" value="int(11)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value="0"/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
+    <column name="EVN_TYPE" type="VARCHAR" size="32" required="false" default="">
+      <vendor type="mysql">
+        <parameter name="Field" value="EVN_TYPE"/>
+        <parameter name="Type" value="varchar(32)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value=""/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
+    <column name="TAS_EVN_UID" type="VARCHAR" size="32" required="false" default="">
+      <vendor type="mysql">
+        <parameter name="Field" value="TAS_EVN_UID"/>
+        <parameter name="Type" value="varchar(32)"/>
+        <parameter name="Null" value="NO"/>
+        <parameter name="Key" value=""/>
+        <parameter name="Default" value=""/>
+        <parameter name="Extra" value=""/>
+      </vendor>
+    </column>
     <index name="indexEventTable">
       <index-column name="EVN_UID"/>
       <vendor type="mysql">
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index e4cf23fa0..aa743637e 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -465,6 +465,9 @@ CREATE TABLE `ROUTE`
 	`ROU_SEND_EMAIL` VARCHAR(20) default 'TRUE' NOT NULL,
 	`ROU_SOURCEANCHOR` INTEGER default 1,
 	`ROU_TARGETANCHOR` INTEGER default 0,
+	`ROU_TO_PORT` INTEGER default 1 NOT NULL,
+	`ROU_FROM_PORT` INTEGER default 2 NOT NULL,
+	`ROU_EVN_UID` VARCHAR(32) default '' NOT NULL,
 	PRIMARY KEY (`ROU_UID`)
 )Type=MyISAM  DEFAULT CHARSET='utf8' COMMENT='Differents flows for a flow in business process';
 #-----------------------------------------------------------------------------
@@ -517,6 +520,8 @@ CREATE TABLE `SWIMLANES_ELEMENTS`
 	`SWI_TYPE` VARCHAR(20) default 'LINE' NOT NULL,
 	`SWI_X` INTEGER default 0 NOT NULL,
 	`SWI_Y` INTEGER default 0 NOT NULL,
+	`SWI_WIDTH` INTEGER default 0 NOT NULL,
+	`SWI_HEIGHT` INTEGER default 0 NOT NULL,
 	PRIMARY KEY (`SWI_UID`)
 )Type=MyISAM  DEFAULT CHARSET='utf8';
 #-----------------------------------------------------------------------------
@@ -540,6 +545,8 @@ CREATE TABLE `TASK`
 	`TAS_PRIORITY_VARIABLE` VARCHAR(100) default '' NOT NULL,
 	`TAS_ASSIGN_TYPE` VARCHAR(30) default 'BALANCED' NOT NULL,
 	`TAS_ASSIGN_VARIABLE` VARCHAR(100) default '@@SYS_NEXT_USER_TO_BE_ASSIGNED' NOT NULL,
+	`TAS_MI_INSTANCE_VARIABLE` VARCHAR(100) default '@@SYS_VAR_TOTAL_INSTANCE' NOT NULL,
+	`TAS_MI_COMPLETE_VARIABLE` VARCHAR(100) default '@@SYS_VAR_TOTAL_INSTANCES_COMPLETE' NOT NULL,
 	`TAS_ASSIGN_LOCATION` VARCHAR(20) default 'FALSE' NOT NULL,
 	`TAS_ASSIGN_LOCATION_ADHOC` VARCHAR(20) default 'FALSE' NOT NULL,
 	`TAS_TRANSFER_FLY` VARCHAR(20) default 'FALSE' NOT NULL,
@@ -561,7 +568,11 @@ CREATE TABLE `TASK`
 	`TAS_DERIVATION` VARCHAR(100) default 'NORMAL' NOT NULL,
 	`TAS_POSX` INTEGER default 0 NOT NULL,
 	`TAS_POSY` INTEGER default 0 NOT NULL,
+	`TAS_WIDTH` INTEGER default 110 NOT NULL,
+	`TAS_HEIGHT` INTEGER default 60 NOT NULL,
 	`TAS_COLOR` VARCHAR(32) default '' NOT NULL,
+	`TAS_EVN_UID` VARCHAR(32) default '' NOT NULL,
+	`TAS_BOUNDARY` VARCHAR(32) default '' NOT NULL,
 	PRIMARY KEY (`TAS_UID`)
 )Type=MyISAM  DEFAULT CHARSET='utf8' COMMENT='Task of workflow';
 #-----------------------------------------------------------------------------
@@ -999,6 +1010,10 @@ CREATE TABLE `EVENT`
 	`EVN_CONDITIONS` TEXT,
 	`EVN_ACTION_PARAMETERS` TEXT,
 	`TRI_UID` VARCHAR(32) default '',
+	`EVN_POSX` INTEGER default 0 NOT NULL,
+	`EVN_POSY` INTEGER default 0 NOT NULL,
+	`EVN_TYPE` VARCHAR(32) default '',
+	`TAS_EVN_UID` VARCHAR(32) default '',
 	PRIMARY KEY (`EVN_UID`),
 	KEY `indexEventTable`(`EVN_UID`)
 )Type=MyISAM  DEFAULT CHARSET='utf8';