diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 9a114126d..b731cac28 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -25,7 +25,7 @@
  *
  */
 
-require_once ("classes/model/Application.php");
+/*require_once ("classes/model/Application.php");
 require_once ("classes/model/AppCacheView.php");
 require_once ("classes/model/AppDelay.php");
 require_once ("classes/model/AppDelegation.php");
@@ -42,24 +42,24 @@ require_once ("classes/model/CaseTrackerObject.php");
 require_once ("classes/model/Configuration.php");
 require_once ("classes/model/Content.php");
 require_once ("classes/model/DbSource.php");
-require_once ("classes/model/Dynaform.php");
-require_once ("classes/model/InputDocument.php");
-require_once ("classes/model/Language.php");
-require_once ("classes/model/ObjectPermission.php");
-require_once ("classes/model/OutputDocument.php");
-require_once ("classes/model/Process.php");
-require_once ("classes/model/ProcessUser.php");
-require_once ("classes/model/ReportTable.php");
-require_once ("classes/model/ReportVar.php");
-require_once ("classes/model/Route.php");
-require_once ("classes/model/Step.php");
-require_once ("classes/model/StepSupervisor.php");
-require_once ("classes/model/StepTrigger.php");
-require_once ("classes/model/SubApplication.php");
-require_once ("classes/model/Task.php");
-require_once ("classes/model/TaskUser.php");
-require_once ("classes/model/Triggers.php");
-require_once ("classes/model/Users.php");
+require_once ("classes/model/Dynaform.php");*/
+//require_once ("classes/model/InputDocument.php");
+//require_once ("classes/model/Language.php");
+//require_once ("classes/model/ObjectPermission.php");
+//require_once ("classes/model/OutputDocument.php");
+//require_once ("classes/model/Process.php");
+//require_once ("classes/model/ProcessUser.php");
+//require_once ("classes/model/ReportTable.php");
+//require_once ("classes/model/ReportVar.php");
+//require_once ("classes/model/Route.php");
+//require_once ("classes/model/Step.php");
+//require_once ("classes/model/StepSupervisor.php");
+//require_once ("classes/model/StepTrigger.php");
+//require_once ("classes/model/SubApplication.php");
+//require_once ("classes/model/Task.php");
+//require_once ("classes/model/TaskUser.php");
+//require_once ("classes/model/Triggers.php");
+//require_once ("classes/model/Users.php");
 
 G::LoadClass("pmScript");
 
diff --git a/workflow/engine/classes/class.dynaFormField.php b/workflow/engine/classes/class.dynaFormField.php
index 4f490f97d..3d1ab37d1 100755
--- a/workflow/engine/classes/class.dynaFormField.php
+++ b/workflow/engine/classes/class.dynaFormField.php
@@ -25,8 +25,8 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  *
  */
-G::LoadClass('xmlDb');
-G::LoadSystem('dynaformhandler');
+//G::LoadClass('xmlDb');
+//G::LoadSystem('dynaformhandler');
 
 /**
  * Dynaform Field - DynaformField class
diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php
index 96e6a8fa4..300d87c77 100755
--- a/workflow/engine/classes/model/AppCacheView.php
+++ b/workflow/engine/classes/model/AppCacheView.php
@@ -4,7 +4,7 @@
  * @package    workflow.engine.classes.model
  */
 
-require_once ('classes/model/om/BaseAppCacheView.php');
+//require_once ('classes/model/om/BaseAppCacheView.php');
 
 
 /**
@@ -18,11 +18,11 @@ require_once ('classes/model/om/BaseAppCacheView.php');
  *
  */
 
-require_once ('classes/model/Application.php');
-require_once ('classes/model/AppDelegation.php');
-require_once ('classes/model/AppDelay.php');
-require_once ('classes/model/Task.php');
-require_once ('classes/model/AdditionalTables.php');
+//require_once ('classes/model/Application.php');
+//require_once ('classes/model/AppDelegation.php');
+//require_once ('classes/model/AppDelay.php');
+//require_once ('classes/model/Task.php');
+//require_once ('classes/model/AdditionalTables.php');
 
 
 /**
diff --git a/workflow/engine/classes/model/AppDelay.php b/workflow/engine/classes/model/AppDelay.php
index 4d4d27806..13d47a055 100755
--- a/workflow/engine/classes/model/AppDelay.php
+++ b/workflow/engine/classes/model/AppDelay.php
@@ -4,7 +4,7 @@
  * @package    workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseAppDelay.php';
+//require_once 'classes/model/om/BaseAppDelay.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php
index 6d83ba57e..0c2c0765f 100755
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -25,11 +25,11 @@
  *
  */
 
-require_once 'classes/model/om/BaseAppDelegation.php';
-require_once ("classes/model/HolidayPeer.php");
-require_once ("classes/model/TaskPeer.php");
-require_once ("classes/model/Task.php");
-G::LoadClass( "dates" );
+//require_once 'classes/model/om/BaseAppDelegation.php';
+//require_once ("classes/model/HolidayPeer.php");
+//require_once ("classes/model/TaskPeer.php");
+//require_once ("classes/model/Task.php");
+//G::LoadClass( "dates" );
 
 /**
  * Skeleton subclass for representing a row from the 'APP_DELEGATION' table.
diff --git a/workflow/engine/classes/model/AppDocument.php b/workflow/engine/classes/model/AppDocument.php
index 7e4f493b2..ac839192e 100755
--- a/workflow/engine/classes/model/AppDocument.php
+++ b/workflow/engine/classes/model/AppDocument.php
@@ -25,9 +25,9 @@
  *
  */
 
-require_once 'classes/model/om/BaseAppDocument.php';
-require_once 'classes/model/Content.php';
-require_once 'classes/model/InputDocument.php';
+//require_once 'classes/model/om/BaseAppDocument.php';
+//require_once 'classes/model/Content.php';
+//require_once 'classes/model/InputDocument.php';
 
 /**
  * Skeleton subclass for representing a row from the 'APP_DOCUMENT' table.
diff --git a/workflow/engine/classes/model/AppEvent.php b/workflow/engine/classes/model/AppEvent.php
index 28dd25975..420a1169c 100755
--- a/workflow/engine/classes/model/AppEvent.php
+++ b/workflow/engine/classes/model/AppEvent.php
@@ -5,7 +5,7 @@
  * @package workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseAppEvent.php';
+//require_once 'classes/model/om/BaseAppEvent.php';
 
 /**
  * Skeleton subclass for representing a row from the 'APP_EVENT' table.
diff --git a/workflow/engine/classes/model/AppHistory.php b/workflow/engine/classes/model/AppHistory.php
index ab69b1e17..95b0b7e35 100755
--- a/workflow/engine/classes/model/AppHistory.php
+++ b/workflow/engine/classes/model/AppHistory.php
@@ -4,7 +4,7 @@
  * @package    workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseAppHistory.php';
+//require_once 'classes/model/om/BaseAppHistory.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/AppMessage.php b/workflow/engine/classes/model/AppMessage.php
index 03b88fcf0..0ce2e71bc 100755
--- a/workflow/engine/classes/model/AppMessage.php
+++ b/workflow/engine/classes/model/AppMessage.php
@@ -23,7 +23,7 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 
-require_once 'classes/model/om/BaseAppMessage.php';
+//require_once 'classes/model/om/BaseAppMessage.php';
 
 /**
  * Skeleton subclass for representing a row from the 'APP_MESSAGE' table.
diff --git a/workflow/engine/classes/model/AppNotes.php b/workflow/engine/classes/model/AppNotes.php
index 56ca7f3d0..7040f2db5 100755
--- a/workflow/engine/classes/model/AppNotes.php
+++ b/workflow/engine/classes/model/AppNotes.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'classes/model/om/BaseAppNotes.php';
+//require_once 'classes/model/om/BaseAppNotes.php';
 
 /**
  * Skeleton subclass for representing a row from the 'APP_NOTES' table.
diff --git a/workflow/engine/classes/model/AppOwner.php b/workflow/engine/classes/model/AppOwner.php
index afb1b3c5d..31e01e514 100755
--- a/workflow/engine/classes/model/AppOwner.php
+++ b/workflow/engine/classes/model/AppOwner.php
@@ -24,7 +24,7 @@
  *
  */
 
-require_once 'classes/model/om/BaseAppOwner.php';
+//require_once 'classes/model/om/BaseAppOwner.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/AppSolrQueue.php b/workflow/engine/classes/model/AppSolrQueue.php
index b28e5ad86..b85ce67ca 100644
--- a/workflow/engine/classes/model/AppSolrQueue.php
+++ b/workflow/engine/classes/model/AppSolrQueue.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once 'classes/model/om/BaseAppSolrQueue.php';
-require_once 'classes/entities/AppSolrQueue.php';
+//require_once 'classes/model/om/BaseAppSolrQueue.php';
+//require_once 'classes/entities/AppSolrQueue.php';
 
 /**
  * Skeleton subclass for representing a row from the 'APP_SOLR_QUEUE' table.
diff --git a/workflow/engine/classes/model/AppThread.php b/workflow/engine/classes/model/AppThread.php
index beb7946bc..8da9a7013 100755
--- a/workflow/engine/classes/model/AppThread.php
+++ b/workflow/engine/classes/model/AppThread.php
@@ -24,7 +24,7 @@
  *
  */
 
-require_once 'classes/model/om/BaseAppThread.php';
+//require_once 'classes/model/om/BaseAppThread.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/Application.php b/workflow/engine/classes/model/Application.php
index dc256892c..5ed9d1cb8 100755
--- a/workflow/engine/classes/model/Application.php
+++ b/workflow/engine/classes/model/Application.php
@@ -24,8 +24,8 @@
  *
  */
 
-require_once ('classes/model/om/BaseApplication.php');
-require_once ('classes/model/Content.php');
+//require_once ('classes/model/om/BaseApplication.php');
+//require_once ('classes/model/Content.php');
 
 
 /**
diff --git a/workflow/engine/classes/model/CaseTracker.php b/workflow/engine/classes/model/CaseTracker.php
index ca965cb58..0a06f7a4e 100755
--- a/workflow/engine/classes/model/CaseTracker.php
+++ b/workflow/engine/classes/model/CaseTracker.php
@@ -5,7 +5,7 @@
  * @package workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseCaseTracker.php';
+//require_once 'classes/model/om/BaseCaseTracker.php';
 
 /**
  * Skeleton subclass for representing a row from the 'CASE_TRACKER' table.
diff --git a/workflow/engine/classes/model/CaseTrackerObject.php b/workflow/engine/classes/model/CaseTrackerObject.php
index f21f08121..9067fde87 100755
--- a/workflow/engine/classes/model/CaseTrackerObject.php
+++ b/workflow/engine/classes/model/CaseTrackerObject.php
@@ -5,7 +5,7 @@
  * @package workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseCaseTrackerObject.php';
+//require_once 'classes/model/om/BaseCaseTrackerObject.php';
 
 /**
  * Skeleton subclass for representing a row from the 'CASE_TRACKER_OBJECT' table.
diff --git a/workflow/engine/classes/model/Configuration.php b/workflow/engine/classes/model/Configuration.php
index 4b8d90a41..125093065 100755
--- a/workflow/engine/classes/model/Configuration.php
+++ b/workflow/engine/classes/model/Configuration.php
@@ -24,8 +24,8 @@
  *
  */
 
-require_once 'classes/model/om/BaseConfiguration.php';
-require_once 'classes/model/Content.php';
+//require_once 'classes/model/om/BaseConfiguration.php';
+//require_once 'classes/model/Content.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/Content.php b/workflow/engine/classes/model/Content.php
index ac1c1193d..9501599b5 100755
--- a/workflow/engine/classes/model/Content.php
+++ b/workflow/engine/classes/model/Content.php
@@ -25,7 +25,7 @@
  *
  */
 
-require_once 'classes/model/om/BaseContent.php';
+//require_once 'classes/model/om/BaseContent.php';
 
 /**
  * Skeleton subclass for representing a row from the 'CONTENT' table.
diff --git a/workflow/engine/classes/model/DbSource.php b/workflow/engine/classes/model/DbSource.php
index 8922be31f..dee1bb11a 100755
--- a/workflow/engine/classes/model/DbSource.php
+++ b/workflow/engine/classes/model/DbSource.php
@@ -24,8 +24,8 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  *
  */
-require_once 'classes/model/Content.php';
-require_once 'classes/model/om/BaseDbSource.php';
+//require_once 'classes/model/Content.php';
+//require_once 'classes/model/om/BaseDbSource.php';
 
 /**
  * Skeleton subclass for representing a row from the 'DB_SOURCE' table.
diff --git a/workflow/engine/classes/model/Dynaform.php b/workflow/engine/classes/model/Dynaform.php
index f54a35fc7..17df6b4eb 100755
--- a/workflow/engine/classes/model/Dynaform.php
+++ b/workflow/engine/classes/model/Dynaform.php
@@ -25,10 +25,10 @@
  *
  */
 
-require_once 'classes/model/om/BaseDynaform.php';
-require_once 'classes/model/Content.php';
-require_once ('classes/model/AdditionalTables.php');
-G::LoadClass( 'dynaFormField' );
+//require_once 'classes/model/om/BaseDynaform.php';
+//require_once 'classes/model/Content.php';
+//require_once ('classes/model/AdditionalTables.php');
+//G::LoadClass( 'dynaFormField' );
 
 /**
  * Skeleton subclass for representing a row from the 'DYNAFORM' table.
diff --git a/workflow/engine/classes/model/InputDocument.php b/workflow/engine/classes/model/InputDocument.php
index fd16b2d38..23615c7f6 100755
--- a/workflow/engine/classes/model/InputDocument.php
+++ b/workflow/engine/classes/model/InputDocument.php
@@ -25,8 +25,8 @@
  *
  */
 
-require_once 'classes/model/om/BaseInputDocument.php';
-require_once 'classes/model/Content.php';
+//require_once 'classes/model/om/BaseInputDocument.php';
+//require_once 'classes/model/Content.php';
 
 /**
  * Skeleton subclass for representing a row from the 'INPUT_DOCUMENT' table.
diff --git a/workflow/engine/classes/model/IsoCountry.php b/workflow/engine/classes/model/IsoCountry.php
index c5ec04d03..2adfe5b78 100755
--- a/workflow/engine/classes/model/IsoCountry.php
+++ b/workflow/engine/classes/model/IsoCountry.php
@@ -24,7 +24,7 @@
  *
  */
 
-require_once 'classes/model/om/BaseIsoCountry.php';
+//require_once 'classes/model/om/BaseIsoCountry.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/IsoLocation.php b/workflow/engine/classes/model/IsoLocation.php
index b600932cc..f78fdbb77 100755
--- a/workflow/engine/classes/model/IsoLocation.php
+++ b/workflow/engine/classes/model/IsoLocation.php
@@ -24,7 +24,7 @@
  *
  */
 
-require_once 'classes/model/om/BaseIsoLocation.php';
+//require_once 'classes/model/om/BaseIsoLocation.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/IsoSubdivision.php b/workflow/engine/classes/model/IsoSubdivision.php
index 0763e1594..41a42266c 100755
--- a/workflow/engine/classes/model/IsoSubdivision.php
+++ b/workflow/engine/classes/model/IsoSubdivision.php
@@ -24,7 +24,7 @@
  *
  */
 
-require_once 'classes/model/om/BaseIsoSubdivision.php';
+//require_once 'classes/model/om/BaseIsoSubdivision.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/Language.php b/workflow/engine/classes/model/Language.php
index 39e362da8..0d9c8127c 100755
--- a/workflow/engine/classes/model/Language.php
+++ b/workflow/engine/classes/model/Language.php
@@ -25,11 +25,11 @@
  *
  */
 
-require_once 'classes/model/om/BaseLanguage.php';
+//require_once 'classes/model/om/BaseLanguage.php';
 
-require_once 'classes/model/Content.php';
-require_once 'classes/model/IsoCountry.php';
-require_once 'classes/model/Translation.php';
+//require_once 'classes/model/Content.php';
+//require_once 'classes/model/IsoCountry.php';
+//require_once 'classes/model/Translation.php';
 
 /**
  * Skeleton subclass for representing a row from the 'LANGUAGE' table.
diff --git a/workflow/engine/classes/model/ObjectPermission.php b/workflow/engine/classes/model/ObjectPermission.php
index 9267d316f..e0e45dcd6 100755
--- a/workflow/engine/classes/model/ObjectPermission.php
+++ b/workflow/engine/classes/model/ObjectPermission.php
@@ -5,7 +5,7 @@
  * @package workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseObjectPermission.php';
+//require_once 'classes/model/om/BaseObjectPermission.php';
 
 /**
  * Skeleton subclass for representing a row from the 'OBJECT_PERMISSION' table.
diff --git a/workflow/engine/classes/model/OutputDocument.php b/workflow/engine/classes/model/OutputDocument.php
index 642851f5a..2e44c5364 100755
--- a/workflow/engine/classes/model/OutputDocument.php
+++ b/workflow/engine/classes/model/OutputDocument.php
@@ -24,8 +24,8 @@
  *
  */
 
-require_once ("classes/model/om/BaseOutputDocument.php");
-require_once ("classes/model/Content.php");
+//require_once ("classes/model/om/BaseOutputDocument.php");
+//require_once ("classes/model/Content.php");
 
 /**
  * Skeleton subclass for representing a row from the 'OUTPUT_DOCUMENT' table.
diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php
index 06c6f73b9..e766a1874 100755
--- a/workflow/engine/classes/model/Process.php
+++ b/workflow/engine/classes/model/Process.php
@@ -25,9 +25,9 @@
  *
  */
 
-require_once 'classes/model/om/BaseProcess.php';
-require_once 'classes/model/Content.php';
-require_once 'classes/model/ProcessCategory.php';
+//require_once 'classes/model/om/BaseProcess.php';
+//require_once 'classes/model/Content.php';
+//require_once 'classes/model/ProcessCategory.php';
 
 /**
  * Skeleton subclass for representing a row from the 'PROCESS' table.
diff --git a/workflow/engine/classes/model/ProcessCategory.php b/workflow/engine/classes/model/ProcessCategory.php
index b1209f500..c293374e3 100755
--- a/workflow/engine/classes/model/ProcessCategory.php
+++ b/workflow/engine/classes/model/ProcessCategory.php
@@ -4,7 +4,7 @@
  * @package    workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseProcessCategory.php';
+//require_once 'classes/model/om/BaseProcessCategory.php';
 
 /**
  * Skeleton subclass for representing a row from the 'PROCESS_CATEGORY' table.
diff --git a/workflow/engine/classes/model/ProcessUser.php b/workflow/engine/classes/model/ProcessUser.php
index 4eaa146ae..dc1f3dfd2 100755
--- a/workflow/engine/classes/model/ProcessUser.php
+++ b/workflow/engine/classes/model/ProcessUser.php
@@ -4,7 +4,7 @@
  * @package    workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseProcessUser.php';
+//require_once 'classes/model/om/BaseProcessUser.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/ReportTable.php b/workflow/engine/classes/model/ReportTable.php
index cb8515876..ea2e567fa 100755
--- a/workflow/engine/classes/model/ReportTable.php
+++ b/workflow/engine/classes/model/ReportTable.php
@@ -25,8 +25,8 @@
  *
  */
 
-require_once 'classes/model/Content.php';
-require_once 'classes/model/om/BaseReportTable.php';
+//require_once 'classes/model/Content.php';
+//require_once 'classes/model/om/BaseReportTable.php';
 
 /**
  * Skeleton subclass for representing a row from the 'REPORT_TABLE' table.
diff --git a/workflow/engine/classes/model/ReportVar.php b/workflow/engine/classes/model/ReportVar.php
index 9c12d02ae..5831d22cc 100755
--- a/workflow/engine/classes/model/ReportVar.php
+++ b/workflow/engine/classes/model/ReportVar.php
@@ -5,7 +5,7 @@
  * @package workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseReportVar.php';
+//require_once 'classes/model/om/BaseReportVar.php';
 
 /**
  * Skeleton subclass for representing a row from the 'REPORT_VAR' table.
diff --git a/workflow/engine/classes/model/Route.php b/workflow/engine/classes/model/Route.php
index 4ecd70352..c9e972fb3 100755
--- a/workflow/engine/classes/model/Route.php
+++ b/workflow/engine/classes/model/Route.php
@@ -25,8 +25,8 @@
  *
  */
 
-require_once 'classes/model/om/BaseRoute.php';
-require_once 'classes/model/Content.php';
+//require_once 'classes/model/om/BaseRoute.php';
+//require_once 'classes/model/Content.php';
 
 /**
  * Skeleton subclass for representing a row from the 'ROUTE' table.
diff --git a/workflow/engine/classes/model/Step.php b/workflow/engine/classes/model/Step.php
index 1d81396ad..d28ab34ac 100755
--- a/workflow/engine/classes/model/Step.php
+++ b/workflow/engine/classes/model/Step.php
@@ -25,7 +25,7 @@
  *
  */
 
-require_once 'classes/model/om/BaseStep.php';
+//require_once 'classes/model/om/BaseStep.php';
 
 /**
  * Skeleton subclass for representing a row from the 'STEP' table.
diff --git a/workflow/engine/classes/model/StepSupervisor.php b/workflow/engine/classes/model/StepSupervisor.php
index c0f4466d5..529747493 100755
--- a/workflow/engine/classes/model/StepSupervisor.php
+++ b/workflow/engine/classes/model/StepSupervisor.php
@@ -5,7 +5,7 @@
  * @package workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseStepSupervisor.php';
+//require_once 'classes/model/om/BaseStepSupervisor.php';
 
 /**
  * Skeleton subclass for representing a row from the 'STEP_SUPERVISOR' table.
diff --git a/workflow/engine/classes/model/StepTrigger.php b/workflow/engine/classes/model/StepTrigger.php
index 146573e95..cb44b9fd7 100755
--- a/workflow/engine/classes/model/StepTrigger.php
+++ b/workflow/engine/classes/model/StepTrigger.php
@@ -25,7 +25,7 @@
  *
  */
 
-require_once 'classes/model/om/BaseStepTrigger.php';
+//require_once 'classes/model/om/BaseStepTrigger.php';
 
 /**
  * Skeleton subclass for representing a row from the 'STEP_TRIGGER' table.
diff --git a/workflow/engine/classes/model/SubApplication.php b/workflow/engine/classes/model/SubApplication.php
index 299e98c89..d8781db71 100755
--- a/workflow/engine/classes/model/SubApplication.php
+++ b/workflow/engine/classes/model/SubApplication.php
@@ -4,7 +4,7 @@
  * @package    workflow.engine.classes.model
  */
 
-require_once 'classes/model/om/BaseSubApplication.php';
+//require_once 'classes/model/om/BaseSubApplication.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/Task.php b/workflow/engine/classes/model/Task.php
index 13f5597a1..7408a9857 100755
--- a/workflow/engine/classes/model/Task.php
+++ b/workflow/engine/classes/model/Task.php
@@ -1,6 +1,6 @@
 <?php
-require_once 'classes/model/om/BaseTask.php';
-require_once 'classes/model/Content.php';
+//require_once 'classes/model/om/BaseTask.php';
+//require_once 'classes/model/Content.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/TaskUser.php b/workflow/engine/classes/model/TaskUser.php
index d8d444397..1df286bb3 100755
--- a/workflow/engine/classes/model/TaskUser.php
+++ b/workflow/engine/classes/model/TaskUser.php
@@ -25,8 +25,8 @@
  *
  */
 
-require_once 'classes/model/om/BaseTaskUser.php';
-require_once 'classes/model/Content.php';
+//require_once 'classes/model/om/BaseTaskUser.php';
+//require_once 'classes/model/Content.php';
 
 /**
  * Skeleton subclass for representing a row from the 'GROUP_USER' table.
diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php
index 80f1582c0..c69e9bb6a 100755
--- a/workflow/engine/classes/model/Translation.php
+++ b/workflow/engine/classes/model/Translation.php
@@ -25,7 +25,7 @@
  *
  */
 
-require_once 'classes/model/om/BaseTranslation.php';
+//require_once 'classes/model/om/BaseTranslation.php';
 
 /**
  * Skeleton subclass for representing a row from the 'TRANSLATION' table.
diff --git a/workflow/engine/classes/model/Triggers.php b/workflow/engine/classes/model/Triggers.php
index 7e666f453..d0d6a09e0 100755
--- a/workflow/engine/classes/model/Triggers.php
+++ b/workflow/engine/classes/model/Triggers.php
@@ -24,8 +24,8 @@
  *
  */
 
-require_once 'classes/model/Content.php';
-require_once 'classes/model/om/BaseTriggers.php';
+//require_once 'classes/model/Content.php';
+//require_once 'classes/model/om/BaseTriggers.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php
index 7197e83ed..745cde70b 100755
--- a/workflow/engine/classes/model/Users.php
+++ b/workflow/engine/classes/model/Users.php
@@ -25,10 +25,10 @@
  *
  */
 
-require_once 'classes/model/om/BaseUsers.php';
-require_once 'classes/model/IsoCountry.php';
-require_once 'classes/model/IsoSubdivision.php';
-require_once 'classes/model/IsoLocation.php';
+//require_once 'classes/model/om/BaseUsers.php';
+//require_once 'classes/model/IsoCountry.php';
+//require_once 'classes/model/IsoSubdivision.php';
+//require_once 'classes/model/IsoLocation.php';
 
 /**
  * Skeleton subclass for representing a row from the 'USERS' table.
diff --git a/workflow/public_html/bootstrap.php b/workflow/public_html/bootstrap.php
index 717350a76..78a90a6b2 100755
--- a/workflow/public_html/bootstrap.php
+++ b/workflow/public_html/bootstrap.php
@@ -26,7 +26,6 @@
  * bootstrap - ProcessMaker Bootstrap
  * this file is used initialize main variables, redirect and dispatch all requests
  */
-
 // Defining the PATH_SEP constant, he we are defining if the the path separator symbol will be '\\' or '/'
 define( 'PATH_SEP', '/' );
 
@@ -444,6 +443,139 @@ Bootstrap::registerClass('System',        PATH_HOME . "engine/classes/class.syst
 Bootstrap::registerClass('Propel',          PATH_THIRDPARTY . "propel/Propel.php");
 Bootstrap::registerClass('Creole',          PATH_THIRDPARTY . "creole/Creole.php");
 
+//DATABASE propel classes used in 'Cases' Options
+
+Bootstrap::registerClass('BaseContent',        PATH_HOME . "engine/classes/model/om/BaseContent.php");
+Bootstrap::registerClass('Content',            PATH_HOME . "engine/classes/model/Content.php");
+Bootstrap::registerClass('BaseApplication',    PATH_HOME . "engine/classes/model/om/BaseApplication.php");
+Bootstrap::registerClass('Application',        PATH_HOME . "engine/classes/model/Application.php");
+
+Bootstrap::registerClass('BaseAppDelegation',  PATH_HOME . "engine/classes/model/om/BaseAppDelegation.php");
+Bootstrap::registerClass('BaseHoliday',        PATH_HOME . "engine/classes/model/om/BaseHoliday.php");
+Bootstrap::registerClass('BaseHolidayPeer',    PATH_HOME . "engine/classes/model/om/BaseHolidayPeer.php");
+Bootstrap::registerClass('BaseTask',           PATH_HOME . "engine/classes/model/om/BaseTask.php");
+Bootstrap::registerClass('BaseTaskPeer',       PATH_HOME . "engine/classes/model/om/BaseTaskPeer.php");
+Bootstrap::registerClass('HolidayPeer',        PATH_HOME . "engine/classes/model/HolidayPeer.php");
+Bootstrap::registerClass('Holiday',            PATH_HOME . "engine/classes/model/Holiday.php");
+Bootstrap::registerClass('Task',               PATH_HOME . "engine/classes/model/Task.php");
+Bootstrap::registerClass('TaskPeer',           PATH_HOME . "engine/classes/model/TaskPeer.php");
+Bootstrap::registerClass('dates',              PATH_HOME . "engine/classes/class.dates.php");
+Bootstrap::registerClass('AppDelegation',      PATH_HOME . "engine/classes/model/AppDelegation.php");
+Bootstrap::registerClass('BaseAppDelay',       PATH_HOME . "engine/classes/model/om/BaseAppDelay.php");
+Bootstrap::registerClass('AppDelayPeer',       PATH_HOME . "engine/classes/model/AppDelayPeer.php");
+Bootstrap::registerClass('AppDelay',           PATH_HOME . "engine/classes/model/AppDelay.php");
+Bootstrap::registerClass('BaseAdditionalTables',PATH_HOME . "engine/classes/model/om/BaseAdditionalTables.php");
+Bootstrap::registerClass('AdditionalTables',   PATH_HOME . "engine/classes/model/AdditionalTables.php");
+Bootstrap::registerClass('BaseAppCacheView',   PATH_HOME . "engine/classes/model/om/BaseAppCacheView.php");
+Bootstrap::registerClass('AppCacheView',       PATH_HOME . "engine/classes/model/AppCacheView.php");
+
+Bootstrap::registerClass('BaseInputDocument',  PATH_HOME . "engine/classes/model/om/BaseInputDocument.php");
+Bootstrap::registerClass('InputDocument',      PATH_HOME . "engine/classes/model/InputDocument.php");
+Bootstrap::registerClass('BaseAppDocument',    PATH_HOME . "engine/classes/model/om/BaseAppDocument.php");
+Bootstrap::registerClass('AppDocument',        PATH_HOME . "engine/classes/model/AppDocument.php");
+
+Bootstrap::registerClass('BaseAppEvent',       PATH_HOME . "engine/classes/model/om/BaseAppEvent.php");
+Bootstrap::registerClass('AppEvent',           PATH_HOME . "engine/classes/model/AppEvent.php");
+
+Bootstrap::registerClass('BaseAppHistory',     PATH_HOME . "engine/classes/model/om/BaseAppHistory.php");
+Bootstrap::registerClass('AppHistory',         PATH_HOME . "engine/classes/model/AppHistory.php");
+
+Bootstrap::registerClass('BaseAppMessage',     PATH_HOME . "engine/classes/model/om/BaseAppMessage.php");
+Bootstrap::registerClass('AppMessage',         PATH_HOME . "engine/classes/model/AppMessage.php");
+
+Bootstrap::registerClass('BaseAppNotes',        PATH_HOME . "engine/classes/model/om/BaseAppNotes.php");
+Bootstrap::registerClass('AppNotes',            PATH_HOME . "engine/engine/classes/model/AppNotes.php");
+
+Bootstrap::registerClass('BaseAppOwner',        PATH_HOME . "engine/classes/model/om/BaseAppOwner.php");
+Bootstrap::registerClass('AppOwner',            PATH_HOME . "engine/classes/model/AppOwner.php");
+
+Bootstrap::registerClass('BaseAppSolrQueue',    PATH_HOME . "engine/classes/model/om/BaseAppSolrQueue.php");
+Bootstrap::registerClass('Entity_AppSolrQueue', PATH_HOME . "engine/classes/entities/AppSolrQueue.php");
+Bootstrap::registerClass('AppSolrQueue',        PATH_HOME . "engine/classes/model/AppSolrQueue.php");
+
+Bootstrap::registerClass('BaseAppThread',       PATH_HOME . "engine/classes/model/om/BaseAppThread.php");
+Bootstrap::registerClass('AppThread',           PATH_HOME . "engine/classes/model/AppThread.php");
+
+Bootstrap::registerClass('BaseCaseTracker',     PATH_HOME . "engine/classes/model/om/BaseCaseTracker.php");
+Bootstrap::registerClass('CaseTracker',         PATH_HOME . "engine/classes/model/CaseTracker.php");
+
+Bootstrap::registerClass('BaseCaseTrackerObject',PATH_HOME . "engine/classes/model/om/BaseCaseTrackerObject.php");
+Bootstrap::registerClass('CaseTrackerObject',    PATH_HOME . "engine/classes/model/CaseTrackerObject.php");
+
+Bootstrap::registerClass('BaseConfiguration',   PATH_HOME . "engine/classes/model/om/BaseConfiguration.php");
+Bootstrap::registerClass('Configuration',       PATH_HOME . "engine/classes/model/Configuration.php");
+
+Bootstrap::registerClass('BaseDbSource',        PATH_HOME . "engine/classes/model/om/BaseDbSource.php");
+Bootstrap::registerClass('DbSource',            PATH_HOME . "engine/classes/model/DbSource.php");
+
+Bootstrap::registerClass('XMLDB',              PATH_HOME . "engine/classes/class.xmlDb.php");
+Bootstrap::registerClass('dynaFormHandler',    PATH_GULLIVER . "class.dynaformhandler.php");
+Bootstrap::registerClass('DynaFormField',      PATH_HOME . "engine/classes/class.dynaFormField.php");
+Bootstrap::registerClass('BaseDynaform',       PATH_HOME . "engine/classes/model/om/BaseDynaform.php");
+Bootstrap::registerClass('Dynaform',           PATH_HOME . "engine/classes/model/Dynaform.php");
+
+Bootstrap::registerClass('BaseIsoCountry',     PATH_HOME . "engine/classes/model/om/BaseIsoCountry.php");
+Bootstrap::registerClass('IsoCountry',         PATH_HOME . "engine/classes/model/IsoCountry.php");
+Bootstrap::registerClass('BaseTranslation',    PATH_HOME . "engine/classes/model/om/BaseTranslation.php");
+Bootstrap::registerClass('Translation',        PATH_HOME . "engine/classes/model/Translation.php");
+Bootstrap::registerClass('BaseLanguage',       PATH_HOME . "engine/classes/model/om/BaseLanguage.php");
+Bootstrap::registerClass('Language',           PATH_HOME . "engine/classes/model/Language.php");
+
+Bootstrap::registerClass('BaseObjectPermission',PATH_HOME . "engine/classes/model/om/BaseObjectPermission.php");
+Bootstrap::registerClass('ObjectPermission',    PATH_HOME . "engine/classes/model/ObjectPermission.php");
+
+Bootstrap::registerClass('BaseOutputDocument',  PATH_HOME . "engine/classes/model/om/BaseOutputDocument.php");
+Bootstrap::registerClass('OutputDocument',      PATH_HOME . "engine/classes/model/OutputDocument.php");
+
+Bootstrap::registerClass('BaseProcess',         PATH_HOME . "engine/classes/model/om/BaseProcess.php");
+Bootstrap::registerClass('BaseProcessCategory', PATH_HOME . "engine/classes/model/om/BaseProcessCategory.php");
+Bootstrap::registerClass('ProcessCategory',     PATH_HOME . "engine/classes/model/ProcessCategory.php");
+Bootstrap::registerClass('ProcessCategoryPeer', PATH_HOME . "engine/classes/model/ProcessCategoryPeer.php");
+Bootstrap::registerClass('ProcessPeer',         PATH_HOME . "engine/classes/model/ProcessPeer.php");
+Bootstrap::registerClass('Process',             PATH_HOME . "engine/classes/model/Process.php");
+
+Bootstrap::registerClass('BaseProcessUser',     PATH_HOME . "engine/classes/model/om/BaseProcessUser.php");
+Bootstrap::registerClass('ProcessUser',         PATH_HOME . "engine/classes/model/ProcessUser.php");
+
+Bootstrap::registerClass('BaseReportTable',     PATH_HOME . "engine/classes/model/om/BaseReportTable.php");
+Bootstrap::registerClass('ReportTable',         PATH_HOME . "engine/classes/model/ReportTable.php");
+
+Bootstrap::registerClass('BaseReportVar',       PATH_HOME . "engine/classes/model/om/BaseReportVar.php");
+Bootstrap::registerClass('ReportVar',           PATH_HOME . "engine/classes/model/ReportVar.php");
+
+Bootstrap::registerClass('BaseRoute',           PATH_HOME . "engine/classes/model/om/BaseRoute.php");
+Bootstrap::registerClass('Route',               PATH_HOME . "engine/classes/model/Route.php");
+
+Bootstrap::registerClass('BaseStep',            PATH_HOME . "engine/classes/model/om/BaseStep.php");
+Bootstrap::registerClass('Step',                PATH_HOME . "engine/classes/model/Step.php");
+
+Bootstrap::registerClass('BaseStepSupervisor',  PATH_HOME . "engine/classes/model/om/BaseStepSupervisor.php");
+Bootstrap::registerClass('StepSupervisor',      PATH_HOME . "engine/classes/model/StepSupervisor.php");
+
+Bootstrap::registerClass('BaseStepTrigger',     PATH_HOME . "engine/classes/model/om/BaseStepTrigger.php");
+Bootstrap::registerClass('StepTrigger',         PATH_HOME . "engine/classes/model/StepTrigger.php");
+
+Bootstrap::registerClass('BaseSubApplication',  PATH_HOME . "engine/classes/model/om/BaseSubApplication.php");
+Bootstrap::registerClass('SubApplication',      PATH_HOME . "engine/classes/model/SubApplication.php");
+
+Bootstrap::registerClass('BaseTask',            PATH_HOME . "engine/classes/model/om/BaseTask.php");
+Bootstrap::registerClass('Task',                PATH_HOME . "engine/classes/model/Task.php");
+
+Bootstrap::registerClass('BaseTaskUser',        PATH_HOME . "engine/classes/model/om/BaseTaskUser.php");
+Bootstrap::registerClass('TaskUserPeer',        PATH_HOME . "engine/classes/model/TaskUserPeer.php");
+Bootstrap::registerClass('TaskUser',            PATH_HOME . "engine/classes/model/TaskUser.php");
+
+Bootstrap::registerClass('BaseTriggers',        PATH_HOME . "engine/classes/model/om/BaseTriggers.php");
+Bootstrap::registerClass('Triggers',            PATH_HOME . "engine/classes/model/Triggers.php");
+
+Bootstrap::registerClass('BaseUsers',           PATH_HOME . "engine/classes/model/om/BaseUsers.php");
+Bootstrap::registerClass('IsoCountry',          PATH_HOME . "engine/classes/model/IsoCountry.php");
+Bootstrap::registerClass('BaseIsoSubdivision',  PATH_HOME . "engine/classes/model/om/BaseIsoSubdivision.php");
+Bootstrap::registerClass('IsoSubdivision',      PATH_HOME . "engine/classes/model/IsoSubdivision.php");
+Bootstrap::registerClass('BaseIsoLocation',     PATH_HOME . "engine/classes/model/om/BaseIsoLocation.php");
+Bootstrap::registerClass('Users',               PATH_HOME . "engine/classes/model/Users.php");
+
+
 //Bootstrap::registerClass('LoginLog',          PATH_HOME . "engine/classes/model/LoginLog.php");
 //Bootstrap::registerClass('LoginLogPeer',      PATH_HOME . "engine/classes/model/LoginLogPeer.php");