diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index c38f78fb6..13138b51e 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -288,7 +288,7 @@ class WebApplication
         Services\Api::setWorkspace(SYS_SYS);
         $cacheDir = defined("PATH_WORKSPACE") ? PATH_WORKSPACE : (defined("PATH_C")? PATH_C: sys_get_temp_dir());
 
-        $sysConfig = \PmSystem::getSystemConfiguration();
+        $sysConfig = \ProcessMaker\Core\System::getSystemConfiguration();
 
         \Luracast\Restler\Defaults::$cacheDirectory = $cacheDir;
         $productionMode = (bool) !(isset($sysConfig["service_api_debug"]) && $sysConfig["service_api_debug"]);
@@ -450,7 +450,7 @@ class WebApplication
         define("PATH_SERVICES_REST", PATH_CORE . "services" . PATH_SEP . "rest" . PATH_SEP);
 
         G::defineConstants();
-        $arraySystemConfiguration = \PmSystem::getSystemConfiguration();
+        $arraySystemConfiguration = \ProcessMaker\Core\System::getSystemConfiguration();
 
         ini_set('date.timezone', $arraySystemConfiguration['time_zone']); //Set Time Zone
 
@@ -502,7 +502,7 @@ class WebApplication
             exit(0);
         }
 
-        $arraySystemConfiguration = \PmSystem::getSystemConfiguration('', '', SYS_SYS);
+        $arraySystemConfiguration = \ProcessMaker\Core\System::getSystemConfiguration('', '', SYS_SYS);
 
         //Do not change any of these settings directly, use env.ini instead
         ini_set('display_errors', $arraySystemConfiguration['display_errors']);
diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php
index bf5ca22ba..965f5e9a4 100644
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -1,4 +1,7 @@
 <?php
+
+use ProcessMaker\Core\System;
+
 /**
  * class.bootstrap.php
  *
@@ -41,7 +44,7 @@ class Bootstrap
 
     public static function getSystemConfiguration($globalIniFile = '', $wsIniFile = '', $wsName = '')
     {
-        return PmSystem::getSystemConfiguration($globalIniFile, $wsIniFile, $wsName);
+        return System::getSystemConfiguration($globalIniFile, $wsIniFile, $wsName);
     }
     /**
      * @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
@@ -1030,7 +1033,7 @@ class Bootstrap
      */
     public function getCheckSum($files)
     {
-        $key = PmSystem::getVersion();
+        $key = System::getVersion();
 
         if (!is_array($files)) {
             $tmp = $files;
@@ -1923,7 +1926,7 @@ class Bootstrap
         /* Fix to prevent use uxs skin outside siplified interface,
           because that skin is not compatible with others interfaces */
         if ($args['SYS_SKIN'] == 'uxs' && $args['SYS_COLLECTION'] != 'home' && $args['SYS_COLLECTION'] != 'cases') {
-            $config = PmSystem::getSystemConfiguration();
+            $config = System::getSystemConfiguration();
             $args['SYS_SKIN'] = $config['default_skin'];
         }
 
diff --git a/gulliver/system/class.codeScanner.php b/gulliver/system/class.codeScanner.php
index 889f371be..b47bcffe4 100644
--- a/gulliver/system/class.codeScanner.php
+++ b/gulliver/system/class.codeScanner.php
@@ -1,4 +1,7 @@
 <?php
+
+use ProcessMaker\Core\System;
+
 if (!defined("T_ML_COMMENT")) {
     define("T_ML_COMMENT", T_COMMENT);
 } else {
@@ -29,7 +32,7 @@ class CodeScanner
                         $workspace = new WorkspaceTools($option);
 
                         if ($workspace->workspaceExists()) {
-                            $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', $workspace->name);
+                            $arraySystemConfiguration = System::getSystemConfiguration('', '', $workspace->name);
                             $flag = (int)($arraySystemConfiguration['enable_blacklist']) == 1;
                         }
                         break;
diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 91edafcfd..87a317d87 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -24,6 +24,7 @@
  *
  */
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 /**
@@ -865,7 +866,7 @@ class G
         /* Fix to prevent use uxs skin outside siplified interface,
         because that skin is not compatible with others interfaces*/
         if ($args['SYS_SKIN'] == 'uxs' && $args['SYS_COLLECTION'] != 'home' && $args['SYS_COLLECTION'] != 'cases') {
-            $config = PmSystem::getSystemConfiguration();
+            $config = System::getSystemConfiguration();
             $args['SYS_SKIN'] = $config['default_skin'];
         }
 
@@ -4649,7 +4650,7 @@ class G
      */
     public function getCheckSum ($files)
     {
-        $key = PmSystem::getVersion();
+        $key = System::getVersion();
 
         if (! is_array( $files )) {
             $tmp = $files;
@@ -5280,7 +5281,7 @@ class G
 
     public static function browserCacheFilesGetUid()
     {
-        $sysConf = PmSystem::getSystemConfiguration(PATH_CONFIG . "env.ini");
+        $sysConf = System::getSystemConfiguration(PATH_CONFIG . "env.ini");
 
         return (isset($sysConf["browser_cache_files_uid"]))? $sysConf["browser_cache_files_uid"] : null;
     }
@@ -5405,7 +5406,7 @@ class G
      */
     public static function log($message, $pathData = PATH_DATA, $file = 'cron.log')
     {
-        $config = PmSystem::getSystemConfiguration();
+        $config = System::getSystemConfiguration();
 
 
         $oLogger = Logger::getSingleton($pathData, PATH_SEP, $file);
diff --git a/gulliver/system/class.soapNtlm.php b/gulliver/system/class.soapNtlm.php
index fc5e04aa3..89ab4651b 100644
--- a/gulliver/system/class.soapNtlm.php
+++ b/gulliver/system/class.soapNtlm.php
@@ -30,6 +30,8 @@
  * to allow NTLM authentication throw soap connection
  */
 
+use ProcessMaker\Core\System;
+
 /**
  *
  * @package gulliver.system
@@ -200,7 +202,7 @@ class soapNtlm
         curl_setopt( $this->ch, CURLOPT_USERPWD, $this->getuser() . ':' . $this->getpassword() ); // Ankit's code
         //Apply proxy settings
         if (class_exists( 'System' )) {
-            $sysConf = PmSystem::getSystemConfiguration();
+            $sysConf = System::getSystemConfiguration();
             $sysConf = $filter->xssFilterHard($sysConf);
             if ($sysConf['proxy_host'] != '') {
                 curl_setopt( $this->ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
@@ -243,7 +245,7 @@ class NTLMSoapClient extends SoapClient
 
         //Apply proxy settings
         if (class_exists( 'System' )) {
-            $sysConf = PmSystem::getSystemConfiguration();
+            $sysConf = System::getSystemConfiguration();
             if ($sysConf['proxy_host'] != '') {
                 curl_setopt( $ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
                 if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/PmBootstrap.php b/workflow/engine/PmBootstrap.php
index d20698611..8c54c057c 100644
--- a/workflow/engine/PmBootstrap.php
+++ b/workflow/engine/PmBootstrap.php
@@ -1,5 +1,7 @@
 <?php
 //test
+use ProcessMaker\Core\System;
+
 class PmBootstrap extends Bootstrap
 {
     public $pmConfig = array();
@@ -25,7 +27,7 @@ class PmBootstrap extends Bootstrap
     {
         parent::configure();
 
-        $this->pmConfig = PmSystem::getSystemConfiguration();
+        $this->pmConfig = System::getSystemConfiguration();
 
         $e_all  = defined('E_DEPRECATED') ? E_ALL  & ~E_DEPRECATED : E_ALL;
         $e_all  = defined('E_STRICT')     ? $e_all & ~E_STRICT     : $e_all;
diff --git a/workflow/engine/bin/cron.php b/workflow/engine/bin/cron.php
index ae48cb31e..2c456ed14 100644
--- a/workflow/engine/bin/cron.php
+++ b/workflow/engine/bin/cron.php
@@ -1,4 +1,7 @@
 <?php
+
+use ProcessMaker\Core\System;
+
 require_once(__DIR__ . '/../../../bootstrap/autoload.php');
 try {
     //Set variables
@@ -77,7 +80,7 @@ try {
     $classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP);
     //Load classes
 
-    $arraySystemConfiguration = PmSystem::getSystemConfiguration();
+    $arraySystemConfiguration = System::getSystemConfiguration();
 
     $e_all = (defined('E_DEPRECATED'))?            E_ALL  & ~E_DEPRECATED : E_ALL;
     $e_all = (defined('E_STRICT'))?                $e_all & ~E_STRICT     : $e_all;
diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php
index 0c7758de3..95ff5c04a 100644
--- a/workflow/engine/bin/cron_single.php
+++ b/workflow/engine/bin/cron_single.php
@@ -1,6 +1,7 @@
 <?php
 require_once(__DIR__ . '/../../../bootstrap/autoload.php');
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 register_shutdown_function(
@@ -68,7 +69,7 @@ try {
 
     $classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP);
 
-    $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', $workspace);
+    $arraySystemConfiguration = System::getSystemConfiguration('', '', $workspace);
 
     $e_all = (defined('E_DEPRECATED'))?            E_ALL  & ~E_DEPRECATED : E_ALL;
     $e_all = (defined('E_STRICT'))?                $e_all & ~E_STRICT     : $e_all;
diff --git a/workflow/engine/bin/reindex_solr.php b/workflow/engine/bin/reindex_solr.php
index a277a001e..6844c0022 100644
--- a/workflow/engine/bin/reindex_solr.php
+++ b/workflow/engine/bin/reindex_solr.php
@@ -26,6 +26,8 @@
 // php reindex_solr.php workspacename [reindexall|reindexmissing|optimizeindex] [-skip 1005] [-reindextrunksize 1000]
 // var_dump($argv);
 //(count ($argv) == 4) || ((count ($argv) == 5) && ($argv [3] != '-skip'))
+use ProcessMaker\Core\System;
+
 $commandLineSyntaxMsg = "Invalid command line arguments: \n " .
   "syntax: ".
   "php reindex_solr.php [workspace_name] [reindexall|reindexmissing|optimizeindex|reindexone|deleteindexone] [-skip {record_number}] [-reindextrunksize {trunk_size}] [-appuid {APP_UID}]\n" .
@@ -143,7 +145,7 @@ if (! defined ('SYS_SYS')) {
       // ****************************************
       // read initialize file
       require_once PATH_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'class.system.php';
-      $config = PmSystem::getSystemConfiguration ('', '', SYS_SYS);
+      $config = System::getSystemConfiguration ('', '', SYS_SYS);
       define ('MEMCACHED_ENABLED', $config ['memcached']);
       define ('MEMCACHED_SERVER', $config ['memcached_server']);
       define ('TIME_ZONE', $config ['time_zone']);
@@ -259,7 +261,7 @@ function processWorkspace()
 
   try {
 
-    if (($solrConf = PmSystem::solrEnv (SYS_SYS)) !== false) {
+    if (($solrConf = System::solrEnv (SYS_SYS)) !== false) {
       print "Solr Configuration file: " . PATH_DATA_SITE . "env.ini\n";
       print "solr_enabled: " . $solrConf ['solr_enabled'] . "\n";
       print "solr_host: " . $solrConf ['solr_host'] . "\n";
diff --git a/workflow/engine/bin/tasks/cliCommon.php b/workflow/engine/bin/tasks/cliCommon.php
index 8bb00d4bc..561801ca3 100644
--- a/workflow/engine/bin/tasks/cliCommon.php
+++ b/workflow/engine/bin/tasks/cliCommon.php
@@ -26,6 +26,9 @@
  */
 
 /* Get the size of the terminal (only works on Linux, on Windows it's always 80) */
+
+use ProcessMaker\Core\System;
+
 preg_match_all("/rows.([0-9]+);.columns.([0-9]+);/", strtolower(exec('stty -a |grep columns')), $output);
 if(sizeof($output) == 3 && isset($output[2]) && isset($output[2][0])) {
   define("COLUMNS", $output[2][0]);
@@ -47,7 +50,7 @@ function get_workspaces_from_args($args, $includeAll = true) {
     $workspaces[] = new WorkspaceTools($arg);
   }
   if (empty($workspaces) && $includeAll) {
-    $workspaces = PmSystem::listWorkspaces();
+    $workspaces = System::listWorkspaces();
   }
   return $workspaces;
 }
diff --git a/workflow/engine/bin/tasks/cliUpgrade.php b/workflow/engine/bin/tasks/cliUpgrade.php
index 276871557..bfc449763 100644
--- a/workflow/engine/bin/tasks/cliUpgrade.php
+++ b/workflow/engine/bin/tasks/cliUpgrade.php
@@ -25,6 +25,8 @@
  * @package workflow-engine-bin-tasks
  */
 
+use ProcessMaker\Core\System;
+
 CLI::taskName('upgrade');
 CLI::taskDescription("Upgrade workspaces.\n\n This command should be run after upgrading ProcessMaker to a new version so that all workspaces are also upgraded to the\n  new version.");
 
@@ -87,7 +89,7 @@ function run_upgrade($command, $args)
     }
     $flag = G::isPMUnderUpdating(1, $oneWorkspace);
     //start to upgrade
-    $checksum = PmSystem::verifyChecksum();
+    $checksum = System::verifyChecksum();
     if ($checksum === false) {
         CLI::logging(CLI::error("checksum.txt not found, integrity check is not possible") . "\n");
         if (!CLI::question("Integrity check failed, do you want to continue the upgrade?")) {
@@ -177,7 +179,7 @@ function run_upgrade($command, $args)
             }
         }
     } else {
-        CLI::logging('ProcessMaker ' . PmSystem::getVersion(). ' installed', PATH_DATA . 'log/upgrades.log');
+        CLI::logging('ProcessMaker ' . System::getVersion(). ' installed', PATH_DATA . 'log/upgrades.log');
     }
 
     //Safe upgrade for JavaScript files
diff --git a/workflow/engine/bin/verify_solr.php b/workflow/engine/bin/verify_solr.php
index e1debf6a2..5cb5110ac 100644
--- a/workflow/engine/bin/verify_solr.php
+++ b/workflow/engine/bin/verify_solr.php
@@ -26,6 +26,8 @@
 // php reindex_solr.php workspacename [reindexall|reindexmissing|optimizeindex] [-skip 1005] [-reindextrunksize 1000]
 // var_dump($argv);
 //(count ($argv) == 4) || ((count ($argv) == 5) && ($argv [3] != '-skip'))
+use ProcessMaker\Core\System;
+
 $commandLineSyntaxMsg = "Invalid command line arguments: \n " .
   "Verify the list of cases comparing db vs solr lists by user if usr_uid is specify only verify one user otherwhise all users ".
   "syntax: ".
@@ -117,7 +119,7 @@ if (! defined ('SYS_SYS')) {
       // ****************************************
       // read initialize file
       require_once PATH_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'class.system.php';
-      $config = PmSystem::getSystemConfiguration ('', '', SYS_SYS);
+      $config = System::getSystemConfiguration ('', '', SYS_SYS);
       define ('MEMCACHED_ENABLED', $config ['memcached']);
       define ('MEMCACHED_SERVER', $config ['memcached_server']);
       define ('TIME_ZONE', $config ['time_zone']);
@@ -335,7 +337,7 @@ function displayMissingCases($aAppUidsDB, $aAppUidsSolr)
 
 function getListUids($usrUid, $action)
 {
-  if (($solrConf = PmSystem::solrEnv (SYS_SYS)) !== false) {
+  if (($solrConf = System::solrEnv (SYS_SYS)) !== false) {
 
     print "Solr Configuration file: " . PATH_DATA_SITE . "env.ini\n";
     print "solr_enabled: " . $solrConf ['solr_enabled'] . "\n";
diff --git a/workflow/engine/classes/BpmnEngineSearchIndexAccessSolr.php b/workflow/engine/classes/BpmnEngineSearchIndexAccessSolr.php
index f50765c5e..40bb64346 100644
--- a/workflow/engine/classes/BpmnEngineSearchIndexAccessSolr.php
+++ b/workflow/engine/classes/BpmnEngineSearchIndexAccessSolr.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 /**
  * Interface to the Solr Search server
  */
@@ -61,7 +63,7 @@ class BpmnEngineSearchIndexAccessSolr
         curl_setopt($handlerTotal, CURLOPT_RETURNTRANSFER, true);
 
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($handlerTotal, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
@@ -142,7 +144,7 @@ class BpmnEngineSearchIndexAccessSolr
         curl_setopt($handler, CURLOPT_RETURNTRANSFER, true);
 
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
@@ -190,7 +192,7 @@ class BpmnEngineSearchIndexAccessSolr
         curl_setopt($handler, CURLOPT_BINARYTRANSFER, true); // --data-binary
         curl_setopt($handler, CURLOPT_POSTFIELDS, $solrUpdateDocument->document); // data
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
@@ -235,7 +237,7 @@ class BpmnEngineSearchIndexAccessSolr
         curl_setopt($handler, CURLOPT_BINARYTRANSFER, true); // --data-binary
         curl_setopt($handler, CURLOPT_POSTFIELDS, "<commit/>"); // data
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
@@ -280,7 +282,7 @@ class BpmnEngineSearchIndexAccessSolr
         curl_setopt($handler, CURLOPT_BINARYTRANSFER, true); // --data-binary
         curl_setopt($handler, CURLOPT_POSTFIELDS, "<rollback/>"); // data
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
@@ -325,7 +327,7 @@ class BpmnEngineSearchIndexAccessSolr
         curl_setopt($handler, CURLOPT_BINARYTRANSFER, true); // --data-binary
         curl_setopt($handler, CURLOPT_POSTFIELDS, "<optimize/>"); // data
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
@@ -366,7 +368,7 @@ class BpmnEngineSearchIndexAccessSolr
         curl_setopt($handler, CURLOPT_RETURNTRANSFER, true);
 
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
@@ -446,7 +448,7 @@ class BpmnEngineSearchIndexAccessSolr
         curl_setopt($handler, CURLOPT_BINARYTRANSFER, true); // --data-binary
         curl_setopt($handler, CURLOPT_POSTFIELDS, "<delete><query>*:*</query></delete>"); // data
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
@@ -492,7 +494,7 @@ class BpmnEngineSearchIndexAccessSolr
         curl_setopt($handler, CURLOPT_BINARYTRANSFER, true); // --data-binary
         curl_setopt($handler, CURLOPT_POSTFIELDS, "<delete><query>" . $idQuery . "</query></delete>"); // data
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
@@ -573,7 +575,7 @@ class BpmnEngineSearchIndexAccessSolr
         curl_setopt($handler, CURLOPT_RETURNTRANSFER, true);
 
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/Cases.php b/workflow/engine/classes/Cases.php
index 20384823e..30321f0e7 100644
--- a/workflow/engine/classes/Cases.php
+++ b/workflow/engine/classes/Cases.php
@@ -1,6 +1,7 @@
 <?php
 
 use \ProcessMaker\BusinessModel\WebEntryEvent;
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 /**
@@ -18,7 +19,7 @@ class Cases
     public function __construct()
     {
         //get Solr initialization variables
-        if (($solrConf = PmSystem::solrEnv()) !== false) {
+        if (($solrConf = System::solrEnv()) !== false) {
             $this->appSolr = new AppSolr($solrConf['solr_enabled'], $solrConf['solr_host'], $solrConf['solr_instance']);
         }
     }
diff --git a/workflow/engine/classes/DashletRssReader.php b/workflow/engine/classes/DashletRssReader.php
index d00e4d543..843f847b6 100644
--- a/workflow/engine/classes/DashletRssReader.php
+++ b/workflow/engine/classes/DashletRssReader.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 class DashletRssReader implements DashletInterface
 {
 
@@ -52,7 +54,7 @@ class DashletRssReader implements DashletInterface
         curl_setopt( $pCurl, CURLOPT_VERBOSE, false );
 
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt( $pCurl, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
             if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/EnterpriseUtils.php b/workflow/engine/classes/EnterpriseUtils.php
index 3cafc36dd..70a26187d 100644
--- a/workflow/engine/classes/EnterpriseUtils.php
+++ b/workflow/engine/classes/EnterpriseUtils.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 class EnterpriseUtils
 {
     public static function getInternetConnection()
@@ -39,7 +41,7 @@ class EnterpriseUtils
                 curl_setopt($ch, CURLOPT_VERBOSE, true);
 
                 //Apply proxy settings
-                $sysConf = PmSystem::getSystemConfiguration();
+                $sysConf = System::getSystemConfiguration();
                 if (isset($sysConf['proxy_host'])) {
                     if ($sysConf['proxy_host'] != '') {
                         curl_setopt($ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
diff --git a/workflow/engine/classes/P11835.php b/workflow/engine/classes/P11835.php
index 76b5d9f46..d072a0f9a 100644
--- a/workflow/engine/classes/P11835.php
+++ b/workflow/engine/classes/P11835.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 class P11835 extends Patch
 {
     /*
@@ -16,7 +18,7 @@ class P11835 extends Patch
         $rs->next();
         while($row = $rs->getRow()) {
             if ($row ['Field'] == "TAS_GROUP_VARIABLE") {
-                $version = PmSystem::getVersion ();
+                $version = System::getVersion ();
                 $version = explode('-',$version);
                 if ($version[0] == '2.5.1') {
                     echo "Version " . $version[0] . " Patch\n";
@@ -84,7 +86,7 @@ class P11835 extends Patch
         $arrayHotfix = $conf->getConfiguration("HOTFIX", "");
         $arrayHotfix = (is_array($arrayHotfix))? $arrayHotfix : array($arrayHotfix);
         
-        $pmVersion = self::pmVersion(PmSystem::getVersion()) . "";
+        $pmVersion = self::pmVersion(System::getVersion()) . "";
         
         if (($pmVersion == "2.5.2.4" || $pmVersion == "2.8") && !in_array("15394", $arrayHotfix)) {
             $cnn = Propel::getConnection("workflow");
diff --git a/workflow/engine/classes/PMPluginRegistry.php b/workflow/engine/classes/PMPluginRegistry.php
index 5ae9c2ecf..6136b662a 100644
--- a/workflow/engine/classes/PMPluginRegistry.php
+++ b/workflow/engine/classes/PMPluginRegistry.php
@@ -1,4 +1,6 @@
 <?php
+
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 class PMPluginRegistry
@@ -501,7 +503,7 @@ class PMPluginRegistry
 
     public function uninstallPluginWorkspaces ($arrayPlugin)
     {
-        $workspace = PmSystem::listWorkspaces();
+        $workspace = System::listWorkspaces();
 
         foreach ($workspace as $indexWS => $ws) {
             $wsPathDataSite = PATH_DATA . "sites" . PATH_SEP . $ws->name . PATH_SEP;
@@ -1542,7 +1544,7 @@ class PMPluginRegistry
             if (isset($pluginDetails->aWorkspaces) && is_array($pluginDetails->aWorkspaces) && count($pluginDetails->aWorkspaces) > 0) {
                 $arrayWorkspace = array();
 
-                foreach (PmSystem::listWorkspaces() as $value) {
+                foreach (System::listWorkspaces() as $value) {
                     $workspaceTools = $value;
 
                     $arrayWorkspace[] = $workspaceTools->name;
diff --git a/workflow/engine/classes/Padl.php b/workflow/engine/classes/Padl.php
index 9f18840d0..6aa8ebe1f 100644
--- a/workflow/engine/classes/Padl.php
+++ b/workflow/engine/classes/Padl.php
@@ -27,6 +27,8 @@
  * see CHANGELOG
  */
 
+use ProcessMaker\Core\System;
+
 /**
  * Project:		Distrubution License Class
  * File:			class.license.lib.php
@@ -264,7 +266,7 @@ class Padl
         }
 
         // Proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             if (!is_array($params['http'])) {
                 $params['http'] = array();
diff --git a/workflow/engine/classes/PmDynaform.php b/workflow/engine/classes/PmDynaform.php
index 437a145cf..5ef326550 100644
--- a/workflow/engine/classes/PmDynaform.php
+++ b/workflow/engine/classes/PmDynaform.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 /**
  * Implementing pmDynaform library in the running case.
  *
@@ -1056,7 +1058,7 @@
         $javascript = "
             <script type=\"text/javascript\">
                 var jsondata = " . G::json_encode($json) . ";
-                var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";
+                var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";
                 var pm_run_outside_main_app = \"\";
                 var dyn_uid = \"" . $this->fields["CURRENT_DYNAFORM"] . "\";
                 var __DynaformName__ = \"" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "\";
@@ -1117,7 +1119,7 @@
         $javascrip = "" .
                 "<script type='text/javascript'>\n" .
                 "var jsondata = " . G::json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var pm_run_outside_main_app = null;\n" .
                 "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
                 "var __DynaformName__ = '" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "';\n" .
@@ -1196,7 +1198,7 @@
         $javascrip = "" .
                 "<script type='text/javascript'>\n" .
                 "var jsondata = " . $this->json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var pm_run_outside_main_app = '" . $this->fields["PM_RUN_OUTSIDE_MAIN_APP"] . "';\n" .
                 "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
                 "var __DynaformName__ = '" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "';\n" .
@@ -1253,7 +1255,7 @@
         $javascrip = "
         <script type=\"text/javascript\">
             var jsondata = " . G::json_encode($json) . ";
-            var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";
+            var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";
             var pm_run_outside_main_app = null;
             var dyn_uid = \"" . $this->fields["CURRENT_DYNAFORM"] . "\";
             var __DynaformName__ = \"" . $this->fields["PRO_UID"] . "_" . $this->fields["CURRENT_DYNAFORM"] . "\";
@@ -1297,7 +1299,7 @@
         $javascrip = "" .
                 "<script type='text/javascript'>\n" .
                 "var jsondata = " . G::json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var pm_run_outside_main_app = null;\n" .
                 "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
                 "var __DynaformName__ = null;\n" .
@@ -1339,7 +1341,7 @@
         $javascrip = "" .
                 "<script type='text/javascript'>\n" .
                 "var jsondata = " . G::json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var pm_run_outside_main_app = null;\n" .
                 "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
                 "var __DynaformName__ = null;\n" .
@@ -1381,7 +1383,7 @@
                 "var pathRTLCss = '" . $this->pathRTLCss . "';\n" .
                 "var delIndex = " . (isset($this->fields["DEL_INDEX"]) ? $this->fields["DEL_INDEX"] : "0") . ";\n" .
                 "var jsonData = " . $this->json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var leaveCaseWarning = " . $this->getLeaveCaseWarning() . ";\n" .
                 $js .
                 "</script>";
@@ -1403,7 +1405,7 @@
         $javascrip = "" .
                 "<script type='text/javascript'>\n" .
                 "var jsondata = " . G::json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var pm_run_outside_main_app = null;\n" .
                 "var dyn_uid = '" . $currentDynaform . "';\n" .
                 "var __DynaformName__ = null;\n" .
diff --git a/workflow/engine/classes/Processes.php b/workflow/engine/classes/Processes.php
index 3c7b60397..acb3056a9 100644
--- a/workflow/engine/classes/Processes.php
+++ b/workflow/engine/classes/Processes.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 class Processes
 {
 
@@ -5771,7 +5773,7 @@ class Processes
         $endpoint = PML_WSDL_URL;
         $sessionId = '';
         $proxy = array();
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             $proxy['proxy_host'] = $sysConf['proxy_host'];
             if ($sysConf['proxy_port'] != '') {
@@ -5813,7 +5815,7 @@ class Processes
         ini_set("soap.wsdl_cache_enabled", "0"); // enabling WSDL cache
         try {
             $proxy = array();
-            $sysConf = PmSystem::getSystemConfiguration();
+            $sysConf = System::getSystemConfiguration();
             if ($sysConf['proxy_host'] != '') {
                 $proxy['proxy_host'] = $sysConf['proxy_host'];
                 if ($sysConf['proxy_port'] != '') {
@@ -5845,7 +5847,7 @@ class Processes
 
         $endpoint = PML_WSDL_URL;
         $proxy = array();
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
 
         if ($sysConf['proxy_host'] != '') {
             $proxy['proxy_host'] = $sysConf['proxy_host'];
@@ -5922,7 +5924,7 @@ class Processes
 
         $endpoint = PML_WSDL_URL;
         $proxy = array();
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             $proxy['proxy_host'] = $sysConf['proxy_host'];
             if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/SpoolRun.php b/workflow/engine/classes/SpoolRun.php
index 9220b5586..d2474a5ca 100644
--- a/workflow/engine/classes/SpoolRun.php
+++ b/workflow/engine/classes/SpoolRun.php
@@ -8,6 +8,8 @@
  * @link http://www.openmail.cc
  */
 
+use ProcessMaker\Core\System;
+
 /**
  * @package workflow.engine.ProcessMaker
  */
@@ -548,7 +550,7 @@ class SpoolRun
      */
     public function resendEmails($dateResend = null, $cron = 0)
     {
-        $aConfiguration = PmSystem::getEmailConfiguration();
+        $aConfiguration = System::getEmailConfiguration();
 
         if (!isset($aConfiguration["MESS_ENABLED"])) {
             $aConfiguration["MESS_ENABLED"] = '0';
diff --git a/workflow/engine/classes/Upgrade.php b/workflow/engine/classes/Upgrade.php
index 46b14b0fd..2721186ec 100644
--- a/workflow/engine/classes/Upgrade.php
+++ b/workflow/engine/classes/Upgrade.php
@@ -1,6 +1,8 @@
 <?php
 
 
+use ProcessMaker\Core\System;
+
 class Upgrade
 {
     private $addon = null;
@@ -90,7 +92,7 @@ class Upgrade
             G::rm_dir(PATH_C);
             mkdir(PATH_C, 0777, true);
         }
-        $workspaces = PmSystem::listWorkspaces();
+        $workspaces = System::listWorkspaces();
         $count = count($workspaces);
         $first = true;
         $num = 0;
diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index 2b53fd5d7..e15d1b71f 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -1,5 +1,6 @@
 <?php
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Util\FixReferencePath;
 use ProcessMaker\Plugins\Adapters\PluginAdapter;
 
@@ -498,7 +499,7 @@ class WorkspaceTools
 
         $language = new Language();
 
-        foreach (PmSystem::listPoFiles() as $poFile) {
+        foreach (System::listPoFiles() as $poFile) {
             $poName = basename($poFile);
             $names = explode(".", basename($poFile));
             $extension = array_pop($names);
@@ -849,8 +850,8 @@ class WorkspaceTools
      */
     public function upgradePluginsDatabase()
     {
-        foreach (PmSystem::getPlugins() as $pluginName) {
-            $pluginSchema = PmSystem::getPluginSchema($pluginName);
+        foreach (System::getPlugins() as $pluginName) {
+            $pluginSchema = System::getPluginSchema($pluginName);
             if ($pluginSchema !== false) {
                 CLI::logging("Updating plugin " . CLI::info($pluginName) . "\n");
                 $this->upgradeSchema($pluginSchema);
@@ -869,8 +870,8 @@ class WorkspaceTools
         $this->initPropel(true);
         P11835::$dbAdapter = $this->dbAdapter;
         P11835::isApplicable();
-        $systemSchema = PmSystem::getSystemSchema($this->dbAdapter);
-        $systemSchemaRbac = PmSystem::getSystemSchemaRbac($this->dbAdapter);// get the Rbac Schema
+        $systemSchema = System::getSystemSchema($this->dbAdapter);
+        $systemSchemaRbac = System::getSystemSchemaRbac($this->dbAdapter);// get the Rbac Schema
         $this->registerSystemTables(array_merge($systemSchema, $systemSchemaRbac));
         $this->upgradeSchema($systemSchema);
         $this->upgradeSchema($systemSchemaRbac, false, true, $onedb); // perform Upgrade to Rbac
@@ -898,7 +899,7 @@ class WorkspaceTools
 
             $emailSever = new \ProcessMaker\BusinessModel\EmailServer();
 
-            $emailConfiguration = PmSystem::getEmailConfiguration();
+            $emailConfiguration = System::getEmailConfiguration();
 
             if (!empty($emailConfiguration)) {
                 $arrayData["MESS_ENGINE"] = $emailConfiguration["MESS_ENGINE"];
@@ -993,7 +994,7 @@ class WorkspaceTools
 
         if (!$onedb) {
             if ($rbac) {
-                $rename = PmSystem::verifyRbacSchema($workspaceSchema);
+                $rename = System::verifyRbacSchema($workspaceSchema);
                 if (count($rename) > 0) {
                     foreach ($rename as $tableName) {
                         $oDataBase->executeQuery($oDataBase->generateRenameTableSQL($tableName));
@@ -1002,7 +1003,7 @@ class WorkspaceTools
             }
         }
         $workspaceSchema = $this->getSchema($rbac);
-        $changes = PmSystem::compareSchema($workspaceSchema, $schema);
+        $changes = System::compareSchema($workspaceSchema, $schema);
 
         $changed = (count($changes['tablesToAdd']) > 0 || count($changes['tablesToAlter']) > 0 || count($changes['tablesWithNewIndex']) > 0 || count($changes['tablesToAlterIndex']) > 0);
 
@@ -1141,7 +1142,7 @@ class WorkspaceTools
      */
     public function getMetadata()
     {
-        $Fields = array_merge(PmSystem::getSysInfo(), $this->getDBInfo());
+        $Fields = array_merge(System::getSysInfo(), $this->getDBInfo());
         $Fields['WORKSPACE_NAME'] = $this->name;
 
         if (isset($this->dbHost)) {
@@ -1176,7 +1177,7 @@ class WorkspaceTools
      */
     public static function printSysInfo()
     {
-        $fields = PmSystem::getSysInfo();
+        $fields = System::getSysInfo();
 
         $info = array(
             'ProcessMaker Version' => $fields['PM_VERSION'],
@@ -1655,7 +1656,7 @@ class WorkspaceTools
             throw new Exception("Workspace $srcWorkspace not found in backup");
         }
 
-        $version = PmSystem::getVersion();
+        $version = System::getVersion();
         $pmVersion = (preg_match("/^([\d\.]+).*$/", $version, $arrayMatch)) ? $arrayMatch[1] : ""; //Otherwise: Branch master
 
         CLI::logging(CLI::warning("
@@ -1919,7 +1920,7 @@ class WorkspaceTools
 
     public function backupLogFiles()
     {
-        $config = PmSystem::getSystemConfiguration();
+        $config = System::getSystemConfiguration();
 
         clearstatcache();
         $path = PATH_DATA . "log" . PATH_SEP;
@@ -1952,7 +1953,7 @@ class WorkspaceTools
                 $envFile = PATH_CONFIG . 'env.ini';
                 $skin ='neoclassic';
                 if (file_exists($envFile)) {
-                    $sysConf = PmSystem::getSystemConfiguration($envFile);
+                    $sysConf = System::getSystemConfiguration($envFile);
                     $lang = $sysConf['default_lang'];
                     $skin = $sysConf['default_skin'];
                 }
@@ -3525,7 +3526,7 @@ class WorkspaceTools
     public function migrateIteeToDummytask($workspaceName)
     {
         $this->initPropel(true);
-        $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', $workspaceName);
+        $arraySystemConfiguration = System::getSystemConfiguration('', '', $workspaceName);
         $conf = new Configurations();
         \G::$sysSys = $workspaceName;
         \G::$pathDataSite = PATH_DATA . "sites" . PATH_SEP . \G::$sysSys . PATH_SEP;
diff --git a/workflow/engine/classes/WsBase.php b/workflow/engine/classes/WsBase.php
index fffdf4ecb..d842e82a6 100644
--- a/workflow/engine/classes/WsBase.php
+++ b/workflow/engine/classes/WsBase.php
@@ -1,6 +1,7 @@
 <?php
 
 //It works with the table CONFIGURATION in a WF dataBase
+use ProcessMaker\Core\System;
 
 /**
  * Copyright (C) 2009 COLOSA
@@ -269,7 +270,7 @@ class WsBase
         try {
             $solrEnabled = 0;
 
-            if (($solrEnv = PmSystem::solrEnv()) !== false) {
+            if (($solrEnv = System::solrEnv()) !== false) {
 
                 $appSolr = new AppSolr(
                     $solrEnv["solr_enabled"],
@@ -872,7 +873,7 @@ class WsBase
                     }
                 }
 
-                $aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : PmSystem::getEmailConfiguration();
+                $aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : System::getEmailConfiguration();
 
                 if (!isset($aSetup['MESS_ENABLED'])) {
                     $aSetup['MESS_ENABLED'] = 1;
@@ -881,7 +882,7 @@ class WsBase
                 }
             } else {
             /*----------------------------------********---------------------------------*/
-                $aSetup = PmSystem::getEmailConfiguration();
+                $aSetup = System::getEmailConfiguration();
             /*----------------------------------********---------------------------------*/
             }
             /*----------------------------------********---------------------------------*/
@@ -2825,7 +2826,7 @@ class WsBase
             $result->status_code = 0;
             $result->message = G::loadTranslation( 'ID_SUCESSFUL' );
             $result->timestamp = date( 'Y-m-d H:i:s' );
-            $result->version = PmSystem::getVersion();
+            $result->version = System::getVersion();
             $result->operatingSystem = $redhat;
             $result->webServer = getenv( 'SERVER_SOFTWARE' );
             $result->serverName = getenv( 'SERVER_NAME' );
diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index 1e391e2f0..4e8642092 100644
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -28,6 +28,7 @@
 //
 // License: LGPL, see LICENSE
 ////////////////////////////////////////////////////
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 use ProcessMaker\Util\ElementTranslation;
 
@@ -242,7 +243,7 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter
     $aContext = \Bootstrap::getDefaultContextLog();
     $con = Propel::getConnection( $DBConnectionUID );
     $con->begin();
-    $blackList = PmSystem::getQueryBlackList();
+    $blackList = System::getQueryBlackList();
     $aListQueries = explode('|', $blackList['queries']);
     $aListAllTables = explode(
         '|',
@@ -903,7 +904,7 @@ function WSProcessList ()
 //private function to get current email configuration
 function getEmailConfiguration ()
 {
-    return PmSystem::getEmailConfiguration();
+    return System::getEmailConfiguration();
 }
 
 /**
diff --git a/workflow/engine/classes/class.webdav.php b/workflow/engine/classes/class.webdav.php
index 6ba087c81..d02d0d86e 100644
--- a/workflow/engine/classes/class.webdav.php
+++ b/workflow/engine/classes/class.webdav.php
@@ -5,6 +5,9 @@
  *
  * @package workflow.engine.classes
  */
+
+use ProcessMaker\Core\System;
+
 require_once "HTTP/WebDAV/Server.php";
 require_once "System.php";
 
@@ -742,7 +745,7 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
         if (is_dir($path)) {
             $query = "DELETE FROM properties WHERE path LIKE '" . $this->_slashify($options["path"]) . "%'";
             mysql_query($query);
-            PmSystem::rm("-rf $path");
+            System::rm("-rf $path");
         } else {
             unlink($path);
         }
@@ -845,7 +848,7 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
             mysql_query($query);
         } else {
             if (is_dir($source)) {
-                $files = PmSystem::find($source);
+                $files = System::find($source);
                 $files = array_reverse($files);
             } else {
                 $files = array($source
diff --git a/workflow/engine/classes/model/AddonsManager.php b/workflow/engine/classes/model/AddonsManager.php
index cdde1ae5d..4549a981e 100644
--- a/workflow/engine/classes/model/AddonsManager.php
+++ b/workflow/engine/classes/model/AddonsManager.php
@@ -1,5 +1,6 @@
 <?php
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 require_once 'classes/model/om/BaseAddonsManager.php';
@@ -157,7 +158,7 @@ class AddonsManager extends BaseAddonsManager
     public function getInstalledVersion()
     {
         if ($this->isCore()) {
-            return (EnterpriseUtils::pmVersion(PmSystem::getVersion()));
+            return (EnterpriseUtils::pmVersion(System::getVersion()));
         } else {
             if ($this->isPlugin()) {
                 if (!$this->isInstalled()) {
@@ -243,7 +244,7 @@ class AddonsManager extends BaseAddonsManager
         );
 
         // Proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             if (!is_array($option['http'])) {
                 $option['http'] = array();
diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php
index 54f4120f1..0a9fd1c30 100644
--- a/workflow/engine/classes/model/AddonsStore.php
+++ b/workflow/engine/classes/model/AddonsStore.php
@@ -1,5 +1,6 @@
 <?php
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 require_once 'classes/model/om/BaseAddonsStore.php';
@@ -489,7 +490,7 @@ class AddonsStore extends BaseAddonsStore
                     "header" => "Content-type: application/x-www-form-urlencoded\r\n",
                     "content" => http_build_query(
                         array(
-                            "pmVersion" => PmSystem::getVersion(),
+                            "pmVersion" => System::getVersion(),
                             "version" => STORE_VERSION
                         )
                     )
@@ -497,7 +498,7 @@ class AddonsStore extends BaseAddonsStore
             );
 
             // Proxy settings
-            $sysConf = PmSystem::getSystemConfiguration();
+            $sysConf = System::getSystemConfiguration();
             if (isset($sysConf['proxy_host'])) {
                 if ($sysConf['proxy_host'] != '') {
                     if (!is_array($option['http'])) {
diff --git a/workflow/engine/classes/model/AppNotes.php b/workflow/engine/classes/model/AppNotes.php
index 667989122..736173b36 100644
--- a/workflow/engine/classes/model/AppNotes.php
+++ b/workflow/engine/classes/model/AppNotes.php
@@ -1,6 +1,7 @@
 <?php
 
 //require_once 'classes/model/om/BaseAppNotes.php';
+use ProcessMaker\Core\System;
 
 /**
  * Skeleton subclass for representing a row from the 'APP_NOTES' table.
@@ -148,7 +149,7 @@ class AppNotes extends BaseAppNotes
     {
         try {
 
-            $aConfiguration = PmSystem::getEmailConfiguration();
+            $aConfiguration = System::getEmailConfiguration();
 
             $msgError = "";
             if (! isset( $aConfiguration['MESS_ENABLED'] ) || $aConfiguration['MESS_ENABLED'] != '1') {
diff --git a/workflow/engine/classes/model/Language.php b/workflow/engine/classes/model/Language.php
index ceed78a4b..06e6a69e7 100644
--- a/workflow/engine/classes/model/Language.php
+++ b/workflow/engine/classes/model/Language.php
@@ -1,4 +1,7 @@
 <?php
+
+use ProcessMaker\Core\System;
+
 class Language extends BaseLanguage
 {
     private static $arrayRecord = array();
@@ -355,7 +358,7 @@ class Language extends BaseLanguage
         $sLanguage = $langRecord['LAN_NAME'];
 
         //setting headers
-        $poFile->addHeader( 'Project-Id-Version', 'ProcessMaker ' . PmSystem::getVersion() );
+        $poFile->addHeader( 'Project-Id-Version', 'ProcessMaker ' . System::getVersion() );
         $poFile->addHeader( 'POT-Creation-Date', '' );
         $poFile->addHeader( 'PO-Revision-Date', date( 'Y-m-d H:i:s' ) );
         $poFile->addHeader( 'Last-Translator', '' );
diff --git a/workflow/engine/classes/triggers/api/Zimbra.php b/workflow/engine/classes/triggers/api/Zimbra.php
index c74cf047f..dceac7d28 100644
--- a/workflow/engine/classes/triggers/api/Zimbra.php
+++ b/workflow/engine/classes/triggers/api/Zimbra.php
@@ -11,6 +11,8 @@
  * @GPL 2007, Plymouth State University, ITS
  */
 
+use ProcessMaker\Core\System;
+
 /**
  * zimbra.class.php
  *
@@ -206,7 +208,7 @@ class Zimbra
         curl_setopt($this->_curl, CURLOPT_SSL_VERIFYHOST, false);
 
         //Apply proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($this->_curl, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/triggers/class.pmSugarFunctions.php b/workflow/engine/classes/triggers/class.pmSugarFunctions.php
index 077883651..61ab24a34 100644
--- a/workflow/engine/classes/triggers/class.pmSugarFunctions.php
+++ b/workflow/engine/classes/triggers/class.pmSugarFunctions.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 /**
  * class.pmSugar.pmFunctions.php
  *
@@ -22,7 +24,7 @@ function getSoapClientOptions ()
     $options = array ('trace' => 1);
 
     //Apply proxy settings
-    $sysConf = PmSystem::getSystemConfiguration();
+    $sysConf = System::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
         $options['proxy_host'] = $sysConf['proxy_host'];
         if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/triggers/class.pmTalendFunctions.php b/workflow/engine/classes/triggers/class.pmTalendFunctions.php
index 340d9a1ed..0b0083618 100644
--- a/workflow/engine/classes/triggers/class.pmTalendFunctions.php
+++ b/workflow/engine/classes/triggers/class.pmTalendFunctions.php
@@ -15,6 +15,7 @@
 //
 // License: LGPL, see LICENSE
 ////////////////////////////////////////////////////
+use ProcessMaker\Core\System;
 
 
 /**
@@ -47,7 +48,7 @@ function executeTalendWebservice ($wsdl, $message, $params = array())
     ) );
 
     //Apply proxy settings
-    $sysConf = PmSystem::getSystemConfiguration();
+    $sysConf = System::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
         curl_setopt( $client, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
         if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/triggers/class.pmTrZimbra.php b/workflow/engine/classes/triggers/class.pmTrZimbra.php
index 75d5a42f5..6a7aed5c9 100644
--- a/workflow/engine/classes/triggers/class.pmTrZimbra.php
+++ b/workflow/engine/classes/triggers/class.pmTrZimbra.php
@@ -14,6 +14,7 @@
 //
 // License: LGPL, see LICENSE
 ////////////////////////////////////////////////////
+use ProcessMaker\Core\System;
 
 
 /**
@@ -401,7 +402,7 @@ function uploadZimbraFile($ServerUrl, $username, $preAuthKey, $folderName, $file
     curl_setopt ($ch, CURLOPT_HTTPHEADER,$header_array);
 
     //Apply proxy settings
-    $sysConf = PmSystem::getSystemConfiguration();
+    $sysConf = System::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
         curl_setopt($ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
         if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/controllers/admin.php b/workflow/engine/controllers/admin.php
index f7c29b7bf..aa87d89ca 100644
--- a/workflow/engine/controllers/admin.php
+++ b/workflow/engine/controllers/admin.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 /**
  * Admin controller
  *
@@ -19,7 +21,7 @@ class Admin extends Controller
         $RBAC->requirePermissions( 'PM_SETUP' );
         require_once PATH_CONTROLLERS . 'main.php';
 
-        $skinsList = PmSystem::getSkingList();
+        $skinsList = System::getSkingList();
         foreach ($skinsList['skins'] as $key => $value) {
             if ($value['SKIN_WORKSPACE'] != 'Global') {
                 unset( $skinsList['skins'][$key] );
@@ -29,7 +31,7 @@ class Admin extends Controller
         $mainController = new Main();
         $languagesList = $mainController->getLanguagesList();
         $languagesList[] = array ("", G::LoadTranslation("ID_USE_LANGUAGE_URL"));
-        $sysConf = PmSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
+        $sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
 
         foreach ($skinsList['skins'] as $skin) {
             $skins[] = array ($skin['SKIN_FOLDER_ID'],$skin['SKIN_NAME']);
@@ -268,7 +270,7 @@ class Admin extends Controller
         if (defined('SYSTEM_NAME')) {
             $systemName = SYSTEM_NAME;
         }
-        $properties[] = array ($systemName. ' Ver.', PmSystem::getVersion() . $ee, $pmSection);
+        $properties[] = array ($systemName. ' Ver.', System::getVersion() . $ee, $pmSection);
         $properties[] = array("PMUI JS Lib. Ver.", $pmuiVer, $pmSection);
         $properties[] = array("MAFE JS Lib. Ver.", $mafeVer, $pmSection);
         $properties[] = array("PM Dynaform JS Lib. Ver.", $pmdynaformVer, $pmSection);
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 4aa0a9f6c..6c4aebb86 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -1,5 +1,6 @@
 <?php
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 /**
@@ -41,7 +42,7 @@ class adminProxy extends HttpProxyController
         $updateRedirector = false;
         $restart = false;
         self::validateDataSystemConf($httpData, $envFile);
-        $sysConf = PmSystem::getSystemConfiguration($envFile);
+        $sysConf = System::getSystemConfiguration($envFile);
         $updatedConf = array();
 
         if ($sysConf['default_lang'] != $httpData->default_lang) {
@@ -99,7 +100,7 @@ class adminProxy extends HttpProxyController
                 }
             }
 
-            PmSystem::updateIndexFile(array(
+            System::updateIndexFile(array(
               'lang' => $sysConf['default_lang'],
               'skin' => $sysConf['default_skin']
             ));
@@ -614,7 +615,7 @@ class adminProxy extends HttpProxyController
         $sBodyPre->prepare();
         $sBodyPre->assign('server', $_SERVER['SERVER_NAME']);
         $sBodyPre->assign('date', date('H:i:s'));
-        $sBodyPre->assign('ver', PmSystem::getVersion());
+        $sBodyPre->assign('ver', System::getVersion());
         $sBodyPre->assign('engine', $engine);
         $sBodyPre->assign('msg', $msg);
         $sBody = $sBodyPre->getOutputContent();
@@ -1418,7 +1419,7 @@ class adminProxy extends HttpProxyController
         $params['lt'] = isset($licInfo[SYS_SYS]) ? isset($licInfo[SYS_SYS]['TYPE'])? $licInfo[SYS_SYS]['TYPE'] : ''  : '';
 
         //ProcessMaker Version
-        $params['v'] = PmSystem::getVersion();
+        $params['v'] = System::getVersion();
         if (file_exists(PATH_DATA. 'log/upgrades.log')) {
             $params['pmu'] = serialize(file_get_contents(PATH_DATA. 'log/upgrades.log', 'r'));
         } else {
@@ -1508,7 +1509,7 @@ class adminProxy extends HttpProxyController
 
         //Country/city (Timezone)
         $params['t'] = (defined('TIME_ZONE') && TIME_ZONE != "Unknown") ? TIME_ZONE : date_default_timezone_get();
-        $params['w'] = count(PmSystem::listWorkspaces());
+        $params['w'] = count(System::listWorkspaces());
 
         $support = PATH_DATA_SITE . G::sanitizeString($licenseManager->info['FIRST_NAME'] . '-' . $licenseManager->info['LAST_NAME'] . '-' . SYS_SYS . '-' . date('YmdHis'), false, false) . '.spm';
         file_put_contents($support, serialize($params));
diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php
index 5b9b241da..efa0d8ccb 100644
--- a/workflow/engine/controllers/designer.php
+++ b/workflow/engine/controllers/designer.php
@@ -1,5 +1,6 @@
 <?php
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 /**
@@ -64,7 +65,7 @@ class Designer extends Controller
         $this->setVar("SYS_SYS", SYS_SYS);
         $this->setVar("SYS_LANG", SYS_LANG);
         $this->setVar("SYS_SKIN", SYS_SKIN);
-        $this->setVar('HTTP_SERVER_HOSTNAME', PmSystem::getHttpServerHostnameRequestsFrontEnd());
+        $this->setVar('HTTP_SERVER_HOSTNAME', System::getHttpServerHostnameRequestsFrontEnd());
 
         if ($debug) {
             if (!file_exists(PATH_HTML . "lib-dev/pmUI/build.cache")) {
diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php
index 2cb64d6bb..8633d6982 100644
--- a/workflow/engine/controllers/home.php
+++ b/workflow/engine/controllers/home.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 /**
  * Home controller
  *
@@ -102,7 +104,7 @@ class Home extends Controller
         $userProperty = new UsersProperties();
         $process = new Process();
         $case = new Cases();
-        $sysConf = PmSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
+        $sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
 
         //Get ProcessStatistics Info
         $start = 0;
@@ -184,7 +186,7 @@ class Home extends Controller
 
         $solrEnabled = false;
 
-        if (($solrConf = PmSystem::solrEnv()) !== false) {
+        if (($solrConf = System::solrEnv()) !== false) {
 
             $ApplicationSolrIndex = new AppSolr(
                 $solrConf["solr_enabled"],
@@ -408,7 +410,7 @@ class Home extends Controller
             $type == "todo" || $type == "draft" || $type == "paused" || $type == "sent" ||
             $type == "selfservice" || $type == "unassigned" || $type == "search"
         ) &&
-        (($solrConf = PmSystem::solrEnv()) !== false)
+        (($solrConf = System::solrEnv()) !== false)
         ) {
 
             $ApplicationSolrIndex = new AppSolr(
diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php
index e5fc7deac..80f740b67 100644
--- a/workflow/engine/controllers/installer.php
+++ b/workflow/engine/controllers/installer.php
@@ -5,7 +5,11 @@
  *
  * @author Erik A. O. <erik@colosa.com>
  */
-global $translation;
+global
+
+use ProcessMaker\Core\System;
+
+$translation;
 include PATH_LANGUAGECONT."translation.".SYS_LANG;
 
 class Installer extends Controller
@@ -966,7 +970,7 @@ class Installer extends Controller
             $envFile = PATH_CONFIG . 'env.ini';
 
             // getting configuration from env.ini
-            $sysConf = PmSystem::getSystemConfiguration( $envFile );
+            $sysConf = System::getSystemConfiguration( $envFile );
 
             $langUri = 'en';
             if (isset($sysConf['default_lang'])) {
@@ -1022,7 +1026,7 @@ class Installer extends Controller
 
                 try {
                     // update the main index file
-                    $indexFileUpdated = PmSystem::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin']));
+                    $indexFileUpdated = System::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin']));
                 } catch (Exception $e) {
                     $info->result = false;
                     $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array(PATH_HTML . "index.html."));
diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php
index db150c5a8..a7a35c9e8 100644
--- a/workflow/engine/controllers/main.php
+++ b/workflow/engine/controllers/main.php
@@ -1,5 +1,6 @@
 <?php
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 /**
@@ -264,7 +265,7 @@ class Main extends Controller
         }
 
         $this->setVar( 'logo_company', $this->getCompanyLogo() );
-        $this->setVar( 'pmos_version', PmSystem::getVersion() );
+        $this->setVar( 'pmos_version', System::getVersion() );
 
         $footerText = 'Copyright &copy; 2003-' . date( 'Y' ) . ' Colosa, Inc. All rights reserved.';
         $adviseText = 'Supplied free of charge with no support, certification, warranty,
@@ -314,7 +315,7 @@ class Main extends Controller
         $this->includeExtJS( 'main/sysLogin' );
 
         $this->setVar( 'logo_company', $this->getCompanyLogo() );
-        $this->setVar( 'pmos_version', PmSystem::getVersion() );
+        $this->setVar( 'pmos_version', System::getVersion() );
 
         $footerText = G::LoadTranslation('ID_COPYRIGHT_FROM') . date( 'Y' ) . G::LoadTranslation('ID_COPYRIGHT_COL');
         $adviseText = G::LoadTranslation('ID_COLOSA_AND_CERTIFIED_PARTNERS');
@@ -384,7 +385,7 @@ class Main extends Controller
             $template->assign( 'passwd', $newPass );
             $template->assign( 'poweredBy', G::loadTranslation( 'ID_PROCESSMAKER_SLOGAN1' ) );
             $template->assign( 'versionLabel', G::loadTranslation( 'ID_VERSION' ) );
-            $template->assign( 'version', PmSystem::getVersion() );
+            $template->assign( 'version', System::getVersion() );
             $template->assign( 'visit', G::loadTranslation( 'ID_VISIT' ) );
 
             $template->assign( 'footer', '' );
@@ -733,7 +734,7 @@ class Main extends Controller
         if (defined('SYSTEM_NAME')) {
             $systemName = SYSTEM_NAME;
         }
-        $properties[] = array ($systemName. ' Ver.', PmSystem::getVersion() . $ee, $pmSection);
+        $properties[] = array ($systemName. ' Ver.', System::getVersion() . $ee, $pmSection);
         $properties[] = array("PMUI JS Lib. Ver.", $pmuiVer, $pmSection);
         $properties[] = array("MAFE JS Lib. Ver.", $mafeVer, $pmSection);
         $properties[] = array("PM Dynaform JS Lib. Ver.", $pmdynaformVer, $pmSection);
diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index ad00b2ce7..41243e7f2 100644
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -6,6 +6,9 @@
  * @inherits HttpProxyController
  * @access public
  */
+
+use ProcessMaker\Core\System;
+
 header("Content-type: text/html;charset=utf-8");
 require_once 'classes/model/AdditionalTables.php';
 
@@ -920,7 +923,7 @@ class pmTablesProxy extends HttpProxyController
             $result = new stdClass();
             $net = new Net( G::getIpAddress() );
 
-            $META = " \n-----== ProcessMaker Open Source Private Tables ==-----\n" . " @Ver: 1.0 Oct-2009\n" . " @Processmaker version: " . PmSystem::getVersion() . "\n" . " -------------------------------------------------------\n" . " @Export Date: " . date( "l jS \of F Y h:i:s A" ) . "\n" . " @Server address: " . getenv( 'SERVER_NAME' ) . " (" . getenv( 'SERVER_ADDR' ) . ")\n" . " @Client address: " . $net->hostname . "\n" . " @Workspace: " . SYS_SYS . "\n" . " @Export trace back:\n\n";
+            $META = " \n-----== ProcessMaker Open Source Private Tables ==-----\n" . " @Ver: 1.0 Oct-2009\n" . " @Processmaker version: " . System::getVersion() . "\n" . " -------------------------------------------------------\n" . " @Export Date: " . date( "l jS \of F Y h:i:s A" ) . "\n" . " @Server address: " . getenv( 'SERVER_NAME' ) . " (" . getenv( 'SERVER_ADDR' ) . ")\n" . " @Client address: " . $net->hostname . "\n" . " @Workspace: " . SYS_SYS . "\n" . " @Export trace back:\n\n";
 
             $EXPORT_TRACEBACK = Array ();
             $c = 0;
diff --git a/workflow/engine/controllers/strategicDashboard.php b/workflow/engine/controllers/strategicDashboard.php
index 64c0d0810..0a39b6a24 100644
--- a/workflow/engine/controllers/strategicDashboard.php
+++ b/workflow/engine/controllers/strategicDashboard.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 /**
  * StrategicDashboard controller
  * @inherits Controller
@@ -31,7 +33,7 @@ class StrategicDashboard extends Controller
         $user = new Users();
         $user = $user->load($RBAC->aUserInfo['USER_INFO']['USR_UID']);
         $this->usrUnitCost = $this->currencySymbolToShow($user);
-        $this->urlProxy = PmSystem::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/';
+        $this->urlProxy = System::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/';
         //change
         $clientId = 'x-pm-local-client';
         $client = $this->getClientCredentials($clientId);
diff --git a/workflow/engine/controllers/webEntryProxy.php b/workflow/engine/controllers/webEntryProxy.php
index 4ac277da0..1b350e04e 100644
--- a/workflow/engine/controllers/webEntryProxy.php
+++ b/workflow/engine/controllers/webEntryProxy.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 class webEntryProxy extends HttpProxyController
 {
     //Delete Web Entry
@@ -183,7 +185,7 @@ class webEntryProxy extends HttpProxyController
         $template->assign( 'dynaform', $dynTitle );
         $template->assign( 'timestamp', date( 'l jS \of F Y h:i:s A' ) );
         $template->assign( 'ws', SYS_SYS );
-        $template->assign( 'version', PmSystem::getVersion() );
+        $template->assign( 'version', System::getVersion() );
 
         $fileName = $pathProcess . $dynTitle . 'Post.php';
         file_put_contents( $fileName, $template->getOutputContent() );
diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
index 276755f37..a43f9b0eb 100644
--- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
+++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
@@ -22,6 +22,8 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 
+use ProcessMaker\Core\System;
+
 $filter = new InputFilter();
 $_POST = $filter->xssFilterHard($_POST);
 $_REQUEST = $filter->xssFilterHard($_REQUEST);
@@ -192,7 +194,7 @@ if ($actionAjax == 'sendMailMessage_JXP') {
         $oCase = new Cases();
         $data = $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] );
 
-        $aSetup = PmSystem::getEmailConfiguration();
+        $aSetup = System::getEmailConfiguration();
 
         $oSpool = new SpoolRun();
 
diff --git a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
index 5ea1dbfc0..58d21dfa9 100644
--- a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
+++ b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 $action = (isset($_REQUEST["action"])) ? $_REQUEST["action"] : "consolidated";
 $arrayTabItem = array();
 
@@ -69,7 +71,7 @@ while ($rsSql->next()) {
 }
 
 if (count($arrayTabItem) > 0) {
-    $urlProxy = PmSystem::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/consolidated/';
+    $urlProxy = System::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/consolidated/';
     $clientId = 'x-pm-local-client';
     $client = getClientCredentials($clientId);
     $authCode = getAuthorizationCode($client);
diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php
index fe0cf9530..8ddadd997 100644
--- a/workflow/engine/methods/cases/casesListExtJs.php
+++ b/workflow/engine/methods/cases/casesListExtJs.php
@@ -1,5 +1,6 @@
 <?php
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 unset($_SESSION['APPLICATION']);
@@ -121,7 +122,7 @@ $oAppCache->confCasesList = $confCasesList;
 $solrEnabled = 0;
 if ($action == "todo" || $action == "draft" || $action == "sent" || $action == "selfservice" ||
     $action == "unassigned" || $action == "search") {
-    $solrConfigured = ($solrConf = PmSystem::solrEnv()) !== false ? 1 : 0;
+    $solrConfigured = ($solrConf = System::solrEnv()) !== false ? 1 : 0;
     if ($solrConfigured == 1) {
         $applicationSolrIndex = new AppSolr(
             $solrConf['solr_enabled'],
diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php
index 661dbb0da..140772f30 100644
--- a/workflow/engine/methods/cases/cases_Ajax.php
+++ b/workflow/engine/methods/cases/cases_Ajax.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 $filter = new InputFilter();
 $_GET = $filter->xssFilterHard($_GET);
 $_POST = $filter->xssFilterHard($_POST);
@@ -785,7 +787,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $data = $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] );
         //print_r($data);
 
-        $aSetup = PmSystem::getEmailConfiguration();
+        $aSetup = System::getEmailConfiguration();
 
         $passwd = $aSetup['MESS_PASSWORD'];
         $passwdDec = G::decrypt( $passwd, 'EMAILENCRYPT' );
diff --git a/workflow/engine/methods/enterprise/addonsStore.php b/workflow/engine/methods/enterprise/addonsStore.php
index a2fcceb25..b078b4d23 100644
--- a/workflow/engine/methods/enterprise/addonsStore.php
+++ b/workflow/engine/methods/enterprise/addonsStore.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 AddonsStore::checkLicenseStore();
 
 $licenseManager = &PmLicenseManager::getSingleton();
@@ -60,7 +62,7 @@ $oHeadPublisher->assign("SUPPORT_FLAG", ((isset($licenseManager->supportStartDat
 $oHeadPublisher->assign("supportStartDate", (isset($licenseManager->supportStartDate))? $licenseManager->supportStartDate : '');
 $oHeadPublisher->assign("supportEndDate", (isset($licenseManager->supportEndDate))? $licenseManager->supportEndDate : '');
 
-$oHeadPublisher->assign("PROCESSMAKER_VERSION", PmSystem::getVersion());
+$oHeadPublisher->assign("PROCESSMAKER_VERSION", System::getVersion());
 $oHeadPublisher->assign("PROCESSMAKER_URL", "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN );
 $oHeadPublisher->assign("SYS_SKIN", SYS_SKIN);
 $oHeadPublisher->assign("URL_PART_LOGIN", ((substr(SYS_SKIN, 0, 2) == "ux" && SYS_SKIN != "uxs")? "main/login" : "login/login"));
diff --git a/workflow/engine/methods/enterprise/addonsStoreAction.php b/workflow/engine/methods/enterprise/addonsStoreAction.php
index 851b849cf..36a95c0e7 100644
--- a/workflow/engine/methods/enterprise/addonsStoreAction.php
+++ b/workflow/engine/methods/enterprise/addonsStoreAction.php
@@ -1,4 +1,6 @@
 <?php
+
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 function runBgProcessmaker($task, $log)
@@ -249,7 +251,7 @@ try {
                 );
 
                 // Proxy settings
-                $sysConf = PmSystem::getSystemConfiguration();
+                $sysConf = System::getSystemConfiguration();
                 if ($sysConf['proxy_host'] != '') {
                     if (!is_array($option['http'])) {
                         $option['http'] = array();
diff --git a/workflow/engine/methods/enterprise/enterprise.php b/workflow/engine/methods/enterprise/enterprise.php
index e4add20c7..824b58bdc 100644
--- a/workflow/engine/methods/enterprise/enterprise.php
+++ b/workflow/engine/methods/enterprise/enterprise.php
@@ -1,5 +1,6 @@
 <?php
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 if (!defined("PATH_PM_ENTERPRISE")) {
@@ -18,7 +19,7 @@ class enterprisePlugin extends PMPlugin
     {
         $pathPluginTrunk = PATH_CORE . "enterprise";
 
-        $VERSION = PmSystem::getVersion();
+        $VERSION = System::getVersion();
 
         $res = parent::PMPlugin($sNamespace, $sFilename);
         $this->sFriendlyName = "ProcessMaker Enterprise Core Edition";
diff --git a/workflow/engine/methods/enterprise/processMakerAjax.php b/workflow/engine/methods/enterprise/processMakerAjax.php
index d7c492222..e034d2ae6 100644
--- a/workflow/engine/methods/enterprise/processMakerAjax.php
+++ b/workflow/engine/methods/enterprise/processMakerAjax.php
@@ -1,4 +1,7 @@
 <?php
+
+use ProcessMaker\Core\System;
+
 ini_set("max_execution_time", 0);
 
 if (!defined("PM_VERSION")) {
@@ -40,7 +43,7 @@ function install($file)
         );
 
         // Proxy settings
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if (isset($sysConf['proxy_host'])) {
             if ($sysConf['proxy_host'] != '') {
                 if (!is_array($option['http'])) {
@@ -147,7 +150,7 @@ switch ($option) {
             );
 
             // Proxy settings
-            $sysConf = PmSystem::getSystemConfiguration();
+            $sysConf = System::getSystemConfiguration();
             if (isset($sysConf['proxy_host'])) {
                 if ($sysConf['proxy_host'] != '') {
                     if (!is_array($option['http'])) {
@@ -316,7 +319,7 @@ switch ($option) {
             );
 
             // Proxy settings
-            $sysConf = PmSystem::getSystemConfiguration();
+            $sysConf = System::getSystemConfiguration();
             if (isset($sysConf['proxy_host'])) {
                 if ($sysConf['proxy_host'] != '') {
                     if (!is_array($option['http'])) {
diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index 96d965e8d..fa03f6b95 100644
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -23,6 +23,7 @@
  *
  */
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 try {
@@ -247,7 +248,7 @@ try {
         $userTimeZone = $user->getUsrTimeZone();
 
         if (trim($userTimeZone) == '') {
-            $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
+            $arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
 
             $userTimeZone = $arraySystemConfiguration['time_zone'];
         }
@@ -421,7 +422,7 @@ try {
         die;
     }
 
-    $configS = PmSystem::getSystemConfiguration('', '', SYS_SYS);
+    $configS = System::getSystemConfiguration('', '', SYS_SYS);
     $activeSession = isset($configS['session_block']) ? !(int)$configS['session_block']:true;
     if ($activeSession){
         setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/');
diff --git a/workflow/engine/methods/login/authenticationSso.php b/workflow/engine/methods/login/authenticationSso.php
index 758b2258d..1d8a9cafb 100644
--- a/workflow/engine/methods/login/authenticationSso.php
+++ b/workflow/engine/methods/login/authenticationSso.php
@@ -1,6 +1,8 @@
 <?php
 global $G_PUBLISH;
 
+use ProcessMaker\Core\System;
+
 try {
     if ($RBAC->singleSignOn) {
         $_SESSION['__USER_LOGGED_SSO__']  = $RBAC->userObj->fields['USR_UID'];
@@ -38,7 +40,7 @@ try {
     }
     /*----------------------------------********---------------------------------*/
 
-    $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
+    $arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
 
     //Set User Time Zone
     $user = UsersPeer::retrieveByPK($userUid);
diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index 9c66e4ccb..8faa2997c 100644
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -23,6 +23,7 @@
  *
  */
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 /*----------------------------------********---------------------------------*/
@@ -360,7 +361,7 @@ $flagForgotPassword = isset($oConf->aConfig['login_enableForgotPassword'])
 
 setcookie('PM-Warning', trim(G::LoadTranslation('ID_BLOCKER_MSG'), '*'), time() + (24 * 60 * 60), SYS_URI);
 
-$configS = PmSystem::getSystemConfiguration('', '', SYS_SYS);
+$configS = System::getSystemConfiguration('', '', SYS_SYS);
 $activeSession = isset($configS['session_block']) ? !(int)$configS['session_block'] : true;
 if ($activeSession) {
     setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/');
diff --git a/workflow/engine/methods/login/retrivePassword.php b/workflow/engine/methods/login/retrivePassword.php
index 28593b75d..842bc42f9 100644
--- a/workflow/engine/methods/login/retrivePassword.php
+++ b/workflow/engine/methods/login/retrivePassword.php
@@ -1,4 +1,7 @@
 <?php
+
+use ProcessMaker\Core\System;
+
 $data = $_POST['form'];
 global $RBAC;
 
@@ -8,7 +11,7 @@ $data['USR_USERNAME'] = strip_tags($data['USR_USERNAME']);
 $userData = $rbacUser->getByUsername($data['USR_USERNAME']);
 
 if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'] && ($userData['USR_AUTH_TYPE'] === '' || $userData['USR_AUTH_TYPE'] == 'MYSQL') ) {
-    $aSetup = PmSystem::getEmailConfiguration();
+    $aSetup = System::getEmailConfiguration();
     if (count($aSetup) == 0 || !isset($aSetup['MESS_ENGINE'])) {
         G::SendTemporalMessage ('ID_EMAIL_ENGINE_IS_NOT_ENABLED', "warning");
         G::header('location: forgotPassword');
@@ -53,7 +56,7 @@ if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'
   <tbody><tr><td><img id='logo' src='http://".$_SERVER['SERVER_NAME']."/images/processmaker.logo.jpg' /></td></tr>
   <tr><td style='font-size: 14px;'>$msg</td></tr>
   <tr><td style='vertical-align:middel;'>
-  <br /><hr><b>This Business Process is powered by ProcessMaker ver. ".PmSystem::getVersion().".<b><br />
+  <br /><hr><b>This Business Process is powered by ProcessMaker ver. ".System::getVersion().".<b><br />
   <a href='http://www.processmaker.com' style='color:#c40000;'>www.processmaker.com</a><br /></td>
   </tr></tbody></table>";
 
diff --git a/workflow/engine/methods/processes/mainInit.php b/workflow/engine/methods/processes/mainInit.php
index 415f09547..ef7697246 100644
--- a/workflow/engine/methods/processes/mainInit.php
+++ b/workflow/engine/methods/processes/mainInit.php
@@ -21,6 +21,8 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
+
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 //$oHeadPublisher = & headPublisher::getSingleton();
@@ -29,7 +31,7 @@ $RBAC->requirePermissions( 'PM_FACTORY' );
 
 $conf = new Configurations();
 
-$pmVersion = (preg_match("/^([\d\.]+).*$/", PmSystem::getVersion(), $arrayMatch))? $arrayMatch[1] : ""; //Otherwise: Branch master
+$pmVersion = (preg_match("/^([\d\.]+).*$/", System::getVersion(), $arrayMatch))? $arrayMatch[1] : ""; //Otherwise: Branch master
 
 /*----------------------------------********---------------------------------*/
 if (true) {
@@ -93,7 +95,7 @@ $designer = new Designer();
 $oHeadPublisher->assign('SYS_SYS', SYS_SYS);
 $oHeadPublisher->assign('SYS_LANG', SYS_LANG);
 $oHeadPublisher->assign('SYS_SKIN', SYS_SKIN);
-$oHeadPublisher->assign('HTTP_SERVER_HOSTNAME', PmSystem::getHttpServerHostnameRequestsFrontEnd());
+$oHeadPublisher->assign('HTTP_SERVER_HOSTNAME', System::getHttpServerHostnameRequestsFrontEnd());
 $oHeadPublisher->assign('credentials', base64_encode(G::json_encode($designer->getCredentials())));
 
 $deleteCasesFlag = false;
diff --git a/workflow/engine/methods/processes/processes_webEntryGenerate.php b/workflow/engine/methods/processes/processes_webEntryGenerate.php
index 6f92e759d..1767fcf2f 100644
--- a/workflow/engine/methods/processes/processes_webEntryGenerate.php
+++ b/workflow/engine/methods/processes/processes_webEntryGenerate.php
@@ -1,5 +1,8 @@
 <?php
 global $G_FORM;
+
+use ProcessMaker\Core\System;
+
 $sPRO_UID = $oData->PRO_UID;
 $sTASKS = $oData->TASKS;
 $sDYNAFORM = $oData->DYNAFORM;
@@ -86,7 +89,7 @@ try {
         $template->assign( 'dynaform', $dynTitle );
         $template->assign( 'timestamp', date( 'l jS \of F Y h:i:s A' ) );
         $template->assign( 'ws', SYS_SYS );
-        $template->assign( 'version', PmSystem::getVersion() );
+        $template->assign( 'version', System::getVersion() );
 
         $fileName = $pathProcess . $dynTitle . 'Post.php';
         file_put_contents( $fileName, $template->getOutputContent() );
diff --git a/workflow/engine/methods/setup/cron.php b/workflow/engine/methods/setup/cron.php
index 914881e70..2f4d7d211 100644
--- a/workflow/engine/methods/setup/cron.php
+++ b/workflow/engine/methods/setup/cron.php
@@ -2,6 +2,8 @@
 
 global $RBAC;
 
+use ProcessMaker\Core\System;
+
 if ($RBAC->userCanAccess("PM_SETUP") != 1) {
     G::SendTemporalMessage("ID_USER_HAVENT_RIGHTS_PAGE", "error", "labels");
     exit(0);
@@ -62,7 +64,7 @@ $cronInfo["fileLogSize"] = $fileLogSize;
 $cronInfo["fileLogPath"] = $fileLog;
 
 //Workspaces
-$workspaces = PmSystem::listWorkspaces();
+$workspaces = System::listWorkspaces();
 $arrayAux = array ();
 
 foreach ($workspaces as $index => $workspace) {
diff --git a/workflow/engine/methods/setup/emails_Ajax.php b/workflow/engine/methods/setup/emails_Ajax.php
index 6c1630c5c..f39be59e6 100644
--- a/workflow/engine/methods/setup/emails_Ajax.php
+++ b/workflow/engine/methods/setup/emails_Ajax.php
@@ -21,7 +21,9 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
- 
+
+
+use ProcessMaker\Core\System;
 
 $filter = new InputFilter();
 $_POST = $filter->xssFilterHard($_POST);
@@ -252,7 +254,7 @@ function sendTestMail ()
   <tbody><tr><td><img id='logo' src='http://" . $_SERVER['SERVER_NAME'] . "/images/processmaker.logo.jpg' /></td></tr>
   <tr><td style='font-size: 14px;'>$msg [" . date( 'H:i:s' ) . "] - $engine</td></tr>
   <tr><td style='vertical-align:middel;'>
-  <br /><hr><b>This Business Process is powered by ProcessMaker ver. " . PmSystem::getVersion() . ".<b><br />
+  <br /><hr><b>This Business Process is powered by ProcessMaker ver. " . System::getVersion() . ".<b><br />
   <a href='http://www.processmaker.com' style='color:#c40000;'>www.processmaker.com</a><br /></td>
   </tr></tbody></table>";
 
diff --git a/workflow/engine/methods/setup/pluginsImportFile.php b/workflow/engine/methods/setup/pluginsImportFile.php
index 96f19c4a7..51f29c8ef 100644
--- a/workflow/engine/methods/setup/pluginsImportFile.php
+++ b/workflow/engine/methods/setup/pluginsImportFile.php
@@ -23,6 +23,8 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  *
  */
+
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 global $RBAC;
@@ -279,8 +281,8 @@ try {
             $oClass->iPMVersion = 0;
         }
         if ($oClass->iPMVersion > 0) {
-            if (PmSystem::getVersion() > 0) {
-                if ($oClass->iPMVersion > PmSystem::getVersion()) {
+            if (System::getVersion() > 0) {
+                if ($oClass->iPMVersion > System::getVersion()) {
                     //throw new Exception('This plugin needs version ' . $oClass->iPMVersion . ' or higher of ProcessMaker');
                 }
             }
diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php
index 26ecc8990..9e893680b 100644
--- a/workflow/engine/methods/setup/skin_Ajax.php
+++ b/workflow/engine/methods/setup/skin_Ajax.php
@@ -1,4 +1,7 @@
 <?php
+
+use ProcessMaker\Core\System;
+
 if (! isset( $_REQUEST['action'] )) {
     $res['success'] = false;
     $res['error'] = $res['message'] = G::LoadTranslation('ID_REQUEST_ACTION');
@@ -46,7 +49,7 @@ function skinList ()
         $textFilter = '';
     }
 
-    $skinList = PmSystem::getSkingList();
+    $skinList = System::getSkingList();
     $wildcard = '';
     if (isset( $_REQUEST['activeskin'] )) {
         $wildcard = '@';
diff --git a/workflow/engine/methods/setup/skinsExport.php b/workflow/engine/methods/setup/skinsExport.php
index 2373fa344..e1cc945e9 100644
--- a/workflow/engine/methods/setup/skinsExport.php
+++ b/workflow/engine/methods/setup/skinsExport.php
@@ -1,5 +1,7 @@
 <?php
 
+use ProcessMaker\Core\System;
+
 /**
  * skinsExport.php
  *
@@ -150,7 +152,7 @@ G::mk_dir( $pathPublic . 'images' );
 $fields['className'] = $id;
 $fields['version'] = $oConf->version;
 $fields['description'] = $oConf->description;
-$fields['PMversion'] = PmSystem::getVersion();
+$fields['PMversion'] = System::getVersion();
 savePluginFile( 'skinPluginMainClass', $pathHome . $id . '.php', $fields );
 
 savePluginFile( 'skinPluginClass', $pathBase . 'class.' . $id . '.php', $fields );
diff --git a/workflow/engine/methods/setup/upgrade.php b/workflow/engine/methods/setup/upgrade.php
index b3ae31211..5c849f3ef 100644
--- a/workflow/engine/methods/setup/upgrade.php
+++ b/workflow/engine/methods/setup/upgrade.php
@@ -21,7 +21,11 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-global $RBAC;
+global
+
+use ProcessMaker\Core\System;
+
+$RBAC;
 $access = $RBAC->userCanAccess( 'PM_SETUP_ADVANCE' );
 if ($access != 1) {
     switch ($access) {
@@ -61,7 +65,7 @@ $G_SUB_MENU = 'setup';
 $G_ID_MENU_SELECTED = 'SETUP';
 $G_ID_SUB_MENU_SELECTED = 'UPGRADE';
 
-$Fields['PM_VERSION'] = PmSystem::getVersion();
+$Fields['PM_VERSION'] = System::getVersion();
 $Fields['MAX_FILE_SIZE'] = $uploadMaxSize . " (" . $UPLOAD_MAX_SIZE . ") ";
 
 $G_PUBLISH = new Publisher();
diff --git a/workflow/engine/methods/setup/upgrade_System.php b/workflow/engine/methods/setup/upgrade_System.php
index 3a51b97a1..bd2c1de01 100644
--- a/workflow/engine/methods/setup/upgrade_System.php
+++ b/workflow/engine/methods/setup/upgrade_System.php
@@ -22,6 +22,8 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 
+use ProcessMaker\Core\System;
+
 /**
  * New System Upgrade controller
  *
@@ -49,7 +51,7 @@ $G_ID_MENU_SELECTED = 'SETUP';
 $G_ID_SUB_MENU_SELECTED = 'UPGRADE';
 
 require_once "classes/class.system.php";
-$oSystem = new PmSystem();
+$oSystem = new System();
 
 try {
     if (! $oSystem->verifyFileForUpgrade()) {
diff --git a/workflow/engine/methods/setup/webServicesAjax.php b/workflow/engine/methods/setup/webServicesAjax.php
index 1a1910869..788e6518c 100644
--- a/workflow/engine/methods/setup/webServicesAjax.php
+++ b/workflow/engine/methods/setup/webServicesAjax.php
@@ -21,6 +21,9 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
+
+use ProcessMaker\Core\System;
+
 ini_set( "soap.wsdl_cache_enabled", "0" ); // enabling WSDL cache
 
 $filter = new InputFilter();
@@ -149,7 +152,7 @@ try {
 
         //Apply proxy settings
         $proxy = array ();
-        $sysConf = PmSystem::getSystemConfiguration();
+        $sysConf = System::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             $proxy['proxy_host'] = $sysConf['proxy_host'];
             if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php
index 10601ece7..4148507e2 100644
--- a/workflow/engine/methods/users/usersEdit.php
+++ b/workflow/engine/methods/users/usersEdit.php
@@ -1,5 +1,7 @@
 <?php
 //calculating the max upload file size;
+use ProcessMaker\Core\System;
+
 $POST_MAX_SIZE = ini_get( 'post_max_size' );
 $mul = substr( $POST_MAX_SIZE, - 1 );
 $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
@@ -17,7 +19,7 @@ if ($postMaxSize < $uploadMaxSize) {
 $expirationDate = 1;
 $envFile = PATH_CONFIG . 'env.ini';
 if (file_exists($envFile) ) {
-    $sysConf = PmSystem::getSystemConfiguration($envFile);
+    $sysConf = System::getSystemConfiguration($envFile);
     if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
        $expirationDate = abs($sysConf['expiration_year']);
     }
@@ -31,7 +33,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 }
 /*----------------------------------********---------------------------------*/
 
-$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
+$arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
 
 $oHeadPublisher = & headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
diff --git a/workflow/engine/methods/users/usersInit.php b/workflow/engine/methods/users/usersInit.php
index 9ee14d407..208d1197c 100644
--- a/workflow/engine/methods/users/usersInit.php
+++ b/workflow/engine/methods/users/usersInit.php
@@ -1,6 +1,8 @@
 <?php
 global $RBAC;
 
+use ProcessMaker\Core\System;
+
 require_once 'classes/model/Users.php';
 unset( $_SESSION['CURRENT_USER'] );
 $oUser = new Users();
@@ -32,7 +34,7 @@ if ($postMaxSize < $uploadMaxSize) {
 $expirationDate = 1;
 $envFile = PATH_CONFIG . 'env.ini';
 if (file_exists($envFile) ) {
-    $sysConf = PmSystem::getSystemConfiguration($envFile);
+    $sysConf = System::getSystemConfiguration($envFile);
     if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
        $expirationDate = abs($sysConf['expiration_year']);
     }
@@ -46,7 +48,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 }
 /*----------------------------------********---------------------------------*/
 
-$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
+$arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
 
 $oHeadPublisher = & headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
diff --git a/workflow/engine/methods/users/usersNew.php b/workflow/engine/methods/users/usersNew.php
index 1cbe900cf..b73bf00d3 100644
--- a/workflow/engine/methods/users/usersNew.php
+++ b/workflow/engine/methods/users/usersNew.php
@@ -1,5 +1,8 @@
 <?php
 global $RBAC;
+
+use ProcessMaker\Core\System;
+
 $RBAC->requirePermissions( 'PM_USERS' );
 
 //calculating the max upload file size;
@@ -20,7 +23,7 @@ if ($postMaxSize < $uploadMaxSize) {
 $expirationDate = 1;
 $envFile = PATH_CONFIG . 'env.ini';
 if (file_exists($envFile) ) {
-    $sysConf = PmSystem::getSystemConfiguration($envFile);
+    $sysConf = System::getSystemConfiguration($envFile);
     if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
        $expirationDate = abs($sysConf['expiration_year']);
     }
@@ -35,7 +38,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 }
 /*----------------------------------********---------------------------------*/
 
-$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
+$arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
 
 $oHeadPublisher = & headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php
index 685aa98f3..53cb9caf2 100644
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -7,6 +7,7 @@
  * @author Hugo Loza
  */
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 define('SE_LAYOUT_NOT_FOUND', 6);
@@ -44,7 +45,7 @@ class SkinEngine
     $this->content = $content;
     $this->skinVariants = array('blank','extjs','raw','tracker','submenu');
     $this->skinsBasePath = G::ExpandPath("skinEngine");
-    $sysConf = PmSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
+    $sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
     $this->skinDefault = (isset($sysConf['default_skin']) && $sysConf['default_skin'] != '') ? $sysConf['default_skin'] : 'classic';
     $this->_init();
   }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
index 9497c57a8..30809356d 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
@@ -408,7 +408,7 @@ class ActionsByEmail
                     $arrayConfigAux = $row;
                     $arrayConfigAux["SMTPSecure"] = $row["SMTPSECURE"];
                 }
-                $aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : \PmSystem::getEmailConfiguration();
+                $aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : \ProcessMaker\Core\System::getEmailConfiguration();
 
                 $spool = new SpoolRun();
                 $spool->setConfig($aSetup);
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index b6be36577..3735858f9 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -184,7 +184,7 @@ class Cases
     {
         try {
             $solrEnabled = false;
-            $solrConf = \PmSystem::solrEnv();
+            $solrConf = \ProcessMaker\Core\System::solrEnv();
 
             if ($solrConf !== false) {
                 $ApplicationSolrIndex = new \AppSolr(
@@ -376,7 +376,7 @@ class Cases
     {
         try {
             $solrEnabled = 0;
-            if (($solrEnv = \PmSystem::solrEnv()) !== false) {
+            if (($solrEnv = \ProcessMaker\Core\System::solrEnv()) !== false) {
                 $appSolr = new \AppSolr(
                     $solrEnv["solr_enabled"],
                     $solrEnv["solr_host"],
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
index b7162f6ad..5f1289afd 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
@@ -182,7 +182,7 @@ class EmailServer
             $sBodyPre->prepare();
             $sBodyPre->assign("server", $_SERVER["SERVER_NAME"]);
             $sBodyPre->assign("date", date("H:i:s"));
-            $sBodyPre->assign("ver", \PmSystem::getVersion());
+            $sBodyPre->assign("ver", \ProcessMaker\Core\System::getVersion());
             $sBodyPre->assign("engine", $engine);
             $sBodyPre->assign("msg", $msg);
             $sBody = $sBodyPre->getOutputContent();
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
index 0ea5c7ad7..4a8aedc97 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -1260,7 +1260,7 @@ class Light
         $offset = timezone_offset_get( new \DateTimeZone( $tz ), new \DateTime() );
         $response['timeZone'] = sprintf( "GMT%s%02d:%02d", ( $offset >= 0 ) ? '+' : '-', abs( $offset / 3600 ), abs( ($offset % 3600) / 60 ) );
         $response['multiTimeZone'] = $multiTimeZone;
-        $fields = \PmSystem::getSysInfo();
+        $fields = \ProcessMaker\Core\System::getSysInfo();
         $response['version'] = $fields['PM_VERSION'];
 
         $buildType = 'Community';
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
index 7aace44f0..ba5334dc5 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
@@ -11,7 +11,7 @@ class NotificationDevice
 
     public function checkMobileNotifications()
     {
-        $conf = \PmSystem::getSystemConfiguration('', '', SYS_SYS);
+        $conf = \ProcessMaker\Core\System::getSystemConfiguration('', '', SYS_SYS);
         $activeNotifications = true;
         if (isset($conf['mobileNotifications'])) {
             $activeNotifications = $conf['mobileNotifications'] == 1 ? true : false;
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
index 667e61aae..eaac581ad 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
@@ -54,7 +54,7 @@ class PushMessageAndroid
      */
     public function setSettingNotification()
     {
-        $conf = \PmSystem::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
+        $conf = \ProcessMaker\Core\System::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
         $this->setUrl($conf['android']['url']);
         $this->setKey($conf['android']['serverApiKey']);
     }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
index 89647f707..8d04030a0 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
@@ -67,7 +67,7 @@ class PushMessageIOS
      */
     public function setSettingNotification()
     {
-        $conf = \PmSystem::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
+        $conf = \ProcessMaker\Core\System::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
         $this->setUrl($conf['apple']['url']);
         $this->setKey($conf['apple']['passphrase']);
         $this->setPemFile($conf['apple']['pemFile']);
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
index 09b5308f1..4619dbec1 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
@@ -134,7 +134,7 @@ class GranularExporter
         $data["version"] = "3.1";
         $data["container"] = "ProcessMaker-Project";
         $data["metadata"] = array(
-            "vendor_version" => \PmSystem::getVersion(),
+            "vendor_version" => \ProcessMaker\Core\System::getVersion(),
             "vendor_version_code" => "Michelangelo",
             "export_timestamp" => date("U"),
             "export_datetime" => date("Y-m-d\TH:i:sP"),
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
index 3e1d3a15d..a893cc1ea 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
@@ -30,7 +30,7 @@ class Pmgmail {
 
         //getting the skin
         require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.system.php");
-        $sysConf = new \PmSystem();
+        $sysConf = new \ProcessMaker\Core\System();
         $responseSysConfig = $sysConf->getSystemConfiguration( PATH_CONFIG . 'env.ini' );
         $response['enviroment'] = $responseSysConfig['default_skin'];
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Skins.php b/workflow/engine/src/ProcessMaker/BusinessModel/Skins.php
index f9f17d759..a49bf9134 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Skins.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Skins.php
@@ -1,7 +1,7 @@
 <?php
 namespace ProcessMaker\BusinessModel;
 
-use PmSystem;
+use ProcessMaker\Core\System;
 use Exception;
 use G;
 
@@ -18,7 +18,7 @@ class Skins
      */
     public function getSkins()
     {
-        $list = PmSystem::getSkingList();
+        $list = System::getSkingList();
         return $list['skins'];
     }
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
index aba48f509..a7cf4dd79 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
@@ -453,7 +453,7 @@ class WebEntry
                     $template->assign("dynaform", empty($arrayDynaFormData) ? '' : $arrayDynaFormData["DYN_TITLE"]);
                     $template->assign("timestamp", date("l jS \of F Y h:i:s A"));
                     $template->assign("ws", $this->sysSys);
-                    $template->assign("version", \PmSystem::getVersion());
+                    $template->assign("version", \ProcessMaker\Core\System::getVersion());
 
                     $fileName = $pathDataPublicProcess . PATH_SEP . $weTitle . "Post.php";
 
diff --git a/workflow/engine/classes/PmSystem.php b/workflow/engine/src/ProcessMaker/Core/System.php
similarity index 59%
rename from workflow/engine/classes/PmSystem.php
rename to workflow/engine/src/ProcessMaker/Core/System.php
index 27ddd0fca..18e692fa3 100644
--- a/workflow/engine/classes/PmSystem.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -1,5 +1,15 @@
 <?php
 
+namespace ProcessMaker\Core;
+use Configurations;
+use DomDocument;
+use Exception;
+use G;
+use GzipFile;
+use InputFilter;
+use schema;
+use WorkspaceTools;
+
 /**
  * class Processmaker System for workflow mantanance routines
  *
@@ -9,7 +19,7 @@
  *
  */
 
-class PmSystem
+class System
 {
     public $sFilename;
     public $sFilesList;
@@ -63,18 +73,18 @@ class PmSystem
      *
      * @return array with the names of the plugins
      */
-    public static function getPlugins ()
+    public static function getPlugins()
     {
-        $plugins = array ();
+        $plugins = array();
 
-        foreach (glob( PATH_PLUGINS . "*" ) as $filename) {
-            $info = pathinfo( $filename );
-            if (array_key_exists( "extension", $info ) && (strcmp( $info["extension"], "php" ) == 0)) {
-                $plugins[] = basename( $filename, ".php" );
+        foreach (glob(PATH_PLUGINS . "*") as $filename) {
+            $info = pathinfo($filename);
+            if (array_key_exists("extension", $info) && (strcmp($info["extension"], "php") == 0)) {
+                $plugins[] = basename($filename, ".php");
             }
         }
 
-        sort( $plugins, SORT_STRING );
+        sort($plugins, SORT_STRING);
         return $plugins;
     }
 
@@ -87,13 +97,13 @@ class PmSystem
      * @access public
      * @return array of workspace tools objects
      */
-    public static function listWorkspaces ()
+    public static function listWorkspaces()
     {
-        $oDirectory = dir( PATH_DB );
-        $aWorkspaces = array ();
-        foreach (glob( PATH_DB . "*" ) as $filename) {
-            if (is_dir( $filename ) && file_exists( $filename . "/db.php" )) {
-                $aWorkspaces[] = new WorkspaceTools( basename( $filename ) );
+        $oDirectory = dir(PATH_DB);
+        $aWorkspaces = array();
+        foreach (glob(PATH_DB . "*") as $filename) {
+            if (is_dir($filename) && file_exists($filename . "/db.php")) {
+                $aWorkspaces[] = new WorkspaceTools(basename($filename));
             }
         }
         return $aWorkspaces;
@@ -107,17 +117,17 @@ class PmSystem
      * @author Alexandre Rosenfeld <alexandre@colosa.com>
      * @return string system
      */
-    public static function getVersion ()
+    public static function getVersion()
     {
-        if (! defined( 'PM_VERSION' )) {
-            if (file_exists( PATH_METHODS . 'login/version-pmos.php' )) {
-                include (PATH_METHODS . 'login/version-pmos.php');
+        if (!defined('PM_VERSION')) {
+            if (file_exists(PATH_METHODS . 'login/version-pmos.php')) {
+                include(PATH_METHODS . 'login/version-pmos.php');
             } else {
                 $version = self::getVersionFromGit();
                 if ($version === false) {
                     $version = 'Development Version';
                 }
-                define( 'PM_VERSION', $version );
+                define('PM_VERSION', $version);
             }
         }
         return PM_VERSION;
@@ -129,17 +139,17 @@ class PmSystem
      * @author Alexandre Rosenfeld <alexandre@colosa.com>
      * @return string branch and tag information
      */
-    public static function getVersionFromGit ($dir = null)
+    public static function getVersionFromGit($dir = null)
     {
         if ($dir == null) {
             $dir = PATH_TRUNK;
         }
-        if (! file_exists( "$dir/.git" )) {
+        if (!file_exists("$dir/.git")) {
             return false;
         }
-        if (exec( "cd $dir && git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/^* \(.*\)$/(Branch \\1)/'", $target )) {
+        if (exec("cd $dir && git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/^* \(.*\)$/(Branch \\1)/'", $target)) {
             //exec( "cd $dir && git describe", $target ); ??? <-- thi is returning "fatal: No names found, cannot describe anything." on apache error log file
-            return implode( ' ', $target );
+            return implode(' ', $target);
         }
         return false;
     }
@@ -151,41 +161,41 @@ class PmSystem
      *
      * @return array with system information
      */
-    public static function getSysInfo ()
+    public static function getSysInfo()
     {
-        $ipe = isset($_SERVER['SSH_CONNECTION']) ? explode( " ", $_SERVER['SSH_CONNECTION'] ) : array();
+        $ipe = isset($_SERVER['SSH_CONNECTION']) ? explode(" ", $_SERVER['SSH_CONNECTION']) : array();
 
-        if (getenv( 'HTTP_CLIENT_IP' )) {
-            $ip = getenv( 'HTTP_CLIENT_IP' );
-        } elseif (getenv( 'HTTP_X_FORWARDED_FOR' )) {
-            $ip = getenv( 'HTTP_X_FORWARDED_FOR' );
+        if (getenv('HTTP_CLIENT_IP')) {
+            $ip = getenv('HTTP_CLIENT_IP');
+        } elseif (getenv('HTTP_X_FORWARDED_FOR')) {
+            $ip = getenv('HTTP_X_FORWARDED_FOR');
         } else {
-            $ip = getenv( 'REMOTE_ADDR' );
+            $ip = getenv('REMOTE_ADDR');
         }
 
         /* For distros with the lsb_release, this returns a one-line description of
         * the distro name, such as "CentOS release 5.3 (Final)" or "Ubuntu 10.10"
         */
         $distro = '';
-        if (file_exists("/dev/")){ //Windows does not have this folder
-          $distro = exec( "lsb_release -d -s 2> /dev/null" );
+        if (file_exists("/dev/")) { //Windows does not have this folder
+            $distro = exec("lsb_release -d -s 2> /dev/null");
         }
 
         /* For distros without lsb_release, we look for *release (such as
         * redhat-release, gentoo-release, SuSE-release, etc) or *version (such as
         * debian_version, slackware-version, etc)
         */
-        if (empty( $distro )) {
-            foreach (glob( "/etc/*release" ) as $filename) {
-                $distro = trim( file_get_contents( $filename ) );
-                if (! empty( $distro )) {
+        if (empty($distro)) {
+            foreach (glob("/etc/*release") as $filename) {
+                $distro = trim(file_get_contents($filename));
+                if (!empty($distro)) {
                     break;
                 }
             }
-            if (empty( $distro )) {
-                foreach (glob( "/etc/*version" ) as $filename) {
-                    $distro = trim( file_get_contents( $filename ) );
-                    if (! empty( $distro )) {
+            if (empty($distro)) {
+                foreach (glob("/etc/*version") as $filename) {
+                    $distro = trim(file_get_contents($filename));
+                    if (!empty($distro)) {
                         break;
                     }
                 }
@@ -195,9 +205,9 @@ class PmSystem
         /* CentOS returns a string with quotes, remove them and append
         * the OS name (such as LINUX, WINNT, DARWIN, etc)
         */
-        $distro = trim( $distro, "\"" ) . " (" . PHP_OS . ")";
+        $distro = trim($distro, "\"") . " (" . PHP_OS . ")";
 
-        $Fields = array ();
+        $Fields = array();
         $Fields['SYSTEM'] = $distro;
         $Fields['PHP'] = phpversion();
         $Fields['PM_VERSION'] = self::getVersion();
@@ -205,45 +215,45 @@ class PmSystem
         $Fields['IP'] = isset($ipe[0]) ? $ipe[0] : ''; //lookup($ipe[0]);
 
 
-        $Fields['PLUGINS_LIST'] = PmSystem::getPlugins();
+        $Fields['PLUGINS_LIST'] = System::getPlugins();
 
         return $Fields;
     }
 
-    public static function listPoFiles ()
+    public static function listPoFiles()
     {
-        $folders = glob( PATH_CORE . '/content/translations/*' );
+        $folders = glob(PATH_CORE . '/content/translations/*');
 
-        $items = glob( PATH_CORE . '/content/translations/*.po' );
+        $items = glob(PATH_CORE . '/content/translations/*.po');
         foreach ($folders as $folder) {
-            if (is_dir( $folder )) {
-                $add = glob( $folder . "/*.po" );
-                $items = array_merge( $items, $add );
+            if (is_dir($folder)) {
+                $add = glob($folder . "/*.po");
+                $items = array_merge($items, $add);
             }
         }
 
         return $items;
     }
 
-    public static function verifyChecksum ()
+    public static function verifyChecksum()
     {
-        if (! file_exists( PATH_TRUNK . "checksum.txt" )) {
+        if (!file_exists(PATH_TRUNK . "checksum.txt")) {
             return false;
         }
-        $lines = explode( "\n", file_get_contents( PATH_TRUNK . "checksum.txt" ) );
-        $result = array ("diff" => array (),"missing" => array ()
+        $lines = explode("\n", file_get_contents(PATH_TRUNK . "checksum.txt"));
+        $result = array("diff" => array(), "missing" => array()
         );
         foreach ($lines as $line) {
-            if (empty( $line )) {
+            if (empty($line)) {
                 continue;
             }
-            list ($checksum, $empty, $filename) = explode( " ", $line );
+            list ($checksum, $empty, $filename) = explode(" ", $line);
             //Skip xmlform because these files always change.
-            if (strpos( $filename, "/xmlform/" ) !== false) {
+            if (strpos($filename, "/xmlform/") !== false) {
                 continue;
             }
-            if (file_exists( realpath( $filename ) )) {
-                if (strcmp( $checksum, G::encryptFileOld( realpath( $filename ) ) ) != 0) {
+            if (file_exists(realpath($filename))) {
+                if (strcmp($checksum, G::encryptFileOld(realpath($filename))) != 0) {
                     $result['diff'][] = $filename;
                 }
             } else {
@@ -262,20 +272,20 @@ class PmSystem
      * param
      * @return boolean
      */
-    public function verifyFileForUpgrade ()
+    public function verifyFileForUpgrade()
     {
 
         $filter = new InputFilter();
-        $upgradeFilename = isset( $_FILES['form']['name']['UPGRADE_FILENAME'] ) ? $_FILES['form']['name']['UPGRADE_FILENAME'] : '';
-        $tempFilename = isset( $_FILES['form']['tmp_name']['UPGRADE_FILENAME'] ) ? $_FILES['form']['tmp_name']['UPGRADE_FILENAME'] : '';
-        $this->sRevision = str_replace( '.tar.gz', '', str_replace( 'pmos-patch-', '', $upgradeFilename ) );
+        $upgradeFilename = isset($_FILES['form']['name']['UPGRADE_FILENAME']) ? $_FILES['form']['name']['UPGRADE_FILENAME'] : '';
+        $tempFilename = isset($_FILES['form']['tmp_name']['UPGRADE_FILENAME']) ? $_FILES['form']['tmp_name']['UPGRADE_FILENAME'] : '';
+        $this->sRevision = str_replace('.tar.gz', '', str_replace('pmos-patch-', '', $upgradeFilename));
         $sTemFilename = $tempFilename;
         $sTemFilename = $filter->xssFilterHard($sTemFilename, 'path');
         $pathFile = $filter->xssFilterHard(PATH_DATA . 'upgrade' . PATH_SEP . $upgradeFilename, 'path');
         $this->sFilename = $pathFile;
-        $this->sPath = dirname( $this->sFilename ) . PATH_SEP;
-        G::mk_dir( PATH_DATA . 'upgrade' );
-        if (! move_uploaded_file( $sTemFilename, $this->sFilename )) {
+        $this->sPath = dirname($this->sFilename) . PATH_SEP;
+        G::mk_dir(PATH_DATA . 'upgrade');
+        if (!move_uploaded_file($sTemFilename, $this->sFilename)) {
             return false;
         }
         return true;
@@ -290,21 +300,21 @@ class PmSystem
      * param
      * @return void
      */
-    public function getUpgradedFilesList ()
+    public function getUpgradedFilesList()
     {
-        $this->sFilesList = new GzipFile( $this->sFilename );
-        $this->sFilesList->set_options( array ('basedir' => dirname( $this->sFilename ),'overwrite' => 1
-        ) );
+        $this->sFilesList = new GzipFile($this->sFilename);
+        $this->sFilesList->set_options(array('basedir' => dirname($this->sFilename), 'overwrite' => 1
+        ));
         $this->sFilesList->extract_files();
-        if (count( $this->sFilesList->error ) > 0) {
+        if (count($this->sFilesList->error) > 0) {
             $msg = '';
             foreach ($this->sFilesList->error as $key => $val) {
                 $msg .= $val . "\n";
             }
-            throw new Exception( $msg );
+            throw new Exception($msg);
         }
-        if (count( $this->sFilesList->files ) == 0) {
-            throw new Exception( 'The uploaded file is an invalid patch file.' );
+        if (count($this->sFilesList->files) == 0) {
+            throw new Exception('The uploaded file is an invalid patch file.');
         }
     }
 
@@ -317,10 +327,10 @@ class PmSystem
      * param
      * @return boolean
      */
-    public function verifyForBootstrapUpgrade ()
+    public function verifyForBootstrapUpgrade()
     {
         foreach ($this->sFilesList->files as $sFile) {
-            if (basename( $sFile ) == 'schema.xml') {
+            if (basename($sFile) == 'schema.xml') {
                 $this->newSystemClass = $sFile;
                 return true;
             }
@@ -337,7 +347,7 @@ class PmSystem
      * param
      * @return array
      */
-    public function upgrade ()
+    public function upgrade()
     {
         //get special files
         $sListFile = '';
@@ -347,8 +357,8 @@ class PmSystem
         $sSchemaFile = '';
         $sSchemaRBACFile = '';
         foreach ($this->sFilesList->files as $sFile) {
-            if (basename( $sFile ) == 'schema.xml') {
-                if (strpos( $sFile, '/rbac/engine/' ) === false) {
+            if (basename($sFile) == 'schema.xml') {
+                if (strpos($sFile, '/rbac/engine/') === false) {
                     $sOldSchema = '';
                     $sSchemaFile = $sFile;
                 } else {
@@ -358,105 +368,105 @@ class PmSystem
             }
 
             //files.lst
-            if (basename( $sFile ) == 'files.lst') {
+            if (basename($sFile) == 'files.lst') {
                 $this->sUpgradeFileList = $sFile;
             }
 
             //files.lst
-            if (basename( $sFile ) == 'patch.version.txt') {
+            if (basename($sFile) == 'patch.version.txt') {
                 $sPatchVersionFile = $sFile;
             }
 
             //files.rev.txt
-            if (substr( basename( $sFile ), 0, 6 ) == 'files.' && substr( basename( $sFile ), - 4 ) == '.txt') {
+            if (substr(basename($sFile), 0, 6) == 'files.' && substr(basename($sFile), -4) == '.txt') {
                 $sCheckListFile = $sFile;
             }
 
             //po files
-            $sExtension = substr( $sFile, strrpos( $sFile, '.' ) + 1, strlen( $sFile ) );
+            $sExtension = substr($sFile, strrpos($sFile, '.') + 1, strlen($sFile));
             if ($sExtension == 'po') {
                 $sPoFile = $sFile;
             }
         }
 
-        $pmVersion = explode( '-', self::getVersion() );
-        array_shift( $pmVersion );
-        $patchVersion = explode( '-', $this->sRevision );
+        $pmVersion = explode('-', self::getVersion());
+        array_shift($pmVersion);
+        $patchVersion = explode('-', $this->sRevision);
 
-        if ($sPatchVersionFile != '' && file_exists( $sPatchVersionFile )) {
-            $this->sRevision = file_get_contents( $sPatchVersionFile );
-            $patchVersion = explode( '-', $this->sRevision );
+        if ($sPatchVersionFile != '' && file_exists($sPatchVersionFile)) {
+            $this->sRevision = file_get_contents($sPatchVersionFile);
+            $patchVersion = explode('-', $this->sRevision);
         }
 
-        if (! file_exists( PATH_DATA . 'log' . PATH_SEP )) {
-            G::mk_dir( PATH_DATA . 'log' . PATH_SEP );
+        if (!file_exists(PATH_DATA . 'log' . PATH_SEP)) {
+            G::mk_dir(PATH_DATA . 'log' . PATH_SEP);
         }
 
         //empty query log
         $sqlLog = PATH_DATA . 'log' . PATH_SEP . "query.log";
-        $fp = fopen( $sqlLog, "w+" );
-        fwrite( $fp, "" );
-        fclose( $fp );
+        $fp = fopen($sqlLog, "w+");
+        fwrite($fp, "");
+        fclose($fp);
 
-        $aEnvironmentsUpdated = array ();
-        $aEnvironmentsDiff = array ();
-        $aErrors = array ();
+        $aEnvironmentsUpdated = array();
+        $aEnvironmentsDiff = array();
+        $aErrors = array();
 
         //now will verify each folder and file has permissions to write and add files.
         if ($this->sUpgradeFileList != '') {
             $bCopySchema = true;
-            $oFile = fopen( $this->sUpgradeFileList, 'r' );
-            while ($sLine = trim( fgets( $oFile ) )) {
-                $sLine = substr( $sLine, 1 );
-                $aAux = explode( PATH_SEP, $sLine );
-                array_shift( $aAux );
-                $sFilePath = implode( PATH_SEP, $aAux );
+            $oFile = fopen($this->sUpgradeFileList, 'r');
+            while ($sLine = trim(fgets($oFile))) {
+                $sLine = substr($sLine, 1);
+                $aAux = explode(PATH_SEP, $sLine);
+                array_shift($aAux);
+                $sFilePath = implode(PATH_SEP, $aAux);
                 $targetFileName = PATH_TRUNK . $sFilePath;
-                if (! is_dir( $this->sPath . 'processmaker' . PATH_SEP . $sFilePath )) {
+                if (!is_dir($this->sPath . 'processmaker' . PATH_SEP . $sFilePath)) {
                     //if we are updating or deleting a file
-                    if (file_exists( $this->sPath . 'processmaker' . PATH_SEP . $sFilePath )) {
-                        if (file_exists( $targetFileName )) {
-                            if (! is_writable( $targetFileName )) {
-                                throw (new Exception( "File $targetFileName is not writable." ));
+                    if (file_exists($this->sPath . 'processmaker' . PATH_SEP . $sFilePath)) {
+                        if (file_exists($targetFileName)) {
+                            if (!is_writable($targetFileName)) {
+                                throw (new Exception("File $targetFileName is not writable."));
                             }
                         } else {
                             //verify parent folder, and ask if that folder is writable
-                            $auxDir = explode( '/', $targetFileName );
-                            array_pop( $auxDir );
-                            $parentDir = implode( '/', $auxDir );
-                            if (! is_dir( $parentDir )) {
+                            $auxDir = explode('/', $targetFileName);
+                            array_pop($auxDir);
+                            $parentDir = implode('/', $auxDir);
+                            if (!is_dir($parentDir)) {
                                 //throw (new Exception("File $parentDir is an invalid directory."));
-                                G::mk_dir( $parentDir );
+                                G::mk_dir($parentDir);
                             }
-                            if (! is_writable( $parentDir )) {
-                                throw (new Exception( "Directory $parentDir is not writable." ));
+                            if (!is_writable($parentDir)) {
+                                throw (new Exception("Directory $parentDir is not writable."));
                             }
                         }
                     } else {
                         //delete unused files
-                        if (file_exists( $targetFileName ) && ! is_writable( $targetFileName )) {
-                            throw (new Exception( "File $targetFileName is not writable." ));
+                        if (file_exists($targetFileName) && !is_writable($targetFileName)) {
+                            throw (new Exception("File $targetFileName is not writable."));
                         }
                     }
                 } else {
                     $dirName = PATH_TRUNK . $sFilePath;
-                    if ($dirName[strlen( $dirName ) - 1] == '/') {
-                        $dirName = substr( $dirName, 0, strlen( $dirName ) - 1 );
+                    if ($dirName[strlen($dirName) - 1] == '/') {
+                        $dirName = substr($dirName, 0, strlen($dirName) - 1);
                     }
-                    $auxDir = explode( '/', $dirName );
-                    array_pop( $auxDir );
-                    $parentDir = implode( '/', $auxDir );
-                    if (file_exists( $dirName )) {
-                        if (is_writable( $dirName )) {
+                    $auxDir = explode('/', $dirName);
+                    array_pop($auxDir);
+                    $parentDir = implode('/', $auxDir);
+                    if (file_exists($dirName)) {
+                        if (is_writable($dirName)) {
                             //print "e. ok $dirName <br>";
                         } else {
-                            throw (new Exception( "$dirName  is not writable" ));
+                            throw (new Exception("$dirName  is not writable"));
                         }
                     } else {
-                        if (is_writable( $parentDir )) {
-                            mkdir( $dirName, 0777 );
+                        if (is_writable($parentDir)) {
+                            mkdir($dirName, 0777);
                         } else {
-                            throw (new Exception( "$dirName does not exist and parent folder $parentDir is not writable" ));
+                            throw (new Exception("$dirName does not exist and parent folder $parentDir is not writable"));
                         }
                     }
                 }
@@ -466,46 +476,46 @@ class PmSystem
         //processing list file files.lst
         if ($this->sUpgradeFileList != '') {
             $bCopySchema = true;
-            $oFile = fopen( $this->sUpgradeFileList, 'r' );
-            while ($sLine = trim( fgets( $oFile ) )) {
-                $action = substr( $sLine, 0, 1 );
-                $sLine = substr( $sLine, 1 );
-                $aAux = explode( PATH_SEP, $sLine );
-                array_shift( $aAux );
-                $sFilePath = implode( PATH_SEP, $aAux );
+            $oFile = fopen($this->sUpgradeFileList, 'r');
+            while ($sLine = trim(fgets($oFile))) {
+                $action = substr($sLine, 0, 1);
+                $sLine = substr($sLine, 1);
+                $aAux = explode(PATH_SEP, $sLine);
+                array_shift($aAux);
+                $sFilePath = implode(PATH_SEP, $aAux);
                 $targetFileName = PATH_TRUNK . $sFilePath;
-                if (strtoupper( $action ) != 'D') {
-                    if (! is_dir( $this->sPath . 'processmaker' . PATH_SEP . $sFilePath )) {
-                        if (file_exists( $this->sPath . 'processmaker' . PATH_SEP . $sFilePath )) {
-                            if (strpos( $sFilePath, 'schema.xml' ) !== false && $bCopySchema) {
+                if (strtoupper($action) != 'D') {
+                    if (!is_dir($this->sPath . 'processmaker' . PATH_SEP . $sFilePath)) {
+                        if (file_exists($this->sPath . 'processmaker' . PATH_SEP . $sFilePath)) {
+                            if (strpos($sFilePath, 'schema.xml') !== false && $bCopySchema) {
                                 $bCopySchema = false;
-                                $sOldSchema = str_replace( 'schema.xml', 'schema_' . date( 'Ymd' ) . '.xml', PATH_TRUNK . $sFilePath );
-                                $this->pm_copy( PATH_TRUNK . $sFilePath, $sOldSchema );
+                                $sOldSchema = str_replace('schema.xml', 'schema_' . date('Ymd') . '.xml', PATH_TRUNK . $sFilePath);
+                                $this->pm_copy(PATH_TRUNK . $sFilePath, $sOldSchema);
                             }
-                            if (file_exists( $targetFileName )) {
-                                if (is_writable( $targetFileName )) {
-                                    $this->pm_copy( $this->sPath . 'processmaker' . PATH_SEP . $sFilePath, $targetFileName );
-                                    @chmod( $targetFileName, 0666 );
+                            if (file_exists($targetFileName)) {
+                                if (is_writable($targetFileName)) {
+                                    $this->pm_copy($this->sPath . 'processmaker' . PATH_SEP . $sFilePath, $targetFileName);
+                                    @chmod($targetFileName, 0666);
                                 } else {
-                                    throw (new Exception( "Failed to open file: Permission denied in $targetFileName." ));
+                                    throw (new Exception("Failed to open file: Permission denied in $targetFileName."));
                                 }
                             } else {
-                                $this->pm_copy( $this->sPath . 'processmaker' . PATH_SEP . $sFilePath, $targetFileName );
-                                @chmod( $targetFileName, 0666 );
+                                $this->pm_copy($this->sPath . 'processmaker' . PATH_SEP . $sFilePath, $targetFileName);
+                                @chmod($targetFileName, 0666);
                             }
                         } else {
                             //delete unused files
-                            if (file_exists( $targetFileName )) {
-                                @unlink( $targetFileName );
+                            if (file_exists($targetFileName)) {
+                                @unlink($targetFileName);
                             }
                         }
                     } else {
-                        if (! file_exists( PATH_TRUNK . $sFilePath )) {
-                            mkdir( PATH_TRUNK . $sFilePath, 0777 );
+                        if (!file_exists(PATH_TRUNK . $sFilePath)) {
+                            mkdir(PATH_TRUNK . $sFilePath, 0777);
                         }
                     }
-                } elseif (file_exists( PATH_TRUNK . $sFilePath ) && $sFilePath != 'workflow/engine/gulliver') {
-                    @unlink( PATH_TRUNK . $sFilePath );
+                } elseif (file_exists(PATH_TRUNK . $sFilePath) && $sFilePath != 'workflow/engine/gulliver') {
+                    @unlink(PATH_TRUNK . $sFilePath);
                 }
             }
         }
@@ -517,25 +527,25 @@ class PmSystem
         $distinct = 0;
         //checking files of this installation server with the files in Repository Code.
         if ($sCheckListFile != '') {
-            $fp = fopen( $sCheckListFile, 'r' );
-            while (! feof( $fp )) {
-                $line = explode( ' ', fgets( $fp ) );
-                if (count( $line ) == 3) {
-                    $file = PATH_TRUNK . trim( $line[2] );
-                    if (is_readable( $file )) {
-                        $size = sprintf( "%07d", filesize( $file ) );
-                        $checksum = sprintf( "%010u", G::encryptCrc32( file_get_contents( $file ) ) );
-                        if (! ($line[0] == $size && $line[1] == $checksum) && substr( $file, - 4 ) != '.xml') {
+            $fp = fopen($sCheckListFile, 'r');
+            while (!feof($fp)) {
+                $line = explode(' ', fgets($fp));
+                if (count($line) == 3) {
+                    $file = PATH_TRUNK . trim($line[2]);
+                    if (is_readable($file)) {
+                        $size = sprintf("%07d", filesize($file));
+                        $checksum = sprintf("%010u", G::encryptCrc32(file_get_contents($file)));
+                        if (!($line[0] == $size && $line[1] == $checksum) && substr($file, -4) != '.xml') {
                             $distinctFiles .= $file . "\n";
-                            $distinct ++;
+                            $distinct++;
                         }
                     } else {
                         $missedFiles .= $file . "\n";
-                        $missed ++;
+                        $missed++;
                     }
                 }
             }
-            fclose( $fp );
+            fclose($fp);
         }
 
         if ($missed > 0) {
@@ -555,47 +565,47 @@ class PmSystem
         $bForceXml = true;
         $bParseSchema = true;
         $bParseSchemaRBAC = true;
-        $oDirectory = dir( PATH_DB );
+        $oDirectory = dir(PATH_DB);
 
         //count db.php files ( workspaces )
-        $aWorkspaces = array ();
+        $aWorkspaces = array();
         while (($sObject = $oDirectory->read())) {
-            if (is_dir( PATH_DB . $sObject ) && substr( $sObject, 0, 1 ) != '.' && file_exists( PATH_DB . $sObject . PATH_SEP . 'db.php' )) {
+            if (is_dir(PATH_DB . $sObject) && substr($sObject, 0, 1) != '.' && file_exists(PATH_DB . $sObject . PATH_SEP . 'db.php')) {
                 $aWorkspaces[] = $sObject;
             }
         }
-        $aUpgradeData = array ();
+        $aUpgradeData = array();
         $aUpgradeData['workspaces'] = $aWorkspaces;
-        $aUpgradeData['wsQuantity'] = count( $aWorkspaces );
+        $aUpgradeData['wsQuantity'] = count($aWorkspaces);
         $aUpgradeData['sPoFile'] = $sPoFile;
         $aUpgradeData['bForceXmlPoFile'] = true;
         $aUpgradeData['sSchemaFile'] = $sSchemaFile;
         $aUpgradeData['sSchemaRBACFile'] = $sSchemaRBACFile;
 
-        file_put_contents( PATH_DATA . 'log' . PATH_SEP . "upgrade.data.bin", serialize( $aUpgradeData ) );
+        file_put_contents(PATH_DATA . 'log' . PATH_SEP . "upgrade.data.bin", serialize($aUpgradeData));
 
         $sSchemaFile = '';
         $sPoFile = '';
         $sSchemaRBACFile = '';
 
-        $oDirectory = dir( PATH_DB );
+        $oDirectory = dir(PATH_DB);
         while (($sObject = $oDirectory->read())) {
-            if (is_dir( PATH_DB . $sObject ) && substr( $sObject, 0, 1 ) != '.') {
-                if (file_exists( PATH_DB . $sObject . PATH_SEP . 'db.php' )) {
-                    eval( $this->getDatabaseCredentials( PATH_DB . $sObject . PATH_SEP . 'db.php' ) );
+            if (is_dir(PATH_DB . $sObject) && substr($sObject, 0, 1) != '.') {
+                if (file_exists(PATH_DB . $sObject . PATH_SEP . 'db.php')) {
+                    eval($this->getDatabaseCredentials(PATH_DB . $sObject . PATH_SEP . 'db.php'));
                 }
                 $aEnvironmentsUpdated[] = $sObject;
                 $aEnvironmentsDiff[] = $sObject;
             }
         }
         $oDirectory->close();
-        @unlink( PATH_CORE . 'config/_databases_.php' );
+        @unlink(PATH_CORE . 'config/_databases_.php');
 
         //clean up smarty directory
-        $oDirectory = dir( PATH_SMARTY_C );
+        $oDirectory = dir(PATH_SMARTY_C);
         while ($sFilename = $oDirectory->read()) {
             if (($sFilename != '.') && ($sFilename != '..')) {
-                @unlink( PATH_SMARTY_C . PATH_SEP . $sFilename );
+                @unlink(PATH_SMARTY_C . PATH_SEP . $sFilename);
             }
         }
 
@@ -605,12 +615,12 @@ class PmSystem
         //clean up xmlform folders
         $sDir = PATH_C . 'xmlform';
         $sDir = $filter->xssFilterHard($sDir, 'path');
-        if (file_exists( $sDir ) && is_dir( $sDir )) {
-            $oDirectory = dir( $sDir );
+        if (file_exists($sDir) && is_dir($sDir)) {
+            $oDirectory = dir($sDir);
             while ($sObjectName = $oDirectory->read()) {
                 if (($sObjectName != '.') && ($sObjectName != '..')) {
-                    if (is_dir( $sDir . PATH_SEP . $sObjectName )) {
-                        G::rm_dir( $sDir . PATH_SEP . $sObjectName );
+                    if (is_dir($sDir . PATH_SEP . $sObjectName)) {
+                        G::rm_dir($sDir . PATH_SEP . $sObjectName);
                     }
                 }
             }
@@ -618,14 +628,14 @@ class PmSystem
         }
 
         //changing the PM_VERSION according the patch file name
-        $oFile = fopen( PATH_METHODS . 'login/version-pmos.php', 'w+' );
-        if (isset( $this->sRevision ) && $this->sRevision != '') {
-            fwrite( $oFile, "<?php\n  define ( 'PM_VERSION' , str_replace ( ' ','',  '1.6-" . $this->sRevision . "' ));\n?>" );
+        $oFile = fopen(PATH_METHODS . 'login/version-pmos.php', 'w+');
+        if (isset($this->sRevision) && $this->sRevision != '') {
+            fwrite($oFile, "<?php\n  define ( 'PM_VERSION' , str_replace ( ' ','',  '1.6-" . $this->sRevision . "' ));\n?>");
         } else {
-            fwrite( $oFile, "<?php\n  define ( 'PM_VERSION' , str_replace ( ' ','',  'unknow' ));\n?>" );
+            fwrite($oFile, "<?php\n  define ( 'PM_VERSION' , str_replace ( ' ','',  'unknow' ));\n?>");
         }
-        fclose( $oFile );
-        $ver = explode( "-", $this->sRevision );
+        fclose($oFile);
+        $ver = explode("-", $this->sRevision);
         $this->aErrors = $aErrors;
         $this->aWorkspaces = $aWorkspaces;
 
@@ -641,9 +651,9 @@ class PmSystem
      * param
      * @return array
      */
-    public function cleanupUpgradeDirectory ()
+    public function cleanupUpgradeDirectory()
     {
-        G::rm_dir( PATH_DATA . "upgrade" . PATH_SEP . "processmaker" );
+        G::rm_dir(PATH_DATA . "upgrade" . PATH_SEP . "processmaker");
     }
 
     /**
@@ -656,14 +666,14 @@ class PmSystem
      * @param string $target
      * @return void
      */
-    public function pm_copy ($source, $target)
+    public function pm_copy($source, $target)
     {
-        if (! is_dir( dirname( $target ) )) {
-            G::mk_dir( dirname( $target ) );
+        if (!is_dir(dirname($target))) {
+            G::mk_dir(dirname($target));
         }
-        if (! copy( $source, $target )) {
-            krumo( $source );
-            krumo( $target );
+        if (!copy($source, $target)) {
+            krumo($source);
+            krumo($target);
         }
     }
 
@@ -676,16 +686,16 @@ class PmSystem
      * @param string $dbFile
      * @return $sContent
      */
-    public function getDatabaseCredentials ($dbFile)
+    public function getDatabaseCredentials($dbFile)
     {
-        $sContent = file_get_contents( $dbFile );
-        $sContent = str_replace( '<?php', '', $sContent );
-        $sContent = str_replace( '<?', '', $sContent );
-        $sContent = str_replace( '?>', '', $sContent );
-        $sContent = str_replace( 'define', '', $sContent );
-        $sContent = str_replace( "('", '$', $sContent );
-        $sContent = str_replace( "',", '=', $sContent );
-        $sContent = str_replace( ");", ';', $sContent );
+        $sContent = file_get_contents($dbFile);
+        $sContent = str_replace('<?php', '', $sContent);
+        $sContent = str_replace('<?', '', $sContent);
+        $sContent = str_replace('?>', '', $sContent);
+        $sContent = str_replace('define', '', $sContent);
+        $sContent = str_replace("('", '$', $sContent);
+        $sContent = str_replace("',", '=', $sContent);
+        $sContent = str_replace(");", ';', $sContent);
         return $sContent;
     }
 
@@ -694,9 +704,9 @@ class PmSystem
      *
      * @return schema content in an array
      */
-    public static function getSystemSchema ()
+    public static function getSystemSchema()
     {
-        return PmSystem::getSchema( PATH_TRUNK . "workflow/engine/config/schema.xml" );
+        return System::getSchema(PATH_TRUNK . "workflow/engine/config/schema.xml");
     }
 
     /**
@@ -704,9 +714,9 @@ class PmSystem
      *
      * @return schema content in an array
      */
-    public static function getSystemSchemaRbac ()
+    public static function getSystemSchemaRbac()
     {
-    	return PmSystem::getSchema( PATH_TRUNK . "rbac/engine/config/schema.xml" );
+        return System::getSchema(PATH_TRUNK . "rbac/engine/config/schema.xml");
     }
 
     /**
@@ -715,13 +725,13 @@ class PmSystem
      * @param string $pluginName name of the plugin
      * @return $sContent
      */
-    public static function getPluginSchema ($pluginName)
+    public static function getPluginSchema($pluginName)
     {
 
         $filter = new InputFilter();
         $pathFile = $filter->xssFilterHard(PATH_PLUGINS . $pluginName . "/config/schema.xml", 'path');
-        if (file_exists( $pathFile )) {
-            return PmSystem::getSchema( $pathFile );
+        if (file_exists($pathFile)) {
+            return System::getSchema($pathFile);
         } else {
             return false;
         }
@@ -822,12 +832,12 @@ class PmSystem
      * @param array $aOldSchema original schema array
      * @return array with tablesToRename
      */
-    public static function verifyRbacSchema ($aOldSchema)
+    public static function verifyRbacSchema($aOldSchema)
     {
-        $aChanges = array ();
+        $aChanges = array();
 
         foreach ($aOldSchema as $sTableName => $aColumns) {
-            if(substr($sTableName, 0,4) != 'RBAC') {
+            if (substr($sTableName, 0, 4) != 'RBAC') {
                 $aChanges[] = $sTableName;
             }
         }
@@ -842,7 +852,7 @@ class PmSystem
      * @param array $aNewSchema new schema array
      * @return array with tablesToAdd, tablesToAlter, tablesWithNewIndex and tablesToAlterIndex
      */
-    public static function compareSchema ($aOldSchema, $aNewSchema)
+    public static function compareSchema($aOldSchema, $aNewSchema)
     {
         //$aChanges = array('tablesToDelete' => array(), 'tablesToAdd' => array(), 'tablesToAlter' => array());
         //Tables to delete, but this is disabled
@@ -855,19 +865,19 @@ class PmSystem
         //}
 
 
-        $aChanges = array ('tablesToAdd' => array (),'tablesToAlter' => array (),'tablesWithNewIndex' => array (),'tablesToAlterIndex' => array ()
+        $aChanges = array('tablesToAdd' => array(), 'tablesToAlter' => array(), 'tablesWithNewIndex' => array(), 'tablesToAlterIndex' => array()
         );
 
         //new tables  to create and alter
         foreach ($aNewSchema as $sTableName => $aColumns) {
-            if (! isset( $aOldSchema[$sTableName] )) {
+            if (!isset($aOldSchema[$sTableName])) {
                 $aChanges['tablesToAdd'][$sTableName] = $aColumns;
             } else {
                 //drop old columns
                 foreach ($aOldSchema[$sTableName] as $sColumName => $aParameters) {
-                    if (! isset( $aNewSchema[$sTableName][$sColumName] )) {
-                        if (! isset( $aChanges['tablesToAlter'][$sTableName] )) {
-                            $aChanges['tablesToAlter'][$sTableName] = array ('DROP' => array (),'ADD' => array (),'CHANGE' => array ()
+                    if (!isset($aNewSchema[$sTableName][$sColumName])) {
+                        if (!isset($aChanges['tablesToAlter'][$sTableName])) {
+                            $aChanges['tablesToAlter'][$sTableName] = array('DROP' => array(), 'ADD' => array(), 'CHANGE' => array()
                             );
                         }
                         $aChanges['tablesToAlter'][$sTableName]['DROP'][$sColumName] = $sColumName;
@@ -878,10 +888,10 @@ class PmSystem
                 //foreach ($aNewSchema[$sTableName] as $sColumName => $aParameters) {
                 foreach ($aColumns as $sColumName => $aParameters) {
                     if ($sColumName != 'INDEXES') {
-                        if (! isset( $aOldSchema[$sTableName][$sColumName] )) {
+                        if (!isset($aOldSchema[$sTableName][$sColumName])) {
                             //this column doesnt exist in oldschema
-                            if (! isset( $aChanges['tablesToAlter'][$sTableName] )) {
-                                $aChanges['tablesToAlter'][$sTableName] = array ('DROP' => array (),'ADD' => array (),'CHANGE' => array ()
+                            if (!isset($aChanges['tablesToAlter'][$sTableName])) {
+                                $aChanges['tablesToAlter'][$sTableName] = array('DROP' => array(), 'ADD' => array(), 'CHANGE' => array()
                                 );
                             }
                             $aChanges['tablesToAlter'][$sTableName]['ADD'][$sColumName] = $aParameters;
@@ -890,18 +900,18 @@ class PmSystem
                             $newField = $aNewSchema[$sTableName][$sColumName];
                             $oldField = $aOldSchema[$sTableName][$sColumName];
                             //both are null, no change is required
-                            if (! isset( $newField['Default'] ) && ! isset( $oldField['Default'] )) {
+                            if (!isset($newField['Default']) && !isset($oldField['Default'])) {
                                 $changeDefaultAttr = false;
                                 //one of them is null, change IS required
                             }
-                            if (! isset( $newField['Default'] ) && isset( $oldField['Default'] ) && $oldField['Default'] != '') {
+                            if (!isset($newField['Default']) && isset($oldField['Default']) && $oldField['Default'] != '') {
                                 $changeDefaultAttr = true;
                             }
-                            if (isset( $newField['Default'] ) && ! isset( $oldField['Default'] )) {
+                            if (isset($newField['Default']) && !isset($oldField['Default'])) {
                                 $changeDefaultAttr = true;
                                 //both are defined and they are different.
                             }
-                            if (isset( $newField['Default'] ) && isset( $oldField['Default'] )) {
+                            if (isset($newField['Default']) && isset($oldField['Default'])) {
                                 if ($newField['Default'] != $oldField['Default']) {
                                     $changeDefaultAttr = true;
                                 } else {
@@ -910,28 +920,28 @@ class PmSystem
                             }
                             //special cases
                             // BLOB and TEXT columns cannot have DEFAULT values.  http://dev.mysql.com/doc/refman/5.0/en/blob.html
-                            if (in_array( strtolower( $newField['Type'] ), array ('text','mediumtext') )) {
+                            if (in_array(strtolower($newField['Type']), array('text', 'mediumtext'))) {
                                 $changeDefaultAttr = false;
                             }
-                                //#1067 - Invalid default value for datetime field
-                            if (in_array( $newField['Type'], array ('datetime') ) && isset( $newField['Default'] ) && $newField['Default'] == '') {
+                            //#1067 - Invalid default value for datetime field
+                            if (in_array($newField['Type'], array('datetime')) && isset($newField['Default']) && $newField['Default'] == '') {
                                 $changeDefaultAttr = false;
                             }
 
                             //#1067 - Invalid default value for int field
-                            if (substr( $newField['Type'], 0, 3 ) == "INT" && isset( $newField['Default'] ) && $newField['Default'] == '') {
+                            if (substr($newField['Type'], 0, 3) == "INT" && isset($newField['Default']) && $newField['Default'] == '') {
                                 $changeDefaultAttr = false;
                             }
 
                             //if any difference exists, then insert the difference in aChanges
-                            if (strcasecmp( $newField['Field'], $oldField['Field'] ) !== 0 || strcasecmp( $newField['Type'], $oldField['Type'] ) !== 0 || strcasecmp( $newField['Null'], $oldField['Null'] ) !== 0 || $changeDefaultAttr) {
-                                if (! isset( $aChanges['tablesToAlter'][$sTableName] )) {
-                                    $aChanges['tablesToAlter'][$sTableName] = array ('DROP' => array (),'ADD' => array (),'CHANGE' => array ());
+                            if (strcasecmp($newField['Field'], $oldField['Field']) !== 0 || strcasecmp($newField['Type'], $oldField['Type']) !== 0 || strcasecmp($newField['Null'], $oldField['Null']) !== 0 || $changeDefaultAttr) {
+                                if (!isset($aChanges['tablesToAlter'][$sTableName])) {
+                                    $aChanges['tablesToAlter'][$sTableName] = array('DROP' => array(), 'ADD' => array(), 'CHANGE' => array());
                                 }
                                 $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Field'] = $newField['Field'];
                                 $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Type'] = $newField['Type'];
                                 $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Null'] = $newField['Null'];
-                                if (isset( $newField['Default'] )) {
+                                if (isset($newField['Default'])) {
                                     $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Default'] = $newField['Default'];
                                 } else {
                                     $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Default'] = null;
@@ -944,17 +954,17 @@ class PmSystem
                 //foreach $aColumns
 
                 //now check the indexes of table
-                if (isset( $aNewSchema[$sTableName]['INDEXES'] )) {
+                if (isset($aNewSchema[$sTableName]['INDEXES'])) {
                     foreach ($aNewSchema[$sTableName]['INDEXES'] as $indexName => $indexFields) {
-                        if (! isset( $aOldSchema[$sTableName]['INDEXES'][$indexName] )) {
-                            if (! isset( $aChanges['tablesWithNewIndex'][$sTableName] )) {
-                                $aChanges['tablesWithNewIndex'][$sTableName] = array ();
+                        if (!isset($aOldSchema[$sTableName]['INDEXES'][$indexName])) {
+                            if (!isset($aChanges['tablesWithNewIndex'][$sTableName])) {
+                                $aChanges['tablesWithNewIndex'][$sTableName] = array();
                             }
                             $aChanges['tablesWithNewIndex'][$sTableName][$indexName] = $indexFields;
                         } else {
                             if ($aOldSchema[$sTableName]['INDEXES'][$indexName] != $indexFields) {
-                                if (! isset( $aChanges['tablesToAlterIndex'][$sTableName] )) {
-                                    $aChanges['tablesToAlterIndex'][$sTableName] = array ();
+                                if (!isset($aChanges['tablesToAlterIndex'][$sTableName])) {
+                                    $aChanges['tablesToAlterIndex'][$sTableName] = array();
                                 }
                                 $aChanges['tablesToAlterIndex'][$sTableName][$indexName] = $indexFields;
                             }
@@ -976,23 +986,23 @@ class PmSystem
 
         if (count($arrayEmailServerDefault) > 0) {
             $arrayDataEmailServerConfig = array(
-                "MESS_ENGINE"              => $arrayEmailServerDefault["MESS_ENGINE"],
-                "MESS_SERVER"              => $arrayEmailServerDefault["MESS_SERVER"],
-                "MESS_PORT"                => (int)($arrayEmailServerDefault["MESS_PORT"]),
-                "MESS_RAUTH"               => (int)($arrayEmailServerDefault["MESS_RAUTH"]),
-                "MESS_ACCOUNT"             => $arrayEmailServerDefault["MESS_ACCOUNT"],
-                "MESS_PASSWORD"            => $arrayEmailServerDefault["MESS_PASSWORD"],
-                "MESS_FROM_MAIL"           => $arrayEmailServerDefault["MESS_FROM_MAIL"],
-                "MESS_FROM_NAME"           => $arrayEmailServerDefault["MESS_FROM_NAME"],
-                "SMTPSecure"               => $arrayEmailServerDefault["SMTPSECURE"],
+                "MESS_ENGINE" => $arrayEmailServerDefault["MESS_ENGINE"],
+                "MESS_SERVER" => $arrayEmailServerDefault["MESS_SERVER"],
+                "MESS_PORT" => (int)($arrayEmailServerDefault["MESS_PORT"]),
+                "MESS_RAUTH" => (int)($arrayEmailServerDefault["MESS_RAUTH"]),
+                "MESS_ACCOUNT" => $arrayEmailServerDefault["MESS_ACCOUNT"],
+                "MESS_PASSWORD" => $arrayEmailServerDefault["MESS_PASSWORD"],
+                "MESS_FROM_MAIL" => $arrayEmailServerDefault["MESS_FROM_MAIL"],
+                "MESS_FROM_NAME" => $arrayEmailServerDefault["MESS_FROM_NAME"],
+                "SMTPSecure" => $arrayEmailServerDefault["SMTPSECURE"],
                 "MESS_TRY_SEND_INMEDIATLY" => (int)($arrayEmailServerDefault["MESS_TRY_SEND_INMEDIATLY"]),
-                "MAIL_TO"                  => $arrayEmailServerDefault["MAIL_TO"],
-                "MESS_DEFAULT"             => (int)($arrayEmailServerDefault["MESS_DEFAULT"]),
-                "MESS_ENABLED"             => 1,
-                "MESS_BACKGROUND"          => "",
-                "MESS_PASSWORD_HIDDEN"     => "",
-                "MESS_EXECUTE_EVERY"       => "",
-                "MESS_SEND_MAX"            => ""
+                "MAIL_TO" => $arrayEmailServerDefault["MAIL_TO"],
+                "MESS_DEFAULT" => (int)($arrayEmailServerDefault["MESS_DEFAULT"]),
+                "MESS_ENABLED" => 1,
+                "MESS_BACKGROUND" => "",
+                "MESS_PASSWORD_HIDDEN" => "",
+                "MESS_EXECUTE_EVERY" => "",
+                "MESS_SEND_MAX" => ""
             );
 
             //Return
@@ -1006,61 +1016,61 @@ class PmSystem
         }
     }
 
-    public function getSkingList ()
+    public function getSkingList()
     {
         //Create Skins custom folder if it doesn't exists
-        if (! is_dir( PATH_CUSTOM_SKINS )) {
-            G::verifyPath( PATH_CUSTOM_SKINS, true );
+        if (!is_dir(PATH_CUSTOM_SKINS)) {
+            G::verifyPath(PATH_CUSTOM_SKINS, true);
         }
 
         //Get Skin Config files
-        $skinListArray = array ();
-        $customSkins = glob( PATH_CUSTOM_SKINS . "*/config.xml" );
+        $skinListArray = array();
+        $customSkins = glob(PATH_CUSTOM_SKINS . "*/config.xml");
 
         if (!is_array($customSkins)) {
             $customSkins = array();
         }
 
         // getting al base skins
-        $baseSkins = glob( G::ExpandPath( "skinEngine" ) . '*/config.xml' );
+        $baseSkins = glob(G::ExpandPath("skinEngine") . '*/config.xml');
 
         // filtering no public skins (uxs, simplified)
         foreach ($baseSkins as $i => $skinName) {
-            if (strpos( $skinName, 'simplified' ) !== false || strpos( $skinName, 'uxs' ) !== false || strpos( $skinName, 'uxmodern' ) !== false) {
-                unset( $baseSkins[$i] );
+            if (strpos($skinName, 'simplified') !== false || strpos($skinName, 'uxs') !== false || strpos($skinName, 'uxmodern') !== false) {
+                unset($baseSkins[$i]);
             }
         }
 
-        $customSkins = array_merge( $baseSkins, $customSkins );
+        $customSkins = array_merge($baseSkins, $customSkins);
         $global = G::LoadTranslation('ID_GLOBAL');
 
         //Read and parse each Configuration File
         foreach ($customSkins as $key => $configInformation) {
-            $folderId = basename( dirname( $configInformation ) );
+            $folderId = basename(dirname($configInformation));
 
             if ($folderId == 'base') {
                 $folderId = 'classic';
             }
 
             $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
-            if ($partnerFlag && ($folderId == 'classic')){
+            if ($partnerFlag && ($folderId == 'classic')) {
                 continue;
             }
 
-            $xmlConfiguration = file_get_contents( $configInformation );
-            $xmlConfigurationObj = G::xmlParser( $xmlConfiguration );
+            $xmlConfiguration = file_get_contents($configInformation);
+            $xmlConfigurationObj = G::xmlParser($xmlConfiguration);
 
-            if (isset( $xmlConfigurationObj->result['skinConfiguration'] )) {
+            if (isset($xmlConfigurationObj->result['skinConfiguration'])) {
                 $skinInformationArray = $skinFilesArray = $xmlConfigurationObj->result['skinConfiguration']['__CONTENT__']['information']['__CONTENT__'];
-                $res = array ();
-                $res['SKIN_FOLDER_ID'] = strtolower( $folderId );
+                $res = array();
+                $res['SKIN_FOLDER_ID'] = strtolower($folderId);
 
                 foreach ($skinInformationArray as $keyInfo => $infoValue) {
-                    $res['SKIN_' . strtoupper( $keyInfo )] = (isset($infoValue['__VALUE__'])) ? $infoValue['__VALUE__'] : '';
+                    $res['SKIN_' . strtoupper($keyInfo)] = (isset($infoValue['__VALUE__'])) ? $infoValue['__VALUE__'] : '';
                 }
-                $res['SKIN_CREATEDATE'] = (isset($res['SKIN_CREATEDATE'])) ? $res['SKIN_CREATEDATE']: '';
-                $res['SKIN_MODIFIEDDATE'] = (isset($res['SKIN_MODIFIEDDATE'])) ? $res['SKIN_MODIFIEDDATE']: '';
-                $res['SKIN_WORKSPACE'] = (isset($res['SKIN_WORKSPACE'])) ? ( ($res['SKIN_WORKSPACE'] != '')? $res['SKIN_WORKSPACE'] : $global): $global;
+                $res['SKIN_CREATEDATE'] = (isset($res['SKIN_CREATEDATE'])) ? $res['SKIN_CREATEDATE'] : '';
+                $res['SKIN_MODIFIEDDATE'] = (isset($res['SKIN_MODIFIEDDATE'])) ? $res['SKIN_MODIFIEDDATE'] : '';
+                $res['SKIN_WORKSPACE'] = (isset($res['SKIN_WORKSPACE'])) ? (($res['SKIN_WORKSPACE'] != '') ? $res['SKIN_WORKSPACE'] : $global) : $global;
 
                 $swWS = true;
                 if ($res['SKIN_WORKSPACE'] != $global) {
@@ -1084,14 +1094,14 @@ class PmSystem
         return $skinListArray;
     }
 
-    public function getAllTimeZones ()
+    public function getAllTimeZones()
     {
         throw new Exception(__METHOD__ . ': The method is deprecated');
     }
 
-    public static function getSystemConfiguration ($globalIniFile = '', $wsIniFile = '', $wsName = '')
+    public static function getSystemConfiguration($globalIniFile = '', $wsIniFile = '', $wsName = '')
     {
-        if (! is_null(self::$config)) {
+        if (!is_null(self::$config)) {
             return self::$config;
         }
 
@@ -1118,8 +1128,8 @@ class PmSystem
 
         // default configuration for "error_reporting" conf
         if (empty(self::$defaultConfig["error_reporting"])) {
-            $errorReportingDefault = defined('E_DEPRECATED') ? E_ALL  & ~E_DEPRECATED : E_ALL;
-            $errorReportingDefault = defined('E_STRICT') ? $errorReportingDefault  & ~E_STRICT : $errorReportingDefault;
+            $errorReportingDefault = defined('E_DEPRECATED') ? E_ALL & ~E_DEPRECATED : E_ALL;
+            $errorReportingDefault = defined('E_STRICT') ? $errorReportingDefault & ~E_STRICT : $errorReportingDefault;
             self::$defaultConfig["error_reporting"] = $errorReportingDefault;
         }
 
@@ -1131,7 +1141,7 @@ class PmSystem
         }
 
         // Workspace environment configuration
-        if (file_exists($wsIniFile) ) {
+        if (file_exists($wsIniFile)) {
             if (($wsConf = @parse_ini_file($wsIniFile)) !== false) {
                 $config = array_merge($config, $wsConf);
             }
@@ -1155,66 +1165,67 @@ class PmSystem
     * @param string $globalIniFile
     * @return array of execute query Black list
     */
-    public static function getQueryBlackList($globalIniFile = ''){
+    public static function getQueryBlackList($globalIniFile = '')
+    {
         $config = array();
         if (empty($globalIniFile)) {
             $blackListIniFile = PATH_CONFIG . 'execute-query-blacklist.ini';
             $sysTablesIniFile = PATH_CONFIG . 'system-tables.ini';
         }
         // read the global execute-query-blacklist.ini configuration file
-        if(file_exists($blackListIniFile)){
+        if (file_exists($blackListIniFile)) {
             $config = @parse_ini_file($blackListIniFile);
         }
-        if(file_exists($sysTablesIniFile)){
+        if (file_exists($sysTablesIniFile)) {
             $systemTables = @parse_ini_file($sysTablesIniFile);
             $config['tables'] = $systemTables['tables'];
         }
         return $config;
     }
 
-    public function updateIndexFile ($conf)
+    public function updateIndexFile($conf)
     {
-        if (! file_exists( PATH_HTML . 'index.html' )) {
-            throw new Exception( 'The public index file "' . PATH_HTML . 'index.html" does not exist!' );
+        if (!file_exists(PATH_HTML . 'index.html')) {
+            throw new Exception('The public index file "' . PATH_HTML . 'index.html" does not exist!');
         } else {
-            if (! is_writable( PATH_HTML . 'index.html' )) {
-                throw new Exception( 'The index.html file is not writable on workflow/public_html directory.' );
+            if (!is_writable(PATH_HTML . 'index.html')) {
+                throw new Exception('The index.html file is not writable on workflow/public_html directory.');
             }
         }
 
-        $content = file_get_contents( PATH_HTML . 'index.html' );
+        $content = file_get_contents(PATH_HTML . 'index.html');
         $result = false;
 
         $patt = '/<meta\s+http\-equiv="REFRESH"\s+content=\"0;URL=(.+)\"\s*\/>/';
 
-        @preg_match( $patt, $content, $match );
+        @preg_match($patt, $content, $match);
 
-        if (is_array( $match ) && count( $match ) > 0 && isset( $match[1] )) {
-            $newUrl = "sys/" . (($conf["lang"] != "")? $conf["lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $conf["skin"] . "/login/login";
+        if (is_array($match) && count($match) > 0 && isset($match[1])) {
+            $newUrl = "sys/" . (($conf["lang"] != "") ? $conf["lang"] : ((defined("SYS_LANG") && SYS_LANG != "") ? SYS_LANG : "en")) . "/" . $conf["skin"] . "/login/login";
 
-            $newMetaStr = str_replace( $match[1], $newUrl, $match[0] );
-            $newContent = str_replace( $match[0], $newMetaStr, $content );
+            $newMetaStr = str_replace($match[1], $newUrl, $match[0]);
+            $newContent = str_replace($match[0], $newMetaStr, $content);
 
-            $result = (@file_put_contents( PATH_HTML . 'index.html', $newContent ) !== false);
+            $result = (@file_put_contents(PATH_HTML . 'index.html', $newContent) !== false);
         }
 
         return $result;
     }
 
-    public static function solrEnv ($sysName = '')
+    public static function solrEnv($sysName = '')
     {
-        if (empty( $sysName )) {
-            $conf = PmSystem::getSystemConfiguration();
+        if (empty($sysName)) {
+            $conf = System::getSystemConfiguration();
         } else {
-            $conf = PmSystem::getSystemConfiguration( '', '', $sysName );
+            $conf = System::getSystemConfiguration('', '', $sysName);
         }
 
-        if (! isset( $conf['solr_enabled'] ) || ! isset( $conf['solr_host'] ) || ! isset( $conf['solr_instance'] )) {
+        if (!isset($conf['solr_enabled']) || !isset($conf['solr_host']) || !isset($conf['solr_instance'])) {
             return false;
         }
 
         if ($conf['solr_enabled']) {
-            return array ('solr_enabled' => $conf['solr_enabled'],'solr_host' => $conf['solr_host'],'solr_instance' => $conf['solr_instance']
+            return array('solr_enabled' => $conf['solr_enabled'], 'solr_host' => $conf['solr_host'], 'solr_instance' => $conf['solr_instance']
             );
         }
 
@@ -1224,7 +1235,7 @@ class PmSystem
     public static function getInstance()
     {
         if (is_null(self::$instance)) {
-            self::$instance = new PmSystem();
+            self::$instance = new System();
         }
 
         return self::$instance;
@@ -1250,10 +1261,10 @@ class PmSystem
             $arraySystemConfiguration = self::getSystemConfiguration();
 
             $serverProtocol = $arraySystemConfiguration['server_protocol'];
-            $serverProtocol = ($serverProtocol != '')? $serverProtocol : ((G::is_https())? 'https' : 'http');
+            $serverProtocol = ($serverProtocol != '') ? $serverProtocol : ((G::is_https()) ? 'https' : 'http');
 
             $serverHostname = $arraySystemConfiguration['server_hostname_requests_frontend'];
-            $serverHostname = ($serverHostname != '')? $serverHostname : $_SERVER['HTTP_HOST'];
+            $serverHostname = ($serverHostname != '') ? $serverHostname : $_SERVER['HTTP_HOST'];
 
             //Return
             return $serverProtocol . '://' . $serverHostname;
diff --git a/workflow/engine/src/ProcessMaker/Exporter/Exporter.php b/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
index bf28ee0d5..ec6de89c5 100644
--- a/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
+++ b/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
@@ -39,7 +39,7 @@ abstract class Exporter
         $this->projectData = $this->bpmnProject->getProject();
 
         $this->metadata = array(
-            "vendor_version" => \PmSystem::getVersion(),
+            "vendor_version" => \ProcessMaker\Core\System::getVersion(),
             "vendor_version_code" => "Michelangelo",
             "export_timestamp" => date("U"),
             "export_datetime" => date("Y-m-d\TH:i:sP"),
diff --git a/workflow/engine/src/ProcessMaker/Plugins/PluginRegistry.php b/workflow/engine/src/ProcessMaker/Plugins/PluginRegistry.php
index 10604028a..756e38ee4 100644
--- a/workflow/engine/src/ProcessMaker/Plugins/PluginRegistry.php
+++ b/workflow/engine/src/ProcessMaker/Plugins/PluginRegistry.php
@@ -10,7 +10,7 @@ use InputFilter;
 use Language;
 use PEAR;
 use PluginsRegistry;
-use PmSystem;
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\Adapters\PluginAdapter;
 use ProcessMaker\Plugins\Interfaces\CaseSchedulerPlugin;
 use ProcessMaker\Plugins\Interfaces\CronFile;
@@ -33,7 +33,6 @@ use ProcessMaker\Plugins\Traits\Attributes;
 use ProcessMaker\Plugins\Traits\PluginStructure;
 use Publisher;
 use stdClass;
-use System;
 
 /**
  * Class PluginRegistry
@@ -428,7 +427,7 @@ class PluginRegistry
      */
     public function uninstallPluginWorkspaces($arrayPlugin)
     {
-        $workspace = PmSystem::listWorkspaces();
+        $workspace = System::listWorkspaces();
 
         foreach ($workspace as $indexWS => $ws) {
             $pluginRegistry = PluginRegistry::loadSingleton();
@@ -1392,7 +1391,7 @@ class PluginRegistry
             ) {
                 $arrayWorkspace = array();
 
-                foreach (PmSystem::listWorkspaces() as $value) {
+                foreach (System::listWorkspaces() as $value) {
                     $workspaceTools = $value;
 
                     $arrayWorkspace[] = $workspaceTools->name;
diff --git a/workflow/engine/src/ProcessMaker/Project/Handler.php b/workflow/engine/src/ProcessMaker/Project/Handler.php
index 0cb76b53e..47bffac53 100644
--- a/workflow/engine/src/ProcessMaker/Project/Handler.php
+++ b/workflow/engine/src/ProcessMaker/Project/Handler.php
@@ -110,21 +110,21 @@ abstract class Handler
      */
     public static function logstr($str)
     {
-        if (\PmSystem::isDebugMode()) {
+        if (\ProcessMaker\Core\System::isDebugMode()) {
             Logger::getInstance()->setLog($str);
         }
     }
 
     public static function logInline()
     {
-        if (\PmSystem::isDebugMode()) {
+        if (\ProcessMaker\Core\System::isDebugMode()) {
             call_user_func_array(array(Logger::getInstance(), 'setLogInline'), func_get_args());
         }
     }
 
     public static function log()
     {
-        if (\PmSystem::isDebugMode()) {
+        if (\ProcessMaker\Core\System::isDebugMode()) {
             $logger = Logger::getInstance();
             call_user_func_array(array($logger, 'setLogLine'), func_get_args());
         }
diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
index b8c1c4d3f..8e3809202 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
@@ -371,7 +371,7 @@ class Server implements iAuthenticate
                 $userTimeZone = $user->getUsrTimeZone();
 
                 if (trim($userTimeZone) == '') {
-                    $arraySystemConfiguration = \PmSystem::getSystemConfiguration('', '', SYS_SYS);
+                    $arraySystemConfiguration = \ProcessMaker\Core\System::getSystemConfiguration('', '', SYS_SYS);
 
                     $userTimeZone = $arraySystemConfiguration['time_zone'];
                 }
diff --git a/workflow/engine/src/ProcessMaker/Util/System.php b/workflow/engine/src/ProcessMaker/Util/System.php
index f9863f741..9e86faa1a 100644
--- a/workflow/engine/src/ProcessMaker/Util/System.php
+++ b/workflow/engine/src/ProcessMaker/Util/System.php
@@ -26,7 +26,7 @@ class System
     public static function getTimeZone()
     {
         try {
-            $arraySystemConfiguration = \PmSystem::getSystemConfiguration('', '', SYS_SYS);
+            $arraySystemConfiguration = \ProcessMaker\Core\System::getSystemConfiguration('', '', SYS_SYS);
 
             //Return
             return $arraySystemConfiguration['time_zone'];