diff --git a/config/tables.php b/config/tables.php
index 5f533c6a..7ec1c193 100644
--- a/config/tables.php
+++ b/config/tables.php
@@ -1,7 +1,7 @@
 <?php
 
-use LaravelEnso\Filters\Enums\ComparisonOperators;
-use LaravelEnso\Filters\Enums\SearchModes;
+use LaravelEnso\Filters\Enums\ComparisonOperator;
+use LaravelEnso\Filters\Enums\SearchMode;
 
 return [
     /*
@@ -288,10 +288,10 @@
     |--------------------------------------------------------------------------
     | The comparison operator will be the default used for every table. Can be
     | customized for each table. Possible values:
-    | ComparisonOperators::Like, ComparisonOperators::ILike
+    | ComparisonOperator::Like, ComparisonOperator::ILike
     */
 
-    'comparisonOperator' => ComparisonOperators::Like,
+    'comparisonOperator' => ComparisonOperator::Like->value,
 
     /*
     |--------------------------------------------------------------------------
@@ -299,13 +299,13 @@
     |--------------------------------------------------------------------------
     | Global allowed search modes that can be customized for each table.
     | Possible values:
-    | SearchModes::Full', SearchModes::StartsWith, SearchModes::EndsWith
+    | SearchMode::Full', SearchMode::StartsWith, SearchMode::EndsWith
     */
 
     'searchModes' => [
-        SearchModes::Full, SearchModes::StartsWith, SearchModes::EndsWith,
-        SearchModes::ExactMatch, SearchModes::DoesntContain,
-        // SearchModes::Algolia,
+        SearchMode::Full->value, SearchMode::StartsWith->value, SearchMode::EndsWith->value,
+        SearchMode::ExactMatch->value, SearchMode::DoesntContain->value,
+        // SearchMode::Algolia->value,
     ],
 
     /*
@@ -314,10 +314,10 @@
     |--------------------------------------------------------------------------
     | Controls the default way in which wildcards are used in the query.
     | Can be customized for each table. Possible values:
-    | SearchModes::Full', SearchModes::StartsWith, SearchModes::EndsWith
+    | SearchMode::Full', SearchMode::StartsWith, SearchMode::EndsWith
     */
 
-    'searchMode' => SearchModes::Full,
+    'searchMode' => SearchMode::Full->value,
 
     /*
     |--------------------------------------------------------------------------
diff --git a/src/Exports/EnsoExcel.php b/src/Exports/EnsoExcel.php
index fbdd2932..b2ae89ec 100644
--- a/src/Exports/EnsoExcel.php
+++ b/src/Exports/EnsoExcel.php
@@ -5,7 +5,7 @@
 use Illuminate\Foundation\Auth\User;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config as ConfigFacade;
-use LaravelEnso\DataExport\Enums\Statuses;
+use LaravelEnso\DataExport\Enums\Status;
 use LaravelEnso\DataExport\Models\Export;
 use LaravelEnso\DataExport\Notifications\ExportDone;
 use LaravelEnso\Files\Models\File;
@@ -27,7 +27,7 @@ protected function process(): void
         App::setLocale($this->user->preferences()->global->lang);
 
         $this->export->update([
-            'status' => Statuses::Processing,
+            'status' => Status::Processing->value,
             'total'  => $this->count,
         ]);
 
@@ -53,7 +53,7 @@ protected function finalize(): void
 
         $file = File::attach(...$args);
 
-        $this->export->fill(['status' => Statuses::Finalized])
+        $this->export->fill(['status' => Status::Finalized->value])
             ->file()->associate($file)
             ->save();
 
@@ -64,7 +64,7 @@ protected function finalize(): void
 
     protected function notifyError(): void
     {
-        $this->export->update(['status' => Statuses::Failed]);
+        $this->export->update(['status' => Status::Failed->value]);
 
         parent::notifyError();
     }
diff --git a/src/Exports/Prepare.php b/src/Exports/Prepare.php
index 04ee1e90..79fe7d5b 100644
--- a/src/Exports/Prepare.php
+++ b/src/Exports/Prepare.php
@@ -3,7 +3,7 @@
 namespace LaravelEnso\Tables\Exports;
 
 use Illuminate\Foundation\Auth\User;
-use LaravelEnso\DataExport\Enums\Statuses;
+use LaravelEnso\DataExport\Enums\Status;
 use LaravelEnso\DataExport\Models\Export;
 use LaravelEnso\Tables\Jobs\EnsoExcel;
 use LaravelEnso\Tables\Jobs\Excel;
@@ -34,7 +34,7 @@ protected function export(): Export
     {
         return Export::factory()->create([
             'name'   => $this->config->name(),
-            'status' => Statuses::Waiting,
+            'status' => Status::Waiting->value,
         ]);
     }
 }
diff --git a/src/Services/Template/Validators/Structure/Attributes.php b/src/Services/Template/Validators/Structure/Attributes.php
index b5ad3bb6..c20498d2 100644
--- a/src/Services/Template/Validators/Structure/Attributes.php
+++ b/src/Services/Template/Validators/Structure/Attributes.php
@@ -3,7 +3,7 @@
 namespace LaravelEnso\Tables\Services\Template\Validators\Structure;
 
 use Illuminate\Support\Str;
-use LaravelEnso\Filters\Enums\ComparisonOperators;
+use LaravelEnso\Filters\Enums\ComparisonOperator;
 use LaravelEnso\Helpers\Services\Obj;
 use LaravelEnso\Tables\Exceptions\Template as Exception;
 
@@ -114,8 +114,8 @@ private function selectable()
     private function comparisonOperator()
     {
         $invalid = $this->template->has('comparisonOperator')
-            && $this->template->get('comparisonOperator') !== ComparisonOperators::Like
-            && $this->template->get('comparisonOperator') !== ComparisonOperators::ILike;
+            && $this->template->get('comparisonOperator') !== ComparisonOperator::Like->value
+            && $this->template->get('comparisonOperator') !== ComparisonOperator::ILike->value;
 
         if ($invalid) {
             throw Exception::invalidComparisonOperator();
diff --git a/tests/units/Services/Template/Validators/AttributesTest.php b/tests/units/Services/Template/Validators/AttributesTest.php
index a2c22a64..84c3831d 100644
--- a/tests/units/Services/Template/Validators/AttributesTest.php
+++ b/tests/units/Services/Template/Validators/AttributesTest.php
@@ -2,7 +2,7 @@
 
 namespace LaravelEnso\Tables\Tests\units\Services\Template\Validators;
 
-use LaravelEnso\Filters\Enums\ComparisonOperators;
+use LaravelEnso\Filters\Enums\ComparisonOperator;
 use LaravelEnso\Helpers\Services\Obj;
 use LaravelEnso\Tables\Exceptions\Template as Exception;
 use LaravelEnso\Tables\Services\Template\Validators\Structure\Attributes;
@@ -71,7 +71,7 @@ public function cannot_validate_with_non_boolean_selectable()
     /** @test */
     public function cannot_validate_with_invalid_comparison_operator()
     {
-        $this->template->set('comparisonOperator', ComparisonOperators::Equal);
+        $this->template->set('comparisonOperator', ComparisonOperator::Equal->value);
 
         $this->expectException(Exception::class);