diff --git a/app/Http/Controllers/TelemetryController.php b/app/Http/Controllers/TelemetryController.php
index 2cd2b05..afd0ca9 100644
--- a/app/Http/Controllers/TelemetryController.php
+++ b/app/Http/Controllers/TelemetryController.php
@@ -31,35 +31,10 @@ class TelemetryController extends Controller
         }
     }
 
-    public function powerFactor(Request $request)
-    {
-        try {
-            $response = $this->med5minContract->getPowerFactor($request->all());
-            return (new TelemetryResource($response))
-                ->response()
-                ->setStatusCode(Response::HTTP_OK);
-        } catch (\Exception $ex) {
-            return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR);
-        }
-    }
-
-
-    public function demand(Request $request)
-    {
-        try {
-            $response = $this->med5minContract->getDemand($request->all());
-            return (new TelemetryResource($response))
-                ->response()
-                ->setStatusCode(Response::HTTP_OK);
-        } catch (\Exception $ex) {
-            return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR);
-        }
-    }
-
     public function discretization(Request $request)
     {
         try {
-            $response = $this->med5minContract->getDiscretization($request->all());
+            $response = $this->med5minContract->getDiscretization($request->all(), $request->getPathInfo());
             return (new TelemetryResource($response))
                 ->response()
                 ->setStatusCode(Response::HTTP_OK);
diff --git a/app/Models/Med5min.php b/app/Models/Med5min.php
index a536ace..e7267b8 100644
--- a/app/Models/Med5min.php
+++ b/app/Models/Med5min.php
@@ -8,6 +8,7 @@ use DateTimeInterface;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Builder;
 use OwenIt\Auditing\Contracts\Auditable as Auditing;
 use OwenIt\Auditing\Auditable;
 
@@ -43,4 +44,16 @@ class Med5min extends Model implements Auditing
     {
         return $date->format('d/m/Y H:i:s');
     }
+
+    protected static function booted()
+    {
+        static::addGlobalScope('dados_cadastrais', function (Builder $builder){
+           $builder->join(
+               "dados_cadastrais",
+               "dados_cadastrais.codigo_scde",
+               "=",
+               "med_5min.ponto"
+           );
+        });
+    }
 }
diff --git a/app/Models/Scopes/UserScope.php b/app/Models/Scopes/UserScope.php
index 0543eac..8596117 100644
--- a/app/Models/Scopes/UserScope.php
+++ b/app/Models/Scopes/UserScope.php
@@ -13,8 +13,8 @@ class UserScope implements Scope
     /**
      * Apply the scope to a given Eloquent query builder.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $builder
-     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param Builder $builder
+     * @param Model $model
      * @return void
      */
     public function apply(Builder $builder, Model $model)
diff --git a/app/Repositories/Med5min/Med5minContractInterface.php b/app/Repositories/Med5min/Med5minContractInterface.php
index d348a6d..48f9876 100644
--- a/app/Repositories/Med5min/Med5minContractInterface.php
+++ b/app/Repositories/Med5min/Med5minContractInterface.php
@@ -8,13 +8,11 @@ use App\Repositories\ContractInterface;
 
 interface Med5minContractInterface extends ContractInterface
 {
-    public function getDiscretized5min($params);
-    public function getDiscretized15min($params);
-    public function getDiscretizedOneHour($params);
-    public function getDiscretizedOneDay($params);
-    public function getDiscretizedOneMonth($params);
-    public function getPowerFactor($params);
-    public function getDemand($params);
-    public function getDiscretization($params);
+    public function getDiscretized5min($params, bool $typeField);
+    public function getDiscretized15min($params, bool $typeField);
+    public function getDiscretizedOneHour($params, bool $typeField);
+    public function getDiscretizedOneDay($params, bool $typeField);
+    public function getDiscretizedOneMonth($params, bool $typeField);
+    public function getDiscretization($params, $path);
 
 }
\ No newline at end of file
diff --git a/app/Repositories/Med5min/Med5minRepository.php b/app/Repositories/Med5min/Med5minRepository.php
index 34ae423..862ad12 100644
--- a/app/Repositories/Med5min/Med5minRepository.php
+++ b/app/Repositories/Med5min/Med5minRepository.php
@@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 
 
 class Med5minRepository extends AbstractRepository implements Med5minContractInterface
@@ -31,77 +32,33 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt
         return $query;
     }
 
-    public function getPowerFactor($params): Collection|array
-    {
-        $fields =
-            [
-                "med_5min.ponto",
-                "med_5min.dia_num",
-                DB::raw("SUM(med_5min.ativa_consumo) AS consumo"),
-                DB::raw("SUM(med_5min.reativa_consumo+med_5min.reativa_geracao) AS reativa"),
-                DB::raw("(SUM(med_5min.ativa_consumo)/(SUM(med_5min.ativa_consumo)^2 +SUM(med_5min.reativa_consumo+med_5min.reativa_geracao)^2))*1000 as FP"),
-                DB::raw("0.92 as F_ref")
-            ];
-
-        $params = static::filterRow($params);
-
-        return $this->execute($fields, $params)
-            ->groupBy(["med_5min.dia_num", "med_5min.ponto"])
-            ->orderBy(DB::raw("med_5min.dia_num, med_5min.ponto"))
-            ->distinct()
-            ->get();
-
-
-    }
-
-    public function getDemand($params): Collection|array
-    {
-        $fields =
-            [
-                "med_5min.ponto",
-                "med_5min.dia_num",
-                DB::raw("TO_CHAR((date('1899-12-31') + interval '1' day * med_5min.dia_num), 'DD/MM/YYYY') as day_formatted"),
-                DB::raw("(med_5min.minuto/60) AS hora"),
-                DB::raw("SUM(med_5min.ativa_consumo) AS dem_reg"),
-                DB::raw("(CASE WHEN ((med_5min.minuto/60) >= 18 AND (med_5min.minuto/60) <= 21) THEN dados_cadastrais.demanda_p ELSE dados_cadastrais.demanda_fp  END) as dem_cont")
-            ];
-
-        $params = static::filterRow($params);
-
-        return $this->execute($fields, $params)
-            ->join(
-                "dados_cadastrais",
-                "dados_cadastrais.codigo_scde",
-                "=",
-                "med_5min.ponto"
-            )
-            ->groupBy(["med_5min.ponto", "med_5min.dia_num", "day_formatted", 'hora', 'dem_cont'])
-            ->distinct()
-            ->get();
-    }
-
-
-    public function getDiscretization($params)
+    public function getDiscretization($params, $path): Collection|array
     {
         if (empty($params['type'])) {
             return abort(404, 'Error! The type field needs to be filled in.');
         }
 
+        $typeField = collect($path)->map(function($item){
+            $value = Str::of($item)->explode('/')->offsetGet(3);
+            return $value === "powerFactor" ? true : ($value === "demand"? false : null);
+        })->first();
+
         $type = $params['type'];
 
         $params = static::filterRow($params);
 
         return match ($type) {
-            '5_min' => $this->getDiscretized5min($params),
-            '15_min' => $this->getDiscretized15min($params),
-            '1_hora' => $this->getDiscretizedOneHour($params),
-            '1_dia' => $this->getDiscretizedOneDay($params),
-            '1_mes' => $this->getDiscretizedOneMonth($params)
+            '5_min' => $this->getDiscretized5min($params, $typeField),
+            '15_min' => $this->getDiscretized15min($params, $typeField),
+            '1_hora' => $this->getDiscretizedOneHour($params, $typeField),
+            '1_dia' => $this->getDiscretizedOneDay($params, $typeField),
+            '1_mes' => $this->getDiscretizedOneMonth($params, $typeField)
         };
     }
 
-    public function getDiscretized5min($params)
+    public function getDiscretized5min($params, bool $typeField = null): Collection|array
     {
+
         $fields =
             [
                 'med_5min.ponto',
@@ -113,14 +70,21 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt
                 DB::raw("SUM(med_5min.reativa_consumo+med_5min.reativa_geracao) AS reativa")
             ];
 
+        if (!is_null($typeField))
+        {
+            $fields = $this->typeField($fields, $typeField);
+        }
+
+        $groupBy = $this->groupField($typeField);
+
         return $this->execute($fields, $params)
-            ->groupBy(["med_5min.ponto", "med_5min.dia_num", "day_formatted", 'hora', 'minut'])
+            ->groupBy($groupBy)
             ->distinct()
             ->get();
 
     }
 
-    public function getDiscretized15min($params)
+    public function getDiscretized15min($params, $typeField = null)
     {
         $fields =
             [
@@ -133,13 +97,20 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt
                 DB::raw("SUM(med_5min.reativa_consumo+med_5min.reativa_geracao) AS reativa")
             ];
 
+        if (!is_null($typeField))
+        {
+            $fields = $this->typeField($fields, $typeField);
+        }
+
+        $groupBy = $this->groupField($typeField);
+
         return $this->execute($fields, $params)
-            ->groupBy(["med_5min.ponto", "med_5min.dia_num", "day_formatted", 'hora', 'minut'])
+            ->groupBy($groupBy)
             ->distinct()
             ->get();
     }
 
-    public function getDiscretizedOneHour($params)
+    public function getDiscretizedOneHour($params, $typeField = null, string $type = '1_hora'): Collection|array
     {
         $fields =
             [
@@ -149,15 +120,22 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt
                 DB::raw("(med_5min.minuto/60) AS hora"),
                 DB::raw("SUM(med_5min.ativa_consumo) AS consumo"),
                 DB::raw("SUM(med_5min.reativa_consumo+med_5min.reativa_geracao) AS reativa")
-            ];;
+            ];
+
+        if (!is_null($typeField))
+        {
+            $fields = $this->typeField($fields, $typeField);
+        }
+
+        $groupBy = $this->groupField($typeField, $type);
 
         return $this->execute($fields, $params)
-            ->groupBy(["med_5min.ponto", "med_5min.dia_num", "day_formatted", 'hora'])
+            ->groupBy($groupBy)
             ->distinct()
             ->get();
     }
 
-    public function getDiscretizedOneDay($params)
+    public function getDiscretizedOneDay($params, $typeField = null, string $type = '1_dia'): Collection|array
     {
         $fields =
             [
@@ -168,17 +146,25 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt
                 DB::raw("SUM(med_5min.reativa_consumo+med_5min.reativa_geracao) AS reativa")
             ];
 
+        if (!is_null($typeField))
+        {
+            $fields = $this->typeField($fields, $typeField);
+        }
+
+        $groupBy = $this->groupField($typeField, $type);
+
         return $this->execute($fields, $params)
-            ->groupBy(["med_5min.ponto", "med_5min.dia_num", "day_formatted"])
+            ->groupBy($groupBy)
             ->distinct()
             ->get();
     }
 
-    public function getDiscretizedOneMonth($params): Collection|array
+    public function getDiscretizedOneMonth($params, $typeField = null, string $type = '1_mes'): Collection|array
     {
         $fields =
             [
                 'med_5min.ponto',
+                'med_5min.dia_num',
                 DB::raw("(
                     med_5min.dia_num::INTEGER - extract(day from (
                         (date('1899-12-30') + interval '1' day * med_5min.dia_num)
@@ -193,14 +179,20 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt
                         )
                     ))
 	            ) as dia_data"),
-                DB::raw("1 as hora"),
-                DB::raw("1 as minuto"),
+                DB::raw("TO_CHAR((date('1899-12-31') + interval '1' day * med_5min.dia_num), 'DD/MM/YYYY') as day_formatted"),
                 DB::raw("SUM(med_5min.ativa_consumo) As consumo"),
                 DB::raw("SUM(med_5min.reativa_consumo+med_5min.reativa_geracao) As reativa")
             ];
 
+        if (!is_null($typeField))
+        {
+            $fields = $this->typeField($fields, $typeField);
+        }
+
+        $groupBy = $this->groupField($typeField, $type);
+
         return $this->execute($fields, $params)
-            ->groupBy(["med_5min.dia_num", "med_5min.ponto"])
+            ->groupBy($groupBy)
             ->orderBy(DB::raw("med_5min.dia_num, med_5min.ponto"))
             ->get();
 
@@ -219,4 +211,56 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt
         return $arr;
     }
 
+    private function typeField(array $fields, bool $typeField): array
+    {
+
+        return collect($fields)->when($typeField, function ($collection, $value){
+
+            $field =
+                [
+                    DB::raw("(SUM(med_5min.ativa_consumo)/(SUM(med_5min.ativa_consumo)^2 +SUM(med_5min.reativa_consumo+med_5min.reativa_geracao)^2))*1000 as FP"),
+                    DB::raw("0.92 as F_ref")
+                ];
+
+            return $collection->merge($field);
+
+        }, function ($collection, $value){
+
+            $field =
+                [
+                    DB::raw("SUM(med_5min.ativa_consumo) AS dem_reg"),
+                    DB::raw("(CASE WHEN ((med_5min.minuto/60) >= 18 AND (med_5min.minuto/60) <= 21) THEN dados_cadastrais.demanda_p ELSE dados_cadastrais.demanda_fp  END) as dem_cont")
+                ];
+
+            return $collection->merge($field);
+
+        })->all();
+
+    }
+
+    public function groupField($typeField, $type = null): array
+    {
+        $fields = ["med_5min.ponto", "med_5min.dia_num", "day_formatted", 'hora', 'minut'];
+
+        if ($type === '1_hora')
+        {
+            array_splice($fields, 4);
+        }
+
+        if ($type === '1_dia' || $type === '1_mes')
+        {
+            array_splice($fields, 3);
+        }
+
+        if ($typeField === false)
+        {
+            $item = ['dem_cont'];
+            return collect($fields)->merge($item)->all();
+        }
+
+        return $fields;
+    }
+
+
+
 }
diff --git a/routes/api.php b/routes/api.php
index 33f2e6b..67a7857 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -67,8 +67,8 @@ Route::middleware(['auth:sanctum', 'ability:Client'])->group(function () {
     Route::post('economy/estimates', [\App\Http\Controllers\EconomyController::class, 'captiveMonthlyEconomy']);
     Route::post('economy/MWh', [\App\Http\Controllers\EconomyController::class, 'costMWhEconomy']);
 
-    Route::post('telemetry/powerFactor', [\App\Http\Controllers\TelemetryController::class, 'powerFactor']);
-    Route::post('telemetry/demand', [\App\Http\Controllers\TelemetryController::class, 'demand']);
+    Route::post('telemetry/powerFactor', [\App\Http\Controllers\TelemetryController::class, 'discretization']);
+    Route::post('telemetry/demand', [\App\Http\Controllers\TelemetryController::class, 'discretization']);
     Route::post('telemetry/discretization', [\App\Http\Controllers\TelemetryController::class, 'discretization']);
 
     Route::post('operation/summary', [\App\Http\Controllers\OperationSummaryController::class, 'operationSummary']); // Resumo Operações