diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php
index 7439cd74a..b7d5b3ee8 100644
--- a/workflow/engine/src/BusinessModel/Task.php
+++ b/workflow/engine/src/BusinessModel/Task.php
@@ -576,8 +576,8 @@ class Task
     /**
      * Return a assignee list of an activity
      *
-     * @param string $sProcessUID
-     * @param string $sTaskUID
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sTaskUID {@min 32} {@max 32}
      * @param string $filter
      * @param int    $start
      * @param int    $limit
@@ -680,8 +680,8 @@ class Task
     /**
      * Return the available users and users groups to assigned to an activity
      *
-     * @param string $sProcessUID
-     * @param string $sTaskUID
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sTaskUID {@min 32} {@max 32}
      * @param string $filter
      * @param int    $start
      * @param int    $limit
@@ -777,9 +777,9 @@ class Task
     /**
      * Return a single user or group assigned to an activity
      *
-     * @param string $sProcessUID
-     * @param string $sTaskUID
-     * @param string $sAssigneeUID
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sTaskUID {@min 32} {@max 32}
+     * @param string $sAssigneeUID {@min 32} {@max 32}
      *
      * return array
      *
@@ -877,9 +877,9 @@ class Task
     /**
      * Assign a user or group to an activity
      *
-     * @param string $sProcessUID
-     * @param string $sTaskUID
-     * @param string $sAssigneeUID
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sTaskUID {@min 32} {@max 32}
+     * @param string $sAssigneeUID {@min 32} {@max 32}
      * @param string $assType {@choice user,group}
      *
      * return array
@@ -943,9 +943,9 @@ class Task
     /**
      * Remove a assignee of an activity
      *
-     * @param string $sProcessUID
-     * @param string $sTaskUID
-     * @param string $sAssigneeUID
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sTaskUID {@min 32} {@max 32}
+     * @param string $sAssigneeUID {@min 32} {@max 32}
      *
      * @access public
      */
@@ -978,8 +978,8 @@ class Task
     /**
      * Return a adhoc assignee list of an activity
      *
-     * @param string $sProcessUID
-     * @param string $sTaskUID
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sTaskUID {@min 32} {@max 32}
      *
      * return array
      *
@@ -1079,8 +1079,8 @@ class Task
     /**
      * Return the available adhoc users and users groups to assigned to an activity
      *
-     * @param string $sProcessUID
-     * @param string $sTaskUID
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sTaskUID {@min 32} {@max 32}
      *
      * return array
      *
@@ -1173,9 +1173,9 @@ class Task
     /**
      * Return a single Adhoc user or group assigned to an activity
      *
-     * @param string $sProcessUID
-     * @param string $sTaskUID
-     * @param string $sAssigneeUID
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sTaskUID {@min 32} {@max 32}
+     * @param string $sAssigneeUID {@min 32} {@max 32}
      *
      * return array
      *
@@ -1273,10 +1273,10 @@ class Task
     /**
      * Assign a Adhoc user or group to an activity
      *
-     * @param string $sProcessUID
-     * @param string $sTaskUID
-     * @param string $sAssigneeUID
-     * @param string $assType
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sTaskUID {@min 32} {@max 32}
+     * @param string $sAssigneeUID {@min 32} {@max 32}
+     * @param string $assType {@choice user,group}
      *
      * return array
      *
@@ -1339,9 +1339,9 @@ class Task
     /**
      * Remove a Adhoc assignee of an activity
      *
-     * @param string $sProcessUID
-     * @param string $sTaskUID
-     * @param string $sAssigneeUID
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sTaskUID {@min 32} {@max 32}
+     * @param string $sAssigneeUID {@min 32} {@max 32}
      *
      * @access public
      */
@@ -1362,7 +1362,7 @@ class Task
             }
             $oTaskUser = \TaskUserPeer::retrieveByPK($sTaskUID, $sAssigneeUID, $iType, $iRelation);
             if (! is_null( $oTaskUser )) {
-                OutputDocumentsTaskUserPeer::doDelete($oCriteria);
+                \TaskUserPeer::doDelete($oCriteria);
             } else {
                 throw (new \Exception( 'This row does not exist!' ));
             }
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
index e6d727ec5..b251bebf7 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
@@ -222,18 +222,18 @@ class Assignee extends Api
     }
 
     /**
-     * @url DELETE /:prjUid/activity/:actUid/adhoc-assignee/:assUid
+     * @url DELETE /:prjUid/activity/:actUid/adhoc-assignee/:adaUid
      *
      * @param string $prjUid
      * @param string $actUid
-     * @param string $assUid
+     * @param string $adaUid
      *
      */
-    public function doDeleteActivityAdhocAssignee($prjUid, $actUid, $assUid)
+    public function doDeleteActivityAdhocAssignee($prjUid, $actUid, $adaUid)
     {
         try {
             $task = new \BusinessModel\Task();
-            $arrayData = $task->removeTaskAdhocAssignee($prjUid, $actUid, $assUid);
+            $arrayData = $task->removeTaskAdhocAssignee($prjUid, $actUid, $adaUid);
         } catch (\Exception $e) {
             //response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/ProcessSupervisors.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/ProcessSupervisors.php
index 4bd44bea2..67115e388 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project/ProcessSupervisors.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/ProcessSupervisors.php
@@ -191,8 +191,8 @@ class ProcessSupervisors extends Api
     /**
      * @url POST /:prjUid/process-supervisor
      *
-     * @param string $prjUid
-     * @param string $usr_uid
+     * @param string $prjUid {@min 32} {@max 32}
+     * @param string $usr_uid {@min 32} {@max 32}
      * @param string $pu_type {@choice SUPERVISOR,GROUP_SUPERVISOR}
      *
      * @status 201
@@ -214,8 +214,8 @@ class ProcessSupervisors extends Api
     /**
      * @url POST /:prjUid/process-supervisor/dynaform
      *
-     * @param string $prjUid
-     * @param string $dyn_uid
+     * @param string $prjUid {@min 32} {@max 32}
+     * @param string $dyn_uid {@min 32} {@max 32}
      *
      * @status 201
      */
@@ -236,8 +236,8 @@ class ProcessSupervisors extends Api
     /**
      * @url POST /:prjUid/process-supervisor/input-document
      *
-     * @param string $prjUid
-     * @param string $inp_doc_uid
+     * @param string $prjUid {@min 32} {@max 32}
+     * @param string $inp_doc_uid {@min 32} {@max 32}
      *
      * @status 201
      */
@@ -258,8 +258,8 @@ class ProcessSupervisors extends Api
     /**
      * @url DELETE /:prjUid/process-supervisor/:puUid
      *
-     * @param string $prjUid
-     * @param string $puUid
+     * @param string $prjUid {@min 32} {@max 32}
+     * @param string $puUid {@min 32} {@max 32}
      *
      */
     public function doDeleteSupervisor($prjUid, $puUid)
@@ -277,8 +277,8 @@ class ProcessSupervisors extends Api
     /**
      * @url DELETE /:prjUid/process-supervisor/dynaform/:pudUid
      *
-     * @param string $prjUid
-     * @param string $pudUid
+     * @param string $prjUid {@min 32} {@max 32}
+     * @param string $pudUid {@min 32} {@max 32}
      *
      */
     public function doDeleteDynaformSupervisor($prjUid, $pudUid)
@@ -296,8 +296,8 @@ class ProcessSupervisors extends Api
     /**
      * @url DELETE /:prjUid/process-supervisor/input-document/:puiUid
      *
-     * @param string $prjUid
-     * @param string $puiUid
+     * @param string $prjUid {@min 32} {@max 32}
+     * @param string $puiUid {@min 32} {@max 32}
      *
      */
     public function doDeleteInputDocumentSupervisor($prjUid, $puiUid)