diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php
index 43565a61b..d4e708267 100644
--- a/workflow/engine/src/BusinessModel/Task.php
+++ b/workflow/engine/src/BusinessModel/Task.php
@@ -572,5 +572,678 @@ class Task
         }
 
     }
-}
 
+    /**
+     * Return a assignee list of an activity
+     *
+     * @param string $sProcessUID
+     * @param string $sTaskUID
+     * @param string $filter
+     * @param int    $start
+     * @param int    $limit
+     *
+     * return array
+     *
+     * @access public
+     */
+    public function getTaskAssignees($sProcessUID, $sTaskUID, $filter, $start, $limit)
+    {
+        try {
+            $aUsers = array();
+            $sDelimiter = \DBAdapter::getStringDelimiter();
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
+            $oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::USR_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_TYPE);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_RELATION);
+            $oCriteria->addAlias('C', 'CONTENT');
+            $aConditions = array();
+            $aConditions[] = array(\TaskUserPeer::USR_UID, 'C.CON_ID' );
+            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter );
+            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
+            $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
+            $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID);
+            $oCriteria->add(\TaskUserPeer::TU_TYPE, 1);
+            $oCriteria->add(\TaskUserPeer::TU_RELATION, 2);
+            $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            $c = 0;
+            while ($aRow = $oDataset->getRow()) {
+                $c++;
+                $oGroup = new \Groupwf();
+                $aFields = $oGroup->load($aRow['USR_UID']);
+                if ($aFields['GRP_STATUS'] == 'ACTIVE') {
+                    $oCriteria = new \Criteria('workflow');
+                    $oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER');
+                    $oCriteria->add(\GroupUserPeer::GRP_UID, $aRow['USR_UID']);
+                    $oDataset2 = \GroupUserPeer::doSelectRS($oCriteria);
+                    $oDataset2->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+                    $oDataset2->next();
+                    $aRow2 = $oDataset2->getRow();
+                } else {
+                    $aRow2['GROUP_INACTIVE'] = '(' . \G::LoadTranslation('ID_GROUP_INACTIVE') . ')';
+                }
+                $aUsers[] = array('aas_uid' => $aRow['USR_UID'],
+                                  'aas_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $aRow['GRP_TITLE'] .
+                                  ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' .
+                                  ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')) .
+                                  ')' . '' : $aRow['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']),
+                                  'aas_lastname' => "",
+                                  'aas_username' => "",
+                                  'aas_type' => "group");
+                $oDataset->next();
+            }
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::USR_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_TYPE);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_RELATION);
+            $oCriteria->addJoin(\TaskUserPeer::USR_UID, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN);
+            $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID);
+            $oCriteria->add(\TaskUserPeer::TU_TYPE, 1);
+            $oCriteria->add(\TaskUserPeer::TU_RELATION, 1);
+            $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            while ($aRow = $oDataset->getRow()) {
+                $aUsers[] = array('aas_uid' => $aRow['USR_UID'],
+                                  'aas_name' => $aRow['USR_FIRSTNAME'],
+                                  'aas_lastname' => $aRow['USR_LASTNAME'],
+                                  'aas_username' => $aRow['USR_USERNAME'],
+                                  'aas_type' => "user" );
+                $oDataset->next();
+            }
+            return $aUsers;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Return the available users and users groups to assigned to an activity
+     *
+     * @param string $sProcessUID
+     * @param string $sTaskUID
+     * @param string $filter
+     * @param int    $start
+     * @param int    $limit
+     *
+     * return array
+     *
+     * @access public
+     */
+    public function getTaskAvailableAssignee($sProcessUID, $sTaskUID, $filter, $start, $limit)
+    {
+        try {
+            $iType = 1;
+            $aUsers = array();
+            $oTasks = new \Tasks();
+            $aAux = $oTasks->getGroupsOfTask($sTaskUID, $iType);
+            $aUIDS1 = array();
+            $aUIDS2 = array();
+            foreach ($aAux as $aGroup) {
+                $aUIDS1[] = $aGroup['GRP_UID'];
+            }
+            $aAux = $oTasks->getUsersOfTask($sTaskUID, $iType);
+            foreach ($aAux as $aUser) {
+                $aUIDS2[] = $aUser['USR_UID'];
+            }
+            $aUsers = array();
+            $sDelimiter = \DBAdapter::getStringDelimiter();
+            $groups = new \Groupwf();
+            $start = '';
+            $limit = '';
+            $filter = '';
+            $result = $groups->getAllGroup($start, $limit, $filter);
+            $c = 0;
+            foreach ($result['rows'] as $results) {
+                if (!in_array($results['GRP_UID'], $aUIDS1)) {
+                    $c++;
+                    $oCriteria = new \Criteria('workflow');
+                    $oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER');
+                    $oCriteria->add(\GroupUserPeer::GRP_UID, $results['GRP_UID']);
+                    $oDataset2 = \GroupUserPeer::doSelectRS($oCriteria);
+                    $oDataset2->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+                    $oDataset2->next();
+                    $aRow2 = $oDataset2->getRow();
+                    $aUsers[] = array('aas_uid' => $results['GRP_UID'],
+                                      'aas_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $results['GRP_TITLE'] .
+                                           ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' .
+                                      ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')) .
+                                      ')' . '' : $aRow['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']),
+                                      'aas_lastname' => "",
+                                      'aas_username' => "",
+                                      'aas_type' => "group" );
+                }
+            }
+            $sDelimiter = \DBAdapter::getStringDelimiter();
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addSelectColumn(\UsersPeer::USR_UID);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
+            $oCriteria->add(\UsersPeer::USR_STATUS, 'ACTIVE');
+            $oCriteria->add(\UsersPeer::USR_UID, $aUIDS2, \Criteria::NOT_IN);
+            $oDataset = \UsersPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            while ($aRow = $oDataset->getRow()) {
+                $aUsers[] = array('aas_uid' => $aRow['USR_UID'],
+                                  'aas_name' => $aRow['USR_FIRSTNAME'],
+                                  'aas_lastname' => $aRow['USR_LASTNAME'],
+                                  'aas_username' => $aRow['USR_USERNAME'],
+                                  'aas_type' => "user" );
+                $oDataset->next();
+            }
+            return $aUsers;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Return a single user or group assigned to an activity
+     *
+     * @param string $sProcessUID
+     * @param string $sTaskUID
+     * @param string $sAssigneeUID
+     *
+     * return array
+     *
+     * @access public
+     */
+    public function getTaskAssignee($sProcessUID, $sTaskUID, $sAssigneeUID)
+    {
+        try {
+            $iType = 1;
+            $aUsers = array();
+            $sDelimiter = \DBAdapter::getStringDelimiter();
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
+            $oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::USR_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_TYPE);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_RELATION);
+            $oCriteria->addAlias('C', 'CONTENT');
+            $aConditions = array();
+            $aConditions[] = array(\TaskUserPeer::USR_UID, 'C.CON_ID' );
+            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter );
+            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
+            $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
+            $oCriteria->add(\TaskUserPeer::USR_UID, $sAssigneeUID);
+            $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID);
+            $oCriteria->add(\TaskUserPeer::TU_TYPE, $iType);
+            $oCriteria->add(\TaskUserPeer::TU_RELATION, 2);
+            $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            $c = 0;
+            while ($aRow = $oDataset->getRow()) {
+                $c++;
+                $oGroup = new \Groupwf();
+                $aFields = $oGroup->load($aRow['USR_UID']);
+                if ($aFields['GRP_STATUS'] == 'ACTIVE') {
+                    $oCriteria = new \Criteria('workflow');
+                    $oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER');
+                    $oCriteria->add(\GroupUserPeer::GRP_UID, $aRow['USR_UID']);
+                    $oDataset2 = \GroupUserPeer::doSelectRS($oCriteria);
+                    $oDataset2->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+                    $oDataset2->next();
+                    $aRow2 = $oDataset2->getRow();
+                } else {
+                    $aRow2['GROUP_INACTIVE'] = '(' . \G::LoadTranslation('ID_GROUP_INACTIVE') . ')';
+                }
+                $aUsers = array('aas_uid' => $aRow['USR_UID'],
+                                'aas_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $aRow['GRP_TITLE'] .
+                                ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' .
+                                ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')) .
+                                ')' . '' : $aRow['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']),
+                                'aas_lastname' => "",
+                                'aas_username' => "",
+                                'aas_type' => "group" );
+                $oDataset->next();
+            }
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::USR_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_TYPE);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_RELATION);
+            $oCriteria->addJoin(\TaskUserPeer::USR_UID, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN);
+            $oCriteria->add(\TaskUserPeer::USR_UID, $sAssigneeUID);
+            $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID);
+            $oCriteria->add(\TaskUserPeer::TU_TYPE, $iType);
+            $oCriteria->add(\TaskUserPeer::TU_RELATION, 1);
+            $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            while ($aRow = $oDataset->getRow()) {
+                $aUsers = array('aas_uid' => $aRow['USR_UID'],
+                                'aas_name' => $aRow['USR_FIRSTNAME'],
+                                'aas_lastname' => $aRow['USR_LASTNAME'],
+                                'aas_username' => $aRow['USR_USERNAME'],
+                                'aas_type' => "user" );
+                $oDataset->next();
+            }
+            return $aUsers;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Assign a user or group to an activity
+     *
+     * @param string $sProcessUID
+     * @param string $sTaskUID
+     * @param string $sAssigneeUID
+     * @param string $assType {@choice user,group}
+     *
+     * return array
+     *
+     * @access public
+     */
+    public function addTaskAssignee($sProcessUID, $sTaskUID, $sAssigneeUID, $assType)
+    {
+        try {
+            $iType = 1;
+            $oTaskUser = new \TaskUser();
+            if ($assType == "user") {
+                $oTaskUser->create(array('TAS_UID' => $sTaskUID,
+                                   'USR_UID' => $sAssigneeUID,
+                                   'TU_TYPE' => $iType,
+                                   'TU_RELATION' => 1));
+                return array('aas_uid' => $sAssigneeUID, 
+                             'aas_type' => $assType);
+            } else {
+                $oTaskUser->create(array('TAS_UID' => $sTaskUID,
+                                   'USR_UID' => $sAssigneeUID,
+                                   'TU_TYPE' => $iType,
+                                   'TU_RELATION' => 2));
+                return array('aas_uid' => $sAssigneeUID,
+                             'aas_type' => $assType);
+            }
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Remove a assignee of an activity
+     *
+     * @param string $sProcessUID
+     * @param string $sTaskUID
+     * @param string $sAssigneeUID
+     *
+     * @access public
+     */
+    public function removeTaskAssignee($sProcessUID, $sTaskUID, $sAssigneeUID)
+    {   
+        try {
+            $iType = 1;
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addSelectColumn( \TaskUserPeer::TU_RELATION );
+            $oCriteria->add(\TaskUserPeer::USR_UID, $sAssigneeUID);
+            $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID);
+            $oCriteria->add(\TaskUserPeer::TU_TYPE, $iType);
+            $oTaskUser = \TaskUserPeer::doSelectRS($oCriteria);
+            $oTaskUser->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            while ($oTaskUser->next()) {
+                $aRow = $oTaskUser->getRow();
+                $iRelation = $aRow['TU_RELATION'];
+            }
+            $oTaskUser = \TaskUserPeer::retrieveByPK($sTaskUID, $sAssigneeUID, $iType, $iRelation);
+            if (! is_null( $oTaskUser )) {
+                \TaskUserPeer::doDelete($oCriteria);
+            } else {
+                throw (new \Exception( 'This row does not exist!' ));
+            }
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Return a adhoc assignee list of an activity
+     *
+     * @param string $sProcessUID
+     * @param string $sTaskUID
+     *
+     * return array
+     *
+     * @access public
+     */
+    public function getTaskAdhocAssignees($sProcessUID, $sTaskUID)
+    {
+        try {
+            $aUsers = array();
+            $sDelimiter = \DBAdapter::getStringDelimiter();
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
+            $oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::USR_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_TYPE);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_RELATION);
+            $oCriteria->addAlias('C', 'CONTENT');
+            $aConditions = array();
+            $aConditions[] = array(\TaskUserPeer::USR_UID, 'C.CON_ID' );
+            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter );
+            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
+            $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
+            $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID);
+            $oCriteria->add(\TaskUserPeer::TU_TYPE, 2);
+            $oCriteria->add(\TaskUserPeer::TU_RELATION, 2);
+            $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            $c = 0;
+            while ($aRow = $oDataset->getRow()) {
+                $c++;
+                $oGroup = new \Groupwf();
+                $aFields = $oGroup->load($aRow['USR_UID']);
+                if ($aFields['GRP_STATUS'] == 'ACTIVE') {
+                    $oCriteria = new \Criteria('workflow');
+                    $oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER');
+                    $oCriteria->add(\GroupUserPeer::GRP_UID, $aRow['USR_UID']);
+                    $oDataset2 = \GroupUserPeer::doSelectRS($oCriteria);
+                    $oDataset2->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+                    $oDataset2->next();
+                    $aRow2 = $oDataset2->getRow();
+                } else {
+                    $aRow2['GROUP_INACTIVE'] = '(' . \G::LoadTranslation('ID_GROUP_INACTIVE') . ')';
+                }
+                $aUsers[] = array('aas_uid' => $aRow['USR_UID'],
+                                  'aas_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $aRow['GRP_TITLE'] .
+                                  ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' .
+                                  ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')) .
+                                  ')' . '' : $aRow['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']),
+                                  'aas_lastname' => "",
+                                  'aas_username' => "",
+                                  'aas_type' => "group");
+                $oDataset->next();
+            }
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::USR_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_TYPE);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_RELATION);
+            $oCriteria->addJoin(\TaskUserPeer::USR_UID, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN);
+            $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID);
+            $oCriteria->add(\TaskUserPeer::TU_TYPE, 2);
+            $oCriteria->add(\TaskUserPeer::TU_RELATION, 1);
+            $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            while ($aRow = $oDataset->getRow()) {
+                $aUsers[] = array('aas_uid' => $aRow['USR_UID'],
+                                  'aas_name' => $aRow['USR_FIRSTNAME'],
+                                  'aas_lastname' => $aRow['USR_LASTNAME'],
+                                  'aas_username' => $aRow['USR_USERNAME'],
+                                  'aas_type' => "user" );
+                $oDataset->next();
+            }
+            return $aUsers;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Return the available adhoc users and users groups to assigned to an activity
+     *
+     * @param string $sProcessUID
+     * @param string $sTaskUID
+     *
+     * return array
+     *
+     * @access public
+     */
+    public function getTaskAvailableAdhocAssignee($sProcessUID, $sTaskUID)
+    {
+        try {
+            $iType = 2;
+            $aUsers = array();
+            $oTasks = new \Tasks();
+            $aAux = $oTasks->getGroupsOfTask($sTaskUID, $iType);
+            $aUIDS1 = array();
+            $aUIDS2 = array();
+            foreach ($aAux as $aGroup) {
+                $aUIDS1[] = $aGroup['GRP_UID'];
+            }
+            $aAux = $oTasks->getUsersOfTask($sTaskUID, $iType);
+            foreach ($aAux as $aUser) {
+                $aUIDS2[] = $aUser['USR_UID'];
+            }
+            $aUsers = array();
+            $sDelimiter = \DBAdapter::getStringDelimiter();
+            $groups = new \Groupwf();
+            $start = '';
+            $limit = '';
+            $filter = '';
+            $result = $groups->getAllGroup($start, $limit, $filter);
+            $c = 0;
+            foreach ($result['rows'] as $results) {
+                if (!in_array($results['GRP_UID'], $aUIDS1)) {
+                    $c++;
+                    $oCriteria = new \Criteria('workflow');
+                    $oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER');
+                    $oCriteria->add(\GroupUserPeer::GRP_UID, $results['GRP_UID']);
+                    $oDataset2 = \GroupUserPeer::doSelectRS($oCriteria);
+                    $oDataset2->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+                    $oDataset2->next();
+                    $aRow2 = $oDataset2->getRow();
+                    $aUsers[] = array('aas_uid' => $results['GRP_UID'],
+                                      'aas_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $results['GRP_TITLE'] .
+                                      ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' .
+                                      ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')) .
+                                      ')' . '' : $aRow['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']),
+                                      'aas_lastname' => "",
+                                      'aas_username' => "",
+                                      'aas_type' => "group" );
+                }
+            }
+            $sDelimiter = \DBAdapter::getStringDelimiter();
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addSelectColumn(\UsersPeer::USR_UID);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
+            $oCriteria->add(\UsersPeer::USR_STATUS, 'ACTIVE');
+            $oCriteria->add(\UsersPeer::USR_UID, $aUIDS2, \Criteria::NOT_IN);
+            $oDataset = \UsersPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            while ($aRow = $oDataset->getRow()) {
+                $aUsers[] = array('aas_uid' => $aRow['USR_UID'],
+                                  'aas_name' => $aRow['USR_FIRSTNAME'],
+                                  'aas_lastname' => $aRow['USR_LASTNAME'],
+                                  'aas_username' => $aRow['USR_USERNAME'],
+                                  'aas_type' => "user" );
+                $oDataset->next();
+            }
+            return $aUsers;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Return a single Adhoc user or group assigned to an activity
+     *
+     * @param string $sProcessUID
+     * @param string $sTaskUID
+     * @param string $sAssigneeUID
+     *
+     * return array
+     *
+     * @access public
+     */
+    public function getTaskAdhocAssignee($sProcessUID, $sTaskUID, $sAssigneeUID)
+    {
+        try {
+            $iType = 2;
+            $aUsers = array();
+            $sDelimiter = \DBAdapter::getStringDelimiter();
+            $oCriteria = new \Criteria('workflow'   );
+            $oCriteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
+            $oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::USR_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_TYPE);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_RELATION);
+            $oCriteria->addAlias('C', 'CONTENT');
+            $aConditions = array();
+            $aConditions[] = array(\TaskUserPeer::USR_UID, 'C.CON_ID' );
+            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter );
+            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
+            $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
+            $oCriteria->add(\TaskUserPeer::USR_UID, $sAssigneeUID);
+            $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID);
+            $oCriteria->add(\TaskUserPeer::TU_TYPE, $iType);
+            $oCriteria->add(\TaskUserPeer::TU_RELATION, 2);
+            $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            $c = 0;
+            while ($aRow = $oDataset->getRow()) {
+                $c++;
+                $oGroup = new \Groupwf();
+                $aFields = $oGroup->load($aRow['USR_UID']);
+                if ($aFields['GRP_STATUS'] == 'ACTIVE') {
+                    $oCriteria = new \Criteria('workflow');
+                    $oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER');
+                    $oCriteria->add(\GroupUserPeer::GRP_UID, $aRow['USR_UID']);
+                    $oDataset2 = \GroupUserPeer::doSelectRS($oCriteria);
+                    $oDataset2->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+                    $oDataset2->next();
+                    $aRow2 = $oDataset2->getRow();
+                } else {
+                    $aRow2['GROUP_INACTIVE'] = '(' . \G::LoadTranslation('ID_GROUP_INACTIVE') . ')';
+                }
+                $aUsers = array('aas_uid' => $aRow['USR_UID'],
+                                'aas_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $aRow['GRP_TITLE'] .
+                                ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' .
+                                ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')) .
+                                ')' . '' : $aRow['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']),
+                                'aas_lastname' => "",
+                                'aas_username' => "",
+                                'aas_type' => "group" );
+                $oDataset->next();
+            }
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
+            $oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::USR_UID);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_TYPE);
+            $oCriteria->addSelectColumn(\TaskUserPeer::TU_RELATION);
+            $oCriteria->addJoin(\TaskUserPeer::USR_UID, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN);
+            $oCriteria->add(\TaskUserPeer::USR_UID, $sAssigneeUID);
+            $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID);
+            $oCriteria->add(\TaskUserPeer::TU_TYPE, $iType);
+            $oCriteria->add(\TaskUserPeer::TU_RELATION, 1);
+            $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            while ($aRow = $oDataset->getRow()) {
+                $aUsers = array('aas_uid' => $aRow['USR_UID'],
+                                'aas_name' => $aRow['USR_FIRSTNAME'],
+                                'aas_lastname' => $aRow['USR_LASTNAME'],
+                                'aas_username' => $aRow['USR_USERNAME'],
+                                'aas_type' => "user" );
+                $oDataset->next();
+            }
+            return $aUsers;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Assign a Adhoc user or group to an activity
+     *
+     * @param string $sProcessUID
+     * @param string $sTaskUID
+     * @param string $sAssigneeUID
+     * @param string $assType
+     *
+     * return array
+     *
+     * @access public
+     */
+    public function addTaskAdhocAssignee($sProcessUID, $sTaskUID, $sAssigneeUID, $assType)
+    {
+        try {
+            $iType = 2;
+            $oTaskUser = new \TaskUser();
+            if ($assType == "user") {
+                $oTaskUser->create(array('TAS_UID' => $sTaskUID,
+                                   'USR_UID' => $sAssigneeUID,
+                                   'TU_TYPE' => $iType,
+                                   'TU_RELATION' => 1));
+                return array('aas_uid' => $sAssigneeUID,
+                             'aas_type' => $assType);
+            } else {
+                $oTaskUser->create(array('TAS_UID' => $sTaskUID,
+                                   'USR_UID' => $sAssigneeUID,
+                                   'TU_TYPE' => $iType,
+                                   'TU_RELATION' => 2));
+                return array('aas_uid' => $sAssigneeUID,
+                             'aas_type' => $assType);
+            }
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Remove a Adhoc assignee of an activity
+     *
+     * @param string $sProcessUID
+     * @param string $sTaskUID
+     * @param string $sAssigneeUID
+     *
+     * @access public
+     */
+    public function removeTaskAdhocAssignee($sProcessUID, $sTaskUID, $sAssigneeUID)
+    {
+        try {
+            $iType = 2;
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addSelectColumn( \TaskUserPeer::TU_RELATION );
+            $oCriteria->add(\TaskUserPeer::USR_UID, $sAssigneeUID);
+            $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID);
+            $oCriteria->add(\TaskUserPeer::TU_TYPE, $iType);
+            $oTaskUser = \TaskUserPeer::doSelectRS($oCriteria);
+            $oTaskUser->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            while ($oTaskUser->next()) {
+                $aRow = $oTaskUser->getRow();
+                $iRelation = $aRow['TU_RELATION'];
+            }
+            $oTaskUser = \TaskUserPeer::retrieveByPK($sTaskUID, $sAssigneeUID, $iType, $iRelation);
+            if (! is_null( $oTaskUser )) {
+                \TaskUserPeer::doDelete($oCriteria);
+            } else {
+                throw (new \Exception( 'This row does not exist!' ));
+            }
+        } catch (Exception $e) {
+            throw $e;
+        }
+   }
+}
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
new file mode 100644
index 000000000..09acd897c
--- /dev/null
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
@@ -0,0 +1,249 @@
+<?php
+namespace Services\Api\ProcessMaker\Project\Activity;
+
+use \ProcessMaker\Services\Api;
+use \Luracast\Restler\RestException;
+
+/**
+ * Project\Activity\Assignee Api Controller
+ *
+ * @protected
+ */
+class Assignee extends Api
+{
+    /**
+     * @url GET /:prjUid/activity/:actUid/assignee
+     *
+     * @param string $prjUid
+     * @param string $actUid
+     * @param string $filter
+     * @param int    $start
+     * @param int    $limit
+     *
+     */
+    public function doGetActivityAssignees($prjUid, $actUid, $filter = '', $start = '1', $limit = '50')
+    {
+        $response = array();
+        try {
+            $task = new \BusinessModel\Task();
+            $arrayData = $task->getTaskAssignees($prjUid, $actUid, $filter, $start, $limit);
+            //Response
+            $response = $arrayData;
+        } catch (\Exception $e) {
+            //response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+        return $response;
+    }
+
+    /**
+     * @url GET /:prjUid/activity/:actUid/available-assignee
+     *
+     * @param string $prjUid
+     * @param string $actUid
+     * @param string $filter
+     * @param int    $start
+     * @param int    $limit
+     *
+     */
+    public function doGetActivityAvailableAssignee($prjUid, $actUid, $filter = '', $start = '1', $limit = '50')
+    {
+        $response = array();
+        try {
+            $task = new \BusinessModel\Task();
+            $arrayData = $task->getTaskAvailableAssignee($prjUid, $actUid, $filter, $start, $limit);
+            //Response
+            $response = $arrayData;
+        } catch (\Exception $e) {
+            //response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+        return $response;
+    }
+
+    /**
+     * @url GET /:prjUid/activity/:actUid/assignee/:aasUid
+     *
+     * @param string $prjUid
+     * @param string $actUid
+     * @param string $aasUid
+     *
+     */
+    public function doGetActivityAssignee($prjUid, $actUid, $aasUid)
+    {
+        $response = array();
+        try {
+            $task = new \BusinessModel\Task();
+            $arrayData = $task->getTaskAssignee($prjUid, $actUid, $aasUid);
+            //Response
+            $response = $arrayData;
+        } catch (\Exception $e) {
+            //response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+        return $response;
+    }
+
+    /**
+     * @url POST /:prjUid/activity/:actUid/assignee
+     *
+     * @param string $prjUid
+     * @param string $actUid
+     * @param string $assUid
+     * @param string $assType {@choice user,group}
+     *
+     * @status 201
+     */
+    public function doPostActivityAssignee($prjUid, $actUid, $assUid, $assType)
+    {
+        try {
+            $task = new \BusinessModel\Task();
+            $arrayData = $task->addTaskAssignee($prjUid, $actUid, $assUid, $assType);
+            //Response
+            $response = $arrayData;
+        } catch (\Exception $e) {
+            //Response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+        return $response;
+    }
+
+    /**
+     * @url DELETE /:prjUid/activity/:actUid/assignee/:assUid
+     *
+     * @param string $prjUid
+     * @param string $actUid
+     * @param string $assUid
+     *
+     */
+    public function doDeleteActivityAssignee($prjUid, $actUid, $assUid)
+    {
+        try {
+            $task = new \BusinessModel\Task();
+            $arrayData = $task->removeTaskAssignee($prjUid, $actUid, $assUid);
+        } catch (\Exception $e) {
+            //response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+        return $response;
+    }
+
+    /**
+     * @url GET /:prjUid/activity/:actUid/adhoc-assignee
+     *
+     * @param string $prjUid
+     * @param string $actUid
+     * @param string $filter
+     * @param int    $start
+     * @param int    $limit
+     *
+     */
+    public function doGetActivityAdhocAssignees($prjUid, $actUid, $filter = '', $start = '1', $limit = '50')
+    {
+        $response = array();
+        try {
+            $task = new \BusinessModel\Task();
+            $arrayData = $task->getTaskAdhocAssignees($prjUid, $actUid, $filter, $start, $limit);
+            //Response
+            $response = $arrayData;
+        } catch (\Exception $e) {
+            //response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+        return $response;
+    }
+
+    /**
+     * @url GET /:prjUid/activity/:actUid/available-adhoc-assignee
+     *
+     * @param string $prjUid
+     * @param string $actUid
+     * @param string $filter
+     * @param int    $start
+     * @param int    $limit
+     *
+     */
+    public function doGetActivityAvailableAdhocAssignee($prjUid, $actUid, $filter = '', $start = '1', $limit = '50')
+    {
+        $response = array();
+        try {
+            $task = new \BusinessModel\Task();
+            $arrayData = $task->getTaskAvailableAdhocAssignee($prjUid, $actUid, $filter, $start, $limit);
+            //Response
+            $response = $arrayData;
+        } catch (\Exception $e) {
+            //response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+        return $response;
+    }
+
+    /**
+     * @url GET /:prjUid/activity/:actUid/adhoc-assignee/:aasUid
+     *
+     * @param string $prjUid
+     * @param string $actUid
+     * @param string $assUid
+     *
+     */
+    public function doGetActivityAdhocAssignee($prjUid, $actUid, $aasUid)
+    {
+        $response = array();
+        try {
+            $task = new \BusinessModel\Task();
+            $arrayData = $task->getTaskAdhocAssignee($prjUid, $actUid, $aasUid);
+            //Response
+            $response = $arrayData;
+        } catch (\Exception $e) {
+            //response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+        return $response;
+    }
+
+    /**
+     * @url POST /:prjUid/activity/:actUid/adhoc-assignee
+     *
+     * @param string $prjUid
+     * @param string $actUid
+     * @param string $assUid
+     * @param string $assType {@choice user,group}
+     *
+     * @status 201
+     */
+    public function doPostActivityAdhocAssignee($prjUid, $actUid, $assUid, $assType)
+    {
+        try {
+            $task = new \BusinessModel\Task();
+            $arrayData = $task->addTaskAdhocAssignee($prjUid, $actUid, $assUid, $assType);
+            //Response
+            $response = $arrayData;
+        } catch (\Exception $e) {
+            //response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+        return $response;
+    }
+
+    /**
+     * @url DELETE /:prjUid/activity/:actUid/adhoc-assignee/:assUid
+     *
+     * @param string $prjUid
+     * @param string $actUid
+     * @param string $assUid
+     *
+     */
+    public function doDeleteActivityAdhocAssignee($prjUid, $actUid, $assUid)
+    {
+        $response = array();
+        try {
+            $task = new \BusinessModel\Task();
+            $arrayData = $task->removeTaskAdhocAssignee($prjUid, $actUid, $assUid);
+        } catch (\Exception $e) {
+            //response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+        return $response;
+    }
+
+}
diff --git a/workflow/engine/src/Services/api.ini b/workflow/engine/src/Services/api.ini
index e0a2bebfd..7cb335a67 100644
--- a/workflow/engine/src/Services/api.ini
+++ b/workflow/engine/src/Services/api.ini
@@ -15,5 +15,6 @@ debug = 1
 [alias: project]
     activity = "Services\Api\ProcessMaker\Project\Activity"
     step     = "Services\Api\ProcessMaker\Project\Activity\Step"
+    assignee  = "Services\Api\ProcessMaker\Project\Activity\Assignee"
     trigger  = "Services\Api\ProcessMaker\Project\Activity\Step\Trigger"