diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 3c012b0..441a54b 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -16,6 +16,10 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+
       - name: Validate composer.json and composer.lock
         run: composer validate --strict
 
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index b365c14..8af361b 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -15,7 +15,15 @@ jobs:
 
     strategy:
       matrix:
-        version: [~4.5.0, ~4.6.0]
+        version: 
+          - constraint: ~4.5.0
+            config: 4
+          - constraint: ~4.6.0
+            config: 4
+          - constraint:  ~4.7.0
+            config: 4
+          - constraint: ~5.0.0
+            config: 5
 
     env:
       CRAFT_APP_ID: pest
@@ -37,7 +45,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql
+        image: mysql:8
         env:
           MYSQL_ROOT_PASSWORD: root
           MYSQL_DATABASE: pest
@@ -54,7 +62,7 @@ jobs:
 
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.2'
+        php-version: '8.3'
 
     - name: Validate composer.json and composer.lock
       run: composer validate --strict
@@ -66,18 +74,19 @@ jobs:
         path: |
           composer.lock
           vendor
-        key: ${{ runner.os }}-craft-vendor-${{ hashFiles('composer.json') }}
+        key: ${{ runner.os }}-craft-${{ matrix.version.constraint }}-vendor-${{ hashFiles('composer.json') }}
 
     - name: Install dependencies
       run: |
-        composer require "craftcms/cms:${{ matrix.version }}" --prefer-dist --no-progress
+        composer require "craftcms/cms:${{ matrix.version.constraint }}" --prefer-dist --no-progress
         ./bin/post-clone.sh
 
     - name: Copy config files
       run: |
         mkdir -p ./storage
-        cp -r ./stubs/config ./
-        cat config/app.php
+        cp -r ./stubs/config/app.php ./config/app.php
+        cp -r ./stubs/config/general.php ./config/general.php
+        cp -r ./stubs/config/project-${{ matrix.version.config }}/ ./config/project/
 
     - name: Wait for MySQL
       run: until mysqladmin ping -h 127.0.0.1 -u root -proot; do sleep 1; done
@@ -90,6 +99,8 @@ jobs:
 
     - name: Run pint
       run: ./vendor/bin/pint --test -vvv src/
+      if: always()
 
     - name: Run test suite
       run: ./vendor/bin/pest --compact -vvv
+      if: always()
diff --git a/.gitignore b/.gitignore
index a84ab54..73f4e95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .idea
 cpresources
 /src/bin/index.php
+.phpunit.cache
 .phpunit.result.cache
 /config
 .env
@@ -24,4 +25,4 @@ node_modules
 /templates
 /node_modules
 /.env.example
-/cpresources
\ No newline at end of file
+/cpresources
diff --git a/bin/create-default-fs.php b/bin/create-default-fs.php
index f47a1b0..43ef82d 100755
--- a/bin/create-default-fs.php
+++ b/bin/create-default-fs.php
@@ -22,7 +22,7 @@
 
 $volume = $app->volumes->getVolumeByHandle('local');
 if (! $volume) {
-    $volume = new \craft\models\Volume();
+    $volume = new \craft\models\Volume;
     $volume->name = 'Local';
     $volume->handle = 'local';
     $volume->fs = $fs;
diff --git a/composer.json b/composer.json
index 8352e05..75dcc3a 100644
--- a/composer.json
+++ b/composer.json
@@ -15,11 +15,12 @@
         "symfony/css-selector": "^5.3|^6.0",
         "symfony/dom-crawler": "^6.0.3",
         "symfony/process": "^5.3|^6.0",
-        "illuminate/collections": "^8.23|^9.1|^10.0",
-        "pestphp/pest": "^2.26",
+        "pestphp/pest": "^3.0",
         "vlucas/phpdotenv": "^2.4|^3.4|^5.4",
-        "craftcms/cms": "^4.5",
-        "illuminate/support": "^9.52"
+        "craftcms/cms": "^4.5|^5.0.0-beta.1",
+        "illuminate/support": "^9.52|^10.0|^11.0",
+        "composer/composer": "^2.7",
+        "composer/semver": "^3.4"
     },
     "autoload": {
         "psr-4": {
@@ -54,7 +55,7 @@
     "prefer-stable": true,
     "require-dev": {
         "craftcms/phpstan": "dev-main",
-        "craftcms/craft": "^4.0",
+        "craftcms/craft": "^4.0.0|^5.0.0-alpha.1",
         "symfony/var-dumper": "^5.0|^6.0",
         "laravel/pint": "^1.13"
     }
diff --git a/docs/factories/entry.md b/docs/factories/entry.md
index 8b5b174..0f501d7 100644
--- a/docs/factories/entry.md
+++ b/docs/factories/entry.md
@@ -12,7 +12,7 @@ in three ways,
 
 If you do not pass a section, one will be created automatically.
 
-## type($handle)
+## type($identifier)
 Set the entry type
 
 ## postDate(DateTime|string|int $value)
diff --git a/phpstan-craft4.neon b/phpstan-craft4.neon
new file mode 100644
index 0000000..9dd0e85
--- /dev/null
+++ b/phpstan-craft4.neon
@@ -0,0 +1,5 @@
+parameters:
+    excludePaths:
+        - src/actions/RenderCraft5CompiledClasses.php
+        - src/factories/EntryType.php
+        - src/factories/MatrixFieldEntries.php
diff --git a/phpstan-craft5.neon b/phpstan-craft5.neon
new file mode 100644
index 0000000..aa20a7d
--- /dev/null
+++ b/phpstan-craft5.neon
@@ -0,0 +1,6 @@
+parameters:
+    excludePaths:
+        - src/actions/RenderCraft4CompiledClasses.php
+        - src/factories/AddsMatrixBlocks.php
+        - src/factories/BlockType.php
+        - src/factories/MatrixFieldBlocks.php
diff --git a/phpstan.neon b/phpstan.neon
index 9843abd..c705439 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,5 +1,6 @@
 includes:
     - vendor/craftcms/phpstan/phpstan.neon
+    - phpstan.php
 
 parameters:
     paths:
@@ -15,3 +16,4 @@ parameters:
     excludePaths:
       - src/craft/*
       - src/illuminate/*
+      - src/actions/RenderCompiledClasses.php
diff --git a/phpstan.php b/phpstan.php
new file mode 100644
index 0000000..cb00f87
--- /dev/null
+++ b/phpstan.php
@@ -0,0 +1,16 @@
+<?php
+
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
+
+$config = [];
+
+if (InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '~4.0')) {
+    $config['includes'][] = 'phpstan-craft4.neon';
+}
+
+if (InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '~5.0')) {
+    $config['includes'][] = 'phpstan-craft5.neon';
+}
+
+return $config;
diff --git a/phpunit.xml b/phpunit.xml
index 680bc7c..6e93a83 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         cacheDirectory=".phpunit.cache"
+         beStrictAboutOutputDuringTests="false"
+  >
   <testsuites>
     <testsuite name="Test Suite">
       <directory suffix="Test.php">./tests</directory>
diff --git a/src/Pest.php b/src/Pest.php
index 3bea7ae..3d92ccd 100644
--- a/src/Pest.php
+++ b/src/Pest.php
@@ -2,16 +2,21 @@
 
 namespace markhuot\craftpest;
 
+use Composer\Semver\Semver;
 use Craft;
 use craft\base\Field;
 use craft\elements\db\ElementQuery;
 use craft\elements\Entry;
 use craft\events\DefineBehaviorsEvent;
+use markhuot\craftpest\actions\RenderCraft4CompiledClasses;
+use markhuot\craftpest\actions\RenderCraft5CompiledClasses;
 use markhuot\craftpest\behaviors\ExpectableBehavior;
 use markhuot\craftpest\behaviors\FieldTypeHintBehavior;
 use markhuot\craftpest\behaviors\TestableElementBehavior;
 use markhuot\craftpest\behaviors\TestableElementQueryBehavior;
 use markhuot\craftpest\console\PestController;
+use markhuot\craftpest\interfaces\RenderCompiledClassesInterface;
+use markhuot\craftpest\interfaces\SectionsServiceInterface;
 use yii\base\BootstrapInterface;
 use yii\base\Event;
 
@@ -52,5 +57,17 @@ function (DefineBehaviorsEvent $event) {
                 $event->behaviors['fieldTypeHintBehavior'] = FieldTypeHintBehavior::class;
             }
         );
+
+        Craft::$container->set(SectionsServiceInterface::class, function () {
+            return Semver::satisfies(Craft::$app->version, '~5.0')
+                ? Craft::$app->getEntries() // @phpstan-ignore-line
+                : Craft::$app->getSections(); // @phpstan-ignore-line
+        });
+
+        Craft::$container->set(RenderCompiledClassesInterface::class, function () {
+            return Semver::satisfies(Craft::$app->version, '~5.0')
+                ? Craft::$container->get(RenderCraft5CompiledClasses::class) // @phpstan-ignore-line
+                : Craft::$container->get(RenderCraft4CompiledClasses::class); // @phpstan-ignore-line
+        });
     }
 }
diff --git a/src/actions/RenderCompiledClasses.php b/src/actions/RenderCraft4CompiledClasses.php
similarity index 91%
rename from src/actions/RenderCompiledClasses.php
rename to src/actions/RenderCraft4CompiledClasses.php
index 0844624..a811717 100644
--- a/src/actions/RenderCompiledClasses.php
+++ b/src/actions/RenderCraft4CompiledClasses.php
@@ -5,10 +5,11 @@
 use craft\db\Table;
 use craft\helpers\FileHelper;
 use craft\helpers\StringHelper;
+use markhuot\craftpest\interfaces\RenderCompiledClassesInterface;
 
-class RenderCompiledClasses
+class RenderCraft4CompiledClasses implements RenderCompiledClassesInterface
 {
-    public function handle($forceRecreate = false)
+    public function handle(bool $forceRecreate = false)
     {
         $contentService = \Craft::$app->getContent();
         $originalContentTable = $contentService->contentTable;
diff --git a/src/actions/RenderCraft5CompiledClasses.php b/src/actions/RenderCraft5CompiledClasses.php
new file mode 100644
index 0000000..1b00c9c
--- /dev/null
+++ b/src/actions/RenderCraft5CompiledClasses.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace markhuot\craftpest\actions;
+
+use craft\helpers\FileHelper;
+use craft\helpers\StringHelper;
+use markhuot\craftpest\interfaces\RenderCompiledClassesInterface;
+
+class RenderCraft5CompiledClasses implements RenderCompiledClassesInterface
+{
+    public function handle(bool $forceRecreate = false)
+    {
+        $this->render($forceRecreate);
+
+        return true;
+    }
+
+    protected function render(bool $forceRecreate)
+    {
+        $storedFieldVersion = \Craft::$app->getFields()->getFieldVersion();
+        $compiledClassesPath = \Craft::$app->getPath()->getCompiledClassesPath();
+        $fieldVersionExists = $storedFieldVersion !== null;
+        if (! $fieldVersionExists) {
+            $storedFieldVersion = StringHelper::randomString(12);
+        }
+
+        $compiledClassPath = $compiledClassesPath.DIRECTORY_SEPARATOR.'FactoryFields_'.$storedFieldVersion.'.php';
+
+        if (file_exists($compiledClassPath) && ! $forceRecreate) {
+            return false;
+        }
+
+        $this->cleanupOldMixins('FactoryFields_'.$storedFieldVersion.'.php');
+
+        $template = file_get_contents(__DIR__.'/../../stubs/compiled_classes/FactoryFields.twig');
+
+        $compiledClass = \Craft::$app->view->renderString($template, [
+            'fields' => \Craft::$app->fields->getAllFields(),
+        ]);
+
+        file_put_contents($compiledClassPath, $compiledClass);
+    }
+
+    protected function cleanupOldMixins(?string $except = null)
+    {
+        $compiledClassesPath = __DIR__.'/../storage/';
+
+        FileHelper::clearDirectory($compiledClassesPath, [
+            'filter' => function (string $path) use ($except): bool {
+                $b = basename($path);
+
+                return
+                    str_starts_with($b, 'FactoryFields') &&
+                    ($except === null || $b !== $except);
+            },
+        ]);
+    }
+}
diff --git a/src/bin/generate-docs.php b/src/bin/generate-docs.php
index 108e01c..0554620 100644
--- a/src/bin/generate-docs.php
+++ b/src/bin/generate-docs.php
@@ -59,7 +59,7 @@ function parseClass(string $className)
 function parseComment(string $comment)
 {
     preg_match_all('/@see\s+(.+)$/m', $comment, $sees);
-    foreach (($sees[1] ?? []) as $index => $otherClass) {
+    foreach ($sees[1] as $index => $otherClass) {
         $comment = str_replace($sees[0][$index], 'SEE['.$otherClass.']', $comment);
     }
 
@@ -71,7 +71,7 @@ function parseComment(string $comment)
     $comment = preg_replace('/(^\s+|\s+$)/', '', $comment);
 
     preg_match_all('/^SEE\[(.+)\]$/m', $comment, $sees);
-    foreach (($sees[1] ?? []) as $index => $otherClass) {
+    foreach ($sees[1] as $index => $otherClass) {
         $comment = str_replace($sees[0][$index], "\n\n".implode("\n\n", parseClass($otherClass))."\n\n", $comment);
     }
 
diff --git a/src/console/IdeController.php b/src/console/IdeController.php
deleted file mode 100644
index 6882e27..0000000
--- a/src/console/IdeController.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace markhuot\craftpest\console;
-
-use craft\console\Controller;
-use markhuot\craftpest\actions\RenderCompiledClasses;
-use yii\console\ExitCode;
-
-class IdeController extends Controller
-{
-    public bool $force = false;
-
-    public function options($actionID): array
-    {
-        return [
-            'force',
-        ];
-    }
-
-    /**
-     * Run the Pest tests
-     */
-    public function actionGenerateMixins()
-    {
-        $result = (new RenderCompiledClasses)->handle($this->force);
-
-        if ($result) {
-            echo "Mixins successfully generated!\n";
-        } else {
-            echo "Mixins already exist, skipping.\n";
-        }
-
-        return ExitCode::OK;
-    }
-}
diff --git a/src/console/PestController.php b/src/console/PestController.php
index de8c911..7996eb5 100644
--- a/src/console/PestController.php
+++ b/src/console/PestController.php
@@ -2,9 +2,10 @@
 
 namespace markhuot\craftpest\console;
 
+use Craft;
 use craft\console\Controller;
 use craft\helpers\FileHelper;
-use markhuot\craftpest\actions\RenderCompiledClasses;
+use markhuot\craftpest\interfaces\RenderCompiledClassesInterface;
 use markhuot\craftpest\Pest;
 use Symfony\Component\Process\Process;
 use yii\console\ExitCode;
@@ -112,7 +113,7 @@ protected function runTests()
 
     public function actionCompileTemplates()
     {
-        $compiledTemplatesDir = \Craft::$app->path->getCompiledTemplatesPath();
+        $compiledTemplatesDir = Craft::$app->path->getCompiledTemplatesPath();
         FileHelper::removeDirectory($compiledTemplatesDir);
 
         $compileTemplates = function ($path, $base = '') {
@@ -128,29 +129,29 @@ public function actionCompileTemplates()
                 if ($logicalName === 'index.twig' || $logicalName === 'index.html') {
                     $logicalName = '';
                 }
-                $oldTemplateMode = \Craft::$app->view->getTemplateMode();
-                \Craft::$app->view->setTemplateMode('site');
-                $twig = \Craft::$app->view->twig;
-                if (version_greater_than_or_equal_to(\Craft::$app->version, '4')) {
+                $oldTemplateMode = Craft::$app->view->getTemplateMode();
+                Craft::$app->view->setTemplateMode('site');
+                $twig = Craft::$app->view->twig;
+                if (version_greater_than_or_equal_to(Craft::$app->version, '4')) {
                     // @phpstan-ignore-next-line Ignored because one of these will fail based on the installed version of Craft
                     $twig->loadTemplate($twig->getTemplateClass($logicalName), $logicalName);
-                } elseif (version_greater_than_or_equal_to(\Craft::$app->version, '3')) {
+                } elseif (version_greater_than_or_equal_to(Craft::$app->version, '3')) {
                     // @phpstan-ignore-next-line Ignored because one of these will fail based on the installed version of Craft
                     $twig->loadTemplate($logicalName);
                 }
-                \Craft::$app->view->setTemplateMode($oldTemplateMode);
+                Craft::$app->view->setTemplateMode($oldTemplateMode);
             }
         };
 
         // hack
-        $compileTemplates(\Craft::getAlias('@templates'));
+        $compileTemplates(Craft::getAlias('@templates'));
 
         return 0;
     }
 
     public function actionGenerateMixins()
     {
-        $result = (new RenderCompiledClasses)->handle($this->force);
+        $result = Craft::$container->get(RenderCompiledClassesInterface::class)->handle($this->force);
 
         if ($result) {
             echo "Mixins successfully generated!\n";
diff --git a/src/console/TestableResponse.php b/src/console/TestableResponse.php
index 4861fef..0b9314e 100644
--- a/src/console/TestableResponse.php
+++ b/src/console/TestableResponse.php
@@ -10,8 +10,7 @@ public function __construct(
         protected int $exitCode,
         protected string $stdout,
         protected string $stderr,
-    ) {
-    }
+    ) {}
 
     public function assertSuccesful()
     {
diff --git a/src/events/RollbackTransactionEvent.php b/src/events/RollbackTransactionEvent.php
index add3448..18d2d7b 100644
--- a/src/events/RollbackTransactionEvent.php
+++ b/src/events/RollbackTransactionEvent.php
@@ -4,6 +4,4 @@
 
 use yii\base\Event;
 
-class RollbackTransactionEvent extends Event
-{
-}
+class RollbackTransactionEvent extends Event {}
diff --git a/src/exceptions/AutoCommittingFieldsException.php b/src/exceptions/AutoCommittingFieldsException.php
index 2d9158d..ff89255 100644
--- a/src/exceptions/AutoCommittingFieldsException.php
+++ b/src/exceptions/AutoCommittingFieldsException.php
@@ -2,6 +2,4 @@
 
 namespace markhuot\craftpest\exceptions;
 
-class AutoCommittingFieldsException extends \Exception
-{
-}
+class AutoCommittingFieldsException extends \Exception {}
diff --git a/src/factories/Asset.php b/src/factories/Asset.php
index 9190709..d7eff35 100644
--- a/src/factories/Asset.php
+++ b/src/factories/Asset.php
@@ -78,7 +78,7 @@ public function source(string $source)
 
     public function newElement()
     {
-        return new \craft\elements\Asset();
+        return new \craft\elements\Asset;
     }
 
     public function definition(int $index = 0)
diff --git a/src/factories/BlockType.php b/src/factories/BlockType.php
index aaa1354..824f6d7 100644
--- a/src/factories/BlockType.php
+++ b/src/factories/BlockType.php
@@ -33,7 +33,7 @@ public function inferences(array $definition = [])
 
     public function newElement()
     {
-        return new MatrixBlockType();
+        return new MatrixBlockType;
     }
 
     public function store($blockType)
diff --git a/src/factories/Category.php b/src/factories/Category.php
index c041b08..204dca2 100644
--- a/src/factories/Category.php
+++ b/src/factories/Category.php
@@ -22,7 +22,7 @@ public function group($handle)
 
     public function newElement()
     {
-        return new \craft\elements\Category();
+        return new \craft\elements\Category;
     }
 
     public function definition(int $index = 0)
diff --git a/src/factories/Element.php b/src/factories/Element.php
index f4a8829..90908a7 100644
--- a/src/factories/Element.php
+++ b/src/factories/Element.php
@@ -2,11 +2,13 @@
 
 namespace markhuot\craftpest\factories;
 
+use craft\base\FieldInterface;
 use craft\fields\BaseRelationField;
 use craft\fields\Matrix;
 use Illuminate\Support\Collection;
 
 use function markhuot\craftpest\helpers\base\array_wrap;
+use function markhuot\craftpest\helpers\base\collection_wrap;
 
 abstract class Element extends Factory
 {
@@ -51,7 +53,7 @@ public function store($element)
     /**
      * Recursively resolve nested factories
      */
-    public function resolveFactories(array $values)
+    public function resolveFactories(array $values, FieldInterface $field)
     {
         // for legacy reasons ->create can either return a model or a collection of models.
         // Because of this, when we resolve factories we could end up with nested arrays of
@@ -69,7 +71,14 @@ public function resolveFactories(array $values)
                 // will go in to the model okay, but when you try to pull them back out to save them
                 // you get an EntryQuery with no access to the raw array of unsaved entries.
                 // Because of that we call ->create() here on all nested factories.
-                $values[$index] = $value->create();
+                $values[$index] = $field instanceof Matrix ? collection_wrap($value->make())->map(function (\craft\elements\Entry|array $entry) {
+                    return is_array($entry) ? $entry : [
+                        'type' => $entry->getType()->handle,
+                        'enabled' => true,
+                        'collapsed' => false,
+                        'fields' => $entry->getSerializedFieldValues(),
+                    ];
+                }) : $value->create();
                 $flattenIndexes[] = $index;
             }
         }
@@ -104,7 +113,7 @@ protected function setAttributes($attributes, $element)
         }
 
         // No need to progress further if the element doesn't support content or has no field layout
-        if (! $element::hasContent() || ! $element->getFieldLayout()) {
+        if (! $element->getFieldLayout()) {
             return $element;
         }
 
@@ -130,7 +139,7 @@ protected function setAttributes($attributes, $element)
             }
 
             if (is_subclass_of($field, BaseRelationField::class)) {
-                $value = $this->resolveFactories(array_wrap($value))->map(function ($element) {
+                $value = $this->resolveFactories(array_wrap($value), $field)->map(function ($element) {
                     if (is_numeric($element)) {
                         return $element;
                     }
@@ -143,7 +152,7 @@ protected function setAttributes($attributes, $element)
             }
 
             if (is_a($field, Matrix::class)) {
-                $value = $this->resolveFactories(array_wrap($value))
+                $value = $this->resolveFactories(array_wrap($value), $field)
                     ->mapWithKeys(function ($item, $index) {
                         return ['new'.($index + 1) => $item];
                     })->toArray();
diff --git a/src/factories/Entry.php b/src/factories/Entry.php
index 5676dac..f59d5b1 100644
--- a/src/factories/Entry.php
+++ b/src/factories/Entry.php
@@ -3,9 +3,11 @@
 namespace markhuot\craftpest\factories;
 
 use craft\models\EntryType;
-use markhuot\craftpest\factories\Section as FactoriesSection;
+use markhuot\craftpest\interfaces\SectionsServiceInterface;
 use markhuot\craftpest\storage\FactoryFields;
 
+use function markhuot\craftpest\helpers\base\service;
+
 /**
  * Entry Factory
  *
@@ -25,11 +27,11 @@
  */
 class Entry extends Element
 {
-    /** @var EntryType */
-    protected $type;
-
     /** @var string|\craft\models\Section|null */
-    protected $sectionIdentifier;
+    protected $sectionIdentifier = null;
+
+    /** @var EntryType|string|null */
+    protected $entryTypeIdentifier = null;
 
     protected $priorityAttributes = ['sectionId', 'typeId'];
 
@@ -53,9 +55,11 @@ public function section($identifier)
     /**
      * Set the entry type
      */
-    public function type($handle)
+    public function type($identifier)
     {
+        $this->entryTypeIdentifier = $identifier;
 
+        return $this;
     }
 
     /**
@@ -126,26 +130,22 @@ public function author(\craft\web\User|string|int $user)
      *
      * @internal
      */
-    public function inferSectionId()
+    public function inferSectionId(): ?int
     {
         if (is_a($this->sectionIdentifier, \craft\models\Section::class)) {
             $section = $this->sectionIdentifier;
         } elseif (is_numeric($this->sectionIdentifier)) {
-            $section = \Craft::$app->sections->getSectionById($this->sectionIdentifier);
+            $section = service(SectionsServiceInterface::class)->getSectionById($this->sectionIdentifier);
         } elseif (is_string($this->sectionIdentifier)) {
-            $section = \Craft::$app->sections->getSectionByHandle($this->sectionIdentifier);
+            $section = service(SectionsServiceInterface::class)->getSectionByHandle($this->sectionIdentifier);
         } else {
             $reflector = new \ReflectionClass($this);
             $className = $reflector->getShortName();
             $sectionHandle = lcfirst($className);
-            $section = \Craft::$app->sections->getSectionByHandle($sectionHandle);
+            $section = service(SectionsServiceInterface::class)->getSectionByHandle($sectionHandle);
         }
 
-        if (empty($section)) {
-            $section = FactoriesSection::factory()->create();
-        }
-
-        return $section->id;
+        return $section?->id;
     }
 
     /**
@@ -153,18 +153,31 @@ public function inferSectionId()
      *
      * @internal
      */
-    public function inferTypeId($sectionid): int
+    public function inferTypeId(?int $sectionid): ?int
     {
-        $reflector = new \ReflectionClass($this);
-        $className = $reflector->getShortName();
-        $typeHandle = lcfirst($className);
-        $section = \Craft::$app->sections->getSectionById($sectionid);
-        $matches = array_filter($section->entryTypes, fn ($e) => $e->handle === $typeHandle);
-        if (count($matches) === 0) {
-            $matches = $section->entryTypes;
+        if ($sectionid) {
+            $section = service(SectionsServiceInterface::class)->getSectionById($sectionid);
+            $entryTypes = collect($section->getEntryTypes());
+        } else {
+            $entryTypes = collect(service(SectionsServiceInterface::class)->getAllEntryTypes());
         }
 
-        return $matches[0]->id;
+        if (is_a($this->entryTypeIdentifier, \craft\models\EntryType::class)) {
+            $entryType = $this->entryTypeIdentifier;
+        } elseif (is_numeric($this->entryTypeIdentifier)) {
+            $entryType = $entryTypes->where('id', $this->entryTypeIdentifier)->first();
+        } elseif (is_string($this->entryTypeIdentifier)) {
+            $entryType = $entryTypes->where('handle', $this->entryTypeIdentifier)->first();
+        } elseif ($sectionid) {
+            $reflector = new \ReflectionClass($this);
+            $className = $reflector->getShortName();
+            $typeHandle = lcfirst($className);
+            $entryType = $entryTypes->where('handle', $typeHandle)->first() ??
+                         $entryTypes->where('handle', 'default')->first() ??
+                         $entryTypes->first();
+        }
+
+        return $entryType->id ?? null;
     }
 
     /**
@@ -174,7 +187,7 @@ public function inferTypeId($sectionid): int
      */
     public function newElement()
     {
-        return new \craft\elements\Entry();
+        return new \craft\elements\Entry;
     }
 
     /**
@@ -185,6 +198,12 @@ public function inferences(array $definition = [])
         $sectionId = $this->inferSectionId();
         $typeId = $this->inferTypeId($sectionId);
 
+        // If you couldn't infer anything, then create a new section/type
+        if (empty($sectionId) && empty($typeId)) {
+            $sectionId = ($section = Section::factory()->create())->id;
+            $typeId = collect($section->getEntryTypes())->first()?->id;
+        }
+
         return array_merge($definition, [
             'sectionId' => $sectionId,
             'typeId' => $typeId,
diff --git a/src/factories/EntryType.php b/src/factories/EntryType.php
new file mode 100644
index 0000000..68caf14
--- /dev/null
+++ b/src/factories/EntryType.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace markhuot\craftpest\factories;
+
+use Craft;
+use craft\helpers\StringHelper;
+use craft\models\EntryType as EntryTypeModel;
+
+/**
+ * @method self name(string $name)
+ * @method self handle(string $name)
+ * @method self hasTitleField(bool $hasTitleField)
+ */
+class EntryType extends Factory
+{
+    use Fieldable;
+
+    public function definition(int $index = 0)
+    {
+        $name = $this->faker->words(2, true);
+
+        return [
+            'name' => $name,
+        ];
+    }
+
+    public function inferences(array $definition = [])
+    {
+        if (empty($definition['handle']) && ! empty($definition['name'])) {
+            $definition['handle'] = StringHelper::toCamelCase($definition['name']);
+        }
+
+        return $definition;
+    }
+
+    public function newElement()
+    {
+        return new EntryTypeModel;
+    }
+
+    public function store($entryType)
+    {
+        return Craft::$app->getEntries()->saveEntryType($entryType);
+    }
+}
diff --git a/src/factories/Field.php b/src/factories/Field.php
index 5d500e6..0974fa1 100644
--- a/src/factories/Field.php
+++ b/src/factories/Field.php
@@ -2,6 +2,8 @@
 
 namespace markhuot\craftpest\factories;
 
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
 use craft\helpers\StringHelper;
 
 /**
@@ -23,7 +25,7 @@ public function type(string $type)
     public function group(string $groupName)
     {
         $this->attributes['groupId'] = function () use ($groupName) {
-            foreach (\Craft::$app->fields->getAllGroups() as $group) {
+            foreach (\Craft::$app->fields->getAllGroups() as $group) { //@phpstan-ignore-line
                 if ($group->name === $groupName) {
                     return $group->id;
                 }
@@ -55,12 +57,17 @@ public function newElement()
     public function definition(int $index = 0)
     {
         $name = $this->faker->words(2, true);
-        $firstFieldGroupId = \Craft::$app->fields->getAllGroups()[0]->id;
 
-        return [
+        $definition = [
             'name' => $name,
-            'groupId' => $firstFieldGroupId,
         ];
+
+        if (InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '~4.0')) {
+            $firstFieldGroupId = \Craft::$app->fields->getAllGroups()[0]->id; // @phpstan-ignore-line
+            $definition['groupId'] = $firstFieldGroupId;
+        }
+
+        return $definition;
     }
 
     public function inferences(array $definition = [])
diff --git a/src/factories/Fieldable.php b/src/factories/Fieldable.php
index 41461b4..fa21954 100644
--- a/src/factories/Fieldable.php
+++ b/src/factories/Fieldable.php
@@ -55,7 +55,7 @@ public function storeFields(FieldLayout $fieldLayout, $context = null)
             ->toArray();
 
         if (empty($fieldLayout->getTabs()[0])) {
-            $fieldLayoutTab = new FieldLayoutTab();
+            $fieldLayoutTab = new FieldLayoutTab;
             $fieldLayoutTab->name = 'Content';
             $fieldLayoutTab->sortOrder = 1;
             $fieldLayout->setTabs([$fieldLayoutTab]);
diff --git a/src/factories/MatrixField.php b/src/factories/MatrixField.php
index 25b53b8..27142d0 100644
--- a/src/factories/MatrixField.php
+++ b/src/factories/MatrixField.php
@@ -2,95 +2,21 @@
 
 namespace markhuot\craftpest\factories;
 
-use craft\fields\Matrix;
-use craft\models\MatrixBlockType;
-
-use function markhuot\craftpest\helpers\base\version_greater_than_or_equal_to;
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
 
 class MatrixField extends Field
 {
-    protected $blockTypes = [];
-
-    public function blockTypes(...$blockTypes)
+    public static function factory()
     {
-        if (is_array($blockTypes[0])) {
-            $this->blockTypes = array_merge($this->blockTypes, $blockTypes[0]);
-        } else {
-            $this->blockTypes = array_merge($this->blockTypes, $blockTypes);
+        if (InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '~5.0')) {
+            return MatrixFieldEntries::factory();
         }
 
-        return $this;
-    }
-
-    public function addBlockType($blockType)
-    {
-        $this->blockTypes[] = $blockType;
-
-        return $this;
-    }
-
-    /**
-     * Get the element to be generated
-     */
-    public function newElement()
-    {
-        return new \craft\fields\Matrix;
-    }
-
-    /**
-     * @param  Matrix  $element
-     */
-    public function store($element): bool
-    {
-        // Push the block types in to the field
-        $element->setBlockTypes(
-            collect($this->blockTypes)
-                ->map
-                ->make()
-                ->flatten()
-                ->each(function ($blockType, $index) use ($element) {
-                    $blockType->fieldId = $element->id;
-                    $blockType->sortOrder = $index;
-                })
-                ->toArray()
-        );
-
-        // Store the field, which also saves the block types
-        $result = parent::store($element);
-
-        // If we have an error, stop here because it will be impossible to save
-        // block types on an unsaved/errored matrix field
-        if ($result === false) {
-            return $result;
+        if (InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '~4.0')) {
+            return MatrixFieldBlocks::factory();
         }
 
-        // Add the fields in to the block types
-        collect($this->blockTypes)
-            ->zip($element->getBlockTypes())
-            ->each(function ($props) {
-                /** @var MatrixBlockType $blockType */
-                [$factory, $blockType] = $props;
-                $factory->storeFields($blockType->fieldLayout, $blockType);
-
-                if (version_greater_than_or_equal_to(\Craft::$app->version, '3')) {
-                    $blockType->fieldLayoutId = $blockType->fieldLayout->id;
-                    \Craft::$app->matrix->saveBlockType($blockType);
-                }
-            });
-
-        // In Craft 3.7 the Matrix Field model stores a reference to the `_blockTypes` of the
-        // matrix. Inside that reference the block type stores a reference to its `fieldLayoutId`.
-        //
-        // The reference to the Matrix Field is cached in to \Craft::$app->fields->_fields when the
-        // field is created and it's cached without a valid `fieldLayoutId`.
-        //
-        // The following grabs the global \Craft::$app->fields->field reference to this matrix field
-        // and updates the block types by pulling them fresh from the database. This ensures everything
-        // is up to date and there are no null fieldLayoutId values.
-        /** @var Matrix $cachedMatrixField */
-        $cachedMatrixField = \Craft::$app->fields->getFieldById($element->id);
-        $cachedMatrixField->setBlockTypes(\Craft::$app->matrix->getBlockTypesByFieldId($element->id));
-
-        return $result;
+        throw new \RuntimeException('bad version');
     }
 }
diff --git a/src/factories/MatrixFieldBlocks.php b/src/factories/MatrixFieldBlocks.php
new file mode 100644
index 0000000..3c44d46
--- /dev/null
+++ b/src/factories/MatrixFieldBlocks.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace markhuot\craftpest\factories;
+
+use craft\fields\Matrix;
+use craft\models\MatrixBlockType;
+
+use function markhuot\craftpest\helpers\base\version_greater_than_or_equal_to;
+
+class MatrixFieldBlocks extends Field
+{
+    protected $blockTypes = [];
+
+    public function blockTypes(...$blockTypes)
+    {
+        if (is_array($blockTypes[0])) {
+            $this->blockTypes = array_merge($this->blockTypes, $blockTypes[0]);
+        } else {
+            $this->blockTypes = array_merge($this->blockTypes, $blockTypes);
+        }
+
+        return $this;
+    }
+
+    public function addBlockType($blockType)
+    {
+        $this->blockTypes[] = $blockType;
+
+        return $this;
+    }
+
+    /**
+     * Get the element to be generated
+     */
+    public function newElement()
+    {
+        return new \craft\fields\Matrix;
+    }
+
+    /**
+     * @param  Matrix  $element
+     */
+    public function store($element): bool
+    {
+        // Push the block types in to the field
+        $element->setBlockTypes(
+            collect($this->blockTypes)
+                ->map
+                ->make()
+                ->flatten()
+                ->each(function ($blockType, $index) use ($element) {
+                    $blockType->fieldId = $element->id;
+                    $blockType->sortOrder = $index;
+                })
+                ->toArray()
+        );
+
+        // Store the field, which also saves the block types
+        $result = parent::store($element);
+
+        // If we have an error, stop here because it will be impossible to save
+        // block types on an unsaved/errored matrix field
+        if ($result === false) {
+            return $result;
+        }
+
+        // Add the fields in to the block types
+        collect($this->blockTypes)
+            ->zip($element->getBlockTypes())
+            ->each(function ($props) {
+                /** @var MatrixBlockType $blockType */
+                [$factory, $blockType] = $props;
+                $factory->storeFields($blockType->fieldLayout, $blockType);
+
+                if (version_greater_than_or_equal_to(\Craft::$app->version, '3')) {
+                    $blockType->fieldLayoutId = $blockType->fieldLayout->id;
+                    \Craft::$app->matrix->saveBlockType($blockType);
+                }
+            });
+
+        // In Craft 3.7 the Matrix Field model stores a reference to the `_blockTypes` of the
+        // matrix. Inside that reference the block type stores a reference to its `fieldLayoutId`.
+        //
+        // The reference to the Matrix Field is cached in to \Craft::$app->fields->_fields when the
+        // field is created and it's cached without a valid `fieldLayoutId`.
+        //
+        // The following grabs the global \Craft::$app->fields->field reference to this matrix field
+        // and updates the block types by pulling them fresh from the database. This ensures everything
+        // is up to date and there are no null fieldLayoutId values.
+        /** @var Matrix $cachedMatrixField */
+        $cachedMatrixField = \Craft::$app->fields->getFieldById($element->id);
+        $cachedMatrixField->setBlockTypes(\Craft::$app->matrix->getBlockTypesByFieldId($element->id));
+
+        return $result;
+    }
+}
diff --git a/src/factories/MatrixFieldEntries.php b/src/factories/MatrixFieldEntries.php
new file mode 100644
index 0000000..f7377e2
--- /dev/null
+++ b/src/factories/MatrixFieldEntries.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace markhuot\craftpest\factories;
+
+use craft\fields\Matrix;
+
+class MatrixFieldEntries extends Field
+{
+    /**
+     * @var EntryType[]
+     */
+    protected $entryTypes = [];
+
+    public function entryTypes(...$entryTypes)
+    {
+        if (is_array($entryTypes[0])) {
+            $this->entryTypes = array_merge($this->entryTypes, $entryTypes[0]);
+        } else {
+            $this->entryTypes = array_merge($this->entryTypes, $entryTypes);
+        }
+
+        return $this;
+    }
+
+    public function addEntryType($entryType)
+    {
+        $this->entryTypes[] = $entryType;
+
+        return $this;
+    }
+
+    /**
+     * Get the element to be generated
+     */
+    public function newElement()
+    {
+        return new \craft\fields\Matrix;
+    }
+
+    /**
+     * @param  Matrix  $element
+     */
+    public function store($element): bool
+    {
+        // Push the block types in to the field
+        $element->setEntryTypes(
+            collect($this->entryTypes)
+                ->map(fn (EntryType $entryType) => $entryType->create())
+                ->flatten(1)
+                ->toArray()
+        );
+
+        // Store the field, which also saves the block types
+        $result = parent::store($element);
+
+        // If we have an error, stop here because it will be impossible to save
+        // block types on an unsaved/errored matrix field
+        if ($result === false) {
+            return $result;
+        }
+
+        // Add the fields in to the block types
+        collect($this->entryTypes)
+            ->zip($element->getEntryTypes())
+            ->each(function ($props) {
+                /** @var \craft\models\EntryType $entryType */
+                [$factory, $entryType] = $props;
+                $factory->storeFields($entryType->fieldLayout, $entryType);
+
+                $entryType->fieldLayoutId = $entryType->fieldLayout->id;
+                \Craft::$app->getEntries()->saveEntryType($entryType);
+            });
+
+        return $result;
+    }
+}
diff --git a/src/factories/Section.php b/src/factories/Section.php
index a4ec6f8..6d75cdf 100644
--- a/src/factories/Section.php
+++ b/src/factories/Section.php
@@ -2,10 +2,16 @@
 
 namespace markhuot\craftpest\factories;
 
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
+use Craft;
 use craft\helpers\StringHelper;
+use craft\models\EntryType;
 use craft\models\Section_SiteSettings;
-use Faker\Factory as Faker;
 use Illuminate\Support\Collection;
+use markhuot\craftpest\interfaces\SectionsServiceInterface;
+
+use function markhuot\craftpest\helpers\base\service;
 
 /**
  * @method self name(string $name)
@@ -60,7 +66,7 @@ public function template(string $template)
      */
     public function newElement()
     {
-        return new \craft\models\Section();
+        return new \craft\models\Section;
     }
 
     /**
@@ -74,7 +80,7 @@ public function definition(int $index = 0)
 
         return [
             'name' => $name,
-            'type' => 'channel',
+            'type' => \craft\models\Section::TYPE_CHANNEL,
         ];
     }
 
@@ -86,14 +92,14 @@ public function inferences(array $definition = [])
 
         $name = $definition['name'];
         $handle = $definition['handle'];
-        $definition['siteSettings'] = collect(\Craft::$app->sites->getAllSites())
+        $definition['siteSettings'] = collect(Craft::$app->sites->getAllSites())
             ->mapWithkeys(function ($site) use ($name, $handle) {
-                $settings = new Section_SiteSettings();
+                $settings = new Section_SiteSettings;
                 $settings->siteId = $site->id;
                 $settings->hasUrls = $this->hasUrls;
                 $settings->uriFormat = $this->uriFormat;
                 $settings->enabledByDefault = $this->enabledByDefault;
-                $settings->template = \Craft::$app->view->renderObjectTemplate($this->template, [
+                $settings->template = Craft::$app->view->renderObjectTemplate($this->template, [
                     'name' => $name,
                     'handle' => $handle,
                 ]);
@@ -101,6 +107,18 @@ public function inferences(array $definition = [])
                 return [$site->id => $settings];
             })->toArray();
 
+        if (InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '~5.0')) {
+            if (empty($definition['entryTypes'])) {
+                $entryType = new EntryType([
+                    'name' => $name,
+                    'handle' => StringHelper::toHandle($name),
+                ]);
+                service(SectionsServiceInterface::class)->saveEntryType($entryType);
+                throw_if($entryType->errors, 'Problem saving entry type: '.implode(', ', $entryType->getFirstErrors()));
+                $definition['entryTypes'] = [$entryType];
+            }
+        }
+
         return $definition;
     }
 
@@ -111,7 +129,9 @@ public function inferences(array $definition = [])
      */
     public function store($element)
     {
-        $result = \Craft::$app->sections->saveSection($element);
+        $result = service(SectionsServiceInterface::class)->saveSection($element);
+        throw_unless(empty($element->errors), 'Problem saving section: '.implode(', ', $element->getFirstErrors()));
+
         $this->storeFields($element->entryTypes[0]->fieldLayout);
 
         return $result;
diff --git a/src/factories/User.php b/src/factories/User.php
index 8ad3f39..f312064 100644
--- a/src/factories/User.php
+++ b/src/factories/User.php
@@ -14,7 +14,7 @@ public function newElement()
 
     public function definition(int $index = 0)
     {
-        $email = $this->faker->email();
+        $email = $this->faker->safeEmail();
 
         return [
             'email' => $email,
diff --git a/src/helpers/Base.php b/src/helpers/Base.php
index 0ad45de..3c35c2d 100644
--- a/src/helpers/Base.php
+++ b/src/helpers/Base.php
@@ -2,6 +2,7 @@
 
 namespace markhuot\craftpest\helpers\base;
 
+use Craft;
 use Illuminate\Support\Collection;
 
 if (! function_exists('collection_wrap')) {
@@ -32,3 +33,14 @@ function version_greater_than_or_equal_to(string $version1, string $version2)
         return version_compare($version1, $version2) >= 0;
     }
 }
+
+/**
+ * @template T
+ *
+ * @param  class-string<T>  $className
+ * @return T
+ */
+function service(string $className)
+{
+    return Craft::$container->get($className);
+}
diff --git a/src/helpers/Craft.php b/src/helpers/Craft.php
index a683e46..96d5b8e 100644
--- a/src/helpers/Craft.php
+++ b/src/helpers/Craft.php
@@ -2,10 +2,22 @@
 
 namespace markhuot\craftpest\helpers\craft;
 
+use Composer\Semver\Semver;
+use Craft;
 use craft\helpers\FileHelper;
 
 use function markhuot\craftpest\helpers\base\version_greater_than_or_equal_to;
 
+function isCraftFive(): bool
+{
+    return Semver::satisfies(Craft::$app->version, '~5.0');
+}
+
+function isBeforeCraftFive(): bool
+{
+    return Semver::satisfies(Craft::$app->version, '<5.0');
+}
+
 /**
  * @codeCoverageIgnore
  */
@@ -68,7 +80,7 @@ function createVolume()
     function volumeDefinition(array $definition = [])
     {
         if (version_greater_than_or_equal_to(\Craft::$app->version, '4')) {
-            $fileSystem = new \craft\fs\Local();                                                                  // @phpstan-ignore-line
+            $fileSystem = new \craft\fs\Local;                                                                  // @phpstan-ignore-line
             $fileSystem->name = $definition['name'].' FS';                                                      // @phpstan-ignore-line
             $fileSystem->handle = $definition['handle'].'Fs';                                                   // @phpstan-ignore-line
             $fileSystem->path = \Craft::getAlias('@storage').'/volumes/'.$definition['handle'].'/';    // @phpstan-ignore-line
diff --git a/src/http/requests/GetRequest.php b/src/http/requests/GetRequest.php
index 1675c23..e85b0b2 100644
--- a/src/http/requests/GetRequest.php
+++ b/src/http/requests/GetRequest.php
@@ -2,6 +2,4 @@
 
 namespace markhuot\craftpest\http\requests;
 
-class GetRequest extends WebRequest
-{
-}
+class GetRequest extends WebRequest {}
diff --git a/src/http/requests/PostRequest.php b/src/http/requests/PostRequest.php
index 59502fa..8f70355 100644
--- a/src/http/requests/PostRequest.php
+++ b/src/http/requests/PostRequest.php
@@ -2,6 +2,4 @@
 
 namespace markhuot\craftpest\http\requests;
 
-class PostRequest extends WebRequest
-{
-}
+class PostRequest extends WebRequest {}
diff --git a/src/interfaces/RenderCompiledClassesInterface.php b/src/interfaces/RenderCompiledClassesInterface.php
new file mode 100644
index 0000000..193012d
--- /dev/null
+++ b/src/interfaces/RenderCompiledClassesInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace markhuot\craftpest\interfaces;
+
+interface RenderCompiledClassesInterface
+{
+    public function handle(bool $forceRecreate = false);
+}
diff --git a/src/interfaces/SectionsServiceInterface.php b/src/interfaces/SectionsServiceInterface.php
new file mode 100644
index 0000000..b94850b
--- /dev/null
+++ b/src/interfaces/SectionsServiceInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace markhuot\craftpest\interfaces;
+
+use craft\models\EntryType;
+use craft\models\Section;
+
+interface SectionsServiceInterface
+{
+    public function saveSection(Section $section): bool;
+
+    public function saveEntryType(EntryType $entryType): bool;
+
+    public function getSectionById(int $id): ?Section;
+
+    public function getSectionByHandle(string $handle): ?Section;
+
+    public function getAllEntryTypes(): array;
+
+    public function getEntryTypeById(int $id): ?EntryType;
+
+    public function getEntryTypeByHandle(string $handle): ?EntryType;
+
+    public function getEntryTypesBySectionId(int $sectionId): array;
+}
diff --git a/src/overrides/Config.php b/src/overrides/Config.php
index 8ee1675..9664291 100644
--- a/src/overrides/Config.php
+++ b/src/overrides/Config.php
@@ -2,6 +2,4 @@
 
 namespace markhuot\craftpest\overrides;
 
-class Config extends \craft\services\Config
-{
-}
+class Config extends \craft\services\Config {}
diff --git a/src/overrides/ProjectConfig.php b/src/overrides/ProjectConfig.php
index 64d524f..ad8495e 100644
--- a/src/overrides/ProjectConfig.php
+++ b/src/overrides/ProjectConfig.php
@@ -2,6 +2,4 @@
 
 namespace markhuot\craftpest\overrides;
 
-class ProjectConfig extends \craft\services\Config
-{
-}
+class ProjectConfig extends \craft\services\Config {}
diff --git a/src/pest/MonkeyPatches.php b/src/pest/MonkeyPatches.php
index a76be69..6f42046 100644
--- a/src/pest/MonkeyPatches.php
+++ b/src/pest/MonkeyPatches.php
@@ -20,9 +20,11 @@ public function boot(): void
         $asset = preg_replace('/(class Asset.+?\{)/s', '$1 use \\markhuot\\craftpest\\traits\\Snapshotable;', $asset);
         eval($asset);
 
-        $matrixBlock = file_get_contents($vendorDir.'/craftcms/cms/src/elements/MatrixBlock.php');
-        $matrixBlock = preg_replace('/^<\?php/', '', $matrixBlock);
-        $matrixBlock = preg_replace('/(class MatrixBlock.+?\{)/s', '$1 use \\markhuot\\craftpest\\traits\\Snapshotable;', $matrixBlock);
-        eval($matrixBlock);
+        if (file_exists($vendorDir.'/craftcms/cms/src/elements/MatrixBlock.php')) {
+            $matrixBlock = file_get_contents($vendorDir.'/craftcms/cms/src/elements/MatrixBlock.php');
+            $matrixBlock = preg_replace('/^<\?php/', '', $matrixBlock);
+            $matrixBlock = preg_replace('/(class MatrixBlock.+?\{)/s', '$1 use \\markhuot\\craftpest\\traits\\Snapshotable;', $matrixBlock);
+            eval($matrixBlock);
+        }
     }
 }
diff --git a/src/pest/PhpReporter.php b/src/pest/PhpReporter.php
index 7c8f963..abcff2a 100644
--- a/src/pest/PhpReporter.php
+++ b/src/pest/PhpReporter.php
@@ -2,6 +2,4 @@
 
 namespace markhuot\craftpest\pest;
 
-class PhpReporter extends Reporter
-{
-}
+class PhpReporter extends Reporter {}
diff --git a/src/test/DatabaseAssertions.php b/src/test/DatabaseAssertions.php
index e43a8cc..fa47769 100644
--- a/src/test/DatabaseAssertions.php
+++ b/src/test/DatabaseAssertions.php
@@ -22,7 +22,7 @@ trait DatabaseAssertions
      */
     public function assertDatabaseCount(string $tableName, int $expectedCount)
     {
-        $actualCount = (new Query())->from($tableName)->count();
+        $actualCount = (new Query)->from($tableName)->count();
 
         $this->assertEquals($expectedCount, $actualCount);
     }
diff --git a/src/test/RefreshesDatabase.php b/src/test/RefreshesDatabase.php
index 653f800..d51c485 100644
--- a/src/test/RefreshesDatabase.php
+++ b/src/test/RefreshesDatabase.php
@@ -2,6 +2,8 @@
 
 namespace markhuot\craftpest\test;
 
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
 use markhuot\craftpest\events\FactoryStoreEvent;
 use markhuot\craftpest\events\RollbackTransactionEvent;
 use markhuot\craftpest\exceptions\AutoCommittingFieldsException;
@@ -77,8 +79,12 @@ protected function stopListeningForStores()
     public function beforeStore(FactoryStoreEvent $event)
     {
         $isFieldFactory = is_a($event->sender, Field::class) || is_subclass_of($event->sender, Field::class);
+        $isCraft4 = InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '~4.0');
 
-        if ($isFieldFactory && $this->hasStoredNonFieldContent) {
+        // We don't need to worry about autocommiting fields in Craft 5 because there is no longer
+        // a dynamic content table. The field data goes in a JSON field so the DB schema never
+        // changes!
+        if ($isCraft4 && $isFieldFactory && $this->hasStoredNonFieldContent) {
             throw new AutoCommittingFieldsException('You can not create fields after creating elements while refreshesDatabase is in use.');
         }
 
@@ -123,7 +129,7 @@ public function rollBackTransaction()
 
         $this->transaction->rollBack();
 
-        $event = new RollbackTransactionEvent();
+        $event = new RollbackTransactionEvent;
         $event->sender = $this;
         Event::trigger(RefreshesDatabase::class, 'EVENT_ROLLBACK_TRANSACTION', $event);
 
diff --git a/src/test/TestCase.php b/src/test/TestCase.php
index e9eb4ed..5eea605 100644
--- a/src/test/TestCase.php
+++ b/src/test/TestCase.php
@@ -2,11 +2,12 @@
 
 namespace markhuot\craftpest\test;
 
+use Craft;
 use craft\helpers\App;
 use Illuminate\Support\Collection;
 use markhuot\craftpest\actions\CallSeeders;
-use markhuot\craftpest\actions\RenderCompiledClasses;
 use markhuot\craftpest\console\TestableResponse;
+use markhuot\craftpest\interfaces\RenderCompiledClassesInterface;
 use Symfony\Component\Process\Process;
 
 class TestCase extends \PHPUnit\Framework\TestCase
@@ -60,21 +61,21 @@ protected function callTraits($prefix)
     public function createApplication()
     {
         if (! $this->needsRequireStatements()) {
-            return \Craft::$app;
+            return Craft::$app;
         }
 
         $this->requireCraft();
 
         $needsRefresh = false;
 
-        if (! \Craft::$app->getIsInstalled(true)) {
+        if (! Craft::$app->getIsInstalled(true)) {
             $this->craftInstall();
             $needsRefresh = true;
         }
 
         if (
-            \Craft::$app->getMigrator()->getNewMigrations() ||
-            \Craft::$app->getContentMigrator()->getNewMigrations()
+            Craft::$app->getMigrator()->getNewMigrations() ||
+            Craft::$app->getContentMigrator()->getNewMigrations()
         ) {
             $this->craftMigrateAll();
             $needsRefresh = true;
@@ -88,8 +89,8 @@ public function createApplication()
         // tests you'll reach in to the same cache as the dev side and pull that the project config is unchanged
         // even though it actually _is_ changed. This ensures that there isn't any cache sharing between dev
         // and test.
-        \Craft::$app->getCache()->flush();
-        if (\Craft::$app->getProjectConfig()->areChangesPending(null, true)) {
+        Craft::$app->getCache()->flush();
+        if (Craft::$app->getProjectConfig()->areChangesPending(null, true)) {
             $this->craftProjectConfigApply();
             $needsRefresh = true;
         }
@@ -100,7 +101,7 @@ public function createApplication()
             exit($this->reRunPest());
         }
 
-        return \Craft::$app;
+        return Craft::$app;
     }
 
     protected function craftInstall()
@@ -112,7 +113,7 @@ protected function craftInstall()
             '--interactive='.(App::env('CRAFT_INSTALL_INTERACTIVE') ?? '0'),
         ];
 
-        if (! file_exists(\Craft::getAlias('@config/project/project.yaml'))) {
+        if (! file_exists(Craft::getAlias('@config/project/project.yaml'))) {
             $args = array_merge($args, [
                 '--siteName='.(App::env('CRAFT_INSTALL_SITENAME') ?? '"Craft CMS"'),
                 '--siteUrl='.(App::env('CRAFT_INSTALL_SITEURL') ?? 'http://localhost:8080'),
@@ -201,7 +202,7 @@ protected function reRunPest()
 
     public function renderCompiledClasses()
     {
-        (new RenderCompiledClasses)->handle();
+        Craft::$container->get(RenderCompiledClassesInterface::class)->handle();
     }
 
     protected function needsRequireStatements()
@@ -249,7 +250,7 @@ public function console(array|string $command)
 
     public function renderTemplate(...$args)
     {
-        $content = \Craft::$app->getView()->renderTemplate(...$args);
+        $content = Craft::$app->getView()->renderTemplate(...$args);
 
         return new \markhuot\craftpest\web\TestableResponse(['content' => $content]);
     }
diff --git a/src/web/BenchmarkResult.php b/src/web/BenchmarkResult.php
index 6f7fa20..33056d6 100644
--- a/src/web/BenchmarkResult.php
+++ b/src/web/BenchmarkResult.php
@@ -29,8 +29,7 @@ class BenchmarkResult
     public function __construct(
         public int $startProfileAt,
         public int $endProfileAt,
-    ) {
-    }
+    ) {}
 
     // function summary()
     // {
diff --git a/stubs/compiled_classes/FactoryFields.twig b/stubs/compiled_classes/FactoryFields.twig
index 2f1e89e..f6341cc 100644
--- a/stubs/compiled_classes/FactoryFields.twig
+++ b/stubs/compiled_classes/FactoryFields.twig
@@ -3,12 +3,25 @@
 namespace markhuot\craftpest\storage;
 
 /**
+ {% set type = 'mixed' %}
  {% for field in fields %}
- * @method $this {{ field.handle }}({{ field.factoryTypeHint|default('mixed $value') }}) Sets the {{ field.name }} custom field {{ field.valueType }}
+ {% if craft.app.version < 5 %}
+{% set type = field.valueType() %}
+{% elseif craft.app.version > 5 %}
+{% set type = field.phpType() %}
+{% endif %}
+ * @method $this {{ field.handle }}({{ field.factoryTypeHint|default('mixed $value') }}): {{ type }} Sets the {{ field.name }} custom field
  {% endfor %}
  *
  {% for field in fields %}
- {% if 'craft\\elements\\db\\MatrixBlockQuery' in field.valueType %}
+ {% if craft.app.version < 5 %}
+{% set type = field.valueType() %}
+{% elseif craft.app.version > 5 %}
+{% set type = field.phpType() %}
+{% else %}
+{% set type = 'mixed' %}
+{% endif %}
+ {% if 'craft\\elements\\db\\MatrixBlockQuery' == type %}
  {% for blockType in field.blockTypes %}
  {% if loop.first %}
  * @method $this addBlockTo{{ field.handle|ucfirst }}({{ blockType.fieldLayout.getCustomFieldElements()|map(f => f.getField().factoryTypeHint|default('mixed $value'))|join(', ') }})
diff --git a/stubs/config/db.php b/stubs/config/db.php
index 9f7b4b9..df111c9 100644
--- a/stubs/config/db.php
+++ b/stubs/config/db.php
@@ -13,5 +13,5 @@
     'schema' => App::env('CRAFT_DB_SCHEMA'),
     'tablePrefix' => App::env('CRAFT_DB_TABLE_PREFIX'),
     'charset' => 'utf8',
-    'collation' => 'utf8_unicode_ci',
+    //'collation' => 'utf8_unicode_ci',
 ];
diff --git a/stubs/config/project/entryTypes/default--0193fbbc-6912-4ff6-a3d5-e60ea03c8590.yaml b/stubs/config/project-4/entryTypes/default--0193fbbc-6912-4ff6-a3d5-e60ea03c8590.yaml
similarity index 100%
rename from stubs/config/project/entryTypes/default--0193fbbc-6912-4ff6-a3d5-e60ea03c8590.yaml
rename to stubs/config/project-4/entryTypes/default--0193fbbc-6912-4ff6-a3d5-e60ea03c8590.yaml
diff --git a/stubs/config/project/fieldGroups/f948b9a4-6a4e-43da-84aa-65b91c0cd202.yaml b/stubs/config/project-4/fieldGroups/f948b9a4-6a4e-43da-84aa-65b91c0cd202.yaml
similarity index 100%
rename from stubs/config/project/fieldGroups/f948b9a4-6a4e-43da-84aa-65b91c0cd202.yaml
rename to stubs/config/project-4/fieldGroups/f948b9a4-6a4e-43da-84aa-65b91c0cd202.yaml
diff --git a/stubs/config/project/fields/dropdownField--17685ada-d64c-459c-b9fc-678d43e4bee8.yaml b/stubs/config/project-4/fields/dropdownField--17685ada-d64c-459c-b9fc-678d43e4bee8.yaml
similarity index 100%
rename from stubs/config/project/fields/dropdownField--17685ada-d64c-459c-b9fc-678d43e4bee8.yaml
rename to stubs/config/project-4/fields/dropdownField--17685ada-d64c-459c-b9fc-678d43e4bee8.yaml
diff --git a/stubs/config/project/fields/entriesField--c148dfb3-a122-49ed-8538-de26d0482663.yaml b/stubs/config/project-4/fields/entriesField--c148dfb3-a122-49ed-8538-de26d0482663.yaml
similarity index 100%
rename from stubs/config/project/fields/entriesField--c148dfb3-a122-49ed-8538-de26d0482663.yaml
rename to stubs/config/project-4/fields/entriesField--c148dfb3-a122-49ed-8538-de26d0482663.yaml
diff --git a/stubs/config/project/fields/matrixField--c7529b61-60cd-4e18-a272-3084aee7fa89.yaml b/stubs/config/project-4/fields/matrixField--c7529b61-60cd-4e18-a272-3084aee7fa89.yaml
similarity index 100%
rename from stubs/config/project/fields/matrixField--c7529b61-60cd-4e18-a272-3084aee7fa89.yaml
rename to stubs/config/project-4/fields/matrixField--c7529b61-60cd-4e18-a272-3084aee7fa89.yaml
diff --git a/stubs/config/project/fields/textField--7d1a7bf3-c346-48bc-bb77-f7d76fcacf2e.yaml b/stubs/config/project-4/fields/textField--7d1a7bf3-c346-48bc-bb77-f7d76fcacf2e.yaml
similarity index 100%
rename from stubs/config/project/fields/textField--7d1a7bf3-c346-48bc-bb77-f7d76fcacf2e.yaml
rename to stubs/config/project-4/fields/textField--7d1a7bf3-c346-48bc-bb77-f7d76fcacf2e.yaml
diff --git a/stubs/config/project/matrixBlockTypes/blockTypeOne--b5c238dd-588f-4f0a-b9e4-8a988f0e7468.yaml b/stubs/config/project-4/matrixBlockTypes/blockTypeOne--b5c238dd-588f-4f0a-b9e4-8a988f0e7468.yaml
similarity index 100%
rename from stubs/config/project/matrixBlockTypes/blockTypeOne--b5c238dd-588f-4f0a-b9e4-8a988f0e7468.yaml
rename to stubs/config/project-4/matrixBlockTypes/blockTypeOne--b5c238dd-588f-4f0a-b9e4-8a988f0e7468.yaml
diff --git a/stubs/config/project/project.yaml b/stubs/config/project-4/project.yaml
similarity index 100%
rename from stubs/config/project/project.yaml
rename to stubs/config/project-4/project.yaml
diff --git a/stubs/config/project/sections/posts--ae919370-04f6-4e2d-8d42-f255cc1b6a75.yaml b/stubs/config/project-4/sections/posts--ae919370-04f6-4e2d-8d42-f255cc1b6a75.yaml
similarity index 100%
rename from stubs/config/project/sections/posts--ae919370-04f6-4e2d-8d42-f255cc1b6a75.yaml
rename to stubs/config/project-4/sections/posts--ae919370-04f6-4e2d-8d42-f255cc1b6a75.yaml
diff --git a/stubs/config/project/siteGroups/b11e9b16-d6b0-4771-86bb-3fe962b4596d.yaml b/stubs/config/project-4/siteGroups/b11e9b16-d6b0-4771-86bb-3fe962b4596d.yaml
similarity index 100%
rename from stubs/config/project/siteGroups/b11e9b16-d6b0-4771-86bb-3fe962b4596d.yaml
rename to stubs/config/project-4/siteGroups/b11e9b16-d6b0-4771-86bb-3fe962b4596d.yaml
diff --git a/stubs/config/project/siteGroups/bdde35b2-daab-45e7-aef7-43fd8b221aa2.yaml b/stubs/config/project-4/siteGroups/bdde35b2-daab-45e7-aef7-43fd8b221aa2.yaml
similarity index 100%
rename from stubs/config/project/siteGroups/bdde35b2-daab-45e7-aef7-43fd8b221aa2.yaml
rename to stubs/config/project-4/siteGroups/bdde35b2-daab-45e7-aef7-43fd8b221aa2.yaml
diff --git a/stubs/config/project/sites/default--99c2747f-1049-46bc-93e0-424bad0544e5.yaml b/stubs/config/project-4/sites/default--99c2747f-1049-46bc-93e0-424bad0544e5.yaml
similarity index 100%
rename from stubs/config/project/sites/default--99c2747f-1049-46bc-93e0-424bad0544e5.yaml
rename to stubs/config/project-4/sites/default--99c2747f-1049-46bc-93e0-424bad0544e5.yaml
diff --git a/stubs/config/project/sites/default--bda4d299-4f91-43c1-91d1-48abd1dd5fb4.yaml b/stubs/config/project-4/sites/default--bda4d299-4f91-43c1-91d1-48abd1dd5fb4.yaml
similarity index 100%
rename from stubs/config/project/sites/default--bda4d299-4f91-43c1-91d1-48abd1dd5fb4.yaml
rename to stubs/config/project-4/sites/default--bda4d299-4f91-43c1-91d1-48abd1dd5fb4.yaml
diff --git a/stubs/config/project-5/entryTypes/blockTypeOne--b5c238dd-588f-4f0a-b9e4-8a988f0e7468.yaml b/stubs/config/project-5/entryTypes/blockTypeOne--b5c238dd-588f-4f0a-b9e4-8a988f0e7468.yaml
new file mode 100644
index 0000000..d8d2701
--- /dev/null
+++ b/stubs/config/project-5/entryTypes/blockTypeOne--b5c238dd-588f-4f0a-b9e4-8a988f0e7468.yaml
@@ -0,0 +1,80 @@
+color: null
+fieldLayouts:
+  2f77cf1c-a3db-4396-8d2f-efff2172466e:
+    tabs:
+      -
+        elementCondition: null
+        elements:
+          -
+            autocapitalize: true
+            autocomplete: false
+            autocorrect: true
+            class: null
+            disabled: false
+            elementCondition: null
+            id: null
+            includeInCards: false
+            inputType: null
+            instructions: null
+            label: null
+            max: null
+            min: null
+            name: null
+            orientation: null
+            placeholder: null
+            providesThumbs: false
+            readonly: false
+            requirable: false
+            size: null
+            step: null
+            tip: null
+            title: null
+            type: craft\fieldlayoutelements\entries\EntryTitleField
+            uid: 463de371-8db2-4f1d-b9b1-b9aca58b5c86
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: c05f8773-60a8-4f5e-9925-3cc36a064793 # Field One
+            handle: null
+            includeInCards: true
+            instructions: null
+            label: 'Field One'
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 6a242257-5d04-4ffb-8afb-f0b091472335
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 10199d0e-57f0-4724-aefb-1ef4ed73b408 # Field Two
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: 'Field Two'
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 4b8f210d-545c-4d57-9777-08cdb93862df
+            userCondition: null
+            warning: null
+            width: 100
+        name: Content
+        uid: aad92478-a4a8-49e5-b88b-5fff4734eb2c
+        userCondition: null
+handle: blockTypeOne
+hasTitleField: false
+icon: null
+name: 'Block Type One'
+showSlugField: true
+showStatusField: true
+slugTranslationKeyFormat: null
+slugTranslationMethod: site
+titleFormat: null
+titleTranslationKeyFormat: null
+titleTranslationMethod: site
diff --git a/stubs/config/project-5/entryTypes/default--0193fbbc-6912-4ff6-a3d5-e60ea03c8590.yaml b/stubs/config/project-5/entryTypes/default--0193fbbc-6912-4ff6-a3d5-e60ea03c8590.yaml
new file mode 100644
index 0000000..df084dd
--- /dev/null
+++ b/stubs/config/project-5/entryTypes/default--0193fbbc-6912-4ff6-a3d5-e60ea03c8590.yaml
@@ -0,0 +1,110 @@
+color: null
+fieldLayouts:
+  50cdf242-1476-44dc-ab8b-e3ad70ef3163:
+    tabs:
+      -
+        elementCondition: null
+        elements:
+          -
+            autocapitalize: true
+            autocomplete: false
+            autocorrect: true
+            class: null
+            disabled: false
+            elementCondition: null
+            id: null
+            includeInCards: false
+            inputType: null
+            instructions: null
+            label: null
+            max: null
+            min: null
+            name: null
+            orientation: null
+            placeholder: null
+            providesThumbs: false
+            readonly: false
+            requirable: false
+            size: null
+            step: null
+            tip: null
+            title: null
+            type: craft\fieldlayoutelements\entries\EntryTitleField
+            uid: 880e50a3-79fb-4456-836b-89c970af40b9
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: c7529b61-60cd-4e18-a272-3084aee7fa89 # Matrix Field
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 90a7fa0d-77cd-4612-92f9-4fafd4c1a66d
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: c148dfb3-a122-49ed-8538-de26d0482663 # Entries Field
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: efbdd2ca-b829-4604-bd1e-f66fad9093e2
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 7d1a7bf3-c346-48bc-bb77-f7d76fcacf2e # Text Field
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 189519d9-7809-47fc-bc54-d2441a85ae9d
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 17685ada-d64c-459c-b9fc-678d43e4bee8 # Dropdown Field
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 1440d116-5fe9-45a3-8031-7f3c9b71ef9d
+            userCondition: null
+            warning: null
+            width: 100
+        name: Content
+        uid: a914e695-0910-4b04-841b-cbe6f689856b
+        userCondition: null
+handle: default
+hasTitleField: true
+icon: null
+name: Default
+showSlugField: true
+showStatusField: true
+slugTranslationKeyFormat: null
+slugTranslationMethod: site
+titleFormat: null
+titleTranslationKeyFormat: null
+titleTranslationMethod: site
diff --git a/stubs/config/project-5/fields/dropdownField--17685ada-d64c-459c-b9fc-678d43e4bee8.yaml b/stubs/config/project-5/fields/dropdownField--17685ada-d64c-459c-b9fc-678d43e4bee8.yaml
new file mode 100644
index 0000000..54c1fe3
--- /dev/null
+++ b/stubs/config/project-5/fields/dropdownField--17685ada-d64c-459c-b9fc-678d43e4bee8.yaml
@@ -0,0 +1,32 @@
+columnSuffix: vqczhrcp
+handle: dropdownField
+instructions: null
+name: 'Dropdown Field'
+searchable: false
+settings:
+  options:
+    -
+      __assoc__:
+        -
+          - label
+          - One
+        -
+          - value
+          - one
+        -
+          - default
+          - ''
+    -
+      __assoc__:
+        -
+          - label
+          - Two
+        -
+          - value
+          - two
+        -
+          - default
+          - ''
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\Dropdown
diff --git a/stubs/config/project-5/fields/entriesField--c148dfb3-a122-49ed-8538-de26d0482663.yaml b/stubs/config/project-5/fields/entriesField--c148dfb3-a122-49ed-8538-de26d0482663.yaml
new file mode 100644
index 0000000..b186836
--- /dev/null
+++ b/stubs/config/project-5/fields/entriesField--c148dfb3-a122-49ed-8538-de26d0482663.yaml
@@ -0,0 +1,22 @@
+columnSuffix: null
+handle: entriesField
+instructions: null
+name: 'Entries Field'
+searchable: false
+settings:
+  allowSelfRelations: false
+  branchLimit: null
+  localizeRelations: false
+  maintainHierarchy: false
+  maxRelations: null
+  minRelations: null
+  selectionLabel: null
+  showCardsInGrid: false
+  showSiteMenu: false
+  sources: '*'
+  targetSiteId: null
+  validateRelatedElements: false
+  viewMode: null
+translationKeyFormat: null
+translationMethod: site
+type: craft\fields\Entries
diff --git a/stubs/config/project-5/fields/fieldOne--c05f8773-60a8-4f5e-9925-3cc36a064793.yaml b/stubs/config/project-5/fields/fieldOne--c05f8773-60a8-4f5e-9925-3cc36a064793.yaml
new file mode 100644
index 0000000..a079266
--- /dev/null
+++ b/stubs/config/project-5/fields/fieldOne--c05f8773-60a8-4f5e-9925-3cc36a064793.yaml
@@ -0,0 +1,16 @@
+columnSuffix: jnvscjst
+handle: fieldOne
+instructions: null
+name: 'Matrix Field - Block Type One - Field One'
+searchable: false
+settings:
+  byteLimit: null
+  charLimit: null
+  code: false
+  initialRows: 4
+  multiline: false
+  placeholder: null
+  uiMode: normal
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\PlainText
diff --git a/stubs/config/project-5/fields/fieldTwo--10199d0e-57f0-4724-aefb-1ef4ed73b408.yaml b/stubs/config/project-5/fields/fieldTwo--10199d0e-57f0-4724-aefb-1ef4ed73b408.yaml
new file mode 100644
index 0000000..3417eed
--- /dev/null
+++ b/stubs/config/project-5/fields/fieldTwo--10199d0e-57f0-4724-aefb-1ef4ed73b408.yaml
@@ -0,0 +1,16 @@
+columnSuffix: swmzeype
+handle: fieldTwo
+instructions: null
+name: 'Matrix Field - Block Type One - Field Two'
+searchable: false
+settings:
+  byteLimit: null
+  charLimit: null
+  code: false
+  initialRows: 4
+  multiline: false
+  placeholder: null
+  uiMode: normal
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\PlainText
diff --git a/stubs/config/project-5/fields/matrixField--c7529b61-60cd-4e18-a272-3084aee7fa89.yaml b/stubs/config/project-5/fields/matrixField--c7529b61-60cd-4e18-a272-3084aee7fa89.yaml
new file mode 100644
index 0000000..df84700
--- /dev/null
+++ b/stubs/config/project-5/fields/matrixField--c7529b61-60cd-4e18-a272-3084aee7fa89.yaml
@@ -0,0 +1,19 @@
+columnSuffix: null
+handle: matrixField
+instructions: null
+name: 'Matrix Field'
+searchable: false
+settings:
+  entryTypes:
+    - b5c238dd-588f-4f0a-b9e4-8a988f0e7468 # Block Type One
+  includeTableView: false
+  maxEntries: null
+  minEntries: null
+  pageSize: null
+  propagationKeyFormat: null
+  propagationMethod: all
+  showCardsInGrid: false
+  viewMode: blocks
+translationKeyFormat: null
+translationMethod: site
+type: craft\fields\Matrix
diff --git a/stubs/config/project-5/fields/textField--7d1a7bf3-c346-48bc-bb77-f7d76fcacf2e.yaml b/stubs/config/project-5/fields/textField--7d1a7bf3-c346-48bc-bb77-f7d76fcacf2e.yaml
new file mode 100644
index 0000000..04c6255
--- /dev/null
+++ b/stubs/config/project-5/fields/textField--7d1a7bf3-c346-48bc-bb77-f7d76fcacf2e.yaml
@@ -0,0 +1,16 @@
+columnSuffix: irlrybem
+handle: textField
+instructions: null
+name: 'Text Field'
+searchable: false
+settings:
+  byteLimit: null
+  charLimit: null
+  code: false
+  initialRows: 4
+  multiline: false
+  placeholder: null
+  uiMode: normal
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\PlainText
diff --git a/stubs/config/project-5/graphql/graphql.yaml b/stubs/config/project-5/graphql/graphql.yaml
new file mode 100644
index 0000000..fd4ca55
--- /dev/null
+++ b/stubs/config/project-5/graphql/graphql.yaml
@@ -0,0 +1,3 @@
+publicToken:
+  enabled: false
+  expiryDate: null
diff --git a/stubs/config/project-5/graphql/schemas/184fa66e-14cd-4045-853d-9a69ecf44e4e.yaml b/stubs/config/project-5/graphql/schemas/184fa66e-14cd-4045-853d-9a69ecf44e4e.yaml
new file mode 100644
index 0000000..6288789
--- /dev/null
+++ b/stubs/config/project-5/graphql/schemas/184fa66e-14cd-4045-853d-9a69ecf44e4e.yaml
@@ -0,0 +1,2 @@
+isPublic: true
+name: 'Public Schema'
diff --git a/stubs/config/project-5/matrixBlockTypes/blockTypeOne--b5c238dd-588f-4f0a-b9e4-8a988f0e7468.yaml b/stubs/config/project-5/matrixBlockTypes/blockTypeOne--b5c238dd-588f-4f0a-b9e4-8a988f0e7468.yaml
new file mode 100644
index 0000000..a95c29e
--- /dev/null
+++ b/stubs/config/project-5/matrixBlockTypes/blockTypeOne--b5c238dd-588f-4f0a-b9e4-8a988f0e7468.yaml
@@ -0,0 +1,78 @@
+field: c7529b61-60cd-4e18-a272-3084aee7fa89 # Matrix Field
+fieldLayouts:
+  2f77cf1c-a3db-4396-8d2f-efff2172466e:
+    tabs:
+      -
+        elementCondition: null
+        elements:
+          -
+            elementCondition: null
+            fieldUid: c05f8773-60a8-4f5e-9925-3cc36a064793 # Field One
+            instructions: null
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 6a242257-5d04-4ffb-8afb-f0b091472335
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 10199d0e-57f0-4724-aefb-1ef4ed73b408 # Field Two
+            instructions: null
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 4b8f210d-545c-4d57-9777-08cdb93862df
+            userCondition: null
+            warning: null
+            width: 100
+        name: Content
+        uid: aad92478-a4a8-49e5-b88b-5fff4734eb2c
+        userCondition: null
+fields:
+  10199d0e-57f0-4724-aefb-1ef4ed73b408: # Field Two
+    columnSuffix: swmzeype
+    contentColumnType: text
+    fieldGroup: null
+    handle: fieldTwo
+    instructions: null
+    name: 'Field Two'
+    searchable: false
+    settings:
+      byteLimit: null
+      charLimit: null
+      code: false
+      columnType: null
+      initialRows: 4
+      multiline: false
+      placeholder: null
+      uiMode: normal
+    translationKeyFormat: null
+    translationMethod: none
+    type: craft\fields\PlainText
+  c05f8773-60a8-4f5e-9925-3cc36a064793: # Field One
+    columnSuffix: jnvscjst
+    contentColumnType: text
+    fieldGroup: null
+    handle: fieldOne
+    instructions: null
+    name: 'Field One'
+    searchable: false
+    settings:
+      byteLimit: null
+      charLimit: null
+      code: false
+      columnType: null
+      initialRows: 4
+      multiline: false
+      placeholder: null
+      uiMode: normal
+    translationKeyFormat: null
+    translationMethod: none
+    type: craft\fields\PlainText
+handle: blockTypeOne
+name: 'Block Type One'
+sortOrder: 1
diff --git a/stubs/config/project-5/project.yaml b/stubs/config/project-5/project.yaml
new file mode 100644
index 0000000..9f82c73
--- /dev/null
+++ b/stubs/config/project-5/project.yaml
@@ -0,0 +1,36 @@
+dateModified: 1727718254
+email:
+  fromEmail: michael@bluth.com
+  fromName: Pest
+  transportType: craft\mail\transportadapters\Sendmail
+fs:
+  local:
+    hasUrls: true
+    name: Local
+    settings:
+      path: /workspaces/craft-pest-core/web/volumes/local
+    type: craft\fs\Local
+    url: 'http://localhost:8080/volumes/local/'
+meta:
+  __names__:
+    3b2c4b24-e463-46ca-be26-7285804ecbb1: Local # Local
+    7d1a7bf3-c346-48bc-bb77-f7d76fcacf2e: 'Text Field' # Text Field
+    99c2747f-1049-46bc-93e0-424bad0544e5: Pest # Pest
+    184fa66e-14cd-4045-853d-9a69ecf44e4e: 'Public Schema' # Public Schema
+    0193fbbc-6912-4ff6-a3d5-e60ea03c8590: Default # Default
+    10199d0e-57f0-4724-aefb-1ef4ed73b408: 'Field Two' # Field Two
+    17685ada-d64c-459c-b9fc-678d43e4bee8: 'Dropdown Field' # Dropdown Field
+    ae919370-04f6-4e2d-8d42-f255cc1b6a75: Posts # Posts
+    b5c238dd-588f-4f0a-b9e4-8a988f0e7468: 'Block Type One' # Block Type One
+    b11e9b16-d6b0-4771-86bb-3fe962b4596d: Pest # Pest
+    bda4d299-4f91-43c1-91d1-48abd1dd5fb4: Pest # Pest
+    bdde35b2-daab-45e7-aef7-43fd8b221aa2: Pest # Pest
+    c05f8773-60a8-4f5e-9925-3cc36a064793: 'Field One' # Field One
+    c148dfb3-a122-49ed-8538-de26d0482663: 'Entries Field' # Entries Field
+    c7529b61-60cd-4e18-a272-3084aee7fa89: 'Matrix Field' # Matrix Field
+system:
+  edition: pro
+  live: true
+  name: Pest
+  schemaVersion: 5.0.0.20
+  timeZone: America/Los_Angeles
diff --git a/stubs/config/project-5/sections/posts--ae919370-04f6-4e2d-8d42-f255cc1b6a75.yaml b/stubs/config/project-5/sections/posts--ae919370-04f6-4e2d-8d42-f255cc1b6a75.yaml
new file mode 100644
index 0000000..54728c7
--- /dev/null
+++ b/stubs/config/project-5/sections/posts--ae919370-04f6-4e2d-8d42-f255cc1b6a75.yaml
@@ -0,0 +1,29 @@
+defaultPlacement: end
+enableVersioning: true
+entryTypes:
+  - 0193fbbc-6912-4ff6-a3d5-e60ea03c8590 # Default
+handle: posts
+maxAuthors: 1
+name: Posts
+previewTargets:
+  -
+    __assoc__:
+      -
+        - label
+        - 'Primary entry page'
+      -
+        - urlFormat
+        - '{url}'
+propagationMethod: all
+siteSettings:
+  99c2747f-1049-46bc-93e0-424bad0544e5: # Pest
+    enabledByDefault: true
+    hasUrls: true
+    template: posts/_entry
+    uriFormat: 'posts/{slug}'
+  bda4d299-4f91-43c1-91d1-48abd1dd5fb4: # Pest
+    enabledByDefault: true
+    hasUrls: true
+    template: posts/_entry
+    uriFormat: 'posts/{slug}'
+type: channel
diff --git a/stubs/config/project-5/siteGroups/b11e9b16-d6b0-4771-86bb-3fe962b4596d.yaml b/stubs/config/project-5/siteGroups/b11e9b16-d6b0-4771-86bb-3fe962b4596d.yaml
new file mode 100644
index 0000000..ed2ddb7
--- /dev/null
+++ b/stubs/config/project-5/siteGroups/b11e9b16-d6b0-4771-86bb-3fe962b4596d.yaml
@@ -0,0 +1 @@
+name: Pest
diff --git a/stubs/config/project-5/siteGroups/bdde35b2-daab-45e7-aef7-43fd8b221aa2.yaml b/stubs/config/project-5/siteGroups/bdde35b2-daab-45e7-aef7-43fd8b221aa2.yaml
new file mode 100644
index 0000000..ed2ddb7
--- /dev/null
+++ b/stubs/config/project-5/siteGroups/bdde35b2-daab-45e7-aef7-43fd8b221aa2.yaml
@@ -0,0 +1 @@
+name: Pest
diff --git a/stubs/config/project-5/sites/default--99c2747f-1049-46bc-93e0-424bad0544e5.yaml b/stubs/config/project-5/sites/default--99c2747f-1049-46bc-93e0-424bad0544e5.yaml
new file mode 100644
index 0000000..063150f
--- /dev/null
+++ b/stubs/config/project-5/sites/default--99c2747f-1049-46bc-93e0-424bad0544e5.yaml
@@ -0,0 +1,9 @@
+baseUrl: $PRIMARY_SITE_URL
+enabled: true
+handle: default
+hasUrls: true
+language: en-US
+name: Pest
+primary: true
+siteGroup: bdde35b2-daab-45e7-aef7-43fd8b221aa2 # Pest
+sortOrder: 1
diff --git a/stubs/config/project-5/sites/default--bda4d299-4f91-43c1-91d1-48abd1dd5fb4.yaml b/stubs/config/project-5/sites/default--bda4d299-4f91-43c1-91d1-48abd1dd5fb4.yaml
new file mode 100644
index 0000000..dda612b
--- /dev/null
+++ b/stubs/config/project-5/sites/default--bda4d299-4f91-43c1-91d1-48abd1dd5fb4.yaml
@@ -0,0 +1,9 @@
+baseUrl: $PRIMARY_SITE_URL
+enabled: '1'
+handle: default
+hasUrls: true
+language: en-US
+name: Pest
+primary: false
+siteGroup: b11e9b16-d6b0-4771-86bb-3fe962b4596d # Pest
+sortOrder: 1
diff --git a/stubs/config/project-5/users/fieldLayouts/4ea4c761-9214-4e32-b594-58e906282652.yaml b/stubs/config/project-5/users/fieldLayouts/4ea4c761-9214-4e32-b594-58e906282652.yaml
new file mode 100644
index 0000000..757ccce
--- /dev/null
+++ b/stubs/config/project-5/users/fieldLayouts/4ea4c761-9214-4e32-b594-58e906282652.yaml
@@ -0,0 +1,110 @@
+tabs:
+  -
+    elementCondition: null
+    elements:
+      -
+        autocapitalize: true
+        autocomplete: false
+        autocorrect: true
+        class: null
+        disabled: false
+        elementCondition: null
+        id: null
+        includeInCards: false
+        inputType: null
+        instructions: null
+        label: null
+        max: null
+        min: null
+        name: null
+        orientation: null
+        placeholder: null
+        providesThumbs: false
+        readonly: false
+        requirable: false
+        size: null
+        step: null
+        tip: null
+        title: null
+        type: craft\fieldlayoutelements\users\UsernameField
+        uid: 8d4db13b-bf33-4fcb-a4b3-465419ff6554
+        userCondition: null
+        warning: null
+        width: 100
+      -
+        attribute: fullName
+        autocapitalize: true
+        autocomplete: false
+        autocorrect: true
+        class: null
+        disabled: false
+        elementCondition: null
+        id: null
+        includeInCards: false
+        inputType: null
+        instructions: null
+        label: null
+        max: null
+        min: null
+        name: null
+        orientation: null
+        placeholder: null
+        providesThumbs: false
+        readonly: false
+        requirable: true
+        required: false
+        size: null
+        step: null
+        tip: null
+        title: null
+        type: craft\fieldlayoutelements\users\FullNameField
+        uid: 40cd1617-0f35-489c-bc2a-508347941659
+        userCondition: null
+        warning: null
+        width: 100
+      -
+        elementCondition: null
+        id: null
+        includeInCards: false
+        instructions: null
+        label: null
+        orientation: null
+        providesThumbs: false
+        requirable: false
+        tip: null
+        type: craft\fieldlayoutelements\users\PhotoField
+        uid: 1e08b8ec-6f86-482b-89fe-8ec91608e9a2
+        userCondition: null
+        warning: null
+        width: 100
+      -
+        autocapitalize: true
+        autocomplete: false
+        autocorrect: true
+        class: null
+        disabled: false
+        elementCondition: null
+        id: null
+        includeInCards: false
+        inputType: null
+        instructions: null
+        label: null
+        max: null
+        min: null
+        name: null
+        orientation: null
+        placeholder: null
+        providesThumbs: false
+        readonly: false
+        requirable: false
+        size: null
+        step: null
+        tip: null
+        title: null
+        type: craft\fieldlayoutelements\users\EmailField
+        uid: 54368c30-4e82-4caa-b568-ea6d72ac8e1c
+        userCondition: null
+        width: 100
+    name: Content
+    uid: 5d3a7ac6-f14a-453a-9ac9-9f6cda4c594e
+    userCondition: null
diff --git a/stubs/config/project-5/users/users.yaml b/stubs/config/project-5/users/users.yaml
new file mode 100644
index 0000000..5ffedb3
--- /dev/null
+++ b/stubs/config/project-5/users/users.yaml
@@ -0,0 +1,5 @@
+allowPublicRegistration: false
+defaultGroup: null
+photoSubpath: null
+photoVolumeUid: null
+requireEmailVerification: true
diff --git a/stubs/config/project-5/volumes/local--3b2c4b24-e463-46ca-be26-7285804ecbb1.yaml b/stubs/config/project-5/volumes/local--3b2c4b24-e463-46ca-be26-7285804ecbb1.yaml
new file mode 100644
index 0000000..72ba152
--- /dev/null
+++ b/stubs/config/project-5/volumes/local--3b2c4b24-e463-46ca-be26-7285804ecbb1.yaml
@@ -0,0 +1,47 @@
+fieldLayouts:
+  7948cc32-6d40-46b7-af5d-39b77f566df7:
+    tabs:
+      -
+        elementCondition: null
+        elements:
+          -
+            autocapitalize: true
+            autocomplete: false
+            autocorrect: true
+            class: null
+            disabled: false
+            elementCondition: null
+            id: null
+            includeInCards: false
+            inputType: null
+            instructions: null
+            label: null
+            max: null
+            min: null
+            name: null
+            orientation: null
+            placeholder: null
+            providesThumbs: false
+            readonly: false
+            requirable: false
+            size: null
+            step: null
+            tip: null
+            title: null
+            type: craft\fieldlayoutelements\assets\AssetTitleField
+            uid: 8c8df736-809a-41c5-a4f1-e48f3392078d
+            userCondition: null
+            warning: null
+            width: 100
+        name: Content
+        uid: 1e2b784c-d10c-4014-831d-d78877cf8580
+        userCondition: null
+fs: local
+handle: local
+name: Local
+sortOrder: 1
+subpath: ''
+titleTranslationKeyFormat: null
+titleTranslationMethod: site
+transformFs: null
+transformSubpath: ''
diff --git a/stubs/init/phpunit.xml b/stubs/init/phpunit.xml
index a04832d..eaac926 100644
--- a/stubs/init/phpunit.xml
+++ b/stubs/init/phpunit.xml
@@ -3,6 +3,7 @@
     xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="vendor/autoload.php"
     colors="true"
+    beStrictAboutOutputDuringTests="false"
 >
     <testsuites>
         <testsuite name="Test Suite">
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index c813283..3bc1ca5 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -2,6 +2,8 @@
 
 use markhuot\craftpest\factories\Entry;
 
+use function markhuot\craftpest\helpers\craft\isCraftFive;
+
 it('asserts database content', function () {
     $count = (new \craft\db\Query)->from(\craft\db\Table::SITES)->count();
     $this->assertDatabaseCount(\craft\db\Table::SITES, $count);
@@ -11,13 +13,16 @@
     $section = \markhuot\craftpest\factories\Section::factory()->create();
     $entry = \markhuot\craftpest\factories\Entry::factory()->section($section)->create();
 
-    $this->assertDatabaseHas(\craft\db\Table::CONTENT, [
+    $table = isCraftFive() ? \craft\db\Table::ELEMENTS_SITES : \craft\db\Table::CONTENT;
+    $this->assertDatabaseHas($table, [
         'title' => $entry->title,
     ]);
 });
 
-it('asserts database content is missing')
-    ->assertDatabaseMissing(\craft\db\Table::CONTENT, ['title' => 'fooz baz']);
+it('asserts database content is missing', function () {
+    $table = isCraftFive() ? \craft\db\Table::ELEMENTS_SITES : \craft\db\Table::CONTENT;
+    $this->assertDatabaseMissing($table, ['title' => 'fooz baz']);
+});
 
 it('asserts trashed', function () {
     $entry = Entry::factory()
diff --git a/tests/FactoryFieldTest.php b/tests/FactoryFieldTest.php
index 3115497..0737490 100644
--- a/tests/FactoryFieldTest.php
+++ b/tests/FactoryFieldTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
 use markhuot\craftpest\factories\Entry;
 use markhuot\craftpest\factories\Field;
 use markhuot\craftpest\factories\Section;
@@ -24,9 +26,9 @@
     expect(\craft\elements\Entry::find()->count())->toBe($entryCount);
 });
 
-it('errors when trying to create fields after content elements', function () {
+it('errors when trying to create fields after content elements in Craft 4', function () {
     $this->expectException(\markhuot\craftpest\exceptions\AutoCommittingFieldsException::class);
 
     Section::factory()->create();
     Field::factory()->type(\craft\fields\PlainText::class)->create();
-});
+})->skip(InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '>=5.0.0'));
diff --git a/tests/FactoryMatrixTest.php b/tests/FactoryMatrixTest.php
index 0daf666..10519ca 100644
--- a/tests/FactoryMatrixTest.php
+++ b/tests/FactoryMatrixTest.php
@@ -1,14 +1,29 @@
 <?php
 
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
 use craft\fields\PlainText as PlainTextField;
 use markhuot\craftpest\factories\Block as BlockFactory;
 use markhuot\craftpest\factories\BlockType as BlockTypeFactory;
 use markhuot\craftpest\factories\Entry as EntryFactory;
+use markhuot\craftpest\factories\EntryType;
 use markhuot\craftpest\factories\Field as FieldFactory;
 use markhuot\craftpest\factories\MatrixField as MatrixFieldFactory;
 use markhuot\craftpest\factories\Section as SectionFactory;
 
-it('can fill matrix fields', function () {
+it('can fill matrix fields with EntryTypes in Craft 5', function () {
+    $entry = EntryFactory::factory()
+        ->section('posts')
+        ->matrixField(
+            EntryFactory::factory()->type('blockTypeOne')->fieldOne('foo'),
+            EntryFactory::factory()->type('blockTypeOne')->fieldOne('bar'),
+        )
+        ->create();
+
+    expect($entry->matrixField->all())->toHaveCount(2);
+})->skip(InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '<5.0.0'));
+
+it('can fill matrix fields with Blocks in Craft 4', function () {
     $entry = EntryFactory::factory()
         ->section('posts')
         ->matrixField(
@@ -18,7 +33,7 @@
         ->create();
 
     expect($entry->matrixField->all())->toHaveCount(2);
-});
+})->skip(InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '>5.0.0'));
 
 it('can fill matrix fields with multiple blocks', function () {
     $entry = EntryFactory::factory()
@@ -31,7 +46,49 @@
     expect($entry->matrixField->all())->toHaveCount(5);
 });
 
-it('can create matrix fields', function () {
+it('can create matrix fields in Craft 5', function () {
+    $plainTextOne = FieldFactory::factory()
+        ->type(PlainTextField::class);
+
+    $plainTextTwo = FieldFactory::factory()
+        ->type(PlainTextField::class);
+
+    $blockType = EntryType::factory()
+        ->hasTitleField(false)
+        ->fields($plainTextOne, $plainTextTwo);
+
+    $matrix = MatrixFieldFactory::factory()
+        ->entryTypes($blockType)
+        ->create();
+
+    $section = SectionFactory::factory()
+        ->fields($matrix)
+        ->create();
+
+    $blockTypeHandle = $blockType->getMadeModels()->first()->handle;
+    $plainTextOneHandle = $plainTextOne->getMadeModels()->first()->handle;
+    $plainTextTwoHandle = $plainTextTwo->getMadeModels()->first()->handle;
+
+    $entry = EntryFactory::factory()
+        ->section($section->handle)
+        ->{$matrix->handle}(
+            EntryFactory::factory()
+                ->type($blockTypeHandle)
+                ->{$plainTextOneHandle}('foo')
+                ->{$plainTextTwoHandle}('bar')
+                ->count(5)
+        )
+        ->create();
+
+    $blocks = $entry->{$matrix->handle}->all();
+    expect($blocks)->toHaveCount(5);
+
+    $firstBlock = $blocks[0];
+    expect($firstBlock->{$plainTextOneHandle})->toBe('foo');
+    expect($firstBlock->{$plainTextTwoHandle})->toBe('bar');
+})->skip(InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '<5.0.0'));
+
+it('tests matrix blocks in craft 4', function () {
     $plainTextOne = FieldFactory::factory()
         ->type(PlainTextField::class);
 
@@ -42,7 +99,7 @@
         ->fields($plainTextOne, $plainTextTwo);
 
     $matrix = MatrixFieldFactory::factory()
-        ->blockTypes($blockType)
+        ->entryTypes($blockType)
         ->create();
 
     $section = SectionFactory::factory()
@@ -56,7 +113,7 @@
     $entry = EntryFactory::factory()
         ->section($section->handle)
         ->{$matrix->handle}(
-            BlockFactory::factory()
+            \markhuot\craftpest\factories\Block::factory()
                 ->type($blockTypeHandle)
                 ->{$plainTextOneHandle}('foo')
                 ->{$plainTextTwoHandle}('bar')
@@ -70,7 +127,7 @@
     $firstBlock = $blocks[0];
     expect($firstBlock->{$plainTextOneHandle})->toBe('foo');
     expect($firstBlock->{$plainTextTwoHandle})->toBe('bar');
-});
+})->todo();
 
 it('can fill matrix blocks with a shorthand', function () {
     $plainTextOne = FieldFactory::factory()->type(PlainTextField::class);
@@ -94,7 +151,7 @@
     $block = $entry->{$matrix->handle}->all()[0];
     expect($block->{$plainTextOneHandle})->toBe('foo');
     expect($block->{$plainTextTwoHandle})->toBe('bar');
-});
+})->skip();
 
 it('can fill matrix blocks with a magic shorthand', function () {
     $plainTextOne = FieldFactory::factory()->type(PlainTextField::class)->name('Plain Text One');
@@ -124,4 +181,4 @@
     $block = $entry->{$matrix->handle}->all()[0];
     expect($block->{$plainTextOneHandle})->toBe('foo');
     expect($block->{$plainTextTwoHandle})->toBe('bar');
-});
+})->skip();
diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
index ae5f485..5fde17c 100644
--- a/tests/FactoryTest.php
+++ b/tests/FactoryTest.php
@@ -1,13 +1,17 @@
 <?php
 
 use craft\fields\Entries;
+use markhuot\craftpest\interfaces\SectionsServiceInterface;
+
+use function markhuot\craftpest\helpers\base\service;
+use function markhuot\craftpest\helpers\craft\isCraftFive;
 
 it('can create singles', function () {
     $section = \markhuot\craftpest\factories\Section::factory()
         ->type('single')
         ->create();
 
-    expect(Craft::$app->sections->getSectionByHandle($section->handle)->type)->toBe('single');
+    expect(service(SectionsServiceInterface::class)->getSectionByHandle($section->handle)->type)->toBe('single');
 });
 
 it('can create channels', function () {
@@ -15,7 +19,7 @@
         ->type('channel')
         ->create();
 
-    expect(Craft::$app->sections->getSectionByHandle($section->handle)->type)->toBe('channel');
+    expect(service(SectionsServiceInterface::class)->getSectionByHandle($section->handle)->type)->toBe('channel');
 });
 
 it('can create structures', function () {
@@ -23,7 +27,7 @@
         ->type('structure')
         ->create();
 
-    expect(Craft::$app->sections->getSectionByHandle($section->handle)->type)->toBe('structure');
+    expect(service(SectionsServiceInterface::class)->getSectionByHandle($section->handle)->type)->toBe('structure');
 });
 
 it('can set hasUrls of the section', function () {
@@ -32,7 +36,7 @@
         ->create();
 
     $siteId = \Craft::$app->sites->getCurrentSite()->id;
-    expect(Craft::$app->sections->getSectionByHandle($section->handle)->siteSettings[$siteId]->hasUrls)->toBe(false);
+    expect(service(SectionsServiceInterface::class)->getSectionByHandle($section->handle)->siteSettings[$siteId]->hasUrls)->toBe(false);
 });
 
 it('can set uriFormat of the section', function () {
@@ -41,7 +45,7 @@
         ->create();
 
     $siteId = \Craft::$app->sites->getCurrentSite()->id;
-    expect(Craft::$app->sections->getSectionByHandle($section->handle)->siteSettings[$siteId]->uriFormat)->toBe('{sluggy}');
+    expect(service(SectionsServiceInterface::class)->getSectionByHandle($section->handle)->siteSettings[$siteId]->uriFormat)->toBe('{sluggy}');
 });
 
 it('can set enabledByDefault of the section', function () {
@@ -50,7 +54,7 @@
         ->create();
 
     $siteId = \Craft::$app->sites->getCurrentSite()->id;
-    expect(Craft::$app->sections->getSectionByHandle($section->handle)->siteSettings[$siteId]->enabledByDefault)->toBe(false);
+    expect(service(SectionsServiceInterface::class)->getSectionByHandle($section->handle)->siteSettings[$siteId]->enabledByDefault)->toBe(false);
 });
 
 it('can set template of the section', function () {
@@ -59,7 +63,7 @@
         ->create();
 
     $siteId = \Craft::$app->sites->getCurrentSite()->id;
-    expect(Craft::$app->sections->getSectionByHandle($section->handle)->siteSettings[$siteId]->template)->toBe(implode('/', ['_foo', $section->handle, 'bar']));
+    expect(service(SectionsServiceInterface::class)->getSectionByHandle($section->handle)->siteSettings[$siteId]->template)->toBe(implode('/', ['_foo', $section->handle, 'bar']));
 });
 
 it('can create entries with section id, handle, and object', function () {
@@ -93,7 +97,7 @@
         ->create();
 
     expect($field->getGroup()->name)->toBe('Common');
-});
+})->skip(fn () => isCraftFive());
 
 it('can create fields', function () {
     $field = \markhuot\craftpest\factories\Field::factory()