diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml
deleted file mode 100644
index 60c34b6..0000000
--- a/.github/.kodiak.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-version = 1
-
-[merge]
-automerge_label = "automerge"
-blacklist_title_regex = "^WIP.*"
-blacklist_labels = ["WIP"]
-method = "rebase"
-delete_branch_on_merge = true
-notify_on_conflict = true
-optimistic_updates = false
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a574bd1..7d85dd5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -5,33 +5,39 @@ on:
   workflow_dispatch:
 
   push:
-    branches: [ "*" ]
+    branches: ["*"]
 
   schedule:
     - cron: "0 8 * * 1"
 
 jobs:
-  test83:
+  test85:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.3"
+      php: "8.5"
 
-  test82:
+  test84:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.2"
+      php: "8.4"
 
-  test81:
+  test83:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.1"
+      php: "8.3"
+
+  test82:
+    name: "Nette Tester"
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
+    with:
+      php: "8.2"
 
   testlower:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.1"
+      php: "8.2"
       composer: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest"
diff --git a/composer.json b/composer.json
index 98ef8b0..1baa9cf 100644
--- a/composer.json
+++ b/composer.json
@@ -13,16 +13,16 @@
     }
   ],
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.2",
     "nette/database": "^3.1.9",
     "nette/php-generator": "^4.1.2",
     "nette/utils": "^4.0.3",
     "doctrine/inflector": "^2.0.8"
   },
   "require-dev": {
-    "contributte/qa": "^0.4",
-    "contributte/tester": "^0.4",
-    "contributte/phpstan": "^0.1",
+    "contributte/qa": "^0.4.0",
+    "contributte/tester": "^0.4.0",
+    "contributte/phpstan": "^0.1.0",
     "tracy/tracy": "^2.10.5"
   },
   "autoload": {
@@ -30,6 +30,11 @@
       "Contributte\\Nextras\\Orm\\Generator\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests"
+    }
+  },
   "minimum-stability": "dev",
   "prefer-stable": true,
   "extra": {
diff --git a/phpstan.neon b/phpstan.neon
index 5260d60..bac8562 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -3,7 +3,7 @@ includes:
 
 parameters:
 	level: 9
-	phpVersion: 80100
+	phpVersion: 80200
 
 	scanDirectories:
 		- src
diff --git a/ruleset.xml b/ruleset.xml
index d02bd3d..bb249f0 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset name="Contributte" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
 	<!-- Rulesets -->
-	<rule ref="./vendor/contributte/qa/ruleset-8.0.xml"/>
+	<rule ref="./vendor/contributte/qa/ruleset-8.2.xml"/>
 
 	<!-- Rules -->
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
diff --git a/src/Analyser/Database/DatabaseAnalyser.php b/src/Analyser/Database/DatabaseAnalyser.php
index c0ae9e7..da06c38 100644
--- a/src/Analyser/Database/DatabaseAnalyser.php
+++ b/src/Analyser/Database/DatabaseAnalyser.php
@@ -66,13 +66,14 @@ protected function analyseColumns(Table $table): void
 			$column->setName($col['name']);
 			$column->setNullable($col['nullable']);
 			$column->setType(Helpers::columnType($col['nativetype']));
-			$column->setDefault($col['default']);
+			$column->setDefault(is_scalar($col['default']) ? (string) $col['default'] : null);
 			$column->setOnUpdate(str_contains($col['vendor']['extra'] ?? $col['vendor']['Extra'] ?? '', 'on update'));
 
 			// Analyse ENUM
 			if ($col['nativetype'] === ColumnTypes::NATIVE_TYPE_ENUM) {
+				/** @var array<int, array<int, string>> $enum */
 				$enum = Strings::matchAll($col['vendor']['type'] ?? $col['vendor']['Type'], ColumnTypes::NATIVE_REGEX_ENUM, PREG_PATTERN_ORDER);
-				if ($enum !== []) {
+				if (isset($enum[1])) {
 					$column->setEnum($enum[1]);
 					$column->setType(ColumnTypes::TYPE_ENUM);
 					$column->setSubtype(Helpers::columnType($col['nativetype']));