@@ -12,15 +12,8 @@
  */
 class FeelExpressionEvaluator implements TemplateExpressionInterface
 {
-    private $engine;
-
-    public function __construct()
-    {
-        $this->engine = new FormalExpression();
-    }
-
     /**
-     * Evaluates the template using the mustache engine, if some error is generated an empty string
+     * Evaluates the template using the feel expression engine, if some error is generated an empty string
      * is returned
      *
      * @param string $template
@@ -30,8 +23,9 @@ public function __construct()
     public function render($template, $data)
     {
         try {
-            $this->engine->setBody($template);
-            return $this->engine($data);
+            $formal = new FormalExpression();
+            $formal->setBody($template);
+            return $formal($data);
         } catch (Exception $exception) {
             return "{$template}: " . $exception->getMessage();
         }
 
@@ -11,18 +11,18 @@
 use ProcessMaker\Assets\ScriptsInScreen;
 use ProcessMaker\Bpmn\MustacheOptions;
 use ProcessMaker\BpmnEngine;
-use ProcessMaker\Contracts\SoapClientInterface;
+use ProcessMaker\WebServices\Contracts\SoapClientInterface;
 use ProcessMaker\Contracts\TimerExpressionInterface;
 use ProcessMaker\Facades\WorkflowManager as WorkflowManagerFacade;
 use ProcessMaker\Factories\SoapClientFactory;
 use ProcessMaker\Listeners\BpmnSubscriber;
 use ProcessMaker\Listeners\CommentsSubscriber;
 use ProcessMaker\Managers\ExportManager;
 use ProcessMaker\Managers\TaskSchedulerManager;
-use ProcessMaker\Managers\WebServiceSoapConfigBuilder;
-use ProcessMaker\Managers\WebServiceSoapRequestBuilder;
-use ProcessMaker\Managers\WebServiceSoapResponseBuilder;
-use ProcessMaker\Managers\WebServiceSoapServiceCaller;
+use ProcessMaker\WebServices\SoapConfigBuilder;
+use ProcessMaker\WebServices\SoapRequestBuilder;
+use ProcessMaker\WebServices\SoapResponseMapper;
+use ProcessMaker\WebServices\SoapServiceCaller;
 use ProcessMaker\Managers\WorkflowManager;
 use ProcessMaker\Models\FormalExpression;
 use ProcessMaker\Nayra\Bpmn\Models\EventDefinitionBus;
@@ -39,6 +39,7 @@
 use ProcessMaker\Nayra\Contracts\Storage\BpmnDocumentInterface;
 use ProcessMaker\Repositories\BpmnDocument;
 use ProcessMaker\Repositories\DefinitionsRepository;
+use ProcessMaker\WebServices\NativeSoapClient;
 use ProcessMaker\WebServices\WebServiceRequest;
 
 class WorkflowServiceProvider extends ServiceProvider
@@ -204,18 +205,17 @@ function (ThrowEventInterface $source, EventDefinitionInterface $sourceEventDefi
         });
 
         $this->app->bind(SoapClientInterface::class, function ($app, $request_config) {
-            $factory = new SoapClientFactory();
-            return $factory->createNativeSoapClient($request_config['wsdl'], $request_config['options']);
+            return new NativeSoapClient($request_config['wsdl'], $request_config['options']);
         });
 
         // @todo Complete the WebServiceRequest Factory
         $this->app->bind('WebServiceRequest', function ($app, $params) {
             $dataSource = $params['dataSource'];
             return new WebServiceRequest(
-                new WebServiceSoapConfigBuilder(),
-                new WebServiceSoapRequestBuilder(),
-                new WebServiceSoapResponseBuilder(),
-                new WebServiceSoapServiceCaller(),
+                new SoapConfigBuilder(),
+                new SoapRequestBuilder(),
+                new SoapResponseMapper(),
+                new SoapServiceCaller(),
                 $dataSource
             );
         });
 
@@ -8,10 +8,10 @@
 use GuzzleHttp\Exception\GuzzleException;
 use ProcessMaker\Exception\HttpResponseException;
 use ProcessMaker\Helpers\DataTypeHelper;
-use ProcessMaker\WebServices\JsonResponseMapper;
+use ProcessMaker\WebServices\RestResponseMapper;
 use ProcessMaker\WebServices\RestRequestBuilder;
 use ProcessMaker\WebServices\RestServiceCaller;
-use ProcessMaker\WebServices\WebServiceConfigBuilder;
+use ProcessMaker\WebServices\RestConfigBuilder;
 
 trait MakeHttpRequests
 {
@@ -32,7 +32,7 @@ public function request(array $requestData = [], array $config = [])
     {
         try {
             $request = $this->prepareRequestWithOutboundConfig($requestData, $config);
-            $response = $this->call(...$request);
+            $response = $this->call($request);
             return $this->responseWithHeaderData($response, $requestData, $config);
         } catch (ClientException $exception) {
             throw new HttpResponseException($exception->getResponse());
@@ -41,7 +41,7 @@ public function request(array $requestData = [], array $config = [])
 
     public function prepareRequestWithOutboundConfig($data, $config)
     {
-        $configBuilder = new WebServiceConfigBuilder();
+        $configBuilder = new RestConfigBuilder();
         $requestBuilder = new RestRequestBuilder($this->client ?? null);
         $dsConfig = ['endpoints' => $this->endpoints, 'credentials' => $this->credentials, 'authtype' => $this->authtype];
         //TODO mover para que config no necesite una prop. privada
@@ -57,12 +57,12 @@ private function responseWithHeaderData($response, array $data = [], array $conf
         if (is_array($response)) {
             $status = $response['status'];
             $bodyContent = $response['response'];
-            $responseHeaders = $response['headers'] ?? [];
+            $headers = $response['headers'] ?? [];
         }
         else {
             $status = $response->getStatusCode();
             $bodyContent = $response->getBody()->getContents();
-            $responseHeaders = $response->getHeaders();
+            $headers = $response->getHeaders();
         }
 
         if (!DataTypeHelper::isJson($bodyContent)) {
@@ -80,19 +80,19 @@ private function responseWithHeaderData($response, array $data = [], array $conf
                 throw new HttpResponseException($response);
         }
 
-        $mapper = new JsonResponseMapper();
+        $mapper = new RestResponseMapper();
         $dsConfig = ['endpoints' => $this->endpoints, 'credentials' => $this->credentials];
-        $mapped = $mapper->map($content, $status, $responseHeaders, $config, $dsConfig, $data);
+        $responseData = compact('content', 'status', 'headers');
+        $config['dataSourceInfo'] = $dsConfig;
+        $mapped = $mapper->map($responseData, $config, $data);
 
         return $mapped;
     }
 
-    //private function call($method, $url, array $headers, $body, $bodyType)
-    private function call(...$request)
+    private function call($request)
     {
         $client = $this->client ?? new Client(['verify' => $this->verifySsl]);
         $caller = new RestServiceCaller($client);
-        return $caller->call($this->config, ...$request);
+        return $caller->call($request);
     }
-
 }