diff --git a/app/Concerns/GraphQL/ResolvesArguments.php b/app/Concerns/GraphQL/ResolvesArguments.php
index dd38cfa31..cfe2f2bbb 100644
--- a/app/Concerns/GraphQL/ResolvesArguments.php
+++ b/app/Concerns/GraphQL/ResolvesArguments.php
@@ -24,7 +24,7 @@ trait ResolvesArguments
      *
      * @param  Argument[]  $arguments
      */
-    public function buildArguments(array $arguments): string
+    protected function buildArguments(array $arguments): string
     {
         if (blank($arguments)) {
             return '';
@@ -44,7 +44,7 @@ trait ResolvesArguments
      * @param  Field[]  $fields
      * @return Argument[]
      */
-    public function resolveFilterArguments(array $fields): array
+    protected function resolveFilterArguments(array $fields): array
     {
         return collect($fields)
             ->filter(fn (Field $field) => $field instanceof FilterableField)
@@ -63,7 +63,7 @@ trait ResolvesArguments
      * @param  Field[]  $fields
      * @return Argument[]
      */
-    public function resolveSortArguments(array $fields): array
+    protected function resolveSortArguments(array $fields): array
     {
         $columns = collect($fields)
             ->filter(fn (Field $field) => $field instanceof SortableField)
@@ -75,16 +75,12 @@ trait ResolvesArguments
             ->toArray();
 
         return [
-            new Argument(
-                'sort',
-                '[SortInput!]',
-                false,
-                [
+            new Argument('sort', '[SortInput!]')
+                ->directives([
                     'sortCustom' => [
                         'columns' => json_encode($columns),
                     ],
-                ],
-            ),
+                ]),
         ];
     }
 
@@ -94,15 +90,17 @@ trait ResolvesArguments
      * @param  Field[]  $fields
      * @return Argument[]
      */
-    public function resolveCreateMutationArguments(array $fields): array
+    protected function resolveCreateMutationArguments(array $fields): array
     {
         return collect($fields)
             ->filter(fn (Field $field) => $field instanceof CreatableField)
-            ->map(fn (Field $field) => new Argument(
-                $field->getColumn(),
-                $field->type(),
-                $field instanceof RequiredOnCreation,
-            ))
+            ->map(
+                fn (Field $field) => new Argument(
+                    $field->getColumn(),
+                    $field->type()
+                )
+                    ->required($field instanceof RequiredOnCreation)
+            )
             ->flatten()
             ->toArray();
     }
@@ -113,15 +111,17 @@ trait ResolvesArguments
      * @param  Field[]  $fields
      * @return Argument[]
      */
-    public function resolveUpdateMutationArguments(array $fields): array
+    protected function resolveUpdateMutationArguments(array $fields): array
     {
         return collect($fields)
             ->filter(fn (Field $field) => $field instanceof UpdatableField)
-            ->map(fn (Field $field) => new Argument(
-                $field->getColumn(),
-                $field->type(),
-                $field instanceof RequiredOnUpdate,
-            ))
+            ->map(
+                fn (Field $field) => new Argument(
+                    $field->getColumn(),
+                    $field->type()
+                )
+                    ->required($field instanceof RequiredOnUpdate)
+            )
             ->flatten()
             ->toArray();
     }
@@ -132,21 +132,20 @@ trait ResolvesArguments
      * @param  Field[]  $fields
      * @return Argument[]
      */
-    public function resolveBindArguments(array $fields, bool $shouldRequire = true): array
+    protected function resolveBindArguments(array $fields, bool $shouldRequire = true): array
     {
         return collect($fields)
             ->filter(fn (Field $field) => $field instanceof BindableField)
-            ->map(fn (Field&BindableField $field) => new Argument(
-                $field->getName(),
-                $field->type(),
-                $shouldRequire,
-                [
-                    'bind' => [
-                        'class' => $field->bindTo(),
-                        'column' => $field->bindUsingColumn(),
-                    ],
-                ],
-            ))
+            ->map(
+                fn (Field&BindableField $field) => new Argument($field->getName(), $field->type())
+                    ->required($shouldRequire)
+                    ->directives([
+                        'bind' => [
+                            'class' => $field->bindTo(),
+                            'column' => $field->bindUsingColumn(),
+                        ],
+                    ])
+            )
             ->toArray();
     }
 }
diff --git a/app/Concerns/GraphQL/ResolvesDirectives.php b/app/Concerns/GraphQL/ResolvesDirectives.php
index b318bd8fa..099fb39d4 100644
--- a/app/Concerns/GraphQL/ResolvesDirectives.php
+++ b/app/Concerns/GraphQL/ResolvesDirectives.php
@@ -11,7 +11,7 @@ trait ResolvesDirectives
      *
      * @param  array<string, array<string, mixed>>  $directives
      */
-    public function resolveDirectives(array $directives): string
+    protected function resolveDirectives(array $directives): string
     {
         return collect($directives)
             ->map(function ($args, $directive) {
diff --git a/app/Enums/GraphQL/SortDirection.php b/app/Enums/GraphQL/SortDirection.php
index 401a7b128..83a508dc1 100644
--- a/app/Enums/GraphQL/SortDirection.php
+++ b/app/Enums/GraphQL/SortDirection.php
@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace App\Enums\GraphQL;
 
-enum SortDirection: int
+enum SortDirection: string
 {
-    case ASC = 0;
-    case DESC = 1;
+    case ASC = 'asc';
+    case DESC = 'desc';
 }
diff --git a/app/GraphQL/Builders/Admin/FeaturedThemeBuilder.php b/app/GraphQL/Builders/Admin/FeaturedThemeBuilder.php
index 4fd845983..80cf32d9b 100644
--- a/app/GraphQL/Builders/Admin/FeaturedThemeBuilder.php
+++ b/app/GraphQL/Builders/Admin/FeaturedThemeBuilder.php
@@ -35,9 +35,10 @@ class FeaturedThemeBuilder
      */
     public function current(Builder $builder, mixed $value, mixed $root, array $args, GraphQLContext $context, ResolveInfo $resolveInfo): Builder
     {
-        return $builder->whereNotNull(FeaturedTheme::ATTRIBUTE_START_AT)
-            ->whereNotNull(FeaturedTheme::ATTRIBUTE_END_AT)
-            ->whereDate(FeaturedTheme::ATTRIBUTE_START_AT, ComparisonOperator::LTE->value, Date::now())
-            ->whereDate(FeaturedTheme::ATTRIBUTE_END_AT, ComparisonOperator::GT->value, Date::now());
+        return $builder
+            ->whereValueBetween(Date::now(), [
+                FeaturedTheme::ATTRIBUTE_START_AT,
+                FeaturedTheme::ATTRIBUTE_END_AT,
+            ]);
     }
 }
diff --git a/app/GraphQL/Builders/List/Playlist/PlaylistTrackBuilder.php b/app/GraphQL/Builders/List/Playlist/PlaylistTrackBuilder.php
index ec0ecc42d..9681baa94 100644
--- a/app/GraphQL/Builders/List/Playlist/PlaylistTrackBuilder.php
+++ b/app/GraphQL/Builders/List/Playlist/PlaylistTrackBuilder.php
@@ -17,7 +17,7 @@ class PlaylistTrackBuilder
      * Apply the query builder to the index query.
      *
      * @param  Builder<PlaylistTrack>  $builder
-     * @param  array  $args
+     * @param  array<string, mixed>  $args
      * @return Builder<PlaylistTrack>
      */
     public function index(Builder $builder, mixed $value, mixed $root, array $args, GraphQLContext $context, ResolveInfo $resolveInfo): Builder
@@ -29,4 +29,25 @@ class PlaylistTrackBuilder
 
         return $builder;
     }
+
+    /**
+     * Apply the query builder to the index query.
+     *
+     * @param  Builder<PlaylistTrack>  $builder
+     * @param  array<string, mixed>  $args
+     * @return Builder<PlaylistTrack>
+     */
+    public function show(Builder $builder, mixed $value, mixed $root, array $args, GraphQLContext $context, ResolveInfo $resolveInfo): Builder
+    {
+        /** @var Playlist $playlist */
+        $playlist = Arr::get($args, 'playlist');
+
+        /** @var PlaylistTrack $track */
+        $track = Arr::get($args, 'id');
+
+        $builder->where(PlaylistTrack::ATTRIBUTE_PLAYLIST, $playlist->getKey());
+        $builder->whereKey($track->getKey());
+
+        return $builder;
+    }
 }
diff --git a/app/GraphQL/Controllers/List/Playlist/PlaylistTrackController.php b/app/GraphQL/Controllers/List/Playlist/PlaylistTrackController.php
index dd37cbafe..da8280429 100644
--- a/app/GraphQL/Controllers/List/Playlist/PlaylistTrackController.php
+++ b/app/GraphQL/Controllers/List/Playlist/PlaylistTrackController.php
@@ -8,8 +8,8 @@ use App\Actions\Http\Api\List\Playlist\Track\DestroyTrackAction;
 use App\Actions\Http\Api\List\Playlist\Track\StoreTrackAction;
 use App\Actions\Http\Api\List\Playlist\Track\UpdateTrackAction;
 use App\GraphQL\Controllers\BaseController;
-use App\GraphQL\Definition\Mutations\Rest\List\Playlist\Track\CreatePlaylistTrackMutation;
-use App\GraphQL\Definition\Mutations\Rest\List\Playlist\Track\UpdatePlaylistTrackMutation;
+use App\GraphQL\Definition\Mutations\Models\List\Playlist\Track\CreatePlaylistTrackMutation;
+use App\GraphQL\Definition\Mutations\Models\List\Playlist\Track\UpdatePlaylistTrackMutation;
 use App\Models\List\Playlist;
 use App\Models\List\Playlist\PlaylistTrack;
 use Illuminate\Http\JsonResponse;
@@ -27,10 +27,10 @@ class PlaylistTrackController extends BaseController
     /**
      * Store a newly created resource.
      *
-     * @param  null  $_
+     * @param  null  $root
      * @param  array  $args
      */
-    public function store($_, array $args): PlaylistTrack
+    public function store($root, array $args): PlaylistTrack
     {
         $validated = $this->validated($args, CreatePlaylistTrackMutation::class);
 
@@ -47,10 +47,10 @@ class PlaylistTrackController extends BaseController
     /**
      * Update the specified resource.
      *
-     * @param  null  $_
+     * @param  null  $root
      * @param  array  $args
      */
-    public function update($_, array $args): PlaylistTrack
+    public function update($root, array $args): PlaylistTrack
     {
         $validated = $this->validated($args, UpdatePlaylistTrackMutation::class);
 
@@ -67,10 +67,10 @@ class PlaylistTrackController extends BaseController
     /**
      * Remove the specified resource.
      *
-     * @param  null  $_
+     * @param  null  $root
      * @param  array  $args
      */
-    public function destroy($_, array $args): JsonResponse
+    public function destroy($root, array $args): JsonResponse
     {
         /** @var PlaylistTrack $track */
         $track = Arr::get($args, self::ROUTE_SLUG);
diff --git a/app/GraphQL/Controllers/List/PlaylistController.php b/app/GraphQL/Controllers/List/PlaylistController.php
index 72f84b176..fe206838f 100644
--- a/app/GraphQL/Controllers/List/PlaylistController.php
+++ b/app/GraphQL/Controllers/List/PlaylistController.php
@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace App\GraphQL\Controllers\List;
 
 use App\GraphQL\Controllers\BaseController;
-use App\GraphQL\Definition\Mutations\Rest\List\Playlist\CreatePlaylistMutation;
-use App\GraphQL\Definition\Mutations\Rest\List\Playlist\UpdatePlaylistMutation;
+use App\GraphQL\Definition\Mutations\Models\List\Playlist\CreatePlaylistMutation;
+use App\GraphQL\Definition\Mutations\Models\List\Playlist\UpdatePlaylistMutation;
 use App\Models\List\Playlist;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Arr;
@@ -24,10 +24,10 @@ class PlaylistController extends BaseController
     /**
      * Store a newly created resource.
      *
-     * @param  null  $_
+     * @param  null  $root
      * @param  array  $args
      */
-    public function store($_, array $args): Playlist
+    public function store($root, array $args): Playlist
     {
         $validated = $this->validated($args, CreatePlaylistMutation::class);
 
@@ -44,10 +44,10 @@ class PlaylistController extends BaseController
     /**
      * Update the specified resource.
      *
-     * @param  null  $_
+     * @param  null  $root
      * @param  array  $args
      */
-    public function update($_, array $args): Playlist
+    public function update($root, array $args): Playlist
     {
         /** @var Playlist $playlist */
         $playlist = Arr::pull($args, self::ROUTE_SLUG);
@@ -62,10 +62,10 @@ class PlaylistController extends BaseController
     /**
      * Remove the specified resource.
      *
-     * @param  null  $_
+     * @param  null  $root
      * @param  array  $args
      */
-    public function destroy($_, array $args): JsonResponse
+    public function destroy($root, array $args): JsonResponse
     {
         /** @var Playlist $playlist */
         $playlist = Arr::get($args, self::ROUTE_SLUG);
diff --git a/app/GraphQL/Controllers/List/SyncExternalProfileController.php b/app/GraphQL/Controllers/List/SyncExternalProfileController.php
index 76548c2ec..55f9c6398 100644
--- a/app/GraphQL/Controllers/List/SyncExternalProfileController.php
+++ b/app/GraphQL/Controllers/List/SyncExternalProfileController.php
@@ -16,10 +16,10 @@ class SyncExternalProfileController extends BaseController
     /**
      * Start a new sync job.
      *
-     * @param  null  $_
+     * @param  null  $root
      * @param  array  $args
      */
-    public function store($_, array $args): JsonResponse
+    public function store($root, array $args): JsonResponse
     {
         /** @var ExternalProfile $profile */
         $profile = Arr::pull($args, self::ROUTE_SLUG);
@@ -30,7 +30,7 @@ class SyncExternalProfileController extends BaseController
             ], 403);
         }
 
-        $profile->startSyncJob();
+        $profile->dispatchSyncJob();
 
         return new JsonResponse([
             'message' => 'Job dispatched.',
diff --git a/app/GraphQL/Controllers/User/LikeController.php b/app/GraphQL/Controllers/User/LikeController.php
index dbfe25c18..94178b13e 100644
--- a/app/GraphQL/Controllers/User/LikeController.php
+++ b/app/GraphQL/Controllers/User/LikeController.php
@@ -4,13 +4,13 @@ declare(strict_types=1);
 
 namespace App\GraphQL\Controllers\User;
 
+use App\Exceptions\GraphQL\ClientValidationException;
 use App\GraphQL\Controllers\BaseController;
-use App\GraphQL\Definition\Mutations\User\LikeMutation;
-use App\GraphQL\Definition\Mutations\User\UnlikeMutation;
+use App\GraphQL\Definition\Mutations\Models\User\LikeMutation;
+use App\GraphQL\Definition\Mutations\Models\User\UnlikeMutation;
 use App\Models\List\Playlist;
 use App\Models\User\Like;
 use App\Models\Wiki\Video;
-use Exception;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 
@@ -27,12 +27,12 @@ class LikeController extends BaseController
     /**
      * Store a newly created resource.
      *
-     * @param  null  $_
+     * @param  null  $root
      * @param  array  $args
      *
-     * @throws Exception
+     * @throws ClientValidationException
      */
-    public function store($_, array $args): Model
+    public function store($root, array $args): Model
     {
         $validated = $this->validated($args, LikeMutation::class);
 
@@ -51,18 +51,18 @@ class LikeController extends BaseController
             return $video;
         }
 
-        throw new Exception('None models detected to like.');
+        throw new ClientValidationException('One resource is required to like.');
     }
 
     /**
      * Remove the specified resource.
      *
-     * @param  null  $_
+     * @param  null  $root
      * @param  array  $args
      *
-     * @throws Exception
+     * @throws ClientValidationException
      */
-    public function destroy($_, array $args): Model
+    public function destroy($root, array $args): Model
     {
         $validated = $this->validated($args, UnlikeMutation::class);
 
@@ -81,6 +81,6 @@ class LikeController extends BaseController
             return $video;
         }
 
-        throw new Exception('None models detected to unlike.');
+        throw new ClientValidationException('One resource is required to unlike.');
     }
 }
diff --git a/app/GraphQL/Definition/Argument/Argument.php b/app/GraphQL/Definition/Argument/Argument.php
index 5a3eac9c2..8278e1440 100644
--- a/app/GraphQL/Definition/Argument/Argument.php
+++ b/app/GraphQL/Definition/Argument/Argument.php
@@ -9,24 +9,48 @@ use GraphQL\Type\Definition\Type;
 use Illuminate\Support\Str;
 use Stringable;
 
-readonly class Argument implements Stringable
+class Argument implements Stringable
 {
     use ResolvesDirectives;
 
+    protected bool $required = false;
+
     /**
-     * @param  array<string, array>  $directives
+     * @var array<string, array>
      */
+    protected array $directives = [];
+
     public function __construct(
         public string $name,
         public Type|string $returnType,
-        public bool $required,
-        public array $directives = [],
     ) {}
 
+    /**
+     * Mark the argument as required.
+     */
+    public function required(bool $condition = true): static
+    {
+        $this->required = $condition;
+
+        return $this;
+    }
+
+    /**
+     * Set the directives of the argument.
+     *
+     * @param  array<string, array>  $directives
+     */
+    public function directives(array $directives = []): static
+    {
+        $this->directives = $directives;
+
+        return $this;
+    }
+
     /**
      * Get the resolved directives as a string.
      */
-    public function getResolvedDirectives(): string
+    protected function getResolvedDirectives(): string
     {
         return $this->resolveDirectives($this->directives);
     }
diff --git a/app/GraphQL/Definition/Directives/Filters/EqFilterDirective.php b/app/GraphQL/Definition/Directives/Filters/EqFilterDirective.php
index 3ee91043a..b404b9386 100644
--- a/app/GraphQL/Definition/Directives/Filters/EqFilterDirective.php
+++ b/app/GraphQL/Definition/Directives/Filters/EqFilterDirective.php
@@ -13,15 +13,11 @@ class EqFilterDirective extends FilterDirective
      */
     public function argument(): Argument
     {
-        return new Argument(
-            $this->field->getName(),
-            $this->type,
-            false,
-            [
+        return new Argument($this->field->getName(), $this->type)
+            ->directives([
                 'eq' => [
                     'key' => $this->field->getColumn(),
                 ],
-            ],
-        );
+            ], );
     }
 }
diff --git a/app/GraphQL/Definition/Directives/Filters/GreaterFilterDirective.php b/app/GraphQL/Definition/Directives/Filters/GreaterFilterDirective.php
index 957b50ed7..7ae8bbdce 100644
--- a/app/GraphQL/Definition/Directives/Filters/GreaterFilterDirective.php
+++ b/app/GraphQL/Definition/Directives/Filters/GreaterFilterDirective.php
@@ -14,16 +14,12 @@ class GreaterFilterDirective extends FilterDirective
      */
     public function argument(): Argument
     {
-        return new Argument(
-            $this->field->getName().'_greater',
-            $this->type,
-            false,
-            [
+        return new Argument($this->field->getName().'_greater', $this->type)
+            ->directives([
                 'where' => [
                     'operator' => ComparisonOperator::GT->value,
                     'key' => $this->field->getColumn(),
                 ],
-            ],
-        );
+            ]);
     }
 }
diff --git a/app/GraphQL/Definition/Directives/Filters/InFilterDirective.php b/app/GraphQL/Definition/Directives/Filters/InFilterDirective.php
index b4e5c3cf3..8aaf00f3d 100644
--- a/app/GraphQL/Definition/Directives/Filters/InFilterDirective.php
+++ b/app/GraphQL/Definition/Directives/Filters/InFilterDirective.php
@@ -14,15 +14,11 @@ class InFilterDirective extends FilterDirective
      */
     public function argument(): Argument
     {
-        return new Argument(
-            $this->field->getName().'_in',
-            Type::listOf($this->type),
-            false,
-            [
+        return new Argument($this->field->getName().'_in', Type::listOf($this->type))
+            ->directives([
                 'in' => [
                     'key' => $this->field->getColumn(),
                 ],
-            ],
-        );
+            ]);
     }
 }
diff --git a/app/GraphQL/Definition/Directives/Filters/LesserFilterDirective.php b/app/GraphQL/Definition/Directives/Filters/LesserFilterDirective.php
index 14638d66d..8cd2030c9 100644
--- a/app/GraphQL/Definition/Directives/Filters/LesserFilterDirective.php
+++ b/app/GraphQL/Definition/Directives/Filters/LesserFilterDirective.php
@@ -14,16 +14,12 @@ class LesserFilterDirective extends FilterDirective
      */
     public function argument(): Argument
     {
-        return new Argument(
-            $this->field->getName().'_lesser',
-            $this->type,
-            false,
-            [
+        return new Argument($this->field->getName().'_lesser', $this->type)
+            ->directives([
                 'where' => [
                     'operator' => ComparisonOperator::LT->value,
                     'key' => $this->field->getColumn(),
                 ],
-            ],
-        );
+            ]);
     }
 }
diff --git a/app/GraphQL/Definition/Directives/Filters/LikeFilterDirective.php b/app/GraphQL/Definition/Directives/Filters/LikeFilterDirective.php
index 6871f887e..72f936af8 100644
--- a/app/GraphQL/Definition/Directives/Filters/LikeFilterDirective.php
+++ b/app/GraphQL/Definition/Directives/Filters/LikeFilterDirective.php
@@ -14,16 +14,12 @@ class LikeFilterDirective extends FilterDirective
      */
     public function argument(): Argument
     {
-        return new Argument(
-            $this->field->getName().'_like',
-            $this->type,
-            false,
-            [
+        return new Argument($this->field->getName().'_like', $this->type)
+            ->directives([
                 'where' => [
                     'operator' => ComparisonOperator::LIKE->value,
                     'key' => $this->field->getColumn(),
                 ],
-            ],
-        );
+            ]);
     }
 }
diff --git a/app/GraphQL/Definition/Directives/Filters/NotInFilterDirective.php b/app/GraphQL/Definition/Directives/Filters/NotInFilterDirective.php
index ef22b7efa..400668a65 100644
--- a/app/GraphQL/Definition/Directives/Filters/NotInFilterDirective.php
+++ b/app/GraphQL/Definition/Directives/Filters/NotInFilterDirective.php
@@ -14,15 +14,11 @@ class NotInFilterDirective extends FilterDirective
      */
     public function argument(): Argument
     {
-        return new Argument(
-            $this->field->getName().'_not_in',
-            Type::listOf($this->type),
-            false,
-            [
+        return new Argument($this->field->getName().'_not_in', Type::listOf($this->type))
+            ->directives([
                 'notIn' => [
                     'key' => $this->field->getColumn(),
                 ],
-            ],
-        );
+            ]);
     }
 }
diff --git a/app/GraphQL/Definition/Mutations/Rest/CreateMutation.php b/app/GraphQL/Definition/Mutations/Models/CreateMutation.php
similarity index 98%
rename from app/GraphQL/Definition/Mutations/Rest/CreateMutation.php
rename to app/GraphQL/Definition/Mutations/Models/CreateMutation.php
index 724a7cbd5..30beacbc8 100644
--- a/app/GraphQL/Definition/Mutations/Rest/CreateMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/CreateMutation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\Rest;
+namespace App\GraphQL\Definition\Mutations\Models;
 
 use App\Contracts\GraphQL\Fields\BindableField;
 use App\Contracts\GraphQL\Fields\CreatableField;
diff --git a/app/GraphQL/Definition/Mutations/Rest/DeleteMutation.php b/app/GraphQL/Definition/Mutations/Models/DeleteMutation.php
similarity index 96%
rename from app/GraphQL/Definition/Mutations/Rest/DeleteMutation.php
rename to app/GraphQL/Definition/Mutations/Models/DeleteMutation.php
index 32de7c7a2..99349e0ec 100644
--- a/app/GraphQL/Definition/Mutations/Rest/DeleteMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/DeleteMutation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\Rest;
+namespace App\GraphQL\Definition\Mutations\Models;
 
 use App\Contracts\GraphQL\HasFields;
 use App\GraphQL\Definition\Argument\Argument;
diff --git a/app/GraphQL/Definition/Mutations/List/SyncExternalProfileMutation.php b/app/GraphQL/Definition/Mutations/Models/List/ExternalProfile/SyncExternalProfileMutation.php
similarity index 97%
rename from app/GraphQL/Definition/Mutations/List/SyncExternalProfileMutation.php
rename to app/GraphQL/Definition/Mutations/Models/List/ExternalProfile/SyncExternalProfileMutation.php
index b38971cab..808e6ea75 100644
--- a/app/GraphQL/Definition/Mutations/List/SyncExternalProfileMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/List/ExternalProfile/SyncExternalProfileMutation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\List;
+namespace App\GraphQL\Definition\Mutations\Models\List\ExternalProfile;
 
 use App\Contracts\GraphQL\Fields\BindableField;
 use App\Features\AllowExternalProfileManagement;
diff --git a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/CreatePlaylistMutation.php b/app/GraphQL/Definition/Mutations/Models/List/Playlist/CreatePlaylistMutation.php
similarity index 85%
rename from app/GraphQL/Definition/Mutations/Rest/List/Playlist/CreatePlaylistMutation.php
rename to app/GraphQL/Definition/Mutations/Models/List/Playlist/CreatePlaylistMutation.php
index 405983fdb..39795adf9 100644
--- a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/CreatePlaylistMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/List/Playlist/CreatePlaylistMutation.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\Rest\List\Playlist;
+namespace App\GraphQL\Definition\Mutations\Models\List\Playlist;
 
 use App\GraphQL\Attributes\Resolvers\UseFieldDirective;
 use App\GraphQL\Controllers\List\PlaylistController;
-use App\GraphQL\Definition\Mutations\Rest\CreateMutation;
+use App\GraphQL\Definition\Mutations\Models\CreateMutation;
 use App\GraphQL\Definition\Types\List\PlaylistType;
 use App\Models\List\Playlist;
 
diff --git a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/DeletePlaylistMutation.php b/app/GraphQL/Definition/Mutations/Models/List/Playlist/DeletePlaylistMutation.php
similarity index 88%
rename from app/GraphQL/Definition/Mutations/Rest/List/Playlist/DeletePlaylistMutation.php
rename to app/GraphQL/Definition/Mutations/Models/List/Playlist/DeletePlaylistMutation.php
index 177712e01..a9424508f 100644
--- a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/DeletePlaylistMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/List/Playlist/DeletePlaylistMutation.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\Rest\List\Playlist;
+namespace App\GraphQL\Definition\Mutations\Models\List\Playlist;
 
 use App\GraphQL\Attributes\Resolvers\UseFieldDirective;
 use App\GraphQL\Controllers\List\PlaylistController;
-use App\GraphQL\Definition\Mutations\Rest\DeleteMutation;
+use App\GraphQL\Definition\Mutations\Models\DeleteMutation;
 use App\GraphQL\Definition\Types\List\PlaylistType;
 use App\GraphQL\Definition\Types\MessageResponseType;
 use App\Models\List\Playlist;
diff --git a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/Track/CreatePlaylistTrackMutation.php b/app/GraphQL/Definition/Mutations/Models/List/Playlist/Track/CreatePlaylistTrackMutation.php
similarity index 85%
rename from app/GraphQL/Definition/Mutations/Rest/List/Playlist/Track/CreatePlaylistTrackMutation.php
rename to app/GraphQL/Definition/Mutations/Models/List/Playlist/Track/CreatePlaylistTrackMutation.php
index 891eec60e..b23db48e4 100644
--- a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/Track/CreatePlaylistTrackMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/List/Playlist/Track/CreatePlaylistTrackMutation.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\Rest\List\Playlist\Track;
+namespace App\GraphQL\Definition\Mutations\Models\List\Playlist\Track;
 
 use App\GraphQL\Attributes\Resolvers\UseFieldDirective;
 use App\GraphQL\Controllers\List\Playlist\PlaylistTrackController;
-use App\GraphQL\Definition\Mutations\Rest\CreateMutation;
+use App\GraphQL\Definition\Mutations\Models\CreateMutation;
 use App\GraphQL\Definition\Types\List\Playlist\PlaylistTrackType;
 use App\Models\List\Playlist\PlaylistTrack;
 
diff --git a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/Track/DeletePlaylistTrackMutation.php b/app/GraphQL/Definition/Mutations/Models/List/Playlist/Track/DeletePlaylistTrackMutation.php
similarity index 88%
rename from app/GraphQL/Definition/Mutations/Rest/List/Playlist/Track/DeletePlaylistTrackMutation.php
rename to app/GraphQL/Definition/Mutations/Models/List/Playlist/Track/DeletePlaylistTrackMutation.php
index 87766cb45..68a95580d 100644
--- a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/Track/DeletePlaylistTrackMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/List/Playlist/Track/DeletePlaylistTrackMutation.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\Rest\List\Playlist\Track;
+namespace App\GraphQL\Definition\Mutations\Models\List\Playlist\Track;
 
 use App\GraphQL\Attributes\Resolvers\UseFieldDirective;
 use App\GraphQL\Controllers\List\Playlist\PlaylistTrackController;
-use App\GraphQL\Definition\Mutations\Rest\DeleteMutation;
+use App\GraphQL\Definition\Mutations\Models\DeleteMutation;
 use App\GraphQL\Definition\Types\List\Playlist\PlaylistTrackType;
 use App\GraphQL\Definition\Types\MessageResponseType;
 use App\Models\List\Playlist\PlaylistTrack;
diff --git a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/Track/UpdatePlaylistTrackMutation.php b/app/GraphQL/Definition/Mutations/Models/List/Playlist/Track/UpdatePlaylistTrackMutation.php
similarity index 85%
rename from app/GraphQL/Definition/Mutations/Rest/List/Playlist/Track/UpdatePlaylistTrackMutation.php
rename to app/GraphQL/Definition/Mutations/Models/List/Playlist/Track/UpdatePlaylistTrackMutation.php
index 1d3571270..112f24233 100644
--- a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/Track/UpdatePlaylistTrackMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/List/Playlist/Track/UpdatePlaylistTrackMutation.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\Rest\List\Playlist\Track;
+namespace App\GraphQL\Definition\Mutations\Models\List\Playlist\Track;
 
 use App\GraphQL\Attributes\Resolvers\UseFieldDirective;
 use App\GraphQL\Controllers\List\Playlist\PlaylistTrackController;
-use App\GraphQL\Definition\Mutations\Rest\UpdateMutation;
+use App\GraphQL\Definition\Mutations\Models\UpdateMutation;
 use App\GraphQL\Definition\Types\List\Playlist\PlaylistTrackType;
 use App\Models\List\Playlist\PlaylistTrack;
 
diff --git a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/UpdatePlaylistMutation.php b/app/GraphQL/Definition/Mutations/Models/List/Playlist/UpdatePlaylistMutation.php
similarity index 85%
rename from app/GraphQL/Definition/Mutations/Rest/List/Playlist/UpdatePlaylistMutation.php
rename to app/GraphQL/Definition/Mutations/Models/List/Playlist/UpdatePlaylistMutation.php
index dc9e9cf90..907f8ba4f 100644
--- a/app/GraphQL/Definition/Mutations/Rest/List/Playlist/UpdatePlaylistMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/List/Playlist/UpdatePlaylistMutation.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\Rest\List\Playlist;
+namespace App\GraphQL\Definition\Mutations\Models\List\Playlist;
 
 use App\GraphQL\Attributes\Resolvers\UseFieldDirective;
 use App\GraphQL\Controllers\List\PlaylistController;
-use App\GraphQL\Definition\Mutations\Rest\UpdateMutation;
+use App\GraphQL\Definition\Mutations\Models\UpdateMutation;
 use App\GraphQL\Definition\Types\List\PlaylistType;
 use App\Models\List\Playlist;
 
diff --git a/app/GraphQL/Definition/Mutations/Rest/UpdateMutation.php b/app/GraphQL/Definition/Mutations/Models/UpdateMutation.php
similarity index 97%
rename from app/GraphQL/Definition/Mutations/Rest/UpdateMutation.php
rename to app/GraphQL/Definition/Mutations/Models/UpdateMutation.php
index 6d5ca4b18..71865beee 100644
--- a/app/GraphQL/Definition/Mutations/Rest/UpdateMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/UpdateMutation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\Rest;
+namespace App\GraphQL\Definition\Mutations\Models;
 
 use App\Contracts\GraphQL\Fields\UpdatableField;
 use App\Contracts\GraphQL\HasFields;
diff --git a/app/GraphQL/Definition/Mutations/User/LikeMutation.php b/app/GraphQL/Definition/Mutations/Models/User/LikeMutation.php
similarity index 97%
rename from app/GraphQL/Definition/Mutations/User/LikeMutation.php
rename to app/GraphQL/Definition/Mutations/Models/User/LikeMutation.php
index 4bdf71c4f..4e7b6aba3 100644
--- a/app/GraphQL/Definition/Mutations/User/LikeMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/User/LikeMutation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\User;
+namespace App\GraphQL\Definition\Mutations\Models\User;
 
 use App\Contracts\GraphQL\Fields\CreatableField;
 use App\GraphQL\Attributes\Resolvers\UseFieldDirective;
diff --git a/app/GraphQL/Definition/Mutations/User/UnlikeMutation.php b/app/GraphQL/Definition/Mutations/Models/User/UnlikeMutation.php
similarity index 97%
rename from app/GraphQL/Definition/Mutations/User/UnlikeMutation.php
rename to app/GraphQL/Definition/Mutations/Models/User/UnlikeMutation.php
index 6bf495a99..f3c2385d3 100644
--- a/app/GraphQL/Definition/Mutations/User/UnlikeMutation.php
+++ b/app/GraphQL/Definition/Mutations/Models/User/UnlikeMutation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\GraphQL\Definition\Mutations\User;
+namespace App\GraphQL\Definition\Mutations\Models\User;
 
 use App\Contracts\GraphQL\Fields\DeletableField;
 use App\GraphQL\Attributes\Resolvers\UseFieldDirective;
diff --git a/app/GraphQL/Definition/Queries/BaseQuery.php b/app/GraphQL/Definition/Queries/BaseQuery.php
index 36b4d4b8f..04b3f8a36 100644
--- a/app/GraphQL/Definition/Queries/BaseQuery.php
+++ b/app/GraphQL/Definition/Queries/BaseQuery.php
@@ -81,7 +81,7 @@ abstract class BaseQuery
         $baseType = $this->baseType();
 
         if ($this->resolveSearchAttribute()) {
-            $arguments[] = new Argument('search', Type::string(), false, ['search' => []]);
+            $arguments[] = new Argument('search', Type::string())->directives(['search' => []]);
         }
 
         if ($baseType instanceof BaseType && $baseType instanceof HasFields) {
diff --git a/app/GraphQL/Definition/Queries/EloquentSingularQuery.php b/app/GraphQL/Definition/Queries/EloquentSingularQuery.php
new file mode 100644
index 000000000..098eefae8
--- /dev/null
+++ b/app/GraphQL/Definition/Queries/EloquentSingularQuery.php
@@ -0,0 +1,104 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\GraphQL\Definition\Queries;
+
+use App\Contracts\GraphQL\HasFields;
+use App\GraphQL\Definition\Argument\Argument;
+use App\GraphQL\Definition\Fields\Base\DeletedAtField;
+use App\GraphQL\Definition\Types\BaseType;
+use App\GraphQL\Definition\Types\EloquentType;
+use Exception;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Arr;
+
+abstract class EloquentSingularQuery extends BaseQuery
+{
+    public function __construct(
+        protected string $name,
+    ) {
+        parent::__construct($name, nullable: true, isList: false);
+    }
+
+    /**
+     * The directives of the type.
+     *
+     * @return array<string, array>
+     */
+    public function directives(): array
+    {
+        return [
+            ...parent::directives(),
+
+            ...($this->isTrashable() ? ['softDeletes' => []] : []),
+
+            ...$this->canModelDirective(),
+        ];
+    }
+
+    /**
+     * Build the canModel directive for authorization.
+     *
+     * @return array
+     */
+    protected function canModelDirective(): array
+    {
+        return [
+            'canModel' => [
+                'ability' => 'view',
+                'injectArgs' => 'true',
+                'model' => $this->model(),
+            ],
+        ];
+    }
+
+    /**
+     * The arguments of the type.
+     *
+     * @return Argument[]
+     */
+    public function arguments(): array
+    {
+        $arguments = [];
+        $baseType = $this->baseType();
+
+        if ($baseType instanceof BaseType && $baseType instanceof HasFields) {
+            $arguments[] = $this->resolveBindArguments($baseType->fields());
+        }
+
+        return Arr::flatten($arguments);
+    }
+
+    /**
+     * Get the model related to the query.
+     *
+     * @return class-string<Model>
+     *
+     * @throws Exception
+     */
+    public function model(): string
+    {
+        $baseType = $this->baseType();
+
+        if ($baseType instanceof EloquentType) {
+            return $baseType->model();
+        }
+
+        throw new Exception('The base return type must be an instance of EloquentType, '.get_class($baseType).' given.');
+    }
+
+    /**
+     * Determine if the return model is trashable.
+     */
+    protected function isTrashable(): bool
+    {
+        $baseType = $this->baseType();
+
+        if ($baseType instanceof EloquentType && $baseType instanceof HasFields) {
+            return in_array(new DeletedAtField(), $baseType->fields());
+        }
+
+        return false;
+    }
+}
diff --git a/app/GraphQL/Definition/Queries/List/Playlist/PlaylistTrackQuery.php b/app/GraphQL/Definition/Queries/List/Playlist/PlaylistTrackQuery.php
new file mode 100644
index 000000000..d675ae13c
--- /dev/null
+++ b/app/GraphQL/Definition/Queries/List/Playlist/PlaylistTrackQuery.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\GraphQL\Definition\Queries\List\Playlist;
+
+use App\GraphQL\Attributes\Resolvers\UseBuilderDirective;
+use App\GraphQL\Attributes\Resolvers\UseFindDirective;
+use App\GraphQL\Builders\List\Playlist\PlaylistTrackBuilder;
+use App\GraphQL\Definition\Queries\EloquentSingularQuery;
+use App\GraphQL\Definition\Types\List\Playlist\PlaylistTrackType;
+
+#[UseBuilderDirective(PlaylistTrackBuilder::class, 'show')]
+#[UseFindDirective]
+class PlaylistTrackQuery extends EloquentSingularQuery
+{
+    public function __construct()
+    {
+        parent::__construct('playlisttrack');
+    }
+
+    /**
+     * The description of the type.
+     */
+    public function description(): string
+    {
+        return 'Returns a playlist track resource.';
+    }
+
+    /**
+     * The base return type of the query.
+     */
+    public function baseType(): PlaylistTrackType
+    {
+        return new PlaylistTrackType();
+    }
+}
diff --git a/app/GraphQL/Definition/Queries/List/Playlist/PlaylistTracksQuery.php b/app/GraphQL/Definition/Queries/List/Playlist/PlaylistTracksQuery.php
new file mode 100644
index 000000000..745060b1b
--- /dev/null
+++ b/app/GraphQL/Definition/Queries/List/Playlist/PlaylistTracksQuery.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\GraphQL\Definition\Queries\List\Playlist;
+
+use App\GraphQL\Attributes\Resolvers\UseBuilderDirective;
+use App\GraphQL\Attributes\Resolvers\UsePaginateDirective;
+use App\GraphQL\Builders\List\Playlist\PlaylistTrackBuilder;
+use App\GraphQL\Definition\Argument\Argument;
+use App\GraphQL\Definition\Fields\List\Playlist\PlaylistTrack\PlaylistTrackPlaylistField;
+use App\GraphQL\Definition\Queries\EloquentQuery;
+use App\GraphQL\Definition\Types\List\Playlist\PlaylistTrackType;
+
+#[UseBuilderDirective(PlaylistTrackBuilder::class)]
+#[UsePaginateDirective]
+class PlaylistTracksQuery extends EloquentQuery
+{
+    public function __construct()
+    {
+        parent::__construct('playlisttracks');
+    }
+
+    /**
+     * The description of the type.
+     */
+    public function description(): string
+    {
+        return 'Returns a listing of tracks for the playlist.';
+    }
+
+    /**
+     * The arguments of the type.
+     *
+     * @return Argument[]
+     */
+    public function arguments(): array
+    {
+        return [
+            ...parent::arguments(),
+
+            ...($this->resolveBindArguments([new PlaylistTrackPlaylistField()])),
+        ];
+    }
+
+    /**
+     * The base return type of the query.
+     */
+    public function baseType(): PlaylistTrackType
+    {
+        return new PlaylistTrackType();
+    }
+}
diff --git a/app/GraphQL/Definition/Queries/List/PlaylistQuery.php b/app/GraphQL/Definition/Queries/List/PlaylistQuery.php
new file mode 100644
index 000000000..61f88c37f
--- /dev/null
+++ b/app/GraphQL/Definition/Queries/List/PlaylistQuery.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\GraphQL\Definition\Queries\List;
+
+use App\GraphQL\Attributes\Resolvers\UseFindDirective;
+use App\GraphQL\Definition\Queries\EloquentSingularQuery;
+use App\GraphQL\Definition\Types\List\PlaylistType;
+
+#[UseFindDirective]
+class PlaylistQuery extends EloquentSingularQuery
+{
+    public function __construct()
+    {
+        parent::__construct('playlist');
+    }
+
+    /**
+     * The description of the type.
+     */
+    public function description(): string
+    {
+        return 'Returns a playlist resource.';
+    }
+
+    /**
+     * The base return type of the query.
+     */
+    public function baseType(): PlaylistType
+    {
+        return new PlaylistType();
+    }
+}
diff --git a/app/GraphQL/Definition/Queries/Wiki/Anime/AnimeYearQuery.php b/app/GraphQL/Definition/Queries/Wiki/Anime/AnimeYearQuery.php
index 952823d15..9b7d5154c 100644
--- a/app/GraphQL/Definition/Queries/Wiki/Anime/AnimeYearQuery.php
+++ b/app/GraphQL/Definition/Queries/Wiki/Anime/AnimeYearQuery.php
@@ -54,7 +54,8 @@ class AnimeYearQuery extends BaseQuery
     public function arguments(): array
     {
         return [
-            new Argument('year', Type::int(), true),
+            new Argument('year', Type::int())
+                ->required(),
         ];
     }
 
diff --git a/app/GraphQL/Definition/Queries/Wiki/Anime/FindAnimesByExternalSiteQuery.php b/app/GraphQL/Definition/Queries/Wiki/Anime/FindAnimesByExternalSiteQuery.php
index 2e0bb5424..57c3a1ed4 100644
--- a/app/GraphQL/Definition/Queries/Wiki/Anime/FindAnimesByExternalSiteQuery.php
+++ b/app/GraphQL/Definition/Queries/Wiki/Anime/FindAnimesByExternalSiteQuery.php
@@ -62,9 +62,12 @@ class FindAnimesByExternalSiteQuery extends BaseQuery
     public function arguments(): array
     {
         return [
-            new Argument(self::ATTRIBUTE_SITE, app(TypeRegistry::class)->get(class_basename(ResourceSite::class)), true),
-            new Argument(self::ATTRIBUTE_ID, Type::int(), false),
-            new Argument(self::ATTRIBUTE_LINK, Type::string(), false),
+            new Argument(self::ATTRIBUTE_SITE, app(TypeRegistry::class)->get(class_basename(ResourceSite::class)))
+                ->required(),
+
+            new Argument(self::ATTRIBUTE_ID, Type::int()),
+
+            new Argument(self::ATTRIBUTE_LINK, Type::string()),
         ];
     }
 
diff --git a/app/GraphQL/Definition/Relations/Relation.php b/app/GraphQL/Definition/Relations/Relation.php
index c8dd7822c..5245b8d73 100644
--- a/app/GraphQL/Definition/Relations/Relation.php
+++ b/app/GraphQL/Definition/Relations/Relation.php
@@ -8,6 +8,7 @@ use App\Concerns\GraphQL\ResolvesArguments;
 use App\Concerns\GraphQL\ResolvesDirectives;
 use App\Contracts\GraphQL\HasFields;
 use App\Enums\GraphQL\RelationType;
+use App\GraphQL\Definition\Argument\Argument;
 use GraphQL\Type\Definition\Type;
 use Illuminate\Support\Str;
 use Stringable;
@@ -41,7 +42,7 @@ abstract class Relation implements Stringable
         );
 
         return Str::of($this->field ?? $this->relationName)
-            ->append($this->getArguments())
+            ->append($this->buildArguments($this->arguments()))
             ->append(': ')
             ->append($this->type()->__toString())
             ->append(' ')
@@ -51,8 +52,10 @@ abstract class Relation implements Stringable
 
     /**
      * Resolve the arguments of the sub-query.
+     *
+     * @return Argument[]
      */
-    protected function getArguments(): string
+    protected function arguments(): array
     {
         $arguments = [];
 
@@ -60,7 +63,7 @@ abstract class Relation implements Stringable
             $arguments[] = $this->resolveFilterArguments($this->type->fields());
         }
 
-        return $this->buildArguments($arguments);
+        return $arguments;
     }
 
     /**
diff --git a/app/GraphQL/Directives/SortCustomDirective.php b/app/GraphQL/Directives/SortCustomDirective.php
index 0b46277f2..eaf91f300 100644
--- a/app/GraphQL/Directives/SortCustomDirective.php
+++ b/app/GraphQL/Directives/SortCustomDirective.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\GraphQL\Directives;
 
-use App\Enums\GraphQL\SortDirection;
 use App\Enums\GraphQL\SortType;
 use App\Exceptions\GraphQL\ClientValidationException;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
@@ -36,6 +35,7 @@ class SortCustomDirective extends BaseDirective implements ArgBuilderDirective
     /**
      * @param  array<string, mixed>  $sortByColumns
      *
+     * @throws ClientValidationException
      * @throws InvalidArgumentException
      */
     public function handleBuilder(QueryBuilder|EloquentBuilder|Relation $builder, $sortByColumns): QueryBuilder|EloquentBuilder|Relation
@@ -44,7 +44,7 @@ class SortCustomDirective extends BaseDirective implements ArgBuilderDirective
 
         foreach ($sortByColumns as $sortByColumn) {
             $column = Arr::pull($sortByColumn, 'column');
-            $direction = SortDirection::from(intval(Arr::pull($sortByColumn, 'direction')));
+            $direction = Arr::pull($sortByColumn, 'direction');
 
             $object = collect($sortableColumns)
                 ->first(fn (array $value) => $value['column'] === $column);
@@ -56,7 +56,7 @@ class SortCustomDirective extends BaseDirective implements ArgBuilderDirective
             $sortType = SortType::from(Arr::get($object, 'sortType'));
 
             if ($sortType === SortType::ROOT) {
-                $builder->orderBy($column, $direction->name);
+                $builder->orderBy($column, $direction);
             }
 
             if ($sortType === SortType::AGGREGATE) {
@@ -67,11 +67,11 @@ class SortCustomDirective extends BaseDirective implements ArgBuilderDirective
 
                 $builder->withAggregate([
                     "$relation as {$relation}_value" => function ($query) use ($direction) {
-                        $query->orderBy('value', $direction->name);
+                        $query->orderBy('value', $direction);
                     },
                 ], 'value');
 
-                $builder->orderBy("{$relation}_value", $direction->name);
+                $builder->orderBy("{$relation}_value", $direction);
             }
         }
 
diff --git a/app/GraphQL/Policies/List/PlaylistPolicy.php b/app/GraphQL/Policies/List/PlaylistPolicy.php
index fdebdf766..578021a32 100644
--- a/app/GraphQL/Policies/List/PlaylistPolicy.php
+++ b/app/GraphQL/Policies/List/PlaylistPolicy.php
@@ -11,6 +11,7 @@ use App\GraphQL\Policies\BasePolicy;
 use App\Models\Auth\User;
 use App\Models\List\Playlist;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Log;
 
 class PlaylistPolicy extends BasePolicy
 {
@@ -23,6 +24,7 @@ class PlaylistPolicy extends BasePolicy
     {
         /** @var Playlist $playlist */
         $playlist = Arr::get($injected, $keyName);
+        Log::info($injected);
 
         if ($user !== null) {
             return ($playlist->user()->is($user) || $playlist->visibility !== PlaylistVisibility::PRIVATE)
diff --git a/app/GraphQL/Schemas/List/External/externalentry.graphql b/app/GraphQL/Schemas/List/External/externalentry.graphql
deleted file mode 100644
index 396537aa6..000000000
--- a/app/GraphQL/Schemas/List/External/externalentry.graphql
+++ /dev/null
@@ -1,22 +0,0 @@
-extend type Query {
-    "Returns an external entry resource."
-    externalentry(
-        profile: Int! @bind(class: "App\\Models\\List\\ExternalProfile")
-        id: Int! @bind(class: "App\\Models\\List\\External\\ExternalEntry")
-    ): ExternalEntry @first
-    @canModel(ability: "view", injectArgs: true)
-
-    "Returns a listing of entries for the profile."
-    externalentries(
-        score_lesser: Int @where(key: "score", operator: "<")
-        score_greater: Int @where(key: "score", operator: ">")
-        watchStatus: [ExternalEntryWatchStatus] @in(key: "watch_status")
-        createdAt_lesser: DateTimeTz @where(key: "created_at", operator: "<")
-        createdAt_greater: DateTimeTz @where(key: "created_at", operator: ">")
-        updatedAt_lesser: DateTimeTz @where(key: "updated_at", operator: "<")
-        updatedAt_greater: DateTimeTz @where(key: "updated_at", operator: ">")
-    ): [ExternalEntry!]!
-    @canModel(ability: "viewAny", injectArgs: true)
-    @builder(method: "App\\GraphQL\\Builders\\List\\External\\ExternalEntryBuilder@index")
-    @paginate
-}
\ No newline at end of file
diff --git a/app/GraphQL/Schemas/List/Playlist/playlisttrack.graphql b/app/GraphQL/Schemas/List/Playlist/playlisttrack.graphql
deleted file mode 100644
index 9a4d304b5..000000000
--- a/app/GraphQL/Schemas/List/Playlist/playlisttrack.graphql
+++ /dev/null
@@ -1,21 +0,0 @@
-extend type Query {
-    "Returns a playlist track resource."
-    playlisttrack(
-        playlist: String! @bind(class: "App\\Models\\List\\Playlist", column: "hashid")
-        id: String! @bind(class: "App\\Models\\List\\Playlist\\PlaylistTrack", column: "hashid")
-    ): PlaylistTrack @first
-    @canModel(ability: "view", injectArgs: true)
-
-    "Returns a listing of tracks for the playlist."
-    playlisttracks(
-        createdAt_lesser: DateTimeTz @where(key: "created_at", operator: "<")
-        createdAt_greater: DateTimeTz @where(key: "created_at", operator: ">")
-        updatedAt_lesser: DateTimeTz @where(key: "updated_at", operator: "<")
-        updatedAt_greater: DateTimeTz @where(key: "updated_at", operator: ">")
-        deletedAt_lesser: DateTimeTz @where(key: "deleted_at", operator: "<")
-        deletedAt_greater: DateTimeTz @where(key: "deleted_at", operator: ">")
-    ): [PlaylistTrack!]!
-    @canModel(ability: "viewAny", injectArgs: true)
-    @builder(method: "App\\GraphQL\\Builders\\List\\Playlist\\PlaylistTrackBuilder@index")
-    @paginate
-}
\ No newline at end of file
diff --git a/app/GraphQL/Schemas/List/playlist.graphql b/app/GraphQL/Schemas/List/playlist.graphql
deleted file mode 100644
index 18c37542b..000000000
--- a/app/GraphQL/Schemas/List/playlist.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-extend type Query {
-    "Returns a playlist resource."
-    playlist(
-        id: String! @bind(class: "App\\Models\\List\\Playlist", column: "hashid")
-    ): Playlist @first
-    @canModel(ability: "view", injectArgs: true)
-}
\ No newline at end of file
diff --git a/app/GraphQL/Schemas/schema.graphql b/app/GraphQL/Schemas/schema.graphql
index de3e564a9..de092c20f 100644
--- a/app/GraphQL/Schemas/schema.graphql
+++ b/app/GraphQL/Schemas/schema.graphql
@@ -13,8 +13,4 @@ input WhereHasConditions {
   where: [WhereConditions!]
   AND: [WhereHasConditions!]
   OR: [WhereHasConditions!]
-}
-
-#import List/*.graphql
-#import List/External/*.graphql
-#import List/Playlist/*.graphql
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Api/Admin/CurrentFeaturedThemeController.php b/app/Http/Controllers/Api/Admin/CurrentFeaturedThemeController.php
index 862fc3011..28f5b601d 100644
--- a/app/Http/Controllers/Api/Admin/CurrentFeaturedThemeController.php
+++ b/app/Http/Controllers/Api/Admin/CurrentFeaturedThemeController.php
@@ -6,7 +6,6 @@ namespace App\Http\Controllers\Api\Admin;
 
 use App\Actions\Http\Api\ShowAction;
 use App\Contracts\Http\Api\InteractsWithSchema;
-use App\Enums\Http\Api\Filter\ComparisonOperator;
 use App\Http\Api\Query\Query;
 use App\Http\Api\Schema\Admin\FeaturedThemeSchema;
 use App\Http\Api\Schema\Schema;
@@ -28,10 +27,10 @@ class CurrentFeaturedThemeController extends Controller implements InteractsWith
         $query = new Query($request->validated());
 
         $featuredtheme = FeaturedTheme::query()
-            ->whereNotNull(FeaturedTheme::ATTRIBUTE_START_AT)
-            ->whereNotNull(FeaturedTheme::ATTRIBUTE_END_AT)
-            ->whereDate(FeaturedTheme::ATTRIBUTE_START_AT, ComparisonOperator::LTE->value, Date::now())
-            ->whereDate(FeaturedTheme::ATTRIBUTE_END_AT, ComparisonOperator::GT->value, Date::now())
+            ->whereValueBetween(Date::now(), [
+                FeaturedTheme::ATTRIBUTE_START_AT,
+                FeaturedTheme::ATTRIBUTE_END_AT,
+            ])
             ->firstOrFail();
 
         $show = $action->show($featuredtheme, $query, $request->schema());
diff --git a/app/Http/Controllers/List/External/ExternalTokenCallbackController.php b/app/Http/Controllers/List/External/ExternalTokenCallbackController.php
index aa02e2ebe..38f2c1c36 100644
--- a/app/Http/Controllers/List/External/ExternalTokenCallbackController.php
+++ b/app/Http/Controllers/List/External/ExternalTokenCallbackController.php
@@ -46,7 +46,7 @@ class ExternalTokenCallbackController extends Controller
 
         $profile = $action->store($validated);
 
-        $profile->startSyncJob();
+        $profile->dispatchSyncJob();
 
         return Redirect::to($profile->getClientUrl());
     }
diff --git a/app/Http/Controllers/List/SyncExternalProfileController.php b/app/Http/Controllers/List/SyncExternalProfileController.php
index cb3f55264..c26eaf8ea 100644
--- a/app/Http/Controllers/List/SyncExternalProfileController.php
+++ b/app/Http/Controllers/List/SyncExternalProfileController.php
@@ -50,7 +50,7 @@ class SyncExternalProfileController extends Controller
             ], 403);
         }
 
-        $externalProfile->startSyncJob();
+        $externalProfile->dispatchSyncJob();
 
         return new JsonResponse([
             'message' => 'Job dispatched.',
diff --git a/app/Models/List/ExternalProfile.php b/app/Models/List/ExternalProfile.php
index 194ee9c1b..bdd6cb461 100644
--- a/app/Models/List/ExternalProfile.php
+++ b/app/Models/List/ExternalProfile.php
@@ -191,7 +191,7 @@ class ExternalProfile extends BaseModel
     /**
      * Dispatch the sync external profile job.
      */
-    public function startSyncJob(): void
+    public function dispatchSyncJob(): void
     {
         SyncExternalProfileJob::dispatch($this);
     }
diff --git a/composer.json b/composer.json
index ccbb7e86f..db6da7b1c 100644
--- a/composer.json
+++ b/composer.json
@@ -114,6 +114,7 @@
             "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
         ],
         "lint": "pint",
+        "test:graphql": "@php artisan lighthouse:validate-schema",
         "test:types": "./vendor/bin/phpstan analyse --memory-limit=-1"
     }
 }