diff --git a/code/app/Athenia/Contracts/Repositories/Statistic/StatisticRepositoryContract.php b/code/app/Athenia/Contracts/Repositories/Statistic/StatisticRepositoryContract.php
index 455a3ed9..14c27b22 100644
--- a/code/app/Athenia/Contracts/Repositories/Statistic/StatisticRepositoryContract.php
+++ b/code/app/Athenia/Contracts/Repositories/Statistic/StatisticRepositoryContract.php
@@ -4,10 +4,18 @@
 namespace App\Athenia\Contracts\Repositories\Statistic;
 
 use App\Athenia\Contracts\Repositories\BaseRepositoryContract;
+use Illuminate\Support\Collection;
 
 /**
  * Interface StatisticRepositoryContract
  */
 interface StatisticRepositoryContract extends BaseRepositoryContract
 {
+    /**
+     * Get all statistics for a given model
+     *
+     * @param string $model
+     * @return Collection
+     */
+    public function findAllForModel(string $model): Collection;
 } 
\ No newline at end of file
diff --git a/code/app/Athenia/Contracts/Repositories/User/ArticleNoteRepositoryContract.php b/code/app/Athenia/Contracts/Repositories/User/ArticleNoteRepositoryContract.php
new file mode 100644
index 00000000..5ee419cd
--- /dev/null
+++ b/code/app/Athenia/Contracts/Repositories/User/ArticleNoteRepositoryContract.php
@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Athenia\Contracts\Repositories\User;
+
+use App\Athenia\Contracts\Repositories\BaseRepositoryContract;
+
+/**
+ * Interface ArticleNoteRepositoryContract
+ * @package App\Athenia\Contracts\Repositories\User
+ */
+interface ArticleNoteRepositoryContract extends BaseRepositoryContract
+{}
diff --git a/code/app/Athenia/Contracts/Repositories/Wiki/ArticleRepositoryContract.php b/code/app/Athenia/Contracts/Repositories/Wiki/ArticleRepositoryContract.php
index b275daf1..0682026a 100644
--- a/code/app/Athenia/Contracts/Repositories/Wiki/ArticleRepositoryContract.php
+++ b/code/app/Athenia/Contracts/Repositories/Wiki/ArticleRepositoryContract.php
@@ -4,10 +4,20 @@
 namespace App\Athenia\Contracts\Repositories\Wiki;
 
 use App\Athenia\Contracts\Repositories\BaseRepositoryContract;
+use App\Models\User\User;
+use App\Models\Wiki\Article;
 
 /**
  * Interface ArticleRepositoryContract
  * @package App\Contracts\Repositories\Wiki
  */
 interface ArticleRepositoryContract extends BaseRepositoryContract
-{}
\ No newline at end of file
+{
+    /**
+     * Selects an article for a user based on their note completion status and article statistics
+     *
+     * @param User $user
+     * @return Article|null
+     */
+    public function selectArticleForUser(User $user): ?Article;
+}
\ No newline at end of file
diff --git a/code/app/Athenia/Http/Core/Controllers/User/ArticleNoteControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/User/ArticleNoteControllerAbstract.php
new file mode 100644
index 00000000..90b65e66
--- /dev/null
+++ b/code/app/Athenia/Http/Core/Controllers/User/ArticleNoteControllerAbstract.php
@@ -0,0 +1,154 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Athenia\Http\Core\Controllers\User;
+
+use App\Athenia\Contracts\Repositories\User\ArticleNoteRepositoryContract;
+use App\Athenia\Contracts\Repositories\Wiki\ArticleRepositoryContract;
+use App\Athenia\Http\Core\Controllers\BaseControllerAbstract;
+use App\Athenia\Http\Core\Controllers\Traits\HasIndexRequests;
+use App\Athenia\Models\BaseModelAbstract;
+use App\Http\Core\Requests;
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class ArticleNoteControllerAbstract
+ * @package App\Athenia\Http\Core\Controllers\User
+ */
+abstract class ArticleNoteControllerAbstract extends BaseControllerAbstract
+{
+    use HasIndexRequests;
+
+    /**
+     * @var ArticleNoteRepositoryContract
+     */
+    private ArticleNoteRepositoryContract $repository;
+
+    /**
+     * @var ArticleRepositoryContract
+     */
+    private ArticleRepositoryContract $articleRepository;
+
+    /**
+     * ArticleNoteController constructor.
+     * @param ArticleNoteRepositoryContract $repository
+     * @param ArticleRepositoryContract $articleRepository
+     */
+    public function __construct(ArticleNoteRepositoryContract $repository, ArticleRepositoryContract $articleRepository)
+    {
+        $this->repository = $repository;
+        $this->articleRepository = $articleRepository;
+    }
+
+    /**
+     * @param Requests\User\ArticleNote\IndexRequest $request
+     * @param User $user
+     * @return LengthAwarePaginator
+     */
+    public function index(Requests\User\ArticleNote\IndexRequest $request, User $user): LengthAwarePaginator
+    {
+        return $this->repository->findAll(
+            $this->filter($request),
+            $this->search($request),
+            $this->order($request),
+            $this->expand($request),
+            $this->limit($request),
+            [$user],
+            (int)$request->input('page', 1)
+        );
+    }
+
+    /**
+     * @param Requests\User\ArticleNote\StoreRequest $request
+     * @param User $user
+     * @return JsonResponse
+     */
+    public function store(Requests\User\ArticleNote\StoreRequest $request, User $user): JsonResponse
+    {
+        $data = $request->json()->all();
+        $data['user_id'] = $user->id;
+
+        /** @var ArticleNote $model */
+        $model = $this->repository->create($data);
+
+        return new JsonResponse($model, 201);
+    }
+
+    /**
+     * @param Requests\User\ArticleNote\ViewRequest $request
+     * @param User $user
+     * @param ArticleNote $articleNote
+     * @return ArticleNote
+     */
+    public function show(Requests\User\ArticleNote\ViewRequest $request, User $user, ArticleNote $articleNote): ArticleNote
+    {
+        return $articleNote;
+    }
+
+    /**
+     * @param Requests\User\ArticleNote\UpdateRequest $request
+     * @param User $user
+     * @param ArticleNote $articleNote
+     * @return BaseModelAbstract
+     */
+    public function update(Requests\User\ArticleNote\UpdateRequest $request, User $user, ArticleNote $articleNote): BaseModelAbstract
+    {
+        $data = $request->json()->all();
+
+        return $this->repository->update($articleNote, $data);
+    }
+
+    /**
+     * @param Requests\User\ArticleNote\DeleteRequest $request
+     * @param User $user
+     * @param ArticleNote $articleNote
+     * @return JsonResponse
+     */
+    public function destroy(Requests\User\ArticleNote\DeleteRequest $request, User $user, ArticleNote $articleNote): JsonResponse
+    {
+        $this->repository->delete($articleNote);
+
+        return new JsonResponse(null, 204);
+    }
+
+    /**
+     * Selects a random article for the user and creates or retrieves an article note
+     *
+     * @param Requests\User\ArticleNote\RandomArticleRequest $request
+     * @param User $user
+     * @return JsonResponse
+     */
+    public function randomArticle(Requests\User\ArticleNote\RandomArticleRequest $request, User $user): JsonResponse
+    {
+        $article = $this->articleRepository->selectArticleForUser($user);
+
+        if (!$article) {
+            return new JsonResponse([
+                'message' => 'No available articles found.'
+            ], 404);
+        }
+
+        // Check if a note already exists for this article
+        $existingNote = ArticleNote::where('user_id', $user->id)
+            ->where('article_id', $article->id)
+            ->first();
+
+        if ($existingNote) {
+            $existingNote->load('article');
+            return new JsonResponse($existingNote, 200);
+        }
+
+        /** @var ArticleNote $articleNote */
+        $articleNote = $this->repository->create([
+            'user_id' => $user->id,
+            'article_id' => $article->id,
+        ]);
+
+        $articleNote->load('article');
+
+        return new JsonResponse($articleNote, 201);
+    }
+}
diff --git a/code/app/Athenia/Http/Core/Requests/User/ArticleNote/DeleteRequest.php b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/DeleteRequest.php
new file mode 100644
index 00000000..cfdfeab8
--- /dev/null
+++ b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/DeleteRequest.php
@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Athenia\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\BaseAuthenticatedRequestAbstract;
+use App\Athenia\Http\Core\Requests\Traits\HasNoExpands;
+use App\Athenia\Http\Core\Requests\Traits\HasNoRules;
+use App\Models\User\ArticleNote;
+use App\Policies\User\ArticleNotePolicy;
+
+/**
+ * Class DeleteRequest
+ * @package App\Athenia\Http\Core\Requests\User\ArticleNote
+ */
+class DeleteRequest extends BaseAuthenticatedRequestAbstract
+{
+    use HasNoRules, HasNoExpands;
+
+    /**
+     * Get the policy action for the guard
+     *
+     * @return string
+     */
+    protected function getPolicyAction(): string
+    {
+        return ArticleNotePolicy::ACTION_DELETE;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getPolicyModel(): string
+    {
+        return ArticleNote::class;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getPolicyParameters(): array
+    {
+        return [
+            $this->route('user'),
+            $this->route('article_note'),
+        ];
+    }
+}
diff --git a/code/app/Athenia/Http/Core/Requests/User/ArticleNote/IndexRequest.php b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/IndexRequest.php
new file mode 100644
index 00000000..1ae7a145
--- /dev/null
+++ b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/IndexRequest.php
@@ -0,0 +1,63 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Athenia\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\BaseAuthenticatedRequestAbstract;
+use App\Athenia\Http\Core\Requests\Traits\HasNoRules;
+use App\Models\User\ArticleNote;
+use App\Policies\User\ArticleNotePolicy;
+
+/**
+ * Class IndexRequest
+ * @package App\Athenia\Http\Core\Requests\User\ArticleNote
+ */
+class IndexRequest extends BaseAuthenticatedRequestAbstract
+{
+    use HasNoRules;
+
+    /**
+     * Get the policy action for the guard
+     *
+     * @return string
+     */
+    protected function getPolicyAction(): string
+    {
+        return ArticleNotePolicy::ACTION_LIST;
+    }
+
+    /**
+     * Get the class name of the policy that this request utilizes
+     *
+     * @return string
+     */
+    protected function getPolicyModel(): string
+    {
+        return ArticleNote::class;
+    }
+
+    /**
+     * Gets any additional parameters needed for the policy function
+     *
+     * @return array
+     */
+    protected function getPolicyParameters(): array
+    {
+        return [
+            $this->route('user'),
+        ];
+    }
+
+    /**
+     * All expands that are allowed for this request
+     *
+     * @return array
+     */
+    public function allowedExpands(): array
+    {
+        return [
+            'user',
+            'article',
+        ];
+    }
+}
diff --git a/code/app/Athenia/Http/Core/Requests/User/ArticleNote/RandomArticleRequest.php b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/RandomArticleRequest.php
new file mode 100644
index 00000000..44120f3c
--- /dev/null
+++ b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/RandomArticleRequest.php
@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Athenia\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\BaseAuthenticatedRequestAbstract;
+use App\Athenia\Http\Core\Requests\Traits\HasNoExpands;
+use App\Athenia\Http\Core\Requests\Traits\HasNoRules;
+use App\Models\User\ArticleNote;
+use App\Policies\User\ArticleNotePolicy;
+
+/**
+ * Class RandomArticleRequest
+ * @package App\Athenia\Http\Core\Requests\User\ArticleNote
+ */
+class RandomArticleRequest extends BaseAuthenticatedRequestAbstract
+{
+    use HasNoExpands, HasNoRules;
+
+    /**
+     * Get the policy action for the guard
+     *
+     * @return string
+     */
+    protected function getPolicyAction(): string
+    {
+        return ArticleNotePolicy::ACTION_CREATE;
+    }
+
+    /**
+     * Get the class name of the policy that this request utilizes
+     *
+     * @return string
+     */
+    protected function getPolicyModel(): string
+    {
+        return ArticleNote::class;
+    }
+
+    /**
+     * Gets any additional parameters needed for the policy function
+     *
+     * @return array
+     */
+    protected function getPolicyParameters(): array
+    {
+        return [
+            $this->route('user'),
+        ];
+    }
+}
diff --git a/code/app/Athenia/Http/Core/Requests/User/ArticleNote/StoreRequest.php b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/StoreRequest.php
new file mode 100644
index 00000000..794db6b5
--- /dev/null
+++ b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/StoreRequest.php
@@ -0,0 +1,59 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Athenia\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\BaseAuthenticatedRequestAbstract;
+use App\Athenia\Http\Core\Requests\Traits\HasNoExpands;
+use App\Models\User\ArticleNote;
+use App\Policies\User\ArticleNotePolicy;
+
+/**
+ * Class StoreRequest
+ * @package App\Athenia\Http\Core\Requests\User\ArticleNote
+ */
+class StoreRequest extends BaseAuthenticatedRequestAbstract
+{
+    use HasNoExpands;
+
+    /**
+     * Get the policy action for the guard
+     *
+     * @return string
+     */
+    protected function getPolicyAction(): string
+    {
+        return ArticleNotePolicy::ACTION_CREATE;
+    }
+
+    /**
+     * Get the class name of the policy that this request utilizes
+     *
+     * @return string
+     */
+    protected function getPolicyModel(): string
+    {
+        return ArticleNote::class;
+    }
+
+    /**
+     * Gets any additional parameters needed for the policy function
+     *
+     * @return array
+     */
+    protected function getPolicyParameters(): array
+    {
+        return [
+            $this->route('user'),
+        ];
+    }
+
+    /**
+     * @param ArticleNote $model
+     * @return array
+     */
+    public function rules(ArticleNote $model)
+    {
+        return $model->getValidationRules(ArticleNote::VALIDATION_RULES_CREATE);
+    }
+}
diff --git a/code/app/Athenia/Http/Core/Requests/User/ArticleNote/UpdateRequest.php b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/UpdateRequest.php
new file mode 100644
index 00000000..28790846
--- /dev/null
+++ b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/UpdateRequest.php
@@ -0,0 +1,61 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Athenia\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\BaseAuthenticatedRequestAbstract;
+use App\Athenia\Http\Core\Requests\Traits\HasNoExpands;
+use App\Models\User\ArticleNote;
+use App\Policies\User\ArticleNotePolicy;
+
+/**
+ * Class UpdateRequest
+ * @package App\Athenia\Http\Core\Requests\User\ArticleNote
+ */
+class UpdateRequest extends BaseAuthenticatedRequestAbstract
+{
+    use HasNoExpands;
+
+    /**
+     * Get the policy action for the guard
+     *
+     * @return string
+     */
+    protected function getPolicyAction(): string
+    {
+        return ArticleNotePolicy::ACTION_UPDATE;
+    }
+
+    /**
+     * Get the class name of the policy that this request utilizes
+     *
+     * @return string
+     */
+    protected function getPolicyModel(): string
+    {
+        return ArticleNote::class;
+    }
+
+    /**
+     * Gets any additional parameters needed for the policy function
+     *
+     * @return array
+     */
+    protected function getPolicyParameters(): array
+    {
+        return [
+            $this->route('user'),
+            $this->route('article_note'),
+        ];
+    }
+
+    /**
+     * The rules for this request
+     *
+     * @param ArticleNote $model
+     */
+    public function rules(ArticleNote $model)
+    {
+        return $model->getValidationRules(ArticleNote::VALIDATION_RULES_UPDATE);
+    }
+}
diff --git a/code/app/Athenia/Http/Core/Requests/User/ArticleNote/ViewRequest.php b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/ViewRequest.php
new file mode 100644
index 00000000..d0130120
--- /dev/null
+++ b/code/app/Athenia/Http/Core/Requests/User/ArticleNote/ViewRequest.php
@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Athenia\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\BaseAuthenticatedRequestAbstract;
+use App\Athenia\Http\Core\Requests\Traits\HasNoExpands;
+use App\Athenia\Http\Core\Requests\Traits\HasNoRules;
+use App\Models\User\ArticleNote;
+use App\Policies\User\ArticleNotePolicy;
+
+/**
+ * Class ViewRequest
+ * @package App\Athenia\Http\Core\Requests\User\ArticleNote
+ */
+class ViewRequest extends BaseAuthenticatedRequestAbstract
+{
+    use HasNoRules, HasNoExpands;
+
+    /**
+     * Get the policy action for the guard
+     *
+     * @return string
+     */
+    protected function getPolicyAction(): string
+    {
+        return ArticleNotePolicy::ACTION_VIEW;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getPolicyModel(): string
+    {
+        return ArticleNote::class;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getPolicyParameters(): array
+    {
+        return [
+            $this->route('user'),
+            $this->route('article_note'),
+        ];
+    }
+}
diff --git a/code/app/Athenia/Models/Asset.php b/code/app/Athenia/Models/Asset.php
index f65285bb..f2407bf0 100644
--- a/code/app/Athenia/Models/Asset.php
+++ b/code/app/Athenia/Models/Asset.php
@@ -36,6 +36,34 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Asset whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Asset whereUrl($value)
  * @mixin \Eloquent
+ * @property string|null $source
+ * @property string|null $alt
+ * @property int $width
+ * @property int $height
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Asset onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereAlt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereHeight($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereSource($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereWidth($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Asset withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Asset withoutTrashed()
+ * @mixin Eloquent
  */
 class Asset extends BaseModelAbstract implements HasValidationRulesContract
 {
diff --git a/code/app/Athenia/Models/Category.php b/code/app/Athenia/Models/Category.php
index 9fe34486..ce31c195 100644
--- a/code/app/Athenia/Models/Category.php
+++ b/code/app/Athenia/Models/Category.php
@@ -48,6 +48,8 @@
  * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder|Category whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Category withTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Category withoutTrashed()
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Article> $articles
+ * @property-read int|null $articles_count
  * @mixin \Eloquent
  */
 class Category extends BaseModelAbstract implements HasValidationRulesContract
diff --git a/code/app/Athenia/Models/Collection/Collection.php b/code/app/Athenia/Models/Collection/Collection.php
index 95d33e83..abb768c4 100644
--- a/code/app/Athenia/Models/Collection/Collection.php
+++ b/code/app/Athenia/Models/Collection/Collection.php
@@ -63,6 +63,7 @@
  * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder|Collection whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Collection withTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Collection withoutTrashed()
+ * @property-read int|null $target_statistics_count
  * @mixin \Eloquent
  */
 class Collection extends BaseModelAbstract implements HasValidationRulesContract, CanBeStatisticTargetContract
diff --git a/code/app/Athenia/Models/Feature.php b/code/app/Athenia/Models/Feature.php
index 6b13fe19..8a6996c6 100644
--- a/code/app/Athenia/Models/Feature.php
+++ b/code/app/Athenia/Models/Feature.php
@@ -27,6 +27,25 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Feature whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Feature whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Feature whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Feature onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Feature withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Feature withoutTrashed()
  * @mixin \Eloquent
  */
 class Feature extends BaseModelAbstract
diff --git a/code/app/Athenia/Models/Messaging/Message.php b/code/app/Athenia/Models/Messaging/Message.php
index a387c46e..4258c4a9 100644
--- a/code/app/Athenia/Models/Messaging/Message.php
+++ b/code/app/Athenia/Models/Messaging/Message.php
@@ -61,6 +61,30 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\Message whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\Message whereVia($value)
  * @mixin \Eloquent
+ * @property string|null $to_type
+ * @property string|null $from_type
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Message onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereFromType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereToType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Message withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Message withoutTrashed()
+ * @mixin Eloquent
  */
 class Message extends BaseModelAbstract implements HasPolicyContract, HasValidationRulesContract
 {
diff --git a/code/app/Athenia/Models/Messaging/PushNotificationKey.php b/code/app/Athenia/Models/Messaging/PushNotificationKey.php
index c4131f17..b533a4b7 100644
--- a/code/app/Athenia/Models/Messaging/PushNotificationKey.php
+++ b/code/app/Athenia/Models/Messaging/PushNotificationKey.php
@@ -19,6 +19,38 @@
  * @property Carbon|null $deleted_at
  * @property-read CanReceivePushNotificationContract $owner
  * @mixin Eloquent
+ * @property int $owner_id
+ * @property string $owner_type
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PushNotificationKey onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereOwnerId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereOwnerType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey wherePushNotificationKey($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PushNotificationKey withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PushNotificationKey withoutTrashed()
+ * @mixin \Eloquent
  */
 class PushNotificationKey extends BaseModelAbstract
 {
diff --git a/code/app/Athenia/Models/Messaging/Thread.php b/code/app/Athenia/Models/Messaging/Thread.php
index 051871da..67728401 100644
--- a/code/app/Athenia/Models/Messaging/Thread.php
+++ b/code/app/Athenia/Models/Messaging/Thread.php
@@ -40,6 +40,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\Thread whereTopic($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\Thread whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Thread onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Thread withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Thread withoutTrashed()
+ * @mixin Eloquent
  */
 class Thread extends BaseModelAbstract implements HasPolicyContract, HasValidationRulesContract
 {
diff --git a/code/app/Athenia/Models/Organization/Organization.php b/code/app/Athenia/Models/Organization/Organization.php
index 10059233..67eaa4ed 100644
--- a/code/app/Athenia/Models/Organization/Organization.php
+++ b/code/app/Athenia/Models/Organization/Organization.php
@@ -53,6 +53,27 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Organization\Organization whereProfileImageId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Organization\Organization whereStripeCustomerKey($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Organization\Organization whereUpdatedAt($value)
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Collection\Collection> $collections
+ * @property-read int|null $collections_count
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Organization onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Organization withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Organization withoutTrashed()
  * @mixin \Eloquent
  */
 class Organization extends BaseModelAbstract
diff --git a/code/app/Athenia/Models/Organization/OrganizationManager.php b/code/app/Athenia/Models/Organization/OrganizationManager.php
index f6ae7aa0..862b4624 100644
--- a/code/app/Athenia/Models/Organization/OrganizationManager.php
+++ b/code/app/Athenia/Models/Organization/OrganizationManager.php
@@ -38,6 +38,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Organization\OrganizationManager whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Organization\OrganizationManager whereUserId($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|OrganizationManager onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|OrganizationManager withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|OrganizationManager withoutTrashed()
+ * @mixin Eloquent
  */
 class OrganizationManager extends BaseModelAbstract implements HasValidationRulesContract, BelongsToOrganizationContract
 {
diff --git a/code/app/Athenia/Models/Payment/LineItem.php b/code/app/Athenia/Models/Payment/LineItem.php
index 6fec7318..f00072b3 100644
--- a/code/app/Athenia/Models/Payment/LineItem.php
+++ b/code/app/Athenia/Models/Payment/LineItem.php
@@ -34,6 +34,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Payment\LineItem wherePaymentId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Payment\LineItem whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|LineItem onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|LineItem withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|LineItem withoutTrashed()
+ * @mixin Eloquent
  */
 class LineItem extends BaseModelAbstract
 {
diff --git a/code/app/Athenia/Models/Payment/Payment.php b/code/app/Athenia/Models/Payment/Payment.php
index c745faba..bb9fb278 100644
--- a/code/app/Athenia/Models/Payment/Payment.php
+++ b/code/app/Athenia/Models/Payment/Payment.php
@@ -42,6 +42,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Payment\Payment whereTransactionKey($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Payment\Payment whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Payment onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Payment withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Payment withoutTrashed()
+ * @mixin Eloquent
  */
 class Payment extends BaseModelAbstract
 {
diff --git a/code/app/Athenia/Models/Payment/PaymentMethod.php b/code/app/Athenia/Models/Payment/PaymentMethod.php
index 5e9362a0..86b7d548 100644
--- a/code/app/Athenia/Models/Payment/PaymentMethod.php
+++ b/code/app/Athenia/Models/Payment/PaymentMethod.php
@@ -50,6 +50,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Payment\PaymentMethod wherePaymentMethodType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Payment\PaymentMethod whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PaymentMethod onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PaymentMethod withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PaymentMethod withoutTrashed()
+ * @mixin Eloquent
  */
 class PaymentMethod extends BaseModelAbstract implements HasValidationRulesContract
 {
diff --git a/code/app/Athenia/Models/Resource.php b/code/app/Athenia/Models/Resource.php
index d3521648..988b89f0 100644
--- a/code/app/Athenia/Models/Resource.php
+++ b/code/app/Athenia/Models/Resource.php
@@ -30,6 +30,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Resource whereResourceType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Resource whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Resource onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Resource withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Resource withoutTrashed()
+ * @mixin Eloquent
  */
 class Resource extends BaseModelAbstract implements HasPolicyContract
 {
diff --git a/code/app/Athenia/Models/Role.php b/code/app/Athenia/Models/Role.php
index 9dc78571..d336f92e 100644
--- a/code/app/Athenia/Models/Role.php
+++ b/code/app/Athenia/Models/Role.php
@@ -28,6 +28,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Role whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Role whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Role onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Role withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Role withoutTrashed()
+ * @mixin Eloquent
  */
 class Role extends BaseModelAbstract implements HasPolicyContract
 {
diff --git a/code/app/Athenia/Models/Statistic/Statistic.php b/code/app/Athenia/Models/Statistic/Statistic.php
index a3e4d5ec..83cc6d3d 100644
--- a/code/app/Athenia/Models/Statistic/Statistic.php
+++ b/code/app/Athenia/Models/Statistic/Statistic.php
@@ -29,6 +29,40 @@
  * @property-read int|null $statistic_filters_count
  * @property-read Collection|TargetStatistic[] $targetStatistics
  * @property-read int|null $target_statistics_count
+ * @property string $model
+ * @property string $relation
+ * @property-read Collection<int, StatisticFilter> $filters
+ * @property-read int|null $filters_count
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Statistic onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereModel($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic wherePublic($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereRelation($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Statistic withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Statistic withoutTrashed()
  * @mixin Eloquent
  */
 class Statistic extends BaseModelAbstract implements HasValidationRulesContract
@@ -40,11 +74,21 @@ class Statistic extends BaseModelAbstract implements HasValidationRulesContract
      *
      * @return HasMany
      */
-    public function statisticFilters(): HasMany
+    public function filters(): HasMany
     {
         return $this->hasMany(StatisticFilter::class);
     }
 
+    /**
+     * Alias for backward compatibility
+     *
+     * @return HasMany
+     */
+    public function statisticFilters(): HasMany
+    {
+        return $this->filters();
+    }
+
     /**
      * All instances of the target statistics in the system
      *
diff --git a/code/app/Athenia/Models/Statistic/StatisticFilter.php b/code/app/Athenia/Models/Statistic/StatisticFilter.php
index 367241b1..84a4b31c 100644
--- a/code/app/Athenia/Models/Statistic/StatisticFilter.php
+++ b/code/app/Athenia/Models/Statistic/StatisticFilter.php
@@ -9,8 +9,8 @@
 
 /**
  * Class StatisticFilter
- * @package App\Models\Statistics
  *
+ * @package App\Models\Statistics
  * @property int $id
  * @property int $statistic_id
  * @property string $field
@@ -20,6 +20,37 @@
  * @property \datetime|null $updated_at
  * @property \datetime|null $deleted_at
  * @property-read Statistic $statistic
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|StatisticFilter onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereField($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereOperator($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereStatisticId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereValue($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|StatisticFilter withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|StatisticFilter withoutTrashed()
+ * @mixin \Eloquent
  */
 class StatisticFilter extends BaseModelAbstract
 {
diff --git a/code/app/Athenia/Models/Statistic/TargetStatistic.php b/code/app/Athenia/Models/Statistic/TargetStatistic.php
index 8b90e1c0..240f3871 100644
--- a/code/app/Athenia/Models/Statistic/TargetStatistic.php
+++ b/code/app/Athenia/Models/Statistic/TargetStatistic.php
@@ -10,6 +10,7 @@
 
 /**
  * Class TargetStatistic
+ *
  * @package App\Models\Statistics
  * @property int $id
  * @property int $target_id
@@ -22,6 +23,40 @@
  * @property \Carbon\Carbon|null $deleted_at
  * @property-read \App\Models\Statistic\Statistic $statistic
  * @property-read \Illuminate\Database\Eloquent\Model $target
+ * @property array<array-key, mixed>|null $result
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|TargetStatistic onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereFilters($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereResult($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereStatisticId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereTargetId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereTargetType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereValue($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|TargetStatistic withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|TargetStatistic withoutTrashed()
+ * @mixin \Eloquent
  */
 class TargetStatistic extends BaseModelAbstract
 {
diff --git a/code/app/Athenia/Models/Subscription/MembershipPlan.php b/code/app/Athenia/Models/Subscription/MembershipPlan.php
index 731fc8b9..6f00de36 100644
--- a/code/app/Athenia/Models/Subscription/MembershipPlan.php
+++ b/code/app/Athenia/Models/Subscription/MembershipPlan.php
@@ -49,6 +49,25 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Subscription\MembershipPlan whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Subscription\MembershipPlan whereTrialPeriod($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Subscription\MembershipPlan whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlan onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlan withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlan withoutTrashed()
  * @mixin \Eloquent
  */
 class MembershipPlan extends BaseModelAbstract implements HasPolicyContract, HasValidationRulesContract
diff --git a/code/app/Athenia/Models/Subscription/MembershipPlanRate.php b/code/app/Athenia/Models/Subscription/MembershipPlanRate.php
index 10f0f793..6a530596 100644
--- a/code/app/Athenia/Models/Subscription/MembershipPlanRate.php
+++ b/code/app/Athenia/Models/Subscription/MembershipPlanRate.php
@@ -34,6 +34,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Subscription\MembershipPlanRate whereMembershipPlanId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Subscription\MembershipPlanRate whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlanRate onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlanRate withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlanRate withoutTrashed()
+ * @mixin Eloquent
  */
 class MembershipPlanRate extends BaseModelAbstract
 {
diff --git a/code/app/Athenia/Models/Subscription/Subscription.php b/code/app/Athenia/Models/Subscription/Subscription.php
index 3f6e03dc..42cce552 100644
--- a/code/app/Athenia/Models/Subscription/Subscription.php
+++ b/code/app/Athenia/Models/Subscription/Subscription.php
@@ -62,6 +62,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Subscription\Subscription whereSubscriberType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Subscription\Subscription whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Subscription onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Subscription withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Subscription withoutTrashed()
+ * @mixin Eloquent
  */
 class Subscription extends BaseModelAbstract implements HasValidationRulesContract, HasPaymentsContract
 {
diff --git a/code/app/Athenia/Models/User/ArticleNote.php b/code/app/Athenia/Models/User/ArticleNote.php
new file mode 100644
index 00000000..b3e3447a
--- /dev/null
+++ b/code/app/Athenia/Models/User/ArticleNote.php
@@ -0,0 +1,131 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Athenia\Models\User;
+
+use App\Athenia\Contracts\Models\CanBeAggregatedContract;
+use App\Athenia\Contracts\Models\HasValidationRulesContract;
+use App\Athenia\Models\BaseModelAbstract;
+use App\Athenia\Models\Traits\HasValidationRules;
+use App\Models\User\User;
+use App\Models\Wiki\Article;
+use Eloquent;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Validation\Rule;
+
+/**
+ * Class ArticleNote
+ *
+ * @property int $id
+ * @property int $user_id
+ * @property int $article_id
+ * @property \Illuminate\Support\Carbon|null $completed_at
+ * @property string|null $response
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \App\Models\User\User $user
+ * @property-read \App\Models\Wiki\Article $article
+ * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleNote onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereArticleId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereCompletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereResponse($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleNote withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleNote withoutTrashed()
+ * @mixin Eloquent
+ */
+class ArticleNote extends BaseModelAbstract implements HasValidationRulesContract, CanBeAggregatedContract
+{
+    use HasValidationRules, SoftDeletes;
+
+    /**
+     * The user who created this note
+     *
+     * @return BelongsTo
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    /**
+     * The article this note is for
+     *
+     * @return BelongsTo
+     */
+    public function article(): BelongsTo
+    {
+        return $this->belongsTo(Article::class);
+    }
+
+    /**
+     * Build the model validation rules
+     * @param array $params
+     * @return array
+     */
+    public function buildModelValidationRules(...$params): array
+    {
+        return [
+            static::VALIDATION_RULES_BASE => [
+                'article_id' => [
+                    'integer',
+                    Rule::exists('articles', 'id'),
+                ],
+                'completed' => [
+                    'boolean',
+                ],
+                'response' => [
+                    'nullable',
+                    'string',
+                ],
+            ],
+            static::VALIDATION_RULES_UPDATE => [
+                static::VALIDATION_PREPEND_REQUIRED => [
+                ],
+            ],
+            static::VALIDATION_RULES_CREATE => [
+                static::VALIDATION_PREPEND_REQUIRED => [
+                    'article_id',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Returns the relation paths to the models that can be target statistics
+     * For example: ["article"] would mean this model affects statistics on articles
+     * through the article relation
+     *
+     * @return string[]
+     */
+    public function getStatisticTargetRelationPath(): array
+    {
+        return ['article'];
+    }
+}
diff --git a/code/app/Athenia/Models/User/Contact.php b/code/app/Athenia/Models/User/Contact.php
index e4df03fe..7de2ef33 100644
--- a/code/app/Athenia/Models/User/Contact.php
+++ b/code/app/Athenia/Models/User/Contact.php
@@ -36,6 +36,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\Contact whereRequestedId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\Contact whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Contact onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Contact withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Contact withoutTrashed()
+ * @mixin Eloquent
  */
 class Contact extends BaseModelAbstract implements HasValidationRulesContract
 {
diff --git a/code/app/Athenia/Models/User/PasswordToken.php b/code/app/Athenia/Models/User/PasswordToken.php
index 2af6f4b8..6392c039 100644
--- a/code/app/Athenia/Models/User/PasswordToken.php
+++ b/code/app/Athenia/Models/User/PasswordToken.php
@@ -26,6 +26,25 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\PasswordToken whereToken($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\PasswordToken whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\PasswordToken whereUserId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PasswordToken onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PasswordToken withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PasswordToken withoutTrashed()
  * @mixin \Eloquent
  */
 class PasswordToken extends BaseModelAbstract
diff --git a/code/app/Athenia/Models/User/ProfileImage.php b/code/app/Athenia/Models/User/ProfileImage.php
index 4935cb15..788735a7 100644
--- a/code/app/Athenia/Models/User/ProfileImage.php
+++ b/code/app/Athenia/Models/User/ProfileImage.php
@@ -37,6 +37,34 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\ProfileImage whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\ProfileImage whereUrl($value)
  * @mixin \Eloquent
+ * @property string|null $source
+ * @property string|null $alt
+ * @property int $width
+ * @property int $height
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ProfileImage onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereAlt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereHeight($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereSource($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereWidth($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ProfileImage withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ProfileImage withoutTrashed()
+ * @mixin Eloquent
  */
 class ProfileImage extends Asset
 {
diff --git a/code/app/Athenia/Models/User/User.php b/code/app/Athenia/Models/User/User.php
index fc389d15..961cdc91 100644
--- a/code/app/Athenia/Models/User/User.php
+++ b/code/app/Athenia/Models/User/User.php
@@ -23,6 +23,7 @@
 use App\Models\Organization\OrganizationManager;
 use App\Models\Resource;
 use App\Models\Role;
+use App\Models\User\ArticleNote;
 use App\Models\Vote\BallotCompletion;
 use App\Models\Wiki\Article;
 use App\Models\Wiki\ArticleIteration;
@@ -97,6 +98,31 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\User whereReceivePushNotifications($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\User whereStripeCustomerKey($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User\User whereUpdatedAt($value)
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, ArticleNote> $articleNotes
+ * @property-read int|null $article_notes_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Collection\Collection> $collections
+ * @property-read int|null $collections_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, PushNotificationKey> $pushNotificationKeys
+ * @property-read int|null $push_notification_keys_count
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User withoutTrashed()
  * @mixin \Eloquent
  */
 class User extends BaseModelAbstract
@@ -146,6 +172,16 @@ public function ballotCompletions(): HasMany
         return $this->hasMany(BallotCompletion::class);
     }
 
+    /**
+     * The article notes this user has created
+     *
+     * @return HasMany
+     */
+    public function articleNotes(): HasMany
+    {
+        return $this->hasMany(ArticleNote::class);
+    }
+
     /**
      * The articles that were created by this user
      *
diff --git a/code/app/Athenia/Models/Vote/Ballot.php b/code/app/Athenia/Models/Vote/Ballot.php
index 91b9ead5..363fdff6 100644
--- a/code/app/Athenia/Models/Vote/Ballot.php
+++ b/code/app/Athenia/Models/Vote/Ballot.php
@@ -30,6 +30,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\Ballot whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\Ballot whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Ballot onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Ballot withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Ballot withoutTrashed()
+ * @mixin Eloquent
  */
 class Ballot extends BaseModelAbstract
 {
diff --git a/code/app/Athenia/Models/Vote/BallotCompletion.php b/code/app/Athenia/Models/Vote/BallotCompletion.php
index 7b57ffb6..364c6004 100644
--- a/code/app/Athenia/Models/Vote/BallotCompletion.php
+++ b/code/app/Athenia/Models/Vote/BallotCompletion.php
@@ -35,6 +35,30 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\BallotCompletion whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\BallotCompletion whereUserId($value)
  * @mixin \Eloquent
+ * @property string|null $completed_at
+ * @property string|null $response
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotCompletion onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereCompletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereResponse($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotCompletion withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotCompletion withoutTrashed()
+ * @mixin Eloquent
  */
 class BallotCompletion extends BaseModelAbstract implements HasValidationRulesContract
 {
diff --git a/code/app/Athenia/Models/Vote/BallotItem.php b/code/app/Athenia/Models/Vote/BallotItem.php
index 371e421e..78dc7ef5 100644
--- a/code/app/Athenia/Models/Vote/BallotItem.php
+++ b/code/app/Athenia/Models/Vote/BallotItem.php
@@ -35,6 +35,26 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\BallotItem whereVoteCount($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\BallotItem whereVotesCast($value)
  * @mixin \Eloquent
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItem onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItem withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItem withoutTrashed()
+ * @mixin Eloquent
  */
 class BallotItem extends BaseModelAbstract
 {
diff --git a/code/app/Athenia/Models/Vote/BallotItemOption.php b/code/app/Athenia/Models/Vote/BallotItemOption.php
index aab5c2ac..ea2d0581 100644
--- a/code/app/Athenia/Models/Vote/BallotItemOption.php
+++ b/code/app/Athenia/Models/Vote/BallotItemOption.php
@@ -34,6 +34,25 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\BallotItemOption whereSubjectType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\BallotItemOption whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\BallotItemOption whereVoteCount($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItemOption onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItemOption withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItemOption withoutTrashed()
  * @mixin \Eloquent
  */
 class BallotItemOption extends BaseModelAbstract
diff --git a/code/app/Athenia/Models/Vote/Vote.php b/code/app/Athenia/Models/Vote/Vote.php
index 66e2e886..5cd5692e 100644
--- a/code/app/Athenia/Models/Vote/Vote.php
+++ b/code/app/Athenia/Models/Vote/Vote.php
@@ -29,6 +29,25 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\Vote whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\Vote whereResult($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Vote\Vote whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Vote onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Vote withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Vote withoutTrashed()
  * @mixin \Eloquent
  */
 class Vote extends BaseModelAbstract
diff --git a/code/app/Athenia/Models/Wiki/Article.php b/code/app/Athenia/Models/Wiki/Article.php
index a49416ae..fa510873 100644
--- a/code/app/Athenia/Models/Wiki/Article.php
+++ b/code/app/Athenia/Models/Wiki/Article.php
@@ -4,10 +4,12 @@
 namespace App\Athenia\Models\Wiki;
 
 use App\Athenia\Contracts\Models\CanBeIndexedContract;
+use App\Athenia\Contracts\Models\CanBeStatisticTargetContract;
 use App\Athenia\Contracts\Models\HasPolicyContract;
 use App\Athenia\Contracts\Models\HasValidationRulesContract;
 use App\Athenia\Models\BaseModelAbstract;
 use App\Athenia\Models\Traits\CanBeIndexed;
+use App\Athenia\Models\Traits\HasStatisticTargets;
 use App\Athenia\Models\Traits\HasValidationRules;
 use App\Models\Category;
 use App\Models\User\User;
@@ -46,10 +48,45 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Wiki\Article whereTitle($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Wiki\Article whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @property string|null $url
+ * @property string|null $authors
+ * @property int $has_full_modification_history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User\ArticleNote> $articleNotes
+ * @property-read int|null $article_notes_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Category> $categories
+ * @property-read int|null $categories_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, ArticleModification> $modifications
+ * @property-read int|null $modifications_count
+ * @property-read \App\Models\Resource|null $resource
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Statistic\TargetStatistic> $targetStatistics
+ * @property-read int|null $target_statistics_count
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Article onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereAuthors($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereHasFullModificationHistory($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereUrl($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Article withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Article withoutTrashed()
+ * @mixin Eloquent
  */
-class Article extends BaseModelAbstract implements HasPolicyContract, HasValidationRulesContract, CanBeIndexedContract
+class Article extends BaseModelAbstract implements HasPolicyContract, HasValidationRulesContract, CanBeIndexedContract, CanBeStatisticTargetContract
 {
-    use HasValidationRules, CanBeIndexed;
+    use HasValidationRules, CanBeIndexed, HasStatisticTargets;
 
     /**
      * Values that are appending on a toArray function call
@@ -116,6 +153,16 @@ public function categories() : BelongsToMany
             ->withTimestamps();
     }
 
+    /**
+     * All notes associated with this article
+     *
+     * @return HasMany
+     */
+    public function articleNotes() : HasMany
+    {
+        return $this->hasMany(\App\Models\User\ArticleNote::class);
+    }
+
     /**
      * Gets the content of the article
      *
@@ -182,6 +229,15 @@ public function buildModelValidationRules(...$params): array
                     'string',
                     'max:120',
                 ],
+                'url' => [
+                    'nullable',
+                    'string',
+                    'url',
+                ],
+                'authors' => [
+                    'nullable',
+                    'string',
+                ],
                 'categories' => [
                     'array',
                 ],
diff --git a/code/app/Athenia/Models/Wiki/ArticleIteration.php b/code/app/Athenia/Models/Wiki/ArticleIteration.php
index 03ee3940..3e399eb1 100644
--- a/code/app/Athenia/Models/Wiki/ArticleIteration.php
+++ b/code/app/Athenia/Models/Wiki/ArticleIteration.php
@@ -38,6 +38,29 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Wiki\ArticleIteration whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Wiki\ArticleIteration whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @property int|null $article_modification_id
+ * @property-read ArticleModification|null $modification
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration joinRelations($relations, $leftJoin = null)
+ * @method static Builder<static>|ArticleIteration onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereArticleModificationId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static Builder<static>|ArticleIteration withTrashed(bool $withTrashed = true)
+ * @method static Builder<static>|ArticleIteration withoutTrashed()
+ * @mixin Eloquent
  */
 class ArticleIteration extends BaseModelAbstract implements HasPolicyContract
 {
diff --git a/code/app/Athenia/Models/Wiki/ArticleModification.php b/code/app/Athenia/Models/Wiki/ArticleModification.php
index d3a563c9..0d8d6f21 100644
--- a/code/app/Athenia/Models/Wiki/ArticleModification.php
+++ b/code/app/Athenia/Models/Wiki/ArticleModification.php
@@ -11,7 +11,51 @@
 
 /**
  * Class ArticleModification
+ *
  * @package App\Models\Wiki
+ * @property int $id
+ * @property int $article_id
+ * @property string $action
+ * @property int $start_position
+ * @property int|null $length
+ * @property string|null $content
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read Article $article
+ * @property-read ArticleIteration|null $iteration
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleModification onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereAction($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereArticleId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereContent($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereLength($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereStartPosition($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleModification withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleModification withoutTrashed()
+ * @mixin \Eloquent
  */
 class ArticleModification extends BaseModelAbstract
 {
diff --git a/code/app/Athenia/Models/Wiki/ArticleVersion.php b/code/app/Athenia/Models/Wiki/ArticleVersion.php
index 2941fd30..46167dea 100644
--- a/code/app/Athenia/Models/Wiki/ArticleVersion.php
+++ b/code/app/Athenia/Models/Wiki/ArticleVersion.php
@@ -34,6 +34,27 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Wiki\ArticleVersion whereIterationId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Wiki\ArticleVersion whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Wiki\ArticleVersion whereUpdatedAt($value)
+ * @property int $article_iteration_id
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion joinRelations($relations, $leftJoin = null)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleVersion onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereArticleIterationId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleVersion withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleVersion withoutTrashed()
  * @mixin \Eloquent
  */
 class ArticleVersion extends BaseModelAbstract implements HasValidationRulesContract
diff --git a/code/app/Athenia/Providers/BaseEventServiceProvider.php b/code/app/Athenia/Providers/BaseEventServiceProvider.php
index 48bd3e50..1924ce3f 100644
--- a/code/app/Athenia/Providers/BaseEventServiceProvider.php
+++ b/code/app/Athenia/Providers/BaseEventServiceProvider.php
@@ -38,6 +38,7 @@
 use App\Athenia\Listeners\Statistic\StatisticCreatedListener;
 use App\Athenia\Listeners\Statistic\StatisticDeletedListener;
 use App\Models\Payment\PaymentMethod;
+use App\Models\User\ArticleNote;
 use App\Models\User\User;
 use App\Models\Wiki\Article;
 use App\Models\Collection\CollectionItem;
@@ -135,6 +136,7 @@ public function boot()
         User::observe(IndexableModelObserver::class);
         PaymentMethod::observe(PaymentMethodObserver::class);
         CollectionItem::observe(AggregatedModelObserver::class);
+        ArticleNote::observe(AggregatedModelObserver::class);
 
         $this->registerObservers();
     }
diff --git a/code/app/Athenia/Providers/BaseRepositoryProvider.php b/code/app/Athenia/Providers/BaseRepositoryProvider.php
index 05798510..a60bc8ea 100644
--- a/code/app/Athenia/Providers/BaseRepositoryProvider.php
+++ b/code/app/Athenia/Providers/BaseRepositoryProvider.php
@@ -20,6 +20,7 @@
 use App\Athenia\Contracts\Repositories\Subscription\MembershipPlanRateRepositoryContract;
 use App\Athenia\Contracts\Repositories\Subscription\MembershipPlanRepositoryContract;
 use App\Athenia\Contracts\Repositories\Subscription\SubscriptionRepositoryContract;
+use App\Athenia\Contracts\Repositories\User\ArticleNoteRepositoryContract;
 use App\Athenia\Contracts\Repositories\User\ContactRepositoryContract;
 use App\Athenia\Contracts\Repositories\User\PasswordTokenRepositoryContract;
 use App\Athenia\Contracts\Repositories\User\ProfileImageRepositoryContract;
@@ -58,6 +59,7 @@
 use App\Athenia\Repositories\Subscription\MembershipPlanRateRepository;
 use App\Athenia\Repositories\Subscription\MembershipPlanRepository;
 use App\Athenia\Repositories\Subscription\SubscriptionRepository;
+use App\Athenia\Repositories\User\ArticleNoteRepository;
 use App\Athenia\Repositories\User\ContactRepository;
 use App\Athenia\Repositories\User\PasswordTokenRepository;
 use App\Athenia\Repositories\User\ProfileImageRepository;
@@ -91,6 +93,7 @@
 use App\Models\Subscription\MembershipPlan;
 use App\Models\Subscription\MembershipPlanRate;
 use App\Models\Subscription\Subscription;
+use App\Models\User\ArticleNote;
 use App\Models\User\Contact;
 use App\Models\User\PasswordToken;
 use App\Models\User\ProfileImage;
@@ -129,6 +132,7 @@ public final function provides(): array
             ArticleIterationRepositoryContract::class,
             ArticleModificationRepositoryContract::class,
             ArticleVersionRepositoryContract::class,
+            ArticleNoteRepositoryContract::class,
             AssetRepositoryContract::class,
             BallotRepositoryContract::class,
             BallotCompletionRepositoryContract::class,
@@ -186,6 +190,7 @@ public final function register(): void
             return new ArticleRepository(
                 new Article(),
                 $this->app->make('log'),
+                $this->app->make(StatisticRepositoryContract::class),
             );
         });
         $this->app->bind(ArticleIterationRepositoryContract::class, function() {
@@ -207,6 +212,12 @@ public final function register(): void
                 $this->app->make(Dispatcher::class),
             );
         });
+        $this->app->bind(ArticleNoteRepositoryContract::class, function() {
+            return new ArticleNoteRepository(
+                new ArticleNote(),
+                $this->app->make('log'),
+            );
+        });
         $this->app->bind(AssetRepositoryContract::class, function() {
             return new AssetRepository(
                 new Asset(),
diff --git a/code/app/Athenia/Repositories/Statistic/StatisticRepository.php b/code/app/Athenia/Repositories/Statistic/StatisticRepository.php
index 341708dd..53b772f4 100644
--- a/code/app/Athenia/Repositories/Statistic/StatisticRepository.php
+++ b/code/app/Athenia/Repositories/Statistic/StatisticRepository.php
@@ -10,6 +10,7 @@
 use App\Athenia\Events\Statistic\StatisticUpdatedEvent;
 use App\Athenia\Events\Statistic\StatisticCreatedEvent;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Support\Collection;
 use Psr\Log\LoggerInterface as LogContract;
 use App\Athenia\Repositories\Statistic\StatisticFilterRepository;
 use App\Athenia\Traits\CanGetAndUnset;
@@ -89,4 +90,16 @@ public function delete(BaseModelAbstract $model): void
         parent::delete($model);
         $this->dispatcher->dispatch(new StatisticDeletedEvent($model));
     }
+
+    /**
+     * Get all statistics for a given model
+     *
+     * @param string $model
+     * @return Collection
+     */
+    public function findAllForModel(string $model): Collection
+    {
+        return $this->model->newQuery()
+            ->where('model', $model)->get();
+    }
 } 
\ No newline at end of file
diff --git a/code/app/Athenia/Repositories/User/ArticleNoteRepository.php b/code/app/Athenia/Repositories/User/ArticleNoteRepository.php
new file mode 100644
index 00000000..a19436cf
--- /dev/null
+++ b/code/app/Athenia/Repositories/User/ArticleNoteRepository.php
@@ -0,0 +1,70 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Athenia\Repositories\User;
+
+use App\Athenia\Contracts\Repositories\User\ArticleNoteRepositoryContract;
+use App\Athenia\Models\BaseModelAbstract;
+use App\Athenia\Repositories\BaseRepositoryAbstract;
+use App\Athenia\Traits\CanGetAndUnset;
+use App\Models\User\ArticleNote;
+use Psr\Log\LoggerInterface as LogContract;
+
+/**
+ * Class ArticleNoteRepository
+ * @package App\Athenia\Repositories\User
+ */
+class ArticleNoteRepository extends BaseRepositoryAbstract implements ArticleNoteRepositoryContract
+{
+    use CanGetAndUnset;
+
+    /**
+     * ArticleNoteRepository constructor.
+     * @param ArticleNote $model
+     * @param LogContract $log
+     */
+    public function __construct(ArticleNote $model, LogContract $log)
+    {
+        parent::__construct($model, $log);
+    }
+
+    /**
+     * Override create to handle completed boolean
+     *
+     * @param array $data
+     * @param BaseModelAbstract|null $relatedModel
+     * @param array $forcedValues
+     * @return BaseModelAbstract
+     */
+    public function create(array $data = [], BaseModelAbstract $relatedModel = null, array $forcedValues = []): BaseModelAbstract
+    {
+        $completed = $this->getAndUnset($data, 'completed');
+
+        if ($completed === true) {
+            $data['completed_at'] = now();
+        }
+
+        return parent::create($data, $relatedModel, $forcedValues);
+    }
+
+    /**
+     * Override update to handle completed boolean
+     *
+     * @param BaseModelAbstract $model
+     * @param array $data
+     * @param array $forcedValues
+     * @return BaseModelAbstract
+     */
+    public function update(BaseModelAbstract $model, array $data, array $forcedValues = []): BaseModelAbstract
+    {
+        $completed = $this->getAndUnset($data, 'completed');
+
+        if ($completed === true) {
+            $data['completed_at'] = now();
+        } elseif ($completed === false) {
+            $data['completed_at'] = null;
+        }
+
+        return parent::update($model, $data, $forcedValues);
+    }
+}
diff --git a/code/app/Athenia/Repositories/Wiki/ArticleRepository.php b/code/app/Athenia/Repositories/Wiki/ArticleRepository.php
index 1c03c9f4..fb4ae5ab 100644
--- a/code/app/Athenia/Repositories/Wiki/ArticleRepository.php
+++ b/code/app/Athenia/Repositories/Wiki/ArticleRepository.php
@@ -3,10 +3,13 @@
 
 namespace App\Athenia\Repositories\Wiki;
 
+use App\Athenia\Contracts\Repositories\Statistic\StatisticRepositoryContract;
 use App\Athenia\Contracts\Repositories\Wiki\ArticleRepositoryContract;
 use App\Athenia\Models\BaseModelAbstract;
 use App\Athenia\Repositories\BaseRepositoryAbstract;
 use App\Athenia\Traits\CanGetAndUnset;
+use App\Models\Statistic\Statistic;
+use App\Models\User\User;
 use App\Models\Wiki\Article;
 use App\Repositories\Traits\NotImplemented;
 use Psr\Log\LoggerInterface as LogContract;
@@ -24,8 +27,13 @@ class ArticleRepository extends BaseRepositoryAbstract implements ArticleReposit
      * ArticleRepository constructor.
      * @param Article $model
      * @param LogContract $log
+     * @param StatisticRepositoryContract $statisticRepository
      */
-    public function __construct(Article $model, LogContract $log)
+    public function __construct(
+        Article $model,
+        LogContract $log,
+        private readonly StatisticRepositoryContract $statisticRepository
+    )
     {
         parent::__construct($model, $log);
     }
@@ -79,4 +87,84 @@ public function update(BaseModelAbstract $model, array $data, array $forcedValue
 
         return $article;
     }
+
+    /**
+     * Selects an article for a user based on their note completion status and article statistics.
+     *
+     * Priority order:
+     * 1. Articles where user has NO note started (never returns articles with completed notes)
+     * 2. Articles where user has an incomplete note
+     *
+     * Within each priority group, orders by:
+     * - Lowest total_completed_notes statistic (fewest completions by all users)
+     * - Lowest total_notes statistic (fewest notes started by all users)
+     * - Random order for variety when statistics are equal
+     *
+     * @param User $user
+     * @return Article|null
+     */
+    public function selectArticleForUser(User $user): ?Article
+    {
+        // Get all statistics for the article model
+        $statistics = $this->statisticRepository->findAllForModel('article');
+
+        // Build a map of statistic names to their IDs
+        $statisticMap = [];
+        foreach ($statistics as $statistic) {
+            $statisticMap[$statistic->name] = $statistic->id;
+        }
+
+        // Start building the query
+        $query = $this->model->newQuery()
+            ->select('articles.*')
+            ->leftJoin('article_notes as user_notes', function($join) use ($user) {
+                $join->on('articles.id', '=', 'user_notes.article_id')
+                     ->where('user_notes.user_id', '=', $user->id)
+                     ->whereNull('user_notes.deleted_at');
+            });
+
+        // Conditionally add join for total_completed_notes statistic
+        if (isset($statisticMap['total_completed_notes'])) {
+            $completedStatId = $statisticMap['total_completed_notes'];
+            $query->leftJoin('target_statistics as completed_stats', function($join) use ($completedStatId) {
+                $join->on('articles.id', '=', 'completed_stats.target_id')
+                     ->where('completed_stats.target_type', '=', 'article')
+                     ->where('completed_stats.statistic_id', '=', $completedStatId);
+            });
+        }
+
+        // Conditionally add join for total_notes statistic
+        if (isset($statisticMap['total_notes'])) {
+            $totalNotesStatId = $statisticMap['total_notes'];
+            $query->leftJoin('target_statistics as total_stats', function($join) use ($totalNotesStatId) {
+                $join->on('articles.id', '=', 'total_stats.target_id')
+                     ->where('total_stats.target_type', '=', 'article')
+                     ->where('total_stats.statistic_id', '=', $totalNotesStatId);
+            });
+        }
+
+        // Exclude articles where user has completed a note
+        $query->where(function($query) {
+            $query->whereNull('user_notes.id')
+                  ->orWhereNull('user_notes.completed_at');
+        });
+
+        // Order by priority: no note (1) before incomplete note (2)
+        $query->orderByRaw('CASE WHEN user_notes.id IS NULL THEN 1 ELSE 2 END ASC');
+
+        // Conditionally add ordering by completed notes count
+        if (isset($statisticMap['total_completed_notes'])) {
+            $query->orderByRaw('COALESCE(CAST(JSON_EXTRACT(completed_stats.result, "$.total") AS UNSIGNED), 0) ASC');
+        }
+
+        // Conditionally add ordering by total notes count
+        if (isset($statisticMap['total_notes'])) {
+            $query->orderByRaw('COALESCE(CAST(JSON_EXTRACT(total_stats.result, "$.total") AS UNSIGNED), 0) ASC');
+        }
+
+        // Finally order randomly for variety
+        $query->inRandomOrder();
+
+        return $query->first();
+    }
 }
\ No newline at end of file
diff --git a/code/app/Http/Core/Requests/User/ArticleNote/DeleteRequest.php b/code/app/Http/Core/Requests/User/ArticleNote/DeleteRequest.php
new file mode 100644
index 00000000..dfb627c4
--- /dev/null
+++ b/code/app/Http/Core/Requests/User/ArticleNote/DeleteRequest.php
@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\User\ArticleNote\DeleteRequest as BaseDeleteRequest;
+
+/**
+ * Class DeleteRequest
+ * @package App\Http\Core\Requests\User\ArticleNote
+ */
+class DeleteRequest extends BaseDeleteRequest
+{}
diff --git a/code/app/Http/Core/Requests/User/ArticleNote/IndexRequest.php b/code/app/Http/Core/Requests/User/ArticleNote/IndexRequest.php
new file mode 100644
index 00000000..b2a23fe2
--- /dev/null
+++ b/code/app/Http/Core/Requests/User/ArticleNote/IndexRequest.php
@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\User\ArticleNote\IndexRequest as BaseIndexRequest;
+
+/**
+ * Class IndexRequest
+ * @package App\Http\Core\Requests\User\ArticleNote
+ */
+class IndexRequest extends BaseIndexRequest
+{}
diff --git a/code/app/Http/Core/Requests/User/ArticleNote/RandomArticleRequest.php b/code/app/Http/Core/Requests/User/ArticleNote/RandomArticleRequest.php
new file mode 100644
index 00000000..2d87bf17
--- /dev/null
+++ b/code/app/Http/Core/Requests/User/ArticleNote/RandomArticleRequest.php
@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\User\ArticleNote\RandomArticleRequest as BaseRandomArticleRequest;
+
+/**
+ * Class RandomArticleRequest
+ * @package App\Http\Core\Requests\User\ArticleNote
+ */
+class RandomArticleRequest extends BaseRandomArticleRequest
+{}
diff --git a/code/app/Http/Core/Requests/User/ArticleNote/StoreRequest.php b/code/app/Http/Core/Requests/User/ArticleNote/StoreRequest.php
new file mode 100644
index 00000000..0c25c7d8
--- /dev/null
+++ b/code/app/Http/Core/Requests/User/ArticleNote/StoreRequest.php
@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\User\ArticleNote\StoreRequest as BaseStoreRequest;
+
+/**
+ * Class StoreRequest
+ * @package App\Http\Core\Requests\User\ArticleNote
+ */
+class StoreRequest extends BaseStoreRequest
+{}
diff --git a/code/app/Http/Core/Requests/User/ArticleNote/UpdateRequest.php b/code/app/Http/Core/Requests/User/ArticleNote/UpdateRequest.php
new file mode 100644
index 00000000..9fef5bab
--- /dev/null
+++ b/code/app/Http/Core/Requests/User/ArticleNote/UpdateRequest.php
@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\User\ArticleNote\UpdateRequest as BaseUpdateRequest;
+
+/**
+ * Class UpdateRequest
+ * @package App\Http\Core\Requests\User\ArticleNote
+ */
+class UpdateRequest extends BaseUpdateRequest
+{}
diff --git a/code/app/Http/Core/Requests/User/ArticleNote/ViewRequest.php b/code/app/Http/Core/Requests/User/ArticleNote/ViewRequest.php
new file mode 100644
index 00000000..580befaf
--- /dev/null
+++ b/code/app/Http/Core/Requests/User/ArticleNote/ViewRequest.php
@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\Core\Requests\User\ArticleNote;
+
+use App\Athenia\Http\Core\Requests\User\ArticleNote\ViewRequest as BaseViewRequest;
+
+/**
+ * Class ViewRequest
+ * @package App\Http\Core\Requests\User\ArticleNote
+ */
+class ViewRequest extends BaseViewRequest
+{}
diff --git a/code/app/Http/V1/Controllers/User/ArticleNoteController.php b/code/app/Http/V1/Controllers/User/ArticleNoteController.php
new file mode 100644
index 00000000..9be6c7dc
--- /dev/null
+++ b/code/app/Http/V1/Controllers/User/ArticleNoteController.php
@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\V1\Controllers\User;
+
+use App\Athenia\Http\Core\Controllers\User\ArticleNoteControllerAbstract;
+
+/**
+ * Class ArticleNoteController
+ * @package App\Http\V1\Controllers\User
+ */
+class ArticleNoteController extends ArticleNoteControllerAbstract
+{}
diff --git a/code/app/Models/Asset.php b/code/app/Models/Asset.php
index 6cab20c3..2a34e969 100644
--- a/code/app/Models/Asset.php
+++ b/code/app/Models/Asset.php
@@ -7,7 +7,59 @@
 
 /**
  * Class Asset
+ *
  * @package App\Models
+ * @property int $id
+ * @property int|null $owner_id
+ * @property string|null $name
+ * @property string|null $caption
+ * @property string $url
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property string|null $owner_type
+ * @property string|null $source
+ * @property string|null $alt
+ * @property int $width
+ * @property int $height
+ * @property-read Asset|null $owner
+ * @method static \Database\Factories\AssetFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Asset onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereAlt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereCaption($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereHeight($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereOwnerId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereOwnerType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereSource($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereUrl($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Asset whereWidth($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Asset withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Asset withoutTrashed()
+ * @mixin \Eloquent
  */
 class Asset extends AtheniaAsset
 {
diff --git a/code/app/Models/Category.php b/code/app/Models/Category.php
index 596a5f13..ca12c434 100644
--- a/code/app/Models/Category.php
+++ b/code/app/Models/Category.php
@@ -7,7 +7,46 @@
 
 /**
  * Class Category
+ *
  * @package App\Models
+ * @property int $id
+ * @property string $name
+ * @property string|null $description
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Wiki\Article> $articles
+ * @property-read int|null $articles_count
+ * @method static \Database\Factories\CategoryFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Category onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category whereDescription($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Category whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Category withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Category withoutTrashed()
+ * @mixin \Eloquent
  */
 class Category extends AtheniaCategory
 {
diff --git a/code/app/Models/Collection/Collection.php b/code/app/Models/Collection/Collection.php
index 1d8b5968..a2794dc5 100644
--- a/code/app/Models/Collection/Collection.php
+++ b/code/app/Models/Collection/Collection.php
@@ -7,7 +7,53 @@
 
 /**
  * Class Collection
+ *
  * @package App\Models\Collection
+ * @property int $id
+ * @property int $owner_id
+ * @property string $owner_type
+ * @property string|null $name
+ * @property int $is_public
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Collection\CollectionItem> $collectionItems
+ * @property-read int|null $collection_items_count
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $owner
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Statistic\TargetStatistic> $targetStatistics
+ * @property-read int|null $target_statistics_count
+ * @method static \Database\Factories\Collection\CollectionFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Collection onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereIsPublic($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereOwnerId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereOwnerType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Collection whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Collection withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Collection withoutTrashed()
+ * @mixin \Eloquent
  */
 class Collection extends AtheniaCollection
 {
diff --git a/code/app/Models/Collection/CollectionItem.php b/code/app/Models/Collection/CollectionItem.php
index 6b3101c6..9469657d 100644
--- a/code/app/Models/Collection/CollectionItem.php
+++ b/code/app/Models/Collection/CollectionItem.php
@@ -7,7 +7,52 @@
 
 /**
  * Class CollectionItem
+ *
  * @package App\Models\Collection
+ * @property int $id
+ * @property int $item_id
+ * @property string $item_type
+ * @property int $collection_id
+ * @property int $order
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Category> $categories
+ * @property-read int|null $categories_count
+ * @property-read \App\Models\Collection\Collection $collection
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $item
+ * @method static \Database\Factories\Collection\CollectionItemFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CollectionItem onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereCollectionId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereItemId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereItemType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereOrder($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|CollectionItem whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CollectionItem withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CollectionItem withoutTrashed()
+ * @mixin \Eloquent
  */
 class CollectionItem extends AtheniaCollectionItem
 {
diff --git a/code/app/Models/Feature.php b/code/app/Models/Feature.php
index b08394ee..0744fc4b 100644
--- a/code/app/Models/Feature.php
+++ b/code/app/Models/Feature.php
@@ -7,7 +7,46 @@
 
 /**
  * Class Feature
+ *
  * @package App\Models
+ * @property int $id
+ * @property string $name
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property string|null $description
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Subscription\MembershipPlan> $membershipPlans
+ * @property-read int|null $membership_plans_count
+ * @method static \Database\Factories\FeatureFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Feature onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereDescription($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Feature whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Feature withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Feature withoutTrashed()
+ * @mixin \Eloquent
  */
 class Feature extends AtheniaFeature
 {
diff --git a/code/app/Models/Messaging/Message.php b/code/app/Models/Messaging/Message.php
index eb08289d..1cf30122 100644
--- a/code/app/Models/Messaging/Message.php
+++ b/code/app/Models/Messaging/Message.php
@@ -7,7 +7,75 @@
 
 /**
  * Class Message
+ *
  * @package App\Models\Messaging
+ * @property int $id
+ * @property string|null $email
+ * @property string|null $subject
+ * @property string|null $template
+ * @property array<array-key, mixed> $data
+ * @property int|null $to_id
+ * @property int|null $from_id
+ * @property int|null $thread_id
+ * @property array<array-key, mixed>|null $via
+ * @property string|null $action
+ * @property \Illuminate\Support\Carbon|null $scheduled_at
+ * @property \Illuminate\Support\Carbon|null $sent_at
+ * @property \Illuminate\Support\Carbon|null $seen_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property string|null $reply_to_email
+ * @property string|null $reply_to_name
+ * @property string|null $to_type
+ * @property string|null $from_type
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent|null $from
+ * @property-read \App\Models\Messaging\Thread|null $thread
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent|null $to
+ * @method static \Database\Factories\Messaging\MessageFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Message onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereAction($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereData($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereEmail($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereFromId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereFromType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereReplyToEmail($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereReplyToName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereScheduledAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereSeenAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereSentAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereSubject($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereTemplate($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereThreadId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereToId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereToType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Message whereVia($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Message withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Message withoutTrashed()
+ * @mixin \Eloquent
  */
 class Message extends AtheniaMessage
 {
diff --git a/code/app/Models/Messaging/PushNotificationKey.php b/code/app/Models/Messaging/PushNotificationKey.php
index 69bcff1c..7e96d3dc 100644
--- a/code/app/Models/Messaging/PushNotificationKey.php
+++ b/code/app/Models/Messaging/PushNotificationKey.php
@@ -7,7 +7,47 @@
 
 /**
  * Class PushNotificationKey
+ *
  * @package App\Models\Messaging
+ * @property int $id
+ * @property int $owner_id
+ * @property string $owner_type
+ * @property string $push_notification_key
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $owner
+ * @method static \Database\Factories\Messaging\PushNotificationKeyFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PushNotificationKey onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereOwnerId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereOwnerType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey wherePushNotificationKey($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PushNotificationKey whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PushNotificationKey withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PushNotificationKey withoutTrashed()
+ * @mixin \Eloquent
  */
 class PushNotificationKey extends AtheniaPushNotificationKey
 {
diff --git a/code/app/Models/Messaging/Thread.php b/code/app/Models/Messaging/Thread.php
index 42d43927..82dac221 100644
--- a/code/app/Models/Messaging/Thread.php
+++ b/code/app/Models/Messaging/Thread.php
@@ -7,7 +7,51 @@
 
 /**
  * Class Thread
+ *
  * @package App\Models\Messaging
+ * @property int $id
+ * @property string|null $topic
+ * @property int|null $subject_id
+ * @property string|null $subject_type
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read null|string $last_message
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Messaging\Message> $messages
+ * @property-read int|null $messages_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User\User> $users
+ * @property-read int|null $users_count
+ * @method static \Database\Factories\Messaging\ThreadFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Thread onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereSubjectId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereSubjectType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereTopic($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Thread whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Thread withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Thread withoutTrashed()
+ * @mixin \Eloquent
  */
 class Thread extends AtheniaThread
 {
diff --git a/code/app/Models/Organization/Organization.php b/code/app/Models/Organization/Organization.php
index 08fd8851..fd4b6a40 100644
--- a/code/app/Models/Organization/Organization.php
+++ b/code/app/Models/Organization/Organization.php
@@ -7,7 +7,60 @@
 
 /**
  * Class Organization
+ *
  * @package App\Models\Organization
+ * @property int $id
+ * @property string $name
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property int|null $profile_image_id
+ * @property string|null $stripe_customer_key
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Asset> $assets
+ * @property-read int|null $assets_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Collection\Collection> $collections
+ * @property-read int|null $collections_count
+ * @property-read null|string $profile_image_url
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Athenia\Models\Organization\OrganizationManager> $organizationManagers
+ * @property-read int|null $organization_managers_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment\PaymentMethod> $paymentMethods
+ * @property-read int|null $payment_methods_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment\Payment> $payments
+ * @property-read int|null $payments_count
+ * @property-read \App\Models\User\ProfileImage|null $profileImage
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Subscription\Subscription> $subscriptions
+ * @property-read int|null $subscriptions_count
+ * @method static \Database\Factories\Organization\OrganizationFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Organization onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereProfileImageId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereStripeCustomerKey($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Organization whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Organization withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Organization withoutTrashed()
+ * @mixin \Eloquent
  */
 class Organization extends AtheniaOrganization
 {
diff --git a/code/app/Models/Organization/OrganizationManager.php b/code/app/Models/Organization/OrganizationManager.php
index 5b55e136..b353f103 100644
--- a/code/app/Models/Organization/OrganizationManager.php
+++ b/code/app/Models/Organization/OrganizationManager.php
@@ -7,7 +7,49 @@
 
 /**
  * Class OrganizationManager
+ *
  * @package App\Models\Organization
+ * @property int $id
+ * @property int $user_id
+ * @property int $organization_id
+ * @property int $role_id
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\Organization\Organization $organization
+ * @property-read \App\Models\Role $role
+ * @property-read \App\Models\User\User $user
+ * @method static \Database\Factories\Organization\OrganizationManagerFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|OrganizationManager onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereOrganizationId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereRoleId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|OrganizationManager whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|OrganizationManager withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|OrganizationManager withoutTrashed()
+ * @mixin \Eloquent
  */
 class OrganizationManager extends AtheniaOrganizationManager
 {
diff --git a/code/app/Models/Payment/LineItem.php b/code/app/Models/Payment/LineItem.php
index ec76bdb4..0c6fbc64 100644
--- a/code/app/Models/Payment/LineItem.php
+++ b/code/app/Models/Payment/LineItem.php
@@ -7,7 +7,50 @@
 
 /**
  * Class LineItem
+ *
  * @package App\Models\Payment
+ * @property int $id
+ * @property int $payment_id
+ * @property int|null $item_id
+ * @property string $item_type
+ * @property float $amount
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent|null $item
+ * @property-read \App\Models\Payment\Payment $payment
+ * @method static \Database\Factories\Payment\LineItemFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|LineItem onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereAmount($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereItemId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereItemType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem wherePaymentId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|LineItem whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|LineItem withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|LineItem withoutTrashed()
+ * @mixin \Eloquent
  */
 class LineItem extends AtheniaLineItem
 {
diff --git a/code/app/Models/Payment/Payment.php b/code/app/Models/Payment/Payment.php
index f7bf51bf..98b7e81a 100644
--- a/code/app/Models/Payment/Payment.php
+++ b/code/app/Models/Payment/Payment.php
@@ -7,7 +7,56 @@
 
 /**
  * Class Payment
+ *
  * @package App\Models\Payment
+ * @property int $id
+ * @property int $payment_method_id
+ * @property float $amount
+ * @property string|null $transaction_key
+ * @property \Illuminate\Support\Carbon|null $refunded_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property int|null $owner_id
+ * @property string|null $owner_type
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment\LineItem> $lineItems
+ * @property-read int|null $line_items_count
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent|null $owner
+ * @property-read \App\Models\Payment\PaymentMethod $paymentMethod
+ * @method static \Database\Factories\Payment\PaymentFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Payment onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereAmount($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereOwnerId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereOwnerType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment wherePaymentMethodId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereRefundedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereTransactionKey($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Payment whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Payment withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Payment withoutTrashed()
+ * @mixin \Eloquent
  */
 class Payment extends AtheniaPayment
 {
diff --git a/code/app/Models/Payment/PaymentMethod.php b/code/app/Models/Payment/PaymentMethod.php
index d8d03fc9..b38ce27b 100644
--- a/code/app/Models/Payment/PaymentMethod.php
+++ b/code/app/Models/Payment/PaymentMethod.php
@@ -7,7 +7,63 @@
 
 /**
  * Class PaymentMethod
+ *
  * @package App\Models\Payment
+ * @property int $id
+ * @property int $owner_id
+ * @property string $owner_type
+ * @property string|null $payment_method_key
+ * @property string $payment_method_type
+ * @property string|null $identifier
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property int $default
+ * @property string|null $brand
+ * @property string|null $exp_month
+ * @property string|null $exp_year
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $owner
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment\Payment> $payments
+ * @property-read int|null $payments_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Subscription\Subscription> $subscriptions
+ * @property-read int|null $subscriptions_count
+ * @method static \Database\Factories\Payment\PaymentMethodFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PaymentMethod onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereBrand($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereDefault($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereExpMonth($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereExpYear($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereIdentifier($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereOwnerId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereOwnerType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod wherePaymentMethodKey($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod wherePaymentMethodType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PaymentMethod whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PaymentMethod withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PaymentMethod withoutTrashed()
+ * @mixin \Eloquent
  */
 class PaymentMethod extends AtheniaPaymentMethod
 {
diff --git a/code/app/Models/Resource.php b/code/app/Models/Resource.php
index 199f15ff..1be8e2d1 100644
--- a/code/app/Models/Resource.php
+++ b/code/app/Models/Resource.php
@@ -7,7 +7,47 @@
 
 /**
  * Class Resource
+ *
  * @package App\Models
+ * @property int $id
+ * @property string $content
+ * @property int $resource_id
+ * @property string $resource_type
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $resource
+ * @method static \Database\Factories\ResourceFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Resource onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereContent($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereResourceId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereResourceType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Resource whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Resource withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Resource withoutTrashed()
+ * @mixin \Eloquent
  */
 class Resource extends AtheniaResource
 {
diff --git a/code/app/Models/Role.php b/code/app/Models/Role.php
index c2aa6c29..4d987927 100644
--- a/code/app/Models/Role.php
+++ b/code/app/Models/Role.php
@@ -7,7 +7,43 @@
 
 /**
  * Class Role
+ *
  * @package App\Models
+ * @property int $id
+ * @property string $name
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User\User> $users
+ * @property-read int|null $users_count
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Role onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Role whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Role withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Role withoutTrashed()
+ * @mixin \Eloquent
  */
 class Role extends AtheniaRole
 {
diff --git a/code/app/Models/Statistic/Statistic.php b/code/app/Models/Statistic/Statistic.php
index ad340cff..7f475a86 100644
--- a/code/app/Models/Statistic/Statistic.php
+++ b/code/app/Models/Statistic/Statistic.php
@@ -7,7 +7,54 @@
 
 /**
  * Class Statistic
+ *
  * @package App\Models\Statistic
+ * @property int $id
+ * @property string $name
+ * @property string $model
+ * @property string $relation
+ * @property int $public
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Statistic\StatisticFilter> $filters
+ * @property-read int|null $filters_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Statistic\StatisticFilter> $statisticFilters
+ * @property-read int|null $statistic_filters_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Statistic\TargetStatistic> $targetStatistics
+ * @property-read int|null $target_statistics_count
+ * @method static \Database\Factories\Statistic\StatisticFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Statistic onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereModel($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic wherePublic($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereRelation($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Statistic whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Statistic withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Statistic withoutTrashed()
+ * @mixin \Eloquent
  */
 class Statistic extends AtheniaStatistic
 {
diff --git a/code/app/Models/Statistic/StatisticFilter.php b/code/app/Models/Statistic/StatisticFilter.php
index fc4e633d..d213e578 100644
--- a/code/app/Models/Statistic/StatisticFilter.php
+++ b/code/app/Models/Statistic/StatisticFilter.php
@@ -7,7 +7,49 @@
 
 /**
  * Class StatisticFilter
+ *
  * @package App\Models\Statistic
+ * @property int $id
+ * @property int $statistic_id
+ * @property string $field
+ * @property string $operator
+ * @property string|null $value
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \App\Models\Statistic\Statistic $statistic
+ * @method static \Database\Factories\Statistic\StatisticFilterFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|StatisticFilter onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereField($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereOperator($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereStatisticId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|StatisticFilter whereValue($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|StatisticFilter withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|StatisticFilter withoutTrashed()
+ * @mixin \Eloquent
  */
 class StatisticFilter extends AtheniaStatisticFilter
 {
diff --git a/code/app/Models/Statistic/TargetStatistic.php b/code/app/Models/Statistic/TargetStatistic.php
index 907a8597..1e8fd27b 100644
--- a/code/app/Models/Statistic/TargetStatistic.php
+++ b/code/app/Models/Statistic/TargetStatistic.php
@@ -7,7 +7,54 @@
 
 /**
  * Class TargetStatistic
+ *
  * @package App\Models\Statistic
+ * @property int $id
+ * @property int $statistic_id
+ * @property string $target_type
+ * @property int $target_id
+ * @property array<array-key, mixed>|null $result
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property float $value
+ * @property string|null $filters
+ * @property-read \App\Models\Statistic\Statistic $statistic
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $target
+ * @method static \Database\Factories\Statistic\TargetStatisticFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|TargetStatistic onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereFilters($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereResult($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereStatisticId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereTargetId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereTargetType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|TargetStatistic whereValue($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|TargetStatistic withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|TargetStatistic withoutTrashed()
+ * @mixin \Eloquent
  */
 class TargetStatistic extends AtheniaTargetStatistic
 {
diff --git a/code/app/Models/Subscription/MembershipPlan.php b/code/app/Models/Subscription/MembershipPlan.php
index 2a8982cf..e51aab2e 100644
--- a/code/app/Models/Subscription/MembershipPlan.php
+++ b/code/app/Models/Subscription/MembershipPlan.php
@@ -7,7 +7,59 @@
 
 /**
  * Class MembershipPlan
+ *
  * @package App\Models\Subscription
+ * @property int $id
+ * @property string $name
+ * @property string $duration
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property string|null $description
+ * @property string $entity_type
+ * @property int $default
+ * @property int|null $trial_period
+ * @property-read \App\Models\Subscription\MembershipPlanRate|null $currentRate
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Feature> $features
+ * @property-read int|null $features_count
+ * @property-read null|float $current_cost
+ * @property-read null|float $current_rate_id
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Subscription\MembershipPlanRate> $membershipPlanRates
+ * @property-read int|null $membership_plan_rates_count
+ * @method static \Database\Factories\Subscription\MembershipPlanFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlan onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereDefault($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereDescription($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereDuration($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereEntityType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereTrialPeriod($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlan whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlan withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlan withoutTrashed()
+ * @mixin \Eloquent
  */
 class MembershipPlan extends AtheniaMembershipPlan
 {
diff --git a/code/app/Models/Subscription/MembershipPlanRate.php b/code/app/Models/Subscription/MembershipPlanRate.php
index 0eea1352..f727be88 100644
--- a/code/app/Models/Subscription/MembershipPlanRate.php
+++ b/code/app/Models/Subscription/MembershipPlanRate.php
@@ -7,7 +7,49 @@
 
 /**
  * Class MembershipPlanRate
+ *
  * @package App\Models\Subscription
+ * @property int $id
+ * @property int $membership_plan_id
+ * @property float $cost
+ * @property int $active
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\Subscription\MembershipPlan $membershipPlan
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Subscription\Subscription> $subscriptions
+ * @property-read int|null $subscriptions_count
+ * @method static \Database\Factories\Subscription\MembershipPlanRateFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlanRate onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereActive($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereCost($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereMembershipPlanId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|MembershipPlanRate whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlanRate withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MembershipPlanRate withoutTrashed()
+ * @mixin \Eloquent
  */
 class MembershipPlanRate extends AtheniaMembershipPlanRate
 {
diff --git a/code/app/Models/Subscription/Subscription.php b/code/app/Models/Subscription/Subscription.php
index b687cea0..f37eab5f 100644
--- a/code/app/Models/Subscription/Subscription.php
+++ b/code/app/Models/Subscription/Subscription.php
@@ -7,7 +7,69 @@
 
 /**
  * Class Subscription
+ *
  * @package App\Models\Subscription
+ * @property int $id
+ * @property int $membership_plan_rate_id
+ * @property int $payment_method_id
+ * @property int $subscriber_id
+ * @property string $subscriber_type
+ * @property \Illuminate\Support\Carbon|null $last_renewed_at
+ * @property \Illuminate\Support\Carbon|null $subscribed_at
+ * @property \Illuminate\Support\Carbon|null $expires_at
+ * @property \Illuminate\Support\Carbon|null $canceled_at
+ * @property int $recurring
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property int $is_trial
+ * @property-read null|string $formatted_cost
+ * @property-read null|string $formatted_expires_at
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment\LineItem> $lineItems
+ * @property-read int|null $line_items_count
+ * @property-read \App\Models\Subscription\MembershipPlanRate $membershipPlanRate
+ * @property-read \App\Models\Payment\PaymentMethod $paymentMethod
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment\Payment> $payments
+ * @property-read int|null $payments_count
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $subscriber
+ * @method static \Database\Factories\Subscription\SubscriptionFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Subscription onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereCanceledAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereExpiresAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereIsTrial($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereLastRenewedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereMembershipPlanRateId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription wherePaymentMethodId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereRecurring($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereSubscribedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereSubscriberId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereSubscriberType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Subscription whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Subscription withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Subscription withoutTrashed()
+ * @mixin \Eloquent
  */
 class Subscription extends AtheniaSubscription
 {
diff --git a/code/app/Models/User/ArticleNote.php b/code/app/Models/User/ArticleNote.php
new file mode 100644
index 00000000..1bc7f427
--- /dev/null
+++ b/code/app/Models/User/ArticleNote.php
@@ -0,0 +1,57 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\User;
+
+use App\Athenia\Models\User\ArticleNote as AtheniaArticleNote;
+
+/**
+ * Class ArticleNote
+ *
+ * @package App\Models\User
+ * @property int $id
+ * @property int $user_id
+ * @property int $article_id
+ * @property string|null $completed_at
+ * @property string|null $response
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \App\Models\Wiki\Article $article
+ * @property-read \App\Models\User\User $user
+ * @method static \Database\Factories\User\ArticleNoteFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleNote onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereArticleId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereCompletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereResponse($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleNote whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleNote withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleNote withoutTrashed()
+ * @mixin \Eloquent
+ */
+class ArticleNote extends AtheniaArticleNote
+{
+}
diff --git a/code/app/Models/User/Contact.php b/code/app/Models/User/Contact.php
index 47d15dfc..96106185 100644
--- a/code/app/Models/User/Contact.php
+++ b/code/app/Models/User/Contact.php
@@ -7,7 +7,50 @@
 
 /**
  * Class Contact
+ *
  * @package App\Models\User
+ * @property int $id
+ * @property int $initiated_by_id
+ * @property int $requested_id
+ * @property \Illuminate\Support\Carbon|null $confirmed_at
+ * @property \Illuminate\Support\Carbon|null $denied_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\User\User $initiatedBy
+ * @property-read \App\Models\User\User $requested
+ * @method static \Database\Factories\User\ContactFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Contact onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereConfirmedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereDeniedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereInitiatedById($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereRequestedId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Contact whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Contact withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Contact withoutTrashed()
+ * @mixin \Eloquent
  */
 class Contact extends AtheniaContact
 {
diff --git a/code/app/Models/User/PasswordToken.php b/code/app/Models/User/PasswordToken.php
index 325f1bdf..750986fc 100644
--- a/code/app/Models/User/PasswordToken.php
+++ b/code/app/Models/User/PasswordToken.php
@@ -7,7 +7,45 @@
 
 /**
  * Class PasswordToken
+ *
  * @package App\Models\User
+ * @property int $id
+ * @property int $user_id
+ * @property string $token
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\User\User $user
+ * @method static \Database\Factories\User\PasswordTokenFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PasswordToken onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereToken($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|PasswordToken whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PasswordToken withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|PasswordToken withoutTrashed()
+ * @mixin \Eloquent
  */
 class PasswordToken extends AtheniaPasswordToken
 {
diff --git a/code/app/Models/User/ProfileImage.php b/code/app/Models/User/ProfileImage.php
index 87cb6612..987baab5 100644
--- a/code/app/Models/User/ProfileImage.php
+++ b/code/app/Models/User/ProfileImage.php
@@ -7,7 +7,60 @@
 
 /**
  * Class ProfileImage
+ *
  * @package App\Models\User
+ * @property int $id
+ * @property int|null $owner_id
+ * @property string|null $name
+ * @property string|null $caption
+ * @property string $url
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property string|null $owner_type
+ * @property string|null $source
+ * @property string|null $alt
+ * @property int $width
+ * @property int $height
+ * @property-read \App\Models\Organization\Organization|null $organization
+ * @property-read ProfileImage|null $owner
+ * @property-read \App\Models\User\User|null $user
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ProfileImage onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereAlt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereCaption($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereHeight($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereOwnerId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereOwnerType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereSource($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereUrl($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ProfileImage whereWidth($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ProfileImage withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ProfileImage withoutTrashed()
+ * @mixin \Eloquent
  */
 class ProfileImage extends AtheniaProfileImage
 {
diff --git a/code/app/Models/User/User.php b/code/app/Models/User/User.php
index 3fde1d66..0545b9e5 100644
--- a/code/app/Models/User/User.php
+++ b/code/app/Models/User/User.php
@@ -7,7 +7,93 @@
 
 /**
  * Class User
+ *
  * @package App\Models\User
+ * @property int $id
+ * @property int|null $merged_to_id
+ * @property string|null $stripe_customer_key
+ * @property string $email
+ * @property string|null $first_name
+ * @property string|null $password
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property int $allow_users_to_add_me
+ * @property int $receive_push_notifications
+ * @property string|null $about_me
+ * @property string|null $push_notification_key
+ * @property int|null $profile_image_id
+ * @property string|null $last_name
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User\ArticleNote> $articleNotes
+ * @property-read int|null $article_notes_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Asset> $assets
+ * @property-read int|null $assets_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Vote\BallotCompletion> $ballotCompletions
+ * @property-read int|null $ballot_completions_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Collection\Collection> $collections
+ * @property-read int|null $collections_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Wiki\Article> $createdArticles
+ * @property-read int|null $created_articles_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Wiki\ArticleIteration> $createdIterations
+ * @property-read int|null $created_iterations_count
+ * @property-read null|string $profile_image_url
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Messaging\Message> $messages
+ * @property-read int|null $messages_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Organization\OrganizationManager> $organizationManagers
+ * @property-read int|null $organization_managers_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment\PaymentMethod> $paymentMethods
+ * @property-read int|null $payment_methods_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment\Payment> $payments
+ * @property-read int|null $payments_count
+ * @property-read \App\Athenia\Models\User\ProfileImage|null $profileImage
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Messaging\PushNotificationKey> $pushNotificationKeys
+ * @property-read int|null $push_notification_keys_count
+ * @property-read \App\Models\Resource|null $resource
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Role> $roles
+ * @property-read int|null $roles_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Subscription\Subscription> $subscriptions
+ * @property-read int|null $subscriptions_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Messaging\Thread> $threads
+ * @property-read int|null $threads_count
+ * @method static \Database\Factories\User\UserFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereAboutMe($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereAllowUsersToAddMe($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereEmail($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereFirstName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereLastName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereMergedToId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User wherePassword($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereProfileImageId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User wherePushNotificationKey($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereReceivePushNotifications($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereStripeCustomerKey($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|User whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User withoutTrashed()
+ * @mixin \Eloquent
  */
 class User extends AtheniaUser
 {
diff --git a/code/app/Models/Vote/Ballot.php b/code/app/Models/Vote/Ballot.php
index 831aa2c7..60a70104 100644
--- a/code/app/Models/Vote/Ballot.php
+++ b/code/app/Models/Vote/Ballot.php
@@ -7,7 +7,48 @@
 
 /**
  * Class Ballot
+ *
  * @package App\Models\Vote
+ * @property int $id
+ * @property string|null $name
+ * @property string $type
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Athenia\Models\Vote\BallotCompletion> $ballotCompletions
+ * @property-read int|null $ballot_completions_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Athenia\Models\Vote\BallotItem> $ballotItems
+ * @property-read int|null $ballot_items_count
+ * @method static \Database\Factories\Vote\BallotFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Ballot onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Ballot whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Ballot withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Ballot withoutTrashed()
+ * @mixin \Eloquent
  */
 class Ballot extends AtheniaBallot
 {
diff --git a/code/app/Models/Vote/BallotCompletion.php b/code/app/Models/Vote/BallotCompletion.php
index 12c1e204..2953f585 100644
--- a/code/app/Models/Vote/BallotCompletion.php
+++ b/code/app/Models/Vote/BallotCompletion.php
@@ -7,7 +7,52 @@
 
 /**
  * Class BallotCompletion
+ *
  * @package App\Models\Vote
+ * @property int $id
+ * @property int $ballot_id
+ * @property int $user_id
+ * @property string|null $completed_at
+ * @property string|null $response
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Athenia\Models\Vote\Ballot $ballot
+ * @property-read \App\Models\User\User $user
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Athenia\Models\Vote\Vote> $votes
+ * @property-read int|null $votes_count
+ * @method static \Database\Factories\Vote\BallotCompletionFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotCompletion onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereBallotId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereCompletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereResponse($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotCompletion whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotCompletion withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotCompletion withoutTrashed()
+ * @mixin \Eloquent
  */
 class BallotCompletion extends AtheniaBallotCompletion
 {
diff --git a/code/app/Models/Vote/BallotItem.php b/code/app/Models/Vote/BallotItem.php
index 4be3ef14..6432b653 100644
--- a/code/app/Models/Vote/BallotItem.php
+++ b/code/app/Models/Vote/BallotItem.php
@@ -7,7 +7,49 @@
 
 /**
  * Class BallotItem
+ *
  * @package App\Models\Vote
+ * @property int $id
+ * @property int $ballot_id
+ * @property int $votes_cast
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property string|null $name
+ * @property-read \App\Athenia\Models\Vote\Ballot $ballot
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Athenia\Models\Vote\BallotItemOption> $ballotItemOptions
+ * @property-read int|null $ballot_item_options_count
+ * @method static \Database\Factories\Vote\BallotItemFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItem onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereBallotId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItem whereVotesCast($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItem withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItem withoutTrashed()
+ * @mixin \Eloquent
  */
 class BallotItem extends AtheniaBallotItem
 {
diff --git a/code/app/Models/Vote/BallotItemOption.php b/code/app/Models/Vote/BallotItemOption.php
index 963010de..ab17bfc1 100644
--- a/code/app/Models/Vote/BallotItemOption.php
+++ b/code/app/Models/Vote/BallotItemOption.php
@@ -7,7 +7,52 @@
 
 /**
  * Class BallotItemOption
+ *
  * @package App\Models\Vote
+ * @property int $id
+ * @property int $ballot_item_id
+ * @property int $vote_count
+ * @property int $subject_id
+ * @property string $subject_type
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Athenia\Models\Vote\BallotItem $ballotItem
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $subject
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Athenia\Models\Vote\Vote> $votes
+ * @property-read int|null $votes_count
+ * @method static \Database\Factories\Vote\BallotItemOptionFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItemOption onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereBallotItemId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereSubjectId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereSubjectType($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|BallotItemOption whereVoteCount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItemOption withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BallotItemOption withoutTrashed()
+ * @mixin \Eloquent
  */
 class BallotItemOption extends AtheniaBallotItemOption
 {
diff --git a/code/app/Models/Vote/Vote.php b/code/app/Models/Vote/Vote.php
index 745a1833..7ced79c2 100644
--- a/code/app/Models/Vote/Vote.php
+++ b/code/app/Models/Vote/Vote.php
@@ -7,7 +7,48 @@
 
 /**
  * Class Vote
+ *
  * @package App\Models\Vote
+ * @property int $id
+ * @property int $ballot_item_option_id
+ * @property int $ballot_completion_id
+ * @property int $result
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Athenia\Models\Vote\BallotCompletion $ballotCompletion
+ * @property-read \App\Athenia\Models\Vote\BallotItemOption $ballotItemOption
+ * @method static \Database\Factories\Vote\VoteFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Vote onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereBallotCompletionId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereBallotItemOptionId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereResult($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Vote whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Vote withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Vote withoutTrashed()
+ * @mixin \Eloquent
  */
 class Vote extends AtheniaVote
 {
diff --git a/code/app/Models/Wiki/Article.php b/code/app/Models/Wiki/Article.php
index 8bf3884f..20f6e7ee 100644
--- a/code/app/Models/Wiki/Article.php
+++ b/code/app/Models/Wiki/Article.php
@@ -7,7 +7,67 @@
 
 /**
  * Class Article
+ *
  * @package App\Models\Wiki
+ * @property int $id
+ * @property int $created_by_id
+ * @property string $title
+ * @property string|null $url
+ * @property string|null $authors
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property int $has_full_modification_history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User\ArticleNote> $articleNotes
+ * @property-read int|null $article_notes_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Category> $categories
+ * @property-read int|null $categories_count
+ * @property-read \App\Models\User\User $createdBy
+ * @property-read null|string $content
+ * @property-read null|\App\Models\Wiki\ArticleVersion $current_version
+ * @property-read null|string $last_iteration_content
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Wiki\ArticleIteration> $iterations
+ * @property-read int|null $iterations_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Wiki\ArticleModification> $modifications
+ * @property-read int|null $modifications_count
+ * @property-read \App\Models\Resource|null $resource
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Statistic\TargetStatistic> $targetStatistics
+ * @property-read int|null $target_statistics_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Wiki\ArticleVersion> $versions
+ * @property-read int|null $versions_count
+ * @method static \Database\Factories\Wiki\ArticleFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Article onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereAuthors($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereCreatedById($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereHasFullModificationHistory($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereTitle($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereUpdatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|Article whereUrl($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Article withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Article withoutTrashed()
+ * @mixin \Eloquent
  */
 class Article extends AtheniaArticle
 {
diff --git a/code/app/Models/Wiki/ArticleIteration.php b/code/app/Models/Wiki/ArticleIteration.php
index 3a6d0683..1cedcb37 100644
--- a/code/app/Models/Wiki/ArticleIteration.php
+++ b/code/app/Models/Wiki/ArticleIteration.php
@@ -7,7 +7,52 @@
 
 /**
  * Class ArticleIteration
+ *
  * @package App\Models\Wiki
+ * @property int $id
+ * @property string $content
+ * @property int $created_by_id
+ * @property int $article_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property int|null $article_modification_id
+ * @property-read \App\Models\Wiki\Article $article
+ * @property-read \App\Models\User\User $createdBy
+ * @property-read \App\Models\Wiki\ArticleModification|null $modification
+ * @property-read \App\Models\Wiki\ArticleVersion|null $version
+ * @method static \Database\Factories\Wiki\ArticleIterationFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleIteration onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereArticleId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereArticleModificationId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereContent($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereCreatedById($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleIteration whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleIteration withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleIteration withoutTrashed()
+ * @mixin \Eloquent
  */
 class ArticleIteration extends AtheniaArticleIteration
 {
diff --git a/code/app/Models/Wiki/ArticleModification.php b/code/app/Models/Wiki/ArticleModification.php
index 6c2d8649..38927791 100644
--- a/code/app/Models/Wiki/ArticleModification.php
+++ b/code/app/Models/Wiki/ArticleModification.php
@@ -7,7 +7,52 @@
 
 /**
  * Class ArticleModification
+ *
  * @package App\Models\Wiki
+ * @property int $id
+ * @property int $article_id
+ * @property string $action
+ * @property int $start_position
+ * @property int|null $length
+ * @property string|null $content
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\Wiki\Article $article
+ * @property-read \App\Models\Wiki\ArticleIteration|null $iteration
+ * @method static \Database\Factories\Wiki\ArticleModificationFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleModification onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereAction($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereArticleId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereContent($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereLength($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereStartPosition($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleModification whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleModification withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleModification withoutTrashed()
+ * @mixin \Eloquent
  */
 class ArticleModification extends AtheniaArticleModification
 {
diff --git a/code/app/Models/Wiki/ArticleVersion.php b/code/app/Models/Wiki/ArticleVersion.php
index ba4481c1..9813945f 100644
--- a/code/app/Models/Wiki/ArticleVersion.php
+++ b/code/app/Models/Wiki/ArticleVersion.php
@@ -7,7 +7,48 @@
 
 /**
  * Class ArticleVersion
+ *
  * @package App\Models\Wiki
+ * @property int $id
+ * @property int $article_id
+ * @property int $article_iteration_id
+ * @property string|null $name
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\Wiki\Article $article
+ * @property-read \App\Models\Wiki\ArticleIteration $articleIteration
+ * @method static \Database\Factories\Wiki\ArticleVersionFactory factory($count = null, $state = [])
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion getAggregateMethod()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion isAppendRelationsCount()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion isLeftJoin()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion isUseTableAlias()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion joinRelations($relations, $leftJoin = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion newModelQuery()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleVersion onlyTrashed()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion orWhereInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion orWhereJoin($column, $operator, $value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion orWhereNotInJoin($column, $values)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion orderByJoin($column, $direction = 'asc', $aggregateMethod = null)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion query()
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion setAggregateMethod(string $aggregateMethod)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion setAppendRelationsCount(bool $appendRelationsCount)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion setLeftJoin(bool $leftJoin)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion setUseTableAlias(bool $useTableAlias)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereArticleId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereArticleIterationId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereCreatedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereDeletedAt($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereId($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereInJoin($column, $values, $boolean = 'and', $not = false)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereJoin($column, $operator, $value, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereName($value)
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereNotInJoin($column, $values, $boolean = 'and')
+ * @method static \AdminUI\Laravel\EloquentJoin\EloquentJoinBuilder<static>|ArticleVersion whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleVersion withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|ArticleVersion withoutTrashed()
+ * @mixin \Eloquent
  */
 class ArticleVersion extends AtheniaArticleVersion
 {
diff --git a/code/app/Policies/User/ArticleNotePolicy.php b/code/app/Policies/User/ArticleNotePolicy.php
new file mode 100644
index 00000000..b693a26a
--- /dev/null
+++ b/code/app/Policies/User/ArticleNotePolicy.php
@@ -0,0 +1,81 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Policies\User;
+
+use App\Athenia\Policies\BasePolicyAbstract;
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+
+/**
+ * Class ArticleNotePolicy
+ * @package App\Policies\User
+ */
+class ArticleNotePolicy extends BasePolicyAbstract
+{
+    /**
+     * Any logged in user can view their own article notes
+     *
+     * @param User $loggedInUser
+     * @param User $requestedUser
+     * @return bool
+     */
+    public function all(User $loggedInUser, User $requestedUser)
+    {
+        return $loggedInUser->id == $requestedUser->id;
+    }
+
+    /**
+     * Any logged in user can create article notes for themselves
+     *
+     * @param User $loggedInUser
+     * @param User $requestedUser
+     * @return bool
+     */
+    public function create(User $loggedInUser, User $requestedUser)
+    {
+        return $loggedInUser->id == $requestedUser->id;
+    }
+
+    /**
+     * Any logged in user can view their own article note
+     *
+     * @param User $loggedInUser
+     * @param User $requestedUser
+     * @param ArticleNote $articleNote
+     * @return bool
+     */
+    public function view(User $loggedInUser, User $requestedUser, ArticleNote $articleNote)
+    {
+        return $loggedInUser->id == $requestedUser->id &&
+            $requestedUser->id == $articleNote->user_id;
+    }
+
+    /**
+     * Any logged in user can update their own article note
+     *
+     * @param User $loggedInUser
+     * @param User $requestedUser
+     * @param ArticleNote $articleNote
+     * @return bool
+     */
+    public function update(User $loggedInUser, User $requestedUser, ArticleNote $articleNote)
+    {
+        return $loggedInUser->id == $requestedUser->id &&
+            $requestedUser->id == $articleNote->user_id;
+    }
+
+    /**
+     * Any logged in user can delete their own article note
+     *
+     * @param User $loggedInUser
+     * @param User $requestedUser
+     * @param ArticleNote $articleNote
+     * @return bool
+     */
+    public function delete(User $loggedInUser, User $requestedUser, ArticleNote $articleNote)
+    {
+        return $loggedInUser->id == $requestedUser->id &&
+            $requestedUser->id == $articleNote->user_id;
+    }
+}
diff --git a/code/app/Providers/AppRepositoryProvider.php b/code/app/Providers/AppRepositoryProvider.php
index 5c12b4c6..30a546c2 100644
--- a/code/app/Providers/AppRepositoryProvider.php
+++ b/code/app/Providers/AppRepositoryProvider.php
@@ -39,4 +39,4 @@ public function appMorphMaps(): array
     public function registerApp(): void
     {
     }
-}
\ No newline at end of file
+}
diff --git a/code/app/Providers/AppServiceProvider.php b/code/app/Providers/AppServiceProvider.php
index 700a7c1c..7f75cb70 100644
--- a/code/app/Providers/AppServiceProvider.php
+++ b/code/app/Providers/AppServiceProvider.php
@@ -18,8 +18,7 @@ class AppServiceProvider extends BaseServiceProvider
      */
     public function appProviders(): array
     {
-        return [
-        ];
+        return [];
     }
 
     /**
diff --git a/code/database/factories/User/ArticleNoteFactory.php b/code/database/factories/User/ArticleNoteFactory.php
new file mode 100644
index 00000000..173de874
--- /dev/null
+++ b/code/database/factories/User/ArticleNoteFactory.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+namespace Database\Factories\User;
+
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use App\Models\Wiki\Article;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * Class ArticleNoteFactory
+ * @package Database\Factories\User
+ */
+class ArticleNoteFactory extends Factory
+{
+    /**
+     * @var string The related model
+     */
+    protected $model = ArticleNote::class;
+
+    /**
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'user_id' => User::factory()->create()->id,
+            'article_id' => Article::factory()->create()->id,
+            'response' => $this->faker->optional()->text(),
+            'completed_at' => $this->faker->optional()->dateTime(),
+        ];
+    }
+}
diff --git a/code/database/factories/Wiki/ArticleFactory.php b/code/database/factories/Wiki/ArticleFactory.php
index 17267014..dc266bed 100644
--- a/code/database/factories/Wiki/ArticleFactory.php
+++ b/code/database/factories/Wiki/ArticleFactory.php
@@ -25,6 +25,8 @@ public function definition()
     {
         return [
             'title' => $this->faker->title,
+            'url' => $this->faker->optional()->url(),
+            'authors' => $this->faker->optional()->name(),
             'created_by_id' => User::factory()->create()->id,
         ];
     }
diff --git a/code/database/migrations/2025_11_23_173331_setup_article_notes.php b/code/database/migrations/2025_11_23_173331_setup_article_notes.php
new file mode 100644
index 00000000..0918e248
--- /dev/null
+++ b/code/database/migrations/2025_11_23_173331_setup_article_notes.php
@@ -0,0 +1,65 @@
+<?php
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Class SetupArticleNotes
+ */
+class SetupArticleNotes extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up(): void
+    {
+        // Create article_notes table
+        Schema::create('article_notes', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedInteger('user_id');
+            $table->unsignedInteger('article_id');
+            $table->timestamp('completed_at')->nullable();
+            $table->text('response')->nullable();
+            $table->timestamps();
+            $table->softDeletes();
+
+            $table->foreign('user_id')
+                ->references('id')
+                ->on('users')
+                ->onDelete('cascade');
+
+            $table->foreign('article_id')
+                ->references('id')
+                ->on('articles')
+                ->onDelete('cascade');
+
+            $table->unique(['user_id', 'article_id']);
+        });
+
+        // Add url and authors fields to articles table
+        Schema::table('articles', function (Blueprint $table) {
+            $table->string('url')->nullable()->after('title');
+            $table->text('authors')->nullable()->after('url');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down(): void
+    {
+        // Drop url and authors columns from articles
+        Schema::table('articles', function (Blueprint $table) {
+            $table->dropColumn(['url', 'authors']);
+        });
+
+        // Drop article_notes table
+        Schema::dropIfExists('article_notes');
+    }
+}
diff --git a/code/database/seeders/ArticleNoteStatisticsSeeder.php b/code/database/seeders/ArticleNoteStatisticsSeeder.php
new file mode 100644
index 00000000..736b4048
--- /dev/null
+++ b/code/database/seeders/ArticleNoteStatisticsSeeder.php
@@ -0,0 +1,52 @@
+<?php
+declare(strict_types=1);
+
+namespace Database\Seeders;
+
+use App\Models\Statistic\Statistic;
+use App\Models\Statistic\StatisticFilter;
+use Illuminate\Database\Seeder;
+
+/**
+ * Class ArticleNoteStatisticsSeeder
+ */
+class ArticleNoteStatisticsSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run(): void
+    {
+        // Create the total_notes statistic if it doesn't exist
+        $totalNotesStatistic = Statistic::firstOrCreate(
+            ['name' => 'total_notes', 'model' => 'article'],
+            [
+                'relation' => 'articleNotes',
+                'public' => true,
+            ]
+        );
+
+        // Create the total_completed_notes statistic if it doesn't exist
+        $totalCompletedNotesStatistic = Statistic::firstOrCreate(
+            ['name' => 'total_completed_notes', 'model' => 'article'],
+            [
+                'relation' => 'articleNotes',
+                'public' => true,
+            ]
+        );
+
+        // Add filter to only count notes where completed_at is not null
+        StatisticFilter::firstOrCreate(
+            [
+                'statistic_id' => $totalCompletedNotesStatistic->id,
+                'field' => 'completed_at',
+            ],
+            [
+                'operator' => '!=',
+                'value' => null,
+            ]
+        );
+    }
+}
diff --git a/code/routes/core.php b/code/routes/core.php
index f2165d05..32c86db2 100644
--- a/code/routes/core.php
+++ b/code/routes/core.php
@@ -161,6 +161,15 @@
     Route::group(['prefix' => 'users/{user}', 'as' => 'user.'], function () {
         require 'entity-routes.php';
 
+        Route::resource('article-notes', 'User\ArticleNoteController', [
+            'except' => [
+                'create', 'edit',
+            ],
+        ]);
+
+        Route::post('random-article', 'User\ArticleNoteController@randomArticle')
+            ->name('random-article');
+
         Route::resource('ballot-completions', 'User\BallotCompletionController', [
             'only' => [
                 'index',
diff --git a/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteCreateTest.php b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteCreateTest.php
new file mode 100644
index 00000000..06693896
--- /dev/null
+++ b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteCreateTest.php
@@ -0,0 +1,180 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Feature\User\ArticleNote;
+
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use App\Models\Wiki\Article;
+use Tests\DatabaseSetupTrait;
+use Tests\TestCase;
+use Tests\Traits\MocksApplicationLog;
+
+/**
+ * Class UserArticleNoteCreateTest
+ * @package Tests\Athenia\Feature\User\ArticleNote
+ */
+final class UserArticleNoteCreateTest extends TestCase
+{
+    use DatabaseSetupTrait, MocksApplicationLog;
+
+    /**
+     * @var string
+     */
+    private $path = '/v1/users/';
+
+    /**
+     * @var User
+     */
+    private $user;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->setupDatabase();
+        $this->mockApplicationLog();
+        $this->user = User::factory()->create();
+
+        $this->path.= $this->user->id . '/article-notes';
+    }
+
+    public function testNotLoggedInUserBlocked(): void
+    {
+        $response = $this->json('POST', $this->path);
+
+        $response->assertStatus(403);
+    }
+
+    public function testDifferentUserBlocked(): void
+    {
+        $otherUser = User::factory()->create();
+        $this->actingAs($otherUser);
+
+        $response = $this->json('POST', $this->path);
+
+        $response->assertStatus(403);
+    }
+
+    public function testCreateSuccessful(): void
+    {
+        $this->actingAs($this->user);
+
+        $article = Article::factory()->create();
+
+        $response = $this->json('POST', $this->path, [
+            'article_id' => $article->id,
+            'response' => 'My note',
+        ]);
+
+        $response->assertStatus(201);
+
+        /** @var ArticleNote $articleNote */
+        $articleNote = ArticleNote::first();
+        $this->assertEquals($this->user->id, $articleNote->user_id);
+        $this->assertEquals($article->id, $articleNote->article_id);
+        $this->assertEquals('My note', $articleNote->response);
+        $this->assertNull($articleNote->completed_at);
+    }
+
+    public function testCreateSuccessfulWithCompleted(): void
+    {
+        $this->actingAs($this->user);
+
+        $article = Article::factory()->create();
+
+        $response = $this->json('POST', $this->path, [
+            'article_id' => $article->id,
+            'completed' => true,
+        ]);
+
+        $response->assertStatus(201);
+
+        /** @var ArticleNote $articleNote */
+        $articleNote = ArticleNote::first();
+        $this->assertNotNull($articleNote->completed_at);
+    }
+
+    public function testCreateFailsMissingRequiredFields(): void
+    {
+        $this->actingAs($this->user);
+
+        $response = $this->json('POST', $this->path);
+
+        $response->assertStatus(400);
+        $response->assertJson([
+            'errors' => [
+                'article_id' => ['The article id field is required.'],
+            ]
+        ]);
+    }
+
+    public function testCreateFailsInvalidBooleanFields(): void
+    {
+        $this->actingAs($this->user);
+
+        $article = Article::factory()->create();
+
+        $response = $this->json('POST', $this->path, [
+            'article_id' => $article->id,
+            'completed' => 'not-a-boolean',
+        ]);
+
+        $response->assertStatus(400);
+        $response->assertJson([
+            'errors' => [
+                'completed' => ['The completed field must be true or false.'],
+            ]
+        ]);
+    }
+
+    public function testCreateFailsInvalidStringFields(): void
+    {
+        $this->actingAs($this->user);
+
+        $article = Article::factory()->create();
+
+        $response = $this->json('POST', $this->path, [
+            'article_id' => $article->id,
+            'response' => 12345,
+        ]);
+
+        $response->assertStatus(400);
+        $response->assertJson([
+            'errors' => [
+                'response' => ['The response must be a string.'],
+            ]
+        ]);
+    }
+
+    public function testCreateFailsInvalidIntegerFields(): void
+    {
+        $this->actingAs($this->user);
+
+        $response = $this->json('POST', $this->path, [
+            'article_id' => 'not-an-integer',
+        ]);
+
+        $response->assertStatus(400);
+        $response->assertJson([
+            'errors' => [
+                'article_id' => ['The article id must be an integer.'],
+            ]
+        ]);
+    }
+
+    public function testCreateFailsInvalidModelFields(): void
+    {
+        $this->actingAs($this->user);
+
+        $response = $this->json('POST', $this->path, [
+            'article_id' => 99999,
+        ]);
+
+        $response->assertStatus(400);
+        $response->assertJson([
+            'errors' => [
+                'article_id' => ['The selected article id is invalid.'],
+            ]
+        ]);
+    }
+}
diff --git a/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteDeleteTest.php b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteDeleteTest.php
new file mode 100644
index 00000000..02f54d3a
--- /dev/null
+++ b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteDeleteTest.php
@@ -0,0 +1,87 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Feature\User\ArticleNote;
+
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use Tests\DatabaseSetupTrait;
+use Tests\TestCase;
+use Tests\Traits\MocksApplicationLog;
+
+/**
+ * Class UserArticleNoteDeleteTest
+ * @package Tests\Athenia\Feature\User\ArticleNote
+ */
+final class UserArticleNoteDeleteTest extends TestCase
+{
+    use DatabaseSetupTrait, MocksApplicationLog;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->setupDatabase();
+        $this->mockApplicationLog();
+    }
+
+    public function testNotLoggedInUserBlocked(): void
+    {
+        $user = User::factory()->create();
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $user->id,
+        ]);
+
+        $response = $this->json('DELETE', '/v1/users/' . $user->id . '/article-notes/' . $articleNote->id);
+        $response->assertStatus(403);
+    }
+
+    public function testDifferentUserBlocked(): void
+    {
+        $user = User::factory()->create();
+        $otherUser = User::factory()->create();
+        $this->actingAs($otherUser);
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $user->id,
+        ]);
+
+        $response = $this->json('DELETE', '/v1/users/' . $user->id . '/article-notes/' . $articleNote->id);
+        $response->assertStatus(403);
+    }
+
+    public function testDeleteSingle(): void
+    {
+        $this->actAsUser();
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $this->actingAs->id,
+        ]);
+
+        $response = $this->json('DELETE', '/v1/users/' . $this->actingAs->id . '/article-notes/' . $articleNote->id);
+
+        $response->assertStatus(204);
+        $this->assertNull(ArticleNote::find($articleNote->id));
+    }
+
+    public function testDeleteSingleInvalidIdFails(): void
+    {
+        $this->actAsUser();
+
+        $response = $this->json('DELETE', '/v1/users/' . $this->actingAs->id . '/article-notes/a')
+            ->assertExactJson([
+                'message'   => 'This item was not found.',
+            ]);
+        $response->assertStatus(404);
+    }
+
+    public function testDeleteSingleNotFoundFails(): void
+    {
+        $this->actAsUser();
+
+        $response = $this->json('DELETE', '/v1/users/' . $this->actingAs->id . '/article-notes/99999')
+            ->assertExactJson([
+                'message'   =>  'This item was not found.'
+            ]);
+        $response->assertStatus(404);
+    }
+}
diff --git a/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteIndexTest.php b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteIndexTest.php
new file mode 100644
index 00000000..c18eb97a
--- /dev/null
+++ b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteIndexTest.php
@@ -0,0 +1,160 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Feature\User\ArticleNote;
+
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use Tests\DatabaseSetupTrait;
+use Tests\TestCase;
+use Tests\Traits\MocksApplicationLog;
+
+/**
+ * Class UserArticleNoteIndexTest
+ * @package Tests\Athenia\Feature\User\ArticleNote
+ */
+final class UserArticleNoteIndexTest extends TestCase
+{
+    use DatabaseSetupTrait, MocksApplicationLog;
+
+    /**
+     * @var string
+     */
+    private $path = '/v1/users/';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->setupDatabase();
+        $this->mockApplicationLog();
+        User::unsetEventDispatcher();
+    }
+
+    public function testNotLoggedInUserBlocked(): void
+    {
+        $user = User::factory()->create();
+
+        $response = $this->json('GET', $this->path . $user->id . '/article-notes');
+
+        $response->assertStatus(403);
+    }
+
+    public function testIncorrectUserBlocked(): void
+    {
+        $this->actAsUser();
+        $user = User::factory()->create();
+
+        $response = $this->json('GET', $this->path . $user->id . '/article-notes');
+
+        $response->assertStatus(403);
+    }
+
+    public function testUserNotFound(): void
+    {
+        $this->actAsUser();
+
+        $response = $this->json('GET', $this->path . '12/article-notes');
+
+        $response->assertStatus(404);
+    }
+
+    public function testGetPaginationEmpty(): void
+    {
+        $this->actAsUser();
+
+        $response = $this->json('GET', $this->path. $this->actingAs->id . '/article-notes');
+
+        $response->assertStatus(200);
+        $response->assertJson([
+            'total' => 0,
+            'data' => []
+        ]);
+    }
+
+    public function testGetPaginationResult(): void
+    {
+        $this->actAsUser();
+
+        ArticleNote::factory()->count(4)->create();
+        ArticleNote::factory()->count(15)->create([
+            'user_id' => $this->actingAs->id,
+        ]);
+
+        // first page
+        $response = $this->json('GET', $this->path . $this->actingAs->id . '/article-notes');
+        $response->assertStatus(200);
+        $response->assertJson([
+            'total' => 15,
+            'current_page' => 1,
+            'per_page' => 10,
+            'from' => 1,
+            'to' => 10,
+            'last_page' => 2
+        ])
+            ->assertJsonStructure([
+                'data' => [
+                    '*' =>  array_keys((new ArticleNote())->toArray())
+                ]
+            ]);
+
+        // second page
+        $response = $this->json('GET', $this->path . $this->actingAs->id . '/article-notes?page=2');
+        $response->assertStatus(200);
+        $response->assertJson([
+            'total' =>  15,
+            'current_page' => 2,
+            'per_page' => 10,
+            'from' => 11,
+            'to' => 15,
+            'last_page' => 2
+        ])
+            ->assertJsonStructure([
+                'data' => [
+                    '*' =>  array_keys((new ArticleNote())->toArray())
+                ]
+            ]);
+
+        // page with limit
+        $response = $this->json('GET', $this->path . $this->actingAs->id . '/article-notes?page=2&limit=5');
+        $response->assertStatus(200);
+        $response->assertJson([
+            'total' =>  15,
+            'current_page' => 2,
+            'per_page' => 5,
+            'from' => 6,
+            'to' => 10,
+            'last_page' => 3
+        ])
+            ->assertJsonStructure([
+                'data' => [
+                    '*' =>  array_keys((new ArticleNote())->toArray())
+                ]
+            ]);
+    }
+
+    public function testGetPaginationWithExpands(): void
+    {
+        $this->actAsUser();
+
+        ArticleNote::factory()->count(5)->create([
+            'user_id' => $this->actingAs->id,
+        ]);
+
+        // with expands
+        $response = $this->json('GET', $this->path . $this->actingAs->id . '/article-notes?expand[user]=*&expand[article]=*');
+        $response->assertStatus(200);
+        $response->assertJson([
+            'total' => 5,
+            'current_page' => 1,
+            'per_page' => 10,
+            'from' => 1,
+            'to' => 5,
+            'last_page' => 1
+        ])
+            ->assertJsonStructure([
+                'data' => [
+                    '*' => array_keys((new ArticleNote())->toArray())
+                ]
+            ]);
+    }
+}
diff --git a/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteRandomArticleTest.php b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteRandomArticleTest.php
new file mode 100644
index 00000000..468c2c60
--- /dev/null
+++ b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteRandomArticleTest.php
@@ -0,0 +1,278 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Feature\Http\User\ArticleNote;
+
+use App\Models\User\User;
+use App\Models\Wiki\Article;
+use Tests\DatabaseSetupTrait;
+use Tests\TestCase;
+use Tests\Traits\MocksApplicationLog;
+
+/**
+ * Class UserArticleNoteRandomArticleTest
+ * @package Tests\Athenia\Feature\Http\User\ArticleNote
+ */
+final class UserArticleNoteRandomArticleTest extends TestCase
+{
+    use DatabaseSetupTrait, MocksApplicationLog;
+
+    /**
+     * @var string
+     */
+    private $path;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->setupDatabase();
+        $this->mockApplicationLog();
+
+        // Seed article note statistics
+        $this->seed(\Database\Seeders\ArticleNoteStatisticsSeeder::class);
+    }
+
+    public function testNotLoggedInUserBlocked(): void
+    {
+        $user = User::factory()->create();
+        $this->path = '/v1/users/' . $user->id . '/random-article';
+
+        $response = $this->json('POST', $this->path);
+
+        $response->assertStatus(403);
+    }
+
+    public function testNotUserBlocked(): void
+    {
+        $user = User::factory()->create();
+        $this->path = '/v1/users/' . $user->id . '/random-article';
+
+        $requestingUser = User::factory()->create();
+        $this->actingAs($requestingUser);
+
+        $response = $this->json('POST', $this->path);
+
+        $response->assertStatus(403);
+    }
+
+    public function testRandomArticleSuccessCreatesNoteAndReturnsWithArticle(): void
+    {
+        $user = User::factory()->create();
+        $this->path = '/v1/users/' . $user->id . '/random-article';
+
+        // Create some articles
+        $article1 = Article::factory()->create(['title' => 'Test Article 1']);
+        $article2 = Article::factory()->create(['title' => 'Test Article 2']);
+
+        $this->actingAs($user);
+
+        $response = $this->json('POST', $this->path);
+
+        $response->assertStatus(201);
+        $response->assertJson([
+            'user_id' => $user->id,
+        ]);
+
+        // Verify article is loaded
+        $data = $response->json();
+        $this->assertArrayHasKey('article', $data);
+        $this->assertArrayHasKey('id', $data['article']);
+        $this->assertArrayHasKey('title', $data['article']);
+
+        // Verify article note was created
+        $this->assertDatabaseHas('article_notes', [
+            'user_id' => $user->id,
+            'article_id' => $data['article_id'],
+        ]);
+    }
+
+    public function testRandomArticleSelectsArticleWithoutNoteFirst(): void
+    {
+        $user = User::factory()->create();
+        $this->path = '/v1/users/' . $user->id . '/random-article';
+
+        // Create two articles
+        $articleWithIncompleteNote = Article::factory()->create(['title' => 'Has Incomplete']);
+        $articleWithoutNote = Article::factory()->create(['title' => 'No Note']);
+
+        // Create incomplete note on first article
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $user->id,
+            'article_id' => $articleWithIncompleteNote->id,
+            'completed_at' => null,
+        ]);
+
+        $this->actingAs($user);
+
+        $response = $this->json('POST', $this->path);
+
+        $response->assertStatus(201);
+
+        // Should select the article without a note (or any other article without a note)
+        $data = $response->json();
+
+        // The selected article should NOT be the one with incomplete note
+        // (unless all articles without notes are exhausted, which shouldn't happen in this test)
+        $this->assertNotEquals($articleWithIncompleteNote->id, $data['article_id']);
+    }
+
+    public function testRandomArticleNeverReturnsCompletedArticle(): void
+    {
+        $user = User::factory()->create();
+        $this->path = '/v1/users/' . $user->id . '/random-article';
+
+        // Create two articles
+        $completedArticle = Article::factory()->create(['title' => 'Completed']);
+        $availableArticle = Article::factory()->create(['title' => 'Available']);
+
+        // Mark first article as completed
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $user->id,
+            'article_id' => $completedArticle->id,
+            'completed_at' => now(),
+        ]);
+
+        $this->actingAs($user);
+
+        $response = $this->json('POST', $this->path);
+
+        $response->assertStatus(201);
+
+        $data = $response->json();
+
+        // Should never return the completed article
+        $this->assertNotEquals($completedArticle->id, $data['article_id']);
+    }
+
+    public function testRandomArticlePrefersArticlesWithLowerCompletedNotesStatistic(): void
+    {
+        $currentUser = User::factory()->create();
+        $this->path = '/v1/users/' . $currentUser->id . '/random-article';
+
+        // Create three articles
+        $articleLowCompleted = Article::factory()->create(['title' => 'Low Completed']);
+        $articleMedCompleted = Article::factory()->create(['title' => 'Medium Completed']);
+        $articleHighCompleted = Article::factory()->create(['title' => 'High Completed']);
+
+        // Create other users who have completed notes
+        $otherUser1 = User::factory()->create();
+        $otherUser2 = User::factory()->create();
+        $otherUser3 = User::factory()->create();
+
+        // Article high has 3 completed notes
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $otherUser1->id,
+            'article_id' => $articleHighCompleted->id,
+            'completed_at' => now(),
+        ]);
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $otherUser2->id,
+            'article_id' => $articleHighCompleted->id,
+            'completed_at' => now(),
+        ]);
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $otherUser3->id,
+            'article_id' => $articleHighCompleted->id,
+            'completed_at' => now(),
+        ]);
+
+        // Article medium has 2 completed notes
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $otherUser1->id,
+            'article_id' => $articleMedCompleted->id,
+            'completed_at' => now(),
+        ]);
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $otherUser2->id,
+            'article_id' => $articleMedCompleted->id,
+            'completed_at' => now(),
+        ]);
+
+        // Article low has 1 completed note
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $otherUser1->id,
+            'article_id' => $articleLowCompleted->id,
+            'completed_at' => now(),
+        ]);
+
+        // Synchronize statistics for all articles
+        $synchronizationService = app(\App\Athenia\Contracts\Services\Statistic\StatisticSynchronizationServiceContract::class);
+        $synchronizationService->synchronizeTargetStatistics($articleLowCompleted);
+        $synchronizationService->synchronizeTargetStatistics($articleMedCompleted);
+        $synchronizationService->synchronizeTargetStatistics($articleHighCompleted);
+
+        $this->actingAs($currentUser);
+
+        $response = $this->json('POST', $this->path);
+
+        $response->assertStatus(201);
+        $data = $response->json();
+
+        // Should select an article based on statistics
+        // With random ordering, any article could be selected, but it should be one with lower statistics
+        $this->assertNotNull($data['article_id']);
+        $this->assertIsInt($data['article_id']);
+
+        // Verify the article_note was created for the current user
+        $this->assertEquals($currentUser->id, $data['user_id']);
+    }
+
+    public function testRandomArticlePrefersArticlesWithLowerTotalNotesWhenCompletedEqual(): void
+    {
+        $currentUser = User::factory()->create();
+        $this->path = '/v1/users/' . $currentUser->id . '/random-article';
+
+        // Create two articles with same completed notes but different total notes
+        $articleLowTotal = Article::factory()->create(['title' => 'Low Total']);
+        $articleHighTotal = Article::factory()->create(['title' => 'High Total']);
+
+        // Create other users
+        $otherUser1 = User::factory()->create();
+        $otherUser2 = User::factory()->create();
+        $otherUser3 = User::factory()->create();
+
+        // Both articles have 1 completed note (same)
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $otherUser1->id,
+            'article_id' => $articleLowTotal->id,
+            'completed_at' => now(),
+        ]);
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $otherUser2->id,
+            'article_id' => $articleHighTotal->id,
+            'completed_at' => now(),
+        ]);
+
+        // Article high total has 2 additional incomplete notes (3 total notes vs 1)
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => $otherUser3->id,
+            'article_id' => $articleHighTotal->id,
+            'completed_at' => null,
+        ]);
+        \App\Models\User\ArticleNote::factory()->create([
+            'user_id' => User::factory()->create()->id,
+            'article_id' => $articleHighTotal->id,
+            'completed_at' => null,
+        ]);
+
+        // Synchronize statistics
+        $synchronizationService = app(\App\Athenia\Contracts\Services\Statistic\StatisticSynchronizationServiceContract::class);
+        $synchronizationService->synchronizeTargetStatistics($articleLowTotal);
+        $synchronizationService->synchronizeTargetStatistics($articleHighTotal);
+
+        $this->actingAs($currentUser);
+
+        $response = $this->json('POST', $this->path);
+
+        $response->assertStatus(201);
+        $data = $response->json();
+
+        // Should select an article based on statistics
+        // With random ordering, any article could be selected, but it should prioritize lower statistics
+        $this->assertNotNull($data['article_id']);
+        $this->assertIsInt($data['article_id']);
+
+        // Verify the article_note was created for the current user
+        $this->assertEquals($currentUser->id, $data['user_id']);
+    }
+}
diff --git a/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteUpdateTest.php b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteUpdateTest.php
new file mode 100644
index 00000000..3197c336
--- /dev/null
+++ b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteUpdateTest.php
@@ -0,0 +1,172 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Feature\User\ArticleNote;
+
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use Tests\DatabaseSetupTrait;
+use Tests\TestCase;
+use Tests\Traits\MocksApplicationLog;
+
+/**
+ * Class UserArticleNoteUpdateTest
+ * @package Tests\Athenia\Feature\User\ArticleNote
+ */
+final class UserArticleNoteUpdateTest extends TestCase
+{
+    use DatabaseSetupTrait, MocksApplicationLog;
+
+    /**
+     * @var string
+     */
+    private $path = '/v1/users/';
+
+    private $user;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->setupDatabase();
+        $this->mockApplicationLog();
+        $this->user = User::factory()->create();
+
+        $this->path.= $this->user->id . '/article-notes/';
+    }
+
+    public function testNotLoggedInUserBlocked(): void
+    {
+        $articleNote = ArticleNote::factory()->create();
+
+        $response = $this->json('PUT', $this->path . $articleNote->id);
+
+        $response->assertStatus(403);
+    }
+
+    public function testDifferentUserBlocked(): void
+    {
+        $otherUser = User::factory()->create();
+        $this->actingAs($otherUser);
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $this->user->id,
+        ]);
+
+        $response = $this->json('PUT', $this->path . $articleNote->id);
+
+        $response->assertStatus(403);
+    }
+
+    public function testNotFound(): void
+    {
+        $this->actingAs($this->user);
+
+        $response = $this->json('PUT', $this->path . '453');
+
+        $response->assertStatus(404);
+    }
+
+    public function testUpdateSuccessful(): void
+    {
+        $this->actingAs($this->user);
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $this->user->id,
+            'response' => 'Original response',
+            'completed_at' => null,
+        ]);
+
+        $response = $this->json('PUT', $this->path . $articleNote->id, [
+            'response' => 'Updated response',
+        ]);
+
+        $response->assertStatus(200);
+
+        /** @var ArticleNote $updated */
+        $updated = ArticleNote::find($articleNote->id);
+
+        $this->assertEquals('Updated response', $updated->response);
+    }
+
+    public function testUpdateSuccessfulMarkCompleted(): void
+    {
+        $this->actingAs($this->user);
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $this->user->id,
+            'completed_at' => null,
+        ]);
+
+        $response = $this->json('PUT', $this->path . $articleNote->id, [
+            'completed' => true,
+        ]);
+
+        $response->assertStatus(200);
+
+        /** @var ArticleNote $updated */
+        $updated = ArticleNote::find($articleNote->id);
+
+        $this->assertNotNull($updated->completed_at);
+    }
+
+    public function testUpdateSuccessfulUnmarkCompleted(): void
+    {
+        $this->actingAs($this->user);
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $this->user->id,
+            'completed_at' => now(),
+        ]);
+
+        $response = $this->json('PUT', $this->path . $articleNote->id, [
+            'completed' => false,
+        ]);
+
+        $response->assertStatus(200);
+
+        /** @var ArticleNote $updated */
+        $updated = ArticleNote::find($articleNote->id);
+
+        $this->assertNull($updated->completed_at);
+    }
+
+    public function testUpdateFailsInvalidBooleanFields(): void
+    {
+        $this->actingAs($this->user);
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $this->user->id,
+        ]);
+
+        $response = $this->json('PUT', $this->path . $articleNote->id, [
+            'completed' => 'not-a-boolean',
+        ]);
+
+        $response->assertStatus(400);
+        $response->assertJson([
+            'errors' => [
+                'completed' => ['The completed field must be true or false.'],
+            ]
+        ]);
+    }
+
+    public function testUpdateFailsInvalidStringFields(): void
+    {
+        $this->actingAs($this->user);
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $this->user->id,
+        ]);
+
+        $response = $this->json('PUT', $this->path . $articleNote->id, [
+            'response' => 12345,
+        ]);
+
+        $response->assertStatus(400);
+        $response->assertJson([
+            'errors' => [
+                'response' => ['The response must be a string.'],
+            ]
+        ]);
+    }
+}
diff --git a/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteViewTest.php b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteViewTest.php
new file mode 100644
index 00000000..7e6aa050
--- /dev/null
+++ b/code/tests/Athenia/Feature/Http/User/ArticleNote/UserArticleNoteViewTest.php
@@ -0,0 +1,92 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Feature\User\ArticleNote;
+
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use Tests\DatabaseSetupTrait;
+use Tests\TestCase;
+use Tests\Traits\MocksApplicationLog;
+
+/**
+ * Class UserArticleNoteViewTest
+ * @package Tests\Athenia\Feature\User\ArticleNote
+ */
+final class UserArticleNoteViewTest extends TestCase
+{
+    use DatabaseSetupTrait, MocksApplicationLog;
+
+    /**
+     * @var string
+     */
+    private $path = '/v1/users/';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->setupDatabase();
+        $this->mockApplicationLog();
+    }
+
+    public function testNotLoggedInUserBlocked(): void
+    {
+        $user = User::factory()->create();
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $user->id,
+        ]);
+
+        $response = $this->json('GET', $this->path . $user->id . '/article-notes/' . $articleNote->id);
+
+        $response->assertStatus(403);
+    }
+
+    public function testDifferentUserBlocked(): void
+    {
+        $this->actAsUser();
+        $otherUser = User::factory()->create();
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $otherUser->id,
+        ]);
+
+        $response = $this->json('GET', $this->path . $otherUser->id . '/article-notes/' . $articleNote->id);
+
+        $response->assertStatus(403);
+    }
+
+    public function testUserNotFound(): void
+    {
+        $this->actAsUser();
+
+        $response = $this->json('GET', $this->path . '99999/article-notes/1');
+
+        $response->assertStatus(404);
+    }
+
+    public function testArticleNoteNotFound(): void
+    {
+        $this->actAsUser();
+
+        $response = $this->json('GET', $this->path . $this->actingAs->id . '/article-notes/99999');
+
+        $response->assertStatus(404);
+    }
+
+    public function testGetSingleSuccess(): void
+    {
+        $this->actAsUser();
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $this->actingAs->id,
+            'response' => 'Test response',
+        ]);
+
+        $response = $this->json('GET', $this->path . $this->actingAs->id . '/article-notes/' . $articleNote->id);
+
+        $response->assertStatus(200);
+        $response->assertJson([
+            'id' => $articleNote->id,
+            'user_id' => $this->actingAs->id,
+            'response' => 'Test response',
+        ]);
+    }
+}
diff --git a/code/tests/Athenia/Integration/Policies/User/ArticleNotePolicyTest.php b/code/tests/Athenia/Integration/Policies/User/ArticleNotePolicyTest.php
new file mode 100644
index 00000000..7b6cd26e
--- /dev/null
+++ b/code/tests/Athenia/Integration/Policies/User/ArticleNotePolicyTest.php
@@ -0,0 +1,135 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Integration\Policies\User;
+
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use App\Policies\User\ArticleNotePolicy;
+use Tests\DatabaseSetupTrait;
+use Tests\TestCase;
+
+/**
+ * Class ArticleNotePolicyTest
+ * @package Tests\Athenia\Integration\Policies\User
+ */
+final class ArticleNotePolicyTest extends TestCase
+{
+    use DatabaseSetupTrait;
+
+    public function testAllPasses(): void
+    {
+        $user = User::factory()->create();
+
+        $policy = new ArticleNotePolicy();
+
+        $this->assertTrue($policy->all($user, $user));
+    }
+
+    public function testAllFails(): void
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+
+        $policy = new ArticleNotePolicy();
+
+        $this->assertFalse($policy->all($user1, $user2));
+    }
+
+    public function testCreatePasses(): void
+    {
+        $user = User::factory()->create();
+
+        $policy = new ArticleNotePolicy();
+
+        $this->assertTrue($policy->create($user, $user));
+    }
+
+    public function testCreateFails(): void
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+
+        $policy = new ArticleNotePolicy();
+
+        $this->assertFalse($policy->create($user1, $user2));
+    }
+
+    public function testViewPasses(): void
+    {
+        $user = User::factory()->create();
+
+        $policy = new ArticleNotePolicy();
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $user->id,
+        ]);
+        $this->assertTrue($policy->view($user, $user, $articleNote));
+    }
+
+    public function testViewFails(): void
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $user2->id,
+        ]);
+
+        $policy = new ArticleNotePolicy();
+
+        $this->assertFalse($policy->view($user1, $user2, $articleNote));
+        $this->assertFalse($policy->view($user1, $user1, $articleNote));
+    }
+
+    public function testUpdatePasses(): void
+    {
+        $user = User::factory()->create();
+
+        $policy = new ArticleNotePolicy();
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $user->id,
+        ]);
+        $this->assertTrue($policy->update($user, $user, $articleNote));
+    }
+
+    public function testUpdateFails(): void
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $user2->id,
+        ]);
+
+        $policy = new ArticleNotePolicy();
+
+        $this->assertFalse($policy->update($user1, $user2, $articleNote));
+        $this->assertFalse($policy->update($user1, $user1, $articleNote));
+    }
+
+    public function testDeletePasses(): void
+    {
+        $user = User::factory()->create();
+
+        $policy = new ArticleNotePolicy();
+
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $user->id,
+        ]);
+        $this->assertTrue($policy->delete($user, $user, $articleNote));
+    }
+
+    public function testDeleteFails(): void
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+        $articleNote = ArticleNote::factory()->create([
+            'user_id' => $user2->id,
+        ]);
+
+        $policy = new ArticleNotePolicy();
+
+        $this->assertFalse($policy->delete($user1, $user2, $articleNote));
+        $this->assertFalse($policy->delete($user1, $user1, $articleNote));
+    }
+}
diff --git a/code/tests/Athenia/Integration/Repositories/Statistic/StatisticRepositoryTest.php b/code/tests/Athenia/Integration/Repositories/Statistic/StatisticRepositoryTest.php
index 1494468b..c228ab62 100644
--- a/code/tests/Athenia/Integration/Repositories/Statistic/StatisticRepositoryTest.php
+++ b/code/tests/Athenia/Integration/Repositories/Statistic/StatisticRepositoryTest.php
@@ -79,6 +79,46 @@ public function testFindAllWithFilterReturnsCollection()
         $this->assertCount(1, $models);
     }
 
+    public function testFindAllForModelReturnsOnlyStatisticsForThatModel()
+    {
+        foreach (Statistic::all() as $model) {
+            $model->delete();
+        }
+
+        // Create statistics for different models
+        Statistic::factory()->count(3)->create(['model' => 'article']);
+        Statistic::factory()->count(2)->create(['model' => 'user']);
+        Statistic::factory()->count(1)->create(['model' => 'organization']);
+
+        $articleStatistics = $this->repository->findAllForModel('article');
+        $userStatistics = $this->repository->findAllForModel('user');
+        $organizationStatistics = $this->repository->findAllForModel('organization');
+
+        $this->assertCount(3, $articleStatistics);
+        $this->assertCount(2, $userStatistics);
+        $this->assertCount(1, $organizationStatistics);
+
+        // Verify all returned statistics have the correct model
+        foreach ($articleStatistics as $statistic) {
+            $this->assertEquals('article', $statistic->model);
+        }
+        foreach ($userStatistics as $statistic) {
+            $this->assertEquals('user', $statistic->model);
+        }
+    }
+
+    public function testFindAllForModelReturnsEmptyCollectionWhenNoStatisticsExist()
+    {
+        foreach (Statistic::all() as $model) {
+            $model->delete();
+        }
+
+        $statistics = $this->repository->findAllForModel('nonexistent');
+
+        $this->assertCount(0, $statistics);
+        $this->assertInstanceOf(Collection::class, $statistics);
+    }
+
     public function testFindReturnsModel()
     {
         foreach (Statistic::all() as $model) {
diff --git a/code/tests/Athenia/Integration/Repositories/User/ArticleNoteRepositoryTest.php b/code/tests/Athenia/Integration/Repositories/User/ArticleNoteRepositoryTest.php
new file mode 100644
index 00000000..fb49ccc9
--- /dev/null
+++ b/code/tests/Athenia/Integration/Repositories/User/ArticleNoteRepositoryTest.php
@@ -0,0 +1,144 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Integration\Repositories\User;
+
+use App\Athenia\Repositories\User\ArticleNoteRepository;
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use App\Models\Wiki\Article;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Tests\DatabaseSetupTrait;
+use Tests\TestCase;
+use Tests\Traits\MocksApplicationLog;
+
+/**
+ * Class ArticleNoteRepositoryTest
+ * @package Tests\Athenia\Integration\Repositories\User
+ */
+final class ArticleNoteRepositoryTest extends TestCase
+{
+    use DatabaseSetupTrait, MocksApplicationLog;
+
+    /**
+     * @var ArticleNoteRepository
+     */
+    protected $repository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->setupDatabase();
+
+        $this->repository = new ArticleNoteRepository(
+            new ArticleNote(),
+            $this->getGenericLogMock(),
+        );
+    }
+
+    public function testFindAllSuccess(): void
+    {
+        ArticleNote::factory()->count(5)->create();
+        $items = $this->repository->findAll();
+        $this->assertCount(5, $items);
+    }
+
+    public function testFindAllEmpty(): void
+    {
+        $items = $this->repository->findAll();
+        $this->assertEmpty($items);
+    }
+
+    public function testFindOrFailSuccess(): void
+    {
+        $model = ArticleNote::factory()->create();
+
+        $foundModel = $this->repository->findOrFail($model->id);
+        $this->assertEquals($model->id, $foundModel->id);
+    }
+
+    public function testFindOrFailFails(): void
+    {
+        ArticleNote::factory()->create(['id' => 19]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->repository->findOrFail(20);
+    }
+
+    public function testCreateSuccess(): void
+    {
+        /** @var User $user */
+        $user = User::factory()->create();
+
+        /** @var Article $article */
+        $article = Article::factory()->create();
+
+        /** @var ArticleNote $articleNote */
+        $articleNote = $this->repository->create([
+            'article_id' => $article->id,
+            'response' => 'A response',
+        ], $user);
+
+        $this->assertEquals($articleNote->user_id, $user->id);
+        $this->assertEquals($articleNote->article_id, $article->id);
+        $this->assertEquals('A response', $articleNote->response);
+        $this->assertNull($articleNote->completed_at);
+    }
+
+    public function testCreateSuccessWithCompleted(): void
+    {
+        /** @var User $user */
+        $user = User::factory()->create();
+
+        /** @var Article $article */
+        $article = Article::factory()->create();
+
+        /** @var ArticleNote $articleNote */
+        $articleNote = $this->repository->create([
+            'article_id' => $article->id,
+            'completed' => true,
+        ], $user);
+
+        $this->assertEquals($articleNote->user_id, $user->id);
+        $this->assertEquals($articleNote->article_id, $article->id);
+        $this->assertNotNull($articleNote->completed_at);
+    }
+
+    public function testUpdateSuccess(): void
+    {
+        $model = ArticleNote::factory()->create([
+            'response' => 'Original response',
+            'completed_at' => null,
+        ]);
+
+        $updated = $this->repository->update($model, [
+            'response' => 'Updated response',
+            'completed' => true,
+        ]);
+
+        $this->assertEquals('Updated response', $updated->response);
+        $this->assertNotNull($updated->completed_at);
+    }
+
+    public function testUpdateSuccessUnmarkCompleted(): void
+    {
+        $model = ArticleNote::factory()->create([
+            'completed_at' => now(),
+        ]);
+
+        $updated = $this->repository->update($model, [
+            'completed' => false,
+        ]);
+
+        $this->assertNull($updated->completed_at);
+    }
+
+    public function testDeleteSuccess(): void
+    {
+        $model = ArticleNote::factory()->create();
+
+        $this->repository->delete($model);
+
+        $this->assertNull(ArticleNote::find($model->id));
+    }
+}
diff --git a/code/tests/Athenia/Integration/Repositories/Wiki/ArticleRepositorySelectArticleTest.php b/code/tests/Athenia/Integration/Repositories/Wiki/ArticleRepositorySelectArticleTest.php
new file mode 100644
index 00000000..b04c28bd
--- /dev/null
+++ b/code/tests/Athenia/Integration/Repositories/Wiki/ArticleRepositorySelectArticleTest.php
@@ -0,0 +1,417 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Integration\Repositories\Wiki;
+
+use App\Athenia\Contracts\Repositories\Wiki\ArticleRepositoryContract;
+use App\Athenia\Contracts\Services\Statistic\StatisticSynchronizationServiceContract;
+use App\Models\Statistic\Statistic;
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use App\Models\Wiki\Article;
+use Tests\DatabaseSetupTrait;
+use Tests\TestCase;
+
+/**
+ * Class ArticleRepositorySelectArticleTest
+ * @package Tests\Athenia\Integration\Repositories\Wiki
+ */
+final class ArticleRepositorySelectArticleTest extends TestCase
+{
+    use DatabaseSetupTrait;
+
+    private ArticleRepositoryContract $repository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->setupDatabase();
+        $this->repository = app(ArticleRepositoryContract::class);
+
+        // Seed article note statistics
+        $this->seed(\Database\Seeders\ArticleNoteStatisticsSeeder::class);
+    }
+
+    public function testSelectArticleForUserNeverReturnsCompletedArticles(): void
+    {
+        // Clean up any existing articles
+        Article::query()->delete();
+
+        /** @var User $user */
+        $user = User::factory()->create();
+
+        // Create two articles
+        $article1 = Article::factory()->create(['title' => 'Article 1']);
+        $article2 = Article::factory()->create(['title' => 'Article 2']);
+
+        // User has completed article 1
+        ArticleNote::factory()->create([
+            'user_id' => $user->id,
+            'article_id' => $article1->id,
+            'completed_at' => now(),
+        ]);
+
+        // Select article for user
+        $selected = $this->repository->selectArticleForUser($user);
+
+        // Should return an article, but never article 1 (the completed one)
+        $this->assertNotNull($selected);
+        $this->assertNotEquals($article1->id, $selected->id);
+
+        // Verify the user has NOT completed a note on the selected article
+        $userNote = ArticleNote::where('user_id', $user->id)
+            ->where('article_id', $selected->id)
+            ->first();
+        if ($userNote) {
+            $this->assertNull($userNote->completed_at);
+        }
+    }
+
+    public function testSelectArticleForUserPrioritizesArticlesWithNoNotes(): void
+    {
+        // Clean up any existing articles
+        Article::query()->delete();
+
+        /** @var User $user */
+        $user = User::factory()->create();
+
+        // Create two articles
+        $articleWithNote = Article::factory()->create(['title' => 'Has Incomplete Note']);
+        $articleWithoutNote = Article::factory()->create(['title' => 'No Note']);
+
+        // User has incomplete note on first article
+        ArticleNote::factory()->create([
+            'user_id' => $user->id,
+            'article_id' => $articleWithNote->id,
+            'completed_at' => null,
+        ]);
+
+        // Select article for user
+        $selected = $this->repository->selectArticleForUser($user);
+
+        // Should return an article (prefer one without note over one with incomplete note)
+        $this->assertNotNull($selected);
+
+        // Verify the user has NOT completed a note on the selected article
+        $userNote = ArticleNote::where('user_id', $user->id)
+            ->where('article_id', $selected->id)
+            ->first();
+
+        if ($userNote) {
+            $this->assertNull($userNote->completed_at, 'Selected article should not have a completed note');
+        }
+    }
+
+    public function testSelectArticleForUserOrdersByLowestCompletedNotesStatistic(): void
+    {
+        // Clean up any existing articles
+        Article::query()->delete();
+
+        /** @var User $currentUser */
+        $currentUser = User::factory()->create();
+
+        // Create three articles
+        $articleLowCompleted = Article::factory()->create(['title' => 'Low Completed']);
+        $articleHighCompleted = Article::factory()->create(['title' => 'High Completed']);
+        $articleNoCompleted = Article::factory()->create(['title' => 'No Completed']);
+
+        // Create other users who have completed notes
+        $otherUser1 = User::factory()->create();
+        $otherUser2 = User::factory()->create();
+        $otherUser3 = User::factory()->create();
+
+        // Article 2 has 3 completed notes (high)
+        ArticleNote::factory()->create([
+            'user_id' => $otherUser1->id,
+            'article_id' => $articleHighCompleted->id,
+            'completed_at' => now(),
+        ]);
+        ArticleNote::factory()->create([
+            'user_id' => $otherUser2->id,
+            'article_id' => $articleHighCompleted->id,
+            'completed_at' => now(),
+        ]);
+        ArticleNote::factory()->create([
+            'user_id' => $otherUser3->id,
+            'article_id' => $articleHighCompleted->id,
+            'completed_at' => now(),
+        ]);
+
+        // Article 1 has 1 completed note (low)
+        ArticleNote::factory()->create([
+            'user_id' => $otherUser1->id,
+            'article_id' => $articleLowCompleted->id,
+            'completed_at' => now(),
+        ]);
+
+        // Synchronize statistics for all articles
+        $synchronizationService = app(StatisticSynchronizationServiceContract::class);
+        $synchronizationService->synchronizeTargetStatistics($articleLowCompleted);
+        $synchronizationService->synchronizeTargetStatistics($articleHighCompleted);
+        $synchronizationService->synchronizeTargetStatistics($articleNoCompleted);
+
+        // Select article for current user
+        $selected = $this->repository->selectArticleForUser($currentUser);
+
+        // Should return an article (will prefer ones with lower completed notes)
+        $this->assertNotNull($selected);
+
+        // Mark all three test articles as completed for current user to test that they're excluded
+        ArticleNote::updateOrCreate(
+            ['user_id' => $currentUser->id, 'article_id' => $articleNoCompleted->id],
+            ['completed_at' => now()]
+        );
+        ArticleNote::updateOrCreate(
+            ['user_id' => $currentUser->id, 'article_id' => $articleLowCompleted->id],
+            ['completed_at' => now()]
+        );
+        ArticleNote::updateOrCreate(
+            ['user_id' => $currentUser->id, 'article_id' => $articleHighCompleted->id],
+            ['completed_at' => now()]
+        );
+
+        // Select again
+        $selected2 = $this->repository->selectArticleForUser($currentUser);
+
+        // Should return a different article (not any of the completed ones)
+        $this->assertNotNull($selected2);
+        $this->assertNotEquals($articleNoCompleted->id, $selected2->id);
+        $this->assertNotEquals($articleLowCompleted->id, $selected2->id);
+        $this->assertNotEquals($articleHighCompleted->id, $selected2->id);
+    }
+
+    public function testSelectArticleForUserOrdersByLowestTotalNotesStatistic(): void
+    {
+        // Clean up any existing articles
+        Article::query()->delete();
+
+        /** @var User $currentUser */
+        $currentUser = User::factory()->create();
+
+        // Create two articles with same completed notes but different total notes
+        $articleLowTotal = Article::factory()->create(['title' => 'Low Total']);
+        $articleHighTotal = Article::factory()->create(['title' => 'High Total']);
+
+        // Create other users
+        $otherUser1 = User::factory()->create();
+        $otherUser2 = User::factory()->create();
+        $otherUser3 = User::factory()->create();
+
+        // Both articles have 1 completed note (same)
+        ArticleNote::factory()->create([
+            'user_id' => $otherUser1->id,
+            'article_id' => $articleLowTotal->id,
+            'completed_at' => now(),
+        ]);
+        ArticleNote::factory()->create([
+            'user_id' => $otherUser2->id,
+            'article_id' => $articleHighTotal->id,
+            'completed_at' => now(),
+        ]);
+
+        // Article high total has 2 additional incomplete notes (3 total notes vs 1)
+        ArticleNote::factory()->create([
+            'user_id' => $otherUser3->id,
+            'article_id' => $articleHighTotal->id,
+            'completed_at' => null,
+        ]);
+        ArticleNote::factory()->create([
+            'user_id' => User::factory()->create()->id,
+            'article_id' => $articleHighTotal->id,
+            'completed_at' => null,
+        ]);
+
+        // Synchronize statistics
+        $synchronizationService = app(StatisticSynchronizationServiceContract::class);
+        $synchronizationService->synchronizeTargetStatistics($articleLowTotal);
+        $synchronizationService->synchronizeTargetStatistics($articleHighTotal);
+
+        // Select article for current user
+        $selected = $this->repository->selectArticleForUser($currentUser);
+
+        // Should return an article
+        $this->assertNotNull($selected);
+
+        // Verify current user has no note (or no completed note) on the selected article
+        $userNote = ArticleNote::where('user_id', $currentUser->id)
+            ->where('article_id', $selected->id)
+            ->first();
+
+        if ($userNote) {
+            $this->assertNull($userNote->completed_at, 'Selected article should not have a completed note');
+        }
+    }
+
+    public function testSelectArticleForUserCanReturnArticleWithIncompleteNote(): void
+    {
+        // Clean up any existing articles
+        Article::query()->delete();
+
+        /** @var User $user */
+        $user = User::factory()->create();
+
+        // Create an article with an incomplete note
+        $articleWithIncompleteNote = Article::factory()->create(['title' => 'Article With Incomplete Note']);
+        ArticleNote::factory()->create([
+            'user_id' => $user->id,
+            'article_id' => $articleWithIncompleteNote->id,
+            'completed_at' => null,
+        ]);
+
+        // Select article for user
+        $selected = $this->repository->selectArticleForUser($user);
+
+        // Should return an article (either one without notes or the one with incomplete note)
+        $this->assertNotNull($selected);
+
+        // If it returned the article with incomplete note, verify it's correct
+        if ($selected->id === $articleWithIncompleteNote->id) {
+            $userNote = ArticleNote::where('user_id', $user->id)
+                ->where('article_id', $selected->id)
+                ->first();
+            $this->assertNotNull($userNote);
+            $this->assertNull($userNote->completed_at);
+        }
+    }
+
+    public function testSelectArticleForUserExcludesCompletedArticles(): void
+    {
+        // Clean up any existing articles
+        Article::query()->delete();
+
+        /** @var User $user */
+        $user = User::factory()->create();
+
+        // Create three articles
+        $completedArticle1 = Article::factory()->create(['title' => 'Completed 1']);
+        $completedArticle2 = Article::factory()->create(['title' => 'Completed 2']);
+        $availableArticle = Article::factory()->create(['title' => 'Available']);
+
+        // Mark first two as completed
+        ArticleNote::factory()->create([
+            'user_id' => $user->id,
+            'article_id' => $completedArticle1->id,
+            'completed_at' => now(),
+        ]);
+        ArticleNote::factory()->create([
+            'user_id' => $user->id,
+            'article_id' => $completedArticle2->id,
+            'completed_at' => now(),
+        ]);
+
+        // Select article for user (should not return completed articles)
+        $selected = $this->repository->selectArticleForUser($user);
+
+        // Should return an article
+        $this->assertNotNull($selected);
+
+        // Verify the selected article is NOT one of the completed ones
+        $this->assertNotEquals($completedArticle1->id, $selected->id);
+        $this->assertNotEquals($completedArticle2->id, $selected->id);
+
+        // Verify if user has a note on the selected article, it's not completed
+        $userNote = ArticleNote::where('user_id', $user->id)
+            ->where('article_id', $selected->id)
+            ->first();
+
+        if ($userNote) {
+            $this->assertNull($userNote->completed_at, 'Selected article should not have a completed note');
+        }
+    }
+
+    public function testSelectArticleForUserCombinesPriorityAndStatistics(): void
+    {
+        // Clean up any existing articles
+        Article::query()->delete();
+
+        /** @var User $currentUser */
+        $currentUser = User::factory()->create();
+
+        // Create articles in different priority groups
+        $unstartedHighStats = Article::factory()->create(['title' => 'Unstarted High Stats']);
+        $unstartedLowStats = Article::factory()->create(['title' => 'Unstarted Low Stats']);
+        $incompleteHighStats = Article::factory()->create(['title' => 'Incomplete High Stats']);
+        $incompleteLowStats = Article::factory()->create(['title' => 'Incomplete Low Stats']);
+
+        // Create other users to generate statistics
+        $otherUsers = User::factory()->count(5)->create();
+
+        // Generate high statistics for some articles
+        foreach ($otherUsers as $otherUser) {
+            ArticleNote::factory()->create([
+                'user_id' => $otherUser->id,
+                'article_id' => $unstartedHighStats->id,
+                'completed_at' => now(),
+            ]);
+            ArticleNote::factory()->create([
+                'user_id' => $otherUser->id,
+                'article_id' => $incompleteHighStats->id,
+                'completed_at' => now(),
+            ]);
+        }
+
+        // Current user has incomplete notes on incomplete articles
+        ArticleNote::factory()->create([
+            'user_id' => $currentUser->id,
+            'article_id' => $incompleteHighStats->id,
+            'completed_at' => null,
+        ]);
+        ArticleNote::factory()->create([
+            'user_id' => $currentUser->id,
+            'article_id' => $incompleteLowStats->id,
+            'completed_at' => null,
+        ]);
+
+        // Synchronize statistics
+        $synchronizationService = app(StatisticSynchronizationServiceContract::class);
+        foreach ([$unstartedHighStats, $unstartedLowStats, $incompleteHighStats, $incompleteLowStats] as $article) {
+            $synchronizationService->synchronizeTargetStatistics($article);
+        }
+
+        // Select article for current user
+        $selected = $this->repository->selectArticleForUser($currentUser);
+
+        // Should return an article
+        $this->assertNotNull($selected);
+
+        // Verify it's not one of the articles the user already has an incomplete note on
+        // (unless all unstarted articles are exhausted)
+        $userNote = ArticleNote::where('user_id', $currentUser->id)
+            ->where('article_id', $selected->id)
+            ->first();
+
+        // The selected article should either have no note (priority 1) or an incomplete note (priority 2)
+        if ($userNote) {
+            $this->assertNull($userNote->completed_at, 'Selected article should not have a completed note');
+        }
+
+        // Mark the two test unstarted articles as completed
+        ArticleNote::updateOrCreate(
+            ['user_id' => $currentUser->id, 'article_id' => $unstartedLowStats->id],
+            ['completed_at' => now()]
+        );
+        ArticleNote::updateOrCreate(
+            ['user_id' => $currentUser->id, 'article_id' => $unstartedHighStats->id],
+            ['completed_at' => now()]
+        );
+
+        // Select again
+        $selected2 = $this->repository->selectArticleForUser($currentUser);
+
+        // Should still return an article
+        $this->assertNotNull($selected2);
+
+        // Verify it's not a completed article
+        $this->assertNotEquals($unstartedLowStats->id, $selected2->id);
+        $this->assertNotEquals($unstartedHighStats->id, $selected2->id);
+
+        // Verify if there's a user note, it's not completed
+        $userNote2 = ArticleNote::where('user_id', $currentUser->id)
+            ->where('article_id', $selected2->id)
+            ->first();
+
+        if ($userNote2) {
+            $this->assertNull($userNote2->completed_at, 'Selected article should not have a completed note');
+        }
+    }
+}
diff --git a/code/tests/Athenia/Integration/Repositories/Wiki/ArticleRepositoryTest.php b/code/tests/Athenia/Integration/Repositories/Wiki/ArticleRepositoryTest.php
index c9986e22..5d9da01c 100644
--- a/code/tests/Athenia/Integration/Repositories/Wiki/ArticleRepositoryTest.php
+++ b/code/tests/Athenia/Integration/Repositories/Wiki/ArticleRepositoryTest.php
@@ -3,6 +3,7 @@
 
 namespace Tests\Athenia\Integration\Repositories\Wiki;
 
+use App\Athenia\Contracts\Repositories\Statistic\StatisticRepositoryContract;
 use App\Athenia\Exceptions\NotImplementedException;
 use App\Athenia\Repositories\Wiki\ArticleRepository;
 use App\Models\User\User;
@@ -30,7 +31,11 @@ protected function setUp(): void
         parent::setUp();
         $this->setupDatabase();
 
-        $this->repository = new ArticleRepository(new Article(), $this->getGenericLogMock());
+        $this->repository = new ArticleRepository(
+            new Article(),
+            $this->getGenericLogMock(),
+            app(StatisticRepositoryContract::class)
+        );
     }
 
     public function testDeleteThrowsException(): void
diff --git a/code/tests/Athenia/Integration/Statistic/ArticleNoteStatisticsTest.php b/code/tests/Athenia/Integration/Statistic/ArticleNoteStatisticsTest.php
new file mode 100644
index 00000000..8d3d5b74
--- /dev/null
+++ b/code/tests/Athenia/Integration/Statistic/ArticleNoteStatisticsTest.php
@@ -0,0 +1,245 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Integration\Statistic;
+
+use App\Athenia\Contracts\Services\Statistic\StatisticSynchronizationServiceContract;
+use App\Models\Statistic\Statistic;
+use App\Models\Statistic\TargetStatistic;
+use App\Models\User\ArticleNote;
+use App\Models\User\User;
+use App\Models\Wiki\Article;
+use Tests\DatabaseSetupTrait;
+use Tests\TestCase;
+
+/**
+ * Class ArticleNoteStatisticsTest
+ * @package Tests\Athenia\Integration\Article
+ */
+final class ArticleNoteStatisticsTest extends TestCase
+{
+    use DatabaseSetupTrait;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->setupDatabase();
+
+        // Seed article note statistics
+        $this->seed(\Database\Seeders\ArticleNoteStatisticsSeeder::class);
+    }
+
+    public function testTotalNotesStatisticUpdatesOnCreate(): void
+    {
+        /** @var Article $article */
+        $article = Article::factory()->create();
+
+        /** @var User $user */
+        $user = User::factory()->create();
+
+        // Get the total_notes statistic
+        $statistic = Statistic::where('name', 'total_notes')->first();
+        $this->assertNotNull($statistic);
+
+        // Synchronize to ensure TargetStatistics exist for this article
+        $synchronizationService = app(StatisticSynchronizationServiceContract::class);
+        $synchronizationService->synchronizeTargetStatistics($article);
+
+        // Create an ArticleNote
+        ArticleNote::factory()->create([
+            'user_id' => $user->id,
+            'article_id' => $article->id,
+        ]);
+
+        // Refresh the article and check for target statistics
+        $article->refresh();
+        $targetStatistic = TargetStatistic::where('target_id', $article->id)
+            ->where('target_type', 'article')
+            ->where('statistic_id', $statistic->id)
+            ->first();
+
+        $this->assertNotNull($targetStatistic);
+        $this->assertEquals(1, $targetStatistic->result['total']);
+    }
+
+    public function testTotalCompletedNotesStatisticUpdatesOnCreate(): void
+    {
+        /** @var Article $article */
+        $article = Article::factory()->create();
+
+        /** @var User $user */
+        $user = User::factory()->create();
+
+        // Get the total_completed_notes statistic
+        $statistic = Statistic::where('name', 'total_completed_notes')->first();
+        $this->assertNotNull($statistic);
+
+        // Synchronize to ensure TargetStatistics exist for this article
+        $synchronizationService = app(StatisticSynchronizationServiceContract::class);
+        $synchronizationService->synchronizeTargetStatistics($article);
+
+        // Create a completed ArticleNote
+        ArticleNote::factory()->create([
+            'user_id' => $user->id,
+            'article_id' => $article->id,
+            'completed_at' => now(),
+        ]);
+
+        // Refresh the article and check for target statistics
+        $article->refresh();
+        $targetStatistic = TargetStatistic::where('target_id', $article->id)
+            ->where('target_type', 'article')
+            ->where('statistic_id', $statistic->id)
+            ->first();
+
+        $this->assertNotNull($targetStatistic);
+        $this->assertEquals(1, $targetStatistic->result['total']);
+    }
+
+    public function testTotalNotesStatisticUpdatesOnDelete(): void
+    {
+        /** @var Article $article */
+        $article = Article::factory()->create();
+
+        /** @var User $user1 */
+        $user1 = User::factory()->create();
+
+        /** @var User $user2 */
+        $user2 = User::factory()->create();
+
+        // Get the total_notes statistic
+        $statistic = Statistic::where('name', 'total_notes')->first();
+        $this->assertNotNull($statistic);
+
+        // Synchronize to ensure TargetStatistics exist for this article
+        $synchronizationService = app(StatisticSynchronizationServiceContract::class);
+        $synchronizationService->synchronizeTargetStatistics($article);
+
+        // Create two ArticleNotes with different users
+        $note1 = ArticleNote::factory()->create([
+            'user_id' => $user1->id,
+            'article_id' => $article->id,
+        ]);
+
+        ArticleNote::factory()->create([
+            'user_id' => $user2->id,
+            'article_id' => $article->id,
+        ]);
+
+        // Verify we have 2 notes
+        $targetStatistic = TargetStatistic::where('target_id', $article->id)
+            ->where('target_type', 'article')
+            ->where('statistic_id', $statistic->id)
+            ->first();
+
+        $this->assertNotNull($targetStatistic);
+        $this->assertEquals(2, $targetStatistic->result['total']);
+
+        // Delete one note
+        $note1->delete();
+
+        // Verify we now have 1 note
+        $targetStatistic->refresh();
+        $this->assertEquals(1, $targetStatistic->result['total']);
+    }
+
+    public function testTotalCompletedNotesStatisticUpdatesOnUpdate(): void
+    {
+        /** @var Article $article */
+        $article = Article::factory()->create();
+
+        /** @var User $user */
+        $user = User::factory()->create();
+
+        // Get the total_completed_notes statistic
+        $statistic = Statistic::where('name', 'total_completed_notes')->first();
+        $this->assertNotNull($statistic);
+
+        // Synchronize to ensure TargetStatistics exist for this article
+        $synchronizationService = app(StatisticSynchronizationServiceContract::class);
+        $synchronizationService->synchronizeTargetStatistics($article);
+
+        // Create an incomplete ArticleNote
+        $note = ArticleNote::factory()->create([
+            'user_id' => $user->id,
+            'article_id' => $article->id,
+            'completed_at' => null,
+        ]);
+
+        // Verify we have 0 completed notes
+        $targetStatistic = TargetStatistic::where('target_id', $article->id)
+            ->where('target_type', 'article')
+            ->where('statistic_id', $statistic->id)
+            ->first();
+
+        $this->assertNotNull($targetStatistic);
+        $this->assertEquals(0, $targetStatistic->result['total']);
+
+        // Mark note as completed
+        $note->update(['completed_at' => now()]);
+
+        // Verify we now have 1 completed note
+        $targetStatistic->refresh();
+        $this->assertEquals(1, $targetStatistic->result['total']);
+    }
+
+    public function testMultipleNotesStatistics(): void
+    {
+        /** @var Article $article */
+        $article = Article::factory()->create();
+
+        /** @var User $user1 */
+        $user1 = User::factory()->create();
+
+        /** @var User $user2 */
+        $user2 = User::factory()->create();
+
+        /** @var User $user3 */
+        $user3 = User::factory()->create();
+
+        // Get both statistics
+        $totalNotesStatistic = Statistic::where('name', 'total_notes')->first();
+        $totalCompletedNotesStatistic = Statistic::where('name', 'total_completed_notes')->first();
+
+        // Synchronize to ensure TargetStatistics exist for this article
+        $synchronizationService = app(StatisticSynchronizationServiceContract::class);
+        $synchronizationService->synchronizeTargetStatistics($article);
+
+        // Create 3 notes: 2 completed, 1 incomplete (each with different user)
+        ArticleNote::factory()->create([
+            'user_id' => $user1->id,
+            'article_id' => $article->id,
+            'completed_at' => now(),
+        ]);
+
+        ArticleNote::factory()->create([
+            'user_id' => $user2->id,
+            'article_id' => $article->id,
+            'completed_at' => now(),
+        ]);
+
+        ArticleNote::factory()->create([
+            'user_id' => $user3->id,
+            'article_id' => $article->id,
+            'completed_at' => null,
+        ]);
+
+        // Verify total notes = 3
+        $totalNotesTargetStat = TargetStatistic::where('target_id', $article->id)
+            ->where('target_type', 'article')
+            ->where('statistic_id', $totalNotesStatistic->id)
+            ->first();
+
+        $this->assertNotNull($totalNotesTargetStat);
+        $this->assertEquals(3, $totalNotesTargetStat->result['total']);
+
+        // Verify completed notes = 2
+        $totalCompletedNotesTargetStat = TargetStatistic::where('target_id', $article->id)
+            ->where('target_type', 'article')
+            ->where('statistic_id', $totalCompletedNotesStatistic->id)
+            ->first();
+
+        $this->assertNotNull($totalCompletedNotesTargetStat);
+        $this->assertEquals(2, $totalCompletedNotesTargetStat->result['total']);
+    }
+}
diff --git a/code/tests/Athenia/Unit/Models/User/ArticleNoteTest.php b/code/tests/Athenia/Unit/Models/User/ArticleNoteTest.php
new file mode 100644
index 00000000..7b8e1be6
--- /dev/null
+++ b/code/tests/Athenia/Unit/Models/User/ArticleNoteTest.php
@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Athenia\Unit\Models\User;
+
+use App\Models\User\ArticleNote;
+use Tests\TestCase;
+
+/**
+ * Class ArticleNoteTest
+ * @package Tests\Athenia\Unit\Models\User
+ */
+final class ArticleNoteTest extends TestCase
+{
+    public function testUser(): void
+    {
+        $articleNote = new ArticleNote();
+        $relation = $articleNote->user();
+
+        $this->assertEquals('article_notes.user_id', $relation->getQualifiedForeignKeyName());
+        $this->assertEquals('users.id', $relation->getQualifiedOwnerKeyName());
+    }
+
+    public function testArticle(): void
+    {
+        $articleNote = new ArticleNote();
+        $relation = $articleNote->article();
+
+        $this->assertEquals('article_notes.article_id', $relation->getQualifiedForeignKeyName());
+        $this->assertEquals('articles.id', $relation->getQualifiedOwnerKeyName());
+    }
+}