diff --git a/.github/workflows/coding-style.yml b/.github/workflows/coding-style.yml
index 97e6c166d..013331b5e 100644
--- a/.github/workflows/coding-style.yml
+++ b/.github/workflows/coding-style.yml
@@ -10,7 +10,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.2
                   coverage: none
 
             - run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress
@@ -24,7 +24,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.2
                   coverage: none
 
             - run: composer create-project nette/coding-standard temp/coding-standard ^3 --no-progress
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 5a39324eb..6f22b2fbf 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -13,7 +13,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.2
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d31760993..8337933e1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.0', '8.1', '8.2', '8.3', '8.4']
+                php: ['8.2', '8.3', '8.4']
 
             fail-fast: false
 
@@ -112,7 +112,7 @@ jobs:
 
 
             - name: Save Code Coverage
-              if: ${{ matrix.php == '8.0' }}
+              if: ${{ matrix.php == '8.2' }}
               env:
                   COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: |
diff --git a/composer.json b/composer.json
index eb8aa73e7..ab19434fb 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
 		}
 	],
 	"require": {
-		"php": "8.0 - 8.4"
+		"php": "8.2 - 8.4"
 	},
 	"require-dev": {
 		"tracy/tracy": "^2.9",
@@ -33,7 +33,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "5.0-dev"
+			"dev-master": "6.0-dev"
 		}
 	}
 }
diff --git a/examples/using-substitutions.php b/examples/using-substitutions.php
index d10d85a1e..058ed47b4 100644
--- a/examples/using-substitutions.php
+++ b/examples/using-substitutions.php
@@ -45,7 +45,7 @@ function substFallBack($expr)
 
 
 // define callback
-$dibi->getSubstitutes()->setCallback('substFallBack');
+$dibi->getSubstitutes()->setCallback(substFallBack(...));
 
 // define substitutes as constants
 define('SUBST_ACCOUNT', 'eshop_');
diff --git a/readme.md b/readme.md
index e75f27737..b225b2030 100644
--- a/readme.md
+++ b/readme.md
@@ -34,7 +34,7 @@ Install Dibi via Composer:
 composer require dibi/dibi
 ```
 
-The Dibi 5.0 requires PHP version 8.0 and supports PHP up to 8.4.
+The Dibi 5.0 requires PHP version 8.2 and supports PHP up to 8.4.
 
 
 Usage
diff --git a/src/Dibi/Bridges/Nette/DibiExtension22.php b/src/Dibi/Bridges/Nette/DibiExtension22.php
index a01e1e41c..8f310b034 100644
--- a/src/Dibi/Bridges/Nette/DibiExtension22.php
+++ b/src/Dibi/Bridges/Nette/DibiExtension22.php
@@ -19,14 +19,10 @@
  */
 class DibiExtension22 extends Nette\DI\CompilerExtension
 {
-	private ?bool $debugMode;
-	private ?bool $cliMode;
-
-
-	public function __construct(?bool $debugMode = null, ?bool $cliMode = null)
-	{
-		$this->debugMode = $debugMode;
-		$this->cliMode = $cliMode;
+	public function __construct(
+		private ?bool $debugMode = null,
+		private ?bool $cliMode = null,
+	) {
 	}
 
 
diff --git a/src/Dibi/Bridges/Nette/DibiExtension3.php b/src/Dibi/Bridges/Nette/DibiExtension3.php
index b8b4cece0..b5921dac9 100644
--- a/src/Dibi/Bridges/Nette/DibiExtension3.php
+++ b/src/Dibi/Bridges/Nette/DibiExtension3.php
@@ -20,14 +20,10 @@
  */
 class DibiExtension3 extends Nette\DI\CompilerExtension
 {
-	private ?bool $debugMode;
-	private ?bool $cliMode;
-
-
-	public function __construct(?bool $debugMode = null, ?bool $cliMode = null)
-	{
-		$this->debugMode = $debugMode;
-		$this->cliMode = $cliMode;
+	public function __construct(
+		private ?bool $debugMode = null,
+		private ?bool $cliMode = null,
+	) {
 	}
 
 
diff --git a/src/Dibi/Bridges/Tracy/Panel.php b/src/Dibi/Bridges/Tracy/Panel.php
index 97694b519..5e3d5ae13 100644
--- a/src/Dibi/Bridges/Tracy/Panel.php
+++ b/src/Dibi/Bridges/Tracy/Panel.php
@@ -21,23 +21,22 @@
 class Panel implements Tracy\IBarPanel
 {
 	public static int $maxLength = 1000;
-	public bool|string $explain;
-	public int $filter;
+
 	private array $events = [];
 
 
-	public function __construct(bool $explain = true, ?int $filter = null)
-	{
-		$this->filter = $filter ?: Event::QUERY;
-		$this->explain = $explain;
+	public function __construct(
+		public bool|string $explain = true,
+		public int $filter = Event::QUERY,
+	) {
 	}
 
 
 	public function register(Dibi\Connection $connection): void
 	{
 		Tracy\Debugger::getBar()->addPanel($this);
-		Tracy\Debugger::getBlueScreen()->addPanel([self::class, 'renderException']);
-		$connection->onEvent[] = [$this, 'logEvent'];
+		Tracy\Debugger::getBlueScreen()->addPanel(self::renderException(...));
+		$connection->onEvent[] = $this->logEvent(...);
 	}
 
 
diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php
index 916d0956f..2ad78b928 100644
--- a/src/Dibi/Connection.php
+++ b/src/Dibi/Connection.php
@@ -21,13 +21,25 @@
  */
 class Connection implements IConnection
 {
+	private const Drivers = [
+		'firebird' => Drivers\Ibase\Connection::class,
+		'mysqli' => Drivers\MySQLi\Connection::class,
+		'odbc' => Drivers\ODBC\Connection::class,
+		'oracle' => Drivers\OCI8\Connection::class,
+		'pdo' => Drivers\PDO\Connection::class,
+		'postgre' => Drivers\PgSQL\Connection::class,
+		'sqlite3' => Drivers\SQLite3\Connection::class,
+		'sqlite' => Drivers\SQLite3\Connection::class,
+		'sqlsrv' => Drivers\SQLSrv\Connection::class,
+	];
+
 	/** function (Event $event); Occurs after query is executed */
 	public ?array $onEvent = [];
 	private array $config;
 
 	/** @var string[]  resultset formats */
 	private array $formats;
-	private ?Driver $driver = null;
+	private ?Drivers\Connection $driver = null;
 	private ?Translator $translator = null;
 
 	/** @var array<string, callable(object): Expression | null> */
@@ -120,17 +132,16 @@ public function __destruct()
 	 */
 	final public function connect(): void
 	{
-		if ($this->config['driver'] instanceof Driver) {
+		if ($this->config['driver'] instanceof Drivers\Connection) {
 			$this->driver = $this->config['driver'];
 			$this->translator = new Translator($this);
 			return;
 
-		} elseif (is_subclass_of($this->config['driver'], Driver::class)) {
+		} elseif (is_subclass_of($this->config['driver'], Drivers\Connection::class)) {
 			$class = $this->config['driver'];
 
 		} else {
-			$class = preg_replace(['#\W#', '#sql#'], ['_', 'Sql'], ucfirst(strtolower($this->config['driver'])));
-			$class = "Dibi\\Drivers\\{$class}Driver";
+			$class = self::Drivers[strtolower($this->config['driver'])] ?? throw new Exception("Unknown driver '{$this->config['driver']}'.");
 			if (!class_exists($class)) {
 				throw new Exception("Unable to create instance of Dibi driver '$class'.");
 			}
@@ -196,7 +207,7 @@ final public function getConfig(?string $key = null, $default = null): mixed
 	/**
 	 * Returns the driver and connects to a database in lazy mode.
 	 */
-	final public function getDriver(): Driver
+	final public function getDriver(): Drivers\Connection
 	{
 		if (!$this->driver) {
 			$this->connect();
@@ -284,7 +295,7 @@ final public function nativeQuery(#[Language('SQL')] string $sql): Result
 			throw $e;
 		}
 
-		$res = $this->createResultSet($res ?: new Drivers\NoDataResult(max(0, $this->driver->getAffectedRows())));
+		$res = $this->createResultSet($res ?: new Drivers\Dummy\Result(max(0, $this->driver->getAffectedRows())));
 		if ($event) {
 			$this->onEvent($event->done($res));
 		}
@@ -448,7 +459,7 @@ public function transaction(callable $callback): mixed
 	/**
 	 * Result set factory.
 	 */
-	public function createResultSet(ResultDriver $resultDriver): Result
+	public function createResultSet(Drivers\Result $resultDriver): Result
 	{
 		return (new Result($resultDriver, $this->config['result']['normalize'] ?? true))
 			->setFormats($this->formats);
diff --git a/src/Dibi/DataSource.php b/src/Dibi/DataSource.php
index 89aa37071..0d81d1e81 100644
--- a/src/Dibi/DataSource.php
+++ b/src/Dibi/DataSource.php
@@ -15,8 +15,8 @@
  */
 class DataSource implements IDataSource
 {
-	private Connection $connection;
-	private string $sql;
+	private readonly IConnection $connection;
+	private readonly string $sql;
 	private ?Result $result = null;
 	private ?int $count = null;
 	private ?int $totalCount = null;
@@ -30,7 +30,7 @@ class DataSource implements IDataSource
 	/**
 	 * @param  string  $sql  command or table or view name, as data source
 	 */
-	public function __construct(string $sql, Connection $connection)
+	public function __construct(string $sql, IConnection $connection)
 	{
 		$this->sql = strpbrk($sql, " \t\r\n") === false
 			? $connection->getDriver()->escapeIdentifier($sql) // table name
@@ -99,7 +99,7 @@ public function applyLimit(int $limit, ?int $offset = null): static
 	}
 
 
-	final public function getConnection(): Connection
+	final public function getConnection(): IConnection
 	{
 		return $this->connection;
 	}
diff --git a/src/Dibi/Drivers/Connection.php b/src/Dibi/Drivers/Connection.php
new file mode 100644
index 000000000..9ff28e700
--- /dev/null
+++ b/src/Dibi/Drivers/Connection.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi\Drivers;
+
+use Dibi\DriverException;
+use Dibi\Exception;
+
+
+/**
+ * Database connection driver.
+ */
+interface Connection
+{
+	/**
+	 * Disconnects from a database.
+	 * @throws Exception
+	 */
+	function disconnect(): void;
+
+	/**
+	 * Internal: Executes the SQL query.
+	 * @throws DriverException
+	 */
+	function query(string $sql): ?Result;
+
+	/**
+	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
+	 */
+	function getAffectedRows(): ?int;
+
+	/**
+	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
+	 */
+	function getInsertId(?string $sequence): ?int;
+
+	/**
+	 * Begins a transaction (if supported).
+	 * @throws DriverException
+	 */
+	function begin(?string $savepoint = null): void;
+
+	/**
+	 * Commits statements in a transaction.
+	 * @throws DriverException
+	 */
+	function commit(?string $savepoint = null): void;
+
+	/**
+	 * Rollback changes in a transaction.
+	 * @throws DriverException
+	 */
+	function rollback(?string $savepoint = null): void;
+
+	/**
+	 * Returns the connection resource.
+	 */
+	function getResource(): mixed;
+
+	/**
+	 * Returns the connection reflector.
+	 */
+	function getReflector(): Engine;
+
+	/**
+	 * Encodes data for use in a SQL statement.
+	 */
+	function escapeText(string $value): string;
+
+	function escapeBinary(string $value): string;
+
+	function escapeIdentifier(string $value): string;
+
+	function escapeBool(bool $value): string;
+
+	function escapeDate(\DateTimeInterface $value): string;
+
+	function escapeDateTime(\DateTimeInterface $value): string;
+
+	function escapeDateInterval(\DateInterval $value): string;
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	function escapeLike(string $value, int $pos): string;
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
+}
diff --git a/src/Dibi/Drivers/DummyDriver.php b/src/Dibi/Drivers/Dummy/Connection.php
similarity index 93%
rename from src/Dibi/Drivers/DummyDriver.php
rename to src/Dibi/Drivers/Dummy/Connection.php
index 6f8b0e6bd..e4c630c43 100644
--- a/src/Dibi/Drivers/DummyDriver.php
+++ b/src/Dibi/Drivers/Dummy/Connection.php
@@ -7,22 +7,23 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Dummy;
 
 use Dibi;
+use Dibi\Drivers;
 
 
 /**
  * The dummy driver for testing purposes.
  */
-class DummyDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
+class Connection implements Drivers\Connection, Drivers\Result, Drivers\Engine
 {
 	public function disconnect(): void
 	{
 	}
 
 
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		return null;
 	}
@@ -64,7 +65,7 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Drivers\Engine
 	{
 		return $this;
 	}
diff --git a/src/Dibi/Drivers/NoDataResult.php b/src/Dibi/Drivers/Dummy/Result.php
similarity index 81%
rename from src/Dibi/Drivers/NoDataResult.php
rename to src/Dibi/Drivers/Dummy/Result.php
index f427dc4ea..4e13e702d 100644
--- a/src/Dibi/Drivers/NoDataResult.php
+++ b/src/Dibi/Drivers/Dummy/Result.php
@@ -7,22 +7,19 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Dummy;
 
-use Dibi;
+use Dibi\Drivers;
 
 
 /**
  * The driver for no result set.
  */
-class NoDataResult implements Dibi\ResultDriver
+class Result implements Drivers\Result
 {
-	private int $rows;
-
-
-	public function __construct(int $rows)
-	{
-		$this->rows = $rows;
+	public function __construct(
+		private readonly int $rows,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/Engine.php b/src/Dibi/Drivers/Engine.php
new file mode 100644
index 000000000..f1822d058
--- /dev/null
+++ b/src/Dibi/Drivers/Engine.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi\Drivers;
+
+
+/**
+ * Engine-specific behaviors.
+ */
+interface Engine
+{
+	/**
+	 * Returns list of tables.
+	 * @return array of {name [, (bool) view ]}
+	 */
+	function getTables(): array;
+
+	/**
+	 * Returns metadata for all columns in a table.
+	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
+	 */
+	function getColumns(string $table): array;
+
+	/**
+	 * Returns metadata for all indexes in a table.
+	 * @return array of {name, (array of names) columns [, (bool) unique, (bool) primary ]}
+	 */
+	function getIndexes(string $table): array;
+
+	/**
+	 * Returns metadata for all foreign keys in a table.
+	 */
+	function getForeignKeys(string $table): array;
+}
diff --git a/src/Dibi/Drivers/FirebirdReflector.php b/src/Dibi/Drivers/Engines/FirebirdEngine.php
similarity index 97%
rename from src/Dibi/Drivers/FirebirdReflector.php
rename to src/Dibi/Drivers/Engines/FirebirdEngine.php
index 4114f235b..1818d8f74 100644
--- a/src/Dibi/Drivers/FirebirdReflector.php
+++ b/src/Dibi/Drivers/Engines/FirebirdEngine.php
@@ -7,22 +7,20 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
-use Dibi;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for Firebird/InterBase database.
  */
-class FirebirdReflector implements Dibi\Reflector
+class FirebirdEngine implements Engine
 {
-	private Dibi\Driver $driver;
-
-
-	public function __construct(Dibi\Driver $driver)
-	{
-		$this->driver = $driver;
+	public function __construct(
+		private readonly Connection $driver,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/MySqlReflector.php b/src/Dibi/Drivers/Engines/MySQLEngine.php
similarity index 94%
rename from src/Dibi/Drivers/MySqlReflector.php
rename to src/Dibi/Drivers/Engines/MySQLEngine.php
index dbd55828a..f36806345 100644
--- a/src/Dibi/Drivers/MySqlReflector.php
+++ b/src/Dibi/Drivers/Engines/MySQLEngine.php
@@ -7,23 +7,22 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
 use Dibi;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for MySQL databases.
  * @internal
  */
-class MySqlReflector implements Dibi\Reflector
+class MySQLEngine implements Engine
 {
-	private Dibi\Driver $driver;
-
-
-	public function __construct(Dibi\Driver $driver)
-	{
-		$this->driver = $driver;
+	public function __construct(
+		private readonly Connection $driver,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/OdbcReflector.php b/src/Dibi/Drivers/Engines/ODBCEngine.php
similarity index 89%
rename from src/Dibi/Drivers/OdbcReflector.php
rename to src/Dibi/Drivers/Engines/ODBCEngine.php
index 3285fe034..4831bf0e6 100644
--- a/src/Dibi/Drivers/OdbcReflector.php
+++ b/src/Dibi/Drivers/Engines/ODBCEngine.php
@@ -7,22 +7,21 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
 use Dibi;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for ODBC connections.
  */
-class OdbcReflector implements Dibi\Reflector
+class ODBCEngine implements Engine
 {
-	private Dibi\Driver $driver;
-
-
-	public function __construct(Dibi\Driver $driver)
-	{
-		$this->driver = $driver;
+	public function __construct(
+		private readonly Connection $driver,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/OracleReflector.php b/src/Dibi/Drivers/Engines/OracleEngine.php
similarity index 88%
rename from src/Dibi/Drivers/OracleReflector.php
rename to src/Dibi/Drivers/Engines/OracleEngine.php
index 74c3db69a..b20b29a15 100644
--- a/src/Dibi/Drivers/OracleReflector.php
+++ b/src/Dibi/Drivers/Engines/OracleEngine.php
@@ -7,22 +7,21 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
 use Dibi;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for Oracle database.
  */
-class OracleReflector implements Dibi\Reflector
+class OracleEngine implements Engine
 {
-	private Dibi\Driver $driver;
-
-
-	public function __construct(Dibi\Driver $driver)
-	{
-		$this->driver = $driver;
+	public function __construct(
+		private readonly Connection $driver,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/PostgreReflector.php b/src/Dibi/Drivers/Engines/PostgreSQLEngine.php
similarity index 92%
rename from src/Dibi/Drivers/PostgreReflector.php
rename to src/Dibi/Drivers/Engines/PostgreSQLEngine.php
index 29a33c15f..04c2927b8 100644
--- a/src/Dibi/Drivers/PostgreReflector.php
+++ b/src/Dibi/Drivers/Engines/PostgreSQLEngine.php
@@ -7,24 +7,20 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
-use Dibi;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for PostgreSQL database.
  */
-class PostgreReflector implements Dibi\Reflector
+class PostgreSQLEngine implements Engine
 {
-	private Dibi\Driver $driver;
-	private string $version;
-
-
-	public function __construct(Dibi\Driver $driver, string $version)
-	{
-		$this->driver = $driver;
-		$this->version = $version;
+	public function __construct(
+		private readonly Connection $driver,
+	) {
 	}
 
 
@@ -43,18 +39,15 @@ public function getTables(): array
 			FROM
 				information_schema.tables
 			WHERE
-				table_schema = ANY (current_schemas(false))";
+				table_schema = ANY (current_schemas(false))
 
-		if ($this->version >= 9.3) {
-			$query .= '
-				UNION ALL
-				SELECT
-					matviewname, 1
-				FROM
-					pg_matviews
-				WHERE
-					schemaname = ANY (current_schemas(false))';
-		}
+			UNION ALL
+			SELECT
+				matviewname, 1
+			FROM
+				pg_matviews
+			WHERE
+				schemaname = ANY (current_schemas(false))";
 
 		$res = $this->driver->query($query);
 		$tables = [];
diff --git a/src/Dibi/Drivers/SqlsrvReflector.php b/src/Dibi/Drivers/Engines/SQLServerEngine.php
similarity index 94%
rename from src/Dibi/Drivers/SqlsrvReflector.php
rename to src/Dibi/Drivers/Engines/SQLServerEngine.php
index 32fec929c..bee8c7465 100644
--- a/src/Dibi/Drivers/SqlsrvReflector.php
+++ b/src/Dibi/Drivers/Engines/SQLServerEngine.php
@@ -7,22 +7,21 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
 use Dibi;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for Microsoft SQL Server and SQL Azure databases.
  */
-class SqlsrvReflector implements Dibi\Reflector
+class SQLServerEngine implements Engine
 {
-	private Dibi\Driver $driver;
-
-
-	public function __construct(Dibi\Driver $driver)
-	{
-		$this->driver = $driver;
+	public function __construct(
+		private readonly Connection $driver,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/SqliteReflector.php b/src/Dibi/Drivers/Engines/SQLiteEngine.php
similarity index 94%
rename from src/Dibi/Drivers/SqliteReflector.php
rename to src/Dibi/Drivers/Engines/SQLiteEngine.php
index a85018e40..7ab2328ef 100644
--- a/src/Dibi/Drivers/SqliteReflector.php
+++ b/src/Dibi/Drivers/Engines/SQLiteEngine.php
@@ -7,22 +7,20 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
-use Dibi;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for SQLite database.
  */
-class SqliteReflector implements Dibi\Reflector
+class SQLiteEngine implements Engine
 {
-	private Dibi\Driver $driver;
-
-
-	public function __construct(Dibi\Driver $driver)
-	{
-		$this->driver = $driver;
+	public function __construct(
+		private readonly Connection $driver,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/Firebird/Connection.php
similarity index 95%
rename from src/Dibi/Drivers/FirebirdDriver.php
rename to src/Dibi/Drivers/Firebird/Connection.php
index cef0b98b2..82dae6c00 100644
--- a/src/Dibi/Drivers/FirebirdDriver.php
+++ b/src/Dibi/Drivers/Firebird/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Ibase;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 
 
@@ -24,7 +25,7 @@
  *   - buffers (int) => buffers is the number of database buffers to allocate for the server-side cache. If 0 or omitted, server chooses its own default.
  *   - resource (resource) => existing connection resource
  */
-class FirebirdDriver implements Dibi\Driver
+class Connection implements Drivers\Connection
 {
 	public const ErrorExceptionThrown = -836;
 
@@ -85,7 +86,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException|Dibi\Exception
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$resource = $this->inTransaction
 			? $this->transaction
@@ -199,9 +200,9 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Drivers\Engine
 	{
-		return new FirebirdReflector($this);
+		return new Drivers\Engines\FirebirdEngine($this);
 	}
 
 
@@ -209,9 +210,9 @@ public function getReflector(): Dibi\Reflector
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): FirebirdResult
+	public function createResultDriver($resource): Result
 	{
-		return new FirebirdResult($resource);
+		return new Result($resource);
 	}
 
 
diff --git a/src/Dibi/Drivers/FirebirdResult.php b/src/Dibi/Drivers/Firebird/Result.php
similarity index 88%
rename from src/Dibi/Drivers/FirebirdResult.php
rename to src/Dibi/Drivers/Firebird/Result.php
index a4c0ba782..c6f537c26 100644
--- a/src/Dibi/Drivers/FirebirdResult.php
+++ b/src/Dibi/Drivers/Firebird/Result.php
@@ -7,27 +7,22 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Ibase;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 
 
 /**
  * The driver for Firebird/InterBase result set.
  */
-class FirebirdResult implements Dibi\ResultDriver
+class Result implements Drivers\Result
 {
-	/** @var resource */
-	private $resultSet;
-
-
-	/**
-	 * @param  resource  $resultSet
-	 */
-	public function __construct($resultSet)
-	{
-		$this->resultSet = $resultSet;
+	public function __construct(
+		/** @var resource */
+		private $resultSet,
+	) {
 	}
 
 
@@ -51,7 +46,7 @@ public function fetch(bool $assoc): ?array
 			: @ibase_fetch_row($this->resultSet, IBASE_TEXT); // intentionally @
 
 		if (ibase_errcode()) {
-			if (ibase_errcode() === FirebirdDriver::ERROR_EXCEPTION_THROWN) {
+			if (ibase_errcode() === Connection::ERROR_EXCEPTION_THROWN) {
 				preg_match('/exception (\d+) (\w+) (.*)/is', ibase_errmsg(), $match);
 				throw new Dibi\ProcedureException($match[3], $match[1], $match[2]);
 
diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySQLi/Connection.php
similarity index 96%
rename from src/Dibi/Drivers/MySqliDriver.php
rename to src/Dibi/Drivers/MySQLi/Connection.php
index 41e7c6062..35afac930 100644
--- a/src/Dibi/Drivers/MySqliDriver.php
+++ b/src/Dibi/Drivers/MySQLi/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\MySQLi;
 
 use Dibi;
+use Dibi\Drivers;
 
 
 /**
@@ -30,7 +31,7 @@
  *   - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
  *   - resource (mysqli) => existing connection resource
  */
-class MySqliDriver implements Dibi\Driver
+class Connection implements Drivers\Connection
 {
 	public const ErrorAccessDenied = 1045;
 	public const ErrorDuplicateEntry = 1062;
@@ -146,7 +147,7 @@ public function ping(): bool
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$res = @$this->connection->query($sql, $this->buffered ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT); // intentionally @
 
@@ -263,18 +264,18 @@ public function getResource(): ?\mysqli
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Drivers\Engine
 	{
-		return new MySqlReflector($this);
+		return new Drivers\Engines\MySQLEngine($this);
 	}
 
 
 	/**
 	 * Result set driver factory.
 	 */
-	public function createResultDriver(\mysqli_result $result): MySqliResult
+	public function createResultDriver(\mysqli_result $result): Result
 	{
-		return new MySqliResult($result, $this->buffered);
+		return new Result($result, $this->buffered);
 	}
 
 
diff --git a/src/Dibi/Drivers/MySqliResult.php b/src/Dibi/Drivers/MySQLi/Result.php
similarity index 90%
rename from src/Dibi/Drivers/MySqliResult.php
rename to src/Dibi/Drivers/MySQLi/Result.php
index 4469ef0c9..830cb6a2e 100644
--- a/src/Dibi/Drivers/MySqliResult.php
+++ b/src/Dibi/Drivers/MySQLi/Result.php
@@ -7,24 +7,21 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\MySQLi;
 
 use Dibi;
+use Dibi\Drivers;
 
 
 /**
  * The driver for MySQL result set.
  */
-class MySqliResult implements Dibi\ResultDriver
+class Result implements Drivers\Result
 {
-	private \mysqli_result $resultSet;
-	private bool $buffered;
-
-
-	public function __construct(\mysqli_result $resultSet, bool $buffered)
-	{
-		$this->resultSet = $resultSet;
-		$this->buffered = $buffered;
+	public function __construct(
+		private readonly \mysqli_result $resultSet,
+		private readonly bool $buffered,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OCI8/Connection.php
similarity index 95%
rename from src/Dibi/Drivers/OracleDriver.php
rename to src/Dibi/Drivers/OCI8/Connection.php
index 46a757dbd..3422d4ac8 100644
--- a/src/Dibi/Drivers/OracleDriver.php
+++ b/src/Dibi/Drivers/OCI8/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\OCI8;
 
 use Dibi;
+use Dibi\Drivers;
 
 
 /**
@@ -25,7 +26,7 @@
  *   - resource (resource) => existing connection resource
  *   - persistent => Creates persistent connections with oci_pconnect instead of oci_new_connect
  */
-class OracleDriver implements Dibi\Driver
+class Connection implements Drivers\Connection
 {
 	/** @var resource */
 	private $connection;
@@ -76,7 +77,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$this->affectedRows = null;
 		$res = oci_parse($this->connection, $sql);
@@ -189,9 +190,9 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Drivers\Engine
 	{
-		return new OracleReflector($this);
+		return new Drivers\Engines\OracleEngine($this);
 	}
 
 
@@ -199,9 +200,9 @@ public function getReflector(): Dibi\Reflector
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): OracleResult
+	public function createResultDriver($resource): Result
 	{
-		return new OracleResult($resource);
+		return new Result($resource);
 	}
 
 
diff --git a/src/Dibi/Drivers/OracleResult.php b/src/Dibi/Drivers/OCI8/Result.php
similarity index 89%
rename from src/Dibi/Drivers/OracleResult.php
rename to src/Dibi/Drivers/OCI8/Result.php
index b1590546a..5281f3335 100644
--- a/src/Dibi/Drivers/OracleResult.php
+++ b/src/Dibi/Drivers/OCI8/Result.php
@@ -7,26 +7,21 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\OCI8;
 
 use Dibi;
+use Dibi\Drivers;
 
 
 /**
  * The driver for Oracle result set.
  */
-class OracleResult implements Dibi\ResultDriver
+class Result implements Drivers\Result
 {
-	/** @var resource */
-	private $resultSet;
-
-
-	/**
-	 * @param  resource  $resultSet
-	 */
-	public function __construct($resultSet)
-	{
-		$this->resultSet = $resultSet;
+	public function __construct(
+		/** @var resource */
+		private $resultSet,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/ODBC/Connection.php
similarity index 94%
rename from src/Dibi/Drivers/OdbcDriver.php
rename to src/Dibi/Drivers/ODBC/Connection.php
index a5471c35f..65e3c5acd 100644
--- a/src/Dibi/Drivers/OdbcDriver.php
+++ b/src/Dibi/Drivers/ODBC/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\ODBC;
 
 use Dibi;
+use Dibi\Drivers;
 
 
 /**
@@ -23,7 +24,7 @@
  *   - resource (resource) => existing connection resource
  *   - microseconds (bool) => use microseconds in datetime format?
  */
-class OdbcDriver implements Dibi\Driver
+class Connection implements Drivers\Connection
 {
 	/** @var resource */
 	private $connection;
@@ -76,7 +77,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$this->affectedRows = null;
 		$res = @odbc_exec($this->connection, $sql); // intentionally @
@@ -175,9 +176,9 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Drivers\Engine
 	{
-		return new OdbcReflector($this);
+		return new Drivers\Engines\ODBCEngine($this);
 	}
 
 
@@ -185,9 +186,9 @@ public function getReflector(): Dibi\Reflector
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): OdbcResult
+	public function createResultDriver($resource): Result
 	{
-		return new OdbcResult($resource);
+		return new Result($resource);
 	}
 
 
diff --git a/src/Dibi/Drivers/OdbcResult.php b/src/Dibi/Drivers/ODBC/Result.php
similarity index 90%
rename from src/Dibi/Drivers/OdbcResult.php
rename to src/Dibi/Drivers/ODBC/Result.php
index c8d88e7db..4ec23f7be 100644
--- a/src/Dibi/Drivers/OdbcResult.php
+++ b/src/Dibi/Drivers/ODBC/Result.php
@@ -7,27 +7,24 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\ODBC;
 
 use Dibi;
+use Dibi\Drivers;
 
 
 /**
  * The driver interacting with result set via ODBC connections.
  */
-class OdbcResult implements Dibi\ResultDriver
+class Result implements Drivers\Result
 {
-	/** @var resource */
-	private $resultSet;
 	private int $row = 0;
 
 
-	/**
-	 * @param  resource  $resultSet
-	 */
-	public function __construct($resultSet)
-	{
-		$this->resultSet = $resultSet;
+	public function __construct(
+		/** @var resource */
+		private $resultSet,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PDO/Connection.php
similarity index 85%
rename from src/Dibi/Drivers/PdoDriver.php
rename to src/Dibi/Drivers/PDO/Connection.php
index e0944d84e..72c298ff8 100644
--- a/src/Dibi/Drivers/PdoDriver.php
+++ b/src/Dibi/Drivers/PDO/Connection.php
@@ -7,9 +7,11 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\PDO;
 
 use Dibi;
+use Dibi\Drivers;
+use Dibi\Drivers\Engines;
 use Dibi\Helpers;
 use PDO;
 
@@ -23,14 +25,12 @@
  *   - password (or pass)
  *   - options (array) => driver specific options {@see PDO::__construct}
  *   - resource (PDO) => existing connection
- *   - version
  */
-class PdoDriver implements Dibi\Driver
+class Connection implements Drivers\Connection
 {
 	private ?PDO $connection;
 	private ?int $affectedRows;
 	private string $driverName;
-	private string $serverVersion = '';
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -65,7 +65,6 @@ public function __construct(array $config)
 		}
 
 		$this->driverName = $this->connection->getAttribute(PDO::ATTR_DRIVER_NAME);
-		$this->serverVersion = (string) ($config['version'] ?? @$this->connection->getAttribute(PDO::ATTR_SERVER_VERSION)); // @ - may be not supported
 	}
 
 
@@ -82,7 +81,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$res = $this->connection->query($sql);
 		if ($res) {
@@ -96,10 +95,10 @@ public function query(string $sql): ?Dibi\ResultDriver
 		$code ??= 0;
 		$message = "SQLSTATE[$sqlState]: $message";
 		throw match ($this->driverName) {
-			'mysql' => MySqliDriver::createException($message, $code, $sql),
-			'oci' => OracleDriver::createException($message, $code, $sql),
-			'pgsql' => PostgreDriver::createException($message, $sqlState, $sql),
-			'sqlite' => SqliteDriver::createException($message, $code, $sql),
+			'mysql' => Drivers\MySQLi\Connection::createException($message, $code, $sql),
+			'oci' => Drivers\OCI8\Connection::createException($message, $code, $sql),
+			'pgsql' => Drivers\PgSQL\Connection::createException($message, $sqlState, $sql),
+			'sqlite' => Drivers\SQLite3\Connection::createException($message, $code, $sql),
 			default => new Dibi\DriverException($message, $code, $sql),
 		};
 	}
@@ -174,14 +173,14 @@ public function getResource(): ?PDO
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Drivers\Engine
 	{
 		return match ($this->driverName) {
-			'mysql' => new MySqlReflector($this),
-			'oci' => new OracleReflector($this),
-			'pgsql' => new PostgreReflector($this, $this->connection->getAttribute(PDO::ATTR_SERVER_VERSION)),
-			'sqlite' => new SqliteReflector($this),
-			'mssql', 'dblib', 'sqlsrv' => new SqlsrvReflector($this),
+			'mysql' => new Engines\MySQLEngine($this),
+			'oci' => new Engines\OracleEngine($this),
+			'pgsql' => new Engines\PostgreSQLEngine($this),
+			'sqlite' => new Engines\SQLiteEngine($this),
+			'mssql', 'dblib', 'sqlsrv' => new Engines\SQLServerEngine($this),
 			default => throw new Dibi\NotSupportedException,
 		};
 	}
@@ -190,9 +189,9 @@ public function getReflector(): Dibi\Reflector
 	/**
 	 * Result set driver factory.
 	 */
-	public function createResultDriver(\PDOStatement $result): PdoResult
+	public function createResultDriver(\PDOStatement $result): Result
 	{
-		return new PdoResult($result, $this->driverName);
+		return new Result($result, $this->driverName);
 	}
 
 
@@ -359,17 +358,15 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
 			case 'mssql':
 			case 'sqlsrv':
 			case 'dblib':
-				if (version_compare($this->serverVersion, '11.0') >= 0) { // 11 == SQL Server 2012
-					// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
-					if ($limit !== null) {
-						$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
-					} elseif ($offset) {
-						$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
-					}
-
-					break;
+				// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
+				if ($limit !== null) {
+					$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
+				} elseif ($offset) {
+					$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
 				}
-				// break omitted
+
+				break;
+
 			case 'odbc':
 				if ($offset) {
 					throw new Dibi\NotSupportedException('Offset is not supported by this database.');
diff --git a/src/Dibi/Drivers/PdoResult.php b/src/Dibi/Drivers/PDO/Result.php
similarity index 88%
rename from src/Dibi/Drivers/PdoResult.php
rename to src/Dibi/Drivers/PDO/Result.php
index d0e22371e..bf0d39606 100644
--- a/src/Dibi/Drivers/PdoResult.php
+++ b/src/Dibi/Drivers/PDO/Result.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\PDO;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use PDO;
 
@@ -17,16 +18,12 @@
 /**
  * The driver for PDO result set.
  */
-class PdoResult implements Dibi\ResultDriver
+class Result implements Drivers\Result
 {
-	private ?\PDOStatement $resultSet;
-	private string $driverName;
-
-
-	public function __construct(\PDOStatement $resultSet, string $driverName)
-	{
-		$this->resultSet = $resultSet;
-		$this->driverName = $driverName;
+	public function __construct(
+		private ?\PDOStatement $resultSet,
+		private readonly string $driverName,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PgSQL/Connection.php
similarity index 89%
rename from src/Dibi/Drivers/PostgreDriver.php
rename to src/Dibi/Drivers/PgSQL/Connection.php
index 776e5288e..9f36eb92e 100644
--- a/src/Dibi/Drivers/PostgreDriver.php
+++ b/src/Dibi/Drivers/PgSQL/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\PgSQL;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use PgSql;
 
@@ -23,13 +24,12 @@
  *   - schema => the schema search path
  *   - charset => character encoding to set (default is utf8)
  *   - persistent (bool) => try to find a persistent link?
- *   - resource (resource) => existing connection resource
+ *   - resource (PgSql\Connection) => existing connection resource
  *   - connect_type (int) => see pg_connect()
  */
-class PostgreDriver implements Dibi\Driver
+class Connection implements Drivers\Connection
 {
-	/** @var resource|PgSql\Connection */
-	private $connection;
+	private PgSql\Connection $connection;
 	private ?int $affectedRows;
 
 
@@ -72,7 +72,7 @@ public function __construct(array $config)
 			restore_error_handler();
 		}
 
-		if (!is_resource($this->connection) && !$this->connection instanceof PgSql\Connection) {
+		if (!$this->connection instanceof PgSql\Connection) {
 			throw new Dibi\DriverException($error ?: 'Connecting error.');
 		}
 
@@ -110,7 +110,7 @@ public function ping(): bool
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$this->affectedRows = null;
 		$res = @pg_query($this->connection, $sql); // intentionally @
@@ -118,7 +118,7 @@ public function query(string $sql): ?Dibi\ResultDriver
 		if ($res === false) {
 			throw static::createException(pg_last_error($this->connection), null, $sql);
 
-		} elseif (is_resource($res) || $res instanceof PgSql\Result) {
+		} elseif ($res instanceof PgSql\Result) {
 			$this->affectedRows = Helpers::false2Null(pg_affected_rows($res));
 			if (pg_num_fields($res)) {
 				return $this->createResultDriver($res);
@@ -222,32 +222,28 @@ public function inTransaction(): bool
 
 	/**
 	 * Returns the connection resource.
-	 * @return resource|null
 	 */
-	public function getResource(): mixed
+	public function getResource(): PgSql\Connection
 	{
-		return is_resource($this->connection) || $this->connection instanceof PgSql\Connection
-			? $this->connection
-			: null;
+		return $this->connection;
 	}
 
 
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Drivers\Engine
 	{
-		return new PostgreReflector($this, pg_parameter_status($this->connection, 'server_version'));
+		return new Drivers\Engines\PostgreSQLEngine($this);
 	}
 
 
 	/**
 	 * Result set driver factory.
-	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): PostgreResult
+	public function createResultDriver(PgSql\Result $resource): Result
 	{
-		return new PostgreResult($resource);
+		return new Result($resource);
 	}
 
 
diff --git a/src/Dibi/Drivers/PostgreResult.php b/src/Dibi/Drivers/PgSQL/Result.php
similarity index 78%
rename from src/Dibi/Drivers/PostgreResult.php
rename to src/Dibi/Drivers/PgSQL/Result.php
index bcbecd290..1f66c29f0 100644
--- a/src/Dibi/Drivers/PostgreResult.php
+++ b/src/Dibi/Drivers/PgSQL/Result.php
@@ -7,9 +7,9 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\PgSQL;
 
-use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use PgSql;
 
@@ -17,18 +17,11 @@
 /**
  * The driver for PostgreSQL result set.
  */
-class PostgreResult implements Dibi\ResultDriver
+class Result implements Drivers\Result
 {
-	/** @var resource|PgSql\Result */
-	private $resultSet;
-
-
-	/**
-	 * @param  resource|PgSql\Result  $resultSet
-	 */
-	public function __construct($resultSet)
-	{
-		$this->resultSet = $resultSet;
+	public function __construct(
+		private readonly PgSql\Result $resultSet,
+	) {
 	}
 
 
@@ -94,13 +87,10 @@ public function getResultColumns(): array
 
 	/**
 	 * Returns the result set resource.
-	 * @return resource|PgSql\Result|null
 	 */
-	public function getResultResource(): mixed
+	public function getResultResource(): PgSql\Result
 	{
-		return is_resource($this->resultSet) || $this->resultSet instanceof PgSql\Result
-			? $this->resultSet
-			: null;
+		return $this->resultSet;
 	}
 
 
diff --git a/src/Dibi/Drivers/Result.php b/src/Dibi/Drivers/Result.php
new file mode 100644
index 000000000..f90658b34
--- /dev/null
+++ b/src/Dibi/Drivers/Result.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi\Drivers;
+
+use Dibi\Exception;
+
+
+/**
+ * Database result driver.
+ */
+interface Result
+{
+	/**
+	 * Returns the number of rows in a result set.
+	 */
+	function getRowCount(): int;
+
+	/**
+	 * Moves cursor position without fetching row.
+	 * @throws Exception
+	 */
+	function seek(int $row): bool;
+
+	/**
+	 * Fetches the row at current position and moves the internal cursor to the next position.
+	 * @param  bool  $type  true for associative array, false for numeric
+	 * @internal
+	 */
+	function fetch(bool $type): ?array;
+
+	/**
+	 * Frees the resources allocated for this result set.
+	 */
+	function free(): void;
+
+	/**
+	 * Returns metadata for all columns in a result set.
+	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
+	 */
+	function getResultColumns(): array;
+
+	/**
+	 * Returns the result set resource.
+	 */
+	function getResultResource(): mixed;
+
+	/**
+	 * Decodes data from result set.
+	 */
+	function unescapeBinary(string $value): string;
+}
diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SQLSrv/Connection.php
similarity index 89%
rename from src/Dibi/Drivers/SqlsrvDriver.php
rename to src/Dibi/Drivers/SQLSrv/Connection.php
index 523fd1984..ef9dc9998 100644
--- a/src/Dibi/Drivers/SqlsrvDriver.php
+++ b/src/Dibi/Drivers/SQLSrv/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\SQLSrv;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 
 
@@ -25,12 +26,11 @@
  *   - charset => character encoding to set (default is UTF-8)
  *   - resource (resource) => existing connection resource
  */
-class SqlsrvDriver implements Dibi\Driver
+class Connection implements Drivers\Connection
 {
 	/** @var resource */
 	private $connection;
 	private ?int $affectedRows;
-	private string $version = '';
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -68,8 +68,6 @@ public function __construct(array $config)
 
 			sqlsrv_configure('WarningsReturnAsErrors', 1);
 		}
-
-		$this->version = sqlsrv_server_info($this->connection)['SQLServerVersion'];
 	}
 
 
@@ -86,7 +84,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$this->affectedRows = null;
 		$res = sqlsrv_query($this->connection, $sql);
@@ -173,9 +171,9 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Drivers\Engine
 	{
-		return new SqlsrvReflector($this);
+		return new Drivers\Engines\SQLServerEngine($this);
 	}
 
 
@@ -183,9 +181,9 @@ public function getReflector(): Dibi\Reflector
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): SqlsrvResult
+	public function createResultDriver($resource): Result
 	{
-		return new SqlsrvResult($resource);
+		return new Result($resource);
 	}
 
 
@@ -256,13 +254,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
 		if ($limit < 0 || $offset < 0) {
 			throw new Dibi\NotSupportedException('Negative offset or limit.');
 
-		} elseif (version_compare($this->version, '11', '<')) { // 11 == SQL Server 2012
-			if ($offset) {
-				throw new Dibi\NotSupportedException('Offset is not supported by this database.');
-
-			} elseif ($limit !== null) {
-				$sql = sprintf('SELECT TOP (%d) * FROM (%s) t', $limit, $sql);
-			}
 		} elseif ($limit !== null) {
 			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
 			$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
diff --git a/src/Dibi/Drivers/SqlsrvResult.php b/src/Dibi/Drivers/SQLSrv/Result.php
similarity index 88%
rename from src/Dibi/Drivers/SqlsrvResult.php
rename to src/Dibi/Drivers/SQLSrv/Result.php
index ecd6ed538..c69488be5 100644
--- a/src/Dibi/Drivers/SqlsrvResult.php
+++ b/src/Dibi/Drivers/SQLSrv/Result.php
@@ -7,26 +7,21 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\SQLSrv;
 
 use Dibi;
+use Dibi\Drivers;
 
 
 /**
  * The driver for Microsoft SQL Server and SQL Azure result set.
  */
-class SqlsrvResult implements Dibi\ResultDriver
+class Result implements Drivers\Result
 {
-	/** @var resource */
-	private $resultSet;
-
-
-	/**
-	 * @param  resource  $resultSet
-	 */
-	public function __construct($resultSet)
-	{
-		$this->resultSet = $resultSet;
+	public function __construct(
+		/** @var resource */
+		private $resultSet,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/SqliteDriver.php b/src/Dibi/Drivers/SQLite3/Connection.php
similarity index 93%
rename from src/Dibi/Drivers/SqliteDriver.php
rename to src/Dibi/Drivers/SQLite3/Connection.php
index c1b4b2273..391ad2066 100644
--- a/src/Dibi/Drivers/SqliteDriver.php
+++ b/src/Dibi/Drivers/SQLite3/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\SQLite3;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use SQLite3;
 
@@ -23,7 +24,7 @@
  *   - formatDateTime => how to format datetime in SQL (@see date)
  *   - resource (SQLite3) => existing connection resource
  */
-class SqliteDriver implements Dibi\Driver
+class Connection implements Drivers\Connection
 {
 	private SQLite3 $connection;
 	private string $fmtDate;
@@ -56,10 +57,7 @@ public function __construct(array $config)
 		}
 
 		// enable foreign keys support (defaultly disabled; if disabled then foreign key constraints are not enforced)
-		$version = SQLite3::version();
-		if ($version['versionNumber'] >= '3006019') {
-			$this->query('PRAGMA foreign_keys = ON');
-		}
+		$this->query('PRAGMA foreign_keys = ON');
 	}
 
 
@@ -76,7 +74,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$res = @$this->connection->query($sql); // intentionally @
 		if ($code = $this->connection->lastErrorCode()) {
@@ -177,18 +175,18 @@ public function getResource(): ?SQLite3
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Drivers\Engine
 	{
-		return new SqliteReflector($this);
+		return new Drivers\Engines\SQLiteEngine($this);
 	}
 
 
 	/**
 	 * Result set driver factory.
 	 */
-	public function createResultDriver(\SQLite3Result $result): SqliteResult
+	public function createResultDriver(\SQLite3Result $result): Result
 	{
-		return new SqliteResult($result);
+		return new Result($result);
 	}
 
 
diff --git a/src/Dibi/Drivers/SqliteResult.php b/src/Dibi/Drivers/SQLite3/Result.php
similarity index 91%
rename from src/Dibi/Drivers/SqliteResult.php
rename to src/Dibi/Drivers/SQLite3/Result.php
index 218808b39..2aa8e643c 100644
--- a/src/Dibi/Drivers/SqliteResult.php
+++ b/src/Dibi/Drivers/SQLite3/Result.php
@@ -7,23 +7,21 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\SQLite3;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 
 
 /**
  * The driver for SQLite result set.
  */
-class SqliteResult implements Dibi\ResultDriver
+class Result implements Drivers\Result
 {
-	private \SQLite3Result $resultSet;
-
-
-	public function __construct(\SQLite3Result $resultSet)
-	{
-		$this->resultSet = $resultSet;
+	public function __construct(
+		private readonly \SQLite3Result $resultSet,
+	) {
 	}
 
 
diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php
deleted file mode 100644
index f3dfa9ede..000000000
--- a/src/Dibi/Drivers/Sqlite3Driver.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi\Drivers;
-
-
-/**
- * Alias for SqliteDriver driver.
- */
-class Sqlite3Driver extends SqliteDriver
-{
-}
diff --git a/src/Dibi/Drivers/Sqlite3Result.php b/src/Dibi/Drivers/Sqlite3Result.php
deleted file mode 100644
index 26cca51b3..000000000
--- a/src/Dibi/Drivers/Sqlite3Result.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi\Drivers;
-
-
-/**
- * Alias for SqliteResult driver.
- */
-class Sqlite3Result extends SqliteResult
-{
-}
diff --git a/src/Dibi/Event.php b/src/Dibi/Event.php
index 92f4a1623..ace4d8093 100644
--- a/src/Dibi/Event.php
+++ b/src/Dibi/Event.php
@@ -29,16 +29,16 @@ class Event
 		TRANSACTION = 448, // BEGIN | COMMIT | ROLLBACK
 		ALL = 1023;
 
-	public Connection $connection;
+	public readonly IConnection $connection;
 	public int $type;
-	public string $sql;
-	public Result|DriverException|null $result;
+	public readonly string $sql;
+	public readonly Result|DriverException|null $result;
 	public float $time;
 	public ?int $count = null;
 	public ?array $source = null;
 
 
-	public function __construct(Connection $connection, int $type, ?string $sql = null)
+	public function __construct(IConnection $connection, int $type, ?string $sql = null)
 	{
 		$this->connection = $connection;
 		$this->type = $type;
diff --git a/src/Dibi/Expression.php b/src/Dibi/Expression.php
index e5502991c..c3f174908 100644
--- a/src/Dibi/Expression.php
+++ b/src/Dibi/Expression.php
@@ -15,7 +15,7 @@
  */
 class Expression
 {
-	private array $values;
+	private readonly array $values;
 
 
 	public function __construct(...$values)
diff --git a/src/Dibi/Fluent.php b/src/Dibi/Fluent.php
index 011ba5e20..d3b422007 100644
--- a/src/Dibi/Fluent.php
+++ b/src/Dibi/Fluent.php
@@ -97,7 +97,7 @@ class Fluent implements IDataSource
 		'RIGHT JOIN' => 'FROM',
 	];
 
-	private Connection $connection;
+	private readonly IConnection $connection;
 	private array $setups = [];
 	private ?string $command = null;
 	private array $clauses = [];
@@ -108,12 +108,12 @@ class Fluent implements IDataSource
 	private static HashMap $normalizer;
 
 
-	public function __construct(Connection $connection)
+	public function __construct(IConnection $connection)
 	{
 		$this->connection = $connection;
 
 		if (!isset(self::$normalizer)) {
-			self::$normalizer = new HashMap([self::class, '_formatClause']);
+			self::$normalizer = new HashMap(self::_formatClause(...));
 		}
 	}
 
@@ -263,7 +263,7 @@ final public function getCommand(): ?string
 	}
 
 
-	final public function getConnection(): Connection
+	final public function getConnection(): IConnection
 	{
 		return $this->connection;
 	}
diff --git a/src/Dibi/Helpers.php b/src/Dibi/Helpers.php
index 82bed671e..be2dbfbd3 100644
--- a/src/Dibi/Helpers.php
+++ b/src/Dibi/Helpers.php
@@ -156,7 +156,7 @@ public static function getSuggestion(array $items, string $value): ?string
 
 
 	/** @internal */
-	public static function escape(Driver $driver, $value, string $type): string
+	public static function escape(Drivers\Connection $driver, $value, string $type): string
 	{
 		$types = [
 			Type::Text => 'text',
@@ -208,7 +208,7 @@ public static function detectType(string $type): ?string
 	public static function getTypeCache(): HashMap
 	{
 		if (!isset(self::$types)) {
-			self::$types = new HashMap([self::class, 'detectType']);
+			self::$types = new HashMap(self::detectType(...));
 		}
 
 		return self::$types;
@@ -236,7 +236,7 @@ public static function alias(array &$config, string $key, string $alias): void
 	 * Import SQL dump from file.
 	 * Returns count of sql commands
 	 */
-	public static function loadFromFile(Connection $connection, string $file, ?callable $onProgress = null): int
+	public static function loadFromFile(IConnection $connection, string $file, ?callable $onProgress = null): int
 	{
 		@set_time_limit(0); // intentionally @
 
diff --git a/src/Dibi/IConnection.php b/src/Dibi/IConnection.php
new file mode 100644
index 000000000..cf6b120cf
--- /dev/null
+++ b/src/Dibi/IConnection.php
@@ -0,0 +1,40 @@
+<?php declare(strict_types=1);
+
+namespace Dibi;
+
+use JetBrains\PhpStorm\Language;
+
+interface IConnection
+{
+	public function connect(): void;
+
+	public function disconnect(): void;
+
+	public function isConnected(): bool;
+
+	public function getDriver(): Drivers\Connection;
+
+	public function query(#[Language('GenericSQL')] mixed ...$args): Result;
+
+	public function translate(#[Language('GenericSQL')] mixed ...$args): string;
+
+	public function test(#[Language('GenericSQL')] mixed ...$args): bool;
+
+	public function dataSource(#[Language('GenericSQL')] mixed ...$args): DataSource;
+
+	public function nativeQuery(#[Language('SQL')] string $sql): Result;
+
+	public function getAffectedRows(): int;
+
+	public function getInsertId(?string $sequence = null): int;
+
+	public function begin(?string $savepoint = null): void;
+
+	public function commit(?string $savepoint = null): void;
+
+	public function rollback(?string $savepoint = null): void;
+
+	public function createResultSet(Drivers\Result $resultDriver): Result;
+
+	public function substitute(string $value): string;
+}
diff --git a/src/Dibi/IDataSource.php b/src/Dibi/IDataSource.php
new file mode 100644
index 000000000..0565fc456
--- /dev/null
+++ b/src/Dibi/IDataSource.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi;
+
+
+/**
+ * Provides an interface between a dataset and data-aware components.
+ */
+interface IDataSource extends \Countable, \IteratorAggregate
+{
+	//function \IteratorAggregate::getIterator();
+	//function \Countable::count();
+}
diff --git a/src/Dibi/Literal.php b/src/Dibi/Literal.php
index ca395859b..15eecdf96 100644
--- a/src/Dibi/Literal.php
+++ b/src/Dibi/Literal.php
@@ -15,7 +15,7 @@
  */
 class Literal
 {
-	private string $value;
+	private readonly string $value;
 
 
 	public function __construct($value)
diff --git a/src/Dibi/Loggers/FileLogger.php b/src/Dibi/Loggers/FileLogger.php
index 24239e65c..ca45288f6 100644
--- a/src/Dibi/Loggers/FileLogger.php
+++ b/src/Dibi/Loggers/FileLogger.php
@@ -17,17 +17,11 @@
  */
 class FileLogger
 {
-	/** Name of the file where SQL errors should be logged */
-	public string $file;
-	public int $filter;
-	private bool $errorsOnly;
-
-
-	public function __construct(string $file, ?int $filter = null, bool $errorsOnly = false)
-	{
-		$this->file = $file;
-		$this->filter = $filter ?: Dibi\Event::QUERY;
-		$this->errorsOnly = $errorsOnly;
+	public function __construct(
+		public string $file,
+		public int $filter = Dibi\Event::QUERY,
+		private bool $errorsOnly = false,
+	) {
 	}
 
 
diff --git a/src/Dibi/Reflection/Column.php b/src/Dibi/Reflection/Column.php
index 5415501ba..fc9d4dbb3 100644
--- a/src/Dibi/Reflection/Column.php
+++ b/src/Dibi/Reflection/Column.php
@@ -27,17 +27,10 @@
  */
 class Column
 {
-	/** when created by Result */
-	private ?Dibi\Reflector $reflector;
-
-	/** @var array (name, nativetype, [table], [fullname], [size], [nullable], [default], [autoincrement], [vendor]) */
-	private array $info;
-
-
-	public function __construct(?Dibi\Reflector $reflector, array $info)
-	{
-		$this->reflector = $reflector;
-		$this->info = $info;
+	public function __construct(
+		private readonly ?Dibi\Drivers\Engine $reflector,
+		private array $info,
+	) {
 	}
 
 
diff --git a/src/Dibi/Reflection/Database.php b/src/Dibi/Reflection/Database.php
index a6c42efdd..e2d1c0561 100644
--- a/src/Dibi/Reflection/Database.php
+++ b/src/Dibi/Reflection/Database.php
@@ -21,17 +21,14 @@
  */
 class Database
 {
-	private Dibi\Reflector $reflector;
-	private ?string $name;
-
 	/** @var Table[] */
 	private array $tables;
 
 
-	public function __construct(Dibi\Reflector $reflector, ?string $name = null)
-	{
-		$this->reflector = $reflector;
-		$this->name = $name;
+	public function __construct(
+		private readonly Dibi\Drivers\Engine $reflector,
+		private ?string $name = null,
+	) {
 	}
 
 
diff --git a/src/Dibi/Reflection/ForeignKey.php b/src/Dibi/Reflection/ForeignKey.php
index 492a66f32..c7f005b00 100644
--- a/src/Dibi/Reflection/ForeignKey.php
+++ b/src/Dibi/Reflection/ForeignKey.php
@@ -19,16 +19,10 @@
  */
 class ForeignKey
 {
-	private string $name;
-
-	/** @var array of [local, foreign, onDelete, onUpdate] */
-	private array $references;
-
-
-	public function __construct(string $name, array $references)
-	{
-		$this->name = $name;
-		$this->references = $references;
+	public function __construct(
+		private readonly string $name,
+		private readonly array $references,
+	) {
 	}
 
 
diff --git a/src/Dibi/Reflection/Index.php b/src/Dibi/Reflection/Index.php
index 13fe1df78..71e426c49 100644
--- a/src/Dibi/Reflection/Index.php
+++ b/src/Dibi/Reflection/Index.php
@@ -21,13 +21,9 @@
  */
 class Index
 {
-	/** @var array (name, columns, [unique], [primary]) */
-	private array $info;
-
-
-	public function __construct(array $info)
-	{
-		$this->info = $info;
+	public function __construct(
+		private readonly array $info,
+	) {
 	}
 
 
diff --git a/src/Dibi/Reflection/Result.php b/src/Dibi/Reflection/Result.php
index 3cd1dd936..30380ba36 100644
--- a/src/Dibi/Reflection/Result.php
+++ b/src/Dibi/Reflection/Result.php
@@ -20,8 +20,6 @@
  */
 class Result
 {
-	private Dibi\ResultDriver $driver;
-
 	/** @var Column[]|null */
 	private ?array $columns;
 
@@ -29,9 +27,9 @@ class Result
 	private ?array $names;
 
 
-	public function __construct(Dibi\ResultDriver $driver)
-	{
-		$this->driver = $driver;
+	public function __construct(
+		private readonly Dibi\Drivers\Result $driver,
+	) {
 	}
 
 
@@ -80,7 +78,7 @@ protected function initColumns(): void
 	{
 		if (!isset($this->columns)) {
 			$this->columns = [];
-			$reflector = $this->driver instanceof Dibi\Reflector
+			$reflector = $this->driver instanceof Dibi\Drivers\Engine
 				? $this->driver
 				: null;
 			foreach ($this->driver->getResultColumns() as $info) {
diff --git a/src/Dibi/Reflection/Table.php b/src/Dibi/Reflection/Table.php
index b03d4807c..e262add4b 100644
--- a/src/Dibi/Reflection/Table.php
+++ b/src/Dibi/Reflection/Table.php
@@ -25,7 +25,7 @@
  */
 class Table
 {
-	private Dibi\Reflector $reflector;
+	private readonly Dibi\Drivers\Engine $reflector;
 	private string $name;
 	private bool $view;
 
@@ -40,7 +40,7 @@ class Table
 	private ?Index $primaryKey;
 
 
-	public function __construct(Dibi\Reflector $reflector, array $info)
+	public function __construct(Dibi\Drivers\Engine $reflector, array $info)
 	{
 		$this->reflector = $reflector;
 		$this->name = $info['name'];
diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php
index 24f4513d2..45a3b8824 100644
--- a/src/Dibi/Result.php
+++ b/src/Dibi/Result.php
@@ -17,7 +17,7 @@
  */
 class Result implements IDataSource
 {
-	private ?ResultDriver $driver;
+	private ?Drivers\Result $driver;
 
 	/** Translate table */
 	private array $types = [];
@@ -34,7 +34,7 @@ class Result implements IDataSource
 	private array $formats = [];
 
 
-	public function __construct(ResultDriver $driver, bool $normalize = true)
+	public function __construct(Drivers\Result $driver, bool $normalize = true)
 	{
 		$this->driver = $driver;
 		if ($normalize) {
@@ -59,7 +59,7 @@ final public function free(): void
 	 * Safe access to property $driver.
 	 * @throws \RuntimeException
 	 */
-	final public function getResultDriver(): ResultDriver
+	final public function getResultDriver(): Drivers\Result
 	{
 		if ($this->driver === null) {
 			throw new \RuntimeException('Result-set was released from memory.');
diff --git a/src/Dibi/ResultIterator.php b/src/Dibi/ResultIterator.php
index 505489a90..6bac6b570 100644
--- a/src/Dibi/ResultIterator.php
+++ b/src/Dibi/ResultIterator.php
@@ -15,14 +15,13 @@
  */
 class ResultIterator implements \Iterator, \Countable
 {
-	private Result $result;
 	private mixed $row;
 	private int $pointer = 0;
 
 
-	public function __construct(Result $result)
-	{
-		$this->result = $result;
+	public function __construct(
+		private readonly Result $result,
+	) {
 	}
 
 
diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php
index 35d31c71c..5a23df578 100644
--- a/src/Dibi/Translator.php
+++ b/src/Dibi/Translator.php
@@ -15,8 +15,8 @@
  */
 final class Translator
 {
-	private Connection $connection;
-	private Driver $driver;
+	private IConnection $connection;
+	private readonly Drivers\Connection $driver;
 	private int $cursor = 0;
 	private array $args;
 
@@ -30,11 +30,11 @@ final class Translator
 	private HashMap $identifiers;
 
 
-	public function __construct(Connection $connection)
+	public function __construct(IConnection $connection)
 	{
 		$this->connection = $connection;
 		$this->driver = $connection->getDriver();
-		$this->identifiers = new HashMap([$this, 'delimite']);
+		$this->identifiers = new HashMap($this->delimite(...));
 	}
 
 
@@ -88,7 +88,7 @@ public function translate(array $args): string
 									(\?)                            ## 11) placeholder
 								)/xs
 								XX,
-							[$this, 'cb'],
+							$this->cb(...),
 							substr($arg, $toSkip),
 						);
 					if (preg_last_error()) {
@@ -434,7 +434,7 @@ public function formatValue(mixed $value, ?string $modifier): string
 										:(\S*?:)([a-zA-Z0-9._]?)
 									)/sx
 									XX,
-								[$this, 'cb'],
+								$this->cb(...),
 								substr($value, $toSkip),
 							);
 						if (preg_last_error()) {
diff --git a/src/Dibi/dibi.php b/src/Dibi/dibi.php
index 7ae4620f0..58aaa84be 100644
--- a/src/Dibi/dibi.php
+++ b/src/Dibi/dibi.php
@@ -37,7 +37,7 @@
  */
 class dibi
 {
-	public const Version = '5.0.2';
+	public const Version = '6.0-dev';
 
 	/** @deprecated use dibi::Version */
 	public const VERSION = self::Version;
diff --git a/src/Dibi/interfaces.php b/src/Dibi/interfaces.php
deleted file mode 100644
index 3cf336854..000000000
--- a/src/Dibi/interfaces.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi;
-
-
-/**
- * Provides an interface between a dataset and data-aware components.
- */
-interface IDataSource extends \Countable, \IteratorAggregate
-{
-	//function \IteratorAggregate::getIterator();
-	//function \Countable::count();
-}
-
-
-/**
- * Driver interface.
- */
-interface Driver
-{
-	/**
-	 * Disconnects from a database.
-	 * @throws Exception
-	 */
-	function disconnect(): void;
-
-	/**
-	 * Internal: Executes the SQL query.
-	 * @throws DriverException
-	 */
-	function query(string $sql): ?ResultDriver;
-
-	/**
-	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 */
-	function getAffectedRows(): ?int;
-
-	/**
-	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 */
-	function getInsertId(?string $sequence): ?int;
-
-	/**
-	 * Begins a transaction (if supported).
-	 * @throws DriverException
-	 */
-	function begin(?string $savepoint = null): void;
-
-	/**
-	 * Commits statements in a transaction.
-	 * @throws DriverException
-	 */
-	function commit(?string $savepoint = null): void;
-
-	/**
-	 * Rollback changes in a transaction.
-	 * @throws DriverException
-	 */
-	function rollback(?string $savepoint = null): void;
-
-	/**
-	 * Returns the connection resource.
-	 */
-	function getResource(): mixed;
-
-	/**
-	 * Returns the connection reflector.
-	 */
-	function getReflector(): Reflector;
-
-	/**
-	 * Encodes data for use in a SQL statement.
-	 */
-	function escapeText(string $value): string;
-
-	function escapeBinary(string $value): string;
-
-	function escapeIdentifier(string $value): string;
-
-	function escapeBool(bool $value): string;
-
-	function escapeDate(\DateTimeInterface $value): string;
-
-	function escapeDateTime(\DateTimeInterface $value): string;
-
-	function escapeDateInterval(\DateInterval $value): string;
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	function escapeLike(string $value, int $pos): string;
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
-}
-
-
-/**
- * Result set driver interface.
- */
-interface ResultDriver
-{
-	/**
-	 * Returns the number of rows in a result set.
-	 */
-	function getRowCount(): int;
-
-	/**
-	 * Moves cursor position without fetching row.
-	 * @throws Exception
-	 */
-	function seek(int $row): bool;
-
-	/**
-	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool  $type  true for associative array, false for numeric
-	 * @internal
-	 */
-	function fetch(bool $type): ?array;
-
-	/**
-	 * Frees the resources allocated for this result set.
-	 */
-	function free(): void;
-
-	/**
-	 * Returns metadata for all columns in a result set.
-	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
-	 */
-	function getResultColumns(): array;
-
-	/**
-	 * Returns the result set resource.
-	 */
-	function getResultResource(): mixed;
-
-	/**
-	 * Decodes data from result set.
-	 */
-	function unescapeBinary(string $value): string;
-}
-
-
-/**
- * Reflection driver.
- */
-interface Reflector
-{
-	/**
-	 * Returns list of tables.
-	 * @return array of {name [, (bool) view ]}
-	 */
-	function getTables(): array;
-
-	/**
-	 * Returns metadata for all columns in a table.
-	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
-	 */
-	function getColumns(string $table): array;
-
-	/**
-	 * Returns metadata for all indexes in a table.
-	 * @return array of {name, (array of names) columns [, (bool) unique, (bool) primary ]}
-	 */
-	function getIndexes(string $table): array;
-
-	/**
-	 * Returns metadata for all foreign keys in a table.
-	 */
-	function getForeignKeys(string $table): array;
-}
-
-
-/**
- * Dibi connection.
- */
-interface IConnection
-{
-	/**
-	 * Connects to a database.
-	 */
-	function connect(): void;
-
-	/**
-	 * Disconnects from a database.
-	 */
-	function disconnect(): void;
-
-	/**
-	 * Returns true when connection was established.
-	 */
-	function isConnected(): bool;
-
-	/**
-	 * Returns the driver and connects to a database in lazy mode.
-	 */
-	function getDriver(): Driver;
-
-	/**
-	 * Generates (translates) and executes SQL query.
-	 * @throws Exception
-	 */
-	function query(...$args): Result;
-
-	/**
-	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @throws Exception
-	 */
-	function getAffectedRows(): int;
-
-	/**
-	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @throws Exception
-	 */
-	function getInsertId(?string $sequence = null): int;
-
-	/**
-	 * Begins a transaction (if supported).
-	 */
-	function begin(?string $savepoint = null): void;
-
-	/**
-	 * Commits statements in a transaction.
-	 */
-	function commit(?string $savepoint = null): void;
-
-	/**
-	 * Rollback changes in a transaction.
-	 */
-	function rollback(?string $savepoint = null): void;
-}
diff --git a/tests/dibi/Connection.connect.phpt b/tests/dibi/Connection.connect.phpt
index 85cf56b52..01469f4c6 100644
--- a/tests/dibi/Connection.connect.phpt
+++ b/tests/dibi/Connection.connect.phpt
@@ -36,7 +36,7 @@ test('', function () use ($config) {
 
 	Assert::null($conn->getConfig('lazy'));
 	Assert::same($config['driver'], $conn->getConfig('driver'));
-	Assert::type(Dibi\Driver::class, $conn->getDriver());
+	Assert::type(Dibi\Drivers\Connection::class, $conn->getDriver());
 });
 
 
diff --git a/tests/dibi/Fluent.fetch.limit.mssql.phpt b/tests/dibi/Fluent.fetch.limit.mssql.phpt
index 7df79eb10..cc8fdc362 100644
--- a/tests/dibi/Fluent.fetch.limit.mssql.phpt
+++ b/tests/dibi/Fluent.fetch.limit.mssql.phpt
@@ -2,12 +2,14 @@
 
 declare(strict_types=1);
 
+use Dibi\Drivers\SQLSrv\Connection;
+use Dibi\Drivers\SQLSrv\Result;
 use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 
 
-class MockDriver extends Dibi\Drivers\SqlsrvDriver
+class MockDriver extends Connection
 {
 	public function __construct()
 	{
@@ -19,14 +21,14 @@ class MockDriver extends Dibi\Drivers\SqlsrvDriver
 	}
 
 
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		return new MockResult;
 	}
 }
 
 
-class MockResult extends Dibi\Drivers\SqlsrvResult
+class MockResult extends Result
 {
 	public function __construct()
 	{
@@ -57,28 +59,28 @@ $fluent = $conn->select('*')
 	->orderBy('customer_id');
 
 Assert::same(
-	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY'),
 	(string) $fluent,
 );
 
 
 $fluent->fetch();
 Assert::same(
-	'SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t',
+	'SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY',
 	dibi::$sql,
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY'),
 	dibi::$sql,
 );
 $fluent->fetchAll(0, 3);
 Assert::same(
-	reformat('SELECT TOP (3) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 3 ROWS ONLY'),
 	dibi::$sql,
 );
 Assert::same(
-	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY'),
 	(string) $fluent,
 );
 
@@ -86,16 +88,16 @@ Assert::same(
 $fluent->limit(0);
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 0 ROWS ONLY'),
 	dibi::$sql,
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 0 ROWS ONLY'),
 	dibi::$sql,
 );
 Assert::same(
-	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 0 ROWS ONLY'),
 	(string) $fluent,
 );
 
@@ -104,12 +106,12 @@ $fluent->removeClause('limit');
 $fluent->removeClause('offset');
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY'),
 	dibi::$sql,
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY'),
 	dibi::$sql,
 );
 Assert::same(
diff --git a/tests/dibi/PdoDriver.providedConnection.phpt b/tests/dibi/PdoDriver.providedConnection.phpt
index 41b0d5137..e2f50d17a 100644
--- a/tests/dibi/PdoDriver.providedConnection.phpt
+++ b/tests/dibi/PdoDriver.providedConnection.phpt
@@ -14,7 +14,7 @@ function buildPdoDriver(?int $errorMode)
 		$pdo->setAttribute(PDO::ATTR_ERRMODE, $errorMode);
 	}
 
-	new Dibi\Drivers\PdoDriver(['resource' => $pdo]);
+	new Dibi\Drivers\PDO\Connection(['resource' => $pdo]);
 }
 
 
diff --git a/tests/dibi/Result.normalize.phpt b/tests/dibi/Result.normalize.phpt
index 7a08ce9a6..6ecea60a9 100644
--- a/tests/dibi/Result.normalize.phpt
+++ b/tests/dibi/Result.normalize.phpt
@@ -222,14 +222,10 @@ test('', function () {
 	Assert::same(['col' => 1], $result->test(['col' => true]));
 	Assert::same(['col' => 0], $result->test(['col' => false]));
 
-	if (PHP_VERSION_ID < 80000) {
-		Assert::same(['col' => 0], @$result->test(['col' => ''])); // triggers warning since PHP 7.1
-	} else {
-		Assert::exception(
-			fn() => Assert::same(['col' => 0], $result->test(['col' => ''])),
-			TypeError::class,
-		);
-	}
+	Assert::exception(
+		fn() => Assert::same(['col' => 0], $result->test(['col' => ''])),
+		TypeError::class,
+	);
 
 	Assert::same(['col' => 0], $result->test(['col' => '0']));
 	Assert::same(['col' => 1], $result->test(['col' => '1']));
diff --git a/tests/dibi/Sqlsrv.limits.phpt b/tests/dibi/Sqlsrv.limits.phpt
index f70ea1971..cc0c8a1cd 100644
--- a/tests/dibi/Sqlsrv.limits.phpt
+++ b/tests/dibi/Sqlsrv.limits.phpt
@@ -11,82 +11,59 @@ use Tester\Assert;
 require __DIR__ . '/bootstrap.php';
 
 $tests = function ($conn) {
-	$resource = $conn->getDriver()->getResource();
-	$version = is_resource($resource)
-		? sqlsrv_server_info($resource)['SQLServerVersion']
-		: $resource->getAttribute(PDO::ATTR_SERVER_VERSION);
+	// Limit and offset
+	Assert::same(
+		'SELECT 1 OFFSET 10 ROWS FETCH NEXT 10 ROWS ONLY',
+		$conn->translate('SELECT 1 %ofs %lmt', 10, 10),
+	);
 
-	// MsSQL2012+
-	if (version_compare($version, '11.0') >= 0) {
-		// Limit and offset
-		Assert::same(
-			'SELECT 1 OFFSET 10 ROWS FETCH NEXT 10 ROWS ONLY',
-			$conn->translate('SELECT 1 %ofs %lmt', 10, 10),
-		);
+	// Limit only
+	Assert::same(
+		'SELECT 1 OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY',
+		$conn->translate('SELECT 1 %lmt', 10),
+	);
 
-		// Limit only
-		Assert::same(
-			'SELECT 1 OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY',
-			$conn->translate('SELECT 1 %lmt', 10),
-		);
+	// Offset only
+	Assert::same(
+		'SELECT 1 OFFSET 10 ROWS',
+		$conn->translate('SELECT 1 %ofs', 10),
+	);
 
-		// Offset only
-		Assert::same(
-			'SELECT 1 OFFSET 10 ROWS',
-			$conn->translate('SELECT 1 %ofs', 10),
-		);
+	// Offset invalid
+	Assert::error(
+		function () use ($conn) {
+			$conn->translate('SELECT 1 %ofs', -10);
+		},
+		Dibi\NotSupportedException::class,
+		'Negative offset or limit.',
+	);
 
-		// Offset invalid
-		Assert::error(
-			function () use ($conn) {
-				$conn->translate('SELECT 1 %ofs', -10);
-			},
-			Dibi\NotSupportedException::class,
-			'Negative offset or limit.',
-		);
+	// Limit invalid
+	Assert::error(
+		function () use ($conn) {
+			$conn->translate('SELECT 1 %lmt', -10);
+		},
+		Dibi\NotSupportedException::class,
+		'Negative offset or limit.',
+	);
 
-		// Limit invalid
-		Assert::error(
-			function () use ($conn) {
-				$conn->translate('SELECT 1 %lmt', -10);
-			},
-			Dibi\NotSupportedException::class,
-			'Negative offset or limit.',
-		);
+	// Limit invalid, offset valid
+	Assert::error(
+		function () use ($conn) {
+			$conn->translate('SELECT 1 %ofs %lmt', 10, -10);
+		},
+		Dibi\NotSupportedException::class,
+		'Negative offset or limit.',
+	);
 
-		// Limit invalid, offset valid
-		Assert::error(
-			function () use ($conn) {
-				$conn->translate('SELECT 1 %ofs %lmt', 10, -10);
-			},
-			Dibi\NotSupportedException::class,
-			'Negative offset or limit.',
-		);
-
-		// Limit valid, offset invalid
-		Assert::error(
-			function () use ($conn) {
-				$conn->translate('SELECT 1 %ofs %lmt', -10, 10);
-			},
-			Dibi\NotSupportedException::class,
-			'Negative offset or limit.',
-		);
-	} else {
-		Assert::same(
-			'SELECT TOP (1) * FROM (SELECT 1) t',
-			$conn->translate('SELECT 1 %lmt', 1),
-		);
-
-		Assert::same(
-			'SELECT 1',
-			$conn->translate('SELECT 1 %lmt', -10),
-		);
-
-		Assert::exception(
-			fn() => $conn->translate('SELECT 1 %ofs %lmt', 10, 10),
-			Dibi\NotSupportedException::class,
-		);
-	}
+	// Limit valid, offset invalid
+	Assert::error(
+		function () use ($conn) {
+			$conn->translate('SELECT 1 %ofs %lmt', -10, 10);
+		},
+		Dibi\NotSupportedException::class,
+		'Negative offset or limit.',
+	);
 };
 
 $conn = new Dibi\Connection($config);