diff --git a/.gitattributes b/.gitattributes
index 1cf3eabf..697e6e32 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,32 +1,4 @@
-# Auto-detect text files, ensure they use LF.
-* text=auto eol=lf
+* text=auto
 
-# These files are always considered text and should use LF.
-# See core.whitespace @ https://git-scm.com/docs/git-config for whitespace flags.
-*.php   text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 diff=php
-*.json  text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
-*.test  text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
-*.yml   text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
-
-# Exclude non-essential files from dist
-/.github/ export-ignore
-/docker export-ignore
-/docs export-ignore
-
-.editorconfig export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-/.php-cs-fixer.php export-ignore
-
-/CHANGELOG.md export-ignore
-/CODE_OF_CONDUCT.md export-ignore
-/README.md export-ignore
-/UPGRADE-2.0.md export-ignore
-
-/docker-compose.yaml export-ignore
-/Makefile export-ignore
-/phpunit.xml.dist export-ignore
-/tests/ export-ignore
-
-phpstan.neon export-ignore
-phpstan-baseline.neon export-ignore
+# Always use LF
+core.autocrlf=lf
diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md
deleted file mode 100644
index fbed01eb..00000000
--- a/.github/ISSUE_TEMPLATE/1_Bug_report.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: "\U0001F41B Bug Report"
-about: Report errors and problems
-title: "[bug] "
-labels: Potential Bug
-assignees: ''
-
----
-
-**RollerworksSearch version(s) affected**: x.y.z
-
-**Description**
-<!-- A clear and concise description of the problem. -->
-
-**How to reproduce**
-<!-- Code and/or config needed to reproduce the problem. -->
-
-**Possible Solution**
-<!--- Optional: only if you have suggestions on a fix/reason for the bug -->
-
-**Additional context**
-<!-- Optional: any other context about the problem: log messages, screenshots, etc. -->
diff --git a/.github/ISSUE_TEMPLATE/2_Feature_request.md b/.github/ISSUE_TEMPLATE/2_Feature_request.md
deleted file mode 100644
index c21e7089..00000000
--- a/.github/ISSUE_TEMPLATE/2_Feature_request.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: "\U0001F680 Feature Request"
-about: "I have a suggestion (and may want to implement it \U0001F642)!"
-title: "[Feature] "
-labels: Feature
-assignees: ''
-
----
-
-**Description**
-<!-- A clear and concise description of the new feature. -->
-
-**Example**
-<!-- A simple example of the new feature in action (include PHP code, YAML config, etc.)
-     If the new feature changes an existing feature, include a simple before/after comparison. -->
diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md
deleted file mode 100644
index e4ff6513..00000000
--- a/.github/ISSUE_TEMPLATE/3_Support_question.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: 👩‍🏫 Support Question
-about: Questions about using RollerworksSearch
-labels: Question / Support
-
----
-
-**Description**
-<!-- A clear and concise description of the problem. Also include what you tried, and any code
-snippets if you have them.
-
-Please be patient, it may take some to get a response. Thanks.
-
-Please also note that this project is released with a Contributor Code of Conduct.
-By participating in this project you agree to abide by its terms.
-The Code of Conduct can be found at https://github.com/rollerworks/contributing/blob/master/CODE_OF_CONDUCT.md.
--->
diff --git a/.github/ISSUE_TEMPLATE/4_Security_issue.md b/.github/ISSUE_TEMPLATE/4_Security_issue.md
deleted file mode 100644
index 17772ac4..00000000
--- a/.github/ISSUE_TEMPLATE/4_Security_issue.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: ⛔ Security Issue
-about: Report security issues and problems (PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY)
-
----
-
-⚠ PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.
-
-If you have found a security issue in RollerworksSearch, please send the details to
-security [at] rollerscapes.net and don't disclose it publicly until we can provide a
-fix for it.
-
-**Note:** Please don't blindly send reports about automated tools, make sure the
-reported issue is in fact exploitable. Thanks.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index cdaaddef..00000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,18 +0,0 @@
-| Q             | A
-| ------------- | ---
-| Bug fix?      | yes/no
-| New feature?  | yes/no   <!-- don't forget to update src/**/CHANGELOG.md files -->
-| BC breaks?    | yes/no
-| Deprecations? | yes/no   <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
-| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", if any -->
-| License       | MIT
-
-<!--
-Replace this notice by a short README for your feature/bugfix. This will help people
-understand your PR.
-
-Additionally:
- - Update the docs (for new features) if needed.
- - Always add tests and ensure they pass.
- - Features and deprecations must be submitted against branch main.
--->
diff --git a/.github/composer-config.json b/.github/composer-config.json
deleted file mode 100644
index 3cf84681..00000000
--- a/.github/composer-config.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "config": {
-        "cache-vcs-dir": "/dev/null",
-        "platform-check": false,
-        "preferred-install": {
-            "*": "dist"
-        },
-        "allow-plugins": {
-            "ergebnis/composer-normalize": true,
-            "symfony/flex": true
-        }
-    }
-}
diff --git a/.github/validate-composer-sync.php b/.github/validate-composer-sync.php
deleted file mode 100755
index 14dd694d..00000000
--- a/.github/validate-composer-sync.php
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-if (! file_exists(__DIR__ . '/../vendor/autoload.php')) {
-    throw new RuntimeException('Please first run "composer install" (in the root directory) to install dependencies.');
-}
-
-require_once __DIR__ . '/../vendor/autoload.php';
-
-$rootComposer = json_decode(file_get_contents(__DIR__ . '/../composer.json'), true);
-
-if (! isset($rootComposer['require'])) {
-    throw new RuntimeException('Root composer.json does not contain a "require" section.');
-}
-
-$finder = new Symfony\Component\Finder\Finder();
-$finder
-    ->in(__DIR__ . '/../lib')
-    ->exclude('Tests')
-    ->exclude('vendor')
-    ->name('composer.json')
-    ->files()
-;
-
-$messages = [];
-
-foreach ($finder as $file) {
-    $composerFile = json_decode(file_get_contents($file->getPathname()), true);
-    $messages[$fileName = $file->getRelativePathname()] = [];
-
-    if (! isset($composerFile['require'])) {
-        $messages[$fileName][] = sprintf('Composer file "%s" does not contain a "require" section.', $file->getRelativePathname());
-
-        continue;
-    }
-
-    $packages = array_merge($composerFile['require'], $composerFile['require-dev'] ?? []);
-
-    foreach ($packages as $package => $version) {
-        if (str_starts_with($package, 'rollerworks/search')) {
-            continue;
-        }
-
-        if (! isset($rootComposer['require'][$package]) && ! isset($rootComposer['require-dev'][$package])) {
-            $messages[$fileName][] = sprintf('Package "%s" is missing in root composer.json.', $package);
-
-            continue;
-        }
-
-        $rootPackageVersion = $rootComposer['require'][$package] ?? $rootComposer['require-dev'][$package];
-
-        if ($rootPackageVersion !== $version) {
-            $messages[$fileName][] = sprintf(
-                'Package "%s" has different constraints than root composer.json ("%s" vs "%s").',
-                $package,
-                $version,
-                $rootPackageVersion,
-            );
-        }
-    }
-}
-
-$hasErrors = false;
-
-echo \PHP_EOL . 'Validating if split-package composer.json files are in-sync with root composer.json...' . \PHP_EOL;
-echo '======================================================================================' . \PHP_EOL . \PHP_EOL;
-
-foreach ($messages as $fileName => $errors) {
-
-    echo sprintf('Composer file "lib/%s"', $fileName);
-
-    if ($errors) {
-        $hasErrors = true;
-
-        echo ' [FAIL]' . \PHP_EOL . ' - ' . implode(\PHP_EOL . ' - ', $errors) . \PHP_EOL;
-    } else {
-        echo ' [OK]' . \PHP_EOL;
-    }
-
-    echo \PHP_EOL;
-}
-
-exit($hasErrors ? 1 : 0);
diff --git a/.github/workflows/composer-validate.yaml b/.github/workflows/composer-validate.yaml
deleted file mode 100644
index 6a569cd7..00000000
--- a/.github/workflows/composer-validate.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: Composer Validate
-
-on:
-    push:
-        paths:
-            - 'composer.json'
-            - '**/composer.json'
-    pull_request:
-        paths:
-            - 'composer.json'
-            - '**/composer.json'
-
-concurrency:
-    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-    cancel-in-progress: true
-
-permissions:
-    contents: read
-
-jobs:
-    composer-sync:
-        name: 'Composer package-split synchronization validation'
-        runs-on: ubuntu-24.04
-        env:
-            php-version: '8.4'
-
-        steps:
-            -
-                name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ env.php-version }}
-                    ini-values: "memory_limit=-1"
-                    coverage: none
-
-            -
-                name: Checkout target branch
-                uses: actions/checkout@v6
-
-            -
-                name: 'Install dependencies'
-                run: |
-                    COMPOSER_HOME="$(composer config home)"
-                    ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
-                    composer global require -q "ergebnis/composer-normalize"
-                    composer install --no-progress
-
-            -
-                name: 'Normalized composer.json'
-                run: |
-                    echo "composer.json"
-                    composer validate
-                    
-                     find lib -mindepth 2 -type f -name composer.json -printf '%h\n' | while read -r FILE_PATH; do
-                         echo "$FILE_PATH/composer.json"
-                         composer validate --working-dir=$FILE_PATH
-                         composer normalize --working-dir=$FILE_PATH
-                     done
-
-            -
-                name: Run Split Packages composer.json Lint
-                run: php .github/validate-composer-sync.php
diff --git a/.github/workflows/inspector-bot.yaml b/.github/workflows/inspector-bot.yaml
deleted file mode 100644
index 59f28123..00000000
--- a/.github/workflows/inspector-bot.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: CS
-
-on:
-    pull_request:
-
-permissions:
-    contents: read
-
-jobs:
-    call-inspector-bot:
-        name: InspectorBot
-        uses: rollerscapes/inspector-bot/.github/workflows/inspector-bot.yml@main
-        with:
-            package: RollerworksSearch
-            check_license: true
-
diff --git a/.github/workflows/phpstan.yaml b/.github/workflows/phpstan.yaml
deleted file mode 100644
index d61d1b41..00000000
--- a/.github/workflows/phpstan.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: PHPStan
-
-on:
-    pull_request:
-        branches:
-            - main
-
-defaults:
-    run:
-        shell: bash
-
-concurrency:
-    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-    cancel-in-progress: true
-
-permissions:
-    contents: read
-
-jobs:
-    phpstan:
-        name: PHPStan
-        runs-on: ubuntu-24.04
-
-        env:
-            php-version: '8.2'
-        steps:
-            -
-                name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ env.php-version }}
-                    ini-values: "memory_limit=-1"
-                    coverage: none
-
-            -
-                name: Checkout target branch
-                uses: actions/checkout@v6
-                with:
-                    ref: ${{ github.base_ref }}
-
-            -
-                name: Checkout PR
-                uses: actions/checkout@v6
-
-            -
-                name: Install dependencies
-                run: |
-                    COMPOSER_HOME="$(composer config home)"
-                    ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
-                    composer install --no-progress --ansi --no-plugins
-
-            -
-                name: Generate PHPStan baseline
-                run: |
-                    git checkout composer.json
-                    git checkout -m ${{ github.base_ref }}
-                    vendor/bin/phpstan analyze --generate-baseline --allow-empty-baseline --no-progress
-                    git checkout -m FETCH_HEAD
-
-            -
-                name: PHPStan
-                run: |
-                    vendor/bin/phpstan analyze --no-progress --error-format=github
-
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
deleted file mode 100644
index 46d51f9a..00000000
--- a/.github/workflows/unit-tests.yml
+++ /dev/null
@@ -1,114 +0,0 @@
-name: CI
-on:
-    push:
-        branches:
-            - main
-    pull_request:
-        branches:
-            - main
-env:
-    ES_HTTP_PORT: '59200'
-    ELASTICSEARCH_HOST: 'localhost'
-    ELASTICSEARCH_PORT: '59200'
-    DB_HOST: 127.0.0.1
-
-jobs:
-
-    test:
-
-        name: 'PHPUnit with PHP ${{ matrix.php-version }} / Symfony ${{ matrix.symfony-version }}'
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: false
-            matrix:
-                include:
-                    -
-                        php-version: '8.2'
-                        composer-options: '--prefer-stable'
-                        symfony-version: '^6.4'
-
-                    -
-                        php-version: '8.2'
-                        composer-options: '--prefer-stable'
-                        symfony-version: '^7.4'
-
-                    -
-                        php-version: '8.4'
-                        composer-options: '--prefer-stable'
-                        symfony-version: '^7.4'
-
-                    -
-                        php-version: '8.4'
-                        composer-options: '--prefer-stable'
-                        symfony-version: '^8.0'
-
-        services:
-            # https://docs.docker.com/samples/library/postgres/
-            postgres:
-                image: postgres:9.6
-                env:
-                    POSTGRES_USER: postgres
-                    POSTGRES_PASSWORD: postgres
-                    POSTGRES_DB: search_tests
-                ports:
-                    - "5432:5432"
-                options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
-
-            # https://docs.docker.com/samples/library/mysql/
-            mariadb-server:
-                image: mariadb:10.3
-                env:
-                    MYSQL_DATABASE: search_tests
-                    MYSQL_ROOT_PASSWORD: nope
-                ports:
-                    - "3306:3306"
-                options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
-            # https://hub.docker.com/_/elasticsearch/
-            elasticsearch:
-                image: elasticsearch:7.3.0
-                ports:
-                    - "59200:9200"
-                options: -e="discovery.type=single-node" -e="xpack.security.enabled=false" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=10
-
-        steps:
-            -
-                name: Check the Elasticsearch connection from runner host
-                run: |
-                    curl -fsSL "http://localhost:$ES_HTTP_PORT"
-                    curl -fsSL "http://localhost:$ES_HTTP_PORT/_cluster/health?pretty"
-
-            -
-                name: Checkout
-                uses: actions/checkout@v4
-
-            -
-                name: 'Set up PHP'
-                uses: 'shivammathur/setup-php@v2'
-                with:
-                    php-version: '${{ matrix.php-version }}'
-                    extensions: mbstring, xml, ctype, iconv, intl, bcmath, pdo_sqlite, dom, filter, json, pgsql, pdo, pdo_pgsql, pdo_mysql
-                    coverage: 'xdebug'
-                env:
-                    update: true
-
-            -
-                name: 'Install dependencies'
-                env:
-                    COMPOSER_OPTIONS: '${{ matrix.composer-options }}'
-                    SYMFONY_REQUIRE: '${{ matrix.symfony-version }}'
-                run: |
-                    rm -f composer.lock
-                    composer global config --no-plugins allow-plugins.symfony/flex true
-                    composer global require --no-progress --no-scripts --no-plugins symfony/flex
-                    composer update --no-progress --no-interaction --optimize-autoloader $COMPOSER_OPTIONS
-
-            -
-                name: Run Tests
-                env:
-                    SYMFONY_DEPRECATIONS_HELPER: weak
-                run: |
-                    vendor/bin/phpunit --configuration phpunit.xml.dist
-                    vendor/bin/phpunit --configuration phpunit/pgsql.xml
-                    vendor/bin/phpunit --configuration phpunit/mysql.xml
diff --git a/.gitignore b/.gitignore
index 422feebc..fd941b02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,13 @@
-composer.lock
+/phpunit.xml
+/composer.lock
+*.phar
 /vendor/
-/var
+/.php_cs.cache
+build/**
+*.phar
+/var/
 
-phpunit.xml
 .phpunit.result.cache
-.phpunit.cache/
-.phpunit
-
-.php-cs-fixer.cache
-
 /lib/Symfony/SearchBundle/Tests/Functional/Application/var/
-/lib/Symfony/SearchBundle/Tests/Functional/Application/config/reference.php
+.php-cs-fixer.cache
+lib/Symfony/SearchBundle/Tests/Functional/Application/config/reference.php
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
deleted file mode 100644
index 5543b94e..00000000
--- a/.php-cs-fixer.dist.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-$header = <<<EOF
-This file is part of the RollerworksSearch package.
-
-(c) Sebastiaan Stok <s.stok@rollerscapes.net>
-
-This source file is subject to the MIT license that is bundled
-with this source code in the file LICENSE.
-EOF;
-
-/** @var \Symfony\Component\Finder\Finder $finder */
-$finder = PhpCsFixer\Finder::create();
-$finder
-    ->in([__DIR__.'/lib'])
-    ->notPath('Symfony/SearchBundle/Tests/Functional/Application/var')
-    ->exclude('Fixtures')
-;
-
-$config = new PhpCsFixer\Config();
-$config
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@DoctrineAnnotation' => true,
-        '@PER-CS2x0' => true,
-        '@PER-CS2x0:risky' => true,
-        '@PHP8x1Migration' => true,
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-        '@PHPUnit8x4Migration:risky' => true,
-        'attribute_empty_parentheses' => true, // By PER2.0
-        'blank_line_before_statement' => [
-            'statements' => [
-                'break',
-                'case',
-                'continue',
-                'declare',
-                'default',
-                'do',
-                'exit',
-                'for',
-                'foreach',
-                'goto',
-                'if',
-                'include',
-                'include_once',
-                'require',
-                'require_once',
-                'return',
-                'switch',
-                'throw',
-                'try',
-                'while',
-                'yield_from',
-            ],
-        ],
-        'blank_line_between_import_groups' => false, // Too much noise
-        'comment_to_phpdoc' => ['ignored_tags' => ['codeCoverageIgnoreStart', 'codeCoverageIgnoreEnd']],
-        'concat_space' => ['spacing' => 'one'], // Clarity for concatenations
-        'class_attributes_separation' => [
-            'elements' => [ // Keep spaces to a minimum
-                'const' => 'none',
-                'method' => 'one',
-                'property' => 'none',
-                'trait_import' => 'none',
-                'case' => 'one'
-            ],
-        ],
-        'general_phpdoc_annotation_remove' => ['annotations' => ['since', 'package', 'subpackage', 'date']], // Keep author for borrowed code
-        //'header_comment' => ['header' => $header], // Needs configuring per project
-        'mb_str_functions' => true,
-        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline', 'attribute_placement' => 'standalone', 'after_heredoc' => true],
-        'method_chaining_indentation' => false, // Too fragile for general usage
-        'multiline_promoted_properties' => true, // By PER2.0
-        'not_operator_with_successor_space' => true,
-        'phpdoc_line_span' => ['property' => 'single', 'const' => 'single'],
-        'phpdoc_param_order' => true,
-        'phpdoc_tag_casing' => true,
-        'regular_callable_call' => true,
-        'ordered_class_elements' => false, // Use the depth-first ordering approach
-        'ordered_imports' => [
-            'imports_order' => ['const', 'class', 'function'],
-        ],
-        'php_unit_internal_class' => true,
-        'php_unit_method_casing' => ['case' => 'snake_case'], // it_[does]_[something]
-        'php_unit_strict' => false, // Cannot do this globally
-        'php_unit_test_annotation' => ['style' => 'annotation'],
-
-        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'], // Temporary
-        'php_unit_test_class_requires_covers' => false,
-
-
-        'phpdoc_to_comment' => false, // PHPStan needs these
-        'phpdoc_var_without_name' => false, // PHPStan needs these
-        'single_line_throw' => false, // Long messages might be used
-        'strict_comparison' => false, // Cannot do this globally
-        'types_spaces' => ['space' => 'single'], // Clarity for separate classes
-        'yoda_style' => ['equal' => false, 'identical' => false], // Yoda style is not used
-        'header_comment' => ['header' => $header],
-    ])
-    ->setFinder($finder);
-
-return $config;
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
deleted file mode 100644
index 084fdd91..00000000
--- a/.readthedocs.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Read the Docs configuration file for Sphinx projects
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-version: 2
-
-build:
-    os: ubuntu-22.04
-    tools:
-        python: "2.7"
-
-sphinx:
-    configuration: docs/conf.py
-
-# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
-python:
-    install:
-        -
-            requirements: docs/_build/.requirements.txt
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 57617476..00000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making 
-participation in our project and our community a harassment-free experience for everyone, regardless of age, 
-body size, disability, ethnicity, gender identity and expression, level of experience, nationality, 
-personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected 
-to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, 
-wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily 
-or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing 
-the project or its community. 
-
-Examples of representing a project or community include using an official project  e-mail address, posting via 
-an official social media account, or acting as an appointed representative at an online or offline event. 
-
-Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project 
-team at conduct@rollerscapes.net.
-
-The project team will review and investigate all complaints, and will respond in a way that it deems appropriate 
-to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of 
-an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary 
-or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, 
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 7d4bb1bc..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012-present Sebastiaan Stok
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 33f67fef..00000000
--- a/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-QA_DOCKER_IMAGE=jakzal/phpqa:1.96.4-php8.1-alpine
-QA_DOCKER_COMMAND=docker run --init -t --rm --user "$(shell id -u):$(shell id -g)" --volume /tmp/tmp-phpqa-$(shell id -u):/tmp --volume "$(shell pwd):/project" --workdir /project ${QA_DOCKER_IMAGE}
-
-dist: install cs-full phpstan test
-ci: cs-full-check phpstan test
-lint: cs-full-check phpstan
-
-install:
-	docker-compose run --rm php make in-docker-install
-
-install-dev:
-	docker-compose run --rm php make in-docker-install-dev
-
-install-lowest:
-	docker-compose run --rm php make in-docker-install-lowest
-
-test: docker-up
-	docker-compose run --rm php make in-docker-test
-	@$(MAKE) docker-down
-
-test-coverage: ensure docker-up
-	mkdir -p build/logs build/cov
-	docker-compose run --rm php make in-docker-test-coverage
-	sh -c "${QA_DOCKER_COMMAND} phpdbg -qrr /usr/local/bin/phpcov merge --clover build/logs/clover.xml build/cov"
-	@$(MAKE) docker-down
-
-phpstan:
-	php -d memory_limit=1G vendor/bin/phpstan analyse
-
-cs: ensure
-	sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --diff"
-
-cs-full: ensure
-	sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --using-cache=no --diff"
-
-cs-full-check: ensure
-	sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --using-cache=no --diff --dry-run"
-
-##
-# Special operations
-##
-
-docker-up:
-	docker-compose up -d
-	# wait for ES to boot
-	until curl -s -X GET "http://localhost:59200/" > /dev/null; do sleep 1; done
-
-docker-down:
-	docker-compose down
-
-docs:
-	docker build docs/ -t rollerworks-search-docs
-	@echo 'The documentation is availbe at http://localhost:8000 (to end the process use Ctrl+C)'
-	docker run --rm -p 8000:80 rollerworks-search-docs:latest
-
-##
-# Private targets
-##
-in-docker-install:
-	rm -f composer.lock
-	composer install --no-progress --no-interaction --no-suggest --optimize-autoloader --ansi
-
-in-docker-install-dev:
-	rm -f composer.lock
-	cp composer.json _composer.json
-	composer config minimum-stability dev
-	composer update --no-progress --no-interaction --no-suggest --optimize-autoloader --ansi
-	mv _composer.json composer.json
-
-in-docker-install-lowest:
-	rm -f composer.lock
-	composer update --no-progress --no-suggest --prefer-stable --prefer-lowest --optimize-autoloader --ansi
-
-in-docker-test:
-	SYMFONY_DEPRECATIONS_HELPER=weak vendor/bin/phpunit
-	SYMFONY_DEPRECATIONS_HELPER=weak vendor/bin/phpunit --configuration phpunit/pgsql.xml
-	SYMFONY_DEPRECATIONS_HELPER=weak vendor/bin/phpunit --configuration phpunit/mysql.xml
-
-in-docker-test-coverage:
-	SYMFONY_DEPRECATIONS_HELPER=weak phpdbg -qrr vendor/bin/phpunit --coverage-php build/cov/coverage-phpunit.cov
-	SYMFONY_DEPRECATIONS_HELPER=weak phpdbg -qrr vendor/bin/phpunit --configuration phpunit/pgsql.xml --coverage-php build/cov/coverage-phpunit-pgsql.cov
-	SYMFONY_DEPRECATIONS_HELPER=weak phpdbg -qrr vendor/bin/phpunit --configuration phpunit/mysql.xml --coverage-php build/cov/coverage-phpunit-mysql.cov
-
-ensure:
-	mkdir -p ${HOME}/.composer /tmp/tmp-phpqa-$(shell id -u)
-
-.PHONY: install install-dev install-lowest phpstan cs cs-full cs-full-checks docker-up down-down
-.PHONY: in-docker-install in-docker-install-dev in-docker-install-lowest in-docker-test in-docker-test-coverage docs
diff --git a/README.md b/README.md
deleted file mode 100644
index 027cbde4..00000000
--- a/README.md
+++ /dev/null
@@ -1,171 +0,0 @@
-RollerworksSearch
-=================
-
-## About RollerworksSearch
-
-RollerworksSearch is a powerful search-system for PHP.
-Created to make searching in a PHP powered application as simple and fast as possible.
-
-Whether you want to search for users in your SQL database, want to provide a 
-powerful search system for searching products using an ElasticSearch back-end, 
-or are looking for a way to abstract filtering for a reporter.
-
-> [!WARNING]
-> Elasticsearch support is [currently broken](https://github.com/rollersearch/search/issues/347)
-> and might not be fixed until the next stable release (after v2.0.0).
-
-### How about complex data structures?
-
-A complex data is structure is no problem, say your customer data is stored
-in the "customer" table, the "invoices" data is stored in it's own table, and
-the details of the invoices have there own table.
-
-Instead of writing a very verbose SQL query, your users can use the easy to learn
-StringQuery syntax:
-
-> `invoice-price: > $20.00; invoice-row-label: ~*"my cool product"; customer-type: !consumer`.
-
-You just searched in three relational tables using a single condition with a
-user-friendly syntax. And that is just the start, RollerworksSearch can work with
-any locale, custom input format, or storage system.
-
-Search conditions can be as simple or complex as you need them to be.
-Including grouping and nesting for the best possible result.
-
-## Features
-
-RollerworksSearch provides you with most of the features you can expect
-from a search system, including:
-
-* Localized input processing using the StringQuery format;
-* User-friendly format validation;
-* Integration with API-Platform;
-* Integration for Symfony 6.4 and up (Symfony Flex supported).
-
-And support for the most poplar storage systems.
-
-* [Doctrine DBAL](https://github.com/rollerworks/search-doctrine-dbal)
-* [Doctrine ORM](https://github.com/rollerworks/search-doctrine-orm)
-* [ElasticSearch](https://github.com/rollerworks/search-elasticsearch)
-
-## Installation and usage
-
-*Please ignore the instructions below if your use a framework integration.*
-
-[Read the Documentation][4] for complete instructions and information.
-
-Install the RollerworksSearch "core" library using [Composer][1]:
-
-```bash
-$ composer install rollerworks/search
-```
-
-And create the `SearchFactory` to get started.
-
-```php
-use Rollerworks\Component\Search\Searches;
-use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\ChoiceType;
-use Rollerworks\Component\Search\Input\ErrorPathTranslator;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-
-// The factory is reusable, you create it only once.
-$searchFactory = Searches::createSearchFactory();
-
-// Create a fieldset to inform the system about your configuration.
-// Usually you will have a FieldSet for each data structure (users, invoices, etc).
-$userFieldSet = $searchFactory->createFieldSetBuilder()
-    ->add('firstName', TextType::class)
-    ->add('lastName', TextType::class)
-    ->add('age', IntegerType::class)
-    ->add('type', ChoiceType::class, [
-        'choices' => ['Consumer' => 'c', 'Business' => 'b'],
-    ])
-    ->getFieldSet('users');
-    
-// Now lets process a string query.
-// Tip: the input processor is reusable.
-$inputProcessor = new StringQueryInput();
-
-try {
-    // The ProcessorConfig allows to limit the amount of values, groups
-    // and maximum nesting level. The defaults should be restrictive enough
-    // for most situations.
-    $processorConfig = new ProcessorConfig($userFieldSet);
-    
-    // The `process` method processes the input and produces 
-    // a valid SearchCondition (or throws an exception when something is wrong).
-    $condition = $inputProcessor->process('firstName: sebastiaan, melany;');
-} catch (InvalidSearchConditionException $e) {
-    // Each error message can be transformed to a localized version
-    // using the Symfony Translator contract.
-    
-    $translator = ...; // \Symfony\Contracts\Translation\TranslatorInterface
-    
-    // Note: The ErrorPathHumanizer only works for the `StringQueryInput` input processor.
-    $errorPathHumanizer = new ErrorPathTranslator($translator);
-    
-    foreach ($e->getErrors() as $error) {
-       echo '<span>' $errorPathHumanizer->humanize($error->path) .  ' </span><span>' . htmlentities($error->trans($translator), ENT_COMPAT | ENT_IGNORE, 'UTF-8') '</span>' . PHP_EOL;
-    }
-}
-```
-
-That's it! The `$condition` contains the SearchCondition in a normalized
-data format which can be used in a condition processor (like ElasticSearch), 
-or be exported into another format like JSON for easier usage in a URL.
-
-> **Note:** RollerworksSearch is composed of multiple separate packages (to keep the architecture slim), 
-> the "core" package provides everything you need to get started.
->
-> Searching a (document) storage requires the installation of additional packages. 
-
-### What about validation?
-
-Each field type ensures the value is transformed to the correct format,
-either a date input is automatically transformed to a `DateTimeImuttable` object.
-
-A field that expects an integer will fail when the provided input is not an integer.
-
-To enforce more strict constraints like a maximum amount for an integer field you
-can use the [Symfony Validator extension](https://rollerworkssearch.readthedocs.io/en/latest/integration/symfony_validator.html).
-
-## Resources
-
-* [Read the Documentation][4]
-* RollerworksSearch is maintained under the [Semantic Versioning guidelines](http://semver.org/)
-
-## Who is behind RollerworksSearch?
-
-RollerworksSearch is brought to you by [Sebastiaan Stok](https://github.com/sstok).
-
-## License
-
-RollerworksSearch is released under the [MIT license](LICENSE).
-
-The types and extensions are largely inspired on the Symfony Form Component, 
-and contain a big amount of code from the Symfony project.
-
-## Support
-
-Use the issue tracker to create a new [support question](https://github.com/rollerworks/search/issues/new?labels=Question+%2F+Support&template=3_Support_question.md).
-
-**Note:** Please be patient, it might take some time before your question is answered. **Do not ping the
-maintainers.**
-
-## Contributing
-
-This is an open source project. If you'd like to contribute,
-please read the [Contributing Guidelines][2]. If you're submitting
-a pull request, please follow the guidelines in the [Submitting a Patch][3] section.
-
-**Note:** RollerworksSearch is developed in a monolith repository, do not open pull request
-against repositories marked as `[READ-ONLY]`, thank you.
-
-[1]: https://getcomposer.org/doc/00-intro.md
-[2]: https://github.com/rollerworks/contributing
-[3]: https://contributing.readthedocs.org/en/latest/code/patches.html
-[4]: http://rollerworkssearch.readthedocs.org/en/latest/
diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md
deleted file mode 100644
index 25775274..00000000
--- a/UPGRADE-2.0.md
+++ /dev/null
@@ -1,397 +0,0 @@
-UPGRADE FROM 2.0-BETA13 to 2.0-BETA14
-=====================================
-
-### Core
-
- * The `SearchOrder` now expects an associative array of field-names and direction.
-   Passing a `ValuesGroup` is deprecated, and will be removed in v3.0.
-
-UPGRADE FROM 2.0-BETA10 to 2.0-BETA13
-=====================================
-
-### Core
-
-  * The `Rollerworks\Component\Search\Extension\Core\DataTransformer\IntegerToStringTransformer`
-    deprecated usage of accepting a `null` value for `$roundingMode`, use `IntegerToStringTransformer::ROUND_DOWN` instead.
-
-  * The `Rollerworks\Component\Search\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer`
-    deprecated usage of accepting a `null` value for `$grouping` and `$roundingMode`
-    use `NumberToLocalizedStringTransformer::ROUND_DOWN` for `$roundingMode` and `false` for `$grouping` instead.
-
-UPGRADE FROM 2.0-BETA9 to 2.0-BETA10
-====================================
-
-### Api-Platform
-
- * Support for Api-Platform 2.4 was dropped, you need at least 4.2.
-   Older beta packages can be used if support is required.
-
-UPGRADE FROM 2.0-BETA6 to 2.0-BETA9
-===================================
-
-### Doctrine DBAL/ORM
-
- * Passing `null` as type to `ConversionHints::createParamReferenceFor()` is deprecated 
-   and will no longer be accepted in v3.0.0, pass a type name instead. 
-
-   For now passing `null` defaults to "string", and might fail under specific conditions.
-
-UPGRADE FROM 2.0-BETA5 to 2.0-BETA6
-===================================
-
- * The Symfony Input Validator no longer validates a `PatternMatch` value type.
-   Set the `pattern_match_constraints` option to validate this specific type, with
-   it's own constraints.
-
-   **Note:** A PatternMatch will likely not contain a full value, for more advanced
-   validating it's best to create your own input validator.
-
-UPGRADE FROM 2.0-BETA4 to 2.0-BETA5
-===================================
-
- * Translation ids have been changed to better fit there context, see translation in
-   "lib/Core/Resources/translations" for new ids.
-
-UPGRADE FROM 2.0-BETA2 to 2.0-BETA3
-===================================
-
- * Support for PHP < 8.1 was dropped.
-
- * Support for Symfony 5 was dropped.
-
- * Support for Api-Platform 2.4 was dropped, 2.0-BETA2 of the components 
-   still supports all newer versions of RollerworksSearch.
-
-### Doctrine DBAL 
-
-  * Support for using a query as string was removed, a DBAL QueryBuilder
-    is now required to be passed to the generator.
-
-  * The `DoctrineDbalFactory::createCachedConditionGenerator()` method now 
-    requires a DBAL QueryBuilder and SearchCondition is provided instead
-    of a ``ConditionGenerator`` instance.
- 
-  * The `ConditionGenerator` now longer provides access to the generated
-    condition and parameters. These are applied automatically when calling `apply()`.
-
-    ```php
-    // Doctrine\DBAL\Query\QueryBuilder object
-    $qb = $connection->createQueryBuilder();
-
-    // Rollerworks\Component\Search\SearchCondition object
-    $searchCondition = ...;
-
-    $conditionGenerator = $doctrineDbalFactory->createConditionGenerator($qb, $searchCondition);
-
-    // Set fields mapping
-    // ....
-
-    // Apply the condition (with ordering, if any) to the QueryBuilder
-    $conditionGenerator->apply();
-
-    // Get all the records
-    // See http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/data-retrieval-and-manipulation.html#data-retrieval
-    $result = $qb->execute();
-    ````
-    
-### Doctrine DBAL/ORM
-
- * Doctrine mapping type as object is deprecated and will no longer work in 3.0,
-   use a type-name as string instead.
-
-UPGRADE FROM 2.0-BETA1 to 2.0-BETA2
-===================================
-
- * Support for PHP < 7.4 was dropped.
- 
- * Support for Symfony 4 was dropped.
-
- * Support for PHPUnit < 9.5 was dropped.
-
-### Elasticsearch
-
- * Support for Elastica 6 was dropped.
-
- * Support for Elasticsearch 6 was dropped.
-
-   _See the upgrade instructions of Elasticsearch itself for more information._
-
-### Doctrine ORM
-
- * Support for passing a `Doctrine\ORM\Query` object in the generators was removed, 
-   pass a `Doctrine\ORM\QueryBuilder` object instead.
-   
-  _This BC change was required to make applying of result-ordering possible without worrying
-   to much about details and edge-cases._
-
- * The methods `getWhereClause()` and `getParameters()` on the ConditionGenerators were removed.
-   _It's still possible to generate a stand-alone where-clause by using the `DqlConditionGenerator` directly, 
-    but this is not officially supported nor documented._
-
- * The `createCachedConditionGenerator` of `DoctrineOrmFactory` now expects a
-   a `QueryBuilder` and `SearchCondition` are provided instead of a ConditionGenerator.
-
-   Before:
-   
-      ```php
-      $generator = $ormFactory->createConditionGenerator($query, $searchCondition);
-      $generator = $ormFactory->createCachedConditionGenerator($generator, 60 * 60);
-      ```
-   
-   Now:
-   
-      ```php
-      $generator = $ormFactory->createCachedConditionGenerator($query, $searchCondition, 60 * 60);
-      ```
-   
- * The `updateQuery()` method on the ConditionGenerators was renamed to `apply()` and no 
-   longer supports a prepend for the query, as the query must now always be a `QueryBuilder`.
-
-UPGRADE FROM 2.0-ALPHA23 to 2.0-ALPHA24
-=======================================
-
- * The `html5` option for the `DateTimeType` has been removed.
-   Only the RFC3339 for the norm-input format is supported now.
-
-UPGRADE FROM 2.0-ALPHA21 to 2.0-ALPHA23
-=======================================
-
- * The `$forceNew` argument in `SearchConditionBuilder::field()` is deprecated and will
-   be removed in v2.0.0-BETA1, use `overwriteField()` instead.
-    
-### Doctrine DBAL
-
- * Support for SQLite was removed in Doctrine DBAL.
-
- * Values are no longer embedded but are now provided as parameters,
-   make sure to bind these before executing the query.
-   
-   Before:
-   
-   ```php
-   $whereClause = $conditionGenerator->getWhereClause();
-   $statement = $connection->execute('SELECT * FROM tableName '.$whereClause);
-   
-   $rows = $statement->fetchAll(\PDO::FETCH_ASSOC);
-   ```
-   
-   Now:
-   
-   ```php
-   $whereClause = $conditionGenerator->getWhereClause();
-   $statement = $connection->prepare('SELECT * FROM tableName '.$whereClause);
-   
-   $conditionGenerator->bindParameters($statement);
-
-   $statement->execute();
-   
-   $rows = $statement->fetchAll(\PDO::FETCH_ASSOC);
-   ```
-   
- * The `Rollerworks\Component\Search\Doctrine\Dbal\ValueConversion::convertValue()` method
-   now expects a `string` type is returned, and requires a return-type.
-   
- * Conversion strategies was changed to return a different column/value
-   statement rather than keeping all strategies cached.
-   
-   Use the `ConversionHint` new parameters and helper method to determine
-   the value for the Column.
-
-### Doctrine ORM
-   
- * Support for Doctrine ORM NativeQuery was removed, use the Doctrine DBAL
-   condition-generator instead for this usage.
-    
- * Values are no longer embedded but are now provided as parameters,
-   make sure to bind these before executing the query.
-   
-   Note: Using the `updateQuery()` method already performs the binding process.
-   
- * Doctrine DBAL conversions are no longer applied, instead the Doctrine ORM
-   integration now has it's own conversion API with a much more powerful integration.
-   
-   **Note:** Any functions used in the conversion-generated DQL must be registered
-   with the EntityManager configuration, refer to the Doctrine ORM manual for details. 
-   
-
-UPGRADE FROM 2.0-ALPHA19 to 2.0-ALPHA20
-=======================================
-
- * The DataTransformers have been synchronized with the Symfony
-   versions, which might cause some minor BC breakages.
-   
-   * The `BaseNumberTransformer` has been removed, 
-     extend from `NumberToLocalizedStringTransformer` instead.
-   * The `pattern` option of `DateTimeType` now only affects the
-     view transformer, the norm transformer will use either the `DateTimeToRfc3339Transformer`
-     or `DateTimeToHtml5LocalDateTimeTransformer` when the `html5` option is set to true.
-   * The `precision` option of the `NumberType` has been renamed to `scale`.
-   * The `IntegerType` no longer accepts float values.
-
-
-UPGRADE FROM 2.0-ALPHA12 to 2.0-ALPHA13
-=======================================
-
- * The ArrayInput processor has been removed.
- 
- * ApiPlatform SearchConditionListener no longer supports array-input. 
-   Use JSON or the NormStringQuery input-format instead.
-   
- * The default restriction values of `ProcessorConfig` have been changed
-   to provide a better default;
-   
-   * Maximum values per field is now 100 (was 1000)
-   * Maximum number of groups is now 10 (was 100)
-   * Nesting is now 5 (was 100)
-   
-   Unless you must support a higher number of values 
-   it is advised to not increase these values.
-
-UPGRADE FROM 2.0-ALPHA8 to 2.0-ALPHA12
-======================================
-
-### Core
-
- * The ConditionOptimizers have been removed.
- 
- * The XmlInput processor has been removed.
-
-### Processor
-
- * The SearchProcessor Component has been removed, use an InputProcessor directly.
-   
-   **Before:**
-   
-   ```php
-   $inputProcessorLoader = Loader\InputProcessorLoader::create();
-   $conditionExporterLoader = Loader\ConditionExporterLoader::create();    
-   $processor = new Psr7SearchProcessor($searchFactory, $inputProcessorLoader, $conditionExporterLoader);
-   
-   $request = ...; // A PSR-7 ServerRequestInterface object instance
-   
-   $processorConfig = new ProcessorConfig($userFieldSet);
-   $searchPayload = $processor->processRequest($request, $processorConfig);
-   
-   if ($searchPayload->isChanged() && $searchPayload->isValid()) {
-       header('Location: /search?search='.$searchPayload->searchCode);
-       exit();
-   }
-   
-   if (!$payload->isValid()) {
-       foreach ($payload->messages as $error) {
-          echo (string) $error.PHP_EOL;
-       }
-   }
-   
-   // Notice: This is null when there are errors, when the condition is valid but has
-   // no fields/values this is an empty SearchCondition object.
-   $condition = $payload->searchCondition;
-   ```
-   
-   **After:**
-   
-   ```php
-   // ...
-   
-   $inputProcessor = new StringQueryInput(); // Can be wrapped in a CachingInputProcessor
-   $processorConfig = new ProcessorConfig($fieldSet);
-   
-   $request = ...; // A PSR-7 ServerRequestInterface object instance
-   
-   try {
-       if ($request->getMethod() === 'POST') {
-           $query = $request->getQueryParams()['search'] ?? '';
-           
-           header('Location: /search?search='.$searchPayload->searchCode);
-           exit();
-           
-           // return new RedirectResponse($request->getRequestUri().'?search='.$query);
-       }
-       
-       $query = $request->getParsedBody()['search'] ?? '';
-       $condition = $inputProcessor->process($processorConfig, $query);
-       
-       // Use condition
-   } catch (InvalidSearchConditionException $e) {
-       foreach ($e->getErrors() as $error) {
-          echo (string) $error.PHP_EOL;
-       }
-   }
-   ```
-   
-   **Note:** The ArrayInput processor has been removed, only string-type input
-   formats (StringInput and JsonInput) are supported now.
-
-### ApiPlatform
-
- * The `ApiSearchProcessor` has been removed. Internally the `SearchConditionListener`
-   now handles the user-input and error handling.
- 
- * The `SearchConditionListener` constructor has changed:
- 
-    **Before:**
- 
-    ```
-    SearchFactory $searchFactory
-    SearchProcessor $searchProcessor
-    UrlGeneratorInterface $urlGenerator
-    ResourceMetadataFactory $resourceMetadataFactory
-    EventDispatcherInterface $eventDispatcher
-    ```
-   
-    **After:**
-   
-    ``` 
-    SearchFactory $searchFactory
-    InputProcessorLoader $inputProcessorLoader
-    ResourceMetadataFactory $resourceMetadataFactory
-    EventDispatcherInterface $eventDispatcher
-    CacheInterface $cache = null
-    ```
-    
-    **Note:** The `$cache` argument is optional and only used when the `$cacheTTL`
-    of the `ProcessorConfig` is configured.
-    
- * Cache TTL configuration has been moved to `Rollerworks\Component\Search\Input\ProcessorConfig`, 
-   the metadata configuration format has remained unchanged.
- 
- * The Input format is now automatically detected by the first character.
-   When the provided input starts with an `{` the `JsonInput` processor is used,
-   otherwise the `NormStringQueryInput` processor is used.
-   
- * ArrayInput is deprecated and is internally delegated to the JsonInputProcessor.
-   
-   **In RollerworksSearch v2.0.0-ALPHA12 support for ArrayInput is completely 
-   removed and will throw an exception instead.**
-
-UPGRADE FROM 2.0-ALPHA5 to 2.0-ALPHA8
-=====================================
-
-## ApiPlatform
-
-* The `Rollerworks\Component\Search\ApiPlatform\EventListener\SearchConditionListener`
-  now requires an `EventDispatchInterface` instance as last argument.
-  
-## Doctrine DBAL
-
-* The `Rollerworks\Component\Search\Doctrine\Dbal\StrategySupportedConversion::getConversionStrategy`
-  method must now return an integer (and is enforced with a return-type).
-
-UPGRADE FROM 2.0-ALPHA2 to 2.0-ALPHA5
-=====================================
-
-* Support for using Regex in ValueMatch has been removed.
-  
-  * The constants `PatternMatch::PATTERN_REGEX` and `PatternMatch::PATTERN_NOT_REGEX`
-    have been removed.
-
-  * The method `PatternMatch::isRegex` has been removed.
-
-UPGRADE FROM 2.0-ALPHA1 to 2.0-ALPHA2
-=====================================
-
-* The `ValueComparison` namespaces and classes have been renamed to `ValueComparator`
-
-* The `FieldConfig::setValueComparison` method has been renamed to `setValueComparator`
-
-* The `FieldConfig::getValueComparison` method has been renamed to `getValueComparator`
diff --git a/composer.json b/composer.json
deleted file mode 100644
index 556ae462..00000000
--- a/composer.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "name": "rollersearch/search-dev",
-    "description": "Rollersearch (former RollerworksSearch) monolith development (use separate packages instead)",
-    "license": "MIT",
-    "type": "project",
-    "authors": [
-        {
-            "name": "Sebastiaan Stok",
-            "email": "s.stok@rollercapes.net"
-        },
-        {
-            "name": "Community contributions",
-            "homepage": "https://github.com/rollerworks/search/contributors"
-        }
-    ],
-    "homepage": "https://rollerworks.github.io/",
-    "require": {
-        "php": "^8.1",
-        "nesbot/carbon": "^2.38 || ^3.0",
-        "psr/container": "^1.1 || ^2.0",
-        "symfony/intl": "^6.4 || ^7.4 || ^8.0",
-        "symfony/options-resolver": "^6.4 || ^7.4 || ^8.0",
-        "symfony/polyfill-php84": "^1.33",
-        "symfony/property-access": "^6.4 || ^7.4 || ^8.0",
-        "symfony/string": "^6.4 || ^7.4 || ^8.0",
-        "symfony/translation-contracts": "^3.4"
-    },
-    "require-dev": {
-        "api-platform/core": "^4.2",
-        "doctrine/dbal": "^3.8.0 || ^4.2",
-        "doctrine/doctrine-bundle": "^1.9.1 || ^2.2.3 || ^3.0",
-        "doctrine/orm": "^2.7.3 || ^3.3",
-        "jangregor/phpstan-prophecy": "^2.2",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.1.1 || ^5.1 || ^6.1",
-        "moneyphp/money": "^3.2.0 || ^4.0",
-        "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^10.5",
-        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
-        "rollerscapes/standards": "^0.3",
-        "ruflin/elastica": "^5.0 || ^6.0 || ^7.0",
-        "symfony/asset": "^6.4 || ^7.4 || ^8.0",
-        "symfony/browser-kit": "^6.4 || ^7.4 || ^8.0",
-        "symfony/dom-crawler": "^6.4 || ^7.4 || ^8.0",
-        "symfony/finder": "^6.4 || ^7.4 || ^8.0",
-        "symfony/framework-bundle": "^6.4 || ^7.4 || ^8.0",
-        "symfony/http-foundation": "^6.4 || ^7.4 || ^8.0",
-        "symfony/phpunit-bridge": "^6.4 || ^7.4 || ^8.0",
-        "symfony/routing": "^6.4 || ^7.4 || ^8.0",
-        "symfony/templating": "^6.4 || ^7.4 || ^8.0",
-        "symfony/translation": "^6.4 || ^7.4 || ^8.0",
-        "symfony/twig-bundle": "^6.4 || ^7.4 || ^8.0",
-        "symfony/validator": "^6.4 || ^7.4 || ^8.0",
-        "symfony/var-dumper": "^6.4 || ^7.4 || ^8.0"
-    },
-    "replace": {
-        "rollerworks/search": "self.version",
-        "rollerworks/search-api-platform": "self.version",
-        "rollerworks/search-bundle": "self.version",
-        "rollerworks/search-dev": "self.version",
-        "rollerworks/search-doctrine-dbal": "self.version",
-        "rollerworks/search-doctrine-orm": "self.version",
-        "rollerworks/search-elasticsearch": "self.version",
-        "rollerworks/search-symfony-validator": "self.version"
-    },
-    "conflict": {
-        "moneyphp/money": "<3.2.0"
-    },
-    "suggest": {
-        "moneyphp/money": "To use the MoneyType"
-    },
-    "autoload": {
-        "psr-4": {
-            "Rollerworks\\Bundle\\SearchBundle\\": "lib/Symfony/SearchBundle",
-            "Rollerworks\\Component\\Search\\": "lib/Core",
-            "Rollerworks\\Component\\Search\\ApiPlatform\\": "lib/ApiPlatform",
-            "Rollerworks\\Component\\Search\\Doctrine\\Dbal\\": "lib/Doctrine/Dbal",
-            "Rollerworks\\Component\\Search\\Doctrine\\Orm\\": "lib/Doctrine/Orm",
-            "Rollerworks\\Component\\Search\\Elasticsearch\\": "lib/Elasticsearch",
-            "Rollerworks\\Component\\Search\\Extension\\Doctrine\\Dbal\\": "lib/Doctrine/Dbal/Extension",
-            "Rollerworks\\Component\\Search\\Extension\\Doctrine\\Orm\\": "lib/Doctrine/Orm/Extension",
-            "Rollerworks\\Component\\Search\\Extension\\Symfony\\Validator\\": "lib/Symfony/Validator"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Rollerworks\\Bundle\\SearchBundle\\Tests\\": "lib/Symfony/SearchBundle/Tests",
-            "Rollerworks\\Component\\Search\\Tests\\Doctrine\\Dbal\\": "lib/Doctrine/Dbal/Tests",
-            "Rollerworks\\Component\\Search\\Tests\\Doctrine\\Orm\\": "lib/Doctrine/Orm/Tests",
-            "Rollerworks\\Component\\Search\\Tests\\Elasticsearch\\": "lib/Elasticsearch/Tests"
-        }
-    },
-    "config": {
-        "preferred-install": {
-            "api-platform/core": "source",
-            "doctrine/dbal": "source",
-            "doctrine/orm": "source",
-            "*": "dist"
-        },
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.0-dev"
-        }
-    }
-}
diff --git a/config.php b/config.php
new file mode 100644
index 00000000..1918732a
--- /dev/null
+++ b/config.php
@@ -0,0 +1,26 @@
+<?php
+
+// See https://hupkit.dev/config.html#initialize-configuration-for-a-repository
+
+return [
+    'schema_version' => 2,
+    'main_branch' => 'main',
+    'branches' => [
+        ':default' => [
+            'sync-tags' => true,
+            'split' => [
+                'lib/ApiPlatform' => 'git@github.com:rollersearch/search-api-platform.git',
+                'lib/Core' => 'git@github.com:rollersearch/search-core.git',
+                'lib/Doctrine/Dbal' => 'git@github.com:rollersearch/search-doctrine-dbal.git',
+                'lib/Doctrine/Orm' => 'git@github.com:rollersearch/search-doctrine-orm.git',
+                'lib/Elasticsearch' => 'git@github.com:rollersearch/search-elasticsearch.git',
+                'lib/Symfony/SearchBundle' => 'git@github.com:rollersearch/search-bundle.git',
+                'lib/Symfony/Validator' => 'git@github.com:rollersearch/search-symfony-validator.git',
+            ],
+        ],
+        '1.x' => false,
+    ],
+    'pull_request' => [
+        'split' => 'changed-only',
+    ],
+];
diff --git a/docker-compose.yaml b/docker-compose.yaml
deleted file mode 100644
index 8a4b9254..00000000
--- a/docker-compose.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-version: '3'
-
-services:
-    php:
-        depends_on:
-          - elasticsearch
-          - pgsql
-          - mariadb-server
-        image: rollerworks/search-dev:php-74
-        volumes:
-            - .:/srv/www:rw
-
-    # Storage services
-    pgsql:
-        image: postgres:12.21
-        environment:
-            - POSTGRES_DB=search_tests
-            - POSTGRES_USER=postgres
-            - POSTGRES_PASSWORD=postgres
-        volumes:
-            - pg-data:/var/lib/postgresql/data:rw
-        ports:
-            - "55432:5432"
-
-    mariadb-server:
-        image: mariadb
-        environment:
-            - MYSQL_DATABASE=search_tests
-            - MYSQL_ROOT_PASSWORD=nope
-        volumes:
-            - my-data:/var/lib/mysql:rw
-        ports:
-            - "53306:3306"
-
-    elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.3.0
-        environment:
-            - "discovery.type=single-node"
-            - "xpack.security.enabled=false"
-            - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-        volumes:
-            - es-data:/usr/share/elasticsearch/data
-        ports:
-            - "59200:9200"
-
-volumes:
-    pg-data: {}
-    my-data: {}
-    es-data: {}
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 3b72a523..00000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM php:8.0-cli
-
-ENV BUILD_DEPS="autoconf file g++ gcc libc-dev pkg-config re2c"
-ENV LIB_DEPS="git make unzip ca-certificates zlib1g-dev libzip-dev libpq5 postgresql-server-dev-13"
-ENV ICU_RELEASE=70.1
-ENV CXXFLAGS "--std=c++0x"
-
-RUN apt-get update && apt-get install -y --no-install-recommends $BUILD_DEPS $LIB_DEPS && rm -rf /var/lib/apt/lists/*
-RUN cd /tmp && curl -Ls https://github.com/unicode-org/icu/releases/download/release-$(echo $ICU_RELEASE | tr '.' '-')/icu4c-$(echo $ICU_RELEASE | tr '.' '_')-src.tgz > icu4c-src.tgz \
- && cd /tmp && tar xzf icu4c-src.tgz && cd /tmp/icu/source && ./runConfigureICU Linux && make && make install && rm -rf /tmp/icu /tmp/icu4c-src.tgz
-
-RUN echo "date.timezone=Europe/Amsterdam" >> $PHP_INI_DIR/php.ini \
- && echo "memory_limit=-1" >> $PHP_INI_DIR/php.ini \
- && echo "phar.readonly=0" >> $PHP_INI_DIR/php.ini \
- && docker-php-ext-install zip pdo_pgsql pgsql bcmath mysqli pdo_mysql \
- && docker-php-ext-configure intl && docker-php-ext-install intl \
- && apt-get purge -y --auto-remove $BUILD_DEPS
-
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
-RUN ln -s /usr/bin/composer /usr/bin/composer.phar
-
-# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
-ENV COMPOSER_ALLOW_SUPERUSER 1
-ENV PATH="${PATH}:/root/.composer/vendor/bin"
-
-WORKDIR /srv/www
-
-CMD icu-config --version && php -i | grep 'ICU version'
diff --git a/docs/.gitignore b/docs/.gitignore
deleted file mode 100644
index 0ab11998..00000000
--- a/docs/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/_build/doctrees
-/_build/html
-*.pyc
-
diff --git a/docs/Dockerfile b/docs/Dockerfile
deleted file mode 100644
index f9f7d4dd..00000000
--- a/docs/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM  python:2-stretch as builder
-
-WORKDIR /www
-
-COPY ./_build/.requirements.txt _build/
-
-RUN pip install  pip==9.0.1 wheel==0.29.0 \
-    && pip install -r _build/.requirements.txt
-
-COPY . /www
-
-RUN make html
-
-FROM  nginx:latest
-
-COPY --from=builder /www/_build/html /usr/share/nginx/html
diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index c41e4815..00000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,153 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/RollerworksRecordFilterBundle.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/RollerworksRecordFilterBundle.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/RollerworksRecordFilterBundle"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/RollerworksRecordFilterBundle"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/docs/_build/.requirements.txt b/docs/_build/.requirements.txt
deleted file mode 100644
index 4a52e3fc..00000000
--- a/docs/_build/.requirements.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-alabaster==0.7.10
-Babel==2.4.0
-docutils==0.13.1
-imagesize==0.7.1
-Jinja2==2.9.6
-MarkupSafe==1.0
-Pygments==2.2.0
-pytz==2017.2
-requests==2.12.5
-six==1.10.0
-snowballstemmer==1.2.1
-Sphinx==1.3.6
-git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php
diff --git a/docs/_theme/_exts/symfonycom/__init__.py b/docs/_theme/_exts/symfonycom/__init__.py
deleted file mode 100755
index e69de29b..00000000
diff --git a/docs/_theme/_exts/symfonycom/sphinx/__init__.py b/docs/_theme/_exts/symfonycom/sphinx/__init__.py
deleted file mode 100755
index 1c08bcc1..00000000
--- a/docs/_theme/_exts/symfonycom/sphinx/__init__.py
+++ /dev/null
@@ -1,167 +0,0 @@
-from sphinx.highlighting import lexers, PygmentsBridge
-from pygments.style import Style
-from pygments.formatters import HtmlFormatter
-from pygments.token import Keyword, Name, Comment, String, Error, \
-     Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
-
-from sphinx.writers.html import HTMLTranslator
-from docutils import nodes
-from sphinx.locale import admonitionlabels, lazy_gettext
-
-customadmonitionlabels = admonitionlabels
-l_ = lazy_gettext
-customadmonitionlabels['best-practice'] = l_('Best Practice')
-
-def _getType(path):
-    return path[:path.find('/')]
-
-def _isIndex(path):
-    return 'index' in path
-
-class SensioHTMLTranslator(HTMLTranslator):
-    def __init__(self, builder, *args, **kwds):
-        HTMLTranslator.__init__(self, builder, *args, **kwds)
-        builder.templates.environment.filters['get_type'] = _getType
-        builder.templates.environment.tests['index'] = _isIndex
-        self.highlightlinenothreshold = 0
-
-    def visit_literal(self, node):
-        self.body.append(self.starttag(node, 'tt', '', CLASS='docutils literal'))
-        self.body.append('<code>')
-
-    def depart_literal(self, node):
-        self.body.append('</code>')
-        self.body.append('</tt>')
-
-    def visit_admonition(self, node, name=''):
-        self.body.append(self.starttag(node, 'div', CLASS=('admonition-wrapper')))
-        self.body.append('<div class="' + name + '"></div>')
-        self.body.append('<div class="admonition admonition-' + name + '">')
-        if name and name != 'seealso':
-            node.insert(0, nodes.title(name, customadmonitionlabels[name]))
-        self.set_first_last(node)
-
-    def depart_admonition(self, node=None):
-        self.body.append('</div></div>\n')
-
-    def visit_sidebar(self, node):
-        self.body.append(self.starttag(node, 'div', CLASS=('admonition-wrapper')))
-        self.body.append('<div class="sidebar"></div>')
-        self.body.append('<div class="admonition admonition-sidebar">')
-        self.set_first_last(node)
-        self.in_sidebar = 1
-
-    def depart_sidebar(self, node):
-        self.body.append('</div></div>\n')
-        self.in_sidebar = None
-
-    # overriden to add a new highlight div around each block
-    def visit_literal_block(self, node):
-        if node.rawsource != node.astext():
-            # most probably a parsed-literal block -- don't highlight
-            return BaseTranslator.visit_literal_block(self, node)
-        lang = self.highlightlang
-        linenos = node.rawsource.count('\n') >= \
-                  self.highlightlinenothreshold - 1
-        highlight_args = node.get('highlight_args', {})
-        if node.has_key('language'):
-            # code-block directives
-            lang = node['language']
-            highlight_args['force'] = True
-        if node.has_key('linenos'):
-            linenos = node['linenos']
-        def warner(msg):
-            self.builder.warn(msg, (self.builder.current_docname, node.line))
-        highlighted = self.highlighter.highlight_block(
-            node.rawsource, lang, warn=warner, linenos=linenos,
-            **highlight_args)
-        starttag = self.starttag(node, 'div', suffix='',
-                                 CLASS='highlight-%s' % lang)
-        self.body.append('<div class="literal-block">' + starttag + highlighted + '</div></div>\n')
-        raise nodes.SkipNode
-
-class SensioStyle(Style):
-    background_color = "#000000"
-    default_style = ""
-
-    styles = {
-        # No corresponding class for the following:
-        #Text: "", # class: ''
-        Whitespace: "underline #f8f8f8", # class: 'w'
-        Error: "#a40000 border:#ef2929", # class: 'err'
-        Other: "#ffffff", # class 'x'
-
-    Comment: "italic #B729D9", # class: 'c'
-    Comment.Single: "italic #B729D9", # class: 'c1'
-    Comment.Multiline: "italic #B729D9", # class: 'cm'
-    Comment.Preproc: "noitalic #aaa", # class: 'cp'
-
-    Keyword: "#FF8400", # class: 'k'
-        Keyword.Constant: "#FF8400", # class: 'kc'
-        Keyword.Declaration: "#FF8400", # class: 'kd'
-        Keyword.Namespace: "#FF8400", # class: 'kn'
-        Keyword.Pseudo: "#FF8400", # class: 'kp'
-        Keyword.Reserved: "#FF8400", # class: 'kr'
-        Keyword.Type: "#FF8400", # class: 'kt'
-
-    Operator: "#E0882F", # class: 'o'
-    Operator.Word: "#E0882F", # class: 'ow' - like keywords
-
-    Punctuation: "#999999", # class: 'p'
-
-        # because special names such as Name.Class, Name.Function, etc.
-        # are not recognized as such later in the parsing, we choose them
-        # to look the same as ordinary variables.
-        Name: "#ffffff", # class: 'n'
-    Name.Attribute: "#ffffff", # class: 'na' - to be revised
-    Name.Builtin: "#ffffff", # class: 'nb'
-        Name.Builtin.Pseudo: "#3465a4", # class: 'bp'
-    Name.Class: "#ffffff", # class: 'nc' - to be revised
-        Name.Constant: "#ffffff", # class: 'no' - to be revised
-        Name.Decorator: "#888", # class: 'nd' - to be revised
-        Name.Entity: "#ce5c00", # class: 'ni'
-        Name.Exception: "#cc0000", # class: 'ne'
-    Name.Function: "#ffffff", # class: 'nf'
-        Name.Property: "#ffffff", # class: 'py'
-        Name.Label: "#f57900", # class: 'nl'
-        Name.Namespace: "#ffffff", # class: 'nn' - to be revised
-    Name.Other: "#ffffff", # class: 'nx'
-    Name.Tag: "#cccccc", # class: 'nt' - like a keyword
-    Name.Variable: "#ffffff", # class: 'nv' - to be revised
-        Name.Variable.Class: "#ffffff", # class: 'vc' - to be revised
-        Name.Variable.Global: "#ffffff", # class: 'vg' - to be revised
-        Name.Variable.Instance: "#ffffff", # class: 'vi' - to be revised
-
-    Number: "#1299DA", # class: 'm'
-
-        Literal: "#ffffff", # class: 'l'
-        Literal.Date: "#ffffff", # class: 'ld'
-
-        String: "#56DB3A", # class: 's'
-        String.Backtick: "#56DB3A", # class: 'sb'
-        String.Char: "#56DB3A", # class: 'sc'
-    String.Doc: "italic #B729D9", # class: 'sd' - like a comment
-        String.Double: "#56DB3A", # class: 's2'
-        String.Escape: "#56DB3A", # class: 'se'
-        String.Heredoc: "#56DB3A", # class: 'sh'
-        String.Interpol: "#56DB3A", # class: 'si'
-        String.Other: "#56DB3A", # class: 'sx'
-        String.Regex: "#56DB3A", # class: 'sr'
-    String.Single: "#56DB3A", # class: 's1'
-        String.Symbol: "#56DB3A", # class: 'ss'
-
-        Generic: "#ffffff", # class: 'g'
-        Generic.Deleted: "#a40000", # class: 'gd'
-        Generic.Emph: "italic #ffffff", # class: 'ge'
-        Generic.Error: "#ef2929", # class: 'gr'
-        Generic.Heading: "#000080", # class: 'gh'
-        Generic.Inserted: "#00A000", # class: 'gi'
-        Generic.Output: "#888", # class: 'go'
-        Generic.Prompt: "#745334", # class: 'gp'
-        Generic.Strong: "bold #ffffff", # class: 'gs'
-        Generic.Subheading: "bold #800080", # class: 'gu'
-        Generic.Traceback: "bold #a40000", # class: 'gt'
-    }
-
-def setup(app):
-    app.set_translator('html', SensioHTMLTranslator)
diff --git a/docs/_theme/_exts/symfonycom/sphinx/lexer.py b/docs/_theme/_exts/symfonycom/sphinx/lexer.py
deleted file mode 100755
index 4100b66d..00000000
--- a/docs/_theme/_exts/symfonycom/sphinx/lexer.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from pygments.lexer import RegexLexer, bygroups, using
-from pygments.token import *
-from pygments.lexers.shell import BashLexer, BatchLexer
-
-class TerminalLexer(RegexLexer):
-    name = 'Terminal'
-    aliases = ['terminal']
-    filenames = []
-
-    tokens = {
-        'root': [
-            ('^\$', Generic.Prompt, 'bash-prompt'),
-            ('^[^\n>]+>', Generic.Prompt, 'dos-prompt'),
-            ('^#.+$', Comment.Single),
-            ('^.+$', Generic.Output),
-        ],
-        'bash-prompt': [
-            ('(.+)$', bygroups(using(BashLexer)), '#pop')
-        ],
-        'dos-prompt': [
-            ('(.+)$', bygroups(using(BatchLexer)), '#pop')
-        ],
-    }
diff --git a/docs/_theme/custom_rtd_theme/__init__.py b/docs/_theme/custom_rtd_theme/__init__.py
deleted file mode 100755
index 9e31e7f6..00000000
--- a/docs/_theme/custom_rtd_theme/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""Sphinx ReadTheDocs theme.
-
-From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
-
-"""
-from os import path
-
-__version__ = '0.4.2'
-__version_full__ = __version__
-
-
-def get_html_theme_path():
-    """Return list of HTML theme paths."""
-    cur_dir = path.abspath(path.dirname(path.dirname(__file__)))
-    return cur_dir
-
-# See http://www.sphinx-doc.org/en/stable/theming.html#distribute-your-theme-as-a-python-package
-def setup(app):
-    app.add_html_theme('sphinx_rtd_theme', path.abspath(path.dirname(__file__)))
diff --git a/docs/_theme/custom_rtd_theme/breadcrumbs.html b/docs/_theme/custom_rtd_theme/breadcrumbs.html
deleted file mode 100755
index 5578b619..00000000
--- a/docs/_theme/custom_rtd_theme/breadcrumbs.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{# Support for Sphinx 1.3+ page_source_suffix, but don't break old builds. #}
-
-{% if page_source_suffix %}
-{% set suffix = page_source_suffix %}
-{% else %}
-{% set suffix = source_suffix %}
-{% endif %}
-
-{% if meta is defined and meta is not none %}
-{% set check_meta = True %}
-{% else %}
-{% set check_meta = False %}
-{% endif %}
-
-{% if check_meta and 'github_url' in meta %}
-{% set display_github = True %}
-{% endif %}
-
-{% if check_meta and 'bitbucket_url' in meta %}
-{% set display_bitbucket = True %}
-{% endif %}
-
-{% if check_meta and 'gitlab_url' in meta %}
-{% set display_gitlab = True %}
-{% endif %}
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-
-  <ul class="wy-breadcrumbs">
-    {% block breadcrumbs %}
-      <li><a href="{{ pathto(master_doc) }}">{{ _('Docs') }}</a> &raquo;</li>
-        {% for doc in parents %}
-          <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
-        {% endfor %}
-      <li>{{ title }}</li>
-    {% endblock %}
-    {% block breadcrumbs_aside %}
-      <li class="wy-breadcrumbs-aside">
-        {% if hasdoc(pagename) %}
-            {% if display_github %}
-            {% if check_meta and 'github_url' in meta %}
-              <!-- User defined GitHub URL -->
-              <a href="{{ meta['github_url'] }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
-            {% else %}
-              <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/{{ theme_vcs_pageview_mode|default("blob") }}/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
-            {% endif %}
-          {% elif display_bitbucket %}
-            {% if check_meta and 'bitbucket_url' in meta %}
-              <!-- User defined Bitbucket URL -->
-              <a href="{{ meta['bitbucket_url'] }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
-            {% else %}
-              <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}?mode={{ theme_vcs_pageview_mode|default("view") }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
-            {% endif %}
-          {% elif display_gitlab %}
-            {% if check_meta and 'gitlab_url' in meta %}
-              <!-- User defined GitLab URL -->
-              <a href="{{ meta['gitlab_url'] }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
-            {% else %}
-              <a href="https://{{ gitlab_host|default("gitlab.com") }}/{{ gitlab_user }}/{{ gitlab_repo }}/{{ theme_vcs_pageview_mode|default("blob") }}/{{ gitlab_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
-            {% endif %}
-          {% elif show_source and source_url_prefix %}
-            <a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">{{ _('View page source') }}</a>
-          {% elif show_source and has_source and sourcename %}
-            <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> {{ _('View page source') }}</a>
-          {% endif %}
-        {% endif %}
-      </li>
-    {% endblock %}
-  </ul>
-
-  {% if (theme_prev_next_buttons_location == 'top' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
-  <div class="rst-breadcrumbs-buttons" role="navigation" aria-label="breadcrumb navigation">
-      {% if next %}
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      {% endif %}
-      {% if prev %}
-        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      {% endif %}
-  </div>
-  {% endif %}
-  <hr/>
-</div>
diff --git a/docs/_theme/custom_rtd_theme/footer.html b/docs/_theme/custom_rtd_theme/footer.html
deleted file mode 100755
index 11f672e8..00000000
--- a/docs/_theme/custom_rtd_theme/footer.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<footer>
-  {% if (theme_prev_next_buttons_location == 'bottom' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      {% if next %}
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n" rel="next">{{ _('Next') }} <span class="fa fa-arrow-circle-right"></span></a>
-      {% endif %}
-      {% if prev %}
-        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> {{ _('Previous') }}</a>
-      {% endif %}
-    </div>
-  {% endif %}
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-    {%- if show_copyright %}
-      {%- if hasdoc('copyright') %}
-        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}{% endtrans %}
-      {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}{% endtrans %}
-      {%- endif %}
-    {%- endif %}
-
-    {%- if build_id and build_url %}
-      {% trans build_url=build_url, build_id=build_id %}
-        <span class="build">
-          Build
-          <a href="{{ build_url }}">{{ build_id }}</a>.
-        </span>
-      {% endtrans %}
-    {%- elif commit %}
-      {% trans commit=commit %}
-        <span class="commit">
-          Revision <code>{{ commit }}</code>.
-        </span>
-      {% endtrans %}
-    {%- elif last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-    {%- endif %}
-
-    </p>
-  </div>
-
-  {%- if show_sphinx %}
-  {% trans %}Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/rtfd/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}.
-  {%- endif %}
-
-  {%- block extrafooter %} {% endblock %}
-
-</footer>
-
diff --git a/docs/_theme/custom_rtd_theme/layout.html b/docs/_theme/custom_rtd_theme/layout.html
deleted file mode 100755
index 512e3458..00000000
--- a/docs/_theme/custom_rtd_theme/layout.html
+++ /dev/null
@@ -1,236 +0,0 @@
-{# TEMPLATE VAR SETTINGS #}
-{%- set url_root = pathto('', 1) %}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
-{%- if not embedded and docstitle %}
-  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
-{%- else %}
-  {%- set titlesuffix = "" %}
-{%- endif %}
-{%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="{{ lang_attr }}" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="{{ lang_attr }}" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  {{ metatags }}
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  {% block htmltitle %}
-  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-  {% endblock %}
-
-  {# FAVICON #}
-  {% if favicon %}
-    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-  {% endif %}
-  {# CANONICAL URL #}
-  {% if theme_canonical_url %}
-    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
-  {% endif %}
-
-  {# JAVASCRIPTS #}
-  <script type="text/javascript" src="{{ pathto('_static/js/modernizr.min.js', 1) }}"></script>
-  {%- if not embedded %}
-  {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #}
-    {% if sphinx_version >= "1.8.0" %}
-      <script type="text/javascript" id="documentation_options" data-url_root="{{ pathto('', 1) }}" src="{{ pathto('_static/documentation_options.js', 1) }}"></script>
-      {%- for scriptfile in script_files %}
-        {{ js_tag(scriptfile) }}
-      {%- endfor %}
-    {% else %}
-      <script type="text/javascript">
-          var DOCUMENTATION_OPTIONS = {
-              URL_ROOT:'{{ url_root }}',
-              VERSION:'{{ release|e }}',
-              LANGUAGE:'{{ language }}',
-              COLLAPSE_INDEX:false,
-              FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
-              HAS_SOURCE:  {{ has_source|lower }},
-              SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
-          };
-      </script>
-      {%- for scriptfile in script_files %}
-        <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-      {%- endfor %}
-    {% endif %}
-    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
-
-    {# OPENSEARCH #}
-    {%- if use_opensearch %}
-    <link rel="search" type="application/opensearchdescription+xml"
-          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
-          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-    {%- endif %}
-  {%- endif %}
-
-  {# CSS #}
-  <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-  <link rel="stylesheet" href="{{ pathto('_static/css/pygment.css', 1) }}" type="text/css" />
-  {%- for css in css_files %}
-    {%- if css|attr("rel") %}
-  <link rel="{{ css.rel }}" href="{{ pathto(css.filename, 1) }}" type="text/css"{% if css.title is not none %} title="{{ css.title }}"{% endif %} />
-    {%- else %}
-  <link rel="stylesheet" href="{{ pathto(css, 1) }}" type="text/css" />
-    {%- endif %}
-  {%- endfor %}
-
-  {%- for cssfile in extra_css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {%- endfor %}
-
-  {%- block linktags %}
-    {%- if hasdoc('about') %}
-    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
-    {%- endif %}
-    {%- if hasdoc('search') %}
-    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
-    {%- endif %}
-    {%- if next %}
-    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
-    {%- endif %}
-    {%- if prev %}
-    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
-    {%- endif %}
-  {%- endblock %}
-  {%- block extrahead %} {% endblock %}
-</head>
-
-<body class="wy-body-for-nav">
-
-  {% block extrabody %} {% endblock %}
-  <div class="wy-grid-for-nav">
-
-    {# SIDE NAV, TOGGLES ON MOBILE #}
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          {% block sidebartitle %}
-
-          {% if logo and theme_logo_only %}
-            <a href="{{ pathto(master_doc) }}">
-          {% else %}
-            <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
-          {% endif %}
-
-          {% if logo %}
-            {# Not strictly valid HTML, but it's the only way to display/scale
-               it properly, without weird scripting or heaps of work
-            #}
-            <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" alt="Logo"/>
-          {% endif %}
-          </a>
-
-          {% if theme_display_version %}
-            {%- set nav_version = version %}
-            {% if READTHEDOCS and current_version %}
-              {%- set nav_version = current_version %}
-            {% endif %}
-            {% if nav_version %}
-              <div class="version">
-                {{ nav_version }}
-              </div>
-            {% endif %}
-          {% endif %}
-
-          {% include "searchbox.html" %}
-
-          {% endblock %}
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          {% block menu %}
-            {#
-              The singlehtml builder doesn't handle this toctree call when the
-              toctree is empty. Skip building this for now.
-            #}
-            {% if 'singlehtml' not in builder %}
-              {% set global_toc = toctree(maxdepth=theme_navigation_depth|int,
-                                          collapse=theme_collapse_navigation|tobool,
-                                          includehidden=theme_includehidden|tobool,
-                                          titles_only=theme_titles_only|tobool) %}
-            {% endif %}
-            {% if global_toc %}
-              {{ global_toc }}
-            {% else %}
-              <!-- Local TOC -->
-              <div class="local-toc">{{ toc }}</div>
-            {% endif %}
-          {% endblock %}
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      <nav class="wy-nav-top" aria-label="top navigation">
-        {% block mobile_nav %}
-          <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="{{ pathto(master_doc) }}">{{ project }}</a>
-        {% endblock %}
-      </nav>
-
-
-      <div class="wy-nav-content">
-      {%- block content %}
-        {% if theme_style_external_links|tobool %}
-        <div class="rst-content style-external-links">
-        {% else %}
-        <div class="rst-content">
-        {% endif %}
-          {% include "breadcrumbs.html" %}
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-          {%- block document %}
-           <div itemprop="articleBody">
-            {% block body %}{% endblock %}
-           </div>
-           {% if self.comments()|trim %}
-           <div class="articleComments">
-            {% block comments %}{% endblock %}
-           </div>
-           {% endif%}
-          </div>
-          {%- endblock %}
-          {% include "footer.html" %}
-        </div>
-      {%- endblock %}
-      </div>
-
-    </section>
-
-  </div>
-  {% include "versions.html" %}
-
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.Navigation.enable({{ 'true' if theme_sticky_navigation|tobool else 'false' }});
-      });
-  </script>
-
-  {# Do not conflict with RTD insertion of analytics script #}
-  {% if not READTHEDOCS %}
-    {% if theme_analytics_id %}
-    <!-- Theme Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '{{ theme_analytics_id }}', 'auto');
-    ga('send', 'pageview');
-    </script>
-
-    {% endif %}
-  {% endif %}
-
-  {%- block footer %} {% endblock %}
-
-</body>
-</html>
diff --git a/docs/_theme/custom_rtd_theme/search.html b/docs/_theme/custom_rtd_theme/search.html
deleted file mode 100755
index e3aa9b5c..00000000
--- a/docs/_theme/custom_rtd_theme/search.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{#
-    basic/search.html
-    ~~~~~~~~~~~~~~~~~
-
-    Template for the search page.
-
-    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-#}
-{%- extends "layout.html" %}
-{% set title = _('Search') %}
-{% set script_files = script_files + ['_static/searchtools.js'] %}
-{% block footer %}
-  <script type="text/javascript">
-    jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
-  </script>
-  {# this is used when loading the search index using $.ajax fails,
-     such as on Chrome for documents on localhost #}
-  <script type="text/javascript" id="searchindexloader"></script>
-  {{ super() }}
-{% endblock %}
-{% block body %}
-  <noscript>
-  <div id="fallback" class="admonition warning">
-    <p class="last">
-      {% trans %}Please activate JavaScript to enable the search
-      functionality.{% endtrans %}
-    </p>
-  </div>
-  </noscript>
-
-  {% if search_performed %}
-    <h2>{{ _('Search Results') }}</h2>
-    {% if not search_results %}
-      <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
-    {% endif %}
-  {% endif %}
-  <div id="search-results">
-  {% if search_results %}
-    <ul>
-    {% for href, caption, context in search_results %}
-      <li>
-        <a href="{{ pathto(item.href) }}">{{ caption }}</a>
-        <p class="context">{{ context|e }}</p>
-      </li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-  </div>
-{% endblock %}
diff --git a/docs/_theme/custom_rtd_theme/searchbox.html b/docs/_theme/custom_rtd_theme/searchbox.html
deleted file mode 100755
index 606f5c8c..00000000
--- a/docs/_theme/custom_rtd_theme/searchbox.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{%- if builder != 'singlehtml' %}
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
-    <input type="text" name="q" placeholder="{{ _('Search docs') }}" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-{%- endif %}
diff --git a/docs/_theme/custom_rtd_theme/static/css/badge_only.css b/docs/_theme/custom_rtd_theme/static/css/badge_only.css
deleted file mode 100755
index 323730ae..00000000
--- a/docs/_theme/custom_rtd_theme/static/css/badge_only.css
+++ /dev/null
@@ -1 +0,0 @@
-.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../fonts/fontawesome-webfont.eot");src:url("../fonts/fontawesome-webfont.eot?#iefix") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff") format("woff"),url("../fonts/fontawesome-webfont.ttf") format("truetype"),url("../fonts/fontawesome-webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up{height:auto;max-height:100%}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}
diff --git a/docs/_theme/custom_rtd_theme/static/css/pygment.css b/docs/_theme/custom_rtd_theme/static/css/pygment.css
deleted file mode 100644
index eb159ca5..00000000
--- a/docs/_theme/custom_rtd_theme/static/css/pygment.css
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
-  * Syntax highlighting styles
-  *
-  * https://mattkersley.com/development/one-dark-pygments-theme/
-  */
-
-.rst-content pre.literal-block div[class^="highlight"], .rst-content div[class^="highlight"] div[class^="highlight"], div[class^="highlight"] {
-  background: #282C34;
-  border-radius: 6px;
-  font-size: 0.675em;
-  -webkit-font-smoothing: subpixel-antialiased;
-  width: 100%;
-}
-
-.highlight {
-  color: #a9b7c6;
-}
-
-.highlight .c {
-  color: #a9b7c6;
-  font-style: italic;
-}
-.highlight .err {
-  color: #960050;
-  background-color: #1e0010;
-}
-.highlight .k {
-  color: #C678DD;
-  font-weight: bold;
-}
-.highlight .o {
-  color: #a9b7c6;
-  font-weight: bold;
-}
-.highlight .cm {
-  color: #7b8794;
-  font-style: italic;
-}
-.highlight .cp {
-  color: #5B6370;
-  font-weight: bold;
-}
-.highlight .c1 {
-  color: #808d9a;
-  font-style: italic;
-}
-.highlight .cs {
-  color: #808d9a;
-  font-weight: bold;
-  font-style: italic;
-}
-.highlight .gd {
-  color: #000;
-  background-color: #fdd;
-}
-.highlight .gd .x {
-  color: #000;
-  background-color: #faa;
-}
-.highlight .ge {
-  font-style: italic;
-}
-.highlight .gr {
-  color: #a00;
-}
-.highlight .gh {
-  color: #6f7986;
-}
-.highlight .gi {
-  color: #a6e22e;
-  background-color: #dfd;
-}
-.highlight .gi .x {
-  color: #a6e22e;
-  background-color: #afa;
-}
-.highlight .go {
-  color: #888;
-}
-.highlight .gp {
-  color: #7a7a7a;
-}
-.highlight .gs {
-  font-weight: bold;
-}
-.highlight .gu {
-  color: #aaa;
-}
-.highlight .gt {
-  color: #a00;
-}
-.highlight .kc {
-  font-weight: bold;
-}
-.highlight .kd {
-  color: #C776DF;
-  font-weight: bold;
-}
-.highlight .kp {
-  font-weight: bold;
-}
-.highlight .kr {
-  font-weight: bold;
-}
-.highlight .kt {
-  color: #458;
-  font-weight: bold;
-}
-.highlight .m {
-  color: #4FB6C3;
-}
-.highlight .s {
-  color: #A2BD40;
-}
-.highlight .na {
-  color: #E2964A;
-}
-.highlight .nb {
-  color: #4FB6C3;
-}
-.highlight .nc {
-  color: #E2964A;
-  font-weight: bold;
-}
-.highlight .nd {
-  color: #4FB6BE;
-}
-.highlight .no {
-  color: #4FB6BE;
-}
-.highlight .ni {
-  color: #E2964A;
-}
-.highlight .ne {
-  color: #900;
-  font-weight: bold;
-}
-.highlight .nf {
-  color: #52A5EB;
-  font-weight: bold;
-}
-.highlight .nn {
-  color: #8c8c8c;
-}
-.highlight .nt {
-  color: #DE5442;
-}
-.highlight .nv {
-  color: #DE5442;
-}
-.highlight .nx {
-  color: #C678DD;
-}
-.highlight .ow {
-  font-weight: bold;
-}
-.highlight .w {
-  color: #bbb;
-}
-.highlight .mf {
-  color: #4FB6C3;
-}
-.highlight .mh {
-  color: #4FB6C3;
-}
-.highlight .mi {
-  color: #4FB6C3;
-}
-.highlight .mo {
-  color: #4FB6C3;
-}
-.highlight .sb {
-  color: #A2BD40;
-}
-.highlight .sc {
-  color: #A2BD40;
-}
-.highlight .sd {
-  color: #9198a5;
-}
-.highlight .s2 {
-  color: #A2BD40;
-}
-.highlight .se {
-  color: #A2BD40;
-}
-.highlight .sh {
-  color: #A2BD40;
-}
-.highlight .si {
-  color: #A2BD40;
-}
-.highlight .sx {
-  color: #A2BD40;
-}
-.highlight .sr {
-  color: #009926;
-}
-.highlight .s1 {
-  color: #A2BD40;
-}
-.highlight .ss {
-  color: #990073;
-}
-.highlight .bp {
-  color: #999;
-}
-.highlight .vc {
-  color: #008080;
-}
-.highlight .vg {
-  color: #008080;
-}
-.highlight .vi {
-  color: #008080;
-}
-.highlight .il {
-  color: #4FB6C3;
-}
-
-.post-content > .highlight {
-  line-height: 1;
-  overflow-x: scroll;
-  padding: 10px;
-}
-.post-content > .highlight pre {
-  margin: 0;
-  white-space: pre;
-}
-.post-content > .highlight .lineno {
-  border-right: solid 1px #3C4049;
-  padding-left: 10px;
-  padding-right: 10px;
-  text-align: right;
-}
-.post-content > .highlight span {
-  display: inline-block;
-  padding: 0.3em 0;
-}
-
-.highlighttable .linenos {
-  border-right: solid 1px #3C4049;
-  padding-left: 10px;
-  padding-right: 10px;
-  text-align: right;
-  width: 3em;
-}
-.highlighttable .code .highlight {
-  padding-left: 10px;
-}
-.highlighttable .code .highlight pre {
-  white-space: pre;
-}
diff --git a/docs/_theme/custom_rtd_theme/static/css/theme.css b/docs/_theme/custom_rtd_theme/static/css/theme.css
deleted file mode 100755
index b19dbfe5..00000000
--- a/docs/_theme/custom_rtd_theme/static/css/theme.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* sphinx_rtd_theme version 0.4.2 | MIT license */
-/* Built 20181005 13:10 */
-*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:hover,a:active{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:0}dfn{font-style:italic}ins{background:#ff9;color:#000;text-decoration:none}mark{background:#ff0;color:#000;font-style:italic;font-weight:bold}pre,code,.rst-content tt,.rst-content code,kbd,samp{font-family:monospace,serif;_font-family:"courier new",monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:before,q:after{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}ul,ol,dl{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:0;margin:0;padding:0}label{cursor:pointer}legend{border:0;*margin-left:-7px;padding:0;white-space:normal}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*width:13px;*height:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top;resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none !important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{html,body,section{background:none !important}*{box-shadow:none !important;text-shadow:none !important;filter:none !important;-ms-filter:none !important}a,a:visited{text-decoration:underline}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:.5cm}p,h2,.rst-content .toctree-wrapper p.caption,h3{orphans:3;widows:3}h2,.rst-content .toctree-wrapper p.caption,h3{page-break-after:avoid}}.fa:before,.wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content table>caption .headerlink:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo,.rst-content .admonition,.btn,input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea,.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a,.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a,.wy-nav-top a{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}/*!
- *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url("../fonts/fontawesome-webfont.eot?v=4.7.0");src:url("../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"),url("../fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"),url("../fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"),url("../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa,.wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink,.rst-content table>caption .headerlink,.rst-content tt.download span:first-child,.rst-content code.download span:first-child,.icon{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.3333333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.2857142857em;text-align:center}.fa-ul{padding-left:0;margin-left:2.1428571429em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.1428571429em;width:2.1428571429em;top:.1428571429em;text-align:center}.fa-li.fa-lg{left:-1.8571428571em}.fa-border{padding:.2em .25em .15em;border:solid 0.08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.wy-menu-vertical li span.fa-pull-left.toctree-expand,.wy-menu-vertical li.on a span.fa-pull-left.toctree-expand,.wy-menu-vertical li.current>a span.fa-pull-left.toctree-expand,.rst-content .fa-pull-left.admonition-title,.rst-content h1 .fa-pull-left.headerlink,.rst-content h2 .fa-pull-left.headerlink,.rst-content h3 .fa-pull-left.headerlink,.rst-content h4 .fa-pull-left.headerlink,.rst-content h5 .fa-pull-left.headerlink,.rst-content h6 .fa-pull-left.headerlink,.rst-content dl dt .fa-pull-left.headerlink,.rst-content p.caption .fa-pull-left.headerlink,.rst-content table>caption .fa-pull-left.headerlink,.rst-content tt.download span.fa-pull-left:first-child,.rst-content code.download span.fa-pull-left:first-child,.fa-pull-left.icon{margin-right:.3em}.fa.fa-pull-right,.wy-menu-vertical li span.fa-pull-right.toctree-expand,.wy-menu-vertical li.on a span.fa-pull-right.toctree-expand,.wy-menu-vertical li.current>a span.fa-pull-right.toctree-expand,.rst-content .fa-pull-right.admonition-title,.rst-content h1 .fa-pull-right.headerlink,.rst-content h2 .fa-pull-right.headerlink,.rst-content h3 .fa-pull-right.headerlink,.rst-content h4 .fa-pull-right.headerlink,.rst-content h5 .fa-pull-right.headerlink,.rst-content h6 .fa-pull-right.headerlink,.rst-content dl dt .fa-pull-right.headerlink,.rst-content p.caption .fa-pull-right.headerlink,.rst-content table>caption .fa-pull-right.headerlink,.rst-content tt.download span.fa-pull-right:first-child,.rst-content code.download span.fa-pull-right:first-child,.fa-pull-right.icon{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left,.wy-menu-vertical li span.pull-left.toctree-expand,.wy-menu-vertical li.on a span.pull-left.toctree-expand,.wy-menu-vertical li.current>a span.pull-left.toctree-expand,.rst-content .pull-left.admonition-title,.rst-content h1 .pull-left.headerlink,.rst-content h2 .pull-left.headerlink,.rst-content h3 .pull-left.headerlink,.rst-content h4 .pull-left.headerlink,.rst-content h5 .pull-left.headerlink,.rst-content h6 .pull-left.headerlink,.rst-content dl dt .pull-left.headerlink,.rst-content p.caption .pull-left.headerlink,.rst-content table>caption .pull-left.headerlink,.rst-content tt.download span.pull-left:first-child,.rst-content code.download span.pull-left:first-child,.pull-left.icon{margin-right:.3em}.fa.pull-right,.wy-menu-vertical li span.pull-right.toctree-expand,.wy-menu-vertical li.on a span.pull-right.toctree-expand,.wy-menu-vertical li.current>a span.pull-right.toctree-expand,.rst-content .pull-right.admonition-title,.rst-content h1 .pull-right.headerlink,.rst-content h2 .pull-right.headerlink,.rst-content h3 .pull-right.headerlink,.rst-content h4 .pull-right.headerlink,.rst-content h5 .pull-right.headerlink,.rst-content h6 .pull-right.headerlink,.rst-content dl dt .pull-right.headerlink,.rst-content p.caption .pull-right.headerlink,.rst-content table>caption .pull-right.headerlink,.rst-content tt.download span.pull-right:first-child,.rst-content code.download span.pull-right:first-child,.pull-right.icon{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:""}.fa-music:before{content:""}.fa-search:before,.icon-search:before{content:""}.fa-envelope-o:before{content:""}.fa-heart:before{content:""}.fa-star:before{content:""}.fa-star-o:before{content:""}.fa-user:before{content:""}.fa-film:before{content:""}.fa-th-large:before{content:""}.fa-th:before{content:""}.fa-th-list:before{content:""}.fa-check:before{content:""}.fa-remove:before,.fa-close:before,.fa-times:before{content:""}.fa-search-plus:before{content:""}.fa-search-minus:before{content:""}.fa-power-off:before{content:""}.fa-signal:before{content:""}.fa-gear:before,.fa-cog:before{content:""}.fa-trash-o:before{content:""}.fa-home:before,.icon-home:before{content:""}.fa-file-o:before{content:""}.fa-clock-o:before{content:""}.fa-road:before{content:""}.fa-download:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before{content:""}.fa-arrow-circle-o-down:before{content:""}.fa-arrow-circle-o-up:before{content:""}.fa-inbox:before{content:""}.fa-play-circle-o:before{content:""}.fa-rotate-right:before,.fa-repeat:before{content:""}.fa-refresh:before{content:""}.fa-list-alt:before{content:""}.fa-lock:before{content:""}.fa-flag:before{content:""}.fa-headphones:before{content:""}.fa-volume-off:before{content:""}.fa-volume-down:before{content:""}.fa-volume-up:before{content:""}.fa-qrcode:before{content:""}.fa-barcode:before{content:""}.fa-tag:before{content:""}.fa-tags:before{content:""}.fa-book:before,.icon-book:before{content:""}.fa-bookmark:before{content:""}.fa-print:before{content:""}.fa-camera:before{content:""}.fa-font:before{content:""}.fa-bold:before{content:""}.fa-italic:before{content:""}.fa-text-height:before{content:""}.fa-text-width:before{content:""}.fa-align-left:before{content:""}.fa-align-center:before{content:""}.fa-align-right:before{content:""}.fa-align-justify:before{content:""}.fa-list:before{content:""}.fa-dedent:before,.fa-outdent:before{content:""}.fa-indent:before{content:""}.fa-video-camera:before{content:""}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:""}.fa-pencil:before{content:""}.fa-map-marker:before{content:""}.fa-adjust:before{content:""}.fa-tint:before{content:""}.fa-edit:before,.fa-pencil-square-o:before{content:""}.fa-share-square-o:before{content:""}.fa-check-square-o:before{content:""}.fa-arrows:before{content:""}.fa-step-backward:before{content:""}.fa-fast-backward:before{content:""}.fa-backward:before{content:""}.fa-play:before{content:""}.fa-pause:before{content:""}.fa-stop:before{content:""}.fa-forward:before{content:""}.fa-fast-forward:before{content:""}.fa-step-forward:before{content:""}.fa-eject:before{content:""}.fa-chevron-left:before{content:""}.fa-chevron-right:before{content:""}.fa-plus-circle:before{content:""}.fa-minus-circle:before{content:""}.fa-times-circle:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before{content:""}.fa-check-circle:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before{content:""}.fa-question-circle:before{content:""}.fa-info-circle:before{content:""}.fa-crosshairs:before{content:""}.fa-times-circle-o:before{content:""}.fa-check-circle-o:before{content:""}.fa-ban:before{content:""}.fa-arrow-left:before{content:""}.fa-arrow-right:before{content:""}.fa-arrow-up:before{content:""}.fa-arrow-down:before{content:""}.fa-mail-forward:before,.fa-share:before{content:""}.fa-expand:before{content:""}.fa-compress:before{content:""}.fa-plus:before{content:""}.fa-minus:before{content:""}.fa-asterisk:before{content:""}.fa-exclamation-circle:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.rst-content .admonition-title:before{content:""}.fa-gift:before{content:""}.fa-leaf:before{content:""}.fa-fire:before,.icon-fire:before{content:""}.fa-eye:before{content:""}.fa-eye-slash:before{content:""}.fa-warning:before,.fa-exclamation-triangle:before{content:""}.fa-plane:before{content:""}.fa-calendar:before{content:""}.fa-random:before{content:""}.fa-comment:before{content:""}.fa-magnet:before{content:""}.fa-chevron-up:before{content:""}.fa-chevron-down:before{content:""}.fa-retweet:before{content:""}.fa-shopping-cart:before{content:""}.fa-folder:before{content:""}.fa-folder-open:before{content:""}.fa-arrows-v:before{content:""}.fa-arrows-h:before{content:""}.fa-bar-chart-o:before,.fa-bar-chart:before{content:""}.fa-twitter-square:before{content:""}.fa-facebook-square:before{content:""}.fa-camera-retro:before{content:""}.fa-key:before{content:""}.fa-gears:before,.fa-cogs:before{content:""}.fa-comments:before{content:""}.fa-thumbs-o-up:before{content:""}.fa-thumbs-o-down:before{content:""}.fa-star-half:before{content:""}.fa-heart-o:before{content:""}.fa-sign-out:before{content:""}.fa-linkedin-square:before{content:""}.fa-thumb-tack:before{content:""}.fa-external-link:before{content:""}.fa-sign-in:before{content:""}.fa-trophy:before{content:""}.fa-github-square:before{content:""}.fa-upload:before{content:""}.fa-lemon-o:before{content:""}.fa-phone:before{content:""}.fa-square-o:before{content:""}.fa-bookmark-o:before{content:""}.fa-phone-square:before{content:""}.fa-twitter:before{content:""}.fa-facebook-f:before,.fa-facebook:before{content:""}.fa-github:before,.icon-github:before{content:""}.fa-unlock:before{content:""}.fa-credit-card:before{content:""}.fa-feed:before,.fa-rss:before{content:""}.fa-hdd-o:before{content:""}.fa-bullhorn:before{content:""}.fa-bell:before{content:""}.fa-certificate:before{content:""}.fa-hand-o-right:before{content:""}.fa-hand-o-left:before{content:""}.fa-hand-o-up:before{content:""}.fa-hand-o-down:before{content:""}.fa-arrow-circle-left:before,.icon-circle-arrow-left:before{content:""}.fa-arrow-circle-right:before,.icon-circle-arrow-right:before{content:""}.fa-arrow-circle-up:before{content:""}.fa-arrow-circle-down:before{content:""}.fa-globe:before{content:""}.fa-wrench:before{content:""}.fa-tasks:before{content:""}.fa-filter:before{content:""}.fa-briefcase:before{content:""}.fa-arrows-alt:before{content:""}.fa-group:before,.fa-users:before{content:""}.fa-chain:before,.fa-link:before,.icon-link:before{content:""}.fa-cloud:before{content:""}.fa-flask:before{content:""}.fa-cut:before,.fa-scissors:before{content:""}.fa-copy:before,.fa-files-o:before{content:""}.fa-paperclip:before{content:""}.fa-save:before,.fa-floppy-o:before{content:""}.fa-square:before{content:""}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:""}.fa-list-ul:before{content:""}.fa-list-ol:before{content:""}.fa-strikethrough:before{content:""}.fa-underline:before{content:""}.fa-table:before{content:""}.fa-magic:before{content:""}.fa-truck:before{content:""}.fa-pinterest:before{content:""}.fa-pinterest-square:before{content:""}.fa-google-plus-square:before{content:""}.fa-google-plus:before{content:""}.fa-money:before{content:""}.fa-caret-down:before,.wy-dropdown .caret:before,.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.fa-caret-left:before{content:""}.fa-caret-right:before{content:""}.fa-columns:before{content:""}.fa-unsorted:before,.fa-sort:before{content:""}.fa-sort-down:before,.fa-sort-desc:before{content:""}.fa-sort-up:before,.fa-sort-asc:before{content:""}.fa-envelope:before{content:""}.fa-linkedin:before{content:""}.fa-rotate-left:before,.fa-undo:before{content:""}.fa-legal:before,.fa-gavel:before{content:""}.fa-dashboard:before,.fa-tachometer:before{content:""}.fa-comment-o:before{content:""}.fa-comments-o:before{content:""}.fa-flash:before,.fa-bolt:before{content:""}.fa-sitemap:before{content:""}.fa-umbrella:before{content:""}.fa-paste:before,.fa-clipboard:before{content:""}.fa-lightbulb-o:before{content:""}.fa-exchange:before{content:""}.fa-cloud-download:before{content:""}.fa-cloud-upload:before{content:""}.fa-user-md:before{content:""}.fa-stethoscope:before{content:""}.fa-suitcase:before{content:""}.fa-bell-o:before{content:""}.fa-coffee:before{content:""}.fa-cutlery:before{content:""}.fa-file-text-o:before{content:""}.fa-building-o:before{content:""}.fa-hospital-o:before{content:""}.fa-ambulance:before{content:""}.fa-medkit:before{content:""}.fa-fighter-jet:before{content:""}.fa-beer:before{content:""}.fa-h-square:before{content:""}.fa-plus-square:before{content:""}.fa-angle-double-left:before{content:""}.fa-angle-double-right:before{content:""}.fa-angle-double-up:before{content:""}.fa-angle-double-down:before{content:""}.fa-angle-left:before{content:""}.fa-angle-right:before{content:""}.fa-angle-up:before{content:""}.fa-angle-down:before{content:""}.fa-desktop:before{content:""}.fa-laptop:before{content:""}.fa-tablet:before{content:""}.fa-mobile-phone:before,.fa-mobile:before{content:""}.fa-circle-o:before{content:""}.fa-quote-left:before{content:""}.fa-quote-right:before{content:""}.fa-spinner:before{content:""}.fa-circle:before{content:""}.fa-mail-reply:before,.fa-reply:before{content:""}.fa-github-alt:before{content:""}.fa-folder-o:before{content:""}.fa-folder-open-o:before{content:""}.fa-smile-o:before{content:""}.fa-frown-o:before{content:""}.fa-meh-o:before{content:""}.fa-gamepad:before{content:""}.fa-keyboard-o:before{content:""}.fa-flag-o:before{content:""}.fa-flag-checkered:before{content:""}.fa-terminal:before{content:""}.fa-code:before{content:""}.fa-mail-reply-all:before,.fa-reply-all:before{content:""}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:""}.fa-location-arrow:before{content:""}.fa-crop:before{content:""}.fa-code-fork:before{content:""}.fa-unlink:before,.fa-chain-broken:before{content:""}.fa-question:before{content:""}.fa-info:before{content:""}.fa-exclamation:before{content:""}.fa-superscript:before{content:""}.fa-subscript:before{content:""}.fa-eraser:before{content:""}.fa-puzzle-piece:before{content:""}.fa-microphone:before{content:""}.fa-microphone-slash:before{content:""}.fa-shield:before{content:""}.fa-calendar-o:before{content:""}.fa-fire-extinguisher:before{content:""}.fa-rocket:before{content:""}.fa-maxcdn:before{content:""}.fa-chevron-circle-left:before{content:""}.fa-chevron-circle-right:before{content:""}.fa-chevron-circle-up:before{content:""}.fa-chevron-circle-down:before{content:""}.fa-html5:before{content:""}.fa-css3:before{content:""}.fa-anchor:before{content:""}.fa-unlock-alt:before{content:""}.fa-bullseye:before{content:""}.fa-ellipsis-h:before{content:""}.fa-ellipsis-v:before{content:""}.fa-rss-square:before{content:""}.fa-play-circle:before{content:""}.fa-ticket:before{content:""}.fa-minus-square:before{content:""}.fa-minus-square-o:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before{content:""}.fa-level-up:before{content:""}.fa-level-down:before{content:""}.fa-check-square:before{content:""}.fa-pencil-square:before{content:""}.fa-external-link-square:before{content:""}.fa-share-square:before{content:""}.fa-compass:before{content:""}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:""}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:""}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:""}.fa-euro:before,.fa-eur:before{content:""}.fa-gbp:before{content:""}.fa-dollar:before,.fa-usd:before{content:""}.fa-rupee:before,.fa-inr:before{content:""}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:""}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:""}.fa-won:before,.fa-krw:before{content:""}.fa-bitcoin:before,.fa-btc:before{content:""}.fa-file:before{content:""}.fa-file-text:before{content:""}.fa-sort-alpha-asc:before{content:""}.fa-sort-alpha-desc:before{content:""}.fa-sort-amount-asc:before{content:""}.fa-sort-amount-desc:before{content:""}.fa-sort-numeric-asc:before{content:""}.fa-sort-numeric-desc:before{content:""}.fa-thumbs-up:before{content:""}.fa-thumbs-down:before{content:""}.fa-youtube-square:before{content:""}.fa-youtube:before{content:""}.fa-xing:before{content:""}.fa-xing-square:before{content:""}.fa-youtube-play:before{content:""}.fa-dropbox:before{content:""}.fa-stack-overflow:before{content:""}.fa-instagram:before{content:""}.fa-flickr:before{content:""}.fa-adn:before{content:""}.fa-bitbucket:before,.icon-bitbucket:before{content:""}.fa-bitbucket-square:before{content:""}.fa-tumblr:before{content:""}.fa-tumblr-square:before{content:""}.fa-long-arrow-down:before{content:""}.fa-long-arrow-up:before{content:""}.fa-long-arrow-left:before{content:""}.fa-long-arrow-right:before{content:""}.fa-apple:before{content:""}.fa-windows:before{content:""}.fa-android:before{content:""}.fa-linux:before{content:""}.fa-dribbble:before{content:""}.fa-skype:before{content:""}.fa-foursquare:before{content:""}.fa-trello:before{content:""}.fa-female:before{content:""}.fa-male:before{content:""}.fa-gittip:before,.fa-gratipay:before{content:""}.fa-sun-o:before{content:""}.fa-moon-o:before{content:""}.fa-archive:before{content:""}.fa-bug:before{content:""}.fa-vk:before{content:""}.fa-weibo:before{content:""}.fa-renren:before{content:""}.fa-pagelines:before{content:""}.fa-stack-exchange:before{content:""}.fa-arrow-circle-o-right:before{content:""}.fa-arrow-circle-o-left:before{content:""}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:""}.fa-dot-circle-o:before{content:""}.fa-wheelchair:before{content:""}.fa-vimeo-square:before{content:""}.fa-turkish-lira:before,.fa-try:before{content:""}.fa-plus-square-o:before,.wy-menu-vertical li span.toctree-expand:before{content:""}.fa-space-shuttle:before{content:""}.fa-slack:before{content:""}.fa-envelope-square:before{content:""}.fa-wordpress:before{content:""}.fa-openid:before{content:""}.fa-institution:before,.fa-bank:before,.fa-university:before{content:""}.fa-mortar-board:before,.fa-graduation-cap:before{content:""}.fa-yahoo:before{content:""}.fa-google:before{content:""}.fa-reddit:before{content:""}.fa-reddit-square:before{content:""}.fa-stumbleupon-circle:before{content:""}.fa-stumbleupon:before{content:""}.fa-delicious:before{content:""}.fa-digg:before{content:""}.fa-pied-piper-pp:before{content:""}.fa-pied-piper-alt:before{content:""}.fa-drupal:before{content:""}.fa-joomla:before{content:""}.fa-language:before{content:""}.fa-fax:before{content:""}.fa-building:before{content:""}.fa-child:before{content:""}.fa-paw:before{content:""}.fa-spoon:before{content:""}.fa-cube:before{content:""}.fa-cubes:before{content:""}.fa-behance:before{content:""}.fa-behance-square:before{content:""}.fa-steam:before{content:""}.fa-steam-square:before{content:""}.fa-recycle:before{content:""}.fa-automobile:before,.fa-car:before{content:""}.fa-cab:before,.fa-taxi:before{content:""}.fa-tree:before{content:""}.fa-spotify:before{content:""}.fa-deviantart:before{content:""}.fa-soundcloud:before{content:""}.fa-database:before{content:""}.fa-file-pdf-o:before{content:""}.fa-file-word-o:before{content:""}.fa-file-excel-o:before{content:""}.fa-file-powerpoint-o:before{content:""}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:""}.fa-file-zip-o:before,.fa-file-archive-o:before{content:""}.fa-file-sound-o:before,.fa-file-audio-o:before{content:""}.fa-file-movie-o:before,.fa-file-video-o:before{content:""}.fa-file-code-o:before{content:""}.fa-vine:before{content:""}.fa-codepen:before{content:""}.fa-jsfiddle:before{content:""}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:""}.fa-circle-o-notch:before{content:""}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:""}.fa-ge:before,.fa-empire:before{content:""}.fa-git-square:before{content:""}.fa-git:before{content:""}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:""}.fa-tencent-weibo:before{content:""}.fa-qq:before{content:""}.fa-wechat:before,.fa-weixin:before{content:""}.fa-send:before,.fa-paper-plane:before{content:""}.fa-send-o:before,.fa-paper-plane-o:before{content:""}.fa-history:before{content:""}.fa-circle-thin:before{content:""}.fa-header:before{content:""}.fa-paragraph:before{content:""}.fa-sliders:before{content:""}.fa-share-alt:before{content:""}.fa-share-alt-square:before{content:""}.fa-bomb:before{content:""}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:""}.fa-tty:before{content:""}.fa-binoculars:before{content:""}.fa-plug:before{content:""}.fa-slideshare:before{content:""}.fa-twitch:before{content:""}.fa-yelp:before{content:""}.fa-newspaper-o:before{content:""}.fa-wifi:before{content:""}.fa-calculator:before{content:""}.fa-paypal:before{content:""}.fa-google-wallet:before{content:""}.fa-cc-visa:before{content:""}.fa-cc-mastercard:before{content:""}.fa-cc-discover:before{content:""}.fa-cc-amex:before{content:""}.fa-cc-paypal:before{content:""}.fa-cc-stripe:before{content:""}.fa-bell-slash:before{content:""}.fa-bell-slash-o:before{content:""}.fa-trash:before{content:""}.fa-copyright:before{content:""}.fa-at:before{content:""}.fa-eyedropper:before{content:""}.fa-paint-brush:before{content:""}.fa-birthday-cake:before{content:""}.fa-area-chart:before{content:""}.fa-pie-chart:before{content:""}.fa-line-chart:before{content:""}.fa-lastfm:before{content:""}.fa-lastfm-square:before{content:""}.fa-toggle-off:before{content:""}.fa-toggle-on:before{content:""}.fa-bicycle:before{content:""}.fa-bus:before{content:""}.fa-ioxhost:before{content:""}.fa-angellist:before{content:""}.fa-cc:before{content:""}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:""}.fa-meanpath:before{content:""}.fa-buysellads:before{content:""}.fa-connectdevelop:before{content:""}.fa-dashcube:before{content:""}.fa-forumbee:before{content:""}.fa-leanpub:before{content:""}.fa-sellsy:before{content:""}.fa-shirtsinbulk:before{content:""}.fa-simplybuilt:before{content:""}.fa-skyatlas:before{content:""}.fa-cart-plus:before{content:""}.fa-cart-arrow-down:before{content:""}.fa-diamond:before{content:""}.fa-ship:before{content:""}.fa-user-secret:before{content:""}.fa-motorcycle:before{content:""}.fa-street-view:before{content:""}.fa-heartbeat:before{content:""}.fa-venus:before{content:""}.fa-mars:before{content:""}.fa-mercury:before{content:""}.fa-intersex:before,.fa-transgender:before{content:""}.fa-transgender-alt:before{content:""}.fa-venus-double:before{content:""}.fa-mars-double:before{content:""}.fa-venus-mars:before{content:""}.fa-mars-stroke:before{content:""}.fa-mars-stroke-v:before{content:""}.fa-mars-stroke-h:before{content:""}.fa-neuter:before{content:""}.fa-genderless:before{content:""}.fa-facebook-official:before{content:""}.fa-pinterest-p:before{content:""}.fa-whatsapp:before{content:""}.fa-server:before{content:""}.fa-user-plus:before{content:""}.fa-user-times:before{content:""}.fa-hotel:before,.fa-bed:before{content:""}.fa-viacoin:before{content:""}.fa-train:before{content:""}.fa-subway:before{content:""}.fa-medium:before{content:""}.fa-yc:before,.fa-y-combinator:before{content:""}.fa-optin-monster:before{content:""}.fa-opencart:before{content:""}.fa-expeditedssl:before{content:""}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:""}.fa-battery-3:before,.fa-battery-three-quarters:before{content:""}.fa-battery-2:before,.fa-battery-half:before{content:""}.fa-battery-1:before,.fa-battery-quarter:before{content:""}.fa-battery-0:before,.fa-battery-empty:before{content:""}.fa-mouse-pointer:before{content:""}.fa-i-cursor:before{content:""}.fa-object-group:before{content:""}.fa-object-ungroup:before{content:""}.fa-sticky-note:before{content:""}.fa-sticky-note-o:before{content:""}.fa-cc-jcb:before{content:""}.fa-cc-diners-club:before{content:""}.fa-clone:before{content:""}.fa-balance-scale:before{content:""}.fa-hourglass-o:before{content:""}.fa-hourglass-1:before,.fa-hourglass-start:before{content:""}.fa-hourglass-2:before,.fa-hourglass-half:before{content:""}.fa-hourglass-3:before,.fa-hourglass-end:before{content:""}.fa-hourglass:before{content:""}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:""}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:""}.fa-hand-scissors-o:before{content:""}.fa-hand-lizard-o:before{content:""}.fa-hand-spock-o:before{content:""}.fa-hand-pointer-o:before{content:""}.fa-hand-peace-o:before{content:""}.fa-trademark:before{content:""}.fa-registered:before{content:""}.fa-creative-commons:before{content:""}.fa-gg:before{content:""}.fa-gg-circle:before{content:""}.fa-tripadvisor:before{content:""}.fa-odnoklassniki:before{content:""}.fa-odnoklassniki-square:before{content:""}.fa-get-pocket:before{content:""}.fa-wikipedia-w:before{content:""}.fa-safari:before{content:""}.fa-chrome:before{content:""}.fa-firefox:before{content:""}.fa-opera:before{content:""}.fa-internet-explorer:before{content:""}.fa-tv:before,.fa-television:before{content:""}.fa-contao:before{content:""}.fa-500px:before{content:""}.fa-amazon:before{content:""}.fa-calendar-plus-o:before{content:""}.fa-calendar-minus-o:before{content:""}.fa-calendar-times-o:before{content:""}.fa-calendar-check-o:before{content:""}.fa-industry:before{content:""}.fa-map-pin:before{content:""}.fa-map-signs:before{content:""}.fa-map-o:before{content:""}.fa-map:before{content:""}.fa-commenting:before{content:""}.fa-commenting-o:before{content:""}.fa-houzz:before{content:""}.fa-vimeo:before{content:""}.fa-black-tie:before{content:""}.fa-fonticons:before{content:""}.fa-reddit-alien:before{content:""}.fa-edge:before{content:""}.fa-credit-card-alt:before{content:""}.fa-codiepie:before{content:""}.fa-modx:before{content:""}.fa-fort-awesome:before{content:""}.fa-usb:before{content:""}.fa-product-hunt:before{content:""}.fa-mixcloud:before{content:""}.fa-scribd:before{content:""}.fa-pause-circle:before{content:""}.fa-pause-circle-o:before{content:""}.fa-stop-circle:before{content:""}.fa-stop-circle-o:before{content:""}.fa-shopping-bag:before{content:""}.fa-shopping-basket:before{content:""}.fa-hashtag:before{content:""}.fa-bluetooth:before{content:""}.fa-bluetooth-b:before{content:""}.fa-percent:before{content:""}.fa-gitlab:before,.icon-gitlab:before{content:""}.fa-wpbeginner:before{content:""}.fa-wpforms:before{content:""}.fa-envira:before{content:""}.fa-universal-access:before{content:""}.fa-wheelchair-alt:before{content:""}.fa-question-circle-o:before{content:""}.fa-blind:before{content:""}.fa-audio-description:before{content:""}.fa-volume-control-phone:before{content:""}.fa-braille:before{content:""}.fa-assistive-listening-systems:before{content:""}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:""}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:""}.fa-glide:before{content:""}.fa-glide-g:before{content:""}.fa-signing:before,.fa-sign-language:before{content:""}.fa-low-vision:before{content:""}.fa-viadeo:before{content:""}.fa-viadeo-square:before{content:""}.fa-snapchat:before{content:""}.fa-snapchat-ghost:before{content:""}.fa-snapchat-square:before{content:""}.fa-pied-piper:before{content:""}.fa-first-order:before{content:""}.fa-yoast:before{content:""}.fa-themeisle:before{content:""}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:""}.fa-fa:before,.fa-font-awesome:before{content:""}.fa-handshake-o:before{content:""}.fa-envelope-open:before{content:""}.fa-envelope-open-o:before{content:""}.fa-linode:before{content:""}.fa-address-book:before{content:""}.fa-address-book-o:before{content:""}.fa-vcard:before,.fa-address-card:before{content:""}.fa-vcard-o:before,.fa-address-card-o:before{content:""}.fa-user-circle:before{content:""}.fa-user-circle-o:before{content:""}.fa-user-o:before{content:""}.fa-id-badge:before{content:""}.fa-drivers-license:before,.fa-id-card:before{content:""}.fa-drivers-license-o:before,.fa-id-card-o:before{content:""}.fa-quora:before{content:""}.fa-free-code-camp:before{content:""}.fa-telegram:before{content:""}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:""}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:""}.fa-thermometer-2:before,.fa-thermometer-half:before{content:""}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:""}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:""}.fa-shower:before{content:""}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:""}.fa-podcast:before{content:""}.fa-window-maximize:before{content:""}.fa-window-minimize:before{content:""}.fa-window-restore:before{content:""}.fa-times-rectangle:before,.fa-window-close:before{content:""}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:""}.fa-bandcamp:before{content:""}.fa-grav:before{content:""}.fa-etsy:before{content:""}.fa-imdb:before{content:""}.fa-ravelry:before{content:""}.fa-eercast:before{content:""}.fa-microchip:before{content:""}.fa-snowflake-o:before{content:""}.fa-superpowers:before{content:""}.fa-wpexplorer:before{content:""}.fa-meetup:before{content:""}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.fa,.wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink,.rst-content table>caption .headerlink,.rst-content tt.download span:first-child,.rst-content code.download span:first-child,.icon,.wy-dropdown .caret,.wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-info .wy-input-context{font-family:inherit}.fa:before,.wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content table>caption .headerlink:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before{font-family:"FontAwesome";display:inline-block;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa,a .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,a .rst-content .admonition-title,.rst-content a .admonition-title,a .rst-content h1 .headerlink,.rst-content h1 a .headerlink,a .rst-content h2 .headerlink,.rst-content h2 a .headerlink,a .rst-content h3 .headerlink,.rst-content h3 a .headerlink,a .rst-content h4 .headerlink,.rst-content h4 a .headerlink,a .rst-content h5 .headerlink,.rst-content h5 a .headerlink,a .rst-content h6 .headerlink,.rst-content h6 a .headerlink,a .rst-content dl dt .headerlink,.rst-content dl dt a .headerlink,a .rst-content p.caption .headerlink,.rst-content p.caption a .headerlink,a .rst-content table>caption .headerlink,.rst-content table>caption a .headerlink,a .rst-content tt.download span:first-child,.rst-content tt.download a span:first-child,a .rst-content code.download span:first-child,.rst-content code.download a span:first-child,a .icon{display:inline-block;text-decoration:inherit}.btn .fa,.btn .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .btn span.toctree-expand,.btn .wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.on a .btn span.toctree-expand,.btn .wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.current>a .btn span.toctree-expand,.btn .rst-content .admonition-title,.rst-content .btn .admonition-title,.btn .rst-content h1 .headerlink,.rst-content h1 .btn .headerlink,.btn .rst-content h2 .headerlink,.rst-content h2 .btn .headerlink,.btn .rst-content h3 .headerlink,.rst-content h3 .btn .headerlink,.btn .rst-content h4 .headerlink,.rst-content h4 .btn .headerlink,.btn .rst-content h5 .headerlink,.rst-content h5 .btn .headerlink,.btn .rst-content h6 .headerlink,.rst-content h6 .btn .headerlink,.btn .rst-content dl dt .headerlink,.rst-content dl dt .btn .headerlink,.btn .rst-content p.caption .headerlink,.rst-content p.caption .btn .headerlink,.btn .rst-content table>caption .headerlink,.rst-content table>caption .btn .headerlink,.btn .rst-content tt.download span:first-child,.rst-content tt.download .btn span:first-child,.btn .rst-content code.download span:first-child,.rst-content code.download .btn span:first-child,.btn .icon,.nav .fa,.nav .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .nav span.toctree-expand,.nav .wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.on a .nav span.toctree-expand,.nav .wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.current>a .nav span.toctree-expand,.nav .rst-content .admonition-title,.rst-content .nav .admonition-title,.nav .rst-content h1 .headerlink,.rst-content h1 .nav .headerlink,.nav .rst-content h2 .headerlink,.rst-content h2 .nav .headerlink,.nav .rst-content h3 .headerlink,.rst-content h3 .nav .headerlink,.nav .rst-content h4 .headerlink,.rst-content h4 .nav .headerlink,.nav .rst-content h5 .headerlink,.rst-content h5 .nav .headerlink,.nav .rst-content h6 .headerlink,.rst-content h6 .nav .headerlink,.nav .rst-content dl dt .headerlink,.rst-content dl dt .nav .headerlink,.nav .rst-content p.caption .headerlink,.rst-content p.caption .nav .headerlink,.nav .rst-content table>caption .headerlink,.rst-content table>caption .nav .headerlink,.nav .rst-content tt.download span:first-child,.rst-content tt.download .nav span:first-child,.nav .rst-content code.download span:first-child,.rst-content code.download .nav span:first-child,.nav .icon{display:inline}.btn .fa.fa-large,.btn .wy-menu-vertical li span.fa-large.toctree-expand,.wy-menu-vertical li .btn span.fa-large.toctree-expand,.btn .rst-content .fa-large.admonition-title,.rst-content .btn .fa-large.admonition-title,.btn .rst-content h1 .fa-large.headerlink,.rst-content h1 .btn .fa-large.headerlink,.btn .rst-content h2 .fa-large.headerlink,.rst-content h2 .btn .fa-large.headerlink,.btn .rst-content h3 .fa-large.headerlink,.rst-content h3 .btn .fa-large.headerlink,.btn .rst-content h4 .fa-large.headerlink,.rst-content h4 .btn .fa-large.headerlink,.btn .rst-content h5 .fa-large.headerlink,.rst-content h5 .btn .fa-large.headerlink,.btn .rst-content h6 .fa-large.headerlink,.rst-content h6 .btn .fa-large.headerlink,.btn .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .btn .fa-large.headerlink,.btn .rst-content p.caption .fa-large.headerlink,.rst-content p.caption .btn .fa-large.headerlink,.btn .rst-content table>caption .fa-large.headerlink,.rst-content table>caption .btn .fa-large.headerlink,.btn .rst-content tt.download span.fa-large:first-child,.rst-content tt.download .btn span.fa-large:first-child,.btn .rst-content code.download span.fa-large:first-child,.rst-content code.download .btn span.fa-large:first-child,.btn .fa-large.icon,.nav .fa.fa-large,.nav .wy-menu-vertical li span.fa-large.toctree-expand,.wy-menu-vertical li .nav span.fa-large.toctree-expand,.nav .rst-content .fa-large.admonition-title,.rst-content .nav .fa-large.admonition-title,.nav .rst-content h1 .fa-large.headerlink,.rst-content h1 .nav .fa-large.headerlink,.nav .rst-content h2 .fa-large.headerlink,.rst-content h2 .nav .fa-large.headerlink,.nav .rst-content h3 .fa-large.headerlink,.rst-content h3 .nav .fa-large.headerlink,.nav .rst-content h4 .fa-large.headerlink,.rst-content h4 .nav .fa-large.headerlink,.nav .rst-content h5 .fa-large.headerlink,.rst-content h5 .nav .fa-large.headerlink,.nav .rst-content h6 .fa-large.headerlink,.rst-content h6 .nav .fa-large.headerlink,.nav .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .nav .fa-large.headerlink,.nav .rst-content p.caption .fa-large.headerlink,.rst-content p.caption .nav .fa-large.headerlink,.nav .rst-content table>caption .fa-large.headerlink,.rst-content table>caption .nav .fa-large.headerlink,.nav .rst-content tt.download span.fa-large:first-child,.rst-content tt.download .nav span.fa-large:first-child,.nav .rst-content code.download span.fa-large:first-child,.rst-content code.download .nav span.fa-large:first-child,.nav .fa-large.icon{line-height:.9em}.btn .fa.fa-spin,.btn .wy-menu-vertical li span.fa-spin.toctree-expand,.wy-menu-vertical li .btn span.fa-spin.toctree-expand,.btn .rst-content .fa-spin.admonition-title,.rst-content .btn .fa-spin.admonition-title,.btn .rst-content h1 .fa-spin.headerlink,.rst-content h1 .btn .fa-spin.headerlink,.btn .rst-content h2 .fa-spin.headerlink,.rst-content h2 .btn .fa-spin.headerlink,.btn .rst-content h3 .fa-spin.headerlink,.rst-content h3 .btn .fa-spin.headerlink,.btn .rst-content h4 .fa-spin.headerlink,.rst-content h4 .btn .fa-spin.headerlink,.btn .rst-content h5 .fa-spin.headerlink,.rst-content h5 .btn .fa-spin.headerlink,.btn .rst-content h6 .fa-spin.headerlink,.rst-content h6 .btn .fa-spin.headerlink,.btn .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .btn .fa-spin.headerlink,.btn .rst-content p.caption .fa-spin.headerlink,.rst-content p.caption .btn .fa-spin.headerlink,.btn .rst-content table>caption .fa-spin.headerlink,.rst-content table>caption .btn .fa-spin.headerlink,.btn .rst-content tt.download span.fa-spin:first-child,.rst-content tt.download .btn span.fa-spin:first-child,.btn .rst-content code.download span.fa-spin:first-child,.rst-content code.download .btn span.fa-spin:first-child,.btn .fa-spin.icon,.nav .fa.fa-spin,.nav .wy-menu-vertical li span.fa-spin.toctree-expand,.wy-menu-vertical li .nav span.fa-spin.toctree-expand,.nav .rst-content .fa-spin.admonition-title,.rst-content .nav .fa-spin.admonition-title,.nav .rst-content h1 .fa-spin.headerlink,.rst-content h1 .nav .fa-spin.headerlink,.nav .rst-content h2 .fa-spin.headerlink,.rst-content h2 .nav .fa-spin.headerlink,.nav .rst-content h3 .fa-spin.headerlink,.rst-content h3 .nav .fa-spin.headerlink,.nav .rst-content h4 .fa-spin.headerlink,.rst-content h4 .nav .fa-spin.headerlink,.nav .rst-content h5 .fa-spin.headerlink,.rst-content h5 .nav .fa-spin.headerlink,.nav .rst-content h6 .fa-spin.headerlink,.rst-content h6 .nav .fa-spin.headerlink,.nav .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .nav .fa-spin.headerlink,.nav .rst-content p.caption .fa-spin.headerlink,.rst-content p.caption .nav .fa-spin.headerlink,.nav .rst-content table>caption .fa-spin.headerlink,.rst-content table>caption .nav .fa-spin.headerlink,.nav .rst-content tt.download span.fa-spin:first-child,.rst-content tt.download .nav span.fa-spin:first-child,.nav .rst-content code.download span.fa-spin:first-child,.rst-content code.download .nav span.fa-spin:first-child,.nav .fa-spin.icon{display:inline-block}.btn.fa:before,.wy-menu-vertical li span.btn.toctree-expand:before,.rst-content .btn.admonition-title:before,.rst-content h1 .btn.headerlink:before,.rst-content h2 .btn.headerlink:before,.rst-content h3 .btn.headerlink:before,.rst-content h4 .btn.headerlink:before,.rst-content h5 .btn.headerlink:before,.rst-content h6 .btn.headerlink:before,.rst-content dl dt .btn.headerlink:before,.rst-content p.caption .btn.headerlink:before,.rst-content table>caption .btn.headerlink:before,.rst-content tt.download span.btn:first-child:before,.rst-content code.download span.btn:first-child:before,.btn.icon:before{opacity:.5;-webkit-transition:opacity .05s ease-in;-moz-transition:opacity .05s ease-in;transition:opacity .05s ease-in}.btn.fa:hover:before,.wy-menu-vertical li span.btn.toctree-expand:hover:before,.rst-content .btn.admonition-title:hover:before,.rst-content h1 .btn.headerlink:hover:before,.rst-content h2 .btn.headerlink:hover:before,.rst-content h3 .btn.headerlink:hover:before,.rst-content h4 .btn.headerlink:hover:before,.rst-content h5 .btn.headerlink:hover:before,.rst-content h6 .btn.headerlink:hover:before,.rst-content dl dt .btn.headerlink:hover:before,.rst-content p.caption .btn.headerlink:hover:before,.rst-content table>caption .btn.headerlink:hover:before,.rst-content tt.download span.btn:first-child:hover:before,.rst-content code.download span.btn:first-child:hover:before,.btn.icon:hover:before{opacity:1}.btn-mini .fa:before,.btn-mini .wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li .btn-mini span.toctree-expand:before,.btn-mini .rst-content .admonition-title:before,.rst-content .btn-mini .admonition-title:before,.btn-mini .rst-content h1 .headerlink:before,.rst-content h1 .btn-mini .headerlink:before,.btn-mini .rst-content h2 .headerlink:before,.rst-content h2 .btn-mini .headerlink:before,.btn-mini .rst-content h3 .headerlink:before,.rst-content h3 .btn-mini .headerlink:before,.btn-mini .rst-content h4 .headerlink:before,.rst-content h4 .btn-mini .headerlink:before,.btn-mini .rst-content h5 .headerlink:before,.rst-content h5 .btn-mini .headerlink:before,.btn-mini .rst-content h6 .headerlink:before,.rst-content h6 .btn-mini .headerlink:before,.btn-mini .rst-content dl dt .headerlink:before,.rst-content dl dt .btn-mini .headerlink:before,.btn-mini .rst-content p.caption .headerlink:before,.rst-content p.caption .btn-mini .headerlink:before,.btn-mini .rst-content table>caption .headerlink:before,.rst-content table>caption .btn-mini .headerlink:before,.btn-mini .rst-content tt.download span:first-child:before,.rst-content tt.download .btn-mini span:first-child:before,.btn-mini .rst-content code.download span:first-child:before,.rst-content code.download .btn-mini span:first-child:before,.btn-mini .icon:before{font-size:14px;vertical-align:-15%}.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo,.rst-content .admonition{padding:12px;line-height:24px;margin-bottom:24px;background:#e7f2fa}.wy-alert-title,.rst-content .admonition-title{color:#fff;font-weight:bold;display:block;color:#fff;background:#6ab0de;margin:-12px;padding:6px 12px;margin-bottom:12px}.wy-alert.wy-alert-danger,.rst-content .wy-alert-danger.note,.rst-content .wy-alert-danger.attention,.rst-content .wy-alert-danger.caution,.rst-content .danger,.rst-content .error,.rst-content .wy-alert-danger.hint,.rst-content .wy-alert-danger.important,.rst-content .wy-alert-danger.tip,.rst-content .wy-alert-danger.warning,.rst-content .wy-alert-danger.seealso,.rst-content .wy-alert-danger.admonition-todo,.rst-content .wy-alert-danger.admonition{background:#fdf3f2}.wy-alert.wy-alert-danger .wy-alert-title,.rst-content .wy-alert-danger.note .wy-alert-title,.rst-content .wy-alert-danger.attention .wy-alert-title,.rst-content .wy-alert-danger.caution .wy-alert-title,.rst-content .danger .wy-alert-title,.rst-content .error .wy-alert-title,.rst-content .wy-alert-danger.hint .wy-alert-title,.rst-content .wy-alert-danger.important .wy-alert-title,.rst-content .wy-alert-danger.tip .wy-alert-title,.rst-content .wy-alert-danger.warning .wy-alert-title,.rst-content .wy-alert-danger.seealso .wy-alert-title,.rst-content .wy-alert-danger.admonition-todo .wy-alert-title,.rst-content .wy-alert-danger.admonition .wy-alert-title,.wy-alert.wy-alert-danger .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-danger .admonition-title,.rst-content .wy-alert-danger.note .admonition-title,.rst-content .wy-alert-danger.attention .admonition-title,.rst-content .wy-alert-danger.caution .admonition-title,.rst-content .danger .admonition-title,.rst-content .error .admonition-title,.rst-content .wy-alert-danger.hint .admonition-title,.rst-content .wy-alert-danger.important .admonition-title,.rst-content .wy-alert-danger.tip .admonition-title,.rst-content .wy-alert-danger.warning .admonition-title,.rst-content .wy-alert-danger.seealso .admonition-title,.rst-content .wy-alert-danger.admonition-todo .admonition-title,.rst-content .wy-alert-danger.admonition .admonition-title{background:#f29f97}.wy-alert.wy-alert-warning,.rst-content .wy-alert-warning.note,.rst-content .attention,.rst-content .caution,.rst-content .wy-alert-warning.danger,.rst-content .wy-alert-warning.error,.rst-content .wy-alert-warning.hint,.rst-content .wy-alert-warning.important,.rst-content .wy-alert-warning.tip,.rst-content .warning,.rst-content .wy-alert-warning.seealso,.rst-content .admonition-todo,.rst-content .wy-alert-warning.admonition{background:#ffedcc}.wy-alert.wy-alert-warning .wy-alert-title,.rst-content .wy-alert-warning.note .wy-alert-title,.rst-content .attention .wy-alert-title,.rst-content .caution .wy-alert-title,.rst-content .wy-alert-warning.danger .wy-alert-title,.rst-content .wy-alert-warning.error .wy-alert-title,.rst-content .wy-alert-warning.hint .wy-alert-title,.rst-content .wy-alert-warning.important .wy-alert-title,.rst-content .wy-alert-warning.tip .wy-alert-title,.rst-content .warning .wy-alert-title,.rst-content .wy-alert-warning.seealso .wy-alert-title,.rst-content .admonition-todo .wy-alert-title,.rst-content .wy-alert-warning.admonition .wy-alert-title,.wy-alert.wy-alert-warning .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-warning .admonition-title,.rst-content .wy-alert-warning.note .admonition-title,.rst-content .attention .admonition-title,.rst-content .caution .admonition-title,.rst-content .wy-alert-warning.danger .admonition-title,.rst-content .wy-alert-warning.error .admonition-title,.rst-content .wy-alert-warning.hint .admonition-title,.rst-content .wy-alert-warning.important .admonition-title,.rst-content .wy-alert-warning.tip .admonition-title,.rst-content .warning .admonition-title,.rst-content .wy-alert-warning.seealso .admonition-title,.rst-content .admonition-todo .admonition-title,.rst-content .wy-alert-warning.admonition .admonition-title{background:#f0b37e}.wy-alert.wy-alert-info,.rst-content .note,.rst-content .wy-alert-info.attention,.rst-content .wy-alert-info.caution,.rst-content .wy-alert-info.danger,.rst-content .wy-alert-info.error,.rst-content .wy-alert-info.hint,.rst-content .wy-alert-info.important,.rst-content .wy-alert-info.tip,.rst-content .wy-alert-info.warning,.rst-content .seealso,.rst-content .wy-alert-info.admonition-todo,.rst-content .wy-alert-info.admonition{background:#e7f2fa}.wy-alert.wy-alert-info .wy-alert-title,.rst-content .note .wy-alert-title,.rst-content .wy-alert-info.attention .wy-alert-title,.rst-content .wy-alert-info.caution .wy-alert-title,.rst-content .wy-alert-info.danger .wy-alert-title,.rst-content .wy-alert-info.error .wy-alert-title,.rst-content .wy-alert-info.hint .wy-alert-title,.rst-content .wy-alert-info.important .wy-alert-title,.rst-content .wy-alert-info.tip .wy-alert-title,.rst-content .wy-alert-info.warning .wy-alert-title,.rst-content .seealso .wy-alert-title,.rst-content .wy-alert-info.admonition-todo .wy-alert-title,.rst-content .wy-alert-info.admonition .wy-alert-title,.wy-alert.wy-alert-info .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-info .admonition-title,.rst-content .note .admonition-title,.rst-content .wy-alert-info.attention .admonition-title,.rst-content .wy-alert-info.caution .admonition-title,.rst-content .wy-alert-info.danger .admonition-title,.rst-content .wy-alert-info.error .admonition-title,.rst-content .wy-alert-info.hint .admonition-title,.rst-content .wy-alert-info.important .admonition-title,.rst-content .wy-alert-info.tip .admonition-title,.rst-content .wy-alert-info.warning .admonition-title,.rst-content .seealso .admonition-title,.rst-content .wy-alert-info.admonition-todo .admonition-title,.rst-content .wy-alert-info.admonition .admonition-title{background:#6ab0de}.wy-alert.wy-alert-success,.rst-content .wy-alert-success.note,.rst-content .wy-alert-success.attention,.rst-content .wy-alert-success.caution,.rst-content .wy-alert-success.danger,.rst-content .wy-alert-success.error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .wy-alert-success.warning,.rst-content .wy-alert-success.seealso,.rst-content .wy-alert-success.admonition-todo,.rst-content .wy-alert-success.admonition{background:#dbfaf4}.wy-alert.wy-alert-success .wy-alert-title,.rst-content .wy-alert-success.note .wy-alert-title,.rst-content .wy-alert-success.attention .wy-alert-title,.rst-content .wy-alert-success.caution .wy-alert-title,.rst-content .wy-alert-success.danger .wy-alert-title,.rst-content .wy-alert-success.error .wy-alert-title,.rst-content .hint .wy-alert-title,.rst-content .important .wy-alert-title,.rst-content .tip .wy-alert-title,.rst-content .wy-alert-success.warning .wy-alert-title,.rst-content .wy-alert-success.seealso .wy-alert-title,.rst-content .wy-alert-success.admonition-todo .wy-alert-title,.rst-content .wy-alert-success.admonition .wy-alert-title,.wy-alert.wy-alert-success .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-success .admonition-title,.rst-content .wy-alert-success.note .admonition-title,.rst-content .wy-alert-success.attention .admonition-title,.rst-content .wy-alert-success.caution .admonition-title,.rst-content .wy-alert-success.danger .admonition-title,.rst-content .wy-alert-success.error .admonition-title,.rst-content .hint .admonition-title,.rst-content .important .admonition-title,.rst-content .tip .admonition-title,.rst-content .wy-alert-success.warning .admonition-title,.rst-content .wy-alert-success.seealso .admonition-title,.rst-content .wy-alert-success.admonition-todo .admonition-title,.rst-content .wy-alert-success.admonition .admonition-title{background:#1abc9c}.wy-alert.wy-alert-neutral,.rst-content .wy-alert-neutral.note,.rst-content .wy-alert-neutral.attention,.rst-content .wy-alert-neutral.caution,.rst-content .wy-alert-neutral.danger,.rst-content .wy-alert-neutral.error,.rst-content .wy-alert-neutral.hint,.rst-content .wy-alert-neutral.important,.rst-content .wy-alert-neutral.tip,.rst-content .wy-alert-neutral.warning,.rst-content .wy-alert-neutral.seealso,.rst-content .wy-alert-neutral.admonition-todo,.rst-content .wy-alert-neutral.admonition{background:#f3f6f6}.wy-alert.wy-alert-neutral .wy-alert-title,.rst-content .wy-alert-neutral.note .wy-alert-title,.rst-content .wy-alert-neutral.attention .wy-alert-title,.rst-content .wy-alert-neutral.caution .wy-alert-title,.rst-content .wy-alert-neutral.danger .wy-alert-title,.rst-content .wy-alert-neutral.error .wy-alert-title,.rst-content .wy-alert-neutral.hint .wy-alert-title,.rst-content .wy-alert-neutral.important .wy-alert-title,.rst-content .wy-alert-neutral.tip .wy-alert-title,.rst-content .wy-alert-neutral.warning .wy-alert-title,.rst-content .wy-alert-neutral.seealso .wy-alert-title,.rst-content .wy-alert-neutral.admonition-todo .wy-alert-title,.rst-content .wy-alert-neutral.admonition .wy-alert-title,.wy-alert.wy-alert-neutral .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-neutral .admonition-title,.rst-content .wy-alert-neutral.note .admonition-title,.rst-content .wy-alert-neutral.attention .admonition-title,.rst-content .wy-alert-neutral.caution .admonition-title,.rst-content .wy-alert-neutral.danger .admonition-title,.rst-content .wy-alert-neutral.error .admonition-title,.rst-content .wy-alert-neutral.hint .admonition-title,.rst-content .wy-alert-neutral.important .admonition-title,.rst-content .wy-alert-neutral.tip .admonition-title,.rst-content .wy-alert-neutral.warning .admonition-title,.rst-content .wy-alert-neutral.seealso .admonition-title,.rst-content .wy-alert-neutral.admonition-todo .admonition-title,.rst-content .wy-alert-neutral.admonition .admonition-title{color:#404040;background:#e1e4e5}.wy-alert.wy-alert-neutral a,.rst-content .wy-alert-neutral.note a,.rst-content .wy-alert-neutral.attention a,.rst-content .wy-alert-neutral.caution a,.rst-content .wy-alert-neutral.danger a,.rst-content .wy-alert-neutral.error a,.rst-content .wy-alert-neutral.hint a,.rst-content .wy-alert-neutral.important a,.rst-content .wy-alert-neutral.tip a,.rst-content .wy-alert-neutral.warning a,.rst-content .wy-alert-neutral.seealso a,.rst-content .wy-alert-neutral.admonition-todo a,.rst-content .wy-alert-neutral.admonition a{color:#2980B9}.wy-alert p:last-child,.rst-content .note p:last-child,.rst-content .attention p:last-child,.rst-content .caution p:last-child,.rst-content .danger p:last-child,.rst-content .error p:last-child,.rst-content .hint p:last-child,.rst-content .important p:last-child,.rst-content .tip p:last-child,.rst-content .warning p:last-child,.rst-content .seealso p:last-child,.rst-content .admonition-todo p:last-child,.rst-content .admonition p:last-child{margin-bottom:0}.wy-tray-container{position:fixed;bottom:0px;left:0;z-index:600}.wy-tray-container li{display:block;width:300px;background:transparent;color:#fff;text-align:center;box-shadow:0 5px 5px 0 rgba(0,0,0,0.1);padding:0 24px;min-width:20%;opacity:0;height:0;line-height:56px;overflow:hidden;-webkit-transition:all .3s ease-in;-moz-transition:all .3s ease-in;transition:all .3s ease-in}.wy-tray-container li.wy-tray-item-success{background:#27AE60}.wy-tray-container li.wy-tray-item-info{background:#2980B9}.wy-tray-container li.wy-tray-item-warning{background:#E67E22}.wy-tray-container li.wy-tray-item-danger{background:#E74C3C}.wy-tray-container li.on{opacity:1;height:56px}@media screen and (max-width: 768px){.wy-tray-container{bottom:auto;top:0;width:100%}.wy-tray-container li{width:100%}}button{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;cursor:pointer;line-height:normal;-webkit-appearance:button;*overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}button[disabled]{cursor:default}.btn{display:inline-block;border-radius:2px;line-height:normal;white-space:nowrap;text-align:center;cursor:pointer;font-size:100%;padding:6px 12px 8px 12px;color:#fff;border:1px solid rgba(0,0,0,0.1);background-color:#27AE60;text-decoration:none;font-weight:normal;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:0px 1px 2px -1px rgba(255,255,255,0.5) inset,0px -2px 0px 0px rgba(0,0,0,0.1) inset;outline-none:false;vertical-align:middle;*display:inline;zoom:1;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transition:all .1s linear;-moz-transition:all .1s linear;transition:all .1s linear}.btn-hover{background:#2e8ece;color:#fff}.btn:hover{background:#2cc36b;color:#fff}.btn:focus{background:#2cc36b;outline:0}.btn:active{box-shadow:0px -1px 0px 0px rgba(0,0,0,0.05) inset,0px 2px 0px 0px rgba(0,0,0,0.1) inset;padding:8px 12px 6px 12px}.btn:visited{color:#fff}.btn:disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:.4;cursor:not-allowed;box-shadow:none}.btn-disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:.4;cursor:not-allowed;box-shadow:none}.btn-disabled:hover,.btn-disabled:focus,.btn-disabled:active{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:.4;cursor:not-allowed;box-shadow:none}.btn::-moz-focus-inner{padding:0;border:0}.btn-small{font-size:80%}.btn-info{background-color:#2980B9 !important}.btn-info:hover{background-color:#2e8ece !important}.btn-neutral{background-color:#f3f6f6 !important;color:#404040 !important}.btn-neutral:hover{background-color:#e5ebeb !important;color:#404040}.btn-neutral:visited{color:#404040 !important}.btn-success{background-color:#27AE60 !important}.btn-success:hover{background-color:#295 !important}.btn-danger{background-color:#E74C3C !important}.btn-danger:hover{background-color:#ea6153 !important}.btn-warning{background-color:#E67E22 !important}.btn-warning:hover{background-color:#e98b39 !important}.btn-invert{background-color:#222}.btn-invert:hover{background-color:#2f2f2f !important}.btn-link{background-color:transparent !important;color:#2980B9;box-shadow:none;border-color:transparent !important}.btn-link:hover{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:active{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:visited{color:#9B59B6}.wy-btn-group .btn,.wy-control .btn{vertical-align:middle}.wy-btn-group{margin-bottom:24px;*zoom:1}.wy-btn-group:before,.wy-btn-group:after{display:table;content:""}.wy-btn-group:after{clear:both}.wy-dropdown{position:relative;display:inline-block}.wy-dropdown-active .wy-dropdown-menu{display:block}.wy-dropdown-menu{position:absolute;left:0;display:none;float:left;top:100%;min-width:100%;background:#fcfcfc;z-index:100;border:solid 1px #cfd7dd;box-shadow:0 2px 2px 0 rgba(0,0,0,0.1);padding:12px}.wy-dropdown-menu>dd>a{display:block;clear:both;color:#404040;white-space:nowrap;font-size:90%;padding:0 12px;cursor:pointer}.wy-dropdown-menu>dd>a:hover{background:#2980B9;color:#fff}.wy-dropdown-menu>dd.divider{border-top:solid 1px #cfd7dd;margin:6px 0}.wy-dropdown-menu>dd.search{padding-bottom:12px}.wy-dropdown-menu>dd.search input[type="search"]{width:100%}.wy-dropdown-menu>dd.call-to-action{background:#e3e3e3;text-transform:uppercase;font-weight:500;font-size:80%}.wy-dropdown-menu>dd.call-to-action:hover{background:#e3e3e3}.wy-dropdown-menu>dd.call-to-action .btn{color:#fff}.wy-dropdown.wy-dropdown-up .wy-dropdown-menu{bottom:100%;top:auto;left:auto;right:0}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu{background:#fcfcfc;margin-top:2px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a{padding:6px 12px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover{background:#2980B9;color:#fff}.wy-dropdown.wy-dropdown-left .wy-dropdown-menu{right:0;left:auto;text-align:right}.wy-dropdown-arrow:before{content:" ";border-bottom:5px solid #f5f5f5;border-left:5px solid transparent;border-right:5px solid transparent;position:absolute;display:block;top:-4px;left:50%;margin-left:-3px}.wy-dropdown-arrow.wy-dropdown-arrow-left:before{left:11px}.wy-form-stacked select{display:block}.wy-form-aligned input,.wy-form-aligned textarea,.wy-form-aligned select,.wy-form-aligned .wy-help-inline,.wy-form-aligned label{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-form-aligned .wy-control-group>label{display:inline-block;vertical-align:middle;width:10em;margin:6px 12px 0 0;float:left}.wy-form-aligned .wy-control{float:left}.wy-form-aligned .wy-control label{display:block}.wy-form-aligned .wy-control select{margin-top:6px}fieldset{border:0;margin:0;padding:0}legend{display:block;width:100%;border:0;padding:0;white-space:normal;margin-bottom:24px;font-size:150%;*margin-left:-7px}label{display:block;margin:0 0 .3125em 0;color:#333;font-size:90%}input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}.wy-control-group{margin-bottom:24px;*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;*zoom:1}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group.wy-control-group-required>label:after{content:" *";color:#E74C3C}.wy-control-group .wy-form-full,.wy-control-group .wy-form-halves,.wy-control-group .wy-form-thirds{padding-bottom:12px}.wy-control-group .wy-form-full select,.wy-control-group .wy-form-halves select,.wy-control-group .wy-form-thirds select{width:100%}.wy-control-group .wy-form-full input[type="text"],.wy-control-group .wy-form-full input[type="password"],.wy-control-group .wy-form-full input[type="email"],.wy-control-group .wy-form-full input[type="url"],.wy-control-group .wy-form-full input[type="date"],.wy-control-group .wy-form-full input[type="month"],.wy-control-group .wy-form-full input[type="time"],.wy-control-group .wy-form-full input[type="datetime"],.wy-control-group .wy-form-full input[type="datetime-local"],.wy-control-group .wy-form-full input[type="week"],.wy-control-group .wy-form-full input[type="number"],.wy-control-group .wy-form-full input[type="search"],.wy-control-group .wy-form-full input[type="tel"],.wy-control-group .wy-form-full input[type="color"],.wy-control-group .wy-form-halves input[type="text"],.wy-control-group .wy-form-halves input[type="password"],.wy-control-group .wy-form-halves input[type="email"],.wy-control-group .wy-form-halves input[type="url"],.wy-control-group .wy-form-halves input[type="date"],.wy-control-group .wy-form-halves input[type="month"],.wy-control-group .wy-form-halves input[type="time"],.wy-control-group .wy-form-halves input[type="datetime"],.wy-control-group .wy-form-halves input[type="datetime-local"],.wy-control-group .wy-form-halves input[type="week"],.wy-control-group .wy-form-halves input[type="number"],.wy-control-group .wy-form-halves input[type="search"],.wy-control-group .wy-form-halves input[type="tel"],.wy-control-group .wy-form-halves input[type="color"],.wy-control-group .wy-form-thirds input[type="text"],.wy-control-group .wy-form-thirds input[type="password"],.wy-control-group .wy-form-thirds input[type="email"],.wy-control-group .wy-form-thirds input[type="url"],.wy-control-group .wy-form-thirds input[type="date"],.wy-control-group .wy-form-thirds input[type="month"],.wy-control-group .wy-form-thirds input[type="time"],.wy-control-group .wy-form-thirds input[type="datetime"],.wy-control-group .wy-form-thirds input[type="datetime-local"],.wy-control-group .wy-form-thirds input[type="week"],.wy-control-group .wy-form-thirds input[type="number"],.wy-control-group .wy-form-thirds input[type="search"],.wy-control-group .wy-form-thirds input[type="tel"],.wy-control-group .wy-form-thirds input[type="color"]{width:100%}.wy-control-group .wy-form-full{float:left;display:block;margin-right:2.3576515979%;width:100%;margin-right:0}.wy-control-group .wy-form-full:last-child{margin-right:0}.wy-control-group .wy-form-halves{float:left;display:block;margin-right:2.3576515979%;width:48.821174201%}.wy-control-group .wy-form-halves:last-child{margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n){margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n+1){clear:left}.wy-control-group .wy-form-thirds{float:left;display:block;margin-right:2.3576515979%;width:31.7615656014%}.wy-control-group .wy-form-thirds:last-child{margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n){margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n+1){clear:left}.wy-control-group.wy-control-group-no-input .wy-control{margin:6px 0 0 0;font-size:90%}.wy-control-no-input{display:inline-block;margin:6px 0 0 0;font-size:90%}.wy-control-group.fluid-input input[type="text"],.wy-control-group.fluid-input input[type="password"],.wy-control-group.fluid-input input[type="email"],.wy-control-group.fluid-input input[type="url"],.wy-control-group.fluid-input input[type="date"],.wy-control-group.fluid-input input[type="month"],.wy-control-group.fluid-input input[type="time"],.wy-control-group.fluid-input input[type="datetime"],.wy-control-group.fluid-input input[type="datetime-local"],.wy-control-group.fluid-input input[type="week"],.wy-control-group.fluid-input input[type="number"],.wy-control-group.fluid-input input[type="search"],.wy-control-group.fluid-input input[type="tel"],.wy-control-group.fluid-input input[type="color"]{width:100%}.wy-form-message-inline{display:inline-block;padding-left:.3em;color:#666;vertical-align:middle;font-size:90%}.wy-form-message{display:block;color:#999;font-size:70%;margin-top:.3125em;font-style:italic}.wy-form-message p{font-size:inherit;font-style:italic;margin-bottom:6px}.wy-form-message p:last-child{margin-bottom:0}input{line-height:normal}input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;*overflow:visible}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"]{-webkit-appearance:none;padding:6px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;border-radius:0;-webkit-transition:border .3s linear;-moz-transition:border .3s linear;transition:border .3s linear}input[type="datetime-local"]{padding:.34375em .625em}input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin-right:.3125em;*height:13px;*width:13px}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}input[type="text"]:focus,input[type="password"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus{outline:0;outline:thin dotted \9;border-color:#333}input.no-focus:focus{border-color:#ccc !important}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:1px auto #129FEA}input[type="text"][disabled],input[type="password"][disabled],input[type="email"][disabled],input[type="url"][disabled],input[type="date"][disabled],input[type="month"][disabled],input[type="time"][disabled],input[type="datetime"][disabled],input[type="datetime-local"][disabled],input[type="week"][disabled],input[type="number"][disabled],input[type="search"][disabled],input[type="tel"][disabled],input[type="color"][disabled]{cursor:not-allowed;background-color:#fafafa}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#E74C3C;border:1px solid #E74C3C}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#E74C3C}input[type="file"]:focus:invalid:focus,input[type="radio"]:focus:invalid:focus,input[type="checkbox"]:focus:invalid:focus{outline-color:#E74C3C}input.wy-input-large{padding:12px;font-size:100%}textarea{overflow:auto;vertical-align:top;width:100%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif}select,textarea{padding:.5em .625em;display:inline-block;border:1px solid #ccc;font-size:80%;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border .3s linear;-moz-transition:border .3s linear;transition:border .3s linear}select{border:1px solid #ccc;background-color:#fff}select[multiple]{height:auto}select:focus,textarea:focus{outline:0}select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#fafafa}input[type="radio"][disabled],input[type="checkbox"][disabled]{cursor:not-allowed}.wy-checkbox,.wy-radio{margin:6px 0;color:#404040;display:block}.wy-checkbox input,.wy-radio input{vertical-align:baseline}.wy-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-input-prefix,.wy-input-suffix{white-space:nowrap;padding:6px}.wy-input-prefix .wy-input-context,.wy-input-suffix .wy-input-context{line-height:27px;padding:0 8px;display:inline-block;font-size:80%;background-color:#f3f6f6;border:solid 1px #ccc;color:#999}.wy-input-suffix .wy-input-context{border-left:0}.wy-input-prefix .wy-input-context{border-right:0}.wy-switch{position:relative;display:block;height:24px;margin-top:12px;cursor:pointer}.wy-switch:before{position:absolute;content:"";display:block;left:0;top:0;width:36px;height:12px;border-radius:4px;background:#ccc;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.wy-switch:after{position:absolute;content:"";display:block;width:18px;height:18px;border-radius:4px;background:#999;left:-3px;top:-3px;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.wy-switch span{position:absolute;left:48px;display:block;font-size:12px;color:#ccc;line-height:1}.wy-switch.active:before{background:#1e8449}.wy-switch.active:after{left:24px;background:#27AE60}.wy-switch.disabled{cursor:not-allowed;opacity:.8}.wy-control-group.wy-control-group-error .wy-form-message,.wy-control-group.wy-control-group-error>label{color:#E74C3C}.wy-control-group.wy-control-group-error input[type="text"],.wy-control-group.wy-control-group-error input[type="password"],.wy-control-group.wy-control-group-error input[type="email"],.wy-control-group.wy-control-group-error input[type="url"],.wy-control-group.wy-control-group-error input[type="date"],.wy-control-group.wy-control-group-error input[type="month"],.wy-control-group.wy-control-group-error input[type="time"],.wy-control-group.wy-control-group-error input[type="datetime"],.wy-control-group.wy-control-group-error input[type="datetime-local"],.wy-control-group.wy-control-group-error input[type="week"],.wy-control-group.wy-control-group-error input[type="number"],.wy-control-group.wy-control-group-error input[type="search"],.wy-control-group.wy-control-group-error input[type="tel"],.wy-control-group.wy-control-group-error input[type="color"]{border:solid 1px #E74C3C}.wy-control-group.wy-control-group-error textarea{border:solid 1px #E74C3C}.wy-inline-validate{white-space:nowrap}.wy-inline-validate .wy-input-context{padding:.5em .625em;display:inline-block;font-size:80%}.wy-inline-validate.wy-inline-validate-success .wy-input-context{color:#27AE60}.wy-inline-validate.wy-inline-validate-danger .wy-input-context{color:#E74C3C}.wy-inline-validate.wy-inline-validate-warning .wy-input-context{color:#E67E22}.wy-inline-validate.wy-inline-validate-info .wy-input-context{color:#2980B9}.rotate-90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.rotate-180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.rotate-270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.mirror{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1)}.mirror.rotate-90{-webkit-transform:scaleX(-1) rotate(90deg);-moz-transform:scaleX(-1) rotate(90deg);-ms-transform:scaleX(-1) rotate(90deg);-o-transform:scaleX(-1) rotate(90deg);transform:scaleX(-1) rotate(90deg)}.mirror.rotate-180{-webkit-transform:scaleX(-1) rotate(180deg);-moz-transform:scaleX(-1) rotate(180deg);-ms-transform:scaleX(-1) rotate(180deg);-o-transform:scaleX(-1) rotate(180deg);transform:scaleX(-1) rotate(180deg)}.mirror.rotate-270{-webkit-transform:scaleX(-1) rotate(270deg);-moz-transform:scaleX(-1) rotate(270deg);-ms-transform:scaleX(-1) rotate(270deg);-o-transform:scaleX(-1) rotate(270deg);transform:scaleX(-1) rotate(270deg)}@media only screen and (max-width: 480px){.wy-form button[type="submit"]{margin:.7em 0 0}.wy-form input[type="text"],.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:.3em;display:block}.wy-form label{margin-bottom:.3em;display:block}.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0}.wy-form-aligned .wy-control-group label{margin-bottom:.3em;text-align:left;display:block;width:100%}.wy-form-aligned .wy-control{margin:1.5em 0 0 0}.wy-form .wy-help-inline,.wy-form-message-inline,.wy-form-message{display:block;font-size:80%;padding:6px 0}}@media screen and (max-width: 768px){.tablet-hide{display:none}}@media screen and (max-width: 480px){.mobile-hide{display:none}}.float-left{float:left}.float-right{float:right}.full-width{width:100%}.wy-table,.rst-content table.docutils,.rst-content table.field-list{border-collapse:collapse;border-spacing:0;empty-cells:show;margin-bottom:24px}.wy-table caption,.rst-content table.docutils caption,.rst-content table.field-list caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td,.wy-table th,.rst-content table.docutils th,.rst-content table.field-list th{font-size:90%;margin:0;overflow:visible;padding:8px 16px}.wy-table td:first-child,.rst-content table.docutils td:first-child,.rst-content table.field-list td:first-child,.wy-table th:first-child,.rst-content table.docutils th:first-child,.rst-content table.field-list th:first-child{border-left-width:0}.wy-table thead,.rst-content table.docutils thead,.rst-content table.field-list thead{color:#000;text-align:left;vertical-align:bottom;white-space:nowrap}.wy-table thead th,.rst-content table.docutils thead th,.rst-content table.field-list thead th{font-weight:bold;border-bottom:solid 2px #e1e4e5}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td{background-color:transparent;vertical-align:middle}.wy-table td p,.rst-content table.docutils td p,.rst-content table.field-list td p{line-height:18px}.wy-table td p:last-child,.rst-content table.docutils td p:last-child,.rst-content table.field-list td p:last-child{margin-bottom:0}.wy-table .wy-table-cell-min,.rst-content table.docutils .wy-table-cell-min,.rst-content table.field-list .wy-table-cell-min{width:1%;padding-right:0}.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox],.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox]{margin:0}.wy-table-secondary{color:gray;font-size:90%}.wy-table-tertiary{color:gray;font-size:80%}.wy-table-odd td,.wy-table-striped tr:nth-child(2n-1) td,.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td{background-color:#f3f6f6}.wy-table-backed{background-color:#f3f6f6}.wy-table-bordered-all,.rst-content table.docutils{border:1px solid #e1e4e5}.wy-table-bordered-all td,.rst-content table.docutils td{border-bottom:1px solid #e1e4e5;border-left:1px solid #e1e4e5}.wy-table-bordered-all tbody>tr:last-child td,.rst-content table.docutils tbody>tr:last-child td{border-bottom-width:0}.wy-table-bordered{border:1px solid #e1e4e5}.wy-table-bordered-rows td{border-bottom:1px solid #e1e4e5}.wy-table-bordered-rows tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal td,.wy-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #e1e4e5}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-responsive{margin-bottom:24px;max-width:100%;overflow:auto}.wy-table-responsive table{margin-bottom:0 !important}.wy-table-responsive table td,.wy-table-responsive table th{white-space:nowrap}a{color:#2980B9;text-decoration:none;cursor:pointer}a:hover{color:#3091d1}a:visited{color:#9B59B6}html{height:100%;overflow-x:hidden}body{font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;font-weight:normal;color:#404040;min-height:100%;overflow-x:hidden;background:#edf0f2}.wy-text-left{text-align:left}.wy-text-center{text-align:center}.wy-text-right{text-align:right}.wy-text-large{font-size:120%}.wy-text-normal{font-size:100%}.wy-text-small,small{font-size:80%}.wy-text-strike{text-decoration:line-through}.wy-text-warning{color:#E67E22 !important}a.wy-text-warning:hover{color:#eb9950 !important}.wy-text-info{color:#2980B9 !important}a.wy-text-info:hover{color:#409ad5 !important}.wy-text-success{color:#27AE60 !important}a.wy-text-success:hover{color:#36d278 !important}.wy-text-danger{color:#E74C3C !important}a.wy-text-danger:hover{color:#ed7669 !important}.wy-text-neutral{color:#404040 !important}a.wy-text-neutral:hover{color:#595959 !important}h1,h2,.rst-content .toctree-wrapper p.caption,h3,h4,h5,h6,legend{margin-top:0;font-weight:700;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif}p{line-height:24px;margin:0;font-size:16px;margin-bottom:24px}h1{font-size:175%}h2,.rst-content .toctree-wrapper p.caption{font-size:150%}h3{font-size:125%}h4{font-size:115%}h5{font-size:110%}h6{font-size:100%}hr{display:block;height:1px;border:0;border-top:1px solid #e1e4e5;margin:24px 0;padding:0}code,.rst-content tt,.rst-content code{white-space:nowrap;max-width:100%;background:#fff;border:solid 1px #e1e4e5;font-size:75%;padding:0 5px;font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",Courier,monospace;color:#E74C3C;overflow-x:auto}code.code-large,.rst-content tt.code-large{font-size:90%}.wy-plain-list-disc,.rst-content .section ul,.rst-content .toctree-wrapper ul,article ul{list-style:disc;line-height:24px;margin-bottom:24px}.wy-plain-list-disc li,.rst-content .section ul li,.rst-content .toctree-wrapper ul li,article ul li{list-style:disc;margin-left:24px}.wy-plain-list-disc li p:last-child,.rst-content .section ul li p:last-child,.rst-content .toctree-wrapper ul li p:last-child,article ul li p:last-child{margin-bottom:0}.wy-plain-list-disc li ul,.rst-content .section ul li ul,.rst-content .toctree-wrapper ul li ul,article ul li ul{margin-bottom:0}.wy-plain-list-disc li li,.rst-content .section ul li li,.rst-content .toctree-wrapper ul li li,article ul li li{list-style:circle}.wy-plain-list-disc li li li,.rst-content .section ul li li li,.rst-content .toctree-wrapper ul li li li,article ul li li li{list-style:square}.wy-plain-list-disc li ol li,.rst-content .section ul li ol li,.rst-content .toctree-wrapper ul li ol li,article ul li ol li{list-style:decimal}.wy-plain-list-decimal,.rst-content .section ol,.rst-content ol.arabic,article ol{list-style:decimal;line-height:24px;margin-bottom:24px}.wy-plain-list-decimal li,.rst-content .section ol li,.rst-content ol.arabic li,article ol li{list-style:decimal;margin-left:24px}.wy-plain-list-decimal li p:last-child,.rst-content .section ol li p:last-child,.rst-content ol.arabic li p:last-child,article ol li p:last-child{margin-bottom:0}.wy-plain-list-decimal li ul,.rst-content .section ol li ul,.rst-content ol.arabic li ul,article ol li ul{margin-bottom:0}.wy-plain-list-decimal li ul li,.rst-content .section ol li ul li,.rst-content ol.arabic li ul li,article ol li ul li{list-style:disc}.wy-breadcrumbs{*zoom:1}.wy-breadcrumbs:before,.wy-breadcrumbs:after{display:table;content:""}.wy-breadcrumbs:after{clear:both}.wy-breadcrumbs li{display:inline-block}.wy-breadcrumbs li.wy-breadcrumbs-aside{float:right}.wy-breadcrumbs li a{display:inline-block;padding:5px}.wy-breadcrumbs li a:first-child{padding-left:0}.wy-breadcrumbs li code,.wy-breadcrumbs li .rst-content tt,.rst-content .wy-breadcrumbs li tt{padding:5px;border:none;background:none}.wy-breadcrumbs li code.literal,.wy-breadcrumbs li .rst-content tt.literal,.rst-content .wy-breadcrumbs li tt.literal{color:#404040}.wy-breadcrumbs-extra{margin-bottom:0;color:#b3b3b3;font-size:80%;display:inline-block}@media screen and (max-width: 480px){.wy-breadcrumbs-extra{display:none}.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}@media print{.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}html{font-size:16px}.wy-affix{position:fixed;top:1.618em}.wy-menu a:hover{text-decoration:none}.wy-menu-horiz{*zoom:1}.wy-menu-horiz:before,.wy-menu-horiz:after{display:table;content:""}.wy-menu-horiz:after{clear:both}.wy-menu-horiz ul,.wy-menu-horiz li{display:inline-block}.wy-menu-horiz li:hover{background:rgba(255,255,255,0.1)}.wy-menu-horiz li.divide-left{border-left:solid 1px #404040}.wy-menu-horiz li.divide-right{border-right:solid 1px #404040}.wy-menu-horiz a{height:32px;display:inline-block;line-height:32px;padding:0 16px}.wy-menu-vertical{width:300px}.wy-menu-vertical header,.wy-menu-vertical p.caption{height:32px;display:inline-block;line-height:32px;padding:0 1.618em;margin-bottom:0;display:block;font-weight:bold;text-transform:uppercase;font-size:80%;white-space:nowrap}.wy-menu-vertical ul{margin-bottom:0}.wy-menu-vertical li.divide-top{border-top:solid 1px #404040}.wy-menu-vertical li.divide-bottom{border-bottom:solid 1px #404040}.wy-menu-vertical li.current{background:#e3e3e3}.wy-menu-vertical li.current a{color:gray;border-right:solid 1px #c9c9c9;padding:.4045em 2.427em}.wy-menu-vertical li.current a:hover{background:#d6d6d6}.wy-menu-vertical li code,.wy-menu-vertical li .rst-content tt,.rst-content .wy-menu-vertical li tt{border:none;background:inherit;color:inherit;padding-left:0;padding-right:0}.wy-menu-vertical li span.toctree-expand{display:block;float:left;margin-left:-1.2em;font-size:.8em;line-height:1.6em;color:#4d4d4d}.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a{color:#404040;padding:.4045em 1.618em;font-weight:bold;position:relative;background:#fcfcfc;border:none;padding-left:1.618em -4px}.wy-menu-vertical li.on a:hover,.wy-menu-vertical li.current>a:hover{background:#fcfcfc}.wy-menu-vertical li.on a:hover span.toctree-expand,.wy-menu-vertical li.current>a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand{display:block;font-size:.8em;line-height:1.6em;color:#333}.wy-menu-vertical li.toctree-l1.current>a{border-bottom:solid 1px #c9c9c9;border-top:solid 1px #c9c9c9}.wy-menu-vertical li.toctree-l2 a,.wy-menu-vertical li.toctree-l3 a,.wy-menu-vertical li.toctree-l4 a{color:#404040}.wy-menu-vertical li.toctree-l1.current li.toctree-l2>ul,.wy-menu-vertical li.toctree-l2.current li.toctree-l3>ul{display:none}.wy-menu-vertical li.toctree-l1.current li.toctree-l2.current>ul,.wy-menu-vertical li.toctree-l2.current li.toctree-l3.current>ul{display:block}.wy-menu-vertical li.toctree-l2.current>a{background:#c9c9c9;padding:.4045em 2.427em}.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a{display:block;background:#c9c9c9;padding:.4045em 4.045em}.wy-menu-vertical li.toctree-l2 a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.toctree-l2 span.toctree-expand{color:#a3a3a3}.wy-menu-vertical li.toctree-l3{font-size:.9em}.wy-menu-vertical li.toctree-l3.current>a{background:#bdbdbd;padding:.4045em 4.045em}.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a{display:block;background:#bdbdbd;padding:.4045em 5.663em}.wy-menu-vertical li.toctree-l3 a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.toctree-l3 span.toctree-expand{color:#969696}.wy-menu-vertical li.toctree-l4{font-size:.9em}.wy-menu-vertical li.current ul{display:block}.wy-menu-vertical li ul{margin-bottom:0;display:none}.wy-menu-vertical li ul li a{margin-bottom:0;color:#d9d9d9;font-weight:normal}.wy-menu-vertical a{display:inline-block;line-height:18px;padding:.4045em 1.618em;display:block;position:relative;font-size:90%;color:#d9d9d9}.wy-menu-vertical a:hover{background-color:#4e4a4a;cursor:pointer}.wy-menu-vertical a:hover span.toctree-expand{color:#d9d9d9}.wy-menu-vertical a:active{background-color:#2980B9;cursor:pointer;color:#fff}.wy-menu-vertical a:active span.toctree-expand{color:#fff}.wy-side-nav-search{display:block;width:300px;padding:.809em;margin-bottom:.809em;z-index:200;background-color:#2980B9;text-align:center;padding:.809em;display:block;color:#fcfcfc;margin-bottom:.809em}.wy-side-nav-search input[type=text]{width:100%;border-radius:50px;padding:6px 12px;border-color:#2472a4}.wy-side-nav-search img{display:block;margin:auto auto .809em auto;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a{color:#fcfcfc;font-size:100%;font-weight:bold;display:inline-block;padding:4px 6px;margin-bottom:.809em}.wy-side-nav-search>a:hover,.wy-side-nav-search .wy-dropdown>a:hover{background:rgba(255,255,255,0.1)}.wy-side-nav-search>a img.logo,.wy-side-nav-search .wy-dropdown>a img.logo{display:block;margin:0 auto;height:auto;width:auto;border-radius:0;max-width:100%;background:transparent}.wy-side-nav-search>a.icon img.logo,.wy-side-nav-search .wy-dropdown>a.icon img.logo{margin-top:.85em}.wy-side-nav-search>div.version{margin-top:-.4045em;margin-bottom:.809em;font-weight:normal;color:rgba(255,255,255,0.3)}.wy-nav .wy-menu-vertical header{color:#2980B9}.wy-nav .wy-menu-vertical a{color:#b3b3b3}.wy-nav .wy-menu-vertical a:hover{background-color:#2980B9;color:#fff}[data-menu-wrap]{-webkit-transition:all .2s ease-in;-moz-transition:all .2s ease-in;transition:all .2s ease-in;position:absolute;opacity:1;width:100%;opacity:0}[data-menu-wrap].move-center{left:0;right:auto;opacity:1}[data-menu-wrap].move-left{right:auto;left:-100%;opacity:0}[data-menu-wrap].move-right{right:-100%;left:auto;opacity:0}.wy-body-for-nav{background:#fcfcfc}.wy-grid-for-nav{position:absolute;width:100%;height:100%}.wy-nav-side{position:fixed;top:0;bottom:0;left:0;padding-bottom:2em;width:300px;overflow-x:hidden;overflow-y:hidden;min-height:100%;color:#9b9b9b;background:#343131;z-index:200}.wy-side-scroll{width:320px;position:relative;overflow-x:hidden;overflow-y:scroll;height:100%}.wy-nav-top{display:none;background:#2980B9;color:#fff;padding:.4045em .809em;position:relative;line-height:50px;text-align:center;font-size:100%;*zoom:1}.wy-nav-top:before,.wy-nav-top:after{display:table;content:""}.wy-nav-top:after{clear:both}.wy-nav-top a{color:#fff;font-weight:bold}.wy-nav-top img{margin-right:12px;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-nav-top i{font-size:30px;float:left;cursor:pointer;padding-top:inherit}.wy-nav-content-wrap{margin-left:300px;background:#fcfcfc;min-height:100%}.wy-nav-content{padding:1.618em 3.236em;height:100%;max-width:800px;margin:auto}.wy-body-mask{position:fixed;width:100%;height:100%;background:rgba(0,0,0,0.2);display:none;z-index:499}.wy-body-mask.on{display:block}footer{color:gray}footer p{margin-bottom:12px}footer span.commit code,footer span.commit .rst-content tt,.rst-content footer span.commit tt{padding:0px;font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",Courier,monospace;font-size:1em;background:none;border:none;color:gray}.rst-footer-buttons{*zoom:1}.rst-footer-buttons:before,.rst-footer-buttons:after{width:100%}.rst-footer-buttons:before,.rst-footer-buttons:after{display:table;content:""}.rst-footer-buttons:after{clear:both}.rst-breadcrumbs-buttons{margin-top:12px;*zoom:1}.rst-breadcrumbs-buttons:before,.rst-breadcrumbs-buttons:after{display:table;content:""}.rst-breadcrumbs-buttons:after{clear:both}#search-results .search li{margin-bottom:24px;border-bottom:solid 1px #e1e4e5;padding-bottom:24px}#search-results .search li:first-child{border-top:solid 1px #e1e4e5;padding-top:24px}#search-results .search li a{font-size:120%;margin-bottom:12px;display:inline-block}#search-results .context{color:gray;font-size:90%}@media screen and (max-width: 768px){.wy-body-for-nav{background:#fcfcfc}.wy-nav-top{display:block}.wy-nav-side{left:-300px}.wy-nav-side.shift{width:85%;left:0}.wy-side-scroll{width:auto}.wy-side-nav-search{width:auto}.wy-menu.wy-menu-vertical{width:auto}.wy-nav-content-wrap{margin-left:0}.wy-nav-content-wrap .wy-nav-content{padding:1.618em}.wy-nav-content-wrap.shift{position:fixed;min-width:100%;left:85%;top:0;height:100%;overflow:hidden}}@media screen and (min-width: 1100px){.wy-nav-content-wrap{background:rgba(0,0,0,0.05)}.wy-nav-content{margin:0;background:#fcfcfc}}@media print{.rst-versions,footer,.wy-nav-side{display:none}.wy-nav-content-wrap{margin-left:0}}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa,.rst-versions .rst-current-version .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .rst-versions .rst-current-version span.toctree-expand,.rst-versions .rst-current-version .rst-content .admonition-title,.rst-content .rst-versions .rst-current-version .admonition-title,.rst-versions .rst-current-version .rst-content h1 .headerlink,.rst-content h1 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h2 .headerlink,.rst-content h2 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h3 .headerlink,.rst-content h3 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h4 .headerlink,.rst-content h4 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h5 .headerlink,.rst-content h5 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h6 .headerlink,.rst-content h6 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content dl dt .headerlink,.rst-content dl dt .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content p.caption .headerlink,.rst-content p.caption .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content table>caption .headerlink,.rst-content table>caption .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content tt.download span:first-child,.rst-content tt.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .rst-content code.download span:first-child,.rst-content code.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .icon{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up{height:auto;max-height:100%}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}.rst-content img{max-width:100%;height:auto}.rst-content div.figure{margin-bottom:24px}.rst-content div.figure p.caption{font-style:italic}.rst-content div.figure p:last-child.caption{margin-bottom:0px}.rst-content div.figure.align-center{text-align:center}.rst-content .section>img,.rst-content .section>a>img{margin-bottom:24px}.rst-content abbr[title]{text-decoration:none}.rst-content.style-external-links a.reference.external:after{font-family:FontAwesome;content:"";color:#b3b3b3;vertical-align:super;font-size:60%;margin:0 .2em}.rst-content blockquote{margin-left:24px;line-height:24px;margin-bottom:24px}.rst-content pre.literal-block{white-space:pre;margin:0;padding:12px 12px;font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",Courier,monospace;display:block;overflow:auto}.rst-content pre.literal-block,.rst-content div[class^='highlight']{border:1px solid #e1e4e5;overflow-x:auto;margin:1px 0 24px 0}.rst-content pre.literal-block div[class^='highlight'],.rst-content div[class^='highlight'] div[class^='highlight']{padding:0px;border:none;margin:0}.rst-content div[class^='highlight'] td.code{width:100%}.rst-content .linenodiv pre{border-right:solid 1px #e6e9ea;margin:0;padding:12px 12px;font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",Courier,monospace;user-select:none;pointer-events:none}.rst-content div[class^='highlight'] pre{white-space:pre;margin:0;padding:12px 12px;display:block;overflow:auto}.rst-content div[class^='highlight'] pre .hll{display:block;margin:0 -12px;padding:0 12px}.rst-content pre.literal-block,.rst-content div[class^='highlight'] pre,.rst-content .linenodiv pre{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",Courier,monospace;font-size:12px;line-height:1.4}@media print{.rst-content .codeblock,.rst-content div[class^='highlight'],.rst-content div[class^='highlight'] pre{white-space:pre-wrap}}.rst-content .note .last,.rst-content .attention .last,.rst-content .caution .last,.rst-content .danger .last,.rst-content .error .last,.rst-content .hint .last,.rst-content .important .last,.rst-content .tip .last,.rst-content .warning .last,.rst-content .seealso .last,.rst-content .admonition-todo .last,.rst-content .admonition .last{margin-bottom:0}.rst-content .admonition-title:before{margin-right:4px}.rst-content .admonition table{border-color:rgba(0,0,0,0.1)}.rst-content .admonition table td,.rst-content .admonition table th{background:transparent !important;border-color:rgba(0,0,0,0.1) !important}.rst-content .section ol.loweralpha,.rst-content .section ol.loweralpha li{list-style:lower-alpha}.rst-content .section ol.upperalpha,.rst-content .section ol.upperalpha li{list-style:upper-alpha}.rst-content .section ol p,.rst-content .section ul p{margin-bottom:12px}.rst-content .section ol p:last-child,.rst-content .section ul p:last-child{margin-bottom:24px}.rst-content .line-block{margin-left:0px;margin-bottom:24px;line-height:24px}.rst-content .line-block .line-block{margin-left:24px;margin-bottom:0px}.rst-content .topic-title{font-weight:bold;margin-bottom:12px}.rst-content .toc-backref{color:#404040}.rst-content .align-right{float:right;margin:0px 0px 24px 24px}.rst-content .align-left{float:left;margin:0px 24px 24px 0px}.rst-content .align-center{margin:auto}.rst-content .align-center:not(table){display:block}.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content .toctree-wrapper p.caption .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink,.rst-content table>caption .headerlink{visibility:hidden;font-size:14px}.rst-content h1 .headerlink:after,.rst-content h2 .headerlink:after,.rst-content .toctree-wrapper p.caption .headerlink:after,.rst-content h3 .headerlink:after,.rst-content h4 .headerlink:after,.rst-content h5 .headerlink:after,.rst-content h6 .headerlink:after,.rst-content dl dt .headerlink:after,.rst-content p.caption .headerlink:after,.rst-content table>caption .headerlink:after{content:"";font-family:FontAwesome}.rst-content h1:hover .headerlink:after,.rst-content h2:hover .headerlink:after,.rst-content .toctree-wrapper p.caption:hover .headerlink:after,.rst-content h3:hover .headerlink:after,.rst-content h4:hover .headerlink:after,.rst-content h5:hover .headerlink:after,.rst-content h6:hover .headerlink:after,.rst-content dl dt:hover .headerlink:after,.rst-content p.caption:hover .headerlink:after,.rst-content table>caption:hover .headerlink:after{visibility:visible}.rst-content table>caption .headerlink:after{font-size:12px}.rst-content .centered{text-align:center}.rst-content .sidebar{float:right;width:40%;display:block;margin:0 0 24px 24px;padding:24px;background:#f3f6f6;border:solid 1px #e1e4e5}.rst-content .sidebar p,.rst-content .sidebar ul,.rst-content .sidebar dl{font-size:90%}.rst-content .sidebar .last{margin-bottom:0}.rst-content .sidebar .sidebar-title{display:block;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif;font-weight:bold;background:#e1e4e5;padding:6px 12px;margin:-24px;margin-bottom:24px;font-size:100%}.rst-content .highlighted{background:#F1C40F;display:inline-block;font-weight:bold;padding:0 6px}.rst-content .footnote-reference,.rst-content .citation-reference{vertical-align:baseline;position:relative;top:-0.4em;line-height:0;font-size:90%}.rst-content table.docutils.citation,.rst-content table.docutils.footnote{background:none;border:none;color:gray}.rst-content table.docutils.citation td,.rst-content table.docutils.citation tr,.rst-content table.docutils.footnote td,.rst-content table.docutils.footnote tr{border:none;background-color:transparent !important;white-space:normal}.rst-content table.docutils.citation td.label,.rst-content table.docutils.footnote td.label{padding-left:0;padding-right:0;vertical-align:top}.rst-content table.docutils.citation tt,.rst-content table.docutils.citation code,.rst-content table.docutils.footnote tt,.rst-content table.docutils.footnote code{color:#555}.rst-content .wy-table-responsive.citation,.rst-content .wy-table-responsive.footnote{margin-bottom:0}.rst-content .wy-table-responsive.citation+:not(.citation),.rst-content .wy-table-responsive.footnote+:not(.footnote){margin-top:24px}.rst-content .wy-table-responsive.citation:last-child,.rst-content .wy-table-responsive.footnote:last-child{margin-bottom:24px}.rst-content table.docutils th{border-color:#e1e4e5}.rst-content table.docutils td .last,.rst-content table.docutils td .last :last-child{margin-bottom:0}.rst-content table.field-list{border:none}.rst-content table.field-list td{border:none}.rst-content table.field-list td>strong{display:inline-block}.rst-content table.field-list .field-name{padding-right:10px;text-align:left;white-space:nowrap}.rst-content table.field-list .field-body{text-align:left}.rst-content tt,.rst-content tt,.rst-content code{color:#000;font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",Courier,monospace;padding:2px 5px}.rst-content tt big,.rst-content tt em,.rst-content tt big,.rst-content code big,.rst-content tt em,.rst-content code em{font-size:100% !important;line-height:normal}.rst-content tt.literal,.rst-content tt.literal,.rst-content code.literal{color:#E74C3C}.rst-content tt.xref,a .rst-content tt,.rst-content tt.xref,.rst-content code.xref,a .rst-content tt,a .rst-content code{font-weight:bold;color:#404040}.rst-content pre,.rst-content kbd,.rst-content samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",Courier,monospace}.rst-content a tt,.rst-content a tt,.rst-content a code{color:#2980B9}.rst-content dl{margin-bottom:24px}.rst-content dl dt{font-weight:bold;margin-bottom:12px}.rst-content dl p,.rst-content dl table,.rst-content dl ul,.rst-content dl ol{margin-bottom:12px !important}.rst-content dl dd{margin:0 0 12px 24px;line-height:24px}.rst-content dl:not(.docutils){margin-bottom:24px}.rst-content dl:not(.docutils) dt{display:table;margin:6px 0;font-size:90%;line-height:normal;background:#e7f2fa;color:#2980B9;border-top:solid 3px #6ab0de;padding:6px;position:relative}.rst-content dl:not(.docutils) dt:before{color:#6ab0de}.rst-content dl:not(.docutils) dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dl dt{margin-bottom:6px;border:none;border-left:solid 3px #ccc;background:#f0f0f0;color:#555}.rst-content dl:not(.docutils) dl dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dt:first-child{margin-top:0}.rst-content dl:not(.docutils) tt,.rst-content dl:not(.docutils) tt,.rst-content dl:not(.docutils) code{font-weight:bold}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descclassname,.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) code.descname,.rst-content dl:not(.docutils) tt.descclassname,.rst-content dl:not(.docutils) code.descclassname{background-color:transparent;border:none;padding:0;font-size:100% !important}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) code.descname{font-weight:bold}.rst-content dl:not(.docutils) .optional{display:inline-block;padding:0 4px;color:#000;font-weight:bold}.rst-content dl:not(.docutils) .property{display:inline-block;padding-right:8px}.rst-content .viewcode-link,.rst-content .viewcode-back{display:inline-block;color:#27AE60;font-size:80%;padding-left:24px}.rst-content .viewcode-back{display:block;float:right}.rst-content p.rubric{margin-bottom:12px;font-weight:bold}.rst-content tt.download,.rst-content code.download{background:inherit;padding:inherit;font-weight:normal;font-family:inherit;font-size:inherit;color:inherit;border:inherit;white-space:inherit}.rst-content tt.download span:first-child,.rst-content code.download span:first-child{-webkit-font-smoothing:subpixel-antialiased}.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before{margin-right:4px}.rst-content .guilabel{border:1px solid #7fbbe3;background:#e7f2fa;font-size:80%;font-weight:700;border-radius:4px;padding:2.4px 6px;margin:auto 2px}.rst-content .versionmodified{font-style:italic}@media screen and (max-width: 480px){.rst-content .sidebar{width:100%}}span[id*='MathJax-Span']{color:#404040}.math{text-align:center}@font-face{font-family:"Lato";src:url("../fonts/Lato/lato-regular.eot");src:url("../fonts/Lato/lato-regular.eot?#iefix") format("embedded-opentype"),url("../fonts/Lato/lato-regular.woff2") format("woff2"),url("../fonts/Lato/lato-regular.woff") format("woff"),url("../fonts/Lato/lato-regular.ttf") format("truetype");font-weight:400;font-style:normal}@font-face{font-family:"Lato";src:url("../fonts/Lato/lato-bold.eot");src:url("../fonts/Lato/lato-bold.eot?#iefix") format("embedded-opentype"),url("../fonts/Lato/lato-bold.woff2") format("woff2"),url("../fonts/Lato/lato-bold.woff") format("woff"),url("../fonts/Lato/lato-bold.ttf") format("truetype");font-weight:700;font-style:normal}@font-face{font-family:"Lato";src:url("../fonts/Lato/lato-bolditalic.eot");src:url("../fonts/Lato/lato-bolditalic.eot?#iefix") format("embedded-opentype"),url("../fonts/Lato/lato-bolditalic.woff2") format("woff2"),url("../fonts/Lato/lato-bolditalic.woff") format("woff"),url("../fonts/Lato/lato-bolditalic.ttf") format("truetype");font-weight:700;font-style:italic}@font-face{font-family:"Lato";src:url("../fonts/Lato/lato-italic.eot");src:url("../fonts/Lato/lato-italic.eot?#iefix") format("embedded-opentype"),url("../fonts/Lato/lato-italic.woff2") format("woff2"),url("../fonts/Lato/lato-italic.woff") format("woff"),url("../fonts/Lato/lato-italic.ttf") format("truetype");font-weight:400;font-style:italic}@font-face{font-family:"Roboto Slab";font-style:normal;font-weight:400;src:url("../fonts/RobotoSlab/roboto-slab.eot");src:url("../fonts/RobotoSlab/roboto-slab-v7-regular.eot?#iefix") format("embedded-opentype"),url("../fonts/RobotoSlab/roboto-slab-v7-regular.woff2") format("woff2"),url("../fonts/RobotoSlab/roboto-slab-v7-regular.woff") format("woff"),url("../fonts/RobotoSlab/roboto-slab-v7-regular.ttf") format("truetype")}@font-face{font-family:"Roboto Slab";font-style:normal;font-weight:700;src:url("../fonts/RobotoSlab/roboto-slab-v7-bold.eot");src:url("../fonts/RobotoSlab/roboto-slab-v7-bold.eot?#iefix") format("embedded-opentype"),url("../fonts/RobotoSlab/roboto-slab-v7-bold.woff2") format("woff2"),url("../fonts/RobotoSlab/roboto-slab-v7-bold.woff") format("woff"),url("../fonts/RobotoSlab/roboto-slab-v7-bold.ttf") format("truetype")}
diff --git a/docs/_theme/custom_rtd_theme/static/fonts/FontAwesome.otf b/docs/_theme/custom_rtd_theme/static/fonts/FontAwesome.otf
deleted file mode 100755
index 401ec0f3..00000000
Binary files a/docs/_theme/custom_rtd_theme/static/fonts/FontAwesome.otf and /dev/null differ
diff --git a/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.eot b/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.eot
deleted file mode 100755
index e9f60ca9..00000000
Binary files a/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.svg b/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.svg
deleted file mode 100755
index 855c845e..00000000
--- a/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,2671 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg>
-<metadata>
-Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
- By ,,,
-Copyright Dave Gandy 2016. All rights reserved.
-</metadata>
-<defs>
-<font id="FontAwesome" horiz-adv-x="1536" >
-  <font-face 
-    font-family="FontAwesome"
-    font-weight="400"
-    font-stretch="normal"
-    units-per-em="1792"
-    panose-1="0 0 0 0 0 0 0 0 0 0"
-    ascent="1536"
-    descent="-256"
-    bbox="-1.02083 -256.962 2304.6 1537.02"
-    underline-thickness="0"
-    underline-position="0"
-    unicode-range="U+0020-F500"
-  />
-<missing-glyph horiz-adv-x="896" 
-d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
-    <glyph glyph-name=".notdef" horiz-adv-x="896" 
-d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
-    <glyph glyph-name=".null" horiz-adv-x="0" 
- />
-    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="597" 
- />
-    <glyph glyph-name="space" unicode=" " horiz-adv-x="448" 
- />
-    <glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="glass" unicode="&#xf000;" horiz-adv-x="1792" 
-d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-    <glyph glyph-name="music" unicode="&#xf001;" 
-d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89
-t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="search" unicode="&#xf002;" horiz-adv-x="1664" 
-d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5
-t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-    <glyph glyph-name="envelope" unicode="&#xf003;" horiz-adv-x="1792" 
-d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13
-t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z
-M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="heart" unicode="&#xf004;" horiz-adv-x="1792" 
-d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600
-q-18 -18 -44 -18z" />
-    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="1664" 
-d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455
-l502 -73q56 -9 56 -46z" />
-    <glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664" 
-d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
-l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
-d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
-t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920" 
-d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128
-q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45
-t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128
-q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19
-t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="th_large" unicode="&#xf009;" horiz-adv-x="1664" 
-d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38
-h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="th" unicode="&#xf00a;" horiz-adv-x="1792" 
-d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320
-q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
-h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192
-q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="th_list" unicode="&#xf00b;" horiz-adv-x="1792" 
-d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960
-q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
-h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="ok" unicode="&#xf00c;" horiz-adv-x="1792" 
-d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-    <glyph glyph-name="remove" unicode="&#xf00d;" horiz-adv-x="1408" 
-d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68
-t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-    <glyph glyph-name="zoom_in" unicode="&#xf00e;" horiz-adv-x="1664" 
-d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224
-q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5
-t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-    <glyph glyph-name="zoom_out" unicode="&#xf010;" horiz-adv-x="1664" 
-d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z
-M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z
-" />
-    <glyph glyph-name="off" unicode="&#xf011;" 
-d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5
-t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-    <glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="1792" 
-d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
-v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="cog" unicode="&#xf013;" 
-d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38
-q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13
-l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22
-q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-    <glyph glyph-name="trash" unicode="&#xf014;" horiz-adv-x="1408" 
-d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576
-q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832
-q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="1664" 
-d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5
-l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-    <glyph glyph-name="file_alt" unicode="&#xf016;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-" />
-    <glyph glyph-name="time" unicode="&#xf017;" 
-d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="1920" 
-d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256
-q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-    <glyph glyph-name="download_alt" unicode="&#xf019;" horiz-adv-x="1664" 
-d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136
-q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-    <glyph glyph-name="download" unicode="&#xf01a;" 
-d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273
-t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="upload" unicode="&#xf01b;" 
-d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198
-t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="inbox" unicode="&#xf01c;" 
-d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552
-q25 -61 25 -123z" />
-    <glyph glyph-name="play_circle" unicode="&#xf01d;" 
-d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="repeat" unicode="&#xf01e;" 
-d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q15 0 25 -9
-l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-    <glyph glyph-name="refresh" unicode="&#xf021;" 
-d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117
-q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5
-q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-    <glyph glyph-name="list_alt" unicode="&#xf022;" horiz-adv-x="1792" 
-d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z
-M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5
-t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47
-t47 -113z" />
-    <glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="1152" 
-d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="flag" unicode="&#xf024;" horiz-adv-x="1792" 
-d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48
-t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="headphones" unicode="&#xf025;" horiz-adv-x="1664" 
-d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78
-t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5
-t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-    <glyph glyph-name="volume_off" unicode="&#xf026;" horiz-adv-x="768" 
-d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-    <glyph glyph-name="volume_down" unicode="&#xf027;" horiz-adv-x="1152" 
-d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
-t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-    <glyph glyph-name="volume_up" unicode="&#xf028;" horiz-adv-x="1664" 
-d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
-t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5
-t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289
-t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-    <glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="1408" 
-d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z
-M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-    <glyph glyph-name="barcode" unicode="&#xf02a;" horiz-adv-x="1792" 
-d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z
-M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-    <glyph glyph-name="tag" unicode="&#xf02b;" 
-d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
-l715 -714q37 -39 37 -91z" />
-    <glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="1920" 
-d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
-l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-    <glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="1664" 
-d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23
-q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906
-q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5
-t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="1280" 
-d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-    <glyph glyph-name="print" unicode="&#xf02f;" horiz-adv-x="1664" 
-d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68
-v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-    <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
-d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136
-q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="1664" 
-d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57
-q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -5 -0.5 -13.5t-0.5 -12.5q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5
-q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
-    <glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="1408" 
-d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142
-q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5
-t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68 -0.5t68 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5
-t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
-    <glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024" 
-d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5
-q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
-    <glyph glyph-name="text_height" unicode="&#xf034;" horiz-adv-x="1792" 
-d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2
-t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5
-q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
-q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
-    <glyph glyph-name="text_width" unicode="&#xf035;" 
-d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1
-t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
-q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5
-t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49
-t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
-    <glyph glyph-name="align_left" unicode="&#xf036;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45
-t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="align_center" unicode="&#xf037;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19
-h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="align_right" unicode="&#xf038;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
-t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="align_justify" unicode="&#xf039;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
-t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="list" unicode="&#xf03a;" horiz-adv-x="1792" 
-d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5
-t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344
-q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
-t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192
-q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="indent_left" unicode="&#xf03b;" horiz-adv-x="1792" 
-d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
-t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
-q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="indent_right" unicode="&#xf03c;" horiz-adv-x="1792" 
-d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
-t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
-q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="facetime_video" unicode="&#xf03d;" horiz-adv-x="1792" 
-d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5
-q39 -17 39 -59z" />
-    <glyph glyph-name="picture" unicode="&#xf03e;" horiz-adv-x="1920" 
-d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216
-q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="pencil" unicode="&#xf040;" 
-d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38
-q53 0 91 -38l235 -234q37 -39 37 -91z" />
-    <glyph glyph-name="map_marker" unicode="&#xf041;" horiz-adv-x="1024" 
-d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-    <glyph glyph-name="adjust" unicode="&#xf042;" 
-d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="1024" 
-d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362
-q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="1792" 
-d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
-q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92
-l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-    <glyph glyph-name="share" unicode="&#xf045;" horiz-adv-x="1664" 
-d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832
-q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5
-t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-    <glyph glyph-name="check" unicode="&#xf046;" horiz-adv-x="1664" 
-d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832
-q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110
-q24 -24 24 -57t-24 -57z" />
-    <glyph glyph-name="move" unicode="&#xf047;" horiz-adv-x="1792" 
-d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45
-t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-    <glyph glyph-name="step_backward" unicode="&#xf048;" horiz-adv-x="1024" 
-d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19z" />
-    <glyph glyph-name="fast_backward" unicode="&#xf049;" horiz-adv-x="1792" 
-d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19l710 710
-q19 19 32 13t13 -32v-710q4 10 13 19z" />
-    <glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664" 
-d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z" />
-    <glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="1408" 
-d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-    <glyph glyph-name="pause" unicode="&#xf04c;" 
-d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="stop" unicode="&#xf04d;" 
-d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664" 
-d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
-    <glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792" 
-d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
-q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
-    <glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024" 
-d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z" />
-    <glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="1538" 
-d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-    <glyph glyph-name="chevron_left" unicode="&#xf053;" horiz-adv-x="1280" 
-d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
-    <glyph glyph-name="chevron_right" unicode="&#xf054;" horiz-adv-x="1280" 
-d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
-    <glyph glyph-name="plus_sign" unicode="&#xf055;" 
-d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5
-t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="minus_sign" unicode="&#xf056;" 
-d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
-t103 -385.5z" />
-    <glyph glyph-name="remove_sign" unicode="&#xf057;" 
-d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19
-q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ok_sign" unicode="&#xf058;" 
-d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="question_sign" unicode="&#xf059;" 
-d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59
-q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="info_sign" unicode="&#xf05a;" 
-d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23
-t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="screenshot" unicode="&#xf05b;" 
-d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109
-q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143
-q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="remove_circle" unicode="&#xf05c;" 
-d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
-l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5
-t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ok_circle" unicode="&#xf05d;" 
-d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198
-t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ban_circle" unicode="&#xf05e;" 
-d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61
-t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-    <glyph glyph-name="arrow_left" unicode="&#xf060;" 
-d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5
-t32.5 -90.5z" />
-    <glyph glyph-name="arrow_right" unicode="&#xf061;" 
-d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-    <glyph glyph-name="arrow_up" unicode="&#xf062;" horiz-adv-x="1664" 
-d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651
-q37 -39 37 -91z" />
-    <glyph glyph-name="arrow_down" unicode="&#xf063;" horiz-adv-x="1664" 
-d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-    <glyph glyph-name="share_alt" unicode="&#xf064;" horiz-adv-x="1792" 
-d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22
-t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-    <glyph glyph-name="resize_full" unicode="&#xf065;" 
-d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332
-q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="resize_small" unicode="&#xf066;" 
-d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45
-t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-    <glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="1408" 
-d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="1408" 
-d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="asterisk" unicode="&#xf069;" horiz-adv-x="1664" 
-d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154
-q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-    <glyph glyph-name="exclamation_sign" unicode="&#xf06a;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192
-q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-    <glyph glyph-name="gift" unicode="&#xf06b;" 
-d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320
-q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5
-t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="1792" 
-d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268
-q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-43 0 -63.5 17.5t-45.5 59.5q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5
-t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-    <glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="1408" 
-d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1
-q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-    <glyph glyph-name="eye_open" unicode="&#xf06e;" horiz-adv-x="1792" 
-d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5
-t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-    <glyph glyph-name="eye_close" unicode="&#xf070;" horiz-adv-x="1792" 
-d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9
-q-106 -189 -316 -567t-315 -566l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5
-q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z
-" />
-    <glyph glyph-name="warning_sign" unicode="&#xf071;" horiz-adv-x="1792" 
-d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185
-q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-    <glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="1408" 
-d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9
-q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-    <glyph glyph-name="calendar" unicode="&#xf073;" horiz-adv-x="1664" 
-d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z
-M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64
-q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47
-h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="random" unicode="&#xf074;" horiz-adv-x="1792" 
-d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1
-t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5
-v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111
-t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-    <glyph glyph-name="comment" unicode="&#xf075;" horiz-adv-x="1792" 
-d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281
-q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-    <glyph glyph-name="magnet" unicode="&#xf076;" 
-d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384
-q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="chevron_up" unicode="&#xf077;" horiz-adv-x="1792" 
-d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
-    <glyph glyph-name="chevron_down" unicode="&#xf078;" horiz-adv-x="1792" 
-d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
-    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920" 
-d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -10 7 -21
-zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z
-" />
-    <glyph glyph-name="shopping_cart" unicode="&#xf07a;" horiz-adv-x="1664" 
-d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45
-t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="folder_close" unicode="&#xf07b;" horiz-adv-x="1664" 
-d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="folder_open" unicode="&#xf07c;" horiz-adv-x="1920" 
-d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5
-t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="resize_vertical" unicode="&#xf07d;" horiz-adv-x="768" 
-d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-    <glyph glyph-name="resize_horizontal" unicode="&#xf07e;" horiz-adv-x="1792" 
-d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-    <glyph glyph-name="bar_chart" unicode="&#xf080;" horiz-adv-x="2048" 
-d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
-    <glyph glyph-name="twitter_sign" unicode="&#xf081;" 
-d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4
-q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5
-t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="facebook_sign" unicode="&#xf082;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960
-q0 119 84.5 203.5t203.5 84.5h960z" />
-    <glyph glyph-name="camera_retro" unicode="&#xf083;" horiz-adv-x="1792" 
-d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5
-t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280
-q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="key" unicode="&#xf084;" horiz-adv-x="1792" 
-d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26
-l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5
-t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-    <glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="1920" 
-d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5
-t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -11 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5
-l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7
-l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -8 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31
-q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20
-t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68
-q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70
-q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="1792" 
-d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224
-q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7
-q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-    <glyph glyph-name="thumbs_up_alt" unicode="&#xf087;" 
-d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5
-t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769
-q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128
-q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-    <glyph glyph-name="thumbs_down_alt" unicode="&#xf088;" 
-d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 31 18 69q0 37 -17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5
-t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z
-M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5
-h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -73 49 -163z" />
-    <glyph glyph-name="star_half" unicode="&#xf089;" horiz-adv-x="896" 
-d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-    <glyph glyph-name="heart_empty" unicode="&#xf08a;" horiz-adv-x="1792" 
-d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559
-q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5
-q224 0 351 -124t127 -344z" />
-    <glyph glyph-name="signout" unicode="&#xf08b;" horiz-adv-x="1664" 
-d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704
-q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-    <glyph glyph-name="linkedin_sign" unicode="&#xf08c;" 
-d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5
-q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="pushpin" unicode="&#xf08d;" horiz-adv-x="1152" 
-d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38
-t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-    <glyph glyph-name="external_link" unicode="&#xf08e;" horiz-adv-x="1792" 
-d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320
-q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="signin" unicode="&#xf090;" 
-d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5
-q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="1664" 
-d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91
-t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96
-q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="github_sign" unicode="&#xf092;" 
-d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
-q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4
-t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16
-q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="upload_alt" unicode="&#xf093;" horiz-adv-x="1664" 
-d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92
-t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-    <glyph glyph-name="lemon" unicode="&#xf094;" 
-d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5
-q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44
-q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5
-q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z" />
-    <glyph glyph-name="phone" unicode="&#xf095;" horiz-adv-x="1408" 
-d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
-q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174q2 -1 19 -11.5t24 -14
-t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-    <glyph glyph-name="check_empty" unicode="&#xf096;" horiz-adv-x="1408" 
-d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
-q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="bookmark_empty" unicode="&#xf097;" horiz-adv-x="1280" 
-d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289
-q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-    <glyph glyph-name="phone_sign" unicode="&#xf098;" 
-d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
-t-3.5 16.5q0 13 20.5 33.5t45 38.5t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5
-t320.5 -216.5q6 -2 30 -11t33 -12.5t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z
-" />
-    <glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="1664" 
-d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41
-q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-    <glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="1024" 
-d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
-    <glyph glyph-name="github" unicode="&#xf09b;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
-q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5
-t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12
-q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z
-M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
-    <glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="1664" 
-d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5
-t316.5 -131.5t131.5 -316.5z" />
-    <glyph glyph-name="credit_card" unicode="&#xf09d;" horiz-adv-x="1920" 
-d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608
-q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-    <glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="1408" 
-d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5
-t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294
-q187 -186 294 -425.5t120 -501.5z" />
-    <glyph glyph-name="hdd" unicode="&#xf0a0;" 
-d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5
-h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75
-l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-    <glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="1792" 
-d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5
-t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-    <glyph glyph-name="bell" unicode="&#xf0a2;" horiz-adv-x="1792" 
-d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z
-M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5
-t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-    <glyph glyph-name="certificate" unicode="&#xf0a3;" 
-d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70
-l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70
-l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-    <glyph glyph-name="hand_right" unicode="&#xf0a4;" horiz-adv-x="1792" 
-d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106
-q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43
-q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5
-t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-    <glyph glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792" 
-d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576q-50 0 -89 -38.5
-t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45z
-M1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128q0 122 81.5 189t206.5 67
-q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="hand_up" unicode="&#xf0a6;" 
-d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576
-q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5
-t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76
-q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-    <glyph glyph-name="hand_down" unicode="&#xf0a7;" 
-d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33
-t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580
-q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100
-q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-    <glyph glyph-name="circle_arrow_left" unicode="&#xf0a8;" 
-d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="circle_arrow_right" unicode="&#xf0a9;" 
-d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="circle_arrow_up" unicode="&#xf0aa;" 
-d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="circle_arrow_down" unicode="&#xf0ab;" 
-d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="globe" unicode="&#xf0ac;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11
-q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 11t-9.5 10q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5
-q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5
-q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5
-t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-4 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3
-q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25
-q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5
-t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5
-t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10.5t17 -19.5q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21
-q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5
-q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3
-q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5
-t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q8 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5
-q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7
-q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-    <glyph glyph-name="wrench" unicode="&#xf0ad;" horiz-adv-x="1664" 
-d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5
-t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-    <glyph glyph-name="tasks" unicode="&#xf0ae;" horiz-adv-x="1792" 
-d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19
-t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="filter" unicode="&#xf0b0;" horiz-adv-x="1408" 
-d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-    <glyph glyph-name="briefcase" unicode="&#xf0b1;" horiz-adv-x="1792" 
-d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68
-t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="fullscreen" unicode="&#xf0b2;" 
-d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144
-l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z
-" />
-    <glyph glyph-name="group" unicode="&#xf0c0;" horiz-adv-x="1920" 
-d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5
-t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75
-t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5
-t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-    <glyph glyph-name="link" unicode="&#xf0c1;" horiz-adv-x="1664" 
-d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26
-l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15
-t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207
-q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-    <glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="1920" 
-d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z
-" />
-    <glyph glyph-name="beaker" unicode="&#xf0c3;" horiz-adv-x="1664" 
-d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-    <glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="1792" 
-d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84
-q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148
-q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108
-q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6
-q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="1792" 
-d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299
-h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-    <glyph glyph-name="paper_clip" unicode="&#xf0c6;" horiz-adv-x="1408" 
-d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181
-l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235
-z" />
-    <glyph glyph-name="save" unicode="&#xf0c7;" 
-d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5
-h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-    <glyph glyph-name="sign_blank" unicode="&#xf0c8;" 
-d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="reorder" unicode="&#xf0c9;" 
-d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45
-t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="ul" unicode="&#xf0ca;" horiz-adv-x="1792" 
-d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
-t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z
-M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="ol" unicode="&#xf0cb;" horiz-adv-x="1792" 
-d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362
-q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5
-t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 121.5t0.5 121.5v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216
-q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="strikethrough" unicode="&#xf0cc;" horiz-adv-x="1792" 
-d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 98 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6
-l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -56 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23
-l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-    <glyph glyph-name="underline" unicode="&#xf0cd;" 
-d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47
-q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41
-q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472
-q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-    <glyph glyph-name="table" unicode="&#xf0ce;" horiz-adv-x="1664" 
-d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23
-v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192
-q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192
-q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113
-z" />
-    <glyph glyph-name="magic" unicode="&#xf0d0;" horiz-adv-x="1664" 
-d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276
-l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-    <glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="1792" 
-d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5
-t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38
-t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="pinterest" unicode="&#xf0d2;" 
-d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134
-q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33
-q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="pinterest_sign" unicode="&#xf0d3;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5
-t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5
-t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-    <glyph glyph-name="google_plus_sign" unicode="&#xf0d4;" 
-d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
-h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304" 
-d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
-q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
-    <glyph glyph-name="money" unicode="&#xf0d6;" horiz-adv-x="1920" 
-d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384
-v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="caret_down" unicode="&#xf0d7;" horiz-adv-x="1024" 
-d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="caret_up" unicode="&#xf0d8;" horiz-adv-x="1024" 
-d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="caret_left" unicode="&#xf0d9;" horiz-adv-x="640" 
-d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-    <glyph glyph-name="caret_right" unicode="&#xf0da;" horiz-adv-x="640" 
-d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="columns" unicode="&#xf0db;" horiz-adv-x="1664" 
-d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="1024" 
-d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="sort_down" unicode="&#xf0dd;" horiz-adv-x="1024" 
-d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="sort_up" unicode="&#xf0de;" horiz-adv-x="1024" 
-d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="envelope_alt" unicode="&#xf0e0;" horiz-adv-x="1792" 
-d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123
-q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-    <glyph glyph-name="linkedin" unicode="&#xf0e1;" 
-d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329
-q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-    <glyph glyph-name="undo" unicode="&#xf0e2;" 
-d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
-t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-    <glyph glyph-name="legal" unicode="&#xf0e3;" horiz-adv-x="1792" 
-d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5
-t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14
-q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28
-q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-    <glyph glyph-name="dashboard" unicode="&#xf0e4;" horiz-adv-x="1792" 
-d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5
-t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5
-t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29
-q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="comment_alt" unicode="&#xf0e5;" horiz-adv-x="1792" 
-d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640
-q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5
-t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-    <glyph glyph-name="comments_alt" unicode="&#xf0e6;" horiz-adv-x="1792" 
-d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257
-t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5
-t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129
-q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-    <glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="896" 
-d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-    <glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="1792" 
-d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320
-q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68
-z" />
-    <glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="1664" 
-d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97
-q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69
-q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-    <glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="1792" 
-d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28
-h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-    <glyph glyph-name="light_bulb" unicode="&#xf0eb;" horiz-adv-x="1024" 
-d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134
-q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47
-q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5
-t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-    <glyph glyph-name="exchange" unicode="&#xf0ec;" horiz-adv-x="1792" 
-d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9
-q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-    <glyph glyph-name="cloud_download" unicode="&#xf0ed;" horiz-adv-x="1920" 
-d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
-q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-    <glyph glyph-name="cloud_upload" unicode="&#xf0ee;" horiz-adv-x="1920" 
-d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
-q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-    <glyph glyph-name="user_md" unicode="&#xf0f0;" horiz-adv-x="1408" 
-d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56
-t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68
-t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
-t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="stethoscope" unicode="&#xf0f1;" horiz-adv-x="1408" 
-d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48
-t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252
-t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-    <glyph glyph-name="suitcase" unicode="&#xf0f2;" horiz-adv-x="1792" 
-d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66
-t66 -158z" />
-    <glyph glyph-name="bell_alt" unicode="&#xf0f3;" horiz-adv-x="1792" 
-d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5
-t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-    <glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="1920" 
-d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45
-t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="food" unicode="&#xf0f5;" horiz-adv-x="1408" 
-d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45
-t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="file_text_alt" unicode="&#xf0f6;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704
-q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
-    <glyph glyph-name="building" unicode="&#xf0f7;" horiz-adv-x="1408" 
-d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="1408" 
-d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5
-t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320
-v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="1920" 
-d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5
-t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152
-q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="medkit" unicode="&#xf0fa;" horiz-adv-x="1792" 
-d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32
-q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="fighter_jet" unicode="&#xf0fb;" horiz-adv-x="1920" 
-d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96
-q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q128 -28 200 -52t80 -34z" />
-    <glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="1664" 
-d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-    <glyph glyph-name="h_sign" unicode="&#xf0fd;" 
-d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="f0fe" unicode="&#xf0fe;" 
-d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="double_angle_left" unicode="&#xf100;" horiz-adv-x="1024" 
-d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
-t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-    <glyph glyph-name="double_angle_right" unicode="&#xf101;" horiz-adv-x="1024" 
-d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23
-l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="double_angle_up" unicode="&#xf102;" horiz-adv-x="1152" 
-d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393
-q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="double_angle_down" unicode="&#xf103;" horiz-adv-x="1152" 
-d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
-t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-    <glyph glyph-name="angle_left" unicode="&#xf104;" horiz-adv-x="640" 
-d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-    <glyph glyph-name="angle_right" unicode="&#xf105;" horiz-adv-x="640" 
-d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="angle_up" unicode="&#xf106;" horiz-adv-x="1152" 
-d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="angle_down" unicode="&#xf107;" horiz-adv-x="1152" 
-d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-    <glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="1920" 
-d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19
-t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="1920" 
-d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z
-M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-    <glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="1152" 
-d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832
-q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="mobile_phone" unicode="&#xf10b;" horiz-adv-x="768" 
-d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136
-q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="circle_blank" unicode="&#xf10c;" 
-d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103
-t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="quote_left" unicode="&#xf10d;" horiz-adv-x="1664" 
-d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z
-M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-    <glyph glyph-name="quote_right" unicode="&#xf10e;" horiz-adv-x="1664" 
-d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216
-v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-    <glyph glyph-name="spinner" unicode="&#xf110;" horiz-adv-x="1792" 
-d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5
-t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z
-M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5
-q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="circle" unicode="&#xf111;" 
-d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="reply" unicode="&#xf112;" horiz-adv-x="1792" 
-d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19
-l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-    <glyph glyph-name="github_alt" unicode="&#xf113;" horiz-adv-x="1664" 
-d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320
-q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86
-t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218
-q0 -87 -27 -168q136 -160 136 -398z" />
-    <glyph glyph-name="folder_close_alt" unicode="&#xf114;" horiz-adv-x="1664" 
-d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320
-q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="folder_open_alt" unicode="&#xf115;" horiz-adv-x="1920" 
-d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68
-v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z
-" />
-    <glyph glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="smile" unicode="&#xf118;" 
-d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
-t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5
-t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="frown" unicode="&#xf119;" 
-d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
-t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204
-t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="meh" unicode="&#xf11a;" 
-d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
-t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="1920" 
-d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
-t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150
-t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="1920" 
-d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16
-h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16
-h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96
-q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896
-h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="flag_alt" unicode="&#xf11d;" horiz-adv-x="1792" 
-d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9
-h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102
-q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-    <glyph glyph-name="flag_checkered" unicode="&#xf11e;" horiz-adv-x="1792" 
-d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2
-q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266
-q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8
-q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-    <glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="1664" 
-d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9
-t9 -23z" />
-    <glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="1920" 
-d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5
-l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-    <glyph glyph-name="reply_all" unicode="&#xf122;" horiz-adv-x="1792" 
-d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1
-q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-    <glyph glyph-name="star_half_empty" unicode="&#xf123;" horiz-adv-x="1664" 
-d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5
-l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-    <glyph glyph-name="location_arrow" unicode="&#xf124;" horiz-adv-x="1408" 
-d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-    <glyph glyph-name="crop" unicode="&#xf125;" horiz-adv-x="1664" 
-d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23
-v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="code_fork" unicode="&#xf126;" horiz-adv-x="1024" 
-d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5
-q-2 -287 -226 -414q-67 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497
-q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-    <glyph glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664" 
-d="M439 265l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320
-q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18
-l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9
-t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-    <glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="1024" 
-d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5
-t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-    <glyph glyph-name="_279" unicode="&#xf129;" horiz-adv-x="640" 
-d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192
-q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="640" 
-d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-    <glyph glyph-name="superscript" unicode="&#xf12b;" 
-d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
-M1534 846v-206h-514l-3 27q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5
-t-65.5 -51.5t-30.5 -63h232v80h126z" />
-    <glyph glyph-name="subscript" unicode="&#xf12c;" 
-d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
-M1536 -50v-206h-514l-4 27q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73
-h232v80h126z" />
-    <glyph glyph-name="_283" unicode="&#xf12d;" horiz-adv-x="1920" 
-d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-    <glyph glyph-name="puzzle_piece" unicode="&#xf12e;" horiz-adv-x="1664" 
-d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5
-t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89
-q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117
-q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-    <glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="1152" 
-d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5
-t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-    <glyph glyph-name="microphone_off" unicode="&#xf131;" horiz-adv-x="1408" 
-d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128
-q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23
-t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-    <glyph glyph-name="shield" unicode="&#xf132;" horiz-adv-x="1280" 
-d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150
-t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="calendar_empty" unicode="&#xf133;" horiz-adv-x="1664" 
-d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
-q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="fire_extinguisher" unicode="&#xf134;" horiz-adv-x="1408" 
-d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800
-q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113
-q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-    <glyph glyph-name="rocket" unicode="&#xf135;" horiz-adv-x="1664" 
-d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1
-q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-    <glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="1792" 
-d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-    <glyph glyph-name="chevron_sign_left" unicode="&#xf137;" 
-d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="chevron_sign_right" unicode="&#xf138;" 
-d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="chevron_sign_up" unicode="&#xf139;" 
-d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="chevron_sign_down" unicode="&#xf13a;" 
-d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="1408" 
-d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-    <glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="1792" 
-d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-    <glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="1792" 
-d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352
-q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19
-t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="unlock_alt" unicode="&#xf13e;" horiz-adv-x="1152" 
-d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181
-v-320h736z" />
-    <glyph glyph-name="bullseye" unicode="&#xf140;" 
-d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150
-t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ellipsis_horizontal" unicode="&#xf141;" horiz-adv-x="1408" 
-d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192
-q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="ellipsis_vertical" unicode="&#xf142;" horiz-adv-x="384" 
-d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192
-q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="_303" unicode="&#xf143;" 
-d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
-q13 0 23 10t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="play_sign" unicode="&#xf144;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56
-q16 -8 32 -8q17 0 32 9z" />
-    <glyph glyph-name="ticket" unicode="&#xf145;" horiz-adv-x="1792" 
-d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136
-t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-    <glyph glyph-name="minus_sign_alt" unicode="&#xf146;" 
-d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
-t84.5 -203.5z" />
-    <glyph glyph-name="check_minus" unicode="&#xf147;" horiz-adv-x="1408" 
-d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5
-t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="level_up" unicode="&#xf148;" horiz-adv-x="1024" 
-d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-    <glyph glyph-name="level_down" unicode="&#xf149;" horiz-adv-x="1024" 
-d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-    <glyph glyph-name="check_sign" unicode="&#xf14a;" 
-d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5
-t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="edit_sign" unicode="&#xf14b;" 
-d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120
-v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_312" unicode="&#xf14c;" 
-d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960
-q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="share_sign" unicode="&#xf14d;" 
-d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q11 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5
-t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="compass" unicode="&#xf14e;" 
-d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="collapse" unicode="&#xf150;" 
-d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120
-v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="collapse_top" unicode="&#xf151;" 
-d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_317" unicode="&#xf152;" 
-d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5
-t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="eur" unicode="&#xf153;" horiz-adv-x="1024" 
-d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9
-t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26
-l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-    <glyph glyph-name="gbp" unicode="&#xf154;" horiz-adv-x="1024" 
-d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7
-q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-    <glyph glyph-name="usd" unicode="&#xf155;" horiz-adv-x="1024" 
-d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43
-t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5
-t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50
-t53 -63.5t31.5 -76.5t13 -94z" />
-    <glyph glyph-name="inr" unicode="&#xf156;" horiz-adv-x="898" 
-d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102
-q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1027" 
-d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61
-l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-    <glyph glyph-name="rub" unicode="&#xf158;" horiz-adv-x="1280" 
-d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128
-q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-    <glyph glyph-name="krw" unicode="&#xf159;" horiz-adv-x="1792" 
-d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23
-t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28
-q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="1280" 
-d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164
-l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30
-t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-    <glyph glyph-name="file" unicode="&#xf15b;" 
-d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
-    <glyph glyph-name="file_text" unicode="&#xf15c;" 
-d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704
-q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
-    <glyph glyph-name="sort_by_alphabet" unicode="&#xf15d;" horiz-adv-x="1664" 
-d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23
-v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162
-l230 -662h70z" />
-    <glyph glyph-name="_329" unicode="&#xf15e;" horiz-adv-x="1664" 
-d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150
-v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248
-v119h121z" />
-    <glyph glyph-name="sort_by_attributes" unicode="&#xf160;" horiz-adv-x="1792" 
-d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832
-q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256
-q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="sort_by_attributes_alt" unicode="&#xf161;" horiz-adv-x="1792" 
-d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192
-q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832
-q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="sort_by_order" unicode="&#xf162;" 
-d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23
-zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5
-t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-    <glyph glyph-name="sort_by_order_alt" unicode="&#xf163;" 
-d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9
-t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13
-q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-    <glyph glyph-name="_334" unicode="&#xf164;" horiz-adv-x="1664" 
-d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76
-q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5
-t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-    <glyph glyph-name="_335" unicode="&#xf165;" horiz-adv-x="1664" 
-d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135
-t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121
-t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-    <glyph glyph-name="youtube_sign" unicode="&#xf166;" 
-d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 17 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15
-q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38
-q21 -29 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5
-q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78q7 -23 23 -69l24 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38
-q-51 0 -78 -38q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5
-h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="youtube" unicode="&#xf167;" 
-d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73
-q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51
-q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99
-q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-38 -51 -106 -51q-67 0 -105 51
-q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-    <glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="1408" 
-d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942
-q25 45 64 45h241q22 0 31 -15z" />
-    <glyph glyph-name="xing_sign" unicode="&#xf169;" 
-d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1
-l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792" 
-d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
-l-14 -17q-14 -15 -29 -26.5t-31 -19t-28 -12.5t-28.5 -8t-24 -4.5t-23 -3t-16.5 -1.5q-251 -19 -627 -19q-207 2 -359.5 6.5t-200.5 7.5l-49 4l-36 4q-36 5 -54.5 10t-51 21t-56.5 41q-6 6 -15.5 18.5t-29 58.5t-26.5 101q-8 64 -12.5 136.5t-5.5 113.5v40v136
-q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z" />
-    <glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="1792" 
-d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-    <glyph glyph-name="stackexchange" unicode="&#xf16c;" 
-d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
-    <glyph glyph-name="instagram" unicode="&#xf16d;" 
-d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
-q-7 0 -76.5 0.5t-105.5 0t-96.5 -3t-103 -10t-71.5 -18.5q-50 -20 -88 -58t-58 -88q-11 -29 -18.5 -71.5t-10 -103t-3 -96.5t0 -105.5t0.5 -76.5t-0.5 -76.5t0 -105.5t3 -96.5t10 -103t18.5 -71.5q20 -50 58 -88t88 -58q29 -11 71.5 -18.5t103 -10t96.5 -3t105.5 0t76.5 0.5
-t76.5 -0.5t105.5 0t96.5 3t103 10t71.5 18.5q50 20 88 58t58 88q11 29 18.5 71.5t10 103t3 96.5t0 105.5t-0.5 76.5t0.5 76.5t0 105.5t-3 96.5t-10 103t-18.5 71.5q-20 50 -58 88t-88 58q-29 11 -71.5 18.5t-103 10t-96.5 3t-105.5 0t-76.5 -0.5zM1536 640q0 -229 -5 -317
-q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z" />
-    <glyph glyph-name="flickr" unicode="&#xf16e;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150
-t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-    <glyph glyph-name="adn" unicode="&#xf170;" 
-d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="f171" unicode="&#xf171;" horiz-adv-x="1408" 
-d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22
-t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18
-t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5
-t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-    <glyph glyph-name="bitbucket_sign" unicode="&#xf172;" 
-d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5
-t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z
-M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120
-v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="1024" 
-d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14
-q78 2 134 29z" />
-    <glyph glyph-name="tumblr_sign" unicode="&#xf174;" 
-d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z
-M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="long_arrow_down" unicode="&#xf175;" horiz-adv-x="768" 
-d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-    <glyph glyph-name="long_arrow_up" unicode="&#xf176;" horiz-adv-x="768" 
-d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-    <glyph glyph-name="long_arrow_left" unicode="&#xf177;" horiz-adv-x="1792" 
-d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="long_arrow_right" unicode="&#xf178;" horiz-adv-x="1792" 
-d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-    <glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="1408" 
-d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q113 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65
-q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-    <glyph glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664" 
-d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-    <glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="1408" 
-d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30
-t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5
-h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-    <glyph glyph-name="linux" unicode="&#xf17c;" 
-d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-10 -11 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z
-M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7
-q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15
-q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5
-t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19
-q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63
-q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18q-2 -1 -4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92
-q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152
-q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-6 0 -8 -2t0 -4
-t5 -3q14 -4 18 -31q0 -3 8 2q2 2 2 3zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5
-t-30 -18.5t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43
-q-19 4 -51 9.5t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49
-t-14 -48q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54
-q110 143 124 195q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5
-t-40.5 -33.5t-61 -14q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5
-t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-    <glyph glyph-name="dribble" unicode="&#xf17d;" 
-d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81
-t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19
-q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -5 6.5 -17t7.5 -17q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6
-t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="skype" unicode="&#xf17e;" 
-d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5
-t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5
-q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80
-q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-    <glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="1280" 
-d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z
-M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324
-l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
-    <glyph glyph-name="trello" unicode="&#xf181;" 
-d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408
-q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="1280" 
-d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43
-q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="1024" 
-d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z
-M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="gittip" unicode="&#xf184;" 
-d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="sun" unicode="&#xf185;" horiz-adv-x="1792" 
-d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4
-l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94
-q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-    <glyph glyph-name="_366" unicode="&#xf186;" 
-d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61
-t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-    <glyph glyph-name="archive" unicode="&#xf187;" horiz-adv-x="1792" 
-d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536
-q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="bug" unicode="&#xf188;" horiz-adv-x="1664" 
-d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207
-q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19
-t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-    <glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920" 
-d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58
-t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6
-q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q16 19 38 30q53 26 239 24
-q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2
-q39 5 64 -2.5t31 -16.5z" />
-    <glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="1792" 
-d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12
-q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422
-q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178
-q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z
-M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-    <glyph glyph-name="renren" unicode="&#xf18b;" 
-d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495
-q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-    <glyph glyph-name="_372" unicode="&#xf18c;" horiz-adv-x="1408" 
-d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5
-t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56
-t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -4 1 -50t-1 -72q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5
-t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-    <glyph glyph-name="stack_exchange" unicode="&#xf18d;" horiz-adv-x="1280" 
-d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z
-" />
-    <glyph glyph-name="_374" unicode="&#xf18e;" 
-d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
-t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="arrow_circle_alt_left" unicode="&#xf190;" 
-d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
-t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_376" unicode="&#xf191;" 
-d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z
-M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="dot_circle_alt" unicode="&#xf192;" 
-d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5
-t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_378" unicode="&#xf193;" horiz-adv-x="1664" 
-d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128
-q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 17 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-    <glyph glyph-name="vimeo_square" unicode="&#xf194;" 
-d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179
-q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_380" unicode="&#xf195;" horiz-adv-x="1152" 
-d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160
-q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="plus_square_o" unicode="&#xf196;" horiz-adv-x="1408" 
-d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832
-q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_382" unicode="&#xf197;" horiz-adv-x="2176" 
-d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40
-t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29
-q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
-    <glyph glyph-name="_383" unicode="&#xf198;" horiz-adv-x="1664" 
-d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9
-q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102
-t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
-    <glyph glyph-name="_384" unicode="&#xf199;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69
-q-47 32 -142 92.5t-142 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13
-t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
-    <glyph glyph-name="_385" unicode="&#xf19a;" horiz-adv-x="1792" 
-d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5
-t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21
-t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286
-t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273
-t273 -182.5t331.5 -68z" />
-    <glyph glyph-name="_386" unicode="&#xf19b;" horiz-adv-x="1792" 
-d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
-    <glyph glyph-name="_387" unicode="&#xf19c;" horiz-adv-x="2048" 
-d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64
-q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
-    <glyph glyph-name="_388" unicode="&#xf19d;" horiz-adv-x="2304" 
-d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433
-q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
-    <glyph glyph-name="_389" unicode="&#xf19e;" 
-d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q44 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0
-q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
-    <glyph glyph-name="uniF1A0" unicode="&#xf1a0;" 
-d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
-t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
-    <glyph glyph-name="f1a1" unicode="&#xf1a1;" horiz-adv-x="1792" 
-d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26
-t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37
-q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191
-t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_392" unicode="&#xf1a2;" 
-d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54
-q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83
-q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
-q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_393" unicode="&#xf1a3;" 
-d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150
-v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103
-t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="f1a4" unicode="&#xf1a4;" horiz-adv-x="1920" 
-d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328
-v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
-    <glyph glyph-name="_395" unicode="&#xf1a5;" 
-d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
-t84.5 -203.5z" />
-    <glyph glyph-name="_396" unicode="&#xf1a6;" horiz-adv-x="2048" 
-d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123
-v-369h123z" />
-    <glyph glyph-name="_397" unicode="&#xf1a7;" 
-d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101
-v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
-q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_398" unicode="&#xf1a8;" horiz-adv-x="2038" 
-d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14
-q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24
-q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33
-q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5
-t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43
-q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5
-t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13
-t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
-    <glyph glyph-name="_399" unicode="&#xf1a9;" 
-d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10
-q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14
-q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14
-t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44
-q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
-    <glyph glyph-name="_400" unicode="&#xf1aa;" 
-d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z
-M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5
-t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5
-q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126
-t135.5 51q85 0 145 -60.5t60 -145.5z" />
-    <glyph glyph-name="f1ab" unicode="&#xf1ab;" 
-d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5
-q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28
-q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z
-M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11
-q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q107 36 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5
-q20 0 20 -21v-418z" />
-    <glyph glyph-name="_402" unicode="&#xf1ac;" horiz-adv-x="1792" 
-d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48
-l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23
-t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128
-q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128
-q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
-    <glyph glyph-name="_403" unicode="&#xf1ad;" 
-d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9
-t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64
-q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
-q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9
-t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64
-q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
-q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9
-t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
-    <glyph glyph-name="_404" unicode="&#xf1ae;" horiz-adv-x="1280" 
-d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
-q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="uniF1B1" unicode="&#xf1b0;" horiz-adv-x="1664" 
-d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5
-q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819
-q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5
-t100.5 134t141.5 55.5z" />
-    <glyph glyph-name="_406" unicode="&#xf1b1;" horiz-adv-x="768" 
-d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
-    <glyph glyph-name="_407" unicode="&#xf1b2;" horiz-adv-x="1792" 
-d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z
-" />
-    <glyph glyph-name="_408" unicode="&#xf1b3;" horiz-adv-x="2304" 
-d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67
-t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-4 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70
-v-400l434 -186q36 -16 57 -48t21 -70z" />
-    <glyph glyph-name="_409" unicode="&#xf1b4;" horiz-adv-x="2048" 
-d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658
-q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204
-q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
-    <glyph glyph-name="_410" unicode="&#xf1b5;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5
-t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217
-t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
-    <glyph glyph-name="_411" unicode="&#xf1b6;" horiz-adv-x="1792" 
-d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5
-q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89
-q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
-    <glyph glyph-name="_412" unicode="&#xf1b7;" 
-d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5
-q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5
-q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z
-" />
-    <glyph glyph-name="_413" unicode="&#xf1b8;" horiz-adv-x="1792" 
-d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188
-l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5
-t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1
-q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
-    <glyph glyph-name="_414" unicode="&#xf1b9;" horiz-adv-x="2048" 
-d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384
-q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5
-l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="_415" unicode="&#xf1ba;" horiz-adv-x="2048" 
-d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5
-t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z
-M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
-    <glyph glyph-name="_416" unicode="&#xf1bb;" 
-d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384
-q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
-    <glyph glyph-name="_417" unicode="&#xf1bc;" 
-d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64
-q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37
-q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_418" unicode="&#xf1bd;" horiz-adv-x="1024" 
-d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
-    <glyph glyph-name="_419" unicode="&#xf1be;" horiz-adv-x="2304" 
-d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11
-q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245
-q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785
-l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242
-q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236
-q0 -11 -8 -19t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786
-q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
-    <glyph glyph-name="uniF1C0" unicode="&#xf1c0;" 
-d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127
-t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5
-t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
-    <glyph glyph-name="uniF1C1" unicode="&#xf1c1;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197
-q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8
-q-1 1 -1 2q-1 2 -1 3q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
-    <glyph glyph-name="_422" unicode="&#xf1c2;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4q0 3 -0.5 6.5t-1.5 8t-1 6.5q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5
-t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z" />
-    <glyph glyph-name="_423" unicode="&#xf1c3;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107
-h-290v-107h68l189 -272l-194 -283h-68z" />
-    <glyph glyph-name="_424" unicode="&#xf1c4;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
-    <glyph glyph-name="_425" unicode="&#xf1c5;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
-    <glyph glyph-name="_426" unicode="&#xf1c6;" 
-d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400
-v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79
-q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
-    <glyph glyph-name="_427" unicode="&#xf1c7;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5
-q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
-    <glyph glyph-name="_428" unicode="&#xf1c8;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
-    <glyph glyph-name="_429" unicode="&#xf1c9;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243
-l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
-    <glyph glyph-name="_430" unicode="&#xf1ca;" 
-d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406
-q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
-    <glyph glyph-name="_431" unicode="&#xf1cb;" horiz-adv-x="1792" 
-d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546
-q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
-    <glyph glyph-name="_432" unicode="&#xf1cc;" horiz-adv-x="2048" 
-d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94
-q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55
-t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97l93 -108q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5t-85 -189.5z" />
-    <glyph glyph-name="_433" unicode="&#xf1cd;" horiz-adv-x="1792" 
-d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194
-q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5
-t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
-    <glyph glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792" 
-d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
-t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
-    <glyph glyph-name="uniF1D0" unicode="&#xf1d0;" horiz-adv-x="1792" 
-d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41
-t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170
-t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136
-q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
-    <glyph glyph-name="uniF1D1" unicode="&#xf1d1;" horiz-adv-x="1792" 
-d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251
-l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162
-q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33
-q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5
-t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
-t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF1D2" unicode="&#xf1d2;" 
-d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85
-q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392
-q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072
-q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_438" unicode="&#xf1d3;" horiz-adv-x="1792" 
-d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58
-q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47
-q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171
-v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
-    <glyph glyph-name="_439" unicode="&#xf1d4;" 
-d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="uniF1D5" unicode="&#xf1d5;" horiz-adv-x="1280" 
-d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5
-t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153
-t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
-    <glyph glyph-name="uniF1D6" unicode="&#xf1d6;" horiz-adv-x="1792" 
-d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5
-q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20
-t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5
-t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
-    <glyph glyph-name="uniF1D7" unicode="&#xf1d7;" horiz-adv-x="2048" 
-d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25
-q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5
-q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109
-q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
-    <glyph glyph-name="_443" unicode="&#xf1d8;" horiz-adv-x="1792" 
-d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
-    <glyph glyph-name="_444" unicode="&#xf1d9;" horiz-adv-x="1792" 
-d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137
-l863 639l-478 -797z" />
-    <glyph glyph-name="_445" unicode="&#xf1da;" 
-d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
-t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23
-t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_446" unicode="&#xf1db;" 
-d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_447" unicode="&#xf1dc;" horiz-adv-x="1792" 
-d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15
-t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2
-t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160
-q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5
-q0 -26 -12 -48t-36 -22z" />
-    <glyph glyph-name="_448" unicode="&#xf1dd;" horiz-adv-x="1280" 
-d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179
-q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
-    <glyph glyph-name="_449" unicode="&#xf1de;" 
-d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256
-q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
-    <glyph glyph-name="uniF1E0" unicode="&#xf1e0;" 
-d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5
-t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
-    <glyph glyph-name="_451" unicode="&#xf1e1;" 
-d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5
-t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_452" unicode="&#xf1e2;" horiz-adv-x="1792" 
-d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5
-t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91
-q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9
-t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-    <glyph glyph-name="_453" unicode="&#xf1e3;" horiz-adv-x="1792" 
-d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323
-l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
-    <glyph glyph-name="_454" unicode="&#xf1e4;" horiz-adv-x="1792" 
-d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
-v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192
-q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23
-zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5
-t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
-    <glyph glyph-name="_455" unicode="&#xf1e5;" horiz-adv-x="1792" 
-d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z
-M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792" 
-d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234
-l401 400q38 37 91 37t90 -37z" />
-    <glyph glyph-name="_457" unicode="&#xf1e7;" horiz-adv-x="1792" 
-d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5
-t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z
-M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q4 -2 11.5 -7
-t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
-    <glyph glyph-name="_458" unicode="&#xf1e8;" horiz-adv-x="1792" 
-d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
-    <glyph glyph-name="_459" unicode="&#xf1e9;" 
-d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36
-q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q71 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5
-t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87
-q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
-    <glyph glyph-name="_460" unicode="&#xf1ea;" horiz-adv-x="2048" 
-d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19
-t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
-    <glyph glyph-name="_461" unicode="&#xf1eb;" horiz-adv-x="2048" 
-d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121
-q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z
-M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
-    <glyph glyph-name="_462" unicode="&#xf1ec;" horiz-adv-x="1792" 
-d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
-t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5
-t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5
-t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
-M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38
-h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_463" unicode="&#xf1ed;" 
-d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246
-q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598
-q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
-    <glyph glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792" 
-d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
-q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
-    <glyph glyph-name="uniF1F0" unicode="&#xf1f0;" horiz-adv-x="2304" 
-d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27
-q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128
-q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304" 
-d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
-q127 99 172.5 249t-0.5 300.5t-172 249.5zM1185 1195q130 -107 177.5 -265.5t0.5 -317t-178 -264.5q128 -85 281 -85q104 0 198 40.5t162 108.5t108.5 162t40.5 198q0 103 -40.5 197t-108.5 162t-162.5 108.5t-197.5 40.5q-153 0 -281 -85zM1926 473h7v3h-17v-3h7v-17h3v17z
-M1955 456h4v20h-5l-6 -13l-6 13h-5v-20h3v15l6 -13h4l5 13v-15zM1947 16v-2h-2h-3v3h3h2v-1zM1947 7h3l-4 5h2l1 1q1 1 1 3t-1 3l-1 1h-3h-6v-13h3v5h1zM685 75q0 19 11 31t30 12q18 0 29 -12.5t11 -30.5q0 -19 -11 -31t-29 -12q-19 0 -30 12t-11 31zM1158 119q30 0 35 -32
-h-70q5 32 35 32zM1514 75q0 19 11 31t29 12t29.5 -12.5t11.5 -30.5q0 -19 -11 -31t-30 -12q-18 0 -29 12t-11 31zM1786 75q0 18 11.5 30.5t29.5 12.5t29.5 -12.5t11.5 -30.5q0 -19 -11.5 -31t-29.5 -12t-29.5 12.5t-11.5 30.5zM1944 3q-2 0 -4 1q-1 0 -3 2t-2 3q-1 2 -1 4
-q0 3 1 4q0 2 2 4l1 1q2 0 2 1q2 1 4 1q3 0 4 -1l4 -2l2 -4v-1q1 -2 1 -3l-1 -1v-3t-1 -1l-1 -2q-2 -2 -4 -2q-1 -1 -4 -1zM599 7h30v85q0 24 -14.5 38.5t-39.5 15.5q-32 0 -47 -24q-14 24 -45 24q-24 0 -39 -20v16h-30v-135h30v75q0 36 33 36q30 0 30 -36v-75h29v75
-q0 36 33 36q30 0 30 -36v-75zM765 7h29v68v67h-29v-16q-17 20 -43 20q-29 0 -48 -20t-19 -51t19 -51t48 -20q28 0 43 20v-17zM943 48q0 34 -47 40l-14 2q-23 4 -23 14q0 15 25 15q23 0 43 -11l12 24q-22 14 -55 14q-26 0 -41 -12t-15 -32q0 -33 47 -39l13 -2q24 -4 24 -14
-q0 -17 -31 -17q-25 0 -45 14l-13 -23q25 -17 58 -17q29 0 45.5 12t16.5 32zM1073 14l-8 25q-13 -7 -26 -7q-19 0 -19 22v61h48v27h-48v41h-30v-41h-28v-27h28v-61q0 -50 47 -50q21 0 36 10zM1159 146q-29 0 -48 -20t-19 -51q0 -32 19.5 -51.5t49.5 -19.5q33 0 55 19l-14 22
-q-18 -15 -39 -15q-34 0 -41 33h101v12q0 32 -18 51.5t-46 19.5zM1318 146q-23 0 -35 -20v16h-30v-135h30v76q0 35 29 35q10 0 18 -4l9 28q-9 4 -21 4zM1348 75q0 -31 19.5 -51t52.5 -20q29 0 48 16l-14 24q-18 -13 -35 -12q-18 0 -29.5 12t-11.5 31t11.5 31t29.5 12
-q19 0 35 -12l14 24q-20 16 -48 16q-33 0 -52.5 -20t-19.5 -51zM1593 7h30v68v67h-30v-16q-15 20 -42 20q-29 0 -48.5 -20t-19.5 -51t19.5 -51t48.5 -20q28 0 42 20v-17zM1726 146q-23 0 -35 -20v16h-29v-135h29v76q0 35 29 35q10 0 18 -4l9 28q-8 4 -21 4zM1866 7h29v68v122
-h-29v-71q-15 20 -43 20t-47.5 -20.5t-19.5 -50.5t19.5 -50.5t47.5 -20.5q29 0 43 20v-17zM1944 27l-2 -1h-3q-2 -1 -4 -3q-3 -1 -3 -4q-1 -2 -1 -6q0 -3 1 -5q0 -2 3 -4q2 -2 4 -3t5 -1q4 0 6 1q0 1 2 2l2 1q1 1 3 4q1 2 1 5q0 4 -1 6q-1 1 -3 4q0 1 -2 2l-2 1q-1 0 -3 0.5
-t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_467" unicode="&#xf1f2;" horiz-adv-x="2304" 
-d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42
-q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604
-v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569
-q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73
-t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
-    <glyph glyph-name="f1f3" unicode="&#xf1f3;" horiz-adv-x="2304" 
-d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z
-M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260
-l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279
-v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040
-q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168
-q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5
-t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21
-h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5
-t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
-    <glyph glyph-name="_469" unicode="&#xf1f4;" horiz-adv-x="2304" 
-d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16
-t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76
-q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59
-t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489
-l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66
-q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_470" unicode="&#xf1f5;" horiz-adv-x="2304" 
-d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109
-q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118
-q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151
-q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31
-q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_471" unicode="&#xf1f6;" horiz-adv-x="2048" 
-d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5
-l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5
-l418 363q10 8 23.5 7t21.5 -11z" />
-    <glyph glyph-name="_472" unicode="&#xf1f7;" horiz-adv-x="2048" 
-d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128
-q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161
-q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
-    <glyph glyph-name="_473" unicode="&#xf1f8;" horiz-adv-x="1408" 
-d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704
-q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167
-q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_474" unicode="&#xf1f9;" 
-d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5
-t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5
-t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_475" unicode="&#xf1fa;" 
-d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53
-q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24
-t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61
-t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
-    <glyph glyph-name="_476" unicode="&#xf1fb;" horiz-adv-x="1792" 
-d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10
-t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
-    <glyph glyph-name="f1fc" unicode="&#xf1fc;" horiz-adv-x="1792" 
-d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5
-t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
-    <glyph glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792" 
-d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5
-t47 37.5q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-24 0 -44 7t-31 15t-33 27q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38
-t-58 27t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448
-h256v448h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5
-q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
-    <glyph glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048" 
-d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
-    <glyph glyph-name="_480" unicode="&#xf200;" horiz-adv-x="1792" 
-d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_481" unicode="&#xf201;" horiz-adv-x="2048" 
-d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9
-t9 -23z" />
-    <glyph glyph-name="_482" unicode="&#xf202;" horiz-adv-x="1792" 
-d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20
-q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50
-t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1
-q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
-    <glyph glyph-name="_483" unicode="&#xf203;" 
-d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73
-q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110
-q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_484" unicode="&#xf204;" horiz-adv-x="2048" 
-d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5
-t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5
-t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
-    <glyph glyph-name="_485" unicode="&#xf205;" horiz-adv-x="2048" 
-d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5
-t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
-    <glyph glyph-name="_486" unicode="&#xf206;" horiz-adv-x="2304" 
-d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94
-q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469
-q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400
-q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
-    <glyph glyph-name="_487" unicode="&#xf207;" 
-d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5
-h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
-t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
-    <glyph glyph-name="_488" unicode="&#xf208;" horiz-adv-x="2048" 
-d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327
-q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5
-q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
-    <glyph glyph-name="_489" unicode="&#xf209;" horiz-adv-x="1280" 
-d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q17 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119
-t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5
-t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14
-q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88
-q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5
-t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
-    <glyph glyph-name="_490" unicode="&#xf20a;" horiz-adv-x="2048" 
-d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206
-q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307
-t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14
-t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
-    <glyph glyph-name="_491" unicode="&#xf20b;" 
-d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5
-t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_492" unicode="&#xf20c;" 
-d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55
-q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410
-q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
-    <glyph glyph-name="_493" unicode="&#xf20d;" 
-d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
-    <glyph glyph-name="_494" unicode="&#xf20e;" horiz-adv-x="2048" 
-d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335
-q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5
-q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360l15 -6l188 199v347l-187 194q-13 -8 -29 -10zM986 1438
-h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13zM552 226h402l64 66
-l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224l213 -225zM1023 946
-l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196l-48 -227l130 227h-82
-zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
-    <glyph glyph-name="f210" unicode="&#xf210;" 
-d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
-    <glyph glyph-name="_496" unicode="&#xf211;" 
-d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384
-q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
-    <glyph glyph-name="f212" unicode="&#xf212;" horiz-adv-x="2048" 
-d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021
-q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25
-q209 0 374 -102q172 107 374 102z" />
-    <glyph glyph-name="_498" unicode="&#xf213;" horiz-adv-x="2048" 
-d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101
-q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284
-q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
-    <glyph glyph-name="_499" unicode="&#xf214;" 
-d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34
-l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114
-v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z
-M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378
-v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51
-h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5
-t-43 -34t-16.5 -53.5z" />
-    <glyph glyph-name="_500" unicode="&#xf215;" horiz-adv-x="2048" 
-d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832
-q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
-    <glyph glyph-name="_501" unicode="&#xf216;" horiz-adv-x="2048" 
-d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126t-103.5 132.5t-108.5 126.5t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5
-t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113
-t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5
-q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
-    <glyph glyph-name="_502" unicode="&#xf217;" horiz-adv-x="1664" 
-d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
-t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
-q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="_503" unicode="&#xf218;" horiz-adv-x="1664" 
-d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
-t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
-q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="_504" unicode="&#xf219;" horiz-adv-x="2048" 
-d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20
-l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
-    <glyph glyph-name="_505" unicode="&#xf21a;" horiz-adv-x="2048" 
-d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
-q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83
-q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314
-v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
-q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
-    <glyph glyph-name="_506" unicode="&#xf21b;" 
-d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14
-t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5
-q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31
-t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
-    <glyph glyph-name="_507" unicode="&#xf21c;" horiz-adv-x="2304" 
-d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5
-t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105
-l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226
-t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
-    <glyph glyph-name="_508" unicode="&#xf21d;" 
-d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12
-q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384
-q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5
-t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="_509" unicode="&#xf21e;" horiz-adv-x="1792" 
-d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221
-q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124
-t127 -344z" />
-    <glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="1280" 
-d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292
-q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
-    <glyph glyph-name="_511" unicode="&#xf222;" 
-d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5
-q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_512" unicode="&#xf223;" horiz-adv-x="1280" 
-d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5
-t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
-t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_513" unicode="&#xf224;" 
-d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
-q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
-t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_514" unicode="&#xf225;" horiz-adv-x="1792" 
-d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
-q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9
-t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5
-t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_515" unicode="&#xf226;" horiz-adv-x="1792" 
-d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23
-t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391
-q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391
-q0 -226 -154 -391q103 -57 218 -57z" />
-    <glyph glyph-name="_516" unicode="&#xf227;" horiz-adv-x="1920" 
-d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230
-q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9
-t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128
-q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
-    <glyph glyph-name="_517" unicode="&#xf228;" horiz-adv-x="2048" 
-d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23
-t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9
-t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5
-t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
-    <glyph glyph-name="_518" unicode="&#xf229;" 
-d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5
-t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
-t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_519" unicode="&#xf22a;" horiz-adv-x="1280" 
-d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22
-t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5
-t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_520" unicode="&#xf22b;" horiz-adv-x="2048" 
-d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5
-t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5
-t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_521" unicode="&#xf22c;" horiz-adv-x="1280" 
-d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5
-t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_522" unicode="&#xf22d;" horiz-adv-x="1280" 
-d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123
-t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
-    <glyph glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="_525" unicode="&#xf230;" 
-d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
-    <glyph glyph-name="_526" unicode="&#xf231;" horiz-adv-x="1280" 
-d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5
-l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5
-q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
-    <glyph glyph-name="_527" unicode="&#xf232;" 
-d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5
-t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233
-l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
-    <glyph glyph-name="_528" unicode="&#xf233;" horiz-adv-x="1792" 
-d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216
-q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
-    <glyph glyph-name="_529" unicode="&#xf234;" horiz-adv-x="2048" 
-d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5
-t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5
-t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
-    <glyph glyph-name="_530" unicode="&#xf235;" horiz-adv-x="2048" 
-d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136
-q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69
-t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
-    <glyph glyph-name="_531" unicode="&#xf236;" horiz-adv-x="2048" 
-d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704
-q-26 0 -45 -19t-19 -45v-384h1152z" />
-    <glyph glyph-name="_532" unicode="&#xf237;" 
-d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
-    <glyph glyph-name="_533" unicode="&#xf238;" 
-d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56
-t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
-    <glyph glyph-name="_534" unicode="&#xf239;" 
-d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47
-t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
-    <glyph glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792" 
-d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
-q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
-    <glyph glyph-name="_536" unicode="&#xf23b;" 
-d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
-    <glyph glyph-name="_537" unicode="&#xf23c;" horiz-adv-x="2296" 
-d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5
-q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5
-q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42
-q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37
-q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5
-q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139
-q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 5 5 8q16 18 60 23h13q5 18 19 30t33 8
-t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132
-q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132
-q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z
-M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-105 2 -211 0v1q-1 -27 2.5 -86
-t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103
-q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34q0 2 0.5 3.5t1.5 3t1 2.5v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4
-l-10 -2.5t-12 -2l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-6 -1 -9 -1q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130
-t-73 70q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -1 -1 -4t-1 -5q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150
-q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12
-q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
-    <glyph glyph-name="_538" unicode="&#xf23d;" horiz-adv-x="2304" 
-d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5
-t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5
-t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
-    <glyph glyph-name="_539" unicode="&#xf23e;" horiz-adv-x="1792" 
-d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348
-t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23
-t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96
-q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512
-q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
-    <glyph glyph-name="_540" unicode="&#xf240;" horiz-adv-x="2304" 
-d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113
-v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="_541" unicode="&#xf241;" horiz-adv-x="2304" 
-d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
-h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_542" unicode="&#xf242;" horiz-adv-x="2304" 
-d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
-h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_543" unicode="&#xf243;" horiz-adv-x="2304" 
-d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
-h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_544" unicode="&#xf244;" horiz-adv-x="2304" 
-d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23
-v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_545" unicode="&#xf245;" horiz-adv-x="1280" 
-d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
-    <glyph glyph-name="_546" unicode="&#xf246;" horiz-adv-x="1024" 
-d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
-    <glyph glyph-name="_547" unicode="&#xf247;" horiz-adv-x="2048" 
-d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128
-h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
-    <glyph glyph-name="_548" unicode="&#xf248;" horiz-adv-x="2304" 
-d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256
-v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
-    <glyph glyph-name="_549" unicode="&#xf249;" 
-d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
-    <glyph glyph-name="_550" unicode="&#xf24a;" 
-d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68
-z" />
-    <glyph glyph-name="_551" unicode="&#xf24b;" horiz-adv-x="2304" 
-d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5
-t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88
-t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90
-t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_552" unicode="&#xf24c;" horiz-adv-x="2304" 
-d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294
-t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z
-M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_553" unicode="&#xf24d;" horiz-adv-x="1792" 
-d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113
-zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="_554" unicode="&#xf24e;" horiz-adv-x="2304" 
-d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64
-q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91
-t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5
-t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
-    <glyph glyph-name="_555" unicode="&#xf250;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
-t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5
-t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
-    <glyph glyph-name="_556" unicode="&#xf251;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
-t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
-    <glyph glyph-name="_557" unicode="&#xf252;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
-t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
-    <glyph glyph-name="_558" unicode="&#xf253;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
-t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196
-h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
-    <glyph glyph-name="_559" unicode="&#xf254;" 
-d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87
-t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9
-h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
-    <glyph glyph-name="_560" unicode="&#xf255;" 
-d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25
-q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27
-t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21
-q72 69 174 69z" />
-    <glyph glyph-name="_561" unicode="&#xf256;" horiz-adv-x="1792" 
-d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33
-t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52
-h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
-    <glyph glyph-name="_562" unicode="&#xf257;" horiz-adv-x="1792" 
-d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668
-q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17
-t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5
-t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5
-q0 -42 -23 -78t-61 -53l-310 -141h91z" />
-    <glyph glyph-name="_563" unicode="&#xf258;" horiz-adv-x="2048" 
-d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32
-q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68
-q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
-    <glyph glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048" 
-d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
-t60 -162q0 -24 -7 -59l-123 -512q10 7 37.5 28.5t38.5 29.5t35 23t41 20.5t41.5 11t49.5 5.5q105 0 180 -74t75 -179q0 -62 -28.5 -118t-78.5 -94l-507 -380q-68 -51 -153 -51h-694zM1104 1408q-38 0 -68.5 -24t-39.5 -62l-164 -682h-127l-145 602q-9 38 -39.5 62t-68.5 24
-q-48 0 -80 -33t-32 -80q0 -15 3 -28l132 -547h-26l-99 408q-9 37 -40 62.5t-69 25.5q-47 0 -80 -33t-33 -79q0 -14 3 -26l116 -478q7 -28 9 -86t10 -88l100 -401q8 -32 34 -52.5t59 -20.5h694q42 0 76 26l507 379q56 43 56 110q0 52 -37.5 88.5t-89.5 36.5q-43 0 -77 -26
-l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z" />
-    <glyph glyph-name="_565" unicode="&#xf25a;" horiz-adv-x="1792" 
-d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5
-q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5
-v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32
-v-384h32z" />
-    <glyph glyph-name="_566" unicode="&#xf25b;" 
-d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181
-v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46
-q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5
-q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308
-q0 -53 37.5 -90.5t90.5 -37.5h668z" />
-    <glyph glyph-name="_567" unicode="&#xf25c;" horiz-adv-x="1973" 
-d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5
-t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141
-q13 0 22 -8.5t10 -20.5z" />
-    <glyph glyph-name="_568" unicode="&#xf25d;" horiz-adv-x="1792" 
-d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109
-t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640
-q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_569" unicode="&#xf25e;" horiz-adv-x="1792" 
-d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78
-q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5
-t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376
-q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191
-t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
-    <glyph glyph-name="f260" unicode="&#xf260;" horiz-adv-x="2048" 
-d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
-    <glyph glyph-name="f261" unicode="&#xf261;" horiz-adv-x="1792" 
-d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191
-t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_572" unicode="&#xf262;" horiz-adv-x="2304" 
-d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57
-t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197
-t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5
-t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5
-t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5
-q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
-    <glyph glyph-name="f263" unicode="&#xf263;" horiz-adv-x="1280" 
-d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5
-t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94
-q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
-    <glyph glyph-name="_574" unicode="&#xf264;" 
-d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32
-q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5
-zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_575" unicode="&#xf265;" horiz-adv-x="1720" 
-d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33
-l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
-    <glyph glyph-name="_576" unicode="&#xf266;" horiz-adv-x="2304" 
-d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540
-q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81
-l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
-    <glyph glyph-name="_577" unicode="&#xf267;" horiz-adv-x="1792" 
-d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640
-q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5
-t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5
-t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5
-t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191
-t191 -286t71 -348z" />
-    <glyph glyph-name="_578" unicode="&#xf268;" horiz-adv-x="1792" 
-d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962
-q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
-    <glyph glyph-name="_579" unicode="&#xf269;" horiz-adv-x="1792" 
-d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5
-q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5
-q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
-    <glyph glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792" 
-d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
-q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z
-" />
-    <glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792" 
-d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
-q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z
-M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
-    <glyph glyph-name="_582" unicode="&#xf26c;" horiz-adv-x="2048" 
-d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23
-v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="_583" unicode="&#xf26d;" horiz-adv-x="1792" 
-d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34
-h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100
-q-68 175 -180 287z" />
-    <glyph glyph-name="_584" unicode="&#xf26e;" 
-d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
-q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13
-q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 33 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249
-q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 33 -6t30 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183
-q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46
-t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
-    <glyph glyph-name="_585" unicode="&#xf270;" horiz-adv-x="1792" 
-d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z
-M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30
-q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57
-t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133
-q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
-    <glyph glyph-name="_586" unicode="&#xf271;" horiz-adv-x="1792" 
-d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9
-h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224
-v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
-    <glyph glyph-name="_587" unicode="&#xf272;" horiz-adv-x="1792" 
-d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23
-t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47
-t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_588" unicode="&#xf273;" horiz-adv-x="1792" 
-d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z
-M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
-q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_589" unicode="&#xf274;" horiz-adv-x="1792" 
-d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23
-t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47
-t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_590" unicode="&#xf275;" horiz-adv-x="1792" 
-d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
-    <glyph glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024" 
-d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249
-q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
-    <glyph glyph-name="_592" unicode="&#xf277;" horiz-adv-x="1792" 
-d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
-q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
-    <glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048" 
-d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
-v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
-    <glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792" 
-d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472
-q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
-    <glyph glyph-name="_595" unicode="&#xf27a;" horiz-adv-x="1792" 
-d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5
-t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37
-t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-    <glyph glyph-name="_596" unicode="&#xf27b;" horiz-adv-x="1792" 
-d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5
-t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5
-t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51
-t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
-    <glyph glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024" 
-d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
-    <glyph glyph-name="_598" unicode="&#xf27d;" horiz-adv-x="1792" 
-d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246
-q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
-    <glyph glyph-name="f27e" unicode="&#xf27e;" 
-d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
-    <glyph glyph-name="uniF280" unicode="&#xf280;" 
-d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72
-h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275
-l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
-    <glyph glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792" 
-d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
-l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44
-t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106
-q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
-    <glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792" 
-d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
-q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
-    <glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304" 
-d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
-    <glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792" 
-d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
-t169 -253t253 -169t308 -63q213 0 397.5 107t290.5 292zM1030 643l693 -352q-116 -253 -334.5 -400t-492.5 -147q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q260 0 470.5 -133.5t335.5 -366.5zM1543 640h-39v-160h-96v352h136q32 0 54.5 -20
-t28.5 -48t1 -56t-27.5 -48t-57.5 -20z" />
-    <glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792" 
-d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
-    <glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792" 
-d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
-q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 6 2.5 9.5t8.5 5t9.5 2t11.5 0t9 -0.5v391q-32 15 -32 50q0 23 16.5 39t38.5 16t38.5 -16t16.5 -39q0 -35 -32 -50v-17q45 10 83 10q21 0 59.5 -7.5t54.5 -7.5
-q17 0 47 7.5t37 7.5q16 0 16 -16v-210q0 -15 -35 -21.5t-62 -6.5q-18 0 -54.5 7.5t-55.5 7.5q-40 0 -90 -12v-133q1 0 9 0.5t11.5 0t9.5 -2t8.5 -5t2.5 -9.5v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96
-q16 0 16 -16z" />
-    <glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304" 
-d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
-q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5
-t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
-    <glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792" 
-d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
-t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304" 
-d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
-q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5
-q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13
-q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
-    <glyph glyph-name="_610" unicode="&#xf28a;" 
-d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
-t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20
-q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5
-t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
-    <glyph glyph-name="_611" unicode="&#xf28b;" 
-d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
-t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_612" unicode="&#xf28c;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
-t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
-    <glyph glyph-name="_613" unicode="&#xf28d;" 
-d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
-t103 -385.5z" />
-    <glyph glyph-name="_614" unicode="&#xf28e;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
-t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
-    <glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792" 
-d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
-t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048" 
-d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
-t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416
-q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441
-h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
-    <glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792" 
-d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
-q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311
-q15 0 25 -12q9 -12 6 -28z" />
-    <glyph glyph-name="_618" unicode="&#xf293;" 
-d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
-t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
-    <glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024" 
-d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
-    <glyph glyph-name="_620" unicode="&#xf295;" 
-d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5
-t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
-t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792" 
-d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
-    <glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792" 
-d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
-q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
-    <glyph glyph-name="_623" unicode="&#xf298;" 
-d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
-t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
-    <glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792" 
-d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
-q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285
-q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
-    <glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792" 
-d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
-q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
-M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298
-t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_626" unicode="&#xf29b;" 
-d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
-l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z
-M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
-    <glyph glyph-name="_627" unicode="&#xf29c;" 
-d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
-t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5
-t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5
-t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408" 
-d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
-q-67 -192 -92 -234q-15 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521
-q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661
-q3 -1 7 1t7 4l3 2q11 9 11 17z" />
-    <glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304" 
-d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
-t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5
-t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5
-h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96
-t9.5 -70.5z" />
-    <glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408" 
-d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
-q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127
-l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272
-t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249
-q-18 -19 -45 -19z" />
-    <glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176" 
-d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
-q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864
-q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136
-t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56
-t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56
-t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136
-t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
-    <glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792" 
-d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
-M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72
-t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45
-t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4
-q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
-    <glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304" 
-d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
-q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5
-q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101
-q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35
-q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5
-q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
-    <glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792" 
-d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
-t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74
-t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233
-l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
-    <glyph glyph-name="uniF2A5" unicode="&#xf2a5;" 
-d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
-q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10
-q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5
-t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535" 
-d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
-l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5
-q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9
-q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
-    <glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664" 
-d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
-t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38
-l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147q-2 -1 -5 -3.5t-4 -4.5q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148
-q-34 23 -76 23q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26
-l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
-    <glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792" 
-d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
-q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841
-q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5
-q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
-    <glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280" 
-d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
-q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z
-M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
-    <glyph glyph-name="uniF2AA" unicode="&#xf2aa;" 
-d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
-M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5
-q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 42 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
-t84.5 -203.5z" />
-    <glyph glyph-name="uniF2AB" unicode="&#xf2ab;" 
-d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
-q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5
-t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
-t103 -385.5z" />
-    <glyph glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664" 
-d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
-q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5
-t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
-    <glyph glyph-name="uniF2AD" unicode="&#xf2ad;" 
-d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
-q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15
-t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960
-q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304" 
-d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
-q71 27 163 64.5t133.5 53.5t108 34.5t142.5 31.5q186 31 465 -7q1 0 10 -3q11 -6 14 -17t-3 -22l-194 -345q-15 -29 -47 -22q-128 24 -354 24q-146 0 -402 -44.5t-392 -46.5q-82 -1 -149 13t-107 37t-61 40t-33 34l-1 1v2q0 6 6 6q138 0 371 55q192 366 374.5 524t383.5 158
-q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z" />
-    <glyph glyph-name="uniF2B0" unicode="&#xf2b0;" 
-d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
-q-39 69 -58 141l224 79l-237 -14q-5 42 -5 76q0 35 5 77l238 -14l-225 79q19 73 58 140l214 -104l-177 159q46 61 107 108l158 -178l-103 215q67 39 140 58l77 -224l-13 236q36 6 75 6q38 0 76 -6l-14 -237l78 225q74 -19 140 -59l-103 -214l158 178q61 -47 107 -108
-l-177 -159l213 104q37 -62 58 -141l-224 -78l237 14q5 -31 5 -77zM1352 640q0 160 -78.5 295.5t-213 214t-292.5 78.5q-119 0 -227 -46.5t-186.5 -125t-124.5 -187.5t-46 -229q0 -119 46 -228t124.5 -187.5t186.5 -125t227 -46.5q158 0 292.5 78.5t213 214t78.5 294.5z
-M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z" />
-    <glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664" 
-d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
-t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z" />
-    <glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792" 
-d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
-t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22q29 0 49.5 22t20.5 52zM1034 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1208 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114
-q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1476 535q-84 -160 -232 -259.5t-323 -99.5q-123 0 -229.5 51.5t-178.5 137t-113 197.5t-41 232q0 88 21 174q-104 -175 -104 -390q0 -162 65 -312t185 -251q30 57 91 57q56 0 86 -50q32 50 87 50q56 0 86 -50q32 50 87 50t87 -50
-q30 50 86 50q28 0 52.5 -15.5t37.5 -40.5q112 94 177 231.5t73 287.5zM1326 564q0 75 -72 75q-17 0 -47 -6q-95 -19 -149 -19q-226 0 -226 243q0 86 30 204q-83 -127 -83 -275q0 -150 89 -260.5t235 -110.5q111 0 210 70q13 48 13 79zM884 1223q0 50 -32 89.5t-81 39.5
-t-81 -39.5t-32 -89.5q0 -51 31.5 -90.5t81.5 -39.5t81.5 39.5t31.5 90.5zM1513 884q0 96 -37.5 179t-113 137t-173.5 54q-77 0 -149 -35t-127 -94q-48 -159 -48 -268q0 -104 45.5 -157t147.5 -53q53 0 142 19q36 6 53 6q51 0 77.5 -28t26.5 -80q0 -26 -4 -46
-q75 68 117.5 165.5t42.5 200.5zM1792 667q0 -111 -33.5 -249.5t-93.5 -204.5q-58 -64 -195 -142.5t-228 -104.5l-4 -1v-114q0 -43 -29.5 -75t-72.5 -32q-56 0 -86 50q-32 -50 -87 -50t-87 50q-30 -50 -86 -50q-55 0 -87 50q-30 -50 -86 -50q-47 0 -75 33.5t-28 81.5
-q-90 -68 -198 -68q-118 0 -211 80q54 1 106 20q-113 31 -182 127q32 -7 71 -7q89 0 164 46q-192 192 -240 306q-24 56 -24 160q0 57 9 125.5t31.5 146.5t55 141t86.5 105t120 42q59 0 81 -52q19 29 42 54q2 3 12 13t13 16q10 15 23 38t25 42t28 39q87 111 211.5 177
-t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z" />
-    <glyph glyph-name="uniF2B3" unicode="&#xf2b3;" 
-d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
-h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="uniF2B4" unicode="&#xf2b4;" 
-d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
-q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304" 
-d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
-l-158 -158h-155v-544q5 0 21 0.5t22 0t19.5 -2t20.5 -4.5t17.5 -8.5t18.5 -13.5l297 -292q115 -111 227 -111q78 0 125 47q57 -20 112.5 8t72.5 85q74 -6 127 44q20 18 36 45.5t14 50.5q10 -10 43 -10q43 0 77 21t49.5 53t12 71.5t-30.5 73.5zM1824 384h96v512h-93l-157 180
-q-66 76 -169 76h-167q-89 0 -146 -67l-209 -243q-28 -33 -28 -75t27 -75q43 -51 110 -52t111 49l193 218q25 23 53.5 21.5t47 -27t8.5 -56.5q16 -19 56 -63t60 -68q29 -36 82.5 -105.5t64.5 -84.5q52 -66 60 -140zM2112 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32z
-M2304 960v-640q0 -26 -19 -45t-45 -19h-434q-27 -65 -82 -106.5t-125 -51.5q-33 -48 -80.5 -81.5t-102.5 -45.5q-42 -53 -104.5 -81.5t-128.5 -24.5q-60 -34 -126 -39.5t-127.5 14t-117 53.5t-103.5 81l-287 282h-358q-26 0 -45 19t-19 45v672q0 26 19 45t45 19h421
-q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792" 
-d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
-t96 -73t70 -55.5t45.5 -37.5t41.5 -36t39 -34.5q11 -9 11 -24zM1228 297q263 191 345 252q11 8 12.5 20.5t-6.5 23.5l-38 52q-8 11 -21 12.5t-24 -6.5q-231 -169 -343 -250q-5 -3 -52 -39t-71.5 -52.5t-64.5 -35t-69 -18.5t-69 18.5t-64.5 35t-71.5 52.5t-52 39
-q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z" />
-    <glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792" 
-d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
-l37 52q8 11 21.5 13t24.5 -7q94 -73 306 -236q5 -4 43.5 -35t60.5 -46.5t56.5 -32.5t58.5 -17h1h1q24 0 58.5 17t56.5 32.5t60.5 46.5t43.5 35q258 198 313 242q11 8 24 6.5t21 -12.5zM1664 -96v928q-90 83 -159 139q-91 74 -389 304q-3 2 -43 35t-61 48t-56 32.5t-59 17.5
-h-1h-1q-24 0 -59 -17.5t-56 -32.5t-61 -48t-43 -35q-215 -166 -315.5 -245.5t-129.5 -104t-82 -74.5q-14 -12 -21 -19v-928q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 832v-928q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v928q0 56 41 94
-q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z" />
-    <glyph glyph-name="uniF2B8" unicode="&#xf2b8;" 
-d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
-l-279 173zM1173 267l15 234l-230 -164l2 -240zM417 722l373 194l-19 441l-423 -163zM1270 357l20 233l-226 142l-2 -105l144 -95q6 -4 4 -9l-7 -119zM1461 496l30 222l-179 -128l-20 -228zM1273 329l-71 49l-8 -117q0 -5 -4 -8l-234 -187q-7 -5 -14 0l-98 83l7 -161
-q0 -5 -4 -8l-293 -234q-4 -2 -6 -2q-8 2 -8 3l-228 242q-4 4 -59 277q-2 7 5 11l61 37q-94 86 -95 92l-72 351q-2 7 6 12l94 45q-133 100 -135 108l-96 466q-2 10 7 13l433 135q5 0 8 -1l317 -153q6 -4 6 -9l20 -463q0 -7 -6 -10l-118 -61l126 -85q5 -2 5 -8l5 -123l121 74
-q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z" />
-    <glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664" 
-d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
-q61 0 103 48.5t42 121.5zM1028 892q0 108 -76.5 184t-183.5 76t-183.5 -76t-76.5 -184q0 -107 76.5 -183t183.5 -76t183.5 76t76.5 183zM1664 352v-192q0 -14 -9 -23t-23 -9h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216
-q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664" 
-d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
-t18.5 98.5t36.5 91.5t63 64.5t93.5 26h5q7 -4 32 -19.5t35.5 -21t33 -17t37 -16t35 -9t39.5 -4.5t39.5 4.5t35 9t37 16t33 17t35.5 21t32 19.5zM1664 928q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96
-q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216q66 0 113 -47t47 -113v-224h96q13 0 22.5 -9.5t9.5 -22.5v-192zM1408 -96v1472q0 13 -9.5 22.5t-22.5 9.5h-1216
-q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z" />
-    <glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048" 
-d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
-M867 925q0 94 -66.5 160.5t-160.5 66.5t-160.5 -66.5t-66.5 -160.5t66.5 -160.5t160.5 -66.5t160.5 66.5t66.5 160.5zM1792 416v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1792 676v56q0 15 -10.5 25.5t-25.5 10.5h-568
-q-15 0 -25.5 -10.5t-10.5 -25.5v-56q0 -15 10.5 -25.5t25.5 -10.5h568q15 0 25.5 10.5t10.5 25.5zM1792 928v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-352v96q0 14 -9 23t-23 9
-h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048" 
-d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
-q0 -94 -66.5 -160.5t-160.5 -66.5t-160.5 66.5t-66.5 160.5t66.5 160.5t160.5 66.5t160.5 -66.5t66.5 -160.5zM1792 480v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1792 732v-56q0 -15 -10.5 -25.5t-25.5 -10.5h-568
-q-15 0 -25.5 10.5t-10.5 25.5v56q0 15 10.5 25.5t25.5 10.5h568q15 0 25.5 -10.5t10.5 -25.5zM1792 992v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1920 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1728q-13 0 -22.5 -9.5
-t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h352v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h768v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h352q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113
-t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792" 
-d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
-t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792" 
-d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
-t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5z" />
-    <glyph glyph-name="uniF2C0" unicode="&#xf2c0;" 
-d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
-t198.5 -40.5t163.5 -109.5t109.5 -163.5t40.5 -198.5q0 -147 -79 -272zM768 1408q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5zM1195 -128q88 0 150.5 71.5t62.5 173.5q0 239 -78.5 377t-225.5 145
-q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z" />
-    <glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280" 
-d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
-t162.5 -66.5t67.5 -160.5zM1152 -96v1376h-1024v-1376q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1280 1376v-1472q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h352v-96q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v96h352
-q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048" 
-d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
-t56 136zM1792 288v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1408 544v64q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1792 544v64q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23
-v-64q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1792 800v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM128 1152h1792v96q0 14 -9 23t-23 9h-1728q-14 0 -23 -9t-9 -23v-96zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728
-q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048" 
-d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
-M1792 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1408 608v-64q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h320q14 0 23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v64
-q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 864v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1920 32v1120h-1792v-1120q0 -13 9.5 -22.5t22.5 -9.5h1728q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47
-h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792" 
-d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
-q3 -27 -2 -67t-26.5 -95t-58 -100.5t-107 -78t-162.5 -32.5q-71 0 -130.5 19t-105.5 56t-79 78t-66 96q-97 -27 -205 -27q-150 0 -292.5 58t-253 158.5t-178 249t-67.5 317.5q0 170 67.5 319.5t178.5 250.5t253.5 159t291.5 58q121 0 238.5 -36t217 -106t176 -164.5
-t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z" />
-    <glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304" 
-d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
-t17 -20.5t14.5 -23.5t4.5 -21zM1796 33q0 -29 -17.5 -48.5t-46.5 -19.5h-1081q-26 0 -45 19t-19 45q0 29 17.5 48.5t46.5 19.5h1081q26 0 45 -19t19 -45zM1581 644q0 -134 -67 -233q-25 -38 -69.5 -78.5t-83.5 -60.5q-16 -10 -27 -10q-7 0 -15 6t-8 12q0 9 19 30t42 46
-t42 67.5t19 88.5q0 76 -35 130q-29 42 -46 42q-3 0 -3 -5q0 -12 7.5 -35.5t7.5 -36.5q0 -22 -21.5 -35t-44.5 -13q-66 0 -66 76q0 15 1.5 44t1.5 44q0 25 -10 46q-13 25 -42 53.5t-51 28.5q-5 0 -7 -0.5t-3.5 -2.5t-1.5 -6q0 -2 16 -26t16 -54q0 -37 -19 -68t-46 -54
-t-53.5 -46t-45.5 -54t-19 -68q0 -98 42 -160q29 -43 79 -63q16 -5 17 -10q1 -2 1 -5q0 -16 -18 -16q-6 0 -33 11q-119 43 -195 139.5t-76 218.5q0 55 24.5 115.5t60 115t70.5 108.5t59.5 113.5t24.5 111.5q0 53 -25 94q-29 48 -56 64q-19 9 -19 21q0 20 41 20q50 0 110 -29
-q41 -19 71 -44.5t49.5 -51t33.5 -62.5t22 -69t16 -80q0 -1 3 -17.5t4.5 -25t5.5 -25t9 -27t11 -21.5t14.5 -16.5t18.5 -5.5q23 0 37 14t14 37q0 25 -20 67t-20 52t10 10q27 0 93 -70q72 -76 102.5 -156t30.5 -186zM2304 615q0 -274 -138 -503q-19 -32 -48 -72t-68 -86.5
-t-81 -77t-74 -30.5q-16 0 -31 15.5t-15 31.5q0 15 29 50.5t68.5 77t48.5 52.5q183 230 183 531q0 131 -20.5 235t-72.5 211q-58 119 -163 228q-2 3 -13 13.5t-16.5 16.5t-15 17.5t-15 20t-9.5 18.5t-4 19q0 19 16 35.5t35 16.5q70 0 196 -169q98 -131 146 -273t60 -314
-q2 -42 2 -64z" />
-    <glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792" 
-d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
-t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
-t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
-t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
-t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
-t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
-M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z" />
-    <glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920" 
-d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
-t166 -115q94 39 197 24.5t185 -79.5l44 44q10 10 23 10t23 -10zM1344 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1600 896q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1856 1024q26 0 45 -19t19 -45t-19 -45t-45 -19
-t-45 19t-19 45t19 45t45 19zM1216 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1408 832q0 26 19 45t45 19t45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45zM1728 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 768
-q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 640q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1600 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 512q-26 0 -45 19t-19 45t19 45t45 19t45 -19
-t19 -45t-19 -45t-45 -19zM1472 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 384
-q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z" />
-    <glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792" 
-d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
-t-9 23t9 23t23 9t23 -9t9 -23zM768 928q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM704 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1056q0 -14 -9 -23t-23 -9t-23 9
-t-9 23t9 23t23 9t23 -9t9 -23zM704 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v640q0 106 75 181t181 75q108 0 184 -78q46 19 98 12t93 -39l22 22q11 11 22 0l42 -42
-q11 -11 0 -22l-314 -314q-11 -11 -22 0l-42 42q-11 11 0 22l22 22q-36 46 -40.5 104t23.5 108q-37 35 -88 35q-53 0 -90.5 -37.5t-37.5 -90.5v-640h1504q14 0 23 -9t9 -23zM896 1056q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1120q0 -14 -9 -23t-23 -9
-t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM896 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1248q0 -14 -9 -23
-t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z" />
-    <glyph glyph-name="uniF2CE" unicode="&#xf2ce;" 
-d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
-t-247 234.5t-337 74q-124 -7 -237 -61t-193.5 -140.5t-128 -202t-46.5 -240.5q1 -184 99 -336.5t257 -231.5q7 -3 9 -12q3 -21 6 -45q1 -9 5 -32.5t6 -35.5q1 -9 -6.5 -15t-15.5 -2q-148 58 -261 169.5t-173.5 264t-52.5 319.5q7 143 66 273.5t154.5 227t225 157.5t272.5 70
-q164 10 315.5 -46.5t261 -160.5t175 -250.5t65.5 -308.5zM994 800q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5zM1282 768q0 -122 -53.5 -228.5t-146.5 -177.5q-8 -6 -16 -2t-10 14q-6 52 -29 92q-7 10 3 20
-q58 54 91 127t33 155q0 111 -58.5 204t-157.5 141.5t-212 36.5q-133 -15 -229 -113t-109 -231q-10 -92 23.5 -176t98.5 -144q10 -10 3 -20q-24 -41 -29 -93q-2 -9 -10 -13t-16 2q-95 74 -148.5 183t-51.5 234q3 131 69 244t177 181.5t241 74.5q144 7 268 -60t196.5 -187.5
-t72.5 -263.5z" />
-    <glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792" 
-d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792" 
-d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048" 
-d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
-t47 -113z" />
-    <glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792" 
-d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
-l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792" 
-d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
-l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792" 
-d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794" 
-d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
-t30.5 -12l38 -39q12 -12 12 -29.5t-12 -29.5zM951 870q-7 -8 -18.5 -8t-19.5 8q-7 8 -7 19t7 19q8 8 19 8t19 -8t8 -19t-8 -19zM1354 968q-34 -64 -107.5 -85.5t-127.5 16.5q-38 28 -61 66.5t-21 87.5t39 92t75.5 53t70.5 -5t70 -51q2 -2 13 -12.5t14.5 -13.5t13 -13.5
-t12.5 -15.5t10 -15.5t8.5 -18t4 -18.5t1 -21t-5 -22t-9.5 -24zM1555 486q3 20 -8.5 34.5t-27.5 21.5t-33 17t-23 20q-40 71 -84 98.5t-113 11.5q19 13 40 18.5t33 4.5l12 -1q2 45 -34 90q6 20 6.5 40.5t-2.5 30.5l-3 10q43 24 71 65t34 91q10 84 -43 150.5t-137 76.5
-q-60 7 -114 -18.5t-82 -74.5q-30 -51 -33.5 -101t14.5 -87t43.5 -64t56.5 -42q-45 4 -88 36t-57 88q-28 108 32 222q-16 21 -29 32q-50 0 -89 -19q19 24 42 37t36 14l13 1q0 50 -13 78q-10 21 -32.5 28.5t-47 -3.5t-37.5 -40q2 4 4 7q-7 -28 -6.5 -75.5t19 -117t48.5 -122.5
-q-25 -14 -47 -36q-35 -16 -85.5 -70.5t-84.5 -101.5l-33 -46q-90 -34 -181 -125.5t-75 -162.5q1 -16 11 -27q-15 -12 -30 -30q-21 -25 -21 -54t21.5 -40t63.5 6q41 19 77 49.5t55 60.5q-2 2 -6.5 5t-20.5 7.5t-33 3.5q23 5 51 12.5t40 10t27.5 6t26 4t23.5 0.5q14 -7 22 34
-q7 37 7 90q0 102 -40 150q106 -103 101 -219q-1 -29 -15 -50t-27 -27l-13 -6q-4 -7 -19 -32t-26 -45.5t-26.5 -52t-25 -61t-17 -63t-6.5 -66.5t10 -63q-35 54 -37 80q-22 -24 -34.5 -39t-33.5 -42t-30.5 -46t-16.5 -41t-0.5 -38t25.5 -27q45 -25 144 64t190.5 221.5
-t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2D7" unicode="&#xf2d7;" 
-d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
-q-6 -37 -31.5 -252t-30.5 -276q-146 5 -263.5 8t-162.5 4h-44h-628l-376 -12v102l127 25q67 13 91.5 37t25.5 79l8 643q3 402 -8 645q-2 61 -25.5 84t-91.5 36l-127 24v102l376 -12h702q139 0 374 27q-6 -68 -14 -194.5t-12 -219.5l-5 -92h-93l-32 124q-31 121 -74 179.5
-t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z" />
-    <glyph glyph-name="uniF2D8" unicode="&#xf2d8;" 
-d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
-t5 5.5t8 1.5q6 0 10 -1.5t6.5 -4.5t4 -6t2 -8.5t0.5 -8v-9.5v-9zM180 407h122v472h-122v-472zM614 407h106v472h-159l-28 -221q-20 148 -32 221h-158v-472h107v312l45 -312h76l43 319v-319zM1039 712q0 67 -5 90q-3 16 -11 28.5t-17 20.5t-25 14t-26.5 8.5t-31 4t-29 1.5
-h-29.5h-12h-91v-472h56q169 -1 197 24.5t25 180.5q-1 62 -1 100zM1356 515v133q0 29 -2 45t-9.5 33.5t-24.5 25t-46 7.5q-46 0 -77 -34v154h-117v-472h110l7 30q30 -36 77 -36q50 0 66 30.5t16 83.5zM1536 1248v-1216q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113
-v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176" 
-d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
-q0 161 -62 307t-167.5 252t-250.5 168.5t-304 62.5q-147 0 -281 -52.5t-240 -148.5q-30 -58 -45 -160q60 51 143 83.5t158.5 43t143 13.5t108.5 -1l40 -3q33 -1 53 -15.5t24.5 -33t6.5 -37t-1 -28.5q-126 11 -227.5 0.5t-183 -43.5t-142.5 -71.5t-131 -98.5
-q4 -36 11.5 -92.5t35.5 -178t62 -179.5q123 -6 247.5 14.5t214.5 53.5t162.5 67t109.5 59l37 24q22 16 39.5 20.5t30.5 -5t17 -34.5q14 -97 -39 -121q-208 -97 -467 -134q-135 -20 -317 -16q41 -96 110 -176.5t137 -127t130.5 -79t101.5 -43.5l39 -12q143 -23 263 15
-q195 99 314 289t119 418zM2123 621q-14 -135 -40 -212q-70 -208 -181.5 -346.5t-318.5 -253.5q-48 -33 -82 -44q-72 -26 -163 -16q-36 -3 -73 -3q-283 0 -504.5 173t-295.5 442q-1 0 -4 0.5t-5 0.5q-6 -50 2.5 -112.5t26 -115t36 -98t31.5 -71.5l14 -26q8 -12 54 -82
-q-71 38 -124.5 106.5t-78.5 140t-39.5 137t-17.5 107.5l-2 42q-5 2 -33.5 12.5t-48.5 18t-53 20.5t-57.5 25t-50 25.5t-42.5 27t-25 25.5q19 -10 50.5 -25.5t113 -45.5t145.5 -38l2 32q11 149 94 290q41 202 176 365q28 115 81 214q15 28 32 45t49 32q158 74 303.5 104
-t302 11t306.5 -97q220 -115 333 -336t87 -474z" />
-    <glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792" 
-d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
-q-52 -127 -148.5 -220t-214.5 -141.5t-253 -60.5t-266 13.5t-251 91t-210 161.5t-141.5 235.5t-46.5 303.5q1 41 8.5 84.5t12.5 64t24 80.5t23 73q-51 -208 1 -397t173 -318t291 -206t346 -83t349 74.5t289 244.5q20 27 18 14q0 -4 -4 -14zM1465 627q0 -104 -40.5 -199
-t-108.5 -164t-162 -109.5t-198 -40.5t-198 40.5t-162 109.5t-108.5 164t-40.5 199t40.5 199t108.5 164t162 109.5t198 40.5t198 -40.5t162 -109.5t108.5 -164t40.5 -199zM1752 915q-65 147 -180.5 251t-253 153.5t-292 53.5t-301 -36.5t-275.5 -129t-220 -211.5t-131 -297
-t-10 -373q-49 161 -51.5 311.5t35.5 272.5t109 227t165.5 180.5t207 126t232 71t242.5 9t236 -54t216 -124.5t178 -197q33 -50 62 -121t31 -112zM1690 573q12 244 -136.5 416t-396.5 240q-8 0 -10 5t24 8q125 -4 230 -50t173 -120t116 -168.5t58.5 -199t-1 -208
-t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z" />
-    <glyph glyph-name="uniF2DB" unicode="&#xf2db;" 
-d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
-q0 16 16 16h112zM192 1024v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 1280v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM1280 1440v-1472q0 -40 -28 -68t-68 -28h-832q-40 0 -68 28
-t-28 68v1472q0 40 28 68t68 28h832q40 0 68 -28t28 -68zM1536 208v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 464v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 720v-32
-q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 976v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 1232v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16
-h48q16 0 16 -16z" />
-    <glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664" 
-d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
-t-45 -19t-45 19t-19 45v214l-112 -128q-16 -18 -36.5 -22t-37 5.5t-28.5 25t-11 36.5t17 39l208 238v313l-271 -156l-102 -300q-13 -37 -48.5 -42t-60.5 20.5t-12 63.5l55 160l-186 -106q-23 -13 -48 -6.5t-39 29.5q-13 23 -6.5 48.5t29.5 38.5l186 107l-167 33
-q-29 6 -42 29t-8.5 46.5t25.5 40t50 10.5l310 -62l271 157l-271 157l-310 -62q-4 -1 -13 -1q-27 0 -44 18t-19 40t11 43t40 26l167 33l-186 107q-23 13 -29.5 38.5t6.5 48.5t39 30t48 -7l186 -106l-55 160q-13 38 12 63.5t60.5 20.5t48.5 -42l102 -300l271 -156v313
-l-208 238q-16 18 -17 39t11 36.5t28.5 25t37 5.5t36.5 -22l112 -128v214q0 26 19 45t45 19t45 -19t19 -45v-214l112 128q16 18 36.5 22t37 -5.5t28.5 -25t11 -36.5t-17 -39l-208 -238v-313l271 156l102 300q13 37 48.5 42t60.5 -20.5t12 -63.5l-55 -160l186 106
-q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z" />
-    <glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792" 
-d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
-q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z" />
-    <glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792" 
-d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
-t-304 -62t-250.5 -167.5t-167.5 -250.5t-62 -304t62 -304t167.5 -250.5t250.5 -167.5t304 -62t304 62t250.5 167.5t167.5 250.5t62 304zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71
-t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920" 
-d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
-t-45 -31q-1 -1 -9 -8.5t-12.5 -11t-15 -10t-16.5 -5.5t-17 3q-54 27 -84 40q-41 18 -94 -5t-76 -65q-16 -28 -41 -98.5t-43.5 -132.5t-40 -134t-21.5 -73q-22 -69 18.5 -119t110.5 -46q30 2 50.5 15t38.5 46q7 13 79 199.5t77 194.5q6 11 21.5 18t29.5 0q27 -15 21 -53
-q-2 -18 -51 -139.5t-50 -132.5q-6 -38 19.5 -56.5t60.5 -7t55 49.5q4 8 45.5 92t81.5 163.5t46 88.5q20 29 41 28q29 0 25 -38q-2 -16 -65.5 -147.5t-70.5 -159.5q-12 -53 13 -103t74 -74q17 -9 51 -15.5t71.5 -8t62.5 14t20 48.5zM383 86q3 -15 -5 -27.5t-23 -15.5
-q-14 -3 -26.5 5t-15.5 23q-3 14 5 27t22 16t27 -5t16 -23zM953 -177q12 -17 8.5 -37.5t-20.5 -32.5t-37.5 -8t-32.5 21q-11 17 -7.5 37.5t20.5 32.5t37.5 8t31.5 -21zM177 635q-18 -27 -49.5 -33t-57.5 13q-26 18 -32 50t12 58q18 27 49.5 33t57.5 -12q26 -19 32 -50.5
-t-12 -58.5zM1467 -42q19 -28 13 -61.5t-34 -52.5t-60.5 -13t-51.5 34t-13 61t33 53q28 19 60.5 13t52.5 -34zM1579 562q69 -113 42.5 -244.5t-134.5 -207.5q-90 -63 -199 -60q-20 -80 -84.5 -127t-143.5 -44.5t-140 57.5q-12 -9 -13 -10q-103 -71 -225 -48.5t-193 126.5
-q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5 125t79.5 98.5t121 50.5q32 85 99 148t146.5 91.5t168 17t159.5 -66.5q72 21 140 17.5t128.5 -36t104.5 -80t67.5 -115t17.5 -140.5q52 -16 87 -57t45.5 -89t-5.5 -99.5t-58 -87.5z
-M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
-q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
-q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
-    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792" 
- />
-  </font>
-</defs></svg>
diff --git a/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.ttf b/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.ttf
deleted file mode 100755
index 35acda2f..00000000
Binary files a/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.woff b/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.woff
deleted file mode 100755
index 400014a4..00000000
Binary files a/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.woff and /dev/null differ
diff --git a/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.woff2 b/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.woff2
deleted file mode 100755
index 4d13fc60..00000000
Binary files a/docs/_theme/custom_rtd_theme/static/fonts/fontawesome-webfont.woff2 and /dev/null differ
diff --git a/docs/_theme/custom_rtd_theme/static/js/modernizr.min.js b/docs/_theme/custom_rtd_theme/static/js/modernizr.min.js
deleted file mode 100755
index f65d4797..00000000
--- a/docs/_theme/custom_rtd_theme/static/js/modernizr.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.6.2 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-mq-cssclasses-addtest-prefixed-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
- */
-;window.Modernizr=function(a,b,c){function D(a){j.cssText=a}function E(a,b){return D(n.join(a+";")+(b||""))}function F(a,b){return typeof a===b}function G(a,b){return!!~(""+a).indexOf(b)}function H(a,b){for(var d in a){var e=a[d];if(!G(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function I(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:F(f,"function")?f.bind(d||b):f}return!1}function J(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return F(b,"string")||F(b,"undefined")?H(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),I(e,b,c))}function K(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)u[c[d]]=c[d]in k;return u.list&&(u.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),u}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)k.setAttribute("type",f=a[d]),e=k.type!=="text",e&&(k.value=l,k.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(f)&&k.style.WebkitAppearance!==c?(g.appendChild(k),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(k,null).WebkitAppearance!=="textfield"&&k.offsetHeight!==0,g.removeChild(k)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=k.checkValidity&&k.checkValidity()===!1:e=k.value!=l)),t[a[d]]=!!e;return t}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k=b.createElement("input"),l=":)",m={}.toString,n=" -webkit- -moz- -o- -ms- ".split(" "),o="Webkit Moz O ms",p=o.split(" "),q=o.toLowerCase().split(" "),r={svg:"http://www.w3.org/2000/svg"},s={},t={},u={},v=[],w=v.slice,x,y=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["&#173;",'<style id="s',h,'">',a,"</style>"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},z=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return y("@media "+b+" { #"+h+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},A=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=F(e[d],"function"),F(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),B={}.hasOwnProperty,C;!F(B,"undefined")&&!F(B.call,"undefined")?C=function(a,b){return B.call(a,b)}:C=function(a,b){return b in a&&F(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=w.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(w.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(w.call(arguments)))};return e}),s.flexbox=function(){return J("flexWrap")},s.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},s.canvastext=function(){return!!e.canvas&&!!F(b.createElement("canvas").getContext("2d").fillText,"function")},s.webgl=function(){return!!a.WebGLRenderingContext},s.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:y(["@media (",n.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},s.geolocation=function(){return"geolocation"in navigator},s.postmessage=function(){return!!a.postMessage},s.websqldatabase=function(){return!!a.openDatabase},s.indexedDB=function(){return!!J("indexedDB",a)},s.hashchange=function(){return A("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},s.history=function(){return!!a.history&&!!history.pushState},s.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},s.websockets=function(){return"WebSocket"in a||"MozWebSocket"in a},s.rgba=function(){return D("background-color:rgba(150,255,150,.5)"),G(j.backgroundColor,"rgba")},s.hsla=function(){return D("background-color:hsla(120,40%,100%,.5)"),G(j.backgroundColor,"rgba")||G(j.backgroundColor,"hsla")},s.multiplebgs=function(){return D("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},s.backgroundsize=function(){return J("backgroundSize")},s.borderimage=function(){return J("borderImage")},s.borderradius=function(){return J("borderRadius")},s.boxshadow=function(){return J("boxShadow")},s.textshadow=function(){return b.createElement("div").style.textShadow===""},s.opacity=function(){return E("opacity:.55"),/^0.55$/.test(j.opacity)},s.cssanimations=function(){return J("animationName")},s.csscolumns=function(){return J("columnCount")},s.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return D((a+"-webkit- ".split(" ").join(b+a)+n.join(c+a)).slice(0,-a.length)),G(j.backgroundImage,"gradient")},s.cssreflections=function(){return J("boxReflect")},s.csstransforms=function(){return!!J("transform")},s.csstransforms3d=function(){var a=!!J("perspective");return a&&"webkitPerspective"in g.style&&y("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=b.offsetLeft===9&&b.offsetHeight===3}),a},s.csstransitions=function(){return J("transition")},s.fontface=function(){var a;return y('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&g.indexOf(d.split(" ")[0])===0}),a},s.generatedcontent=function(){var a;return y(["#",h,"{font:0/0 a}#",h,':after{content:"',l,'";visibility:hidden;font:3px/1 a}'].join(""),function(b){a=b.offsetHeight>=3}),a},s.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},s.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},s.localstorage=function(){try{return localStorage.setItem(h,h),localStorage.removeItem(h),!0}catch(a){return!1}},s.sessionstorage=function(){try{return sessionStorage.setItem(h,h),sessionStorage.removeItem(h),!0}catch(a){return!1}},s.webworkers=function(){return!!a.Worker},s.applicationcache=function(){return!!a.applicationCache},s.svg=function(){return!!b.createElementNS&&!!b.createElementNS(r.svg,"svg").createSVGRect},s.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==r.svg},s.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(m.call(b.createElementNS(r.svg,"animate")))},s.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(m.call(b.createElementNS(r.svg,"clipPath")))};for(var L in s)C(s,L)&&(x=L.toLowerCase(),e[x]=s[L](),v.push((e[x]?"":"no-")+x));return e.input||K(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)C(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},D(""),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function p(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return r.shivMethods?n(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+l().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(r,b.frag)}function q(a){a||(a=b);var c=m(a);return r.shivCSS&&!f&&!c.hasCSS&&(c.hasCSS=!!k(a,"article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}")),j||p(a,c),a}var c=a.html5||{},d=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,e=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,f,g="_html5shiv",h=0,i={},j;(function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,e._prefixes=n,e._domPrefixes=q,e._cssomPrefixes=p,e.mq=z,e.hasEvent=A,e.testProp=function(a){return H([a])},e.testAllProps=J,e.testStyles=y,e.prefixed=function(a,b,c){return b?J(a,b,c):J(a,"pfx")},g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+v.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
diff --git a/docs/_theme/custom_rtd_theme/static/js/theme.js b/docs/_theme/custom_rtd_theme/static/js/theme.js
deleted file mode 100755
index 96672c62..00000000
--- a/docs/_theme/custom_rtd_theme/static/js/theme.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* sphinx_rtd_theme version 0.4.2 | MIT license */
-/* Built 20181005 13:10 */
-require=function r(s,a,l){function c(e,n){if(!a[e]){if(!s[e]){var i="function"==typeof require&&require;if(!n&&i)return i(e,!0);if(u)return u(e,!0);var t=new Error("Cannot find module '"+e+"'");throw t.code="MODULE_NOT_FOUND",t}var o=a[e]={exports:{}};s[e][0].call(o.exports,function(n){return c(s[e][1][n]||n)},o,o.exports,r,s,a,l)}return a[e].exports}for(var u="function"==typeof require&&require,n=0;n<l.length;n++)c(l[n]);return c}({"sphinx-rtd-theme":[function(n,e,i){var jQuery="undefined"!=typeof window?window.jQuery:n("jquery");e.exports.ThemeNav={navBar:null,win:null,winScroll:!1,winResize:!1,linkScroll:!1,winPosition:0,winHeight:null,docHeight:null,isRunning:!1,enable:function(e){var i=this;void 0===e&&(e=!0),i.isRunning||(i.isRunning=!0,jQuery(function(n){i.init(n),i.reset(),i.win.on("hashchange",i.reset),e&&i.win.on("scroll",function(){i.linkScroll||i.winScroll||(i.winScroll=!0,requestAnimationFrame(function(){i.onScroll()}))}),i.win.on("resize",function(){i.winResize||(i.winResize=!0,requestAnimationFrame(function(){i.onResize()}))}),i.onResize()}))},enableSticky:function(){this.enable(!0)},init:function(i){i(document);var t=this;this.navBar=i("div.wy-side-scroll:first"),this.win=i(window),i(document).on("click","[data-toggle='wy-nav-top']",function(){i("[data-toggle='wy-nav-shift']").toggleClass("shift"),i("[data-toggle='rst-versions']").toggleClass("shift")}).on("click",".wy-menu-vertical .current ul li a",function(){var n=i(this);i("[data-toggle='wy-nav-shift']").removeClass("shift"),i("[data-toggle='rst-versions']").toggleClass("shift"),t.toggleCurrent(n),t.hashChange()}).on("click","[data-toggle='rst-current-version']",function(){i("[data-toggle='rst-versions']").toggleClass("shift-up")}),i("table.docutils:not(.field-list,.footnote,.citation)").wrap("<div class='wy-table-responsive'></div>"),i("table.docutils.footnote").wrap("<div class='wy-table-responsive footnote'></div>"),i("table.docutils.citation").wrap("<div class='wy-table-responsive citation'></div>"),i(".wy-menu-vertical ul").not(".simple").siblings("a").each(function(){var e=i(this);expand=i('<span class="toctree-expand"></span>'),expand.on("click",function(n){return t.toggleCurrent(e),n.stopPropagation(),!1}),e.prepend(expand)})},reset:function(){var n=encodeURI(window.location.hash)||"#";try{var e=$(".wy-menu-vertical"),i=e.find('[href="'+n+'"]');if(0===i.length){var t=$('.document [id="'+n.substring(1)+'"]').closest("div.section");0===(i=e.find('[href="#'+t.attr("id")+'"]')).length&&(i=e.find('[href="#"]'))}0<i.length&&($(".wy-menu-vertical .current").removeClass("current"),i.addClass("current"),i.closest("li.toctree-l1").addClass("current"),i.closest("li.toctree-l1").parent().addClass("current"),i.closest("li.toctree-l1").addClass("current"),i.closest("li.toctree-l2").addClass("current"),i.closest("li.toctree-l3").addClass("current"),i.closest("li.toctree-l4").addClass("current"))}catch(o){console.log("Error expanding nav for anchor",o)}},onScroll:function(){this.winScroll=!1;var n=this.win.scrollTop(),e=n+this.winHeight,i=this.navBar.scrollTop()+(n-this.winPosition);n<0||e>this.docHeight||(this.navBar.scrollTop(i),this.winPosition=n)},onResize:function(){this.winResize=!1,this.winHeight=this.win.height(),this.docHeight=$(document).height()},hashChange:function(){this.linkScroll=!0,this.win.one("hashchange",function(){this.linkScroll=!1})},toggleCurrent:function(n){var e=n.closest("li");e.siblings("li.current").removeClass("current"),e.siblings().find("li.current").removeClass("current"),e.find("> ul li.current").removeClass("current"),e.toggleClass("current")}},"undefined"!=typeof window&&(window.SphinxRtdTheme={Navigation:e.exports.ThemeNav,StickyNav:e.exports.ThemeNav}),function(){for(var r=0,n=["ms","moz","webkit","o"],e=0;e<n.length&&!window.requestAnimationFrame;++e)window.requestAnimationFrame=window[n[e]+"RequestAnimationFrame"],window.cancelAnimationFrame=window[n[e]+"CancelAnimationFrame"]||window[n[e]+"CancelRequestAnimationFrame"];window.requestAnimationFrame||(window.requestAnimationFrame=function(n,e){var i=(new Date).getTime(),t=Math.max(0,16-(i-r)),o=window.setTimeout(function(){n(i+t)},t);return r=i+t,o}),window.cancelAnimationFrame||(window.cancelAnimationFrame=function(n){clearTimeout(n)})}()},{jquery:"jquery"}]},{},["sphinx-rtd-theme"]);
\ No newline at end of file
diff --git a/docs/_theme/custom_rtd_theme/theme.conf b/docs/_theme/custom_rtd_theme/theme.conf
deleted file mode 100755
index 5d80641a..00000000
--- a/docs/_theme/custom_rtd_theme/theme.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = css/theme.css
-pygments_style = default
-
-[options]
-canonical_url =
-analytics_id =
-collapse_navigation = True
-sticky_navigation = True
-navigation_depth = 4
-includehidden = True
-titles_only = 
-logo_only =
-display_version = True
-prev_next_buttons_location = bottom
-style_external_links = False
diff --git a/docs/_theme/custom_rtd_theme/versions.html b/docs/_theme/custom_rtd_theme/versions.html
deleted file mode 100755
index 4d78287a..00000000
--- a/docs/_theme/custom_rtd_theme/versions.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% if READTHEDOCS %}
-{# Add rst-badge after rst-versions for small badge style. #}
-  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-    <span class="rst-current-version" data-toggle="rst-current-version">
-      <span class="fa fa-book"> Read the Docs</span>
-      v: {{ current_version }}
-      <span class="fa fa-caret-down"></span>
-    </span>
-    <div class="rst-other-versions">
-      <dl>
-        <dt>{{ _('Versions') }}</dt>
-        {% for slug, url in versions %}
-          <dd><a href="{{ url }}">{{ slug }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        <dt>{{ _('Downloads') }}</dt>
-        {% for type, url in downloads %}
-          <dd><a href="{{ url }}">{{ type }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        <dt>{{ _('On Read the Docs') }}</dt>
-          <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}/?fromdocs={{ slug }}">{{ _('Project Home') }}</a>
-          </dd>
-          <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/builds/{{ slug }}/?fromdocs={{ slug }}">{{ _('Builds') }}</a>
-          </dd>
-      </dl>
-      <hr/>
-      {% trans %}Free document hosting provided by <a href="http://www.readthedocs.org">Read the Docs</a>.{% endtrans %}
-
-    </div>
-  </div>
-{% endif %}
-
diff --git a/docs/composing_search_conditions.rst b/docs/composing_search_conditions.rst
deleted file mode 100644
index aacb05da..00000000
--- a/docs/composing_search_conditions.rst
+++ /dev/null
@@ -1,117 +0,0 @@
-Composing SearchConditions
-==========================
-
-In this chapter you will learn how to compose your SearchConditions, without
-using an input processor. Composing Conditions manually is perfect for testing
-your integration, or using RollerworksSearch as a SDK for (REST) APIs.
-
-Creating a FieldSet
--------------------
-
-Before you can compose a SearchCondition you first need a FieldSet configuration,
-even when using the Condition only for exporting you need a FieldSet as the exporter
-needs to know which data transformer(s) to use.
-
-.. include:: fieldset.rst.inc
-
-And now you can use the FieldSet for the SearchConditionBuilder, note that
-values must be provided in the "model" format of the field-type.
-
-For the DateTimeType this is a ``DateTime`` object, for the id this is an
-``integer``, and username is a ``string``.
-
-For this example we want to search for users:
-
-Registered between the years 2015 and 2016 (but not within the month May)
-*or* have a username which contains the word "admin".
-
-.. code-block:: php
-
-    use Rollerworks\Component\Search\ConditionOptimizer\DuplicateRemover;
-    use Rollerworks\Component\Search\SearchConditionBuilder;
-    use Rollerworks\Component\Search\Test\SearchConditionOptimizerTestCase;
-    use Rollerworks\Component\Search\Value\Compare;
-    use Rollerworks\Component\Search\Value\ExcludedRange;
-    use Rollerworks\Component\Search\Value\PatternMatch;
-    use Rollerworks\Component\Search\Value\Range;
-    use Rollerworks\Component\Search\Value\ValuesBag;
-    use Rollerworks\Component\Search\Value\ValuesGroup;
-
-    $condition = SearchConditionBuilder::create($fieldSet, ValuesGroup::GROUP_LOGICAL_OR)
-        ->field('regDate')
-            ->add(new Range(new DateTime('2015-01-01 00:00:00 UTC'), new DateTime('2017-01-01 00:00:00 UTC'), true, false))
-            ->add(new ExcludedRange(new DateTime('2015-03-01 00:00:00 UTC'), new DateTime('2015-04-01 00:00:00 UTC'), true, false))
-        end()
-        ->field('name')
-            ->add(new PatternMatch('admin', PatternMatch::PATTERN_CONTAINS))
-        ->end()
-        ->getSearchCondition();
-
-Lets break this down, ``field('name')`` tells the builder we want to work on
-a SearchField named ``name``. Once we are done we call ``end`` and return back to
-the ValuesGroup were we can add/remove other fields, and add new/remove (sub)groups.
-
-.. code-block:: php
-
-    new Range(new DateTime('2015-01-01 00:00:00 UTC'), new DateTime('2017-01-01 00:00:00 UTC'), true, false)
-
-This code segment creates a new ``Range`` value value-holder with an inclusive
-lower bound and exclusive upper bound (everything lower then the value itself).
-
-.. note::
-
-    Calling ``field('name')`` multiple times will return the same instance
-    of the ``ValuesBagBuilder``. Use ``field('name', true)`` to overwrite
-    the existing instance.
-
-The ``SearchConditionBuilder`` is really powerful and developer friendly, but
-instead of explaining everything, the following full example should give you an
-idea about whats possible::
-
-    use Rollerworks\Component\Search\ConditionOptimizer\DuplicateRemover;
-    use Rollerworks\Component\Search\SearchConditionBuilder;
-    use Rollerworks\Component\Search\Test\SearchConditionOptimizerTestCase;
-    use Rollerworks\Component\Search\Value\Compare;
-    use Rollerworks\Component\Search\Value\ExcludedRange;
-    use Rollerworks\Component\Search\Value\PatternMatch;
-    use Rollerworks\Component\Search\Value\Range;
-    use Rollerworks\Component\Search\Value\ValuesBag;
-    use Rollerworks\Component\Search\Value\ValuesGroup;
-
-    $condition = SearchConditionBuilder::create($fieldSet, ValuesGroup::GROUP_LOGICAL_OR)
-        ->field('regDate')
-            ->add(new Range(new DateTime('2015-01-01 00:00:00 UTC'), new DateTime('2017-01-01 00:00:00 UTC'), true, false))
-            ->add(new ExcludedRange(new DateTime('2015-03-01 00:00:00 UTC'), new DateTime('2015-04-01 00:00:00 UTC'), true, false))
-        end()
-        ->field('name')
-            ->add(new PatternMatch('admin', PatternMatch::PATTERN_CONTAINS))
-        ->end()
-        ->group()
-            ->field('id')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-                ->add(new Compare(10, '>'))
-            ->end()
-            ->group(ValuesGroup::GROUP_LOGICAL_OR)
-                ->field('first-name')
-                    ->addSimpleValue('homer')
-                    ->add(new PatternMatch('spider', PatternMatch::PATTERN_CONTAINS))
-                    ->add(new PatternMatch('pig', PatternMatch::PATTERN_CONTAINS))
-                    ->add(new PatternMatch('doctor', PatternMatch::PATTERN_STARTS_WITH, true)) // case-insensitive match
-                    ->add(new PatternMatch('who', PatternMatch::PATTERN_CONTAINS, true)) // case-insensitive match
-                ->end()
-            ->end()
-        ->end()
-        ->getSearchCondition();
-
-You can group as deep as needed, and always return to the previous level using ``end()``.
-The builder support all of your complex and simple conditions.
-
-See also :doc:`searching_in_practice`
-
-Further reading
----------------
-
-* :doc:`Visual condition builder <visual_condition_builder>` (coming soon)
-* :doc:`reference/exporters`
-
diff --git a/docs/conf.py b/docs/conf.py
deleted file mode 100644
index 1c188eb9..00000000
--- a/docs/conf.py
+++ /dev/null
@@ -1,265 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# RollerworksSearch documentation build configuration file, created by
-# sphinx-quickstart on Thu Aug 02 16:57:26 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.abspath('_theme/_exts'))
-
-# adding PhpLexer
-from sphinx.highlighting import lexers
-from pygments.lexers.web import PhpLexer
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sensio.sphinx.refinclude', 'sensio.sphinx.configurationblock', 'sensio.sphinx.phpcode']
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'RollerworksSearch'
-copyright = u'Rollerworks'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = 'v2.0'
-# The full version, including alpha/beta/rc tags.
-release = '2.0.0-alpha0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = []
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'native'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'nature'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-html_short_title = 'RollerworksSearch'
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'RollerworksSearchDoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'RollerworksSearch.tex', u'RollerworksSearch Documentation',
-   u'Sebastiaan Stok', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'rollerworkssearch', u'RollerworksSearch Documentation',
-     [u'Sebastiaan Stok'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'RollerworksSearch', u'RollerworksSearch Documentation',
-   u'Sebastiaan Stok', 'RollerworksSearch', 'a light yet powerful search system',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-# CUSTOM
-
-templates_path = ['_templates']
-source_suffix = '.rst'
-master_doc = 'index'
-html_theme_path = ['_theme']
-html_theme = 'custom_rtd_theme'
-
-pygments_style = 'native'
-primary_domain = 'php'
-highlight_language = 'php'
-
-lexers['php'] = PhpLexer(startinline=True)
-lexers['php-annotations'] = PhpLexer(startinline=True)
-lexers['php-standalone'] = PhpLexer(startinline=True)
-lexers['php-symfony'] = PhpLexer(startinline=True)
-
-api_url = 'http://rollerworks.github.io/search/doc/master/%s'
diff --git a/docs/cookbook/index.rst b/docs/cookbook/index.rst
deleted file mode 100644
index 5f097388..00000000
--- a/docs/cookbook/index.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-The Cookbook
-============
-
-.. toctree::
-    :hidden:
-
-    type/index
-
-.. include:: map.rst.inc
diff --git a/docs/cookbook/map.rst.inc b/docs/cookbook/map.rst.inc
deleted file mode 100644
index 50bceb8d..00000000
--- a/docs/cookbook/map.rst.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-* :doc:`type/index`
-
-  * :doc:`type/index`
-  * :doc:`type/data_transformers`
-  * :doc:`type/create_field_type_extension`
-  * :doc:`type/unit_testing`
-
diff --git a/docs/cookbook/type/building_view.rst b/docs/cookbook/type/building_view.rst
deleted file mode 100644
index c1174d7c..00000000
--- a/docs/cookbook/type/building_view.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Building the field type view
-============================
-
-TBD.
diff --git a/docs/cookbook/type/create_field_type_extension.rst b/docs/cookbook/type/create_field_type_extension.rst
deleted file mode 100644
index 3c90142c..00000000
--- a/docs/cookbook/type/create_field_type_extension.rst
+++ /dev/null
@@ -1,224 +0,0 @@
-.. index::
-   single: Type; Field type extension
-
-How to Create a Field Type Extension
-====================================
-
-.. caution::
-
-    This page is not updated for Rollerworks v2.0 yet.
-
-:doc:`Custom search field types <create_custom_field_type>` are great when
-you need field types with a specific purpose, such as a gender selector,
-or a VAT number input.
-
-But sometimes, you don't really need to add new field types - you want
-to add features on top of existing types. This is where field type
-extensions come in.
-
-Field type extensions have 2 main use-cases:
-
-#. You want to add a **generic feature to several types** (such as
-   adding a "help" text to every field type);
-#. You want to add a **specific feature to a single type** (such
-   as adding a user friendly date picker feature to the "date" field type).
-
-In both those cases, it might be possible to achieve your goal with custom
-field rendering, or custom search field types. But using field type extensions
-can be cleaner (by limiting the amount of business logic in templates)
-and more flexible (you can add several type extensions to a single field
-type).
-
-Field type extensions can achieve most of what custom field types can do,
-but instead of being field types of their own, **they plug into existing types**.
-
-Imagine you want to add a range selector to the ``Number`` type,
-but this requires a min and max value to select from, and maybe a step value.
-
-You could do this by customizing how this field is rendered in a template.
-But field type extensions allow you to do this in a nice DRY fashion.
-
-Defining the Field Type Extension
----------------------------------
-
-Your first task will be to create the field type extension class (called ``RangeTypeExtension``
-in this article). By standard, field extensions usually live in the ``Search\Type\Extension``
-directory of one of your applications/libraries.
-
-When creating a field type extension, you can either implement the
-:class:`Rollerworks\\Component\\Search\\FieldTypeExtensionInterface` interface
-or extend the :class:`Rollerworks\\Component\\Search\\AbstractFieldTypeExtension`
-class. In most cases, it's easier to extend the abstract class::
-
-    // src/Acme/Client/Search/Type/Extension/RangeTypeExtension.php
-    namespace Acme\Client\Search\Type\Extension;
-
-    use Rollerworks\Component\Search\AbstractFieldTypeExtension;
-
-    class RangeTypeExtension extends AbstractFieldTypeExtension
-    {
-        /**
-         * Returns the name of the type being extended.
-         *
-         * @return string The name of the type being extended
-         */
-        public function getExtendedType()
-        {
-            return 'file';
-        }
-    }
-
-The only method you **must** implement is the ``getExtendedType`` function.
-It is used to indicate the name of the field type that will be extended
-by your extension.
-
-.. tip::
-
-    The value you return in the ``getExtendedType`` method corresponds
-    to the value returned by the ``getName`` method in the field type class
-    you wish to extend.
-
-In addition to the ``getExtendedType`` function, you will probably want
-to override one of the following methods:
-
-* ``buildType()``
-
-* ``buildView()``
-
-* ``configureOptions()``
-
-For more information on what those methods do, you can refer to the
-:doc:`Creating Custom Field Types <create_custom_field_type>`
-cookbook article.
-
-Adding the extension Business Logic
------------------------------------
-
-The goal of your extension is to display a range slider instead of an input
-field. As most JavaScript libraries already provide a simple way to trigger
-the rendering the extension only needs to pass the options to view for usage.
-
-The template rendering the view can then use the configured options to
-trigger the rendering done by JavaScript.
-
-Your field type extension class will need to do two things in order to extend
-the ``number`` field type:
-
-#. Override the ``configureOptions`` method in order to add the ``min_value``,
-   ``max_value`` and ``step_value`` options;
-#. Override the ```buildView`` method in order to pass the options to the view.
-
-.. code-block:: php
-    :linenos:
-
-    // src/Acme/Client/Search/Type/Extension/RangeTypeExtension.php
-    namespace Acme\Client\Search\Type\Extension;
-
-    use Rollerworks\Component\Search\AbstractFieldTypeExtension;
-    use Rollerworks\Component\Search\SearchFieldView;
-    use Rollerworks\Component\Search\FieldConfigInterface;
-    use Symfony\Component\OptionsResolver\OptionsResolver;
-
-    class RangeTypeExtension extends AbstractFieldTypeExtension
-    {
-        /**
-         * Returns the name of the type being extended.
-         *
-         * @return string The name of the type being extended
-         */
-        public function getExtendedType()
-        {
-            return 'number';
-        }
-
-        /**
-         * Add the min_value, max_value, step_value options.
-         *
-         * @param OptionsResolver $resolver
-         */
-        public function configureOptions(OptionsResolver $resolver)
-        {
-            $resolver->setOptional(array('min_value', 'max_value', 'step_value'));
-        }
-
-        /**
-         * Pass the image options to the view.
-         *
-         * @param SearchFieldView      $view
-         * @param FieldConfigInterface $field
-         * @param array                $options
-         */
-        public function buildView(SearchFieldView $view, FieldConfigInterface $field, array $options)
-        {
-            foreach (array('min_value', 'max_value', 'step_value') as $key) {
-                if (array_key_exists($key, $options)) {
-                    $view->vars[$key] = $options[$key];
-                }
-            }
-        }
-    }
-
-Using the Field Type
---------------------
-
-Now the type extension is created, the Search system needs to know it exists,
-just like field types this can be done in to ways;
-
-You can choose to register the extension using the ``FactoryBuilder``
-
-.. code-block:: php
-    :linenos:
-
-    use Acme\Client\Search\Type\Extension\RangeTypeExtension;
-    use Rollerworks\Component\Search\Searches;
-
-    $searchFactory = new Searches::createSearchFactoryBuilder()
-        ->addTypeExtension(new RangeTypeExtension())
-        ->getSearchFactory()
-    ;
-
-Or the by registering the type in a ``SearchExtension``.
-
-.. code-block:: php
-    :linenos:
-
-    // src/Acme/Client/Search/ClientExtension.php
-
-    namespace Acme\Client\Search;
-
-    use Rollerworks\Component\Search\AbstractExtension;
-
-    class ClientExtension extends AbstractExtension
-    {
-        protected function loadTypeExtensions()
-        {
-            return array(
-                new Type\Extension\RangeTypeExtension(),
-            );
-        }
-    }
-
-And then register it at system using the FactoryBuilder.
-
-.. code-block:: php
-
-    /* ... */
-
-    $searchFactory = new Searches::createSearchFactoryBuilder()
-        ->addExtension(new ClientExtension())
-        ->getSearchFactory();
-
-Now that type can be used for any field by type name the corresponds with the value
-returned by the ``getName`` method defined earlier.
-
-From now on, when adding a field of type ``number`` in your field, you can
-specify the ``min_value``, ``max_value`` and ``step_value`` options that
-will be used to display an the range selector. For example::
-
-    /* ... */
-
-    $fieldset = $searchFactory->createFieldSetBuilder('products')
-        ->add('name', 'text')
-        ->add('size', 'number', 'min_value' => 1, 'max_value' => 100)
-        ->getFieldSet()
-    ;
diff --git a/docs/cookbook/type/data_transformers.rst b/docs/cookbook/type/data_transformers.rst
deleted file mode 100644
index 2203ac00..00000000
--- a/docs/cookbook/type/data_transformers.rst
+++ /dev/null
@@ -1,154 +0,0 @@
-.. index::
-   single: Field; Data transformers
-
-How to Use Data Transformers
-============================
-
-.. caution::
-
-    This page is not updated for Rollerworks v2.0 yet.
-
-You'll often find the need to transform the data the user entered in a field into
-something else for use in your search processor. You could do this in the processor
-but then you will loose some powerful features (like removing duplicates or overlapping
-values).
-
-Say you have an invoice number that is provided in a special format
-like '2015-134', the first part is the year and second a number relative
-to the year. 2015-134 means number 134 of the year 2015.
-
-The system has no idea how to handle this format. It looks like a number but it's not.
-This is where DataTransformers come into play.
-
-A DataTransformer serves two purposes, it reverse-transformer a user-input
-value into a Model value format (like an object or a PHP primitive type).
-
-And can transform this Model format back into a user friendly output.
-
-The InvoiceNumber object in this example is such a model value.
-
-.. include:: invoice_number.rst.inc
-
-Creating the Transformer
-------------------------
-
-Create an ``InvoiceNumberTransformer`` class - this class will be responsible
-for converting to and from the invoice number and the ``InvoiceNumber`` object::
-
-    // src/Acme/Invoice/Search/DataTransformer/InvoiceNumberTransformer.php
-
-    namespace Acme\Invoice\Search\DataTransformer;
-
-    use Acme\Invoice\InvoiceNumber;
-    use Rollerworks\Component\Search\DataTransformerInterface;
-    use Rollerworks\Component\Search\Exception\TransformationFailedException;
-    use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
-
-    class InvoiceNumberTransformer implements DataTransformerInterface
-    {
-        public function transform($value)
-        {
-            if (!$value instanceof InvoiceNumber) {
-                throw new UnexpectedTypeException($value, 'Acme\Invoice\InvoiceNumber');
-            }
-
-            return (string) $value;
-        }
-
-        public function reverseTransform($value)
-        {
-            if (null === $value) {
-                return null;
-            }
-
-            try {
-                return InvoiceNumber::createFromString($value);
-            } catch (\Exception $e) {
-                throw new TransformationFailedException('This not a valid invoice number.')
-            }
-        }
-    }
-
-.. tip::
-
-    If the transformer is unable to transform the input to an ``InvoiceNumber``
-    a ``TransformationFailedException`` is thrown to indicate an invalid value.
-
-    The error message that is shown to user can be controlled with the
-    ``invalid_message`` field option.
-
-.. note::
-
-    When ``null`` is passed to the ``transform()`` method, your transformer
-    should return an equivalent value of the type it is transforming to (e.g.
-    an empty string, 0 for integers or 0.0 for floats).
-
-Using the Transformer
----------------------
-
-Now that you have the transformer built, you need to add it to your
-invoice field type::
-
-    // src/Acme/Invoice/Search/Type/InvoiceNumberType.php
-
-    namespace Acme\Invoice\Search\Type;
-
-    use Acme\Invoice\Search\DataTransformer\InvoiceNumberTransformer;
-    use Rollerworks\Component\Search\AbstractFieldType;
-    use Rollerworks\Component\Search\Exception\InvalidConfigurationException;
-    use Rollerworks\Component\Search\FieldConfigInterface;
-
-    class InvoiceNumberType extends AbstractFieldType
-    {
-        public function buildType(FieldConfigInterface $config, array $options)
-        {
-            $config->setViewTransformer(new InvoiceNumberTransformer());
-        }
-
-        public function getName()
-        {
-            return 'invoice_number';
-        }
-    }
-
-Cool, you're done! Your user will be able to enter an invoice number into the
-field and it will be transformed back into an ``InvoiceNumber`` object. This means
-after a successful transformation, the system will pass an ``InvoiceNumber``
-object instead of a string value.
-
-And when exporting the value the original format is shown.
-
-View or Norm DataTransformer
-----------------------------
-
-A DataTransformer always transformer between two different formats
-the input to model (``reverseTransform``) and model to original format
-(``transform``).
-
-But there is more to DataTransformers, depending on the input format
-you work with either a view format or a normalized (norm) format.
-
-*The view is for a localized representation of a value like a local data,
-while the norm format allows to provide the value in an export friendly
-format like an ISO data format.*
-
-The view-format is used mainly by the StringQuery input format, while
-*all* other input processors use a normalized (or norm) format.
-
-*Which DataTransformer and format will be used depends on the input processor
-implementation.*
-
-But as a rule of thumb, unless a norm DataTransformer is set for the field,
-each input processor will use the view DataTransformer of the field.
-And fallback to a simple string conversion if neither are set.
-
-So why Use the Data Transformer?
---------------------------------
-
-Transforming user input into a normalized value is done for multiple reasons.
-
-* It makes using the value in the processor easier.
-* It allows for localized input (like numbers on a none-latin charset).
-* And most of all it makes it possible to optimize the search condition.
-
-One very good example for usage is :doc:`Value Comparisons <value_comparison>`.
diff --git a/docs/cookbook/type/index.rst b/docs/cookbook/type/index.rst
deleted file mode 100644
index 28ac87dc..00000000
--- a/docs/cookbook/type/index.rst
+++ /dev/null
@@ -1,241 +0,0 @@
-Custom Field Type
-=================
-
-RollerworksSearch already comes with a ridge collection of field types.
-However there are situations where you may want to create a custom field
-type for a specific purpose. Or when you want enhance there existing function
-functionality.
-
-Fortunately creating your own field types, or extending existing types
-(without worrying about class inheritance) is really easy.
-
-This entire chapter is dedicated to writing your own field types, and field
-type extensions, including data transformers, value comparison and unit testing.
-
-So lets get's started!
-
-Use-case description
---------------------
-
-This recipe assumes you need a field definition which holds specially formatted
-Client ID's, based on the existing integer field. This section explains how the
-field is defined, and how you can register it for usage in your application.
-
-The Client ID begins with a 'C' prefix, and is prepended with zeros until it's
-at least 4 digits.
-
-Example: ``C30320, C0001, C442482, C0020``.
-
-Defining the Field Type
------------------------
-
-In order to create the custom field type, first you have to create the class representing the type.
-In this situation the class holding the field type will be called ``ClientIdType`` and the file will be
-stored in the default location for search field types, which is ``<VendorName>\\Search\\Type``.
-
-Make sure the field extends :class:`Rollerworks\\Component\\Search\\Field\\AbstractFieldType`:
-
-.. code-block:: php
-    :linenos:
-
-    // src/Acme/Client/Search/Type/ClientIdType.php
-
-    namespace Acme\Client\Search\Type;
-
-    use Acme\Client\Search\DataTransformer\ClientIdTransformer;
-    use Rollerworks\Component\Search\Field\AbstractFieldType;
-    use Symfony\Component\OptionsResolver\OptionsResolver;
-
-    class ClientIdType extends AbstractFieldType
-    {
-        public function buildType(FieldConfigInterface $config, array $options)
-        {
-            $config->addViewTransformer(new ClientIdTransformer());
-        }
-    }
-
-.. tip::
-
-    The location of this file is not important - the ``Search\\Type`` directory
-    is just a recommended convention.
-
-Note that a type can do more then shown here, but we will get to that later,
-for now this is enough to create the ClientIdType.
-
-There are three methods that are particularly important:
-
-``buildType()``
-    Each field type has a ``buildType`` method, which is where you configure
-    and build any field(s).
-
-    This method allows to set a view/norm data-transformer, value-comparator,
-    and support value types.
-
-``buildView()``
-    This method is used to set any extra variables you'll
-    need when rendering your field in a template. For example, in `IntegerType`_,
-    a ``precision`` variable is set and used in the template to set
-    the ``precision`` attribute on the ``input`` field.
-
-``configureOptions()``
-    This defines options for your field type that can be used in ``buildType()``
-    and ``buildView()``. There are a lot of options common to all fields
-    (see :doc:`/reference/types/field`), but you can create as many others
-    as needed.
-
-Creating the ClientIdTransformer
---------------------------------
-
-Because the type handel's client ID's in a special format, the type needs
-a :doc:`data_transformers` to transform the input back into
-a regular integer.
-
-.. code-block:: php
-    :linenos:
-
-    // src/Acme/Client/Search/DataTransformer/ClientIdTransformer.php
-
-    namespace Acme\Client\Search\DataTransformer;
-
-    use Rollerworks\Component\Search\DataTransformerInterface;
-    use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-    class ClientIdTransformer implements DataTransformerInterface
-    {
-        public function transform($value)
-        {
-            return sprintf('C%04d', $value);
-        }
-
-        public function reverseTransform($value)
-        {
-            if (null !== $value && !is_scalar($value)) {
-                throw new TransformationFailedException('Expected a scalar.');
-            }
-
-            return (int) ltrim('C0');
-        }
-    }
-
-You will learn more about data-transformers later on, but for now just
-remember that ``reverseTransform`` always processes user-input. While
-``transform`` transformers the model value to something ``reverseTransform``
-can transformer. *Reverse-transform transforms towards a SearchCondition.*
-
-Using the Field Type
---------------------
-
-Now that the type is created, the SearchFactory needs a way to find it.
-
-Fortunately, because this type has no constructor/setter dependencies, it
-can be loaded using the Fully qualified class name (FQCN): ``Acme\Client\Search\Type\ClientIdType``.
-
-So you can use it without having to register it anywhere, *as long as PHP
-is able to load the class.*
-
-Now ClientIdType can be used for any search field and/or field-type (as parent).
-
-.. code-block:: php
-
-    use Acme\Client\Search\Type\ClientIdType;
-    use Rollerworks\Component\Search\Searches;
-
-    $searchFactory = new Searches::createSearchFactoryBuilder()->getSearchFactory();
-
-    $fieldset = $searchFactory->createFieldSetBuilder()
-        ->add('id', ClientIdType::class)
-        // ...
-        ->getFieldSet();
-
-Registering the type
-~~~~~~~~~~~~~~~~~~~~
-
-When the type has constructor/setter dependencies you need to load it
-using a ``SearchExtension``.
-
-.. note::
-
-    Framework integrations use a similar lazy loading system,
-    see there implementation details for more information.
-
-.. code-block:: php
-    :linenos:
-
-    // src/Acme/Client/Search/ClientExtension.php
-
-    namespace Acme\Client\Search;
-
-    use Rollerworks\Component\Search\AbstractExtension;
-
-    class ClientExtension extends AbstractExtension
-    {
-        protected function loadTypes()
-        {
-            return array(
-                new Type\ClientIdType(),
-            );
-        }
-    }
-
-And then register the extension in the system using the FactoryBuilder:
-
-.. code-block:: php
-
-    ...
-
-    use Acme\Client\Search\ClientExtension;
-
-    $searchFactory = new Searches::createSearchFactoryBuilder()
-        ->addExtension(new ClientExtension())
-        ->getSearchFactory();
-
-    /* ... */
-
-    use Acme\Client\Search\ClientExtension\Type\ClientIdType;
-
-    // Register type directly without using an search extension
-    $searchFactory = new Searches::createSearchFactoryBuilder()
-        ->addType(new ClientIdType())
-        ->getSearchFactory();
-
-.. note::
-
-    For best performance it's advised to use a lazy loading
-    SearchExtension like ``LazyExtension``:
-
-    .. code-block:: php
-
-        use Acme\Client\Search\Type\ClientIdType;
-        use Rollerworks\Component\Search\Extension\LazyExtension;
-
-        ...
-
-        $searchFactory = new Searches::createSearchFactoryBuilder()
-            ->addExtension(new LazyExtension([
-                ClientIdType::class => function () {
-                    return new ClientIdType();
-                },
-            ]))
-            ->getSearchFactory();
-
-Conclusion
-----------
-
-That's it, you now know the basics for creating custom field types,
-but field types don't stop here. There's much more you can do.
-
-Learn more about: :doc:`data_transformers`, :doc:`value_comparison`
-:doc:`building_view` and how to :doc:`unit_testing`
-
-Topics
-------
-
-.. toctree::
-    :maxdepth: 2
-
-    data_transformers
-    value_comparison
-    create_field_type_extension
-    unit_testing
-
-.. _`IntegerType`: https://github.com/rollerworks/RollerworksSearch/blob/master/src/Extension/Core/Type/IntegerType.php
diff --git a/docs/cookbook/type/invoice_number.rst.inc b/docs/cookbook/type/invoice_number.rst.inc
deleted file mode 100644
index b947f74e..00000000
--- a/docs/cookbook/type/invoice_number.rst.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-InvoiceNumber value class
--------------------------
-
-First create the InvoiceNumber class that holds an invoice number.
-
-This technique is known as a 'value class', the InvoiceNumber is immutable
-meaning its internal values can't be changed.
-
-.. code-block:: php
-    :linenos:
-
-    // src/Acme/Invoice/InvoiceNumber.php
-
-    namespace Acme\Invoice;
-
-    final class InvoiceNumber
-    {
-        private $year;
-        private $number;
-
-        private function __construct(int $year, int  $number)
-        {
-            $this->year = $year;
-            $this->number = $number;
-        }
-
-        public static function createFromString(string $input): self
-        {
-            if (!preg_match('/^(?P<year>\d{4})-(?P<number>\d+)$/s', $input, $matches)) {
-                throw new \InvalidArgumentException('This not a valid invoice number.');
-            }
-
-            return new InvoiceNumber((int) $matches['year'], (int) ltrim($matches['number'], '0'));
-        }
-
-        public function equals(InvoiceNumber $input): bool
-        {
-            return $input == $this;
-        }
-
-        public function isHigher(InvoiceNumber $input): bool
-        {
-            if ($this->year > $input->year) {
-                return true;
-            }
-
-            if ($input->year === $this->year && $this->number > $input->number) {
-                return true;
-            }
-
-            return false;
-        }
-
-        public function isLower(InvoiceNumber $input): bool
-        {
-            if ($this->year < $input->year) {
-                return true;
-            }
-
-            if ($input->year === $this->year && $this->number < $input->number) {
-                return true;
-            }
-
-            return false;
-        }
-
-        public function __toString(): string
-        {
-            // Return the invoice number with leading zero
-            return sprintf('%d-%04d', $this->year, $this->number);
-        }
-    }
diff --git a/docs/cookbook/type/unit_testing.rst b/docs/cookbook/type/unit_testing.rst
deleted file mode 100644
index a1d2912f..00000000
--- a/docs/cookbook/type/unit_testing.rst
+++ /dev/null
@@ -1,247 +0,0 @@
-.. index::
-   single: Type; Field Type testing
-
-How to Unit Test your Field Types
-=================================
-
-.. caution::
-
-    This page is not updated for Rollerworks v2.0 yet.
-
-A Field consists of 3 core object: a field type (implementing
-:class:`Rollerworks\\Component\\Search\\Field\\FieldType`) the
-:class:`Rollerworks\\Component\\Search\\Field\\SearchField` and the
-:class:`Rollerworks\\Component\\Search\\Field\\SearchFieldView`.
-
-The only class that is usually manipulated by programmers is the field type class
-which serves as a field blueprint. It is used to generate the ``SearchField`` and the
-``SearchFieldView``. You could test it directly by mocking its interactions with the
-factory but it would be complex. It is better to pass it to SearchFactory like it
-is done in a real application. It is simple to bootstrap and you can trust
-the Search components enough to use them as a testing base.
-
-There is already a class that you can benefit from for simple FieldTypes
-testing: :class:`Rollerworks\\Component\\Search\\Test\\SearchIntegrationTestCase`. It is used to
-test the core types and you can use it to test your types too.
-
-.. note::
-
-    Depending on the way you installed RollerworksSearch the tests may
-    not be downloaded. Use the ``--prefer-source`` option with
-    Composer if this is the case.
-
-The Basics
-----------
-
-The simplest ``SearchIntegrationTestCase`` implementation looks like the following::
-
-    // src/Acme/Invoice/Tests/Search/Type/InvoiceNumberTypeTest.php
-    namespace Acme\Invoice\Tests\Search\Type;
-
-    use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-    use Acme\Invoice\Search\Type\InvoiceNumberType;
-    use Acme\Invoice\Search\ValueComparison\InvoiceNumberComparison;
-    use Acme\Invoice\InvoiceNumber;
-
-    class InvoiceNumberTypeTest extends SearchIntegrationTestCase
-    {
-        public function testValidInvoiceNumber()
-        {
-            $field = $this->getFactory()->createField('invoice', 'invoice_number');
-
-            $expectedOutput = new InvoiceNumber(2015, 20);
-            $expectedView = '2015-0020';
-
-            $this->assertTransformedEquals($field, $expectedOutput, '2015-0020', $expectedView);
-            $this->assertTransformedEquals($field, $expectedOutput, '2015-020', $expectedView);
-            $this->assertTransformedEquals($field, $expectedOutput, '2015-20', $expectedView);
-        }
-
-        public function testWrongInputFails()
-        {
-           $field = $this->getFactory()->createField('invoice', 'invoice_number');
-
-            $this->assertTransformedFails($field, '201-0020');
-            $this->assertTransformedFails($field, '2015-');
-            $this->assertTransformedFails($field, '201500');
-        }
-
-        protected function getTypes()
-        {
-            return array(
-                new InvoiceNumberType(
-                    new InvoiceNumberComparison()
-                )
-            );
-        }
-    }
-
-So, what does it test? Here comes a detailed explanation.
-
-First you verify if the ``FieldType`` compiles. This includes basic class
-inheritance, the ``buildField`` function and options resolution. This should
-be the first test you write:
-
-.. code-block:: php
-
-    $type = new TestedType();
-    $form = $this->getFactory()->create($type);
-
-This test checks that none of your data transformers used by the field
-failed. The ``assertTransformedEquals`` checks that the value-input is transformed
-properly to the expected output and that the reverse transforming is what you
-expect::
-
-    $this->assertTransformedEquals($field, $expectedOutput, '2015-0020', $expectedView);
-    $this->assertTransformedEquals($field, $expectedOutput, '2015-020', $expectedView);
-    $this->assertTransformedEquals($field, $expectedOutput, '2015-20', $expectedView);
-
-    $form->submit($formData);
-    $this->assertTrue($form->isSynchronized());
-
-.. note::
-
-    The expected view result is not required, but its a good practice
-    to ensure the field transformers work properly.
-
-Next, verify that invalid values are not transformed::
-
-    $this->assertTransformedFails($field, '201-0020');
-
-.. caution::
-
-    Make sure to only call ``getFactory`` method and not use the private
-    ``factory`` property to get the factory.
-
-    To access the factory builder (before calling the ``getFactory`` method)
-    use the ``factoryBuilder`` property.
-
-Adding a Type your Type Depends on
-----------------------------------
-
-Your field type may depend on other types that are not registered by
-default. It might look like this::
-
-    // src/Acme/Invoice/Search/Type/TestedType.php
-
-    // ... the getParent method
-    return 'my_custom_type';
-
-To create your type correctly, you need to make the other type available
-to the search factory in your test. The easiest way is to register it manually
-before creating the child type using the ``getTypes`` method::
-
-    // src/Acme/Test/Tests/Search/Type/TestedTypeTest.php
-    namespace Acme\Test\Tests\Search\Type;
-
-    use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-    use Acme\Test\Search\Type\ParentType;
-    use Acme\Test\Search\Type\TestedType;
-    use Acme\Test\ValueObject;
-
-    class TestedTypeTest extends SearchIntegrationTestCase
-    {
-        public function testValidValueTransforms()
-        {
-            $field = $this->getFactory()->createField('field_name', 'tested_type');
-
-            $expectedOutput = new ValueObject(10, 20, 50);
-            $expectedView = '{10, 20, 50}';
-
-            $this->assertTransformedEquals($field, $expectedOutput, '{10, 20,50}', $expectedView);
-        }
-
-        protected function getTypes()
-        {
-            return array(
-                new ParentType(),
-                new TestedType(),
-            );
-        }
-    }
-
-.. caution::
-
-    Make sure the parent type you add is well tested. Otherwise you may
-    be getting errors that are not related to the type you are currently
-    testing but to its children.
-
-Adding custom Extensions
-------------------------
-
-It often happens that you use some options that are added by
-:doc:`type extensions </cookbook/type/create_field_type_extension>`. One of the
-cases may be the Symfony ``ValidatorExtension`` with its ``constraints`` option.
-The ``SearchIntegrationTestCase`` loads only the core form extension so an "Invalid option"
-exception will be raised if you try to use it for testing a class that depends
-on other extensions. You need add those extensions to the factory object::
-
-    // src/Acme/Test/Tests/Search/Type/TestedTypeTest.php
-    namespace Acme\Test\Tests\Search\Type;
-
-    use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-    use Rollerworks\Component\Search\Extension\Symfony\ValidatorExtension;
-
-    class TestedTypeTest extends SearchIntegrationTestCase
-    {
-        protected function getTypeExtensions()
-        {
-            return array(
-                new ValidatorExtension(),
-            );
-        }
-
-        // ... your tests
-    }
-
-.. note::
-
-    The Symfony ``ValidatorExtension`` class is provided by a separate package.
-    See :doc:`/installing` for more information to install this extension.
-
-Testing against different Sets of Data
---------------------------------------
-
-If you are not familiar yet with PHPUnit's `data providers`_, this might be
-a good opportunity to use them::
-
-    // src/Acme/Test/Tests/Search/Type/TestedTypeTest.php
-    namespace Acme\Test\Tests\Search\Type;
-
-    use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-    use Acme\Test\Search\Type\TestedType;
-    use Acme\Test\ValueObject;
-
-    class TestedTypeTest extends SearchIntegrationTestCase
-    {
-        protected function getTypes()
-        {
-            return array(
-                new TestedType(),
-            );
-        }
-
-        /**
-         * @dataProvider getValidTestData
-         */
-        public function testValidDataTransforms($input, $expected, $viewExpected = null)
-        {
-            $field = $this->getFactory()->createField('field_name', 'tested_type');
-            $this->assertTransformedEquals($field, $expectedOutput, $input, $expectedView);
-        }
-
-        public function getValidTestData()
-        {
-            return array(
-                array('{10, 20,50}', new ValueObject(10, 20, 50), '{10, 20, 50}'),
-                array('{10, 20, 50}', new ValueObject(10, 20, 50), '{10, 20, 50}'),
-                array('{10,20,50}', new ValueObject(10, 20, 50), '{10, 20, 50}'),
-            );
-        }
-    }
-
-The code above will run your test three times with 3 different sets of
-data. This allows for decoupling the test fixtures from the tests and
-directly testing against multiple sets of data.
-
-.. _`data providers`: http://www.phpunit.de/manual/current/en/writing-tests-for-phpunit.html#writing-tests-for-phpunit.data-providers
diff --git a/docs/cookbook/type/value_comparison.rst b/docs/cookbook/type/value_comparison.rst
deleted file mode 100644
index 48b345a7..00000000
--- a/docs/cookbook/type/value_comparison.rst
+++ /dev/null
@@ -1,170 +0,0 @@
-How to Use Value Comparators
-============================
-
-.. caution::
-
-    This page is not updated for Rollerworks v2.0 yet.
-
-A powerful feature of RollerworksSearch is the ability to optimize
-search conditions and perform basic validation of user input.
-
-But in order to do this the system needs to understand which values
-are equal or lower/higher to other values. Especially when you are
-working with objects.
-
-.. note::
-
-    Fields with range support enabled must have a Value Comparator
-    in order to work properly. A missing Comparator will mark
-    every range in the field invalid!
-
-Assuming you have a field that handles invoice numbers as an InvoiceNumber
-and you configured that the field supports ranges.
-
-.. include:: invoice_number.rst.inc
-
-.. tip::
-
-    See :doc:`data_transformers` on how to transform a user input to
-    an ``InvoiceNumber``.
-
-Creating the Comparator
------------------------
-
-Create an ``InvoiceNumberComparator`` class - this class will be responsible
-for comparing values for equality and lower/higher ``InvoiceNumber`` objects::
-
-    // src/Acme/Invoice/Search/ValueComparator/InvoiceNumberComparator.php
-
-    namespace Acme\Invoice\Search\ValueComparator;
-
-    use Acme\Invoice\InvoiceNumber;
-    use Rollerworks\Component\Search\ValueComparator;
-
-    final class InvoiceNumberComparator implements ValueComparator
-    {
-        public function isHigher($higher, $lower, array $options): bool
-        {
-            return $higher->isHigher($lower);
-        }
-
-        public function isLower($lower, $higher, array $options): bool
-        {
-            return $lower->isLower($higher);
-        }
-
-        public function isEqual($value, $nextValue, array $options): bool
-        {
-            return $value->equals($nextValue);
-        }
-    }
-
-.. tip::
-
-    A comparison method will only receive values that are returned by
-    the field's data transformer.
-
-    You don't have to check if the input is what you expect, but
-    if the input is invalid you need look at the configured data transformers.
-
-.. note::
-
-    When ``isLower()`` and ``isHigher()`` are not supported, then both
-    methods should be return ``false``.
-
-Using the Comparator
---------------------
-
-Now that you have the Comparator built, you need to add it to your
-invoice field type::
-
-    // src/Acme/Invoice/Search/Type/InvoiceNumberType.php
-
-    namespace Acme\Invoice\Search\Type;
-
-    use Acme\Invoice\Search\DataTransformer\InvoiceNumberTransformer;
-    use Rollerworks\Component\Search\AbstractFieldType;
-    use Rollerworks\Component\Search\Exception\InvalidConfigurationException;
-    use Rollerworks\Component\Search\FieldConfigInterface;
-    use Rollerworks\Component\Search\Value\{Compare, Range};
-
-    final class InvoiceNumberType extends AbstractFieldType
-    {
-        private $valueComparator;
-
-        public function __construct()
-        {
-            $this->valueComparator = new InvoiceNumberComparator();
-        }
-
-        public function buildType(FieldConfigInterface $config, array $options)
-        {
-            $config->setValueComparator($this->valueComparator);
-            $config->setValueTypeSupport(Compare::class, true);
-            $config->setValueTypeSupport(Range::class, true);
-
-            $config->addViewTransformer(new InvoiceNumberTransformer());
-        }
-    }
-
-Cool, you're done! Input processors can now validate the bounds of ranges
-and optimizers can optimize the generated search condition.
-
-Optimizing incremented values
------------------------------
-
-Now that your type supports comparing values, you can extend the Comparator with
-the ability to calculate increments.
-
-Calculating increments helps with optimizing single incremented values.
-For example: ``1, 2, 3, 4, 5`` can be converted to a ``1 ~ 5`` range which will
-simplify the search condition and speed-up the search operation.
-
-.. note::
-
-    Optimizing incremented values is done by the
-    :class:``Rollerworks\\Component\\Search\\ConditionOptimizer\\ValuesToRange``
-    optimizer. So make sure its enabled.
-
-Instead of implementing the ``ValueComparator`` interface, you implement the
-``ValueIncrementer`` interface (which extends the ``ValueComparator`` interface)
-and add the ``getIncrementedValue`` method for calculating increments::
-
-    // src/Acme/Invoice/Search/ValueComparison/InvoiceNumberComparison.php
-
-    namespace Acme\Invoice\Search\ValueComparison;
-
-    use Acme\Invoice\InvoiceNumber;
-    use Rollerworks\Component\Search\ValueIncrementerInterface;
-
-    class InvoiceNumberComparison implements ValueIncrementerInterface
-    {
-        public function isHigher($higher, $lower, array $options): bool
-        {
-            return $higher->isHigher($lower);
-        }
-
-        public function isLower($lower, $higher, array $options): bool
-        {
-            return $lower->isLower($higher);
-        }
-
-        public function isEqual($value, $nextValue, array $options): bool
-        {
-            return $value->equals($nextValue);
-        }
-
-        public function getIncrementedValue($value, array $options, int $increments = 1)
-        {
-            return new InvoiceNumber($value->getYear(), $value->getNumber() + $increments);
-        }
-    }
-
-.. note::
-
-    Technically it's possible to optimize ``2015-099, 2015-100, 2015-000"``
-    to ``2015-099 ~ 2015-0001``, but only when we know if "2015-100" is the last
-    invoice for the year 2015.
-
-Cool, you're done! The new ``InvoiceNumberComparison`` can be set as your
-field's ValueComparator.
diff --git a/docs/creating_reusable_fieldsets.rst b/docs/creating_reusable_fieldsets.rst
deleted file mode 100644
index 175169aa..00000000
--- a/docs/creating_reusable_fieldsets.rst
+++ /dev/null
@@ -1,87 +0,0 @@
-Creating Reusable FieldSets
-===========================
-
-While creating FieldSet configurations on the fly is great for testing
-and exporting. It's generally better to use a FieldSetConfigurator
-to hold your FieldSet configuration.
-
-Using a FieldSetConfigurator makes it possible for the FieldSet to
-be serialized and makes your configuration sharable for other
-processors.
-
-And, creating a FieldSetConfigurator is no more different then using
-the builder.
-
-Say your user registration system has the following columns (with there respective
-storage type):
-
-* ``user_id``: integer
-* ``username``: text
-* ``password``: text
-* ``first_name``: text
-* ``last_name``: text
-* ``reg_date``: datetime
-
-You want to allow searching in all columns except password, because RollerworksSearch
-is agnostic to your data system you need tell the system which fields there are
-and then later map these fields to a column.
-
-.. note::
-
-    It may feel redundant to map these fields twice, but this is with a reason.
-
-    A FieldSet can be used for any data system or storage, if the FieldSet was
-    aware of your data system it would be only possible for one storage.
-    And switching from Doctrine ORM to ElasticSearch would be more difficult.
-
-Ok, now lets create a FieldSetConfigurator::
-
-    namespace Acme\Search\FieldSet;
-
-    use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-    use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-    use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType
-    use Rollerworks\Component\Search\FieldSetBuilder;
-    use Rollerworks\Component\Search\FieldSetConfigurator;
-
-    class UsersFieldSet implements FieldSetConfigurator
-    {
-        public function buildFieldSet(FieldSetBuilder $builder)
-        {
-            $builder
-                ->add('id', IntegerType::class)
-                ->add('username', TextType::class)
-                ->add('firstName', TextType::class)
-                ->add('lastName', TextType::class)
-                ->add('regDate', DateTimeType::class);
-        }
-    }
-
-That's it. The ``UsersFieldSet`` is now ready for usage::
-
-    use Acme\Search\FieldSet;
-    use Rollerworks\Component\Search\Searches;
-
-    $searchFactory = new Searches::createSearchFactory();
-
-    $fieldSet = $searchFactory->createFieldSet(FieldSet\UsersFieldSet::class);
-
-Alternatively when your FieldSetConfigurator has dependencies you can use
-a factory-constructor with the ``LazyFieldSetRegistry``::
-
-    use Acme\Search\FieldSet;
-    use Rollerworks\Component\Search\LazyFieldSetRegistry;
-
-    $fieldSetRegistry = LazyFieldSetRegistry::create([FieldSet\UsersFieldSet::class => function () {
-        return new FieldSet\UsersFieldSet();
-    ]);
-
-*Framework integrations provide a similar mechanise, see the integrations
-section for details.*
-
-.. note::
-
-    Depending the implementation of the ``FieldSetRegistry``
-    the configurator is only constructed once.
-
-    The ``LazyFieldSetRegistry`` supports a PSR-11 compatible Container.
diff --git a/docs/fieldset.rst.inc b/docs/fieldset.rst.inc
deleted file mode 100644
index a6ea8abb..00000000
--- a/docs/fieldset.rst.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-A FieldSet is build using either the FieldSetBuilder or a FieldSetConfigurator,
-using a FieldSetConfigurator makes it possible for the FieldSet to be serialized
-and makes your configuration easily sharable for other processors.
-
-For now we will use the FieldSetBuilder, building a FieldSet configuration
-for a user registration system.
-
-Say your user registration system has the following columns (with the storage type):
-
-* ``user_id``: integer
-* ``username``: text
-* ``password``: text
-* ``first_name``: text
-* ``last_name``: text
-* ``reg_date``: datetime
-
-You want to allow searching in all columns except password, because RollerworksSearch
-is agnostic to your data system you need tell the system which fields there are
-and then later map these fields to a (table) column.
-
-.. note::
-
-    It may feel redundant to map these fields twice, but this is with a reason.
-
-    A FieldSet can be used for any data system or storage, if the FieldSet was
-    aware of your data system it would be only possible for one storage.
-    And switching to ElasticSearch from Doctrine would be more difficult.
-
-.. code-block:: php
-    :linenos:
-
-    use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-    use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-    use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-
-    $userFieldSet = $searchFactory->createFieldSetBuilder()
-        ->add('id', IntegerType::class)
-        ->add('username', TextType::class)
-        ->add('firstName', TextType::class)
-        ->add('lastName', TextType::class)
-        ->add('regDate', DateTimeType::class)
-        ->getFieldSet('users');
-
-That's it. The FieldSet is now ready for usage, the ``getFieldSet`` method
-has an optional argument where you can provide the name of the set (eg. ``users``).
-
-Naming a set makes it easier to identify the set's configuration when passed
-to a Condition processor. But it is not required for normal usage.
-
-.. tip::
-
-    The ``getFieldSet`` method produces a new FieldSet configuration every time,
-    this allows to create multiple FieldSet configurations who share a common
-    structure and configuration.
diff --git a/docs/fieldset_registry.rst b/docs/fieldset_registry.rst
deleted file mode 100644
index 9beb1796..00000000
--- a/docs/fieldset_registry.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-FieldSetRegistry
-----------------
-
-A FieldSetRegistry (:class:`Rollerworks\\Component\\Search\\FieldSetRegistry`)
-allows to load a :ref:`FieldSet <fieldset>` from a registry.
-
-The default :class:`Rollerworks\\Component\\Search\\LazyFieldSetRegistry` allows
-to load a FieldSet using the FQCN of a FieldSetConfigurator or by using
-a `PSR-11`_ compatible container.
-
-.. code-block:: php
-
-    use Rollerworks\Component\Search\LazyFieldSetRegistry;
-
-    $container = ...;
-    $registry = new LazyFieldSetRegistry($container, ['fieldset-name' => 'service-id']);
-
-The FieldSetRegistry is amongst used when unserializing a serialized SearchCondition,
-so that you don't have to inject the FieldSet explicitly.
-
-.. _`PSR-11`: http://www.php-fig.org/psr/psr-11/
diff --git a/docs/index.rst b/docs/index.rst
deleted file mode 100644
index 9002a49b..00000000
--- a/docs/index.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-RollerworksSearch
-=================
-
-RollerworksSearch is a powerful search-system for PHP. Created to make
-searching in a PHP powered application as simple and fast as possible.
-
-In this manual you find everything to get started and make the most
-of the library. Start by :doc:`learning the basic terms <introduction>`,
-then :doc:`install RollerworksSearch <installing>`, follow-up with
-:doc:`processing_searches` and continue with integration extensions
-for your framework of choice.
-
-Need more? The Cookbook provides you with some recipes to cook-up your
-own field types, field type extensions.
-
-If you need any help get in touch at the `RollerworksSearch Gitter Channel`_.
-
-Topics
-------
-
-.. toctree::
-    :maxdepth: 1
-
-    introduction
-    installing
-    processing_searches
-    input
-    searching_in_practice
-    composing_search_conditions
-    creating_reusable_fieldsets
-    cookbook/index
-    reference/exporters
-    reference/caching
-
-.. reference/types (needs updating)
-
-Integrations
-------------
-
-.. toctree::
-    :maxdepth: 1
-
-    integration/doctrine/index
-    integration/symfony_bundle
-    integration/symfony_validator
-
-.. _`RollerworksSearch Gitter Channel`: https://gitter.im/rollerworks/RollerworksSearch
diff --git a/docs/input.rst b/docs/input.rst
deleted file mode 100644
index c4043954..00000000
--- a/docs/input.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-.. index::
-   single: input
-
-Input Processors
-================
-
-Input Processors transform the input to a ``SearchCondition``.
-Each processor supports exactly one specific format, which is described
-in the reference section of this manual.
-
-This chapter explains how you use the processors and how you configure
-them to limit the conditions allowed complexity.
-
-Values limit
-------------
-
-To prevent overloading your system the allowed complexity of the provided input
-can be limited a by values (per group), maximum amount of groups and/or a group
-maximum nesting level.
-
-You can configure a processor using :class:`Rollerworks\\Component\\Search\\Input\\ProcessorConfig`.
-
-By default the input is limited to a 100 values per field (per group), 10 groups (per group)
-in total, with a maximum nesting level of 5 levels deep.
-
-You can change these limits by calling ``setLimitValues``, ``setMaxGroups``
-and ``setMaxNestingLevel`` respectively.
-
-.. code-block:: php
-
-        $inputProcessor = ...;
-
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setMaxNestingLevel(2);
-        $config->setLimitValues(50);
-        $config->setMaxGroups(5);
-
-        $input = ...;
-        $condition$inputProcessor->process($config, $input);
-
-.. caution::
-
-    Unless you must support a large number of values its best to not
-    set these values too high.
-
-    Allowing users to pass a large number of values can result
-    in a massive performance hit or even crashing of the application.
-
-    Setting the nesting level to high may require you to increase
-    the ``xdebug.max_nesting_level`` value.
-
-Input format reference
-----------------------
-
-.. toctree::
-    :maxdepth: 1
-
-    reference/input/string_query
-    reference/input/json
diff --git a/docs/installing.rst b/docs/installing.rst
deleted file mode 100644
index 905e6b61..00000000
--- a/docs/installing.rst
+++ /dev/null
@@ -1,97 +0,0 @@
-Installing the Library
-======================
-
-.. note::
-
-    RollerworksSearch is developed in a monolith repository,
-    split into smaller components, which follow the same release
-    cycle and versioning.
-
-    RollerworksSearch v1.0 is no longer maintained.
-
-If you're starting a new project (or already have a project) that will use
-one or more components, the easiest way to integrate everything is with `Composer`_.
-Composer is smart enough to download the component(s) that you need and take
-care of autoloading so that you can begin using the libraries immediately.
-
-This article will take you through using the core component, though
-this applies to using any component.
-
-**1.** If you're creating a new project, create a new empty directory for it.
-
-**2.** Open a terminal and use Composer to grab the library.
-
-.. code-block:: terminal
-
-    $ composer require "rollerworks/search:^2.0"
-
-The name ``rollerworks/search`` is written at the top of the documentation for
-whatever component you want.
-
-.. tip::
-
-    `Install Composer`_ if you don't have it already present on your system.
-    Depending on how you install, you may end up with a ``composer.phar``
-    file in your directory. In that case, no worries! Your command line in that
-    case is ``php composer.phar require "rollerworks/search:^2.0"``.
-
-
-**3.** Write your code!
-
-Once Composer has downloaded the component(s), all you need to do is include
-the ``vendor/autoload.php`` file that was generated by Composer. This file
-takes care of autoloading all of the libraries so that you can use them
-immediately::
-
-    // File example: src/search.php
-
-    // update this to the path to the "vendor/"
-    // directory, relative to this file
-    require_once __DIR__.'/../vendor/autoload.php';
-
-    use Rollerworks\Component\Search\Searches;
-
-    $searchFactory = Searches::createSearchFactory();
-    $userFieldSetBuilder = $searchFactory->createFieldSetBuilder();
-
-    // ...
-
-.. note::
-
-    When using a Framework integration the autoloading is already
-    set-up by your framework bootstrapping.
-
-Extensions
-----------
-
-The ``rollerworks/search`` core library itself does not provide any mechanise
-for searching in a storage engine (like Doctrine or Elasticsearch). Instead they
-are provided as separate libraries, called extensions.
-
-Framework integration libraries (provided by Rollerworks) are designed to provide
-a clear-cut and ready to use solution. Whenever you install an addition extension,
-the integration automatically enables the support for it.
-
-.. note::
-
-    Only extensions provided by Rollerworks are fully integrated, for extensions
-    provided by third party developers you may need to enable some things manually.
-
-Framework integration
----------------------
-
-RollerworksSearch provides full integration for:
-
-* The :doc:`Symfony Framework <integration/symfony_bundle>`,
-* The :doc:`Api Platform <integration/api_platform>`,
-* :doc:`Doctrine DBAL and ORM <integration/doctrine/index>`.
-* :doc:`ElasticSearch <integration/elasticsearch/index>`.
-
-Further reading
----------------
-
-* :doc:`Using the SearchProcessor <processing_searches>`
-* :doc:`Composing SearchConditions <composing_search_conditions>`
-
-.. _Composer: https://getcomposer.org
-.. _Install Composer: https://getcomposer.org/download/
diff --git a/docs/integration/doctrine/conversions.rst b/docs/integration/doctrine/conversions.rst
deleted file mode 100644
index f6b5b010..00000000
--- a/docs/integration/doctrine/conversions.rst
+++ /dev/null
@@ -1,260 +0,0 @@
-Value and Column Conversions (DBAL)
-===================================
-
-.. cuation::
-
-    Since RollerworksSearch v2.0-ALPHA22 conversions for Doctrine ORM
-    are handled separately. See the related chapter for reference.
-
-Conversions for Doctrine DBAL are similar to the DataTransformers
-used for transforming user-input to a model data-format. Except that
-the transformation happens in a single direction and are applied SQL.
-
-So why are are they useful? The power of relational databases is
-storing complex data structures, and allow to retrieve these records
-into a transformed and combined result.
-
-For example the "birthday" field type accepts both an actual (birth)date
-or an age value like "9". But you're not going to store the actual age,
-as this would require constant updating. Instead you calculate the age by
-the date that is stored in the database (you transform the data). This
-transformation process is called a conversion.
-
-.. note::
-
-    Some values don't have to be converted if the Doctrine DBAL Type
-    is already able to process the value as-is.
-
-    For example a ``DateTime`` object can be safely used *if* the mapping-type
-    is properly configured with "date" or "datetime" as column type.
-
-There are two types of converters. Which can be combined together in one
-single class. Conversions can happen at the column and/or value.
-So you can really utilize the power of your SQL queries.
-
-.. note::
-
-    Unlike DataTransformers you`re limited to *one* converter per search
-    field. So setting an new conversion will overwrite previous one.
-
-Conversions are registered by setting the conversion object on the
-``SearchField`` by using the ``configureOptions`` method of the field type.
-
-Using:
-
-   .. code-block:: php
-
-       public function configureOptions(OptionsResolver $resolver)
-       {
-           $resolver->setDefaults([
-               'doctrine_dbal_conversion' => new MyConversionClass(),
-           ]);
-       }
-
-.. tip::
-
-    The ``doctrine_dbal_conversion`` option also accepts a ``Closure`` object
-    for lazy initializing, the closure is executed when initializing the
-    condition-generator.
-
-   .. code-block:: php
-
-       public function configureOptions(OptionsResolver $resolver)
-       {
-           $resolver->setDefaults([
-               'doctrine_dbal_conversion' => static fn () => new MyConversionClass(),
-           ]);
-       }
-
-Before you get started, it's important to know the following about conversions:
-
-#. Conversion should be stateless, meaning they don't remember anything
-   about there operations. This is because the calling order of conversion methods
-   is not predictable and conversions are only executed during the
-   generation process, so using a cached result does not execute them.
-#. Each method receives a :class:`Rollerworks\\Component\\Search\\Doctrine\\Dbal\\ConversionHints`
-   object which provides access to the used database connection, SearchField
-   configuration, column, and helper methods for using parameter-placeholders and
-   getting the actual value that is currently being processed (in the column context).
-#. The ``$options`` array provides the options of the SearchField.
-
-See existing conversions for a more detailed example.
-https://github.com/rollerworks/search/tree/master/lib/Doctrine/Dbal/Extension/Conversion
-
-.. tip::
-
-    To use a conversion for an existing FieldType use a
-    :ref:`FieldTypeExtension <field_type_extension>`.
-
-ColumnConversion
-----------------
-
-A ColumnConversion transforms the provided column to an SQL
-part like a sub-query or user-defined functional call.
-
-The :class:`Rollerworks\\Component\\Search\\Doctrine\\Dbal\\ColumnConversion`
-requires the implementation of one method that must return the column
-or anything that can be used as a replacement.
-
-This example shows how to get the age of a person in years from their date
-of birth. In short, the ``u.birthdate`` column is converted to an actual
-age in years::
-
-    namespace Acme\User\Search\Dbal\Conversion;
-
-    use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-    use Rollerworks\Component\Search\Doctrine\Dbal\ColumnConversion;
-
-    class AgeConversion implements ColumnConversion
-    {
-        public function convertColumn(string $column, array $options, ConversionHints $hints): string
-        {
-            if ('postgresql' === $hints->connection->getDatabasePlatform()->getName()) {
-                return "TO_CHAR('YYYY', AGE($column))";
-            } else {
-                // Return unconverted
-                return $fieldName;
-            }
-        }
-    }
-
-The ``u.birthdate`` column reference is wrapped inside two function calls,
-the first function converts the date to an Interval and then the second function
-extracts the years of the Interval and then casts the extracted years to a
-integer. Now you easily search for users with a certain age.
-
-Value Specific Conversion
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Most column versions are singular, but in some cases you might need
-to apply a different conversion depending on the value that is being
-processed at the moment.
-
-For the ``Rollerworks\\Component\\Search\\Extension\\Doctrine\\Dbal\\Conversion\\DateIntervalConversion`` you need
-to know whether the value needs to be subtracted or added, depending on the processing context.
-
-For the :class:`Rollerworks\\Component\\Search\\Extension\\Doctrine\\Dbal\\Conversion\\MoneyValueConversion`
-you need to know the unit (*precision*) the Currency, but don't have access to the database value.
-
-* The ``$context`` property of the ``ConversionHints`` provides
-  the current processing-context, see the ``CONTEXT_`` constants of the
-  ``ConversionHints`` for possible options;
-
-* The ``$originalValue`` holds the actual value-holder
-  that is currently being processed, depending on the context
-  this either a ``Range``, ``Compare`` value-holder object or ``mixed``
-  type value for ``CONTEXT_SIMPLE_VALUE``.
-
-When you only need the value (regardless of the context) use the
-``getProcessingValue()`` method.
-
-.. _value_conversion:
-
-ValueConversion
----------------
-
-A ValueConversion converts the provided value to an SQL part like a sub-query
-or user-defined functional call.
-
-The :class:`Rollerworks\\Component\\Search\\Doctrine\\Dbal\\ValueConversion`
-requires the implementation of one method that must return the value
-as SQL query-fragment.
-
-.. warning::
-
-    The ``convertValue`` method is required to return an SQL query-fragment
-    that will be applied as-is!
-
-    Avoid embedding the values directly, use the ``createParamReferenceFor``
-    on the ``$hints`` instead.
-
-    Failing to do this can easily lead to a category of security holes called
-    SQL injection, where a third party can modify the executed SQL and even
-    execute their own queries through clever exploiting of the security hole!
-
-    The only only save way to embed a value is with:
-
-    .. code-block:: php
-
-        $hints->createParamReferenceFor($value); // will return param-name `:search_x` where x an incremented number
-
-    Don't try to replace the escaping with your own implementation
-    as this may not provide a full protection against SQL injections.
-
-One of these values is Spatial data which requires a special type of input.
-The input must be provided using an SQL function, and there for this can not
-be done with only PHP.
-
-This example describes how to implement a MySQL specific column type called Point.
-
-The point class::
-
-    namespace Acme\Geo;
-
-    class Point
-    {
-        private $latitude;
-        private $longitude;
-
-        public function __construct(float $latitude, float $longitude)
-        {
-            $this->latitude  = $latitude;
-            $this->longitude = $longitude;
-        }
-
-        public function getLatitude(): float
-        {
-            return $this->latitude;
-        }
-
-        public function getLongitude(): float
-        {
-            return $this->longitude;
-        }
-    }
-
-And the GeoConversion class::
-
-    namespace Acme\Geo\Search\Dbal\Conversion;
-
-    use Acme\Geo\Point;
-    use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-    use Rollerworks\Component\Search\Doctrine\Dbal\SqlValueConversionInterface;
-
-    class GeoConversion implements ValueConversion
-    {
-        public function convertValue($input, array $options, ConversionHints $hints): string
-        {
-            if ($value instanceof Point) {
-                // The second argument is a Doctrine DBAL type used for the binding-type and
-                // any SQL specific transformation (otherwise the value is marked as text and used as-is).
-                $long = $hints->createParamReferenceFor($input->getLongitude(), 'decimal');
-                $lat = $hints->createParamReferenceFor($input->getLatitude(), 'decimal');
-
-                $value = sprintf('POINT(%s, %s)', $long, $lat);
-            }
-
-            return $value;
-        }
-    }
-
-.. note::
-
-    Alternatively you can choose to create a custom Type for Doctrine DBAL.
-    See `Custom Mapping Types`_ in the Doctrine DBAL manual for more information.
-
-    But doing this may cause issues with certain database vendors as the generator
-    doesn't now the value is wrapped inside a function and there for is unable
-    to adjust the generation process for better interoperability.
-
-Testing Conversions
--------------------
-
-To test if the conversions work as expected your can compare the generated,
-SQL with what your expecting, however there's no promise that the SQL
-structure will remain the same for the future releases.
-
-The only way to ensure your conversions work is to run it against an
-actual database with existing records.
-
-.. _`Custom Mapping Types`: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/types.html#custom-mapping-types
diff --git a/docs/integration/doctrine/conversions_orm.rst b/docs/integration/doctrine/conversions_orm.rst
deleted file mode 100644
index 082d29d4..00000000
--- a/docs/integration/doctrine/conversions_orm.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Value and Column Conversions (ORM)
-==================================
-
-TBD.
-
-Note that :doc:`Doctrine DBAL conversions <dbal>` are not applied here.
diff --git a/docs/integration/doctrine/dbal.rst b/docs/integration/doctrine/dbal.rst
deleted file mode 100644
index 362e7d9d..00000000
--- a/docs/integration/doctrine/dbal.rst
+++ /dev/null
@@ -1,272 +0,0 @@
-Searching with Doctrine DBAL
-============================
-
-This section of the manual explains how to install and configure the
-`Doctrine DBAL extension`_. The code samples assume you already have
-`Doctrine DBAL`_ set-up, and know how to write SQL queries.
-
-Following the :doc:`installation instructions </installing>` install the
-extension by running:
-
-.. code-block:: bash
-
-    $ php composer.phar require rollerworks/search-doctrine-dbal
-
-Enabling Integration
---------------------
-
-And enable the :class:`Rollerworks\\Component\\Search\\Extension\\Doctrine\\Dbal\\DoctrineDbalExtension`
-for the ``SearchFactoryBuilder``. To adds extra options for registering :doc:`conversions`
-and ensuring core types work properly.
-
-.. code-block:: php
-
-    use Rollerworks\Component\Search\Searches;
-    use Rollerworks\Component\Search\Extension\Doctrine\Dbal\DoctrineDbalExtension;
-    use Rollerworks\Component\Search\Extension\Core\CoreExtension;
-
-    $searchFactory = new Searches::createSearchFactoryBuilder()
-        ->addExtension(new DoctrineDbalExtension())
-
-        // ...
-        ->getSearchFactory();
-
-That's it, you can use RollerworksSearch with Doctrine DBAL support enabled.
-Continue reading to learn how the query the database with a SearchCondition.
-
-Querying the database
----------------------
-
-As you already know RollerworksSearch uses a ``SearchFactory`` for bootstrapping
-the search system. This factory however doesn't know about integration extensions.
-
-To Query a database with the Doctrine DBAL extension, you use the
-:class:`Rollerworks\\Component\\Search\\Doctrine\\Dbal\\DoctrineDbalFactory`.
-
-.. note::
-
-    The ``DoctrineDbalFactory`` works next to the ``SearchFactory``.
-    It's not a replacement for the ``SearchFactory``.
-
-    You use the SearchFactory first, and the the DoctrineDbalFactory second.
-
-The ``DoctrineDbalFactory`` class provides an entry point for creating
-:class:`Rollerworks\\Component\\Search\\Doctrine\\Dbal\\SqlConditionGenerator` and
-:class:`Rollerworks\\Component\\Search\\Doctrine\\Dbal\\CachedConditionGenerator`
-object instances.
-
-.. note::
-
-    Both classes implement the :class:`Rollerworks\\Component\\Search\\Doctrine\\Dbal\\ConditionGenerator`,
-    a ConditionGenerator is not to be confused a SearchCondition.
-
-    A ``ConditionGenerator`` generates an SQL where-clause 'condition'.
-
-Initiating the ``DoctrineDbalFactory`` is as simple as::
-
-    use Rollerworks\Component\Search\Doctrine\Dbal\DoctrineDbalFactory;
-
-    // \Psr\SimpleCache\CacheInterface | null
-    $cache = ...;
-
-    $doctrineDbalFactory = new DoctrineDbalFactory($cache);
-
-The ``$cache`` must a PSR-16 (SimpleCache) implementation, or can it
-can be omitted to disable the caching of generated conditions.
-
-See also: :doc:`/reference/caching`
-
-Using the ConditionGenerator
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-A ConditionGenerator generates an SQL Where-clause for a relational database
-like PostgreSQL, MySQL, MSSQL, or Oracle OCI.
-
-.. caution::
-
-    A ConditionGenerator is configured with a Doctrine DBAL QueryBuilder and SearchCondition.
-    So reusing a ConditionGenerator is not possible.
-
-    Secondly, the generated query is only valid for the give Database driver.
-    Meaning that when you generated a query with the PostgreSQL database driver
-    this query will not work on MySQL.
-
-First create a ``ConditionGenerator``::
-
-    // ...
-
-    // Doctrine\DBAL\Query\QueryBuilder object
-    $qb = ...;
-
-    // Rollerworks\Component\Search\SearchCondition object
-    $searchCondition = ...;
-
-    $conditionGenerator = $doctrineDbalFactory->createConditionGenerator($qb, $searchCondition);
-
-Before the condition can be generated, the ConditionGenerator needs to know how
-your fields are mapped to which columns and table/schema. To configure this
-field-to-column mapping, use the ``setField`` method on the ConditionGenerator:
-
-.. code-block:: php
-    :linenos:
-
-    /**
-     * Set the search field to database table-column mapping configuration.
-     *
-     * To map a field to more then one column use `field-name#mapping-name`
-     * for the $fieldName argument. The `field-name` is the field name as registered
-     * in the FieldSet, `mapping-name` allows to configure a (secondary) mapping for a field.
-     *
-     * Caution: A field can only have multiple mappings or one, omitting `#` will remove
-     * any existing mappings for that field. Registering the field without `#` first and then
-     * setting multiple mappings for that field will reset the single mapping.
-     *
-     * Tip: The `mapping-name` doesn't have to be same as $column, but using a clear name
-     * will help with trouble shooting.
-     *
-     * @param string $fieldName Name of the search field as registered in the FieldSet or
-     *                          `field-name#mapping-name` to configure a secondary mapping
-     * @param string $column    Database table column-name
-     * @param string $alias     Table alias as used in the query "u" for `FROM users AS u`
-     * @param string $type      Doctrine DBAL supported type, eg. string (not text)
-     *
-     * @throws UnknownFieldException  When the field is not registered in the fieldset
-     * @throws BadMethodCallException When the where-clause is already generated
-     *
-     * @return $this
-     */
-    public function setField(string $fieldName, string $column, string $alias = null, string $type = 'string');
-
-The first parameter is the search field-name as registered in the provided FieldSet
-(with optionally a mapping-name to allow mapping a field to multiple columns).
-
-Order fields must be prefixed with ``@`` as their actual name, either ``@id``.
-
-Followed by the database column-name (without any quoting), the table alias that
-corresponds with the table alias in the Query, and last the dbal-type
-(as provided by Doctrine DBAL).
-
-.. note::
-
-    The db-type must correspond to a Doctrine DBAL supported Type.
-    So instead of using ``varchar`` you use ``string``.
-
-    See `Doctrine DBAL Types`_ for a complete list of types and options.
-
-    If you have a type which requires the setting of options you may need
-    to use a :ref:`value_conversion` instead.
-
-.. caution::
-
-    Only SearchFields in the FieldSet that have a column-mapping configured
-    will be processed. All other fields are ignored.
-
-    If you try to configure a column-mapping for a unregistered SearchField
-    the ConditionGenerator will fail with an exception.
-
-After configuring you are ready to generate the query condition.
-
-Generating the Condition
-************************
-
-.. code-block:: php
-    :linenos:
-
-    // Doctrine\DBAL\Query\QueryBuilder object
-    $qb = $connection->createQueryBuilder();
-
-    // ...
-
-    $qb
-        ->select('u.name AS user_name', 'u.id AS user_id')
-        ->from('users', 'u')
-        ->leftJoin('u', 'contacts', 'c', 'c.user_id = u.id')
-    ;
-
-    $conditionGenerator = $doctrineDbalFactory->createConditionGenerator($qb, $searchCondition);
-
-    // Set the field to column mapping
-    $conditionGenerator->setField('user_id', 'u', 'id', 'integer');
-    $conditionGenerator->setField('user_name', 'u', 'name', 'string');
-    $conditionGenerator->setField('contact_name', 'c', 'name', 'string');
-
-    // Apply the condition (with ordering, if any) to the QueryBuilder
-    $conditionGenerator->apply();
-
-    // Get all the records
-    // See http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/data-retrieval-and-manipulation.html#data-retrieval
-    $result = $qb->execute();
-
-.. tip::
-
-    To prevent certain users from getting results they are not allowed to
-    see you can add an addition and-condition the QueryBuilder
-    or you can use a :ref:`pre_condition` for better portability.
-
-Mapping a field to multiple columns
-***********************************
-
-Instead of searching in a single column it's possible to search in multiple
-columns for the same field. In practice this will work the same as using
-the same values for other fields.
-
-In the example below field ``name`` will search in both the user's ``first``
-and ``last`` name columns (as ``OR`` case). *And* it's still possible to search
-with only the first and/or last name.
-
-.. code-block:: php
-
-    $conditionGenerator = $doctrineDbalFactory->createConditionGenerator($connection, $searchCondition);
-    $conditionGenerator->setField('name#first', 'first', 'u', 'string');
-    $conditionGenerator->setField('name#last', 'last', 'u', 'string');
-    $conditionGenerator->setField('first-name', 'first', 'u', 'string');
-    $conditionGenerator->setField('last-name', 'last', 'u', 'string');
-
-Caching the Where-clause
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Generating a Where-clause may require quite some time and system resources,
-which is why it's recommended to cache the generated query for future usage.
-
-Fortunately the factory allows to create a ``CachedConditionGenerator``
-which can handle caching of the ConditionGenerator for you.
-
-Plus, usage is no different then using the ``SqlConditionGenerator``,
-the ``CachedConditionGenerator`` decorates the ``SqlConditionGenerator``
-and can be configured very similar::
-
-    // ...
-
-    // The third parameter is the cache lifetime in as supported by PSR-16
-    $cacheConditionGenerator = $doctrineDbalFactory->createCachedConditionGenerator($qb, $conditionGenerator, null);
-    $cacheConditionGenerator->setField('first-name', 'first', 'u', 'string');
-    $cacheConditionGenerator->setField('last-name', 'last', 'u', 'string');
-
-    // Apply the condition (with ordering, if any) to the QueryBuilder
-    $cacheConditionGenerator->apply();
-
-The cache-key is a hashed (sha256) combination of the SearchCondition
-(root ValuesGroup and FieldSet set-name) and configured field mappings.
-
-.. note::
-
-    Changes in the FieldSet's Fields configuration are not automatically
-    detected. Keep your cache life-time short and purge existing entries
-    when changing your FieldSet configurations.
-
-Next Steps
-----------
-
-Now that you have completed the basic installation and configuration,
-and know how to query the database for results. You are ready to learn
-about more advanced features and usages of this extension.
-
-You may have noticed the word "conversions", now it's time learn more
-about this! :doc:`conversions`.
-
-And if you get stuck with querying, there is a :doc:`Troubleshooter <troubleshooting>`
-to help you. Good luck.
-
-.. _`Doctrine DBAL Types`: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/types.html
-.. _`Doctrine DBAL extension`: https://github.com/rollerworks/search-doctrine-dbal
-.. _`Doctrine DBAL`: http://www.doctrine-project.org/projects/dbal.html
diff --git a/docs/integration/doctrine/index.rst b/docs/integration/doctrine/index.rst
deleted file mode 100644
index b9c8877d..00000000
--- a/docs/integration/doctrine/index.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-Doctrine integration
-====================
-
-The core library of RollerworksSearch is agnostic to your storage/search index,
-to help with searching your system a number of optional extensions are provided,
-called integration libraries.
-
-You need to install these integrations yourself, but other then that
-there usage is straightforward.
-
-.. note::
-
-    Framework integrations already provide the required registration,
-    you only need to install the package and maybe set some options.
-
-    See also the framework integration details for this extension.
-
-RollerworksSearch provides support for Doctrine DBAL and ORM using
-separate extensions.
-
-.. caution::
-
-    Performing complex search operations in a relation database
-    using Doctrine ORM may cause unresolvable performance problems.
-
-    Due to the way ORM querying works not all conditions can be optimized
-    for the best performance. Consider using :doc:`/integration/elasticsearch`
-    instead.
-
-    See also: http://ocramius.github.io/blog/doctrine-orm-optimization-hydration/
-
-Support for document based storage is not possible due to technical limitations.
-If you need this, consider using :doc:`/integration/elasticsearch`.
-
-.. toctree::
-    :maxdepth: 2
-
-    dbal
-    orm
-    conversions
-    conversions_orm
-    troubleshooting
diff --git a/docs/integration/doctrine/orm.rst b/docs/integration/doctrine/orm.rst
deleted file mode 100644
index b4b99e9c..00000000
--- a/docs/integration/doctrine/orm.rst
+++ /dev/null
@@ -1,385 +0,0 @@
-Searching with Doctrine ORM
-===========================
-
-This section of the manual explains how to install and configure the
-`Doctrine ORM extension`_. The code samples assume you already have
-`Doctrine ORM`_ set-up, and know how to write SQL/DQL queries.
-
-Following the :doc:`installation instructions </installing>` install the
-extension by running:
-
-.. code-block:: bash
-
-    $ php composer.phar require rollerworks/search-doctrine-orm
-
-Enabling Integration
---------------------
-
-And enable the :class:`Rollerworks\\Component\\Search\\Extension\\Doctrine\\Orm\\DoctrineOrmExtension`
-*and* :class:`Rollerworks\\Component\\Search\\Extension\\Doctrine\\Dbal\\DoctrineDbalExtension`
-for the ``SearchFactoryBuilder``. To adds extra options for registering :doc:`conversions`
-and ensuring core types work properly.
-
-.. code-block:: php
-
-    use Rollerworks\Component\Search\Searches;
-    use Rollerworks\Component\Search\Extension\Doctrine\Dbal\DoctrineDbalExtension;
-    use Rollerworks\Component\Search\Extension\Doctrine\Orm\DoctrineOrmExtension;
-    use Rollerworks\Component\Search\Extension\Core\CoreExtension;
-
-    $searchFactory = new Searches::createSearchFactoryBuilder()
-        ->addExtension(new DoctrineDbalExtension())
-        ->addExtension(new DoctrineOrmExtension())
-
-        // ...
-        ->getSearchFactory();
-
-That's it, you can use RollerworksSearch with Doctrine ORM (and DBAL) support enabled.
-Continue reading to learn how the query the database with a SearchCondition.
-
-.. note::
-
-    Make sure to also enable the ``DoctrineDbalExtension`` because some functionality is
-    provided by DBAL, not ORM.
-
-Querying the database
----------------------
-
-As you already know RollerworksSearch uses a ``SearchFactory`` for bootstrapping
-the search system. This factory however doesn't know about integration extensions.
-
-To Query a database with Doctrine ORM extension, you use the
-:class:`Rollerworks\\Component\\Search\\Doctrine\\Orm\\DoctrineOrmFactory`.
-
-.. note::
-
-    The ``DoctrineOrmFactory`` works next to the ``SearchFactory``.
-    It's not a replacement for the ``SearchFactory``.
-
-    You use the SearchFactory first, and the the DoctrineOrmFactory second.
-
-The ``DoctrineOrmFactory`` class provides an entry point for creating
-:class:`Rollerworks\\Component\\Search\\Doctrine\\Orm\\QueryBuilderConditionGenerator`,
-:class:`Rollerworks\\Component\\Search\\Doctrine\\Orm\\CachedDqlConditionGenerator`,
-object instances.
-
-Initiating the ``DoctrineDbalFactory`` is as simple as::
-
-    use Rollerworks\Component\Search\Doctrine\Orm\DoctrineOrmFactory;
-
-    // \Psr\SimpleCache\CacheInterface | null
-    $cache = ...;
-
-    $doctrineDbalFactory = new DoctrineOrmFactory($cache);
-
-The ``$cache`` must a PSR-16 (SimpleCache) implementation, or can it
-can be omitted to disable the caching of generated conditions.
-
-See also: :doc:`/reference/caching`
-
-Using the ConditionGenerator
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The ConditionGenerator requires a ``Doctrine\ORM\QueryBuilder`` instance,
-for NativeQuery use the :doc:`Doctrine DBAL </integration/doctrine/orm.rst>`
-``ConditionGenerator`` instead.
-
-.. caution::
-
-    A ConditionGenerator is configured with the QueryBuilder object and SearchCondition.
-    So reusing a ConditionGenerator instance is not possible.
-
-    Secondly a generated where-clause is only applied once, calling the ``apply()``
-    method twice will raise an PHP ``E_USER_WARNING``.
-
-First create a ``ConditionGenerator``::
-
-    // ...
-
-    // Doctrine\ORM\EntityManagerInterface
-    $entityManager = ...;
-
-    $qb = $entityManager->createQueryBuilder();
-    $qb
-        ->select('I')
-        ->from(\Acme\Entity\Invoice::class, 'I')
-    ;
-
-    // Rollerworks\Component\Search\SearchCondition object
-    $searchCondition = ...;
-
-    $conditionGenerator = $doctrineOrmFactory->createConditionGenerator($qb, $searchCondition);
-
-Before the condition can be generated, the ConditionGenerator needs to know how
-your search fields are mapped to which columns and Entity.
-To configure this field-to-column mapping, use the ``setField`` method on the
-ConditionGenerator::
-
-    /**
-     * Set the search field to Entity mapping mapping configuration.
-     *
-     * To map a search field to more then one entity field use `field-name#mapping-name`
-     * for the $fieldName argument. The `field-name` is the search field name as registered
-     * in the FieldSet, `mapping-name` allows to configure a (secondary) mapping for a field.
-     *
-     * Caution: A search field can only have multiple mappings or one, omitting `#` will remove
-     * any existing mappings for that field. Registering the field without `#` first and then
-     * setting multiple mappings for that field will reset the single mapping.
-     *
-     * Tip: The `mapping-name` doesn't have to be same as $property, but using a clear name
-     * will help with trouble shooting.
-     *
-     * Note: Associations are automatically resolved, but can only work for a single
-     * property reference. If resolving is not possible the property must be owned by
-     * the entity (not reference another entity).
-     *
-     * If the entity field is used in a many-to-many relation you must to reference the
-     * targetEntity that is set on the ManyToMany mapping and use the entity field of that entity.
-     *
-     * @param string $fieldName Name of the search field as registered in the FieldSet or
-     *                          `field-name#mapping-name` to configure a secondary mapping
-     * @param string $property  Entity field name
-     * @param string $alias     Table alias as used in the query "u" for `FROM Acme\Entity\Users AS u`
-     * @param string $entity    Entity name (FQCN or Doctrine aliased)
-     * @param string $dbType    Doctrine DBAL supported type, eg. string (not text)
-     *
-     * @throws UnknownFieldException  When the field is not registered in the fieldset
-     * @throws BadMethodCallException When the where-clause is already generated
-     *
-     * @return $this
-     */
-    $conditionGenerator->setField(string $fieldName, string $property, string $alias = null, string $entity = null, string $dbType = null);
-
-The ``$alias`` and ``$entity`` arguments are marked optional, however they are
-in fact required. A field mapping cannot function without an alias and Entity
-class.
-
-But instead of having to supply this for every field you can set a default
-alias an entity name using ``setDefaultEntity``. Which has an interesting feature.
-
-Calling this method after calling ``setField`` will not affect fields that
-were already configured. Which means you can use this method to configure
-chunks of configuration.
-
-.. code-block:: php
-
-    // ...
-
-    /**
-     * Set the default entity mapping configuration, only for fields
-     * configured *after* this method.
-     *
-     * Note: Calling this method after calling setField() will not affect
-     * fields that were already configured. Which means you can use this
-     * method to configure chunks of configuration.
-     *
-     * @param string $entity Entity name (FQCN or Doctrine aliased)
-     * @param string $alias  Table alias as used in the query "u" for `FROM Acme\Entity\Users AS u`
-     *
-     * @throws BadMethodCallException When the where-clause is already generated
-     *
-     * @return $this
-     */
-    $conditionGenerator->setDefaultEntity(\Acme\Entity\Invoice, 'I');
-    $conditionGenerator->setField('id', 'id');
-
-    $conditionGenerator->setDefaultEntity(\Acme\Entity\Customer::class, 'C');
-    $conditionGenerator->setField('customer', 'id', null, null);
-    $conditionGenerator->setField('@customer', 'id'); // Sorting field (must be registered), without this sorting is not processed for this field.
-    $conditionGenerator->setField('customer_first_name', 'firstName');
-    $conditionGenerator->setField('customer_last_name', 'lastName');
-    $conditionGenerator->setField('customer_birthday', 'birthday');
-
-Only SearchFields in the FieldSet that have a column-mapping configured
-will be processed (including sorting fields). All other SearchFields are ignored.
-
-If you try to configure a field-mapping for a unregistered SearchField
-the ConditionGenerator will fail with an exception.
-
-.. caution::
-
-    For DQL the column mapping of a field must point to the entity
-    field that owns the value (not reference another Entity object).
-
-    Given you have an ``Invoice`` Entity with a ``customer`` (``Customer``
-    Entity) reference, the ``Customer`` Entity owns the the actual value
-    and the field must point to the ``Customer.id`` field, **not**
-    ``Invoice.customer``.
-
-    If you point to a Join association the generator will throw an exception.
-
-The ``$type`` (when given) must correspond to a Doctrine DBAL
-supported type. So instead of using ``varchar`` you use ``string``.
-
-See `Doctrine DBAL Types`_ for a complete list of types and options.
-
-If you have a type which requires the setting of options you may need
-to use a :ref:`ValueConversion <value_conversion>` instead.
-
-After this you are ready to generate the query condition.
-
-Generating the Condition
-************************
-
-.. code-block:: php
-    :linenos:
-
-    // ...
-
-    // Doctrine\ORM\EntityManagerInterface
-    $entityManager = ...;
-
-    $qb = $entityManager->createQueryBuilder();
-    $qb
-        ->select('I')
-        ->from(\Acme\Entity\Invoice::class, 'I')
-        ->join('I.customer', 'C')
-    ;
-
-    // Rollerworks\Component\Search\SearchCondition object
-    $searchCondition = ...;
-
-    $conditionGenerator = $doctrineOrmFactory->createConditionGenerator($qb, $searchCondition);
-
-    // Rollerworks\Component\Search\SearchCondition object
-    $searchCondition = ...;
-
-    $conditionGenerator = $doctrineOrmFactory->createConditionGenerator($statement, $searchCondition);
-
-    $conditionGenerator->setDefaultEntity(\Acme\Entity\Invoice::class, 'I');
-    $conditionGenerator->setField('id', 'id');
-
-    $conditionGenerator->setDefaultEntity(\Acme\Entity\Customer, 'C');
-    $conditionGenerator->setField('customer', 'id');
-    $conditionGenerator->setField('@customer', 'id'); // The `@customer` field must be registered as ordering field
-    $conditionGenerator->setField('customer_first_name', 'firstName');
-    $conditionGenerator->setField('customer_last_name', 'lastName');
-    $conditionGenerator->setField('customer_birthday', 'birthday');
-
-Now apply the generated condition on the QueryBuilder and get the result::
-
-    $conditionGenerator->apply();
-
-    $invoices = $qb->getQuery()->execute();
-
-.. tip::
-
-    To prevent certain users from getting results they are not allowed to
-    see you can combine the generated condition with a primary AND-condition.
-
-    .. code-block:: php
-        :linenos:
-
-        // Doctrine\ORM\EntityManagerInterface
-        $entityManager = ...;
-
-        $qb = $entityManager->createQueryBuilder();
-        $qb
-            ->select('I')
-            ->from(\Acme\Entity\Invoice::class, 'I')
-            ->andWhere('C.id = :user_id') // Limit the invoices to a single user. Mapping the 'customer' field has no effect as this condition is primary.
-            ->join('I.customer', 'C')
-            ->setParameter('user_id', $id);
-
-        // Rollerworks\Component\Search\SearchCondition object
-        $searchCondition = ...;
-
-        $conditionGenerator = $doctrineOrmFactory->createConditionGenerator($qb, $searchCondition);
-        // ...
-
-        $conditionGenerator->apply();
-
-        $invoices = $qb->getQuery()->execute();
-
-    Or you can use a :ref:`pre_condition`.
-
-Mapping a field to multiple columns
-***********************************
-
-Instead of searching in a single column it's possible to search in multiple
-columns for the same SearchField. In practice this will work the same as using
-the same values for other fields.
-
-In the example below SearchField ``name`` will search in both the customer's ``first``
-and ``last`` name columns (as ``OR`` case). And it's still possible to search
-with only the first and/or last name.
-
-.. code-block:: php
-
-    // Doctrine\ORM\EntityManagerInterface
-    $entityManager = ...;
-
-    $qb = $entityManager->createQueryBuilder();
-    $qb
-        ->select('I')
-        ->from(\Acme\Entity\Invoice::class, 'I')
-        ->join('I.customer', 'C')
-        ->setParameter('user_id', $id);
-
-    // Rollerworks\Component\Search\SearchCondition object
-    $searchCondition = ...;
-
-    $conditionGenerator = $doctrineOrmFactory->createConditionGenerator($qb, $searchCondition);
-    $conditionGenerator->setDefaultEntity(\Acme\Entity\Customer, 'C');
-    $conditionGenerator->setField('name#first', 'first');
-    $conditionGenerator->setField('name#last', 'last');
-    $conditionGenerator->setField('first-name', 'first');
-    $conditionGenerator->setField('last-name', 'last');
-    $conditionGenerator->apply();
-
-.. note::
-
-    Multi field-mapping is not possible for ordering fields, an ordering field
-    always maps to a single field. And must include the leading ``@``-sign
-    like ``@id``.
-
-Caching the Where-clause
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Generating a Where-clause may require quite some time and system resources,
-which is why it's recommended to cache the generated query for future usage.
-
-Fortunately the factory allows to create a CachedConditionGenerator
-which can handle caching of the ConditionGenerator for you.
-
-Plus, usage is no different then using a regular ConditionGenerator
-and can be configured very similar.
-
-.. code-block:: php
-    :linenos:
-
-    // Doctrine\ORM\EntityManagerInterface
-    $entityManager = ...;
-
-    $qb = $entityManager->createQueryBuilder();
-    $qb
-        ->select('I')
-        ->from(\Acme\Entity\Invoice::class, 'I')
-        ->join('I.customer', 'C')
-        ->setParameter('user_id', $id);
-
-    // Rollerworks\Component\Search\SearchCondition object
-    $searchCondition = ...;
-
-    // The third argument is the cache lifetime in seconds (or anything supported by your cache implementation), null will use the Cache default
-    $conditionGenerator = $doctrineOrmFactory->createCachedConditionGenerator($qb, $searchCondition, null);
-    // ...
-
-    $conditionGenerator->apply();
-
-Next Steps
-----------
-
-Now that you have completed the basic installation and configuration,
-and know how to query the database for results. You are ready to learn
-about more advanced features and usages of this extension.
-
-You may have noticed the word "conversions", now it's time learn more
-about this! :doc:`conversions_orm`.
-
-And if you get stuck with querying, there is a :doc:`Troubleshooter <troubleshooting>`
-to help you. Good luck.
-
-.. _`Doctrine ORM extension`: https://github.com/rollerworks/search-doctrine-orm
-.. _`Doctrine ORM`: http://www.doctrine-project.org/projects/orm.html
-.. _`Doctrine DBAL Types`: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/types.html
diff --git a/docs/integration/doctrine/troubleshooting.rst b/docs/integration/doctrine/troubleshooting.rst
deleted file mode 100644
index 80060c95..00000000
--- a/docs/integration/doctrine/troubleshooting.rst
+++ /dev/null
@@ -1,73 +0,0 @@
-Troubleshooting
-===============
-
-Why am I not getting any results
---------------------------------
-
-Make sure sure you have properly configured column-mapping for the ConditionGenerator.
-If you are still not getting any results check the following:
-
-#. Are there actual records in the database?
-#. Are you using a result limiter like ``WHERE id = ?`` in the query?
-   If so try running the query without it.
-#. Using multiple tables (with JOIN) will only work when all the tables
-   have a positive match, try using ``LEFT JOIN`` to ignore any missing
-   matches.
-#. Try using a smaller SearchCondition and make sure the values you are
-   searching are actually existent.
-
-Didn't any of this work? Ask help at the `RollerworksSearch Gitter channel`_.
-
-Why am I getting duplicate results? (DBAL)
-------------------------------------------
-
-This a known problem and is not fixable, this happens when you select from
-multiple tables using a JOIN and at least one record matched in multiple
-tables.
-
-For example you have a head table called "users", the user has "contacts".
-These contacts are linked to the user by the "userId". If you search for
-a user by it's contacts multiple contacts will be found that all point to
-the same userId.
-
-Because of how relational databases work you get the contacts list and the
-linked user. But these records are flat, so one row can contain the data of
-multiple tables. And therefor you get duplicate results.
-*Even if you don't select from any of the contacts fields.*
-
-How to solve this?
-~~~~~~~~~~~~~~~~~~
-
-There are a few possibilities you can consider, all of which have there
-pro's and con's.
-
-#. You can use ``DISTINCT`` to remove any duplicate records, but this will
-   not work when you select from other columns of JOINED tables.
-#. Or you can use ``DISTINCT`` to remove any duplicate userId's, giving you
-   a list list of none-duplicate userId's, but you will need to perform an
-   additional query to get all the users with the found userId's.
-#. You can remove the duplicate values yourself using a PHP script.
-   But again this will not work when you need the columns from JOINING
-   tables.
-
-If this all seems like a bit to much work you may want to consider
-using `Doctrine ORM`_, which does the part of transforming flat
-data to an array/object graph for you. Plus there is a
-:doc:`RollerworksSearch Doctrine ORM extension <orm>`!
-
-.. caution::
-
-    You may be tempted to use something like:
-
-    .. code-block:: sql
-
-        SELECT * FROM users AS u LEFT JOIN contacts as c ON c.userid = u.userid GROUP BY userId
-
-    **STOP!** This will not work because the behavior on the other columns
-    is unspecified. MySQL will only accept this query when you don't enable
-    strict-mode, but just because it's not giving any errors doesn't mean
-    it will work as expected.
-
-.. _`RollerworksSearch Gitter channel`: https://gitter.im/rollerworks/RollerworksSearch
-.. _`Doctrine ORM`: http://www.doctrine-project.org/projects/orm.html
-.. _`RollerworksSearch Doctrine ORM extension`: https://github.com/rollerworks/rollerworks-search-doctrine-orm
diff --git a/docs/integration/symfony_bundle.rst b/docs/integration/symfony_bundle.rst
deleted file mode 100644
index 56cf1d0f..00000000
--- a/docs/integration/symfony_bundle.rst
+++ /dev/null
@@ -1,401 +0,0 @@
-Symfony Framework Integration
-=============================
-
-Symfony is a **PHP framework** for web applications and a set of
-reusable PHP components. Integration for RollerworksSearch in a
-Symfony application, is provided using the RollerworksSearchBundle.
-
-You need the Symfony FrameworkBundle and optionally Symfony Flex,
-while not required the following examples assume your using at least
-Symfony 3.4 and have Symfony Flex installed.
-
-All RollerworksSearch services can be autowired. There service-id's are
-shown for reference.
-
-.. note::
-
-    If your new to Symfony, it's a really good idea to learn
-    about the basics of Symfony first.
-
-    These examples assume you know how to work with services,
-    create Controllers and know how to change your app's
-    configuration.
-
-Installation
-------------
-
-Following the :doc:`installation instructions </installing>` install the
-symfony Bundle by running:
-
-.. code-block:: bash
-
-    $ php composer.phar require rollerworks/search-bundle
-
-.. tip::
-
-    Install the RollerworksSearch :doc:`symfony_validator`
-    extension to utilize validation constraints in your input.
-
-    Make sure the ``framework.validator`` is enabled in your application's
-    configuration, unless explicitly disabled this should be automatically enabled.
-
-Basic usage
------------
-
-The purpose of the bundle is to integrate RollerworksSearch into your
-Symfony application. Because of this most of RollerworksSearch's documentation
-can be used as-is.
-
-The main difference is that the integration is already done for you,
-and you use the service Container instead of initializing classes yourself.
-
-SearchFactory
-~~~~~~~~~~~~~
-
-Get the (default) SearchFactory service using ``rollerworks_search.factory``::
-
-    ...
-
-    $searchFactory = $container->get('rollerworks_search.factory');
-
-    $fieldSetBuilder = $searchFactory->createFieldSetBuilder();
-    $userFieldSet = $searchFactory->createFieldSet(UserFieldSet::class);
-
-    $serializer = $searchFactory->getSerializer();
-    $serializedCondition = $serializer->serialize($searchCondition);
-    $searchCondition = $serializer->unserialize($serializedCondition);
-
-Search Query
-~~~~~~~~~~~~
-
-.. code-block:: php
-    :linenos:
-
-    namespace App\Controller;
-
-    use App\Search\FieldSet\UserFieldSet;
-    use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-    use Rollerworks\Component\Search\Input\ProcessorConfig;
-    use Rollerworks\Component\Search\Input\StringQueryInput;
-    use Rollerworks\Component\Search\Loader\InputProcessorLoader;
-    use Rollerworks\Component\Search\SearchFactory;
-    use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-    use Symfony\Component\HttpFoundation\Request;
-
-    class SearchController extends AbstractController
-    {
-        public function searchAction(Request $request, $search = '')
-        {
-            /** @var SearchFactory $searchFactory */
-            $searchFactory = $this->get('search_factory');
-            /** @var StringQueryInput $processor */
-            $processor = $this->get('search.input_loader')->get('string_query');
-
-            $fieldSet = $searchFactory->createFieldSet(UserFieldSet::class);
-            $config = new ProcessorConfig($fieldSet);
-
-            // Enable caching (optional).
-            // https://www.php.net/manual/en/dateinterval.construct.php
-            // $config->setCacheTTL(new \DateInterval('PT2M'));
-
-            try {
-                if ($request->isMethod('POST')) {
-                    $search = $request->request->get('search');
-                    $processor->process($config, $search);
-
-                    return $this->redirectToRoute($request->attributes->get('_route'), ['search' => $request->request->get('search')]);
-                }
-
-                $condition = $processor->process($config, $search);
-            } catch (InvalidSearchConditionException $e) {
-                return $this->render(
-                    'user/search.html.twig',
-                    [
-                        'data' => [],
-                        'errors' => $e->getErrors(),
-                        'search_query' => $search,
-                    ]
-                );
-            }
-
-            if (!$condition->isEmpty()) {
-                // Apply the SearchCondition for searching.
-                $data = ...;
-            }
-
-            return $this->render(
-                'user/search.html.twig',
-                [
-                    'data' => $data,
-                    'search_query' => $search,
-                ]
-            );
-        }
-
-        public static function getSubscribedServices(): array
-        {
-            return parent::getSubscribedServices() + [
-                'search.factory' => SearchFactory::class,
-                'search.input_loader' => InputProcessorLoader::class,
-            ];
-        }
-    }
-
-
-.. code-block:: twig
-    :linenos:
-
-    TBD.
-
-That's it. You can now process search requests! See the reference section
-below to learn more about application wide cache configuring.
-
-Translating labels (StringQuery only)
--------------------------------------
-
-The :class:`Rollerworks\\Component\\Search\\Input\\StringQueryInput`
-allows to use localized names by setting a :class:`Symfony\\Contracts\\Translation\\TranslatableInterface`
-as the fields label.
-
-.. code-block:: php
-    :linenos:
-
-    use Symfony\Component\Translation\TranslatableMessage;
-
-    $userFieldSet = $searchFactory->createFieldSetBuilder()
-        ->add('id', IntegerType::class, ['label' => new TranslatableMessage('label.id', [], 'search')]
-        ->add('username', TextType::class, ['label' => new TranslatableMessage('label.username', [], 'search'))
-        ->getFieldSet('users')
-    ;
-
-Now in the StringQuery can use a localized label like 'gebruikersnaam' (in Dutch)
-instead of username. This option works the same for order fields.
-
-Registering types and type extensions
--------------------------------------
-
-Registering types is only needed when they have injection dependencies
-(constructor or setter). Type extensions always need to be registered.
-
-.. note::
-
-    Tagging is only required if autoconfigure is not enabled, for the current file.
-
-To register a type, create a service as normal and tag it as ``rollerworks_search.type``.
-
-.. configuration-block::
-
-    .. code-block:: xml
-        :linenos:
-
-        <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-            <services>
-                <defaults autowire="true" autoconfigure="true" public="false" />
-
-                <service id="App\Search\Type\MyType" />
-            </services>
-        </container>
-
-    .. code-block:: yaml
-        :linenos:
-
-        services:
-            _defaults:
-                autowire: true
-                autoconfigure: true
-                public: false
-
-            'App\Search\Type\MyType': ~
-
-    .. code-block:: php
-        :linenos:
-
-        use App\Search\Type\MyType;
-        use Symfony\Component\DependencyInjection\Definition;
-
-        $definition = new Definition(MyType::class);
-        $definition->setPublic(false);
-        $definition->addTag('rollerworks_search.type');
-
-        $container->setDefinition(MyType::class, $definition);
-
-To register a type extension, create a service as normal and tag it as ``rollerworks_search.type_extension``.
-
-.. configuration-block::
-
-    .. code-block:: xml
-        :linenos:
-
-        <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-            <services>
-                <service id="App\Search\Type\MyTypeExtension" />
-            </services>
-        </container>
-
-    .. code-block:: yaml
-        :linenos:
-
-        services:
-            'App\Search\Type\MyTypeExtension': ~
-
-    .. code-block:: php
-        :linenos:
-
-        use App\Search\Type\MyTypeExtension;
-        use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-        use Symfony\Component\DependencyInjection\Definition;
-
-        $definition = new Definition(MyType::class);
-        $definition->addTag('rollerworks_search.type_extension');
-
-        $container->setDefinition(MyType::class, $definition);
-
-Condition processors
---------------------
-
-Second to SearchFactory and SearchProcessor the bundle provides an integration
-all build-in condition processors (Doctrine DBAL) and Elasticsearch.
-
-Doctrine integration
-~~~~~~~~~~~~~~~~~~~~
-
-Doctrine integration requires the `DoctrineBundle`_ is installed
-and properly configured.
-
-See :doc:`doctrine/index` for more information on usage details.
-
-.. code-block:: bash
-
-    $ composer require --no-update "doctrine/doctrine-bundle"
-    $ composer require --no-update "rollerworks/search-doctrine-dbal"
-    $ composer update
-
-To install the ORM extension run:
-
-.. code-block:: bash
-
-    $ composer require "rollerworks/search-doctrine-orm:^2.0"
-
-That's it, the extensions are automatically detected and enabled.
-To disable/enable the extension use the following:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-        :linenos:
-
-        rollerworks_search:
-            doctrine:
-                dbal:
-                    enabled: true
-                orm: false # same as ` { enabled: false } `
-
-    .. code-block:: php
-        :linenos:
-
-        /** @var $container \Symfony\Component\DependencyInjection\ContainerBuilder */
-        $container->loadFromExtension('rollerworks_search', [
-            'doctrine' => [
-                'orm' => ['enabled' => true],
-                'orm' => true,
-            ],
-        ]);
-
-.. note::
-
-    The DBAL extension cannot be disabled when ORM extension is enabled.
-
-Basic Usage
-***********
-
-Usage of the Doctrine extensions is as you expect, both the DBAL and ORM
-factories are automatically registered:
-
-.. code-block:: php
-    :linenos:
-
-    // \Rollerworks\Component\Search\Doctrine\Dbal\DoctrineDbalFactory
-    $doctrineDbalFactory = $container->get('rollerworks_search.doctrine_dbal.factory');
-
-    // \Rollerworks\Component\Search\Doctrine\Orm\DoctrineOrmFactory
-    $doctrineOrmFactory = $container->get('rollerworks_search.doctrine_orm.factory');
-
-Enable Caching
-**************
-
-By default the Doctrine integration doesn't have caching enabled, to enable caching
-of generated query conditions configure the ``rollerworks_search.doctrine.cache`` pool.
-
-.. configuration-block::
-
-    .. code-block:: yaml
-        :linenos:
-
-        framework:
-            cache:
-                rollerworks_search.doctrine.cache:
-                    adapter: ...
-
-    .. code-block:: php
-        :linenos:
-
-        /** @var $container \Symfony\Component\DependencyInjection\ContainerBuilder */
-        $container->prependExtensionConfig('framework', [
-            'cache' => [
-                'pools' => [
-                    'rollerworks_search.doctrine.cache' => [
-                        'adapter' => ...,
-                    ],
-                ],
-            ],
-        ]);
-
-.. caution::
-
-    Don't use the ``cache.system`` (Filesystem) adapter but instead use a
-    Redis/Memcache adapter for best performance.
-
-Bundle configuration reference
-------------------------------
-
-This subsection shows the complete the bundle's configuration, for reference.
-Note that extensions are disabled by default, and will be automatically enabled
-when there related dependency is installed.
-
-.. configuration-block::
-
-    .. code-block:: yaml
-        :linenos:
-
-        rollerworks_search:
-            doctrine:
-                dbal:
-                    enabled: false
-                orm:
-                    enabled: false
-                    entity_managers: [default]
-
-    .. code-block:: php
-        :linenos:
-
-        /** @var $container \Symfony\Component\DependencyInjection\ContainerBuilder */
-        $container->loadFromExtension('rollerworks_search', [
-            'doctrine' => [
-                'dbal' => ['enabled' => false],
-                'orm' => [
-                    'enabled' => false,
-                    'entity_managers' => ['default']
-                ],
-            ],
-        ]);
-
-.. _`DoctrineBundle`: http://symfony.com/doc/current/doctrine.html
-
diff --git a/docs/integration/symfony_validator.rst b/docs/integration/symfony_validator.rst
deleted file mode 100644
index ee2b2edc..00000000
--- a/docs/integration/symfony_validator.rst
+++ /dev/null
@@ -1,90 +0,0 @@
-Symfony InputValidator
-======================
-
-The RollerworksSearch Symfony InputValidator facilitates the validating
-of input values using the `Symfony Validator component`_.
-
-This validation is meant to be used for business rules like a minimum/maximum
-value range or disallowing specific patterns. The data transformers already
-ensure the value is properly transformed.
-
-Installation
-------------
-
-Following the :doc:`installation instructions </installing>` install the
-Validation extension by running:
-
-.. code-block:: bash
-
-    $ php composer.phar require rollerworks/search-symfony-validator
-
-And enable the ``Rollerworks\Component\Search\Extension\Symfony\Validator\ValidatorExtension``
-in the ``SearchFactoryBuilder`` and pass the Input Validator to your Input Processor.
-
-.. note::
-
-    The RollerworksSearchBundle already enables the validator extension when
-    you install the extension as described above.
-
-.. code-block:: php
-    :linenos:
-
-    use Rollerworks\Component\Search\Searches;
-    use Rollerworks\Component\Search\Extension\Validator\ValidatorExtension;
-    use Rollerworks\Component\Search\Extension\Validator\InputValidator;
-    use Rollerworks\Component\Search\Input\StringQueryInput;
-    use Symfony\Component\Validator\Validation;
-
-    $searchFactory = Searches::createSearchFactoryBuilder();
-        ->addExtension(new ValidatorExtension())
-        // ...
-
-        ->getSearchFactory();
-
-    $validatorBuilder = Validation::createValidatorBuilder();
-    $validator = $validatorBuilder->getValidator();
-
-    $inputProcessor = new StringQueryInput(new InputValidator($validator));
-
-That's it, you can now use the Validator. But note only search fields with
-``constraints`` set will be actually validated by the validator.
-
-Setting validation constraints
-------------------------------
-
-Before you continue make sure you have a good understanding of what Constraints
-are and how they are to be used. See `Symfony Validator component`_ for
-more information.
-
-You can configure the constraint on a per-field basis when building your FieldSet::
-
-    use Symfony\Component\Validator\Constraints as Assert;
-    use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-
-    // ...
-
-    $fieldSetBuilder = $searchFactory->createFieldSetBuilder()
-    $fieldSetBuilder->add('id', IntegerType::class, ['constraints' => new Assert\Range(['min' => 5])]);
-
-Or when your (custom) type always needs these specific constraints make the constraints
-part of the field type using the ``configureOptions`` method of the field type. Using::
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults(
-            [
-                'constraints' => new Assert\Length(array('min' => 101)),
-            ]
-        );
-    }
-
-.. note::
-
-    For a field that expects an email it's not possible to use a ``PatternMatch``
-    with a constraint that enforces a valid email address.
-
-    Since RollerworksSearch v2.0-BETA6 the ``PatternMatch`` is no longer validated as
-    part of the the ``constraints`` option, use the ``pattern_match_constraints`` for
-    this specific type.
-
-.. _`Symfony Validator component`: http://symfony.com/doc/current/validation.html
diff --git a/docs/introduction.rst b/docs/introduction.rst
deleted file mode 100644
index fb89c2ef..00000000
--- a/docs/introduction.rst
+++ /dev/null
@@ -1,202 +0,0 @@
-Introduction
-============
-
-In this chapter we'll take a short tour of the various components, which put
-together provide the RollerworksSearch system. You will learn key terminology
-used throughout the rest of this manual and gain an understanding of the
-classes you are going to work with.
-
-.. tip::
-
-    RollerworksSearch can be used as both a processing library for search requests.
-    And as a software client to compose search-conditions that will be provided to
-    a third-party (web) API, that uses RollerworksSearch for processing.
-
-    Some functionality is provided by extensions that you need to install
-    in addition to the RollerworksSearch core library.
-
-    See the :doc:`installation <installing>` chapter for more details.
-
-Code Samples
-------------
-
-Code examples are used throughout the manual to clarify what is written in text.
-They will sometimes be usable as-is, but they should always be taken as
-outline/pseudo code only.
-
-A code sample will look like this:
-
-.. code-block:: php
-
-    class AClass
-    {
-        ...
-    }
-
-    // A Comment
-    $obj = new AClass($arg1, $arg2, ... );
-
-    /* A note about another way of doing something
-    $obj = AClass::newInstance($arg1, $arg2, ... );
-    */
-
-The presence of 3 dots ``...`` in a code sample indicates that code has been excluded,
-for brevity. They are not actually part of the code.
-
-Multi-line comments are displayed as ``/* ... */`` and show alternative ways
-of achieving the same result.
-
-You should read the code examples given and try to understand them. They are
-kept concise so that you are not overwhelmed with information.
-
-SearchCondition
----------------
-
-Each search operation starts with a SearchCondition.
-
-A SearchCondition consists of a set of requirements (the condition,
-kept as a structured object-graph), and a **FieldSet** configuration.
-
-*You can think of a condition as an (SQL) query condition ``WHERE (field = 'value')``.*
-But the actual condition is anything from a simple string, and is not limited to merely SQL.
-
-.. tip::
-
-    The final structure of a condition has no limits. You can compose
-    any condition you want for the best possible search result.
-
-    You can use single-values, ranges, comparisons and value matchers
-    (starts/ends with or contains).
-
-In further chapters you will learn how to produce a SearchCondition by
-processing a user provided query, or by manually composing a SearchCondition
-using the :class:`Rollerworks\\Component\\Search\\SearchConditionBuilder`.
-
-* :doc:`input`;
-
-* :doc:`composing_search_conditions`;
-
-FieldSet
---------
-
-A :class:`Rollerworks\\Component\\Search\\FieldSet` (FieldSet configuration)
-holds a set of **SearchField**'s, and optionally a set-name (for internal usage).
-
-The FieldSet helps the search system with processing the field's values and
-transforming user-input to a workable format (eg. an ``DateTime`` object).
-
-To create a FieldSet you can use the ``FieldSetBuilder`` or create a custom
-:doc:`FieldSetConfigurator <creating_reusable_fieldsets>`.
-
-.. note::
-
-    Using a configurator is mandatory if you plan to serialize the condition,
-    it provides a central point to (lazily) load FieldSet configurations.
-
-.. code-block:: php
-    :linenos:
-
-    use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-    use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-
-    // ...
-
-    $userFieldSet = $searchFactory->createFieldSetBuilder()
-        ->add('id', IntegerType::class)
-        ->add('username', TextType::class)
-        ->add('firstName', TextType::class)
-        ->add('lastName', TextType::class)
-        ->getFieldSet();
-
-.. _fieldset:
-
-SearchField
------------
-
-A :class:`Rollerworks\\Component\\Search\\Field\\FieldConfig` consists
-of a number of properties that are needed by various parts of the
-search system for handling/processing field values.
-
-While some of these configurations might seem a bit intimidating you don't really
-need to know all the internals. In further chapters you will learn how to create
-your own Field Type/Data transformers, etc.
-
-So for now remember that a SearchField has a name, a type and some configuration.
-You can see a SearchField as a form field configuration.
-
-.. note::
-
-    The field's name must be unique within a FieldSet, registering the field
-    twice will overwrite the previous one.
-
-Field Type
-~~~~~~~~~~
-
-Field types are used for configuring SearchFields using reusable types
-that make extensions as advanced as possible and reducing the amount of code
-you have to duplicate.
-
-You don't extend a Field type by extending the PHP class, but by using
-an advanced field building system. Each type can have multiple extensions.
-
-.. note::
-
-    Build-in types are provided by the CoreExtension.
-
-    You are free create your own field types for more advanced use-cases.
-    See :doc:`cookbook/type/index` for more information.
-
-Input Processors
-----------------
-
-Input Processors transform the input to a ``SearchCondition``.
-And ensure certain limits (either maximum number of values per field),
-and value formatting constraints adhered.
-
-Out of the box RollerworksSearch provides support for JSON and a special
-user-friendly string-based input format.
-
-Exporters
----------
-
-While the input processors transform user-input to a SearchCondition.
-The exporters do the opposite, transforming a SearchCondition to an exported
-format, which can be process for their respective input processor.
-
-Exporting a SearchCondition is very useful if you want to store the condition
-on the client-side in either a cookie, URI query-parameter or hidden form input field.
-
-Or if you plan to use RollerworksSearch as a client-side SDK.
-
-SearchFactory
--------------
-
-The SearchFactory forms the heart of the search system, it provides easy
-access to various builders, loaders, and the :doc:`SearchConditionSerializer <serializer>`.
-
-.. tip::
-
-    Provided Framework integrations already configure the SearchFactory
-    for you. And allow to plug-in additional extensions and field types.
-
-    Otherwise you would rather want to use the :class:`Rollerworks\\Component\\Search\\Searches`
-    class which takes care of all the boilerplate of setting up a SearchFactory.
-
-Further reading
----------------
-
-Now that you know the basic terms and conventions it's time to get started.
-Note that some extensions are provided separate while there documentation is
-kept within this manual.
-
-Depending on your usage there are a number of dedicated chapters that help you
-with integrating RollerworksSearch.
-
-First make sure you :doc:`install <installing>` RollerworksSearch, and any extensions
-you wish to use.
-
-* :doc:`Processing search queries <processing_searches>`
-* :doc:`composing_search_conditions`
-* :doc:`Symfony Framework integration <integration/symfony_bundle>`
-* :doc:`Using ElasticSearch with Elastica <integration/elastic_search>`
-* :doc:`Doctrine DBAL/ORM integration <integration/doctrine/index>`
diff --git a/docs/make.bat b/docs/make.bat
deleted file mode 100644
index 13a68c2c..00000000
--- a/docs/make.bat
+++ /dev/null
@@ -1,170 +0,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=python -m sphinx.__init__
-)
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and an HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\django-compressor.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\django-compressor.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-:end
diff --git a/docs/processing_searches.rst b/docs/processing_searches.rst
deleted file mode 100644
index e936327c..00000000
--- a/docs/processing_searches.rst
+++ /dev/null
@@ -1,340 +0,0 @@
-Processing Searches Queries
-===========================
-
-In this chapter you will start by integrating RollerworksSearch
-into your application, to process a search query provided a user.
-
-You will learn how to handle search operations user errors.
-
-Make sure you have the core package installed as described in the
-`installation instructions <install>`.
-
-Creating your SearchFactory
----------------------------
-
-All components of RollerworksSearch expect a SearchFactory to create/build,
-and perform search operations. So let's set it up:
-
-.. code-block:: php
-
-    use Rollerworks\Component\Search\Searches;
-
-    $searchFactory = new Searches::createSearchFactoryBuilder()
-        // Here you can optionally add new types and (type) extensions
-        ->getSearchFactory();
-
-The FactoryBuilder helps with setting up the search system quickly.
-
-.. note::
-
-    The ``Searches`` class and ``SearchFactoryBuilder`` are only meant to be used
-    for stand-alone usage. The Framework integrations provide a more powerful
-    system with lazy loading and automatic configuring.
-
-You only need to set-up a SearchFactory once, and then it can be reused
-multiple times trough the application.
-
-Creating a FieldSet
--------------------
-
-Before you can start performing searches the system needs to know which
-fields you to want allow searching in. This configuration is kept in a :ref:`FieldSet <fieldset>`.
-
-.. include:: fieldset.rst.inc
-
-Processing input
-----------------
-
-Now, you are one step away from processing. For all clarity, everything
-you have done so far is shown as a whole.
-
-.. code-block:: php
-    :linenos:
-
-    use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-    use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-    use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-    use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-    use Rollerworks\Component\Search\Input\ProcessorConfig;
-    use Rollerworks\Component\Search\Input\StringQueryInput;
-    use Rollerworks\Component\Search\Searches;
-
-    $searchFactory = Searches::createSearchFactoryBuilder()
-        ->getSearchFactory();
-
-    $userFieldSet = $searchFactory->createFieldSetBuilder()
-        ->add('id', IntegerType::class)
-        ->add('username', TextType::class)
-        ->add('firstName', TextType::class)
-        ->add('lastName', TextType::class)
-        ->add('regDate', DateTimeType::class)
-        ->getFieldSet('users');
-
-    $inputProcessor = new StringQueryInput();
-
-    // Tip: Everything above this line is reusable, input processors
-    // and fieldsets are idempotent from each other.
-
-    try {
-        // The ProcessorConfig allows to limit the amount of values, groups
-        // and maximum nesting level.
-        $processorConfig = new ProcessorConfig($userFieldSet);
-
-        // The `process()` method parsers the input and produces
-        // a valid SearchCondition (or throws an InvalidSearchConditionException
-        // when something is wrong).
-
-        $condition = $inputProcessor->process('firstName: sebastiaan, melany;');
-    } catch (InvalidSearchConditionException $e) {
-        // Each error message can be easily transformed to a localized version.
-        // See 'Handling errors' below for more details.
-        foreach ($e->getErrors() as $error) {
-            echo $error.PHP_EOL;
-        }
-    }
-
-That's it, this example shows the minimum amount of code needed process
-a search query. But using a static string is not what we are looking for,
-so lets improve upon this example, with a form.
-
-.. note::
-
-    This example is more advanced, and you properly want to abstract some
-    of the details in your application. Framework integration already handle
-    this nicely.
-
-.. code-block:: php
-    :linenos:
-
-    use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-    use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-    use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-    use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-    use Rollerworks\Component\Search\Input\ProcessorConfig;
-    use Rollerworks\Component\Search\Input\StringQueryInput;
-    use Rollerworks\Component\Search\Searches;
-
-    $searchFactory = Searches::createSearchFactoryBuilder()
-        ->getSearchFactory();
-
-    $userFieldSet = $searchFactory->createFieldSetBuilder()
-        ->add('id', IntegerType::class)
-        ->add('username', TextType::class)
-        ->add('firstName', TextType::class)
-        ->add('lastName', TextType::class)
-        ->add('regDate', DateTimeType::class)
-        ->getFieldSet('users');
-
-    $inputProcessor = new StringQueryInput();
-
-    try {
-        $processorConfig = new ProcessorConfig($userFieldSet);
-        $isPost = $_SERVER['REQUEST_METHOD'] === 'POST';
-
-        // When a POST is provided the processor will try to parse the input,
-        // and redirect back to the current page with the query passed-on,
-        // if the input is valid.
-
-        $searchQuery = $isPost ? ($_POST['query'] ?? '') : ($_GET['search'] ?? '');
-
-        // The processor always needs to parse the query, see below to apply caching
-        // for better performance.
-        $condition = $inputProcessor->process($processorConfig, $searchQuery);
-
-        if ($isPost) {
-            // Redirect to this page with the search-code provided.
-            // Note: The $_POST['query'] value might be spoofed,
-            // be sure to apply proper format detection.
-            // Or use a proper HTTP request abstraction.
-
-            header('Location: /search?search='.$searchQuery);
-            exit();
-        }
-    } catch (InvalidSearchConditionException $e) {
-        echo '<p>Your condition contains the following errors: <p>'.PHP_EOL;
-        echo '<ul>'.PHP_EOL;
-
-        foreach ($e->getErrors() as $error) {
-           echo '<li>'.$error->path.': '.htmlspecialchars((string) $error).'</li>'.PHP_EOL;
-
-           // Alternatively the error can displayed in a user's local format.
-           // See 'Handling errors' below for more details.
-           // echo '<li>'.$error->path.': '.htmlspecialchars($error->trans($translator)).'</li>'.PHP_EOL;
-        }
-
-        echo '</ul>'.PHP_EOL;
-    }
-
-    $searchQuery = htmlspecialchars($searchQuery);
-
-    // Normally you would use a template system to take care of the presentation
-    echo <<<HTML
-        <form action="/search" method="post">
-
-        <label for="search-condition">Condition: </label>
-        <textarea id="search-condition" name="query" cols="10" rows="20">{$searchQuery}</textarea>
-
-        <div>
-            <button type="submit">Search</button> <button type="Reset">Reset</button>
-        </div>
-        </form>
-    HTML;
-
-That's it, all input processing, and error handling is taken care of, however now
-the query will be parsed for every request, if you only allow small conditions
-this is performance hit is barely noticeable, but if you need to handle bigger
-queries it's advised to cache the produced search condition for additional requests.
-
-Improving performance
----------------------
-
-To Cache the parsed result wrap the input processor with a
-:class:`Rollerworks\\Component\\Search\\Input\\CachingInputProcessor`
-as shown below. Note that you need a FieldSetRegistry set-up for the
-serializer to work properly.
-
-The CachingInputProcessor uses `PSR-16`_ for caching.
-
-.. code-block:: php
-
-    use Rollerworks\\Component\\Search\\Input\\CachingInputProcessor;
-
-    ...
-
-    // A \Psr\SimpleCache\CacheInterface instance
-    $cache = ...;
-
-    $inputProcessor = new StringQueryInput();
-    $inputProcessor = new CachingInputProcessor($cache, $searchFactory->getSerializer(), $inputProcessor, $ttl = 60);
-
-.. warning::
-
-    It's strongly advised to use a memory-based cache system like Redis
-    or Memcache. The cache should have a short time to life (TTL) like 5 minutes.
-
-Done, caching is now enabled!
-
-But wait, did you know you can also change the TTL per processor?
-*This will only affect new items, not items already in the cache.*
-
-.. code-block:: php
-
-    $processorConfig = new ProcessorConfig($userFieldSet);
-    $processorConfig->setCacheTTL(60*5); // Time in seconds (5 minutes)
-
-Handling errors
----------------
-
-The examples above show processor errors in the English language and in some
-cases the information can be a little verbose (eg. unsupported value types).
-
-Fortunately each error is more then a simple string, in fact it's a
-:class:`Rollerworks\\Component\\Search\\ConditionErrorMessage` object
-with a bunch of useful information:
-
-.. code-block:: php
-
-    /**
-     * @var string
-     */
-    public $path;
-
-    /**
-     * @var string
-     */
-    public $message;
-
-    /**
-     * The template for the error message.
-     *
-     * @var string
-     */
-    public $messageTemplate;
-
-    /**
-     * The parameters that should be substituted in the message template.
-     *
-     * @var array
-     */
-    public $messageParameters;
-
-    /**
-     * @var mixed
-     */
-    public $cause;
-
-    /**
-     * A list of parameter names who's values must be translated separately.
-     *
-     * Either token: ["unexpected"]
-     *
-     * @var string[]
-     */
-    public $translatedParameters;
-
-The ``$messageTemplate`` and ``$messageParameters`` are the most interesting
-when you want to display the error message in a localized format. Plus RollerworksSearch,
-comes pre-bundled the translations in various locales.
-
-.. tip::
-
-    Is your language not supported yet or found a typo? Open a pull request for
-    https://github.com/rollerworks/search/tree/master/lib/Core/Resources/translations
-
-    **Note:** All translations must be provided in the XLIFF format.
-    See the contribution guidelines for more details.
-
-Before we can continue we first need to install a compatible Translator,
-for this example we'll use the Symfony `Translator component`_.
-
-This example shows how you can use the Translator to translate error messages,
-but for more flexibility it's best to perform the rendering logic in a template.
-
-.. code-block:: php
-
-    use Symfony\Component\Translation\Translator;
-    use Symfony\Component\Translation\MessageSelector;
-    use Symfony\Component\Translation\Loader\XliffFileLoader;
-    use Rollerworks\Component\Search\ConditionErrorMessage;
-
-    // Location of the translations.
-    $resourcesDirectory = dirname((new \ReflectionClass(FieldSet::class))->getFileName()).'/Resources/translations';
-
-    $translator = new Translator('fr_FR', new MessageSelector());
-    $translator->setFallbackLocales(array('en'));
-    $translator->addLoader('xlf', new XliffFileLoader());
-    $translator->addResource('xlf', $resourcesDirectory.'/messages.en.xlf', 'en');
-    $translator->addResource('xlf', $resourcesDirectory.'/messages.nl.xlf', 'nl');
-
-    // Change with your own locale.
-    $translator->setLocale('en');
-
-    ...
-
-    } catch (InvalidSearchConditionException $e) {
-        echo '<p>Your condition contains the following errors: <p>'.PHP_EOL;
-        echo '<ul>'.PHP_EOL;
-
-        foreach ($e->getErrors() as $error) {
-           echo '<li>'.$error->path.': '.htmlspecialchars($error->trans($translator)).'</li>'.PHP_EOL;
-        }
-
-        echo '</ul>'.PHP_EOL;
-    }
-
-Debugging information
----------------------
-
-But wait, what is ``$cause`` about? This value holds some useful information about
-what caused this error. It can be an Exception object, ``ConstraintViolation`` or anything.
-**It's only meant to be used for debugging, and may contain sensitive information!**
-
-Further reading
----------------
-
-* :doc:`Using Elasticsearch <integration/elasticsearch/index>`
-* :doc:`Doctrine DBAL/ORM integration <integration/doctrine/index>`
-* :doc:`Visual condition builder <visual_condition_builder>` (coming soon)
-
-.. _`PSR-16`: https://www.php-fig.org/psr/psr-16/
-.. _`Translator component`: https://symfony.com/doc/current/components/translation.html
diff --git a/docs/reference/caching.rst b/docs/reference/caching.rst
deleted file mode 100644
index 5822b91e..00000000
--- a/docs/reference/caching.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Caching
-=======
-
-TBD.
diff --git a/docs/reference/exporters.rst b/docs/reference/exporters.rst
deleted file mode 100644
index fb27daed..00000000
--- a/docs/reference/exporters.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Exporting SearchConditions
-==========================
-
-TBD.
diff --git a/docs/reference/input/json.rst b/docs/reference/input/json.rst
deleted file mode 100644
index 347a745f..00000000
--- a/docs/reference/input/json.rst
+++ /dev/null
@@ -1,123 +0,0 @@
-.. index::
-   single: input; json
-
-JsonInput Format
-================
-
-The provided input must be structured as follow:
-
-* Each entry must contain an object with either ``fields`` and/or ``groups``.
-* Optionally the object can contain ``'logical-case' => 'AND'`` to make it AND-cased.
-
-The ``groups`` must have array one or more arrays with the structure as
-described above (``fields`` and/or ``groups``).
-
-The fields array is an associative array where each key is the field-name
-and the values as follow (all the keys are optional, but at least one must
-exists):
-
-.. code-block:: javascript
-    :linenos:
-
-    {
-        "simple-values": [
-            "value1",
-            "value2"
-        ],
-        "excluded-values": [
-            "my value1",
-            "my value2"
-        ],
-        "ranges": [
-            {
-                "lower": 10,
-                "upper": 20
-            }
-        ],
-        "excluded-ranges": [
-            {
-                "lower": 25,
-                "upper": 30
-            }
-        ],
-        "comparisons": [
-            {
-                "value": 50,
-                "operator": ">"
-            }
-        ],
-        "pattern-matchers": [
-            {
-                "value": "foo",
-                "type": "STARTS_WITH"
-            }
-        ]
-    }
-
-The type of ``pattern-matchers`` must either one of the following:
-
-* ``CONTAINS```
-* ``STARTS_WITH``
-* ``ENDS_WITH``
-* ``NOT_CONTAINS``
-* ``NOT_STARTS_WITH``
-* ``NOT_ENDS_WITH``
-
-Full example:
-
-.. code-block:: javascript
-    :linenos:
-
-    {
-        "logical-case": "AND",
-        "fields": {
-            "field1": {
-                "ranges": [
-                    {
-                        "lower": 10,
-                        "upper": 20
-                    },
-                    {
-                        "lower": 30,
-                        "upper": 40
-                    },
-                    {
-                        "lower": 50,
-                        "upper": 60,
-                        "inclusive-lower": false
-                    },
-                    {
-                        "lower": 70,
-                        "upper": 80,
-                        "inclusive-upper": false
-                    }
-                ]
-            }
-        },
-        "groups": [
-            {
-                "logical-case": "AND",
-                "fields": {
-                    "field1": {
-                        "simple-values": [
-                            "value",
-                            "value2",
-                            "value3",
-                            "value4",
-                            "value5"
-                        ]
-                    }
-                },
-                "groups": [...]
-            }
-        ]
-    }
-
-.. note::
-
-    Internally the JsonInput processor uses the same input structure as :doc:`array`.
-
-    The advantage of using the JsonInput processor instead decoding the JSON object
-    yourself is that the JsonInput processor does a linting on the provided input,
-    ensuring the JSON input is valid and will give a more detail message on whats
-    wrong.
diff --git a/docs/reference/input/string_query.rst b/docs/reference/input/string_query.rst
deleted file mode 100644
index 92eccb8d..00000000
--- a/docs/reference/input/string_query.rst
+++ /dev/null
@@ -1,266 +0,0 @@
-.. index::
-   single: input; StringQuery
-
-StringQuery Format
-==================
-
-The StringQuery consists is a user-friendly syntax for providing search
-conditions. Note that input is accepted in any local including none latin
-characters.
-
-.. tip::
-
-    Whitespace characters (including new lines) are ignored for better
-    readability.
-
-    ``field-name: value1, value2;`` and ``field-name:value1,value2;``
-    Are technically the same.
-
-    But spaces within a value like ``field: hello world`` are prohibited.
-    You must quote the entire value then: ``field: "hello world"``
-
-    New lines in a value are always prohibited.
-
-The syntax consists for field-values pairs. Values are separated using
-a single coma (``,``). And pairs are separated using a single semi-colon
-(``;``)
-
-.. code-block:: php
-
-    username: value1, value2;
-
-``username`` is the field-name, ``value1`` and ``value`` are the values of the
-username field.
-
-The ``;`` character at the end of the query-pair indicates that the values
-list has ended, and a new pair or subgroup can be started.
-
-.. tip::
-
-    When the pair is last in the group or at the end of the input it
-    can be omitted.
-
-    .. code-block:: php
-
-        field1: value1, value2; field2: value1, value2;
-
-    Can shorted to.
-
-    .. code-block:: php
-
-        field1: value1, value2; field2: value1, value2
-
-Field-name
-----------
-
-A field-name is limited in formatting, it must start with an alphabetic
-character or word from any language. So a to z or "价" (price) in
-Simplified Chinese.
-
-After this it may be followed be a number, alphabetic character, word
-or a dash ``-`` or underscore ``_`` any given number of times.
-
-The following fields-names are valid:
-
-* ``价``
-* ``price``
-* ``price0``
-* ``total_price``
-* ``total-price``
-
-The following field-names are invalid:
-
-* ``0K`` (must not start with a number)
-* ``0价`` (must not start with a number)
-* ``0`` (must not start with a number)
-* ``_price`` (must not start with an underscore)
-* ``-price``  (must not start with an dash)
-* ``total-price:`` (must not end with an double colon ``:``).
-
-Values
-------
-
-A value can be anything from a word, a sentence, number or specially
-formatted value like a date. But not all values can be used directly.
-
-.. note::
-
-    If the value contains special characters (including spaces) the value
-    must be quoted using double quotes (``"``).
-
-    Special characters are: ``[<>[](),;~!*?=&*``, otherwise these characters
-    could be interpreted as value/field separate or give a syntax error.
-
-If the value itself contains double quotes these must be escaped by duplicating
-theme, so ``va"lue`` becomes ``va""lue`` and ``va""lue`` becomes ``va""""lue``.
-
-Escaped quotes will then be normalized when processing the input.
-
-.. caution::
-
-    Be careful with quotes at the beginning, ``""foo"`` might seem valid,
-    but the first quote is used to indicate a quoted value.
-
-    The correct usage is ``"""foo"`` which is transformed to ``"foo``
-
-Using a value like described above is whats called a "simple value".
-If there are more we call them of a list of simple values.
-
-But as simple values alone are not really useful, you can also use
-excluded simple values, (excluded) ranges, comparisons, and pattern matchers.
-
-To mark a value as being excluded prefix it with an exclamation (``!``),
-this works for almost all value types except comparisons and pattern matcher
-which have there own syntax.
-
-.. code-block:: php
-
-    field: !value, !1 ~ 10;
-
-As some values are part of an expression like a range, the value is referred
-to as a value-part.
-
-Ranges
-~~~~~~
-
-A range consists of two sides, a lower and upper bound (inclusive by default).
-Each side is considered a value-part and must follow the value convention
-(as described above).
-
-The following condition is seen as: field1 is between (inclusive) 1 and 100,
-and field2 is between (inclusive) -1 and 100.
-
-.. code-block:: php
-
-    field: 1-100; field2: -1 ~ 100
-
-Each side is inclusive by default, meaning the 'value' itself and anything
-lower/higher then it. To mark a value as exclusive (everything between,
-but not the actual value) use the outer turning square brace ``]`` for the
-lower-bound and ``[`` for the upper-bound.
-
-* ``]1 ~ 100`` is equal to (higher then) 1 and (equal to or lower then) 100)
-* ``[1 ~ 100`` is equal to (equal to or higher then) 1 and (equal to or lower then) 100)
-* ``[1 ~ 100[`` is equal to (equal to or higher then) 1 and (lower then) 100)
-* ``]1 ~ 100[`` is equal to (higher then) 1 and (lower then) 100)
-
-You can also mark a bound explicitly inclusive using ``[`` for lower-bound
-and ``]`` for the upper-bound to mark the. But as bounds are inclusive by
-default you don't have to do this, it's merely for explicitness.
-
-Comparison
-~~~~~~~~~~
-
-Comparisons are pretty straightforward, each comparison starts with an
-operator followed by a value-part.
-
-Supported operators are:
-
-* ``<`` (lower then)
-* ``<=`` (lower then or equal to)
-* ``<>`` (not higher or lower then (same as marking the value as excluded))
-* ``>`` (higher then)
-* ``>=`` (higher then or equal to)
-
-.. code-block:: php
-
-    field: >=1, < -10, date: > 06/02/2015
-
-.. tip::
-
-    Whenever possible try to use ranges instead of multiple comparisons,
-    because ranges can be optimized.
-
-PatternMatch
-------------
-
-PatternMatchers work similar to Comparisons, everything starting
-with a tilde (``~``) is considered a pattern-matcher.
-
-Supported operators are:
-
-* ``~*`` (contains)
-* ``~>`` (starts with)
-* ``~<`` (ends with)
-* ``~=`` (equals)
-
-And not the excluding equivalent.
-
-* ``~!*`` (does not contain)
-* ``~!>`` (does not start with)
-* ``~!<`` (does not end with)
-* ``~!=`` (equals)
-
-.. code-block:: php
-
-    field: ~> foo, ~*"bar";
-
-To mark the pattern case-insensitive add an 'i' directly after the '~'.
-
-.. code-block:: php
-
-    field: ~i> foo, ~i!* "bar";
-
-Subgroups
----------
-
-For more complex conditions you can nest pairs inside subgroups.
-Subgroups are separated the same way as pairs, using the ``;`` character.
-
-And just like field-values pairs, the group separation character can
-be omitted when the group is last in the group or input.
-
-.. code-block:: php
-
-    (field-name: value1, value2;); (field-name: value1, value2)
-
-Or in combination with field-values pairs.
-
-.. code-block:: php
-
-    field-name: value1, value2; (field-name: value1, value2)
-
-.. tip::
-
-    Noticed that pair in the second subgroup does not end with a ``;``?
-
-    That's because the processor is smart enough to know that the group
-    has ended here and it can simply ignore the missing ``;`` and continue.
-    If there was a second pair or nested subgroup an ``;`` is required.
-
-By default all groups are marked as logical AND, meaning all the fields
-within the group must give a positive match. For explicitness you can use
-this to mark the group as logical AND.
-
-.. code-block:: php
-
-    &(field1: values; field2: values);
-
-To change a group and make it OR'ed (at least one field must give a positive
-match), prefix the group with a star ``*`` character.
-
-.. code-block:: php
-
-    *(field1: values; field2: values);
-
-If you want to head-group (the condition itself) OR'ed or AND (default) use
-``*`` or ``&`` as the first character in the condition.
-
-.. code-block:: php
-
-    * field1: values; field2: values;
-
-.. code-block:: php
-
-    &field1: values; field2: values;
-
-.. caution::
-
-    The OR'ed symbol works only on groups, because the condition always
-    starts with a group the OR'ed symbol is only valid at the start of
-    a condition or subgroup.
-
-    So the following is invalid: ``is_admin: t; * enabled: f;``
-
-    But this is valid: ``is_admin: t; *(enabled: f)`` and marks subgroup 0
-    as OR'ed.
diff --git a/docs/reference/types.rst b/docs/reference/types.rst
deleted file mode 100644
index 4e58843f..00000000
--- a/docs/reference/types.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-.. index::
-   single: Types Reference
-
-Field Types Reference
-=====================
-
-.. toctree::
-   :maxdepth: 1
-   :hidden:
-
-   types/field
-
-   types/text
-   types/integer
-   types/money
-   types/number
-
-   types/choice
-   types/country
-   types/language
-   types/locale
-   types/timezone
-   types/currency
-
-   types/date
-   types/datetime
-   types/time
-   types/birthday
-
-A FieldSet is composed of *fields*, each of which are built with the help of
-a field *type* (e.g. a ``text`` type, ``choice`` type, etc). RollerworksSearch comes
-standard with a large list of field types that can be used.
-
-Supported Field Types
----------------------
-
-The following field types are natively available in RollerworksSearch:
-
-.. include:: /reference/types/map.rst.inc
diff --git a/docs/reference/types/birthday.rst b/docs/reference/types/birthday.rst
deleted file mode 100644
index 0a57596a..00000000
--- a/docs/reference/types/birthday.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-.. index::
-   single: Fields; birthday
-
-birthday Field Type
-===================
-
-A :doc:`date </reference/types/date>` field that specializes in handling
-birthday or age data. Can accept both birthdate or age.
-
-This type is essentially the same as the :doc:`date </reference/types/date>`
-type, but with a special option for handling an age in years.
-
-+----------------------+------------------------------------------------------------------------------+
-| Output Data Type     | can be ``DateTime`` or ``integer``                                           |
-+----------------------+------------------------------------------------------------------------------+
-| Options              | - `allow_future_date`_                                                       |
-+----------------------+------------------------------------------------------------------------------+
-| Inherited Options    | - `format`_                                                                  |
-|                      | - `allow_age`_                                                               |
-|                      | - `allow_future_date`_                                                       |
-+----------------------+------------------------------------------------------------------------------+
-| Parent type          | :doc:`date </reference/types/date>`                                          |
-+----------------------+------------------------------------------------------------------------------+
-| Class                | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\BirthdayType` |
-+----------------------+------------------------------------------------------------------------------+
-
-Field Options
--------------
-
-allow_age
-~~~~~~~~~
-
-**type**: ``bool`` **default**: ``true``
-
-Allow age (in years) as accepted format.
-
-.. caution::
-
-   This will be produce a mixed result for the field values, as some maybe integer
-   while other are ``\DateTime`` objects.
-
-allow_future_date
-~~~~~~~~~~~~~~~~~
-
-**type**: ``bool`` **default**: ``true``
-
-Allow dates that are in the future.
-
-Inherited options
------------------
-
-These options inherit from the :doc:`date </reference/types/date>` type:
-
-.. include:: /reference/types/options/date_format.rst.inc
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/choice.rst b/docs/reference/types/choice.rst
deleted file mode 100644
index ab494955..00000000
--- a/docs/reference/types/choice.rst
+++ /dev/null
@@ -1,89 +0,0 @@
-.. index::
-   single: Fields; choice
-
-choice Field Type
-=================
-
-A multi-purpose field used to allow the user to "choose" one or more options.
-
-To use this field, you must specify *either* the ``choice_list`` or ``choices``
-option.
-
-+--------------------+-------------------------------------------------------------------------------+
-| Output Data Type   | can be various types depending on the choice value                            |
-+--------------------+-------------------------------------------------------------------------------+
-| Options            | - `choices`_                                                                  |
-|                    | - `choice_list`_                                                              |
-|                    | - `label_as_value`_                                                           |
-+--------------------+-------------------------------------------------------------------------------+
-| Inherited options  | - `invalid_message`_                                                          |
-|                    | - `invalid_message_parameters`_                                               |
-+--------------------+-------------------------------------------------------------------------------+
-| Parent type        | :doc:`field </reference/types/field>`                                         |
-+--------------------+-------------------------------------------------------------------------------+
-| Class              | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\ChoiceType`    |
-+--------------------+-------------------------------------------------------------------------------+
-
-Example Usage
--------------
-
-The easiest way to use this field is to specify the choices directly via the
-``choices`` option. The key of the array becomes the value that's actually
-set on your underlying object (e.g. ``m``), while the value is what the
-user choices/types on the input (e.g. ``Male``).
-
-.. code-block:: php
-
-    $builder->add('gender', 'choice', array(
-        'choices'   => array('m' => 'Male', 'f' => 'Female'),
-    ));
-
-You can also use the ``choice_list`` option, which takes an object that can
-specify the choices.
-
-Field Options
--------------
-
-choices
-~~~~~~~
-
-**type**: ``array`` **default**: ``array()``
-
-This is the most basic way to specify the choices that should be used
-by this field. The ``choices`` option is an array, where the array key
-is the item value and the array value is the item's label:
-
-.. code-block:: php
-
-    $builder->add('gender', 'choice', array(
-        'choices' => array('m' => 'Male', 'f' => 'Female')
-    ));
-
-choice_list
-~~~~~~~~~~~
-
-**type**: ``Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceListInterface``
-
-This is one way of specifying the options to be used for this field.
-The ``choice_list`` option must be an instance of the ``ChoiceListInterface``.
-For more advanced cases, a custom class that implements the interface
-can be created to supply the choices.
-
-label_as_value
-~~~~~~~~~~~~~~
-
-**type**: ``bool`` **default**: ``false``
-
-Each choice has a label and value, by default the value is used for transforming
-from view to the choice.
-
-To use the label as value set this to ``true``.
-
-Inherited options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/country.rst b/docs/reference/types/country.rst
deleted file mode 100644
index f9a013ee..00000000
--- a/docs/reference/types/country.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-.. index::
-   single: Fields; country
-
-country Field Type
-==================
-
-The ``country`` type is a subset of the :doc:`choice type </reference/types/choice>`
-that allows the user to select from a large list of countries of the world.
-
-The "value" for each country is the two-letter country code.
-
-.. note::
-
-   The locale of your user is guessed using :phpmethod:`Locale::getDefault`
-
-Unlike the ``choice`` type, you don't need to specify a ``choices`` or
-``choice_list`` option as the field type automatically uses all of the countries
-of the world. You *can* specify either of these options manually, but then
-you should just use the ``choice`` type directly.
-
-+--------------------+------------------------------------------------------------------------------+
-| Overridden Options | - `choices`_                                                                 |
-+--------------------+------------------------------------------------------------------------------+
-| Inherited options  | - `invalid_message`_                                                         |
-|                    | - `invalid_message_parameters`_                                              |
-+--------------------+------------------------------------------------------------------------------+
-| Parent type        | :doc:`field </reference/types/choice>`                                       |
-+--------------------+------------------------------------------------------------------------------+
-| Class              | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\CountryType`  |
-+--------------------+------------------------------------------------------------------------------+
-
-Overridden Options
-------------------
-
-choices
-~~~~~~~
-
-**default**: ``Symfony\Component\Intl\Intl::getRegionBundle()->getCountryNames()``
-
-The country type defaults the ``choices`` option to the whole list of countries.
-The locale is used to translate the countries names.
-
-Inherited options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/currency.rst b/docs/reference/types/currency.rst
deleted file mode 100644
index 5e068839..00000000
--- a/docs/reference/types/currency.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-.. index::
-    single: Fields; currency
-
-currency Field Type
-===================
-
-The ``currency`` type is a subset of the
-:doc:`choice type </reference/types/choice>` that allows the user to
-select from a large list of `3-letter ISO 4217`_ currencies.
-
-Unlike the ``choice`` type, you don't need to specify a ``choices`` or
-``choice_list`` option as the field type automatically uses a large list of
-currencies. You *can* specify either of these options manually, but then you
-should use the ``choice`` type directly.
-
-+--------------------+------------------------------------------------------------------------------+
-| Overridden Options | - `choices`_                                                                 |
-+--------------------+------------------------------------------------------------------------------+
-| Inherited options  | - `invalid_message`_                                                         |
-|                    | - `invalid_message_parameters`_                                              |
-+--------------------+------------------------------------------------------------------------------+
-| Parent type        | :doc:`field </reference/types/choice>`                                       |
-+--------------------+------------------------------------------------------------------------------+
-| Class              | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\CurrencyType` |
-+--------------------+------------------------------------------------------------------------------+
-
-Overridden Options
-------------------
-
-choices
-~~~~~~~
-
-**default**: ``Symfony\Component\Intl\Intl::getCurrencyBundle()->getCurrencyNames()``
-
-The choices option defaults to all currencies.
-
-Inherited options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
-
-.. _`3-letter ISO 4217`: http://en.wikipedia.org/wiki/ISO_4217
diff --git a/docs/reference/types/date.rst b/docs/reference/types/date.rst
deleted file mode 100644
index 5474462c..00000000
--- a/docs/reference/types/date.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-.. index::
-   single: Fields; date
-
-date Field Type
-===============
-
-A field to capture date input.
-
-The provided input can be provided localized.
-The underlying data is stored as a ``DateTime`` object with UTC as timezone.
-
-+----------------------+---------------------------------------------------------------------------+
-| Output Data Type     | ``DateTime``                                                              |
-+----------------------+---------------------------------------------------------------------------+
-| Options              | - `format`_                                                               |
-+----------------------+---------------------------------------------------------------------------+
-| Inherited options    | - `invalid_message`_                                                      |
-|                      | - `invalid_message_parameters`_                                           |
-+----------------------+---------------------------------------------------------------------------+
-| Parent type          | :doc:`field </reference/types/field>`                                     |
-+----------------------+---------------------------------------------------------------------------+
-| Class                | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\DateType`  |
-+----------------------+---------------------------------------------------------------------------+
-
-Field Options
--------------
-
-.. _reference-fields-type-date-format:
-
-.. include:: /reference/types/options/date_format.rst.inc
-
-Inherited options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/datetime.rst b/docs/reference/types/datetime.rst
deleted file mode 100644
index 8f1aa874..00000000
--- a/docs/reference/types/datetime.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-.. index::
-   single: Fields; datetime
-
-datetime Field Type
-===================
-
-A field to capture datetime input.
-
-The provided input can be provided localized.
-The underlying data is stored as a ``DateTime`` object.
-
-+----------------------+------------------------------------------------------------------------------+
-| Output Data Type     | can be ``DateTimeImmutable`` or ``Carbon\CarbonInterval``                    |
-+----------------------+------------------------------------------------------------------------------+
-| Options              | - `with_seconds`_                                                            |
-|                      | - `with_minutes`_                                                            |
-|                      | - `model_timezone`_                                                          |
-|                      | - `input_timezone`_                                                          |
-|                      | - `allow_relative`_                                                          |
-+----------------------+------------------------------------------------------------------------------+
-| Parent type          | :doc:`field </reference/types/field>`                                        |
-+----------------------+------------------------------------------------------------------------------+
-| Class                | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\DateTimeType` |
-+----------------------+------------------------------------------------------------------------------+
-
-Field Options
--------------
-
-.. include:: /reference/types/options/date_format.rst.inc
-
-.. include:: /reference/types/options/with_seconds.rst.inc
-
-.. include:: /reference/types/options/with_minutes.rst.inc
-
-.. include:: /reference/types/options/model_timezone.rst.inc
-
-.. include:: /reference/types/options/input_timezone.rst.inc
-
-Inherited options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/field.rst b/docs/reference/types/field.rst
deleted file mode 100644
index 1aca4a0a..00000000
--- a/docs/reference/types/field.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-.. index::
-   single: Fields; field
-
-field Field Type
-================
-
-See :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\FieldType`.
-
-The ``field`` type predefines a couple of options that are then available
-on all fields.
-
-The most common one is the :class:`Rollerworks\\Component\\Search\\Extension\\Core\\ValueComparison\\SimpleValueComparison`
-to check for duplicated values.
diff --git a/docs/reference/types/integer.rst b/docs/reference/types/integer.rst
deleted file mode 100644
index 64cdbf74..00000000
--- a/docs/reference/types/integer.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-.. index::
-   single: Fields; integer
-
-integer Field Type
-==================
-
-Handles an input "number" field.
-
-This field has different options on how to handle input values that aren't
-integers. By default, all non-integer values (e.g. 6.78) will round down (e.g. 6).
-
-+--------------------+-----------------------------------------------------------------------------+
-| Options            | - `rounding_mode`_                                                          |
-|                    | - `precision`_                                                              |
-|                    | - `grouping`_                                                               |
-+--------------------+-----------------------------------------------------------------------------+
-| Inherited options  | - `invalid_message`_                                                        |
-|                    | - `invalid_message_parameters`_                                             |
-+--------------------+-----------------------------------------------------------------------------+
-| Parent type        | :doc:`field </reference/types/field>`                                       |
-+--------------------+-----------------------------------------------------------------------------+
-| Class              | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\IntegerType` |
-+--------------------+-----------------------------------------------------------------------------+
-
-Field Options
--------------
-
-.. include:: /reference/types/options/precision.rst.inc
-
-rounding_mode
-~~~~~~~~~~~~~
-
-**type**: ``integer`` **default**: ``IntegerToLocalizedStringTransformer::ROUND_DOWN``
-
-By default, if the user enters a non-integer number, it will be rounded
-down. There are several other rounding methods, and each is a constant
-on the :class:`Rollerworks\\Component\\Search\\Extension\\Core\\DataTransformer\\IntegerToLocalizedStringTransformer`:
-
-* ``IntegerToLocalizedStringTransformer::ROUND_DOWN`` Round towards zero.
-
-* ``IntegerToLocalizedStringTransformer::ROUND_FLOOR`` Round towards negative
-  infinity.
-
-* ``IntegerToLocalizedStringTransformer::ROUND_UP`` Round away from zero.
-
-* ``IntegerToLocalizedStringTransformer::ROUND_CEILING`` Round towards
-  positive infinity.
-
-* ``IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN`` Round towards the
-  "nearest neighbor". If both neighbors are equidistant, round down.
-
-* ``IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN`` Round towards the
-  "nearest neighbor". If both neighbors are equidistant, round towards the
-  even neighbor.
-
-* ``IntegerToLocalizedStringTransformer::ROUND_HALF_UP`` Round towards the
-  "nearest neighbor". If both neighbors are equidistant, round up.
-
-.. include:: /reference/types/options/grouping.rst.inc
-
-Inherited options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/language.rst b/docs/reference/types/language.rst
deleted file mode 100644
index 0ea16caa..00000000
--- a/docs/reference/types/language.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-.. index::
-   single: Fields; language
-
-language Field Type
-===================
-
-The ``language`` type is a subset of the :doc:`choice type </reference/types/choice>` that allows the user
-to select from a large list of languages. As an added bonus, the language names
-are displayed in the language of the user.
-
-The "value" for each language is the *Unicode language identifier*
-(e.g. ``fr`` or ``zh-Hant``).
-
-.. note::
-
-   The locale of your user is guessed using :phpmethod:`Locale::getDefault`
-
-Unlike the ``choice`` type, you don't need to specify a ``choices`` or
-``choice_list`` option as the field type automatically uses all of the countries
-of the world. You *can* specify either of these options manually, but then
-you should just use the ``choice`` type directly.
-
-+--------------------+------------------------------------------------------------------------------+
-| Overridden Options | - `choices`_                                                                 |
-+--------------------+------------------------------------------------------------------------------+
-| Inherited options  | - `invalid_message`_                                                         |
-|                    | - `invalid_message_parameters`_                                              |
-+--------------------+------------------------------------------------------------------------------+
-| Parent type        | :doc:`field </reference/types/choice>`                                       |
-+--------------------+------------------------------------------------------------------------------+
-| Class              | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\LanguageType` |
-+--------------------+------------------------------------------------------------------------------+
-
-Overridden Options
-------------------
-
-choices
-~~~~~~~
-
-**default**: ``Symfony\Component\Intl\Intl::getLanguageBundle()->getLanguageNames()``.
-
-The choices option defaults to all languages.
-The default locale is used to translate the languages names.
-
-Inherited options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/locale.rst b/docs/reference/types/locale.rst
deleted file mode 100644
index dd488630..00000000
--- a/docs/reference/types/locale.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-.. index::
-   single: Fields; locale
-
-locale Field Type
-=================
-
-The ``locale`` type is a subset of the ``ChoiceType`` that allows the user
-to select from a large list of locales (language+country). As an added bonus,
-the locale names are displayed in the language of the user.
-
-The "value" for each locale is either the two letter ISO639-1 *language* code
-(e.g. ``fr``), or the language code followed by an underscore (``_``), then
-the ISO3166 *country* code (e.g. ``fr_FR`` for French/France).
-
-.. note::
-
-   The locale of your user is guessed using :phpmethod:`Locale::getDefault`
-
-Unlike the ``choice`` type, you don't need to specify a ``choices`` or
-``choice_list`` option as the field type automatically uses a large list
-of locales. You *can* specify either of these options manually, but then
-you should just use the ``choice`` type directly.
-
-+--------------------+----------------------------------------------------------------------------+
-| Overridden Options | - `choices`_                                                               |
-+--------------------+----------------------------------------------------------------------------+
-| Inherited options  | - `invalid_message`_                                                       |
-|                    | - `invalid_message_parameters`_                                            |
-+--------------------+----------------------------------------------------------------------------+
-| Parent type        | :doc:`field </reference/types/choice>`                                     |
-+--------------------+----------------------------------------------------------------------------+
-| Class              | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\LocaleType` |
-+--------------------+----------------------------------------------------------------------------+
-
-Overridden Options
-------------------
-
-choices
-~~~~~~~
-
-**default**: ``Symfony\Component\Intl\Intl::getLocaleBundle()->getLocaleNames()``
-
-The choices option defaults to all locales. It uses the default locale to
-specify the language.
-
-Inherited options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/map.rst.inc b/docs/reference/types/map.rst.inc
deleted file mode 100644
index cce90734..00000000
--- a/docs/reference/types/map.rst.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-Text Fields
-~~~~~~~~~~~
-
-* :doc:`text </reference/types/text>`
-* :doc:`integer </reference/types/integer>`
-* :doc:`money </reference/types/money>`
-* :doc:`number </reference/types/number>`
-
-Choice Fields
-~~~~~~~~~~~~~
-
-* :doc:`choice </reference/types/choice>`
-* :doc:`country </reference/types/country>`
-* :doc:`language </reference/types/language>`
-* :doc:`locale </reference/types/locale>`
-* :doc:`timezone </reference/types/timezone>`
-* :doc:`currency </reference/types/currency>`
-
-Date and Time Fields
-~~~~~~~~~~~~~~~~~~~~
-
-* :doc:`date </reference/types/date>`
-* :doc:`datetime </reference/types/datetime>`
-* :doc:`time </reference/types/time>`
-* :doc:`birthday </reference/types/birthday>`
-
-Base Fields
-~~~~~~~~~~~
-
-* :doc:`field </reference/types/field>`
diff --git a/docs/reference/types/money.rst b/docs/reference/types/money.rst
deleted file mode 100644
index 1c395144..00000000
--- a/docs/reference/types/money.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-.. index::
-   single: Fields; money
-
-money Field Type
-================
-
-A field specialized in money data.
-
-This field type allows you to process money with a currency.
-There are also several other options for customizing how
-the input and output of the data is handled.
-
-+----------------------+---------------------------------------------------------------------------+
-| Output Data Type     | ``Rollerworks\Component\Search\Extension\Core\Model\MoneyValue``          |
-+----------------------+---------------------------------------------------------------------------+
-| Options              | - `default_currency`_                                                     |
-|                      | - `divisor`_                                                              |
-|                      | - `precision`_                                                            |
-|                      | - `grouping`_                                                             |
-+----------------------+---------------------------------------------------------------------------+
-| Inherited options    | - `invalid_message`_                                                      |
-|                      | - `invalid_message_parameters`_                                           |
-+----------------------+---------------------------------------------------------------------------+
-| Parent type          | :doc:`field </reference/types/field>`                                     |
-+----------------------+---------------------------------------------------------------------------+
-| Class                | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\MoneyType` |
-+----------------------+---------------------------------------------------------------------------+
-
-Field Options
--------------
-
-default_currency
-~~~~~~~~~~~~~~~~
-
-**type**: ``string`` **default**: ``EUR``
-
-Specifies the default currency that the money is being specified in. This
-value is only used when no currency symbol is detected.
-
-This can be any `3 letter ISO 4217 code`_. You can also set this to false to
-enforce an explicit currency symbol.
-
-divisor
-~~~~~~~
-
-**type**: ``integer`` **default**: ``1``
-
-If, for some reason, you need to divide your starting value by a number
-before passing it to the storage later, you can use the ``divisor`` option.
-
-precision
-~~~~~~~~~
-
-**type**: ``integer`` **default**: ``2``
-
-For some reason, if you need some precision other than 2 decimal places,
-you can modify this value. You probably won't need to do this unless,
-for example, you want to round to the nearest dollar (set the precision
-to ``0``).
-
-.. include:: /reference/types/options/grouping.rst.inc
-
-Inherited Options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
-
-.. _`3 letter ISO 4217 code`: http://en.wikipedia.org/wiki/ISO_4217
diff --git a/docs/reference/types/number.rst b/docs/reference/types/number.rst
deleted file mode 100644
index dc48838f..00000000
--- a/docs/reference/types/number.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-.. index::
-   single: Fields; number
-
-number Field Type
-=================
-
-A field specialized in number as input.
-
-This type offers different options for the precision, rounding, and grouping that
-you want to use for your number.
-
-+-------------+----------------------------------------------------------------------------+
-| Options     | - `rounding_mode`_                                                         |
-|             | - `precision`_                                                             |
-|             | - `grouping`_                                                              |
-+-------------+----------------------------------------------------------------------------+
-| Inherited   | - `invalid_message`_                                                       |
-| options     | - `invalid_message_parameters`_                                            |
-+-------------+----------------------------------------------------------------------------+
-| Parent type | :doc:`field </reference/types/field>`                                      |
-+-------------+----------------------------------------------------------------------------+
-| Class       | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\NumberType` |
-+-------------+----------------------------------------------------------------------------+
-
-Field Options
--------------
-
-.. include:: /reference/types/options/precision.rst.inc
-
-rounding_mode
-~~~~~~~~~~~~~
-
-**type**: ``integer`` **default**: ``NumberToLocalizedStringTransformer::ROUND_HALFUP``
-
-If a submitted number needs to be rounded (based on the ``precision``
-option), you have several configurable options for that rounding. Each
-option is a constant on the :class:`Rollerworks\\Component\\Search\\Extension\\Core\\DataTransformer\\NumberToLocalizedStringTransformer`:
-
-* ``NumberToLocalizedStringTransformer::ROUND_DOWN`` Round towards zero.
-
-* ``NumberToLocalizedStringTransformer::ROUND_FLOOR`` Round towards negative
-  infinity.
-
-* ``NumberToLocalizedStringTransformer::ROUND_UP`` Round away from zero.
-
-* ``NumberToLocalizedStringTransformer::ROUND_CEILING`` Round towards
-  positive infinity.
-
-* ``NumberToLocalizedStringTransformer::ROUND_HALF_DOWN`` Round towards the
-  "nearest neighbor". If both neighbors are equidistant, round down.
-
-* ``NumberToLocalizedStringTransformer::ROUND_HALF_EVEN`` Round towards the
-  "nearest neighbor". If both neighbors are equidistant, round towards the
-  even neighbor.
-
-* ``NumberToLocalizedStringTransformer::ROUND_HALF_UP`` Round towards the
-  "nearest neighbor". If both neighbors are equidistant, round up.
-
-.. include:: /reference/types/options/grouping.rst.inc
-
-Inherited Options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/options/allow_relative.rst.inc b/docs/reference/types/options/allow_relative.rst.inc
deleted file mode 100644
index 77303431..00000000
--- a/docs/reference/types/options/allow_relative.rst.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-allow_relative
-~~~~~~~~~~~~~~
-
-**type**: ``bool`` **default**: ``false``_
-
-Enables the handling of relative Date and/or time formats like
-``1 week``, ``6 years 3 hours``.
-
-The actual datetime is relative to now (current date and time), use the minus (``-``)
-sign like ``-1 year`` to invert interval to a past moment.
-
-Internally this uses `Carbon DateInterval`_ to parse the (localized) format.
-
-.. caution::
-
-    For Doctrine DBAL and ORM not all platforms are supported yet.
-    Currently only PostgreSQL and MySQL/MariaDB are supported.
-
-    Working se
-
-.. _`Date/Time Format Syntax`: http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax
-.. _`Carbon DateInterval`: https://carbon.nesbot.com/docs/#api-interval
diff --git a/docs/reference/types/options/date_format.rst.inc b/docs/reference/types/options/date_format.rst.inc
deleted file mode 100644
index 0a1a183f..00000000
--- a/docs/reference/types/options/date_format.rst.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-format
-~~~~~~
-
-**type**: ``integer`` or ``string`` **default**: `IntlDateFormatter::MEDIUM`_
-
-Option passed to the ``IntlDateFormatter`` class, used to transform user input
-into the proper format. This is critical when the input is passed localized format,
-and will define how the user will input the data.
-By default, the format is determined based on the current user locale: meaning
-that *the expected format will be different for different users*. You
-can override it by passing the format as a string.
-
-For more information on valid formats, see `Date/Time Format Syntax`_
-
-.. _`Date/Time Format Syntax`: http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax
-.. _`IntlDateFormatter::MEDIUM`: http://www.php.net/manual/en/class.intldateformatter.php#intl.intldateformatter-constants
diff --git a/docs/reference/types/options/grouping.rst.inc b/docs/reference/types/options/grouping.rst.inc
deleted file mode 100644
index a40773ae..00000000
--- a/docs/reference/types/options/grouping.rst.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-grouping
-~~~~~~~~
-
-**type**: ``integer`` **default**: ``false``
-
-This value is used internally as the ``NumberFormatter::GROUPING_USED`` value when using PHP's ``NumberFormatter`` class.
-
-Its documentation is non-existent, but it appears that if you set this to ``true``, numbers will be grouped with a
-comma or period (depending on your locale): ``12345.123`` would display as ``12,345.123``.
diff --git a/docs/reference/types/options/input_timezone.rst.inc b/docs/reference/types/options/input_timezone.rst.inc
deleted file mode 100644
index fd9f3817..00000000
--- a/docs/reference/types/options/input_timezone.rst.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-input_timezone
-~~~~~~~~~~~~~~
-
-**type**: ``string`` **default**: system default timezone
-
-Timezone that the input data is stored in. This must be one of the
-`PHP supported timezones`_.
-
-.. _`PHP supported timezones`: http://php.net/manual/en/timezones.php
diff --git a/docs/reference/types/options/inputl_timezone.rst.inc b/docs/reference/types/options/inputl_timezone.rst.inc
deleted file mode 100644
index fd9f3817..00000000
--- a/docs/reference/types/options/inputl_timezone.rst.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-input_timezone
-~~~~~~~~~~~~~~
-
-**type**: ``string`` **default**: system default timezone
-
-Timezone that the input data is stored in. This must be one of the
-`PHP supported timezones`_.
-
-.. _`PHP supported timezones`: http://php.net/manual/en/timezones.php
diff --git a/docs/reference/types/options/invalid_message.rst.inc b/docs/reference/types/options/invalid_message.rst.inc
deleted file mode 100644
index 16091238..00000000
--- a/docs/reference/types/options/invalid_message.rst.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-invalid_message
-~~~~~~~~~~~~~~~
-
-**type**: ``string`` **default**: ``This value is not valid``
-
-This is the validation error message that's used if the data entered into
-this field doesn't make sense (i.e. fails validation).
-
-This might happen, for example, if the user enters a nonsense string into
-a :doc:`time</reference/types/time>` field that cannot be converted
-into a real time or if the user enters a string (e.g. ``apple``) into a
-number field.
-
-Normal (business logic) validation (such as when setting a minimum length for
-a field) should be set using validation messages with your validation rules.
-
-Validation is provided by eg the `rollerworks/search-symfony-validator`_ or any other
-supported SearchCondition validator.
-
-.. _`rollerworks/search-symfony-validator`: https://github.com/rollerworks/rollerworks-search-symfony-validator
diff --git a/docs/reference/types/options/invalid_message_parameters.rst.inc b/docs/reference/types/options/invalid_message_parameters.rst.inc
deleted file mode 100644
index 41b053e3..00000000
--- a/docs/reference/types/options/invalid_message_parameters.rst.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-invalid_message_parameters
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-**type**: ``array`` **default**: ``array()``
-
-When setting the ``invalid_message`` option, you may need to
-include some variables in the string. This can be done by adding placeholders
-to that option and including the variables in this option:
-
-.. code-block:: php
-
-    $builder->add('some_field', 'some_type', array(
-        // ...
-        'invalid_message'            => 'You entered an invalid value - it should include %num% letters',
-        'invalid_message_parameters' => array('%num%' => 6),
-    ));
diff --git a/docs/reference/types/options/model_timezone.rst.inc b/docs/reference/types/options/model_timezone.rst.inc
deleted file mode 100644
index c88beb38..00000000
--- a/docs/reference/types/options/model_timezone.rst.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-model_timezone
-~~~~~~~~~~~~~~
-
-**type**: ``string`` **default**: system default timezone
-
-Timezone that the storage data is stored in. This must be one of the
-`PHP supported timezones`_.
-
-.. _`PHP supported timezones`: http://php.net/manual/en/timezones.php
diff --git a/docs/reference/types/options/precision.rst.inc b/docs/reference/types/options/precision.rst.inc
deleted file mode 100644
index ac606eb8..00000000
--- a/docs/reference/types/options/precision.rst.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-precision
-~~~~~~~~~
-
-**type**: ``integer`` **default**: Locale-specific (usually around ``3``)
-
-This specifies how many decimals will be allowed until the field rounds
-the submitted value (via ``rounding_mode``). For example, if ``precision``
-is set to ``2``, a submitted value of ``20.123`` will be rounded to,
-for example, ``20.12`` (depending on your ``rounding_mode``).
diff --git a/docs/reference/types/options/trim.rst.inc b/docs/reference/types/options/trim.rst.inc
deleted file mode 100644
index df0cced8..00000000
--- a/docs/reference/types/options/trim.rst.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-trim
-~~~~
-
-**type**: ``bool`` **default**: ``true``
-
-If true, the whitespace of the submitted string value will be stripped
-via the ``trim()`` function when the data is transformed. This guarantees that
-if a value is submitted with extra whitespace, it will be removed before
-the value is stored in the ``ValuesBag``.
diff --git a/docs/reference/types/options/with_minutes.rst.inc b/docs/reference/types/options/with_minutes.rst.inc
deleted file mode 100644
index fa83356d..00000000
--- a/docs/reference/types/options/with_minutes.rst.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-with_minutes
-~~~~~~~~~~~~
-
-**type**: ``bool`` **default**: ``false``
-
-Whether or not to include minutes in the input.
diff --git a/docs/reference/types/options/with_seconds.rst.inc b/docs/reference/types/options/with_seconds.rst.inc
deleted file mode 100644
index aa6a7427..00000000
--- a/docs/reference/types/options/with_seconds.rst.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-with_seconds
-~~~~~~~~~~~~
-
-**type**: ``bool`` **default**: ``false``
-
-Whether or not to include seconds in the input.
diff --git a/docs/reference/types/text.rst b/docs/reference/types/text.rst
deleted file mode 100644
index fa125101..00000000
--- a/docs/reference/types/text.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-.. index::
-   single: Fields; text
-
-text Field Type
-===============
-
-The text field handles the most basic input text field.
-
-+-------------+----------------------------------------------------------------------------+
-| Options     | - `trim`_                                                                  |
-+-------------+----------------------------------------------------------------------------+
-| Inherited   | - `invalid_message`_                                                       |
-| options     | - `invalid_message_parameters`_                                            |
-+-------------+----------------------------------------------------------------------------+
-| Parent type | :doc:`field </reference/types/field>`                                      |
-+-------------+----------------------------------------------------------------------------+
-| Class       | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\TextType`   |
-+-------------+----------------------------------------------------------------------------+
-
-
-Field Options
--------------
-
-.. include:: /reference/types/options/trim.rst.inc
-
-Inherited Options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/time.rst b/docs/reference/types/time.rst
deleted file mode 100644
index 13a67a67..00000000
--- a/docs/reference/types/time.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-.. index::
-   single: Fields; time
-
-time Field Type
-===============
-
-A field to capture time input.
-
-The provided input can be provided localized.
-The underlying data is stored as a ``DateTime`` object with UTC as time zone.
-
-+----------------------+-----------------------------------------------------------------------------+
-| Output Data Type     | ``DateTime``                                                                |
-+----------------------+-----------------------------------------------------------------------------+
-| Options              | - `with_seconds`_                                                           |
-|                      | - `with_minutes`_                                                           |
-|                      | - `model_timezone`_                                                         |
-|                      | - `input_timezone`_                                                         |
-+----------------------+-----------------------------------------------------------------------------+
-| Inherited options    | - `invalid_message`_                                                        |
-|                      | - `invalid_message_parameters`_                                             |
-+----------------------+-----------------------------------------------------------------------------+
-| Parent type          | :doc:`field </reference/types/field>`                                       |
-+----------------------+-----------------------------------------------------------------------------+
-| Class                | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\TimeType`    |
-+----------------------+-----------------------------------------------------------------------------+
-
-Field Options
--------------
-
-.. include:: /reference/types/options/with_seconds.rst.inc
-
-.. include:: /reference/types/options/with_minutes.rst.inc
-
-.. include:: /reference/types/options/model_timezone.rst.inc
-
-.. include:: /reference/types/options/input_timezone.rst.inc
-
-Inherited options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/reference/types/timezone.rst b/docs/reference/types/timezone.rst
deleted file mode 100644
index db36ad33..00000000
--- a/docs/reference/types/timezone.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-.. index::
-   single: Fields; timezone
-
-timezone Field Type
-===================
-
-The ``timezone`` type is a subset of the ``ChoiceType`` that allows the user
-to select from all possible timezones.
-
-The "value" for each timezone is the full timezone name, such as ``America/Chicago``
-or ``Europe/Istanbul``.
-
-Unlike the ``choice`` type, you don't need to specify a ``choices`` or
-``choice_list`` option as the field type automatically uses a large list
-of timezones. You *can* specify either of these options manually, but then
-you should just use the ``choice`` type directly.
-
-+--------------------+------------------------------------------------------------------------------+
-| Overridden Options | - `choices`_                                                                 |
-+--------------------+------------------------------------------------------------------------------+
-| Inherited options  | - `invalid_message`_                                                         |
-|                    | - `invalid_message_parameters`_                                              |
-+--------------------+------------------------------------------------------------------------------+
-| Parent type        | :doc:`field </reference/types/choice>`                                       |
-+--------------------+------------------------------------------------------------------------------+
-| Class              | :class:`Rollerworks\\Component\\Search\\Extension\\Core\\Type\\TimezoneType` |
-+--------------------+------------------------------------------------------------------------------+
-
-Overridden Options
-------------------
-
-choices
-~~~~~~~
-
-**default**: ``Rollerworks\\Component\\Search\\Extension\\Core\\Type\\TimezoneType::getTimezones()``
-
-The choices option defaults to all languages.
-The default locale is used to translate the languages names.
-
-Inherited options
------------------
-
-These options inherit from the :doc:`field </reference/types/field>` type:
-
-.. include:: /reference/types/options/invalid_message.rst.inc
-
-.. include:: /reference/types/options/invalid_message_parameters.rst.inc
diff --git a/docs/searching_in_practice.rst b/docs/searching_in_practice.rst
deleted file mode 100644
index c03bc3d6..00000000
--- a/docs/searching_in_practice.rst
+++ /dev/null
@@ -1,316 +0,0 @@
-SearchConditions in action
-==========================
-
-This chapter explains how you can use SearchConditions in practice,
-what kind of results you can expect with a SearchCondition and
-handy tips for getting the best result.
-
-The examples shown below use the :doc:`reference/input/string_query`
-syntax as input condition (condition for short).
-
-**Remember that almost all values of a field are OR'ed, meaning
-that at least one value must match for the field to have a positive
-match.** ``field: value1, value2`` means from the current row
-the value of column field1 must be e.g. ``value1`` or ``value2``;
-
-.. note::
-
-    **Excluded values are not OR'ed**, ``field: !value1, !value2;``
-    will only match if: field1 is not value1 *and* not value2;
-
-Notice that some values are between ``"``, this is because any value part
-that is not a single word or contains special character must be quoted in
-the StringQuery syntax.
-
-Common mistakes and good to know
---------------------------------
-
-Comparison
-~~~~~~~~~~
-
-Comparisons are applied as AND, meaning all of them must give a positive
-match. So using multiple comparisons may not give the expected result.
-``field: >10, <20`` is the same as using a range like ``field: ]10 ~ 20[``.
-
-But ``field: >10, <20, >30`` will only give results when the value is between
-10 and 20, the 'higher then 30' part is ignored as the first part is more
-restrictive.
-
-You can solve this by using ranges like: ``field1: 10 ~ 20, >30;``
-Or by using a subgroup like ``(field1: >10, <20); (field1: >30)``
-
-PatternMatch
-~~~~~~~~~~~~
-
-PatternMatchers are either OR'ed or applied as AND. This depends on
-whether they are excluding or not.
-
-Take the following matchers: ``field1: ~* foo; ~!* bar;``
-The first one is a "positive" matcher (field1 contains ``foo``), the second
-one is a negative/excluding matcher (field1 does *not* contain ``bar``).
-
-If both were OR'ed we would either get a result when field1 contains "foo"
-or does not contain "bar", but if the field contains "foo" but also "bar"
-we would get an unexpected result. So the matchers are applied separately.
-
-Last tip
-~~~~~~~~
-
-If something is not possible because of how the condition is evaluated
-you can use subgroups to make it work.
-
-Take the PatternMatcher, say we **want to** search a field that contains
-e.g. "foo" *or* does not contain "bar". With ``field: ~* foo; ~!* bar;``
-this will not work, but if we use two subgroups ``(field: ~*foo); (field: ~!*bar);``
-it will work!
-
-What to expect with a condition
--------------------------------
-
-For all the examples assume we have the following records:
-
-+----------+------------+--------------+-----------------+-----------+
-| id       | sex        | reg_date     | is_admin        | enabled   |
-+==========+============+==============+=================+===========+
-| 10       | male       | 2011-01-04   | t               | t         |
-+----------+------------+--------------+-----------------+-----------+
-| 20       | female     | 2011-01-04   | f               | f         |
-+----------+------------+--------------+-----------------+-----------+
-| 30       | male       | 2013-01-04   | f               | t         |
-+----------+------------+--------------+-----------------+-----------+
-| 100      | female     | 2013-05-04   | f               | f         |
-+----------+------------+--------------+-----------------+-----------+
-| 500      | male       | 2015-03-04   | t               | f         |
-+----------+------------+--------------+-----------------+-----------+
-
-.. tip::
-
-    You are not limited a single table, the actual searching in a database
-    is done by a condition processor which may support searching complex
-    structures or separated entities.
-
-    So no problem if you want to search for an invoice that has a customer
-    relationship, and you want to use the customer as leading condition.
-
-Search for users with a specific sex
----------------------------------------
-
-Say we want to find all female users.
-
-Using condition: ``sex: female``
-
-Will give the following result.
-
-+----------+------------+--------------+-----------------+-----------+
-| id       | sex        | reg_date     | is_admin        | enabled   |
-+==========+============+==============+=================+===========+
-| 20       | female     | 2011-01-04   | f               | f         |
-+----------+------------+--------------+-----------------+-----------+
-| 100      | female     | 2013-05-04   | f               | f         |
-+----------+------------+--------------+-----------------+-----------+
-
-Or we can use a different approach by *excluding* "male" from the sex list.
-
-.. code-block:: php
-
-    sex: !male;
-
-Which will give the same result.
-
-.. note::
-
-    If we had another sex type like "N/A". Then we would have
-    gotten all female users and users with sex "N/A".
-
-Search for users with a specific sex and registration date
--------------------------------------------------------------
-
-Say we want to find all female users, that have registered
-in or after the year 2011 but before 2015.
-*Dates are in ISO date notation year/month/day.*
-
-The following conditions will all produce the same result, but use
-different methods to get the result.
-
-+----------+------------+--------------+-----------------+-----------+
-| id       | sex        | reg_date     | is_admin        | enabled   |
-+==========+============+==============+=================+===========+
-| 20       | female     | 2011-01-04   | f               | f         |
-+----------+------------+--------------+-----------------+-----------+
-| 100      | female     | 2013-05-04   | f               | f         |
-+----------+------------+--------------+-----------------+-----------+
-
-Explicit range
-~~~~~~~~~~~~~~
-
-Find where sex is female and date is (inclusive) between "2011/01/01"
-and "2014/12/31".
-
-.. code-block:: php
-
-    sex: female; date: 2011/01/01 ~ 2014/12/31;
-
-Explicit range with exclusive bounds
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sometimes the upper-value is not really predictable, for example you want to
-search for a date that falls in a leap year. Instead of figuring out the last
-day of the month you can use an exclusive upper-bound.
-
-Find where sex is female and date is between (inclusive) "2011/01/01"
-and (exclusive) "2014/12/31".
-
-The lower bound is inclusive (by default) meaning it will only match a value
-that is equal or higher than "2011/01/01".
-
-The the upper-bound of the range is marked exclusive meaning it will only
-match values that are lower than "2015/01/01".
-
-.. code-block:: php
-
-    sex: female; date: 2011/01/01 ~ ]2015/01/01;
-
-And the same principle can be used for the lower-bound.
-
-.. code-block:: php
-
-    sex: female; date: [2012/12/31 ~ ]2015/01/01;
-
-The lower bound is now exclusive meaning it will only match a value that is higher
-than "2011/01/01".
-
-Implicit range with Comparisons
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Using ranges is just one method, it's also possible to use multiple comparisons,
-which is better known as an "implicit range". It has the same effect as a range,
-but is defined differently.
-
-.. caution::
-
-    Implicit ranges can't (currently) be optimized, so if you have a value
-    which is overlapping in a range this will not be optimized.
-
-    So avoid using implicit ranges whenever possible.
-
-Find where sex is female and date is higher than "2011/01/01"
-and lower than "2014/12/31".
-
-.. code-block:: php
-
-    sex: female; date: >2011/01/01, <2015/01/01;
-
-Subgroup range
-~~~~~~~~~~~~~~
-
-Using subgroups in this case is just an example, normally you would use
-one of the methods described above.
-
-Find where sex is female and subgroup 0 is matching, subgroup 0 matches
-when date is (inclusive) between "2011/01/01" and "2014/12/31".
-
-.. code-block:: php
-
-    sex: female; (date: 2011/01/01 ~ 2014/12/31)
-
-Search for users which either have admin access or are disabled
----------------------------------------------------------------
-
-In the previous section we only used conditions where all the fields
-must match. But what if we want to search with an *OR* condition?
-We want to search for users which either have admin access **or**
-are disabled.
-
-This is where we can use an OR'ed group. In an OR'ed group at least one
-field must match but the other fields are *optional*.
-
-Using condition:
-
-.. code-block:: php
-
-    * is_admin: t; enabled: f;
-
-Will give the following result.
-
-+----------+------------+--------------+-----------------+-----------+
-| id       | sex        | reg_date     | is_admin        | enabled   |
-+==========+============+==============+=================+===========+
-| 10       | male       | 2011-01-04   | t               | t         |
-+----------+------------+--------------+-----------------+-----------+
-| 20       | female     | 2011-01-04   | f               | f         |
-+----------+------------+--------------+-----------------+-----------+
-| 100      | female     | 2013-05-04   | f               | f         |
-+----------+------------+--------------+-----------------+-----------+
-| 500      | male       | 2015-03-04   | t               | f         |
-+----------+------------+--------------+-----------------+-----------+
-
-Lets analyze this result a bit further.
-
-The first row matches because the user is an admin, the user is enabled
-but we can ignore this because we already have a positive match.
-
-The second row matches, the user is not an admin but it's disabled,
-so the second field has a positive match.
-
-.. note::
-
-    The OR'ed symbol works only on groups, because the condition always
-    starts with a group the OR'ed symbol is only valid at the start of
-    a condition or subgroup. So the following is invalid: ``is_admin: t; * enabled: f;``
-
-    But this is valid: ``is_admin: t; *(enabled: f)`` and marks subgroup 0
-    as OR'ed.
-
-Search for users which either "have admin access and are disabled" or female
-----------------------------------------------------------------------------
-
-Using OR'ed subgroups is great if want at least one field to match and
-mark the rest as optional. But this will not work if you want all the fields
-to match, but not together.
-
-This is where subgroup (finally) come into play. Each subgroup can have
-it's own condition which is applied secondary to the parent-group and
-only fields within the subgroup will make it matching.
-
-Using condition:
-
-.. code-block:: php
-
-    (is_admin: t; enabled: f); (sex: female);
-
-.. note::
-
-    Subgroups are always OR'ed to each other, but at **least one must
-    match** for the group it's in! A group can be meant as the condition's root
-    (the root group) or a nested subgroup.
-
-Will give the following result.
-
-+----------+------------+--------------+-----------------+-----------+
-| id       | sex        | reg_date     | is_admin        | enabled   |
-+==========+============+==============+=================+===========+
-| 20       | female     | 2011-01-04   | f               | f         |
-+----------+------------+--------------+-----------------+-----------+
-| 100      | female     | 2013-05-04   | f               | f         |
-+----------+------------+--------------+-----------------+-----------+
-| 500      | male       | 2015-03-04   | t               | f         |
-+----------+------------+--------------+-----------------+-----------+
-
-Lets analyze this result a bit further.
-
-The first and second rows match because the user is a female, the second subgroup
-does not match but as subgroups are OR'ed this is not a problem.
-
-The last row matches because the first subgroup matches, the user is an admin and
-is disabled, the second subgroup does not match and therefor is ignored.
-
-.. caution::
-
-    Note that we used two subgroups, if we the placed either of the fields
-    in the root of the condition like ``sex: female; (is_admin: t; enabled: f)``.
-
-    We would have gotten a completely different result. The first subgroup must match
-    as subgroups are *only OR'ed to each other*.
-
-    So in practice using ``sex: female; (is_admin: t; enabled: f);``
-    is the same as using ``sex: female; is_admin: t; enabled: f;``
diff --git a/docs/serializer.rst b/docs/serializer.rst
deleted file mode 100644
index 3a118173..00000000
--- a/docs/serializer.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-SearchConditionSerializer
--------------------------
-
-The :class:`Rollerworks\\Component\\Search\\SearchConditionSerializer`
-class helps with (un)serializing a ``SearchCondition``.
-
-A SearchCondition holds a condition and a `FieldSet` configuration.
-
-The condition and it's values can be directly serialized, but the FieldSet is
-more difficult. As a Field can have closures and/or resource reference's, it's
-to complex to serialize.
-
-Instead of serializing the FieldSet the serializer stores the FieldSet set-name,
-and when unserializing it loads the FieldSet using a :class:`Rollerworks\\Component\\Search\\FieldSetRegistry`.
-
-.. note::
-
-    The Serializer doesn't check if the FieldSet is actually loadable
-    by the FieldSetRegistry. You must ensure the FieldSet is loadable,
-    else when unserializing you get an exception.
-
-.. caution::
-
-    Suffice to say, never store a serialized SearchCondition in the client-side!
-    The Serializer still uses the PHP serialize/unserialize functions, and due to
-    unpredictable values can't provide a list of trusted classes.
-
-    Use an Exporter to store a SearchCondition in an untrusted storage.
diff --git a/lib/ApiPlatform/.gitattributes b/lib/ApiPlatform/.gitattributes
deleted file mode 100644
index fbd8056d..00000000
--- a/lib/ApiPlatform/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-/Tests/ export-ignore
-/phpunit.xml.dist export-ignore
-.git* export-ignore
diff --git a/lib/ApiPlatform/.gitignore b/lib/ApiPlatform/.gitignore
deleted file mode 100644
index 207f97e0..00000000
--- a/lib/ApiPlatform/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/vendor/
-/composer.lock
-/phpunit.xml
diff --git a/lib/ApiPlatform/ArrayKeysValidator.php b/lib/ApiPlatform/ArrayKeysValidator.php
deleted file mode 100644
index 58af43db..00000000
--- a/lib/ApiPlatform/ArrayKeysValidator.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform;
-
-use ApiPlatform\Metadata\Exception\RuntimeException;
-
-final class ArrayKeysValidator
-{
-    public static function assertKeysExists(array $input, array $required, string $path): void
-    {
-        if ([] !== $missing = array_diff_key(array_flip($required), $input)) {
-            throw new RuntimeException(
-                \sprintf(
-                    'Config "%s" is missing "%s", got "%s".',
-                    $path,
-                    implode('", "', array_flip($missing)),
-                    implode('", "', array_keys($input))
-                )
-            );
-        }
-    }
-
-    public static function assertOnlyKeys(array $input, array $accepted, string $path): void
-    {
-        if (array_diff(array_keys($input), $accepted) !== []) {
-            throw new RuntimeException(
-                \sprintf(
-                    'Config "%s" accepts only "%s", got "%s".',
-                    $path,
-                    implode('", "', $accepted),
-                    implode('", "', array_keys($input))
-                )
-            );
-        }
-    }
-}
diff --git a/lib/ApiPlatform/Doctrine/Orm/Extension/SearchExtension.php b/lib/ApiPlatform/Doctrine/Orm/Extension/SearchExtension.php
deleted file mode 100644
index 5dec7626..00000000
--- a/lib/ApiPlatform/Doctrine/Orm/Extension/SearchExtension.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Doctrine\Orm\Extension;
-
-use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface;
-use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface;
-use ApiPlatform\Metadata\Exception\RuntimeException;
-use ApiPlatform\Metadata\Operation;
-use Doctrine\ORM\QueryBuilder;
-use Rollerworks\Component\Search\ApiPlatform\ArrayKeysValidator;
-use Rollerworks\Component\Search\Doctrine\Orm\ConditionGenerator;
-use Rollerworks\Component\Search\Doctrine\Orm\DoctrineOrmFactory;
-use Rollerworks\Component\Search\SearchCondition;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-/**
- * Applies the RollerworksSearch SearchCondition on a resource query.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class SearchExtension implements QueryCollectionExtensionInterface
-{
-    public function __construct(
-        private readonly RequestStack $requestStack,
-        private readonly DoctrineOrmFactory $ormFactory,
-    ) {
-    }
-
-    public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
-    {
-        $request = $this->requestStack->getCurrentRequest();
-
-        if (! $request) {
-            return;
-        }
-
-        /** @var SearchCondition|null $condition */
-        $condition = $request->attributes->get('_api_search_condition');
-
-        if ($condition === null) {
-            return;
-        }
-
-        $searchContext = $request->attributes->get('_api_search_context');
-        $configuration = $request->attributes->get('_api_search_config');
-        $configPath = "{$resourceClass}#attributes[rollerworks_search][contexts][{$searchContext}][doctrine_orm]";
-
-        if (empty($configuration['doctrine_orm'])) {
-            return;
-        }
-
-        $configuration = $configuration['doctrine_orm'];
-        ArrayKeysValidator::assertOnlyKeys($configuration, ['relations', 'mappings'], $configPath);
-        $this->configureRelations($configPath, $configuration, $queryBuilder);
-
-        $conditionGenerator = $this->ormFactory->createCachedConditionGenerator($queryBuilder, $condition);
-
-        $this->configureMappings($resourceClass, $configuration, $configPath, $conditionGenerator);
-        $conditionGenerator->apply();
-    }
-
-    private function configureRelations(string $configPath, array $configuration, QueryBuilder $queryBuilder): void
-    {
-        if (empty($configuration['relations'])) {
-            return;
-        }
-
-        $configPath .= '[relations]';
-
-        if (isset($configuration['relations']['o'])) {
-            throw new RuntimeException(\sprintf('Invalid configuration for "%s", relation name "o" is already used for the root.', $configPath));
-        }
-
-        foreach ($configuration['relations'] as $alias => $config) {
-            $path = "{$configPath}[{$alias}]";
-
-            ArrayKeysValidator::assertOnlyKeys($config, ['join', 'entity', 'type', 'conditionType', 'condition', 'index'], $path);
-            ArrayKeysValidator::assertKeysExists($config, ['join', 'entity'], $path);
-
-            if (! method_exists($queryBuilder, ($config['type'] ??= 'left') . 'Join')) {
-                throw new RuntimeException(\sprintf('Invalid value for "%s", type "%s" is not supported. Use left, right or inner.', $path . '[type]', $config['type']));
-            }
-
-            $queryBuilder->{$config['type'] . 'Join'}(
-                $config['join'],
-                $alias,
-                $config['conditionType'] ?? null,
-                $config['condition'] ?? null,
-                $config['index'] ?? null
-            );
-        }
-    }
-
-    private function configureMappings(string $resourceClass, array $configuration, string $configPath, ConditionGenerator $conditionGenerator): void
-    {
-        $configuration['relations']['o']['entity'] = $resourceClass;
-
-        foreach ($configuration['mappings'] as $mappingName => $mapping) {
-            if (! \is_array($mapping)) {
-                $mapping = [
-                    'alias' => 'o',
-                    'property' => $mapping,
-                ];
-            }
-
-            if (empty($mapping['alias'])) {
-                $mapping['alias'] = 'o';
-            }
-
-            $path = "{$configPath}[mappings][{$mappingName}]";
-            ArrayKeysValidator::assertOnlyKeys($mapping, ['property', 'alias', 'type'], $path);
-            ArrayKeysValidator::assertKeysExists($mapping, ['property'], $path);
-
-            if (! isset($configuration['relations'][$mapping['alias']])) {
-                throw new RuntimeException(\sprintf('Invalid value for "%s", alias "%s" is not registered in the "relations".', $path . '[alias]', $mapping['alias']));
-            }
-
-            $conditionGenerator->setField(
-                $mappingName,
-                $mapping['property'],
-                $mapping['alias'],
-                $configuration['relations'][$mapping['alias']]['entity'],
-                $mapping['type'] ?? null
-            );
-        }
-    }
-}
diff --git a/lib/ApiPlatform/Elasticsearch/Extension/SearchExtension.php b/lib/ApiPlatform/Elasticsearch/Extension/SearchExtension.php
deleted file mode 100644
index bb72b2c8..00000000
--- a/lib/ApiPlatform/Elasticsearch/Extension/SearchExtension.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Elasticsearch\Extension;
-
-use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface;
-use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface;
-use ApiPlatform\Metadata\Operation;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\Persistence\ManagerRegistry;
-use Elastica\Client;
-use Elastica\Document;
-use Elastica\Search;
-use Rollerworks\Component\Search\ApiPlatform\ArrayKeysValidator;
-use Rollerworks\Component\Search\Elasticsearch\ElasticsearchFactory;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\SearchCondition;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-/**
- * Class SearchExtension.
- */
-class SearchExtension implements QueryCollectionExtensionInterface
-{
-    /** @var array<string, string[]> */
-    private array $identifierNames = [];
-
-    public function __construct(
-        private readonly RequestStack $requestStack,
-        private readonly ManagerRegistry $registry,
-        private readonly ElasticsearchFactory $elasticsearchFactory,
-        private readonly Client $client,
-    ) {
-    }
-
-    public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
-    {
-        $request = $this->requestStack->getCurrentRequest();
-
-        /** @var SearchCondition|null $condition */
-        $condition = $request->attributes->get('_api_search_condition');
-
-        if ($condition === null) {
-            return;
-        }
-
-        $searchContext = $request->attributes->get('_api_search_context');
-        $configuration = $request->attributes->get('_api_search_config');
-        $configPath = "{$resourceClass}#attributes[rollerworks_search][contexts][{$searchContext}][elasticsearch]";
-
-        if (empty($configuration['elasticsearch'])) {
-            return;
-        }
-
-        $configuration = (array) $configuration['elasticsearch'];
-        ArrayKeysValidator::assertOnlyKeys($configuration, ['mappings', 'identifiers_normalizer'], $configPath);
-
-        // this snippet looks weird, factory should create the proper instance on its own
-        $conditionGenerator = $this->elasticsearchFactory->createCachedConditionGenerator(
-            $this->elasticsearchFactory->createConditionGenerator($condition)
-        );
-
-        foreach ($configuration['mappings'] as $fieldName => $mapping) {
-            $conditions = [];
-
-            if (\is_array($mapping)) {
-                ArrayKeysValidator::assertOnlyKeys($mapping, ['property', 'conditions', 'options'], $configPath . '[' . $fieldName . ']');
-                ArrayKeysValidator::assertKeysExists($mapping, ['property'], $configPath . '[' . $fieldName . ']');
-
-                $conditionMappings = $mapping['conditions'] ?? [];
-
-                foreach ($conditionMappings as $idx => $conditionMapping) {
-                    ArrayKeysValidator::assertOnlyKeys($conditionMapping, ['property', 'value'], $configPath . '[' . $fieldName . '][conditions][' . $idx . ']');
-
-                    $conditions[$conditionMapping['property']] = $conditionMapping['value'];
-                }
-                $mapping = $mapping['property'];
-            }
-
-            $conditionGenerator->registerField($fieldName, $mapping, $conditions, $mapping['options'] ?? []);
-        }
-
-        $normalizer = null;
-
-        if (\array_key_exists('identifiers_normalizer', $configuration)) {
-            $normalizer = $configuration['identifiers_normalizer'];
-
-            if (! \is_callable($normalizer)) {
-                throw new BadMethodCallException('Parameter "identifiers_normalizer" must be a valid callable.');
-            }
-        }
-
-        $query = $conditionGenerator->getQuery();
-
-        // move limit/offset from QueryBuilder to Elasticsearch query
-        $firstResult = ($queryBuilder->getFirstResult() ?: 1);
-
-        if ($firstResult !== 1) {
-            $query->setFrom($firstResult);
-            $queryBuilder->setFirstResult(null);
-        }
-
-        $maxResults = $queryBuilder->getMaxResults();
-
-        if ($maxResults !== null) {
-            $query->setSize($maxResults);
-            $queryBuilder->setMaxResults(null);
-        }
-
-        $search = new Search($this->client);
-        $mappings = $conditionGenerator->getMappings();
-
-        foreach ($mappings as $mapping) {
-            $index = $this->client->getIndex($mapping->indexName);
-            $search->addIndex($index);
-        }
-
-        $response = $search->search($query);
-
-        // NOTE: written like this so we only check if we have a normalizer once
-        if ($normalizer !== null) {
-            $callable = static fn (Document $document) => $normalizer($document->getId());
-        } else {
-            $callable = static fn (Document $document): ?string => $document->getId();
-        }
-        $ids = array_map($callable, $response->getDocuments());
-
-        // straight from FOS Elastica Bundle
-        $rootAlias = $queryBuilder->getRootAliases()[0];
-        $identifier = $this->getIdentifierNames($resourceClass);
-
-        // TODO: hack, only works for non-composite PKs
-        $identifier = current($identifier);
-        $queryBuilder
-            ->andWhere(
-                $queryBuilder
-                    ->expr()
-                        ->in($rootAlias . '.' . $identifier, ':ids')
-            )
-            ->setParameter('ids', $ids)
-        ;
-
-        $this->generateOrderByClause($queryBuilder, $rootAlias . '.' . $identifier, $ids);
-    }
-
-    private function getIdentifierNames(string $class): array
-    {
-        if (! \array_key_exists($class, $this->identifierNames)) {
-            $manager = $this->registry->getManagerForClass($class);
-            $metadata = $manager->getClassMetadata($class);
-
-            $this->identifierNames[$class] = $metadata->getIdentifier();
-        }
-
-        return $this->identifierNames[$class];
-    }
-
-    private function generateOrderByClause(QueryBuilder $queryBuilder, string $identifier, array $ids): void
-    {
-        if ($ids === []) {
-            return;
-        }
-
-        $clause = ['CASE'];
-        $last = 0;
-
-        foreach ($ids as $idx => $id) {
-            $alias = \sprintf('id%1$s', $idx);
-            $queryBuilder->setParameter($alias, $id);
-            $clause[] = \sprintf('WHEN %1$s = :%2$s THEN %3$d', $identifier, $alias, $idx);
-            ++$last;
-        }
-        $clause[] = \sprintf('ELSE %1$d', $last);
-        $clause[] = 'END';
-        $clause[] = 'AS HIDDEN order_by';
-
-        $queryBuilder
-            ->addSelect(implode(' ', $clause))
-            ->orderBy('order_by', 'ASC')
-        ;
-    }
-}
diff --git a/lib/ApiPlatform/EventListener/SearchConditionListener.php b/lib/ApiPlatform/EventListener/SearchConditionListener.php
deleted file mode 100644
index 61065141..00000000
--- a/lib/ApiPlatform/EventListener/SearchConditionListener.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\EventListener;
-
-use ApiPlatform\Metadata\Exception\RuntimeException;
-use ApiPlatform\Metadata\HttpOperation;
-use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
-use Psr\SimpleCache\CacheInterface;
-use Rollerworks\Component\Search\ApiPlatform\Exception\InvalidConditionException;
-use Rollerworks\Component\Search\ApiPlatform\SearchConditionEvent;
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
-use Rollerworks\Component\Search\Input\CachingInputProcessor;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\Loader\InputProcessorLoader;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchFactory;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\RequestEvent;
-
-/**
- * SearchConditionListener handles search conditions provided with the Request query.
- *
- * The condition is expected to be provided as an JsonInput or NormStringQuery format at `search`.
- * After this the Request attribute `_api_search_condition` is set with SearchCondition object.
- *
- * Note: Processing Exceptions are not handled by this listener, but handled by the Exception
- * Listener of the ApiPlatform.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class SearchConditionListener
-{
-    public function __construct(
-        private readonly SearchFactory $searchFactory,
-        private readonly InputProcessorLoader $inputProcessorLoader,
-        private readonly ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory,
-        private readonly EventDispatcherInterface $eventDispatcher,
-        private readonly ?CacheInterface $cache = null,
-    ) {
-    }
-
-    /**
-     * Listener callback.
-     *
-     * This listener is expected to be run after the Api EntryPoint but before ReadListener
-     * on the kernel.request event.
-     */
-    public function onKernelRequest(RequestEvent $event): void
-    {
-        $request = $event->getRequest();
-        $operation = $this->initializeOperation($request);
-
-        if ($operation === null || ! $request->isMethodCacheable() || ! ($operation->canRead() ?? true)) {
-            return;
-        }
-
-        $resourceClass = $operation->getClass();
-        $extraProperties = $operation->getExtraProperties();
-        $searchConfig = $extraProperties['rollerworks_search'] ?? [];
-
-        if (empty($searchConfig)) {
-            return;
-        }
-
-        $searchConfig = $this->resolveSearchConfiguration($searchConfig, $resourceClass, $request);
-
-        $config = new ProcessorConfig($this->searchFactory->createFieldSet($searchConfig['fieldset']));
-        $this->configureProcessor($config, $searchConfig, $resourceClass);
-
-        $condition = $this->getCondition($request, $config);
-
-        $conditionEvent = new SearchConditionEvent($condition, $resourceClass, $request);
-
-        // First Dispatch a specific event to for this resource-class and then a generic one for ease of listening.
-        // Note. If propagation is stopped for specific listener the generic listener is ignored.
-        $this->eventDispatcher->dispatch($conditionEvent, SearchConditionEvent::SEARCH_CONDITION_EVENT . $resourceClass);
-        $this->eventDispatcher->dispatch($conditionEvent, SearchConditionEvent::SEARCH_CONDITION_EVENT);
-
-        $request->attributes->set('_api_search_condition', $condition);
-    }
-
-    private function initializeOperation(Request $request): ?HttpOperation
-    {
-        if ($request->attributes->get('_api_operation')) {
-            return $request->attributes->get('_api_operation');
-        }
-
-        if ($request->attributes->get('_api_resource_class') === null) {
-            return null;
-        }
-
-        $operationName = $request->attributes->get('_api_operation_name');
-        /** @var HttpOperation $operation */
-        $operation = $this->resourceMetadataCollectionFactory->create($request->attributes->get('_api_resource_class'))->getOperation($operationName);
-        $request->attributes->set('_api_operation', $operation);
-
-        return $operation;
-    }
-
-    private function resolveSearchConfiguration(array $searchConfig, string $resourceClass, Request $request): array
-    {
-        if (empty($searchConfig['contexts'])) {
-            throw new RuntimeException(
-                \sprintf(
-                    'Resource "%s" is missing a contexts array. Add a "contexts" array with at least one entry.',
-                    $resourceClass . '#attributes[rollerworks_search]'
-                )
-            );
-        }
-
-        $context = $request->attributes->get('_api_search_context', '_any');
-
-        if (! isset($searchConfig['contexts'][$context])) {
-            throw new RuntimeException(
-                \sprintf(
-                    'Search context "%s" is not supported for Resource "%s", supported: "%s".',
-                    $context,
-                    $resourceClass . '#attributes[rollerworks_search][contexts]',
-                    implode('", "', array_keys($searchConfig['contexts']))
-                )
-            );
-        }
-
-        if (empty($searchConfig['contexts'][$context]) || empty($searchConfig['contexts'][$context]['fieldset'])) {
-            throw new RuntimeException(
-                \sprintf(
-                    'Search context "%s" is incorrectly configured for Resource "%s", missing a "fieldset" reference.',
-                    $context,
-                    $resourceClass . '#attributes[rollerworks_search]'
-                )
-            );
-        }
-
-        $request->attributes->set('_api_search_context', $context);
-        $request->attributes->set('_api_search_config', $searchConfig['contexts'][$context]);
-
-        return $searchConfig['contexts'][$context];
-    }
-
-    private function configureProcessor(ProcessorConfig $config, array $options, string $resourceClass): void
-    {
-        if (empty($options['processor'])) {
-            return;
-        }
-
-        foreach ($options['processor'] as $option => $value) {
-            $method = 'set' . ucfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $option))));
-
-            if (! method_exists($config, $method)) {
-                throw new RuntimeException(\sprintf('Processor option "%s" is not supported for Resource "%s".', $option, $resourceClass));
-            }
-
-            if (\is_scalar($value) && ctype_digit((string) $value)) {
-                $value = (int) $value;
-            }
-
-            $config->{$method}($value);
-        }
-    }
-
-    private function getCondition(Request $request, ProcessorConfig $config): SearchCondition
-    {
-        $input = $request->query->get('search', '');
-
-        if (! \is_string($input)) {
-            throw new UnexpectedTypeException($input, 'string');
-        }
-
-        $format = ($input[0] ?? 'n') === '{' ? 'json' : 'norm_string_query';
-
-        $inputProcessor = $this->inputProcessorLoader->get($format);
-
-        if ($this->cache !== null && ($ttl = $config->getCacheTTL()) !== null) {
-            $inputProcessor = new CachingInputProcessor(
-                $this->cache,
-                $this->searchFactory->getSerializer(),
-                $inputProcessor,
-                $ttl
-            );
-        }
-
-        try {
-            return $inputProcessor->process($config, $input);
-        } catch (InvalidSearchConditionException $e) {
-            $error = $e->getErrors();
-
-            if (\is_array($error)) {
-                $error = new ErrorList($error);
-            }
-
-            throw new InvalidConditionException($error, 0, $e);
-        }
-    }
-}
diff --git a/lib/ApiPlatform/Exception/InvalidConditionException.php b/lib/ApiPlatform/Exception/InvalidConditionException.php
deleted file mode 100644
index 40a5deb6..00000000
--- a/lib/ApiPlatform/Exception/InvalidConditionException.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Exception;
-
-use ApiPlatform\JsonSchema\SchemaFactory;
-use ApiPlatform\Metadata\ApiProperty;
-use ApiPlatform\Metadata\Error as Operation;
-use ApiPlatform\Metadata\ErrorResource;
-use ApiPlatform\Metadata\Exception\HttpExceptionInterface;
-use ApiPlatform\Metadata\Exception\ProblemExceptionInterface;
-use ApiPlatform\Metadata\Exception\RuntimeException;
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\ErrorList;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface as SymfonyHttpExceptionInterface;
-use Symfony\Component\Serializer\Attribute\Groups;
-use Symfony\Component\Serializer\Attribute\SerializedName;
-use Symfony\Component\WebLink\Link;
-
-#[ErrorResource(
-    shortName: 'SearchViolation',
-    description: 'Unprocessable condition',
-    operations: [
-        new Operation(
-            outputFormats: ['jsonld' => ['application/problem+json', 'application/ld+json']],
-            links: [new Link(rel: 'http://www.w3.org/ns/json-ld#error', href: 'http://www.w3.org/ns/hydra/error')],
-            errors: [],
-            normalizationContext: [
-                SchemaFactory::OPENAPI_DEFINITION_NAME => '',
-                'groups' => ['jsonld'],
-                'skip_null_values' => true,
-                'ignored_attributes' => ['trace', 'file', 'line', 'code', 'message', 'traceAsString', 'previous'],
-            ],
-            name: '_api_errors_hydra',
-        ),
-    ],
-    outputFormats: [
-        'json' => ['application/problem+json', 'application/json'],
-    ],
-    status: Response::HTTP_BAD_REQUEST,
-    openapi: false,
-    graphQlOperations: []
-)]
-#[ApiProperty(property: 'traceAsString', hydra: false)]
-#[ApiProperty(property: 'string', hydra: false)]
-class InvalidConditionException extends RuntimeException implements ProblemExceptionInterface, HttpExceptionInterface, SymfonyHttpExceptionInterface
-{
-    private int $status = 422;
-
-    /** @var ConditionErrorMessage[] */
-    private readonly array $errors;
-
-    #[Groups(['jsonld', 'json', 'jsonapi'])]
-    #[ApiProperty(writable: false, initializable: false)]
-    private readonly string $detail;
-
-    public function __construct(ErrorList $error, int $code = 0, ?\Throwable $previous = null)
-    {
-        $this->errors = $error->getArrayCopy();
-
-        parent::__construct($messages = $this->__toString(), $code, $previous);
-        $this->detail = $messages;
-    }
-
-    #[Groups(['jsonld'])]
-    #[ApiProperty(writable: false, initializable: false)]
-    public function getDescription(): string
-    {
-        return $this->detail;
-    }
-
-    #[Groups(['jsonld', 'json', 'jsonapi'])]
-    #[ApiProperty(writable: false, initializable: false)]
-    public function getType(): string
-    {
-        return 'https://tools.ietf.org/html/rfc2616#section-10';
-    }
-
-    #[Groups(['jsonld', 'json', 'jsonapi'])]
-    #[ApiProperty(writable: false, initializable: false)]
-    public function getTitle(): ?string
-    {
-        return 'The search condition is invalid';
-    }
-
-    #[Groups(['jsonld', 'json', 'jsonapi'])]
-    #[ApiProperty(writable: false, initializable: false)]
-    public function getDetail(): ?string
-    {
-        return $this->detail;
-    }
-
-    #[Groups(['jsonld', 'json', 'jsonapi'])]
-    public function getStatus(): ?int
-    {
-        return $this->status;
-    }
-
-    public function setStatus(int $status): void
-    {
-        $this->status = $status;
-    }
-
-    public function getInstance(): ?string
-    {
-        return null;
-    }
-
-    #[SerializedName('violations')] // XXX Rename to errors in v3.0
-    #[Groups(['json', 'jsonld'])]
-    #[ApiProperty(
-        jsonldContext: ['@type' => 'SearchViolationList'],
-        schema: [
-            'type' => 'array',
-            'items' => [
-                'type' => 'object',
-                'properties' => [
-                    'propertyPath' => ['type' => 'string', 'description' => 'The path of the error'],
-                    'message' => ['type' => 'string', 'description' => 'The message associated with the error'],
-                ],
-            ],
-        ]
-    )]
-    public function getSearchViolationList(): array
-    {
-        return $this->errors;
-    }
-
-    public function __toString(): string
-    {
-        $message = '';
-
-        foreach ($this->errors as $error) {
-            if ($error->path !== '') {
-                $message .= "{$error->path}: ";
-            }
-
-            $message .= $error->message;
-        }
-
-        return $message;
-    }
-
-    public function getStatusCode(): int
-    {
-        return $this->status;
-    }
-
-    public function getHeaders(): array
-    {
-        return [];
-    }
-}
diff --git a/lib/ApiPlatform/LICENSE b/lib/ApiPlatform/LICENSE
deleted file mode 100644
index c6b65a9a..00000000
--- a/lib/ApiPlatform/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2017-present Sebastiaan Stok
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/lib/ApiPlatform/Metadata-reference.md b/lib/ApiPlatform/Metadata-reference.md
deleted file mode 100644
index b8229dea..00000000
--- a/lib/ApiPlatform/Metadata-reference.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Class:
-
-```php
- "rollerworks_search" = {
-    "contexts" = {
-        "_defaults" {
-            # Set defaults, merged with more specific configuration (and _any)
-        },
-        "ContextName | _any" = { # ContextName is provided using event listeners (request#attributes[_search_context])
-            "fieldset" = "...", # Required
-            "processor" = {
-                "cache_ttl" = "60" # time in seconds
-            }, # Options for the processor
-            "doctrine_orm" = {
-                "relations" = {
-                    "alias" = { "type" = "(left | right | inner)", "entity" "join", "conditionType" = null, "condition" = null, "indexBy" = null }
-                },
-                "mappings" = {
-                    "mapping-name" = { "property" = "...", "alias" = "...", "db_type" = null }
-                },
-            },
-        }
-    }
-}
-```
diff --git a/lib/ApiPlatform/Metadata/DefaultConfigurationMetadataFactory.php b/lib/ApiPlatform/Metadata/DefaultConfigurationMetadataFactory.php
deleted file mode 100644
index 91129134..00000000
--- a/lib/ApiPlatform/Metadata/DefaultConfigurationMetadataFactory.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Metadata;
-
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\Operation;
-use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
-use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
-
-/**
- * The DefaultConfigurationMetadataFactory merges the `_defaults` configuration
- * of the `rollerworks_search` resource attribute to all configs.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class DefaultConfigurationMetadataFactory implements ResourceMetadataCollectionFactoryInterface
-{
-    public function __construct(
-        private readonly ResourceMetadataCollectionFactoryInterface $decorated,
-    ) {
-    }
-
-    public function create(string $resourceClass): ResourceMetadataCollection
-    {
-        $resourceMetadataCollection = $this->decorated->create($resourceClass);
-
-        /** @var ApiResource $resourceMetadata */
-        foreach ($resourceMetadataCollection as $i => $resourceMetadata) {
-            $operations = $resourceMetadata->getOperations();
-
-            if ($operations === null) {
-                continue;
-            }
-
-            /** @var Operation $operation */
-            foreach ($resourceMetadata->getOperations() as $operationName => $operation) {
-                $extraProperties = $operation->getExtraProperties();
-
-                if (isset($extraProperties['rollerworks_search']['contexts']['_defaults'])) {
-                    $extraProperties['rollerworks_search'] = $this->mergeSearchContexts($extraProperties['rollerworks_search']);
-                    $operations->add($operationName, $operation->withExtraProperties($extraProperties));
-                }
-            }
-
-            $resourceMetadataCollection[$i] = $resourceMetadata->withOperations($operations);
-        }
-
-        return $resourceMetadataCollection;
-    }
-
-    private function mergeSearchContexts(array $searchConfig): array
-    {
-        $defaults = $searchConfig['contexts']['_defaults'];
-        unset($searchConfig['contexts']['_defaults']);
-
-        foreach ($searchConfig['contexts'] as $name => $configuration) {
-            $searchConfig['contexts'][$name] = array_replace_recursive($defaults, $configuration);
-        }
-
-        return $searchConfig;
-    }
-}
diff --git a/lib/ApiPlatform/README.md b/lib/ApiPlatform/README.md
deleted file mode 100644
index 09b509e2..00000000
--- a/lib/ApiPlatform/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-RollerworksSearch API-Platform Bridge
-=====================================
-
-[API-Platform](https://github.com/api-platform) integration bridge for [RollerworksSearch][1].
-
-If you'd like to contribute to this project, please go the
-main [RollerworksSearch][1] repository and read the [Contributing][2] section.
-
-Installation
-------------
-
-To install this extension, add the `search-api-platform` to your composer.json
-
-```bash
-$ php composer.phar require rollerworks/search-api-platform
-```
-
-License
--------
-
-The source of this package is subject to the MIT license that is bundled
-with this source code in the file [LICENSE](LICENSE).
-
-[1]: https://github.com/rollerworks/RollerworksSearch
-[2]: https://github.com/rollerworks/RollerworksSearch#contributing
diff --git a/lib/ApiPlatform/SearchConditionEvent.php b/lib/ApiPlatform/SearchConditionEvent.php
deleted file mode 100644
index 985bc927..00000000
--- a/lib/ApiPlatform/SearchConditionEvent.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform;
-
-use Rollerworks\Component\Search\SearchCondition;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Contracts\EventDispatcher\Event;
-
-/**
- * The SearchConditionEvent allows to set a primary-condition.
- *
- * Call getSearchCondition()->setPrimaryCondition() to set a primary-condition.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class SearchConditionEvent extends Event
-{
-    /** @Event */
-    public const SEARCH_CONDITION_EVENT = 'rollerworks_search.process.primary_condition';
-
-    public function __construct(
-        private readonly ?SearchCondition $searchCondition,
-        private readonly string $resourceClass,
-        private readonly Request $request,
-    ) {
-    }
-
-    public function getSearchCondition(): ?SearchCondition
-    {
-        return $this->searchCondition;
-    }
-
-    public function getResourceClass(): string
-    {
-        return $this->resourceClass;
-    }
-
-    public function getRequest(): Request
-    {
-        return $this->request;
-    }
-}
diff --git a/lib/ApiPlatform/Serializer/ConditionErrorMessageNormalizer.php b/lib/ApiPlatform/Serializer/ConditionErrorMessageNormalizer.php
deleted file mode 100644
index 51aa0597..00000000
--- a/lib/ApiPlatform/Serializer/ConditionErrorMessageNormalizer.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Serializer;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-
-final class ConditionErrorMessageNormalizer implements NormalizerInterface
-{
-    /**
-     * @param ConditionErrorMessage $data
-     *
-     * @return array{propertyPath: string, message: string}
-     */
-    public function normalize(mixed $data, ?string $format = null, array $context = []): array
-    {
-        return [
-            'propertyPath' => $data->path,
-            'message' => $data->message,
-        ];
-    }
-
-    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
-    {
-        return \in_array($format, ['json', 'jsonproblem', 'jsonld'], true) && $data instanceof ConditionErrorMessage;
-    }
-
-    public function getSupportedTypes(?string $format): array
-    {
-        if (\in_array($format, ['json', 'jsonproblem', 'jsonld'], true)) {
-            return [
-                ConditionErrorMessage::class => true,
-            ];
-        }
-
-        return [];
-    }
-}
diff --git a/lib/ApiPlatform/Serializer/InvalidSearchConditionNormalizer.php b/lib/ApiPlatform/Serializer/InvalidSearchConditionNormalizer.php
deleted file mode 100644
index 55edd22b..00000000
--- a/lib/ApiPlatform/Serializer/InvalidSearchConditionNormalizer.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Serializer;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Validator\ConstraintViolation;
-use Symfony\Component\Validator\ConstraintViolationList;
-use Symfony\Component\Validator\ConstraintViolationListInterface;
-
-/**
- * Converts {@see InvalidSearchConditionException} to a Hydra error representation.
- *
- * @deprecated use the {@see ConditionErrorMessageNormalizer} with the
- *             {@see \Rollerworks\Component\Search\ApiPlatform\Exception\InvalidConditionException}
- *             as resource handle instead
- */
-final class InvalidSearchConditionNormalizer implements NormalizerInterface
-{
-    /**
-     * @param string[]|null $serializePayloadFields
-     */
-    public function __construct(
-        private readonly ?array $serializePayloadFields = null,
-        private readonly ?NameConverterInterface $nameConverter = null,
-    ) {
-    }
-
-    /**
-     * @return array{type: string, title: string, detail: string, violations: array<array{propertyPath: string, message: string, payload?: array<string, mixed>}>}
-     */
-    public function normalize(mixed $data, ?string $format = null, array $context = []): array
-    {
-        $list = new ConstraintViolationList();
-
-        /** @var ConditionErrorMessage $message */
-        foreach ($data->getErrors() as $message) {
-            $violation = new ConstraintViolation(
-                $message->message,
-                $message->messageTemplate,
-                $message->messageParameters,
-                null, // root
-                $message->path,
-                null, // invalidValue
-                $message->messagePluralization,
-                null, // code
-                null, // constraint
-                $message->cause
-            );
-            $list->add($violation);
-        }
-
-        [$messages, $violations] = $this->getMessagesAndViolations($list);
-
-        return [
-            'type' => $context['type'] ?? 'https://tools.ietf.org/html/rfc2616#section-10',
-            'title' => $context['title'] ?? 'An error occurred',
-            'detail' => $messages ? implode("\n", $messages) : (string) $data,
-            'violations' => $violations,
-        ];
-    }
-
-    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
-    {
-        return ($format === 'json' || $format === 'jsonproblem') && $data instanceof InvalidSearchConditionException;
-    }
-
-    /**
-     * @author Kévin Dunglas <dunglas@gmail.com>
-     *
-     * @see https://github.com/api-platform/core
-     */
-    private function getMessagesAndViolations(ConstraintViolationListInterface $constraintViolationList): array
-    {
-        $violations = $messages = [];
-
-        foreach ($constraintViolationList as $violation) {
-            $violationData = [
-                'propertyPath' => $this->nameConverter ? $this->nameConverter->normalize($violation->getPropertyPath()) : $violation->getPropertyPath(),
-                'message' => $violation->getMessage(),
-            ];
-
-            $constraint = $violation->getConstraint();
-
-            if ($this->serializePayloadFields && $constraint && $constraint->payload) {
-                // If some fields are whitelisted, only them are added
-                $payloadFields = $this->serializePayloadFields === null ? $constraint->payload : array_intersect_key($constraint->payload, array_flip($this->serializePayloadFields));
-                $payloadFields && $violationData['payload'] = $payloadFields;
-            }
-
-            $violations[] = $violationData;
-            $messages[] = ($violationData['propertyPath'] ? "{$violationData['propertyPath']}: " : '') . $violationData['message'];
-        }
-
-        return [$messages, $violations];
-    }
-
-    public function getSupportedTypes(?string $format): array
-    {
-        if ($format === 'json' || $format === 'jsonproblem') {
-            return [
-                InvalidSearchConditionException::class => true,
-            ];
-        }
-
-        return [];
-    }
-}
diff --git a/lib/ApiPlatform/Tests/Doctrine/Orm/Extension/SearchExtensionTest.php b/lib/ApiPlatform/Tests/Doctrine/Orm/Extension/SearchExtensionTest.php
deleted file mode 100644
index a02b760d..00000000
--- a/lib/ApiPlatform/Tests/Doctrine/Orm/Extension/SearchExtensionTest.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\Doctrine\Orm\Extension;
-
-use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator;
-use ApiPlatform\Metadata\Exception\RuntimeException;
-use ApiPlatform\Metadata\Get;
-use Doctrine\ORM\QueryBuilder;
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Rollerworks\Component\Search\ApiPlatform\Doctrine\Orm\Extension\SearchExtension;
-use Rollerworks\Component\Search\ApiPlatform\Tests\Fixtures\Dummy;
-use Rollerworks\Component\Search\ApiPlatform\Tests\Fixtures\DummyRelatedDummy;
-use Rollerworks\Component\Search\Doctrine\Orm\CachedDqlConditionGenerator;
-use Rollerworks\Component\Search\Doctrine\Orm\DoctrineOrmFactory;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-/**
- * @internal
- */
-final class SearchExtensionTest extends TestCase
-{
-    use ProphecyTrait;
-
-    /**
-     * @test
-     */
-    public function apply_to_collection_with_valid_condition(): void
-    {
-        $searchCondition = $this->createCondition();
-
-        $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
-        $queryBuilder = $queryBuilderProphecy->reveal();
-
-        $cachedConditionGeneratorProphecy = $this->prophesize(CachedDqlConditionGenerator::class);
-        $cachedConditionGeneratorProphecy->setField('dummy-id', 'id', 'o', Dummy::class, null)->shouldBeCalled();
-        $cachedConditionGeneratorProphecy->setField('dummy-name', 'name', 'o', Dummy::class, null)->shouldBeCalled();
-        $cachedConditionGeneratorProphecy->apply()->shouldBeCalled();
-
-        $ormFactoryProphecy = $this->prophesize(DoctrineOrmFactory::class);
-        $ormFactoryProphecy->createCachedConditionGenerator($queryBuilder, $searchCondition)->willReturn($cachedConditionGeneratorProphecy->reveal());
-
-        $request = new Request([], [], [
-            '_api_search_condition' => $searchCondition,
-            '_api_search_context' => 'dummy',
-            '_api_search_config' => [
-                'doctrine_orm' => [
-                    'mappings' => [
-                        'dummy-id' => 'id',
-                        'dummy-name' => ['property' => 'name'],
-                    ],
-                ],
-            ],
-        ]);
-
-        $requestStack = new RequestStack();
-        $requestStack->push($request);
-
-        $orderExtensionTest = new SearchExtension($requestStack, $ormFactoryProphecy->reveal());
-        $orderExtensionTest->applyToCollection($queryBuilder, new QueryNameGenerator(), Dummy::class, new Get(name: 'get'));
-    }
-
-    /**
-     * @test
-     */
-    public function apply_to_collection_with_relations(): void
-    {
-        $searchCondition = $this->createCondition();
-
-        $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
-        $queryBuilderProphecy->leftJoin('o.relatedToDummyFriend', 'r', null, null, null)->willReturn($queryBuilderProphecy)->shouldBeCalled();
-        $queryBuilderProphecy->leftJoin('o.thirdLevel', 't', 'WITH', 't.id = o.id', 'o.id')->willReturn($queryBuilderProphecy)->shouldBeCalled();
-        $queryBuilder = $queryBuilderProphecy->reveal();
-
-        $cachedConditionGeneratorProphecy = $this->prophesize(CachedDqlConditionGenerator::class);
-        $cachedConditionGeneratorProphecy->setField('dummy-id', 'id', 'o', DummyRelatedDummy::class, null)->shouldBeCalled();
-        $cachedConditionGeneratorProphecy->setField('dummy-name', 'name', 'o', DummyRelatedDummy::class, null)->shouldBeCalled();
-        $cachedConditionGeneratorProphecy->setField('fiend-name', 'name', 'r', DummyRelatedDummy::class, null)->shouldBeCalled();
-        $cachedConditionGeneratorProphecy->setField('level', 'level', 't', 'ThirdLevel', 'integer')->shouldBeCalled();
-
-        $cachedConditionGeneratorProphecy->apply()->shouldBeCalled();
-
-        $ormFactoryProphecy = $this->prophesize(DoctrineOrmFactory::class);
-        $ormFactoryProphecy->createCachedConditionGenerator($queryBuilder, $searchCondition)->willReturn($cachedConditionGeneratorProphecy->reveal());
-
-        $request = new Request([], [], [
-            '_api_search_condition' => $searchCondition,
-            '_api_search_context' => 'dummy',
-            '_api_search_config' => [
-                'doctrine_orm' => [
-                    'mappings' => [
-                        'dummy-id' => 'id',
-                        'dummy-name' => 'name',
-                        'fiend-name' => ['property' => 'name', 'alias' => 'r'],
-                        'level' => ['property' => 'level', 'alias' => 't', 'type' => 'integer'],
-                    ],
-                    'relations' => [
-                        'r' => ['join' => 'o.relatedToDummyFriend', 'entity' => DummyRelatedDummy::class],
-                        't' => [
-                            'join' => 'o.thirdLevel',
-                            'entity' => 'ThirdLevel',
-                            'conditionType' => 'WITH',
-                            'condition' => 't.id = o.id',
-                            'index' => 'o.id',
-                        ],
-                    ],
-                ],
-            ],
-        ]);
-
-        $requestStack = new RequestStack();
-        $requestStack->push($request);
-
-        $orderExtensionTest = new SearchExtension($requestStack, $ormFactoryProphecy->reveal());
-        $orderExtensionTest->applyToCollection($queryBuilder, new QueryNameGenerator(), DummyRelatedDummy::class, new Get(name: 'get'));
-    }
-
-    /**
-     * @dataProvider provideInvalidConfigurations
-     *
-     * @test
-     */
-    public function apply_to_collection_gives_exception_when_config_is_in_valid(string $message, array $config): void
-    {
-        $searchCondition = $this->createCondition();
-
-        $queryBuilder = $this->createMock(QueryBuilder::class);
-        $cachedConditionGeneratorProphecy = $this->prophesize(CachedDqlConditionGenerator::class);
-
-        $ormFactoryProphecy = $this->prophesize(DoctrineOrmFactory::class);
-        $ormFactoryProphecy->createCachedConditionGenerator($queryBuilder, $searchCondition)->willReturn($cachedConditionGeneratorProphecy->reveal());
-
-        $request = new Request([], [], [
-            '_api_search_condition' => $searchCondition,
-            '_api_search_context' => 'dummy',
-            '_api_search_config' => ['doctrine_orm' => $config],
-        ]);
-
-        $requestStack = new RequestStack();
-        $requestStack->push($request);
-
-        $orderExtensionTest = new SearchExtension($requestStack, $ormFactoryProphecy->reveal());
-
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage($message);
-
-        $orderExtensionTest->applyToCollection($queryBuilder, new QueryNameGenerator(), DummyRelatedDummy::class, new Get(name: 'get'));
-    }
-
-    public static function provideInvalidConfigurations(): iterable
-    {
-        $resourceClass = DummyRelatedDummy::class;
-
-        return [
-            [
-                'Config "' . $resourceClass . '#attributes[rollerworks_search][contexts][dummy][doctrine_orm][relations][r]" is missing "entity", got "join".',
-                [
-                    'mappings' => [
-                        'dummy-id' => 'id',
-                    ],
-                    'relations' => [
-                        'r' => ['join' => 'o.relatedToDummyFriend'],
-                    ],
-                ],
-            ],
-            [
-                'Config "' . $resourceClass . '#attributes[rollerworks_search][contexts][dummy][doctrine_orm][mappings][fiend-name]" accepts only "property", "alias", "type", got "field", "alias".',
-                [
-                    'mappings' => [
-                        'dummy-id' => 'id',
-                        'fiend-name' => ['field' => 'name', 'alias' => 'r'],
-                    ],
-                ],
-            ],
-            [
-                'Config "' . $resourceClass . '#attributes[rollerworks_search][contexts][dummy][doctrine_orm][mappings][fiend-name]" is missing "property", got "alias".',
-                [
-                    'mappings' => [
-                        'dummy-id' => 'id',
-                        'fiend-name' => ['alias' => 'r'],
-                    ],
-                    'relations' => [
-                        'r' => ['join' => 'o.relatedToDummyFriend', 'entity' => DummyRelatedDummy::class],
-                    ],
-                ],
-            ],
-            [
-                'Invalid value for "' . $resourceClass . '#attributes[rollerworks_search][contexts][dummy][doctrine_orm][mappings][fiend-name][alias]", alias "r" is not registered in the "relations".',
-                [
-                    'mappings' => [
-                        'fiend-name' => ['property' => 'name', 'alias' => 'r'],
-                    ],
-                ],
-            ],
-            [
-                'Invalid configuration for "' . $resourceClass . '#attributes[rollerworks_search][contexts][dummy][doctrine_orm][relations]", relation name "o" is already used for the root.',
-                [
-                    'mappings' => [
-                        'dummy-id' => 'id',
-                        'fiend-name' => ['field' => 'name', 'alias' => 'r'],
-                    ],
-                    'relations' => [
-                        'o' => ['join' => 'o.relatedToDummyFriend'],
-                    ],
-                ],
-            ],
-            [
-                $resourceClass . '#attributes[rollerworks_search][contexts][dummy][doctrine_orm][relations][r][type]", type "outer" is not supported. Use left, right or inner.',
-                [
-                    'mappings' => [
-                        'dummy-id' => 'id',
-                        'fiend-name' => ['field' => 'name', 'alias' => 'r'],
-                    ],
-                    'relations' => [
-                        'r' => ['join' => 'o.relatedToDummyFriend', 'entity' => DummyRelatedDummy::class, 'type' => 'outer'],
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function apply_to_collection_without_condition(): void
-    {
-        $ormFactoryProphecy = $this->prophesize(DoctrineOrmFactory::class);
-        $ormFactoryProphecy->createCachedConditionGenerator(Argument::any(), Argument::any())->shouldNotBeCalled();
-
-        $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
-        $queryBuilder = $queryBuilderProphecy->reveal();
-
-        $request = new Request();
-        $requestStack = new RequestStack();
-        $requestStack->push($request);
-
-        $orderExtensionTest = new SearchExtension($requestStack, $ormFactoryProphecy->reveal());
-        $orderExtensionTest->applyToCollection($queryBuilder, new QueryNameGenerator(), Dummy::class, new Get(name: 'get'));
-    }
-
-    private function createCondition(?string $setName = 'dummy_fieldset'): SearchCondition
-    {
-        $fieldSet = $this->prophesize(FieldSet::class);
-        $fieldSet->getSetName()->willReturn($setName);
-
-        return new SearchCondition($fieldSet->reveal(), new ValuesGroup());
-    }
-}
diff --git a/lib/ApiPlatform/Tests/Elasticsearch/Extension/SearchExtensionTest.php b/lib/ApiPlatform/Tests/Elasticsearch/Extension/SearchExtensionTest.php
deleted file mode 100644
index 65585c0a..00000000
--- a/lib/ApiPlatform/Tests/Elasticsearch/Extension/SearchExtensionTest.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\Elasticsearch\Extension;
-
-use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator;
-use ApiPlatform\Metadata\Get;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Func;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\Persistence\ManagerRegistry;
-use Doctrine\Persistence\Mapping\ClassMetadata;
-use Doctrine\Persistence\ObjectManager;
-use Elastica\Client;
-use Elastica\Query;
-use Elastica\Response;
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Rollerworks\Component\Search\ApiPlatform\Elasticsearch\Extension\SearchExtension;
-use Rollerworks\Component\Search\ApiPlatform\Tests\Fixtures\Dummy;
-use Rollerworks\Component\Search\Elasticsearch\CachedConditionGenerator;
-use Rollerworks\Component\Search\Elasticsearch\ElasticsearchFactory;
-use Rollerworks\Component\Search\Elasticsearch\QueryConditionGenerator;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-/**
- * @internal
- */
-final class SearchExtensionTest extends TestCase
-{
-    use ProphecyTrait;
-
-    /**
-     * @test
-     */
-    public function apply_to_collection_with_valid_condition(): void
-    {
-        $query = new Query(['query' => ['bool' => ['must' => 'foo']]]);
-        $ids = [3, 1, 5];
-
-        $elasticaResponse = $this->createResponse($ids);
-        $searchCondition = $this->createCondition();
-
-        $queryFunctionProphecy = $this->prophesize(Func::class);
-        $queryFunction = $queryFunctionProphecy->reveal();
-
-        $queryExpressionProphecy = $this->prophesize(Expr::class);
-        $queryExpressionProphecy->in('o.id', ':ids')->willReturn($queryFunction);
-        $queryExpression = $queryExpressionProphecy->reveal();
-
-        $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
-        $queryBuilderProphecy->andWhere($queryFunction)->willReturn($queryBuilderProphecy);
-        $queryBuilderProphecy->expr()->willReturn($queryExpression);
-        $queryBuilderProphecy->setParameter('ids', $ids)->willReturn($queryBuilderProphecy)->shouldBeCalled();
-        $queryBuilderProphecy->getFirstResult()->willReturn(1)->shouldBeCalled();
-        $queryBuilderProphecy->getMaxResults()->willReturn(null)->shouldBeCalled();
-        $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
-        $queryBuilderProphecy->setParameter('id0', 3)->willReturn($queryBuilderProphecy)->shouldBeCalled();
-        $queryBuilderProphecy->setParameter('id1', 1)->willReturn($queryBuilderProphecy)->shouldBeCalled();
-        $queryBuilderProphecy->setParameter('id2', 5)->willReturn($queryBuilderProphecy)->shouldBeCalled();
-        $queryBuilderProphecy->addSelect('CASE WHEN o.id = :id0 THEN 0 WHEN o.id = :id1 THEN 1 WHEN o.id = :id2 THEN 2 ELSE 3 END AS HIDDEN order_by')->willReturn($queryBuilderProphecy);
-        $queryBuilderProphecy->orderBy('order_by', 'ASC')->willReturn($queryBuilderProphecy)->shouldBeCalled();
-        $queryBuilder = $queryBuilderProphecy->reveal();
-
-        $classMetadataProphecy = $this->prophesize(ClassMetadata::class);
-        $classMetadataProphecy->getIdentifier()->willReturn(['id']);
-        $classMetadata = $classMetadataProphecy->reveal();
-
-        $managerProphecy = $this->prophesize(ObjectManager::class);
-        $managerProphecy->getClassMetadata(Dummy::class)->willReturn($classMetadata);
-        $manager = $managerProphecy->reveal();
-
-        $managerRegistryProphecy = $this->prophesize(ManagerRegistry::class);
-        $managerRegistryProphecy->getManagerForClass(Dummy::class)->willReturn($manager);
-        $managerRegistry = $managerRegistryProphecy->reveal();
-
-        $elasticaClientProphecy = $this->prophesize(Client::class);
-        $elasticaClientProphecy->request('/_search', Argument::in(['POST', 'GET']), $query->toArray(), [])->willReturn($elasticaResponse)->shouldBeCalled();
-        $elasticaClient = $elasticaClientProphecy->reveal();
-
-        $conditionGeneratorProphecy = $this->prophesize(QueryConditionGenerator::class);
-        $conditionGenerator = $conditionGeneratorProphecy->reveal();
-
-        $cachedConditionGeneratorProphecy = $this->prophesize(CachedConditionGenerator::class);
-        $cachedConditionGeneratorProphecy->registerField('dummy-id', 'id', [], [])->shouldBeCalled();
-        $cachedConditionGeneratorProphecy->registerField('dummy-name', 'name', [], [])->shouldBeCalled();
-        $cachedConditionGeneratorProphecy->getQuery()->willReturn($query);
-        $cachedConditionGeneratorProphecy->getMappings()->shouldBeCalled();
-        $cachedConditionGenerator = $cachedConditionGeneratorProphecy->reveal();
-
-        $elasticsearchFactoryProphecy = $this->prophesize(ElasticsearchFactory::class);
-        $elasticsearchFactoryProphecy->createConditionGenerator($searchCondition)->willReturn($conditionGenerator);
-        $elasticsearchFactoryProphecy->createCachedConditionGenerator($conditionGenerator)->willReturn($cachedConditionGenerator);
-        $elasticsearchFactory = $elasticsearchFactoryProphecy->reveal();
-
-        $request = new Request([], [], [
-            '_api_search_condition' => $searchCondition,
-            '_api_search_context' => 'dummy',
-            '_api_search_config' => [
-                'elasticsearch' => [
-                    'mappings' => [
-                        'dummy-id' => 'id',
-                        'dummy-name' => 'name',
-                    ],
-                ],
-            ],
-        ]);
-
-        $requestStack = new RequestStack();
-        $requestStack->push($request);
-
-        $orderExtensionTest = new SearchExtension($requestStack, $managerRegistry, $elasticsearchFactory, $elasticaClient);
-        $orderExtensionTest->applyToCollection($queryBuilder, new QueryNameGenerator(), Dummy::class, new Get(name: 'get'));
-    }
-
-    private function createCondition(?string $setName = 'dummy_fieldset'): SearchCondition
-    {
-        $fieldSetProphecy = $this->prophesize(FieldSet::class);
-        $fieldSetProphecy->getSetName()->willReturn($setName);
-
-        return new SearchCondition($fieldSetProphecy->reveal(), new ValuesGroup());
-    }
-
-    private function createResponse($ids): Response
-    {
-        $response = [];
-
-        foreach ($ids as $id) {
-            $response['hits']['hits'][]['_id'] = $id;
-        }
-
-        return new Response($response);
-    }
-}
diff --git a/lib/ApiPlatform/Tests/EventListener/SearchConditionListenerTest.php b/lib/ApiPlatform/Tests/EventListener/SearchConditionListenerTest.php
deleted file mode 100644
index c2c15377..00000000
--- a/lib/ApiPlatform/Tests/EventListener/SearchConditionListenerTest.php
+++ /dev/null
@@ -1,496 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\EventListener;
-
-use ApiPlatform\Metadata\Exception\RuntimeException;
-use Prophecy\Argument;
-use Rollerworks\Component\Search\ApiPlatform\EventListener\SearchConditionListener;
-use Rollerworks\Component\Search\ApiPlatform\SearchConditionEvent;
-use Rollerworks\Component\Search\ApiPlatform\Tests\Fixtures\BookFieldSet;
-use Rollerworks\Component\Search\ApiPlatform\Tests\MetadataFactoryTrait;
-use Rollerworks\Component\Search\ApiPlatform\Tests\Mock\SpyingInputProcessor;
-use Rollerworks\Component\Search\ApiPlatform\Tests\Mock\StubInputProcessor;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\Loader\ClosureContainer;
-use Rollerworks\Component\Search\Loader\InputProcessorLoader;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Psr16Cache;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-
-/**
- * @internal
- */
-final class SearchConditionListenerTest extends SearchIntegrationTestCase
-{
-    use MetadataFactoryTrait;
-
-    /**
-     * @test
-     */
-    public function it_sets_search_condition_and_config_for_empty_query(): void
-    {
-        $httpKernel = $this->createMock(HttpKernelInterface::class);
-        $resourceMetadataFactory = $this->createResourceMetadataFactory();
-
-        $request = new Request([], [], ['_api_resource_class' => 'dummy', '_api_operation_name' => 'get_collection']);
-        $eventDispatcher = $this->expectingCallEventDispatcher($request);
-
-        $inputProcessor = new SpyingInputProcessor();
-        $listener = new SearchConditionListener(
-            $this->getFactory(),
-            $this->createProcessorLoader($inputProcessor, 'norm_string_query'),
-            $resourceMetadataFactory,
-            $eventDispatcher
-        );
-
-        $listener->onKernelRequest(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
-
-        $arr = [
-            '_api_resource_class' => 'dummy',
-            '_api_operation_name' => 'get_collection',
-            '_api_search_config' => ['fieldset' => BookFieldSet::class],
-            '_api_search_context' => '_any',
-            '_api_search_condition' => SpyingInputProcessor::getCondition(),
-        ];
-
-        self::assertOperationAttrEquals($arr, $request);
-        self::assertEquals('', $inputProcessor->getInput());
-
-        self::assertEquals(BookFieldSet::class, $inputProcessor->getConfig()->getFieldSet()->getSetName());
-    }
-
-    /**
-     * @test
-     */
-    public function it_sets_search_condition_and_config_for_json_query(): void
-    {
-        $httpKernel = $this->createMock(HttpKernelInterface::class);
-        $resourceMetadataFactory = $this->createResourceMetadataFactory();
-
-        $request = new Request(['search' => '{"fields:": ["foobar"]}'], [], ['_api_resource_class' => 'dummy', '_api_operation_name' => 'get_collection']);
-        $eventDispatcher = $this->expectingCallEventDispatcher($request);
-
-        $inputProcessor = new SpyingInputProcessor();
-        $listener = new SearchConditionListener(
-            $this->getFactory(),
-            $this->createProcessorLoader($inputProcessor, 'json'),
-            $resourceMetadataFactory,
-            $eventDispatcher
-        );
-
-        $listener->onKernelRequest(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
-
-        self::assertOperationAttrEquals(
-            [
-                '_api_resource_class' => 'dummy',
-                '_api_operation_name' => 'get_collection',
-                '_api_search_config' => ['fieldset' => BookFieldSet::class],
-                '_api_search_context' => '_any',
-                '_api_search_condition' => SpyingInputProcessor::getCondition(),
-            ],
-            $request
-        );
-        self::assertEquals('{"fields:": ["foobar"]}', $inputProcessor->getInput());
-
-        $config = $inputProcessor->getConfig();
-        self::assertEquals(BookFieldSet::class, $config->getFieldSet()->getSetName());
-    }
-
-    /**
-     * @test
-     */
-    public function it_sets_search_condition_and_config_for_context(): void
-    {
-        $httpKernel = $this->createMock(HttpKernelInterface::class);
-        $resourceMetadataFactory = $this->createResourceMetadataFactory([
-            'rollerworks_search' => [
-                'contexts' => [
-                    '_any' => [
-                        'fieldset' => 'book',
-                    ],
-                    'frontend' => [
-                        'fieldset' => BookFieldSet::class,
-                    ],
-                ],
-            ],
-        ]);
-
-        $request = new Request([], [], ['_api_resource_class' => 'dummy', '_api_search_context' => 'frontend', '_api_operation_name' => 'get_collection']);
-        $eventDispatcher = $this->expectingCallEventDispatcher($request);
-
-        $inputProcessor = new SpyingInputProcessor();
-        $listener = new SearchConditionListener(
-            $this->getFactory(),
-            $this->createProcessorLoader($inputProcessor, 'norm_string_query'),
-            $resourceMetadataFactory,
-            $eventDispatcher
-        );
-
-        $listener->onKernelRequest(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
-
-        self::assertOperationAttrEquals(
-            [
-                '_api_resource_class' => 'dummy',
-                '_api_operation_name' => 'get_collection',
-                '_api_search_config' => ['fieldset' => BookFieldSet::class],
-                '_api_search_context' => 'frontend',
-                '_api_search_condition' => SpyingInputProcessor::getCondition(),
-            ],
-            $request
-        );
-        self::assertEquals('', $inputProcessor->getInput());
-
-        $config = $inputProcessor->getConfig();
-        self::assertEquals(BookFieldSet::class, $config->getFieldSet()->getSetName());
-    }
-
-    /**
-     * @test
-     */
-    public function it_does_nothing_when_no_metadata_is_set(): void
-    {
-        $httpKernel = $this->createMock(HttpKernelInterface::class);
-        $resourceMetadataFactory = $this->createResourceMetadataFactory([]);
-
-        $eventDispatcher = $this->expectingNoCallEventDispatcher();
-        $listener = new SearchConditionListener(
-            $this->getFactory(),
-            $this->createProcessorLoader(new StubInputProcessor(), 'noop'),
-            $resourceMetadataFactory,
-            $eventDispatcher
-        );
-
-        $request = new Request([], [], ['_api_resource_class' => 'dummy', '_api_operation_name' => 'get_collection']);
-        $listener->onKernelRequest(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
-
-        self::assertOperationAttrEquals(['_api_resource_class' => 'dummy', '_api_operation_name' => 'get_collection'], $request);
-    }
-
-    /**
-     * @test
-     */
-    public function it_does_nothing_not_cacheable_requests(): void
-    {
-        $httpKernel = $this->createMock(HttpKernelInterface::class);
-
-        $resourceMetadataFactory = $this->createResourceMetadataFactory([]);
-
-        $request = new Request([], [], ['_api_resource_class' => 'dummy', '_api_operation_name' => 'get_collection']);
-        $request->setMethod('POST');
-
-        $eventDispatcher = $this->expectingNoCallEventDispatcher();
-        $listener = new SearchConditionListener(
-            $this->getFactory(),
-            $this->createProcessorLoader(new StubInputProcessor(), 'noop'),
-            $resourceMetadataFactory,
-            $eventDispatcher
-        );
-
-        $listener->onKernelRequest(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
-
-        self::assertOperationAttrEquals([
-            '_api_resource_class' => 'dummy',
-            '_api_operation_name' => 'get_collection',
-        ], $request);
-    }
-
-    /**
-     * @test
-     */
-    public function it_maps_configuration_processor_configuration(): void
-    {
-        $httpKernel = $this->createMock(HttpKernelInterface::class);
-        $resourceMetadataFactory = $this->createResourceMetadataFactory([
-            'rollerworks_search' => [
-                'contexts' => [
-                    '_any' => [
-                        'fieldset' => BookFieldSet::class,
-                        'processor' => [
-                            'cache_ttl' => 30,
-                        ],
-                    ],
-                ],
-            ],
-        ]);
-
-        $request = new Request([], [], ['_api_resource_class' => 'dummy', '_api_operation_name' => 'get_collection']);
-        $eventDispatcher = $this->expectingCallEventDispatcher($request);
-
-        $inputProcessor = new SpyingInputProcessor();
-        $listener = new SearchConditionListener(
-            $this->getFactory(),
-            $this->createProcessorLoader($inputProcessor, 'norm_string_query'),
-            $resourceMetadataFactory,
-            $eventDispatcher
-        );
-
-        $listener->onKernelRequest(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
-
-        self::assertOperationAttrEquals(
-            [
-                '_api_resource_class' => 'dummy',
-                '_api_operation_name' => 'get_collection',
-                '_api_search_config' => [
-                    'fieldset' => BookFieldSet::class,
-                    'processor' => ['cache_ttl' => 30],
-                ],
-                '_api_search_context' => '_any',
-                '_api_search_condition' => SpyingInputProcessor::getCondition(),
-            ],
-            $request
-        );
-
-        $config = $inputProcessor->getConfig();
-        self::assertEquals(BookFieldSet::class, $config->getFieldSet()->getSetName());
-        self::assertEquals(30, $config->getCacheTTL());
-    }
-
-    /**
-     * @test
-     */
-    public function it_stores_cached_result_when_configured(): void
-    {
-        $httpKernel = $this->createMock(HttpKernelInterface::class);
-        $resourceMetadataFactory = $this->createResourceMetadataFactory([
-            'rollerworks_search' => [
-                'contexts' => [
-                    '_any' => [
-                        'fieldset' => BookFieldSet::class,
-                        'processor' => [
-                            'cache_ttl' => 30,
-                        ],
-                    ],
-                ],
-            ],
-        ]);
-
-        $request = new Request([], [], ['_api_resource_class' => 'dummy', '_api_operation_name' => 'get_collection']);
-        $eventDispatcher = $this->expectingCallEventDispatcher($request);
-
-        $inputProcessor = new SpyingInputProcessor();
-        $listener = new SearchConditionListener(
-            $this->getFactory(),
-            $this->createProcessorLoader($inputProcessor, 'norm_string_query'),
-            $resourceMetadataFactory,
-            $eventDispatcher,
-            new Psr16Cache($arrayCache = new ArrayAdapter())
-        );
-
-        $listener->onKernelRequest(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
-
-        self::assertOperationAttrEquals([
-            '_api_resource_class' => 'dummy',
-            '_api_operation_name' => 'get_collection',
-            '_api_search_config' => [
-                'fieldset' => BookFieldSet::class,
-                'processor' => ['cache_ttl' => 30],
-            ],
-            '_api_search_context' => '_any',
-            '_api_search_condition' => SpyingInputProcessor::getCondition(),
-        ], $request);
-        self::assertCount(1, $arrayCache->getValues());
-
-        $config = $inputProcessor->getConfig();
-        self::assertEquals(BookFieldSet::class, $config->getFieldSet()->getSetName());
-        self::assertEquals(30, $config->getCacheTTL());
-    }
-
-    /**
-     * @test
-     */
-    public function it_does_not_store_cached_result_when_ttl_is_not_configured(): void
-    {
-        $httpKernel = $this->createMock(HttpKernelInterface::class);
-        $resourceMetadataFactory = $this->createResourceMetadataFactory([
-            'rollerworks_search' => [
-                'contexts' => [
-                    '_any' => [
-                        'fieldset' => BookFieldSet::class,
-                    ],
-                ],
-            ],
-        ]);
-
-        $request = new Request([], [], ['_api_resource_class' => 'dummy', '_api_operation_name' => 'get_collection']);
-        $eventDispatcher = $this->expectingCallEventDispatcher($request);
-
-        $inputProcessor = new SpyingInputProcessor();
-        $listener = new SearchConditionListener(
-            $this->getFactory(),
-            $this->createProcessorLoader($inputProcessor, 'norm_string_query'),
-            $resourceMetadataFactory,
-            $eventDispatcher,
-            $cache = new Psr16Cache($arrayCache = new ArrayAdapter())
-        );
-
-        $listener->onKernelRequest($event = new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
-
-        self::assertOperationAttrEquals(
-            [
-                '_api_resource_class' => 'dummy',
-                '_api_operation_name' => 'get_collection',
-                '_api_search_config' => [
-                    'fieldset' => BookFieldSet::class,
-                ],
-                '_api_search_context' => '_any',
-                '_api_search_condition' => SpyingInputProcessor::getCondition(),
-            ],
-            $request
-        );
-        self::assertCount(0, $arrayCache->getValues());
-
-        $config = $inputProcessor->getConfig();
-        self::assertEquals(BookFieldSet::class, $config->getFieldSet()->getSetName());
-        self::assertNull($config->getCacheTTL());
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideIt_errors_when_context_configuration_is_invalidCases
-     */
-    public function it_errors_when_context_configuration_is_invalid(string $message, array $config): void
-    {
-        $httpKernel = $this->createMock(HttpKernelInterface::class);
-        $resourceMetadataFactory = $this->createResourceMetadataFactory($config);
-
-        $request = new Request(
-            ['search' => ['fields' => ['id' => ['single-values' => [1, 1]]]]],
-            [],
-            ['_api_resource_class' => 'dummy', '_api_operation_name' => 'get_collection']
-        );
-
-        $eventDispatcher = $this->expectingNoCallEventDispatcher();
-        $listener = new SearchConditionListener(
-            $this->getFactory(),
-            $this->createProcessorLoader(new StubInputProcessor(), 'noop'),
-            $resourceMetadataFactory,
-            $eventDispatcher
-        );
-
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage($message);
-
-        $listener->onKernelRequest($event = new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
-    }
-
-    public static function provideIt_errors_when_context_configuration_is_invalidCases(): iterable
-    {
-        $resourceClass = 'dummy';
-
-        return [
-            'context with missing fieldset' => [
-                'Search context "_any" is incorrectly configured for Resource "' . $resourceClass . '#attributes[rollerworks_search]", missing a "fieldset" reference.',
-                [
-                    'rollerworks_search' => [
-                        'contexts' => [
-                            '_any' => [
-                                'processor' => ['cache_ttl' => '30'],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            'unsupported processor option' => [
-                'Processor option "foo" is not supported for Resource "' . $resourceClass . '".',
-                [
-                    'rollerworks_search' => [
-                        'contexts' => [
-                            '_any' => [
-                                'fieldset' => BookFieldSet::class,
-                                'processor' => ['cache_ttl' => '30', 'foo' => 'bar'],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            'unregistered context' => [
-                'Search context "_any" is not supported for Resource "' . $resourceClass . '#attributes[rollerworks_search][contexts]", supported: "foo", "bar".',
-                [
-                    'rollerworks_search' => [
-                        'contexts' => [
-                            'foo' => [
-                                'fieldset' => BookFieldSet::class,
-                                'processor' => ['cache_ttl' => '30', 'foo' => 'bar'],
-                            ],
-                            'bar' => [
-                                'fieldset' => BookFieldSet::class,
-                                'processor' => ['cache_ttl' => '30', 'foo' => 'bar'],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            'contexts' => [
-                'Resource "' . $resourceClass . '#attributes[rollerworks_search]" is missing a contexts array. Add a "contexts" array with at least one entry.',
-                [
-                    'rollerworks_search' => [
-                        '_contexts' => [
-                            'foo' => [
-                                'fieldset' => BookFieldSet::class,
-                                'processor' => ['cache_ttl' => '30', 'foo' => 'bar'],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    private function expectingCallEventDispatcher(Request $request, string $resourceClass = 'dummy'): EventDispatcherInterface
-    {
-        $event = new SearchConditionEvent(SpyingInputProcessor::getCondition(), $resourceClass, $request);
-
-        $eventDispatcherProphecy = $this->prophesize(EventDispatcherInterface::class);
-        $eventDispatcherProphecy->dispatch($event, SearchConditionEvent::SEARCH_CONDITION_EVENT)->willReturnArgument()->shouldBeCalled();
-        $eventDispatcherProphecy->dispatch($event, SearchConditionEvent::SEARCH_CONDITION_EVENT . $resourceClass)->willReturnArgument()->shouldBeCalled();
-
-        return $eventDispatcherProphecy->reveal();
-    }
-
-    private function expectingNoCallEventDispatcher(string $resourceClass = 'dummy'): EventDispatcherInterface
-    {
-        $eventDispatcherProphecy = $this->prophesize(EventDispatcherInterface::class);
-        $eventDispatcherProphecy->dispatch(Argument::any(), SearchConditionEvent::SEARCH_CONDITION_EVENT)->willReturnArgument()->shouldNotBeCalled();
-        $eventDispatcherProphecy->dispatch(Argument::any(), SearchConditionEvent::SEARCH_CONDITION_EVENT . $resourceClass)->willReturnArgument()->shouldNotBeCalled();
-
-        return $eventDispatcherProphecy->reveal();
-    }
-
-    private function createProcessorLoader(InputProcessor $inputProcessor, string $name): InputProcessorLoader
-    {
-        return new InputProcessorLoader(
-            new ClosureContainer(
-                [
-                    $name => static fn (): InputProcessor => $inputProcessor,
-                ]
-            ),
-            [$name => $name]
-        );
-    }
-
-    private static function assertOperationAttrEquals(array $attributes, Request $request): void
-    {
-        $requestAttributes = $request->attributes->all();
-
-        // This object graph is to big for comparison and is considered an internal detail
-        unset($attributes['_api_operation'], $requestAttributes['_api_operation']);
-
-        self::assertEquals($attributes, $requestAttributes);
-    }
-}
diff --git a/lib/ApiPlatform/Tests/Fixtures/BookFieldSet.php b/lib/ApiPlatform/Tests/Fixtures/BookFieldSet.php
deleted file mode 100644
index aac1e2cf..00000000
--- a/lib/ApiPlatform/Tests/Fixtures/BookFieldSet.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\Fixtures;
-
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\FieldSetBuilder;
-use Rollerworks\Component\Search\FieldSetConfigurator;
-
-final class BookFieldSet implements FieldSetConfigurator
-{
-    public function buildFieldSet(FieldSetBuilder $builder): void
-    {
-        $builder->add('id', IntegerType::class);
-        $builder->add('title', TextType::class);
-    }
-}
diff --git a/lib/ApiPlatform/Tests/Fixtures/Dummy.php b/lib/ApiPlatform/Tests/Fixtures/Dummy.php
deleted file mode 100644
index 3eac8e16..00000000
--- a/lib/ApiPlatform/Tests/Fixtures/Dummy.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\Fixtures;
-
-use ApiPlatform\Metadata\ApiResource;
-
-/**
- * @internal
- */
-#[ApiResource(filters: ['my_dummy.search', 'my_dummy.order', 'my_dummy.date', 'my_dummy.range', 'my_dummy.boolean', 'my_dummy.numeric'])]
-class Dummy
-{
-}
diff --git a/lib/ApiPlatform/Tests/Fixtures/DummyRelatedDummy.php b/lib/ApiPlatform/Tests/Fixtures/DummyRelatedDummy.php
deleted file mode 100644
index f06a4cc4..00000000
--- a/lib/ApiPlatform/Tests/Fixtures/DummyRelatedDummy.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\Fixtures;
-
-/**
- * @internal
- */
-final class DummyRelatedDummy
-{
-}
diff --git a/lib/ApiPlatform/Tests/InvalidSearchConditionNormalizerTest.php b/lib/ApiPlatform/Tests/InvalidSearchConditionNormalizerTest.php
deleted file mode 100644
index 1d282c25..00000000
--- a/lib/ApiPlatform/Tests/InvalidSearchConditionNormalizerTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\ApiPlatform\Serializer\InvalidSearchConditionNormalizer;
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * @internal
- */
-final class InvalidSearchConditionNormalizerTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function support_normalization(): void
-    {
-        $normalizer = new InvalidSearchConditionNormalizer();
-
-        self::assertTrue($normalizer->supportsNormalization(new InvalidSearchConditionException([]), 'jsonproblem'));
-        self::assertFalse($normalizer->supportsNormalization(new InvalidSearchConditionException([]), 'xml'));
-        self::assertFalse($normalizer->supportsNormalization(new \stdClass(), 'jsonproblem'));
-    }
-
-    /**
-     * @test
-     */
-    public function normalize(): void
-    {
-        $normalizer = new InvalidSearchConditionNormalizer();
-
-        $list = new InvalidSearchConditionException([
-            new ConditionErrorMessage('a', 'b'),
-            new ConditionErrorMessage('', '2'),
-        ]);
-
-        $expected = [
-            'type' => 'https://tools.ietf.org/html/rfc2616#section-10',
-            'title' => 'An error occurred',
-            'detail' => "a: b\n2",
-            'violations' => [
-                [
-                    'propertyPath' => 'a',
-                    'message' => 'b',
-                ],
-                [
-                    'propertyPath' => '',
-                    'message' => '2',
-                ],
-            ],
-        ];
-        self::assertEquals($expected, $normalizer->normalize($list));
-    }
-}
diff --git a/lib/ApiPlatform/Tests/Metadata/DefaultConfigurationMetadataFactoryTest.php b/lib/ApiPlatform/Tests/Metadata/DefaultConfigurationMetadataFactoryTest.php
deleted file mode 100644
index 1f58c865..00000000
--- a/lib/ApiPlatform/Tests/Metadata/DefaultConfigurationMetadataFactoryTest.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\Metadata;
-
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\ApiPlatform\Metadata\DefaultConfigurationMetadataFactory;
-use Rollerworks\Component\Search\ApiPlatform\Tests\MetadataFactoryTrait;
-
-/**
- * @internal
- */
-final class DefaultConfigurationMetadataFactoryTest extends TestCase
-{
-    use MetadataFactoryTrait;
-
-    /**
-     * @test
-     */
-    public function it_merges_defaults_into_all_configs(): void
-    {
-        $decorated = $this->createResourceMetadataFactory([
-            'rollerworks_search' => [
-                'contexts' => [
-                    '_defaults' => [
-                        'processor' => [
-                            'cache_ttl' => 60,
-                            'export_format' => 'json',
-                        ],
-                        'doctrine_orm' => [
-                            'mappings' => [
-                                'dummy-id' => 'id',
-                                'dummy-name' => ['property' => 'name'],
-                            ],
-                        ],
-                    ],
-                    'foo' => [
-                        'processor' => [
-                            'export_format' => 'array',
-                        ],
-                        'doctrine_orm' => [
-                            'mappings' => [
-                                'dummy-name' => ['property' => 'userName'],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ]);
-
-        $factory = new DefaultConfigurationMetadataFactory($decorated);
-
-        $resourceMetadata = $this->getMetadataCollection([
-            'rollerworks_search' => [
-                'contexts' => [
-                    'foo' => [
-                        'processor' => [
-                            'cache_ttl' => 60,
-                            'export_format' => 'array',
-                        ],
-                        'doctrine_orm' => [
-                            'mappings' => [
-                                'dummy-id' => 'id',
-                                'dummy-name' => ['property' => 'userName'],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ]);
-
-        self::assertEquals($resourceMetadata, $factory->create('dummy'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_without_updating_when_no_defaults_were_set(): void
-    {
-        $resourceMetadata = $this->getMetadataCollection([
-            'rollerworks_search' => [
-                'contexts' => [
-                    'foo' => [
-                        'processor' => [
-                            'export_format' => 'array',
-                        ],
-                        'doctrine_orm' => [
-                            'mappings' => [
-                                'dummy-name' => ['property' => 'userName'],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ]);
-
-        $decorated = $this->createResourceMetadataFactory($resourceMetadata, 'Foo');
-
-        $factory = new DefaultConfigurationMetadataFactory($decorated);
-
-        self::assertSame($resourceMetadata, $factory->create('Foo'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_without_updating_when_no_search_config_was_set(): void
-    {
-        $resourceMetadata = $this->getMetadataCollection([]);
-
-        $decorated = $this->createResourceMetadataFactory($resourceMetadata, 'Foo');
-        $factory = new DefaultConfigurationMetadataFactory($decorated);
-
-        self::assertSame($resourceMetadata, $factory->create('Foo'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_when_no_operations_were_set(): void
-    {
-        $resourceMetadata = new ResourceMetadataCollection('Foo', [new ApiResource()]);
-
-        $decorated = $this->createResourceMetadataFactory($resourceMetadata, 'Foo');
-        $factory = new DefaultConfigurationMetadataFactory($decorated);
-
-        self::assertSame($resourceMetadata, $factory->create('Foo'));
-    }
-}
diff --git a/lib/ApiPlatform/Tests/MetadataFactoryTrait.php b/lib/ApiPlatform/Tests/MetadataFactoryTrait.php
deleted file mode 100644
index 5d80a746..00000000
--- a/lib/ApiPlatform/Tests/MetadataFactoryTrait.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests;
-
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\Get;
-use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
-use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Rollerworks\Component\Search\ApiPlatform\Tests\Fixtures\BookFieldSet;
-
-/**
- * @internal
- */
-trait MetadataFactoryTrait
-{
-    use ProphecyTrait;
-
-    private function createResourceMetadataFactory(array | ResourceMetadataCollection | null $metadata = null, string $resourceClass = 'dummy'): ResourceMetadataCollectionFactoryInterface
-    {
-        if (\is_array($metadata)) {
-            $metadata = $this->getMetadataCollection($metadata, $resourceClass);
-        }
-
-        $metadata ??= $this->getMetadataCollection([
-            'rollerworks_search' => [
-                'contexts' => [
-                    '_any' => [
-                        'fieldset' => BookFieldSet::class,
-                    ],
-                ],
-            ],
-        ], $resourceClass);
-
-        $resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataCollectionFactoryInterface::class);
-        $resourceMetadataFactoryProphecy->create($resourceClass)->willReturn($metadata);
-
-        return $resourceMetadataFactoryProphecy->reveal();
-    }
-
-    private function getMetadataCollection(array $extraProperties, string $resourceClass = 'dummy'): ResourceMetadataCollection
-    {
-        return new ResourceMetadataCollection($resourceClass, [
-            new ApiResource(operations: [
-                'get' => new Get(class: $resourceClass, name: 'get'),
-                'get_collection' => (new GetCollection(class: $resourceClass, name: 'get_collection'))->withExtraProperties($extraProperties),
-            ]),
-        ]);
-    }
-}
diff --git a/lib/ApiPlatform/Tests/Mock/EmptyInputProcessorStub.php b/lib/ApiPlatform/Tests/Mock/EmptyInputProcessorStub.php
deleted file mode 100644
index 07f327af..00000000
--- a/lib/ApiPlatform/Tests/Mock/EmptyInputProcessorStub.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\Mock;
-
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-final class EmptyInputProcessorStub implements InputProcessor
-{
-    public function process(ProcessorConfig $config, $input): SearchCondition
-    {
-        $valuesGroup = new ValuesGroup();
-
-        return new SearchCondition(new FieldSetStub(), $valuesGroup);
-    }
-}
diff --git a/lib/ApiPlatform/Tests/Mock/FieldSetStub.php b/lib/ApiPlatform/Tests/Mock/FieldSetStub.php
deleted file mode 100644
index 71588193..00000000
--- a/lib/ApiPlatform/Tests/Mock/FieldSetStub.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\Mock;
-
-use Rollerworks\Component\Search\ApiPlatform\Tests\Fixtures\BookFieldSet;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\FieldSet;
-
-final class FieldSetStub implements FieldSet
-{
-    public function getSetName(): string
-    {
-        return BookFieldSet::class;
-    }
-
-    public function get(string $name): FieldConfig
-    {
-        throw new \BadMethodCallException('Cannot be called');
-    }
-
-    public function all(): array
-    {
-        return [];
-    }
-
-    public function has(string $name): bool
-    {
-        return false;
-    }
-
-    public function isOrder(string $name): bool
-    {
-        return OrderField::isOrder($name);
-    }
-
-    public function isPrivate(string $name): bool
-    {
-        return $name[0] === '_';
-    }
-}
diff --git a/lib/ApiPlatform/Tests/Mock/SpyingInputProcessor.php b/lib/ApiPlatform/Tests/Mock/SpyingInputProcessor.php
deleted file mode 100644
index 83112e3c..00000000
--- a/lib/ApiPlatform/Tests/Mock/SpyingInputProcessor.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\Mock;
-
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-final class SpyingInputProcessor implements InputProcessor
-{
-    private ?ProcessorConfig $config = null;
-    private mixed $input;
-
-    public static function getCondition(): SearchCondition
-    {
-        $valuesGroup = new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR);
-        $valuesGroup->addField('id', (new ValuesBag())->addSimpleValue('1'));
-
-        return new SearchCondition(new FieldSetStub(), $valuesGroup);
-    }
-
-    public function process(ProcessorConfig $config, mixed $input): SearchCondition
-    {
-        $this->config = $config;
-        $this->input = $input;
-
-        return self::getCondition();
-    }
-
-    public function getConfig(): ?ProcessorConfig
-    {
-        return $this->config;
-    }
-
-    public function getInput()
-    {
-        return $this->input;
-    }
-}
diff --git a/lib/ApiPlatform/Tests/Mock/StubInputProcessor.php b/lib/ApiPlatform/Tests/Mock/StubInputProcessor.php
deleted file mode 100644
index 9e692587..00000000
--- a/lib/ApiPlatform/Tests/Mock/StubInputProcessor.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\ApiPlatform\Tests\Mock;
-
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-final class StubInputProcessor implements InputProcessor
-{
-    public function process(ProcessorConfig $config, $input): SearchCondition
-    {
-        $valuesGroup = new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR);
-        $valuesGroup->addField('id', (new ValuesBag())->addSimpleValue('2'));
-
-        return new SearchCondition(new FieldSetStub(), $valuesGroup);
-    }
-}
diff --git a/lib/ApiPlatform/composer.json b/lib/ApiPlatform/composer.json
deleted file mode 100644
index 7a3e6843..00000000
--- a/lib/ApiPlatform/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "rollerworks/search-api-platform",
-    "description": "API-Platform integration bridge for RollerworksSearch",
-    "license": "MIT",
-    "type": "library",
-    "authors": [
-        {
-            "name": "Sebastiaan Stok",
-            "email": "s.stok@rollerscapes.net"
-        }
-    ],
-    "require": {
-        "php": "^8.1",
-        "api-platform/core": "^4.2",
-        "rollerworks/search": "^2.0",
-        "symfony/http-foundation": "^6.4 || ^7.4 || ^8.0"
-    },
-    "require-dev": {
-        "doctrine/orm": "^2.7.3 || ^3.3",
-        "phpunit/phpunit": "^10.5",
-        "rollerworks/search-doctrine-orm": ">=2.0.0-BETA2 ^2.0@dev",
-        "symfony/phpunit-bridge": "^6.4 || ^7.4 || ^8.0"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "autoload": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\ApiPlatform\\": ""
-        },
-        "exclude-from-classmap": [
-            "Tests/"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\ApiPlatform\\Tests\\": "Tests/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.0-dev"
-        }
-    }
-}
diff --git a/lib/ApiPlatform/phpunit.xml.dist b/lib/ApiPlatform/phpunit.xml.dist
deleted file mode 100644
index 626711c0..00000000
--- a/lib/ApiPlatform/phpunit.xml.dist
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
->
-    <php>
-        <ini name="error_reporting" value="-1"/>
-        <ini name="date.timezone" value="UTC"/>
-        <ini name="intl.default_locale" value="en"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="memory_limit" value="-1"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="RollerworksSearch Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-            <exclude>
-                <directory>./vendor/</directory>
-                <directory>./tests/</directory>
-                <file>src/Doctrine/Orm/CollectionDataProvider.php</file>
-                <file>src/Doctrine/Orm/QueryBuilder.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-
-</phpunit>
diff --git a/lib/Core/.gitattributes b/lib/Core/.gitattributes
deleted file mode 100644
index fbd8056d..00000000
--- a/lib/Core/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-/Tests/ export-ignore
-/phpunit.xml.dist export-ignore
-.git* export-ignore
diff --git a/lib/Core/.gitignore b/lib/Core/.gitignore
deleted file mode 100644
index 207f97e0..00000000
--- a/lib/Core/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/vendor/
-/composer.lock
-/phpunit.xml
diff --git a/lib/Core/AbstractExtension.php b/lib/Core/AbstractExtension.php
deleted file mode 100644
index cbdfca14..00000000
--- a/lib/Core/AbstractExtension.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
-use Rollerworks\Component\Search\Field\FieldType;
-use Rollerworks\Component\Search\Field\FieldTypeExtension;
-
-/**
- * The AbstractExtension can be used as a base class for SearchExtensions.
- *
- * A bonus for extending this class rather then the implementing the the
- * {@link SearchExtensionInterface} is that any new methods added the
- * SearchExtensionInterface will not break existing implementations.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-abstract class AbstractExtension implements SearchExtension
-{
-    /** @var array<string, FieldType>|null */
-    private ?array $types = null;
-
-    /** @var array<string, FieldTypeExtension[]>|null */
-    private ?array $typesExtensions = null;
-
-    public function getType(string $name): FieldType
-    {
-        if ($this->types === null) {
-            $this->initTypes();
-        }
-
-        if (! isset($this->types[$name])) {
-            throw new InvalidArgumentException(
-                \sprintf('Type "%s" can not be loaded by this extension', $name)
-            );
-        }
-
-        return $this->types[$name];
-    }
-
-    public function hasType(string $name): bool
-    {
-        if ($this->types === null) {
-            $this->initTypes();
-        }
-
-        return isset($this->types[$name]);
-    }
-
-    public function hasTypeExtensions(string $type): bool
-    {
-        if ($this->typesExtensions === null) {
-            $this->initTypesExtensions();
-        }
-
-        return isset($this->typesExtensions[$type]);
-    }
-
-    public function getTypeExtensions(string $name): array
-    {
-        if ($this->typesExtensions === null) {
-            $this->initTypesExtensions();
-        }
-
-        return $this->typesExtensions[$name] ?? [];
-    }
-
-    /**
-     * If extension needs to provide new field types this function
-     * should be overloaded in child class and return an array of FieldType
-     * instances.
-     *
-     * This is only required for types that have a constructor with (required) arguments.
-     *
-     * @return FieldType[]
-     */
-    protected function loadTypes(): array
-    {
-        return [];
-    }
-
-    /**
-     * If extension needs to provide field type extensions this function
-     * should be overloaded in child class and return array of FieldTypeExtension
-     * instances per type: `TypeClassName => [FieldTypeExtensionInterface, ...]`.
-     *
-     * @return array|array<FieldTypeExtension[]>
-     */
-    protected function loadTypesExtensions(): array
-    {
-        return [];
-    }
-
-    private function initTypes(): void
-    {
-        $this->types = [];
-
-        foreach ($this->loadTypes() as $type) {
-            if (! $type instanceof FieldType) {
-                throw new UnexpectedTypeException($type, FieldType::class);
-            }
-
-            $this->types[$type::class] = $type;
-        }
-    }
-
-    private function initTypesExtensions(): void
-    {
-        $this->typesExtensions = [];
-
-        foreach ($this->loadTypesExtensions() as $extension) {
-            if (! $extension instanceof FieldTypeExtension) {
-                throw new UnexpectedTypeException($extension, FieldTypeExtension::class);
-            }
-
-            $this->typesExtensions[$extension->getExtendedType()][] = $extension;
-        }
-    }
-}
diff --git a/lib/Core/ConditionErrorMessage.php b/lib/Core/ConditionErrorMessage.php
deleted file mode 100644
index d8bfe3f2..00000000
--- a/lib/Core/ConditionErrorMessage.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Symfony\Contracts\Translation\TranslatableInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-/**
- * A ConditionErrorMessage holds an error message,
- * produced during processing.
- *
- * This can be a failed value transformation,
- * too deep nesting, or values overflow.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class ConditionErrorMessage implements TranslatableInterface, \Stringable
-{
-    /** @var string[] */
-    public array $translatedParameters = [];
-
-    public string $translatedDomain = 'validators';
-
-    /**
-     * Any array key in $messageParameters will be used as a placeholder in
-     * $messageTemplate.
-     *
-     * @param string               $path                 Path of the error, this is dependent
-     *                                                   on the values structure
-     * @param string               $message              The translated error message
-     * @param string|null          $messageTemplate      The template for the error message
-     * @param array<string, mixed> $messageParameters    The parameters that should be
-     *                                                   substituted in the message template
-     * @param int|null             $messagePluralization The value for error message pluralization
-     * @param mixed                $cause                The cause of the error
-     */
-    public function __construct(
-        public string $path,
-        public string $message,
-        public ?string $messageTemplate = null,
-        public array $messageParameters = [],
-        public ?int $messagePluralization = null,
-        public mixed $cause = null,
-    ) {
-        $this->messageTemplate ??= $this->message;
-    }
-
-    /**
-     * @param array<string, mixed> $messageParameters
-     */
-    public static function withMessageTemplate(string $path, string $messageTemplate, array $messageParameters = [], ?int $messagePluralization = null, mixed $cause = null): self
-    {
-        return new self(
-            $path,
-            strtr($messageTemplate, $messageParameters),
-            $messageTemplate,
-            $messageParameters,
-            $messagePluralization,
-            $cause
-        );
-    }
-
-    public static function rawMessage(string $path, string $message, mixed $cause = null): self
-    {
-        $obj = new self($path, $message, null, [], null, $cause);
-        $obj->messageTemplate = null; // Mark as untranslated
-
-        return $obj;
-    }
-
-    /**
-     * @param string[] $translatedParameters An array of parameter names that need
-     *                                       to be translated prior to there usage
-     */
-    public function setTranslatedParameters(array $translatedParameters): self
-    {
-        $this->translatedParameters = $translatedParameters;
-
-        return $this;
-    }
-
-    public function setTranslatedDomain(string $domain): self
-    {
-        $this->translatedDomain = $domain;
-
-        return $this;
-    }
-
-    public function __toString(): string
-    {
-        return $this->message;
-    }
-
-    public function trans(TranslatorInterface $translator, ?string $locale = null): string
-    {
-        $parameters = $this->messageParameters;
-
-        // Note that when the input is less than 3 (0 index) characters we don't translate.
-        $nestedTranslator = static fn (string $v): string => isset($v[2]) ? $translator->trans($v, [], 'RollerworksSearch', $locale) : $v;
-
-        foreach ($this->translatedParameters as $name) {
-            $value = $parameters[$name];
-            $parameters[$name] = \is_array($value) ? array_map($nestedTranslator, $value) : $nestedTranslator($value);
-        }
-
-        // Because of the formatting we need to pre-translate the parameters.
-        // Otherwise we could translate the parameters using a TranslatableInterface value.
-        $parameters = $this->formatParameters($parameters);
-
-        return $translator->trans($this->messageTemplate, $parameters, $this->translatedDomain, $locale);
-    }
-
-    /**
-     * @param array<string, string|int|float|(string|int|float)[]> $messageParameters
-     *
-     * @return array<string, string>
-     */
-    private function formatParameters(array $messageParameters): array
-    {
-        $newParams = [];
-
-        foreach ($messageParameters as $name => $value) {
-            if (\is_array($value)) {
-                $value = implode(', ', array_map($this->formatValue(...), $value));
-            } else {
-                $value = $this->formatValue($value);
-            }
-
-            $newParams[$name] = $value;
-        }
-
-        return $newParams;
-    }
-
-    private function formatValue(string | int | float $value): string
-    {
-        $value = (string) $value;
-
-        if (! preg_match('/[\d]/u', $value)) {
-            $value = '"' . $value . '"';
-        }
-
-        return $value;
-    }
-}
diff --git a/lib/Core/ConditionExporter.php b/lib/Core/ConditionExporter.php
deleted file mode 100644
index a2da5983..00000000
--- a/lib/Core/ConditionExporter.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-/**
- * ConditionExporter defines the interface for SearchCondition exporters.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface ConditionExporter
-{
-    /**
-     * Exports the SearchCondition to a portable format.
-     *
-     * The returned format can be anything, as long as it's possible
-     * to 're-import' the exported search condition with a compatible
-     * input processor.
-     */
-    public function exportCondition(SearchCondition $condition);
-}
diff --git a/lib/Core/DataTransformer.php b/lib/Core/DataTransformer.php
deleted file mode 100644
index 16c757fe..00000000
--- a/lib/Core/DataTransformer.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * Transforms a value between different representations.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface DataTransformer
-{
-    /**
-     * Transforms a value from the original representation to a transformed representation.
-     *
-     * This method is called on two occasions:
-     *
-     * 1. When data from an input is submitted using to transform the new input data
-     * back into the renderable format. For example if you have a date field and submit '2009-10-10'
-     * you might accept this value because its easily parsed, but the transformer still writes back
-     * "2009/10/10" onto the display field (for further displaying or other purposes).
-     *
-     * This method must be able to deal with empty values. Usually this will
-     * be NULL, but depending on your implementation other empty values are
-     * possible as well (such as empty strings). The reasoning behind this is
-     * that value transformers must be chainable. If the transform() method
-     * of the first value transformer outputs NULL, the second value transformer
-     * must be able to process that value.
-     *
-     * By convention, transform() should return an empty string if NULL is
-     * passed.
-     *
-     * @param mixed $value The value in the original representation
-     *
-     * @return mixed The value in the transformed representation
-     *
-     * @throws TransformationFailedException When the transformation fails
-     */
-    public function transform($value);
-
-    /**
-     * Transforms a value from the transformed representation to its original
-     * representation.
-     *
-     * This method is called to transform the requests tainted data
-     * into an acceptable format for your data processing layer.
-     *
-     * This method must be able to deal with empty values. Usually this will
-     * be an empty string, but depending on your implementation other empty
-     * values are possible as well (such as empty strings). The reasoning behind
-     * this is that value transformers must be chainable. If the
-     * reverseTransform() method of the first value transformer outputs an
-     * empty string, the second value transformer must be able to process that
-     * value.
-     *
-     * By convention, reverseTransform() should return NULL if an empty string
-     * is passed.
-     *
-     * @param mixed $value The value in the transformed representation
-     *
-     * @return mixed The value in the original representation
-     *
-     * @throws TransformationFailedException When the transformation fails
-     */
-    public function reverseTransform($value);
-}
diff --git a/lib/Core/ErrorList.php b/lib/Core/ErrorList.php
deleted file mode 100644
index f813d15c..00000000
--- a/lib/Core/ErrorList.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * @extends \ArrayObject<string|int, ConditionErrorMessage>
- */
-final class ErrorList extends \ArrayObject
-{
-}
diff --git a/lib/Core/Exception/BadMethodCallException.php b/lib/Core/Exception/BadMethodCallException.php
deleted file mode 100644
index f4bac14d..00000000
--- a/lib/Core/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class BadMethodCallException extends \BadMethodCallException implements SearchException
-{
-}
diff --git a/lib/Core/Exception/GroupsNestingException.php b/lib/Core/Exception/GroupsNestingException.php
deleted file mode 100644
index f3725202..00000000
--- a/lib/Core/Exception/GroupsNestingException.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class GroupsNestingException extends InputProcessorException
-{
-    public function __construct(int $max, string $path)
-    {
-        parent::__construct($path, 'This group exceeds maximum nesting level of {{ max }}.', ['{{ max }}' => $max]);
-    }
-}
diff --git a/lib/Core/Exception/GroupsOverflowException.php b/lib/Core/Exception/GroupsOverflowException.php
deleted file mode 100644
index 41a4dcc3..00000000
--- a/lib/Core/Exception/GroupsOverflowException.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class GroupsOverflowException extends InputProcessorException
-{
-    public function __construct(int $max, string $path)
-    {
-        parent::__construct($path, 'This group exceeds maximum number of groups {{ max }}.', ['{{ max }}' => $max]);
-    }
-}
diff --git a/lib/Core/Exception/InputProcessorException.php b/lib/Core/Exception/InputProcessorException.php
deleted file mode 100644
index 04100911..00000000
--- a/lib/Core/Exception/InputProcessorException.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class InputProcessorException extends \InvalidArgumentException implements SearchException
-{
-    public array $translatedParameters = [];
-
-    /**
-     * @param array<string, mixed> $messageParameters
-     */
-    public function __construct(
-        public string $path,
-        public string $messageTemplate,
-        public array $messageParameters = [],
-        public ?int $plural = null,
-        ?\Exception $previous = null,
-    ) {
-        parent::__construct(strtr($messageTemplate, $this->formatParameters($messageParameters)), 0, $previous);
-    }
-
-    public function toErrorMessageObj(): ConditionErrorMessage
-    {
-        $message = new ConditionErrorMessage(
-            $this->path,
-            $this->getMessage(),
-            $this->messageTemplate,
-            $this->messageParameters,
-            $this->plural,
-            $this
-        );
-        $message->setTranslatedParameters($this->translatedParameters);
-
-        return $message;
-    }
-
-    /**
-     * Set which parameters (by key) need to be translated.
-     *
-     * This helps with the translating of normalized types to
-     * a localized format.
-     *
-     * @param string[] $translatedParameters An array of parameter names that need
-     *                                       to be translated prior to their usage
-     */
-    protected function setTranslatedParameters(array $translatedParameters): self
-    {
-        $this->translatedParameters = $translatedParameters;
-
-        return $this;
-    }
-
-    private function formatParameters(array $messageParameters): array
-    {
-        $newParams = [];
-
-        foreach ($messageParameters as $name => $value) {
-            if (\is_array($value)) {
-                $value = implode(', ', array_map($this->formatValue(...), $value));
-            } else {
-                $value = $this->formatValue($value);
-            }
-
-            $newParams[$name] = $value;
-        }
-
-        return $newParams;
-    }
-
-    private function formatValue(string | int | float $value): string
-    {
-        $value = (string) $value;
-
-        if (! preg_match('/[\d]/u', $value)) {
-            $value = '"' . $value . '"';
-        }
-
-        return $value;
-    }
-}
diff --git a/lib/Core/Exception/InvalidArgumentException.php b/lib/Core/Exception/InvalidArgumentException.php
deleted file mode 100644
index f4d75797..00000000
--- a/lib/Core/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class InvalidArgumentException extends \InvalidArgumentException implements SearchException
-{
-}
diff --git a/lib/Core/Exception/InvalidConfigurationException.php b/lib/Core/Exception/InvalidConfigurationException.php
deleted file mode 100644
index b921bf71..00000000
--- a/lib/Core/Exception/InvalidConfigurationException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class InvalidConfigurationException extends InvalidArgumentException
-{
-}
diff --git a/lib/Core/Exception/InvalidSearchConditionException.php b/lib/Core/Exception/InvalidSearchConditionException.php
deleted file mode 100644
index a776feea..00000000
--- a/lib/Core/Exception/InvalidSearchConditionException.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class InvalidSearchConditionException extends \InvalidArgumentException implements SearchException
-{
-    /**
-     * @param ConditionErrorMessage[] $errors
-     */
-    public function __construct(
-        private readonly array $errors,
-    ) {
-        parent::__construct('The search-condition contains one or more errors.');
-    }
-
-    /**
-     * @return ConditionErrorMessage[]
-     */
-    public function getErrors(): array
-    {
-        return $this->errors;
-    }
-}
diff --git a/lib/Core/Exception/OrderStructureException.php b/lib/Core/Exception/OrderStructureException.php
deleted file mode 100644
index 0b5d4317..00000000
--- a/lib/Core/Exception/OrderStructureException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-final class OrderStructureException extends InputProcessorException
-{
-    public static function invalidValue(string $fieldName): self
-    {
-        return new self('', 'The field {{ field }} only accepts a single simple value.', ['{{ field }}' => $fieldName]);
-    }
-
-    public static function noGrouping(): self
-    {
-        return new self('', 'Order clauses cannot be placed in a group.');
-    }
-}
diff --git a/lib/Core/Exception/SearchException.php b/lib/Core/Exception/SearchException.php
deleted file mode 100644
index b8eaddb8..00000000
--- a/lib/Core/Exception/SearchException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface SearchException
-{
-}
diff --git a/lib/Core/Exception/StringLexerException.php b/lib/Core/Exception/StringLexerException.php
deleted file mode 100644
index a475fa72..00000000
--- a/lib/Core/Exception/StringLexerException.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class StringLexerException extends InputProcessorException
-{
-    // StringQueryInput
-    public const FIELD_REQUIRES_VALUES = 'A field must have at least one value';
-    public const INCORRECT_VALUES_SEPARATOR = 'Values must be separated by a ",". A values list must end with ";" or ")"';
-    public const CANNOT_CLOSE_UNOPENED_GROUP = 'Cannot close group as this field is not in a group';
-    public const GROUP_LOGICAL_WITHOUT_GROUP = 'A group logical operator can only be used at the start of the input or before a group opening';
-
-    // StringLexer
-    public const UNKNOWN_PATTERN_MATCH_FLAG = 'Unknown operator flag, expected "i" and/or "!"';
-    public const NO_SPACES_IN_OPERATOR = 'Spaces are not allowed within an operator';
-    public const INCOMPLETE_VALUE_PATTERN = 'Missing operator and value pattern';
-    public const SPACES_REQ_QUOTING = 'A value containing spaces must be surrounded by quotes';
-    public const SPECIAL_CHARS_REQ_QUOTING = 'A value containing special characters must be surrounded by quotes';
-    public const QUOTED_VALUE_REQUIRE_QUOTING = 'A value containing quotes must be surrounded by quotes';
-    public const VALUE_QUOTES_MUST_ESCAPE = 'Quotes in a quoted value must be escaped';
-    public const MISSING_END_QUOTE = 'Missing quote to end the value';
-
-    public static function syntaxError(int $column, int $line, $expected, string $got): self
-    {
-        if ($expected) {
-            $exp = new self(
-                '',
-                '[Syntax Error] line {{ line }} col {{ column }}: Expected {{ expected }}, got {{ got }}.',
-                [
-                    '{{ line }}' => $line,
-                    '{{ column }}' => $column,
-                    '{{ expected }}' => $expected,
-                    '{{ got }}' => $got,
-                ]
-            );
-
-            $exp->setTranslatedParameters(['{{ expected }}']);
-        } else {
-            $exp = new self(
-                '',
-                '[Syntax Error] line {{ line }} col {{ column }}: Unexpected {{ unexpected }}.',
-                [
-                    '{{ line }}' => $line,
-                    '{{ column }}' => $column,
-                    '{{ unexpected }}' => $got,
-                ]
-            );
-        }
-
-        return $exp;
-    }
-
-    public static function syntaxErrorUnexpectedEnd(int $column, int $line, $expected, string $got): self
-    {
-        $exp = new self(
-            '',
-            '[Syntax Error] line {{ line }} col {{ column }}: Expected {{ expected }}, got {{ got }}.',
-            [
-                '{{ line }}' => $line,
-                '{{ column }}' => $column,
-                '{{ expected }}' => $expected,
-                '{{ got }}' => $got,
-            ]
-        );
-        $exp->setTranslatedParameters(['{{ expected }}', '{{ got }}']);
-
-        return $exp;
-    }
-
-    public static function formatError(int $column, int $line, string $message): self
-    {
-        $exp = new self(
-            '',
-            '[Format Error] line {{ line }} col {{ column }}: {{ message }}.',
-            [
-                '{{ line }}' => $line,
-                '{{ column }}' => $column,
-                '{{ message }}' => $message,
-            ]
-        );
-
-        $exp->setTranslatedParameters(['{{ message }}']);
-
-        return $exp;
-    }
-
-    public function toErrorMessageObj(): ConditionErrorMessage
-    {
-        $message = parent::toErrorMessageObj();
-        $message->setTranslatedDomain('RollerworksSearch');
-
-        return $message;
-    }
-}
diff --git a/lib/Core/Exception/TransformationFailedException.php b/lib/Core/Exception/TransformationFailedException.php
deleted file mode 100644
index f8ece144..00000000
--- a/lib/Core/Exception/TransformationFailedException.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-final class TransformationFailedException extends \RuntimeException implements SearchException
-{
-    /**
-     * @param array<string, mixed> $invalidMessageParameters
-     */
-    public function __construct(
-        string $message = '',
-        int $code = 0,
-        ?\Throwable $previous = null,
-        private ?string $invalidMessage = null,
-        private array $invalidMessageParameters = [],
-        private readonly mixed $value = null,
-    ) {
-        parent::__construct($message, $code, $previous);
-    }
-
-    /**
-     * Sets the message that will be shown to the user.
-     *
-     * @param string|null          $invalidMessage           The message or message key
-     * @param array<string, mixed> $invalidMessageParameters Data to be passed into the translator
-     */
-    public function setInvalidMessage(?string $invalidMessage = null, array $invalidMessageParameters = []): void
-    {
-        $this->invalidMessage = $invalidMessage;
-        $this->invalidMessageParameters = $invalidMessageParameters;
-    }
-
-    public function getInvalidMessage(): ?string
-    {
-        return $this->invalidMessage;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function getInvalidMessageParameters(): array
-    {
-        return $this->invalidMessageParameters;
-    }
-
-    public function getInvalidValue(): mixed
-    {
-        return $this->value;
-    }
-}
diff --git a/lib/Core/Exception/TranslatedArgument.php b/lib/Core/Exception/TranslatedArgument.php
deleted file mode 100644
index 6411fccb..00000000
--- a/lib/Core/Exception/TranslatedArgument.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-use Symfony\Contracts\Translation\TranslatableInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-final class TranslatedArgument implements TranslatableInterface, \Stringable
-{
-    /**
-     * @param array<string, mixed> $parameters
-     */
-    public function __construct(
-        private readonly string $message,
-        private readonly array $parameters = [],
-        private readonly ?string $domain = null,
-    ) {
-    }
-
-    public function __toString(): string
-    {
-        return $this->getMessage();
-    }
-
-    public function getMessage(): string
-    {
-        return $this->message;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function getParameters(): array
-    {
-        return $this->parameters;
-    }
-
-    public function getDomain(): ?string
-    {
-        return $this->domain;
-    }
-
-    public function trans(TranslatorInterface $translator, ?string $locale = null): string
-    {
-        return $translator->trans($this->getMessage(), array_map(
-            static fn ($parameter) => $parameter instanceof TranslatableInterface ? $parameter->trans($translator, $locale) : $parameter,
-            $this->getParameters()
-        ), $this->getDomain(), $locale);
-    }
-}
diff --git a/lib/Core/Exception/UnexpectedTypeException.php b/lib/Core/Exception/UnexpectedTypeException.php
deleted file mode 100644
index 1b28396e..00000000
--- a/lib/Core/Exception/UnexpectedTypeException.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class UnexpectedTypeException extends \InvalidArgumentException implements SearchException
-{
-    /**
-     * @param array|string $expectedType
-     */
-    public function __construct($value, $expectedType)
-    {
-        if (\is_array($expectedType)) {
-            $expectedType = implode('", "', $expectedType);
-        }
-
-        parent::__construct(
-            \sprintf(
-                'Expected argument of type "%s", "%s" given',
-                $expectedType,
-                get_debug_type($value)
-            )
-        );
-    }
-}
diff --git a/lib/Core/Exception/UnknownFieldException.php b/lib/Core/Exception/UnknownFieldException.php
deleted file mode 100644
index a2b43205..00000000
--- a/lib/Core/Exception/UnknownFieldException.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class UnknownFieldException extends InputProcessorException
-{
-    public function __construct(string $fieldName)
-    {
-        parent::__construct(
-            '',
-            'The field {{ field }} is not registered in the FieldSet or available as alias.',
-            ['{{ field }}' => $fieldName]
-        );
-    }
-}
diff --git a/lib/Core/Exception/UnsupportedFieldSetException.php b/lib/Core/Exception/UnsupportedFieldSetException.php
deleted file mode 100644
index 132bba9e..00000000
--- a/lib/Core/Exception/UnsupportedFieldSetException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class UnsupportedFieldSetException extends InvalidArgumentException
-{
-    public function __construct(array $expected, string $provided)
-    {
-        parent::__construct(
-            \sprintf('FieldSet "%s" was not expected, expected one of "%s"', $provided, implode('", "', $expected))
-        );
-    }
-}
diff --git a/lib/Core/Exception/UnsupportedValueTypeException.php b/lib/Core/Exception/UnsupportedValueTypeException.php
deleted file mode 100644
index 57e29d43..00000000
--- a/lib/Core/Exception/UnsupportedValueTypeException.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * UnsupportedValueTypeException.
- *
- * Throw this exception when the value-type is not supported for the field.
- */
-final class UnsupportedValueTypeException extends InputProcessorException
-{
-    public function __construct(string $fieldName, string $valueType)
-    {
-        parent::__construct(
-            '',
-            'The field {{ field }} does not accept {{ type }} values.',
-            [
-                '{{ field }}' => $fieldName,
-                '{{ type }}' => str_contains($valueType, '\\') ? mb_substr($valueType, mb_strrpos($valueType, '\\') + 1) : $valueType,
-            ]
-        );
-
-        $this->setTranslatedParameters(['{{ type }}']);
-    }
-}
diff --git a/lib/Core/Exception/ValuesOverflowException.php b/lib/Core/Exception/ValuesOverflowException.php
deleted file mode 100644
index 6575c867..00000000
--- a/lib/Core/Exception/ValuesOverflowException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exception;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class ValuesOverflowException extends InputProcessorException
-{
-    public function __construct(string $fieldName, int $max, string $path)
-    {
-        parent::__construct(
-            $path,
-            'This value exceeds the maximum number of values. Maximum values are {{ max }}.',
-            [
-                '{{ field }}' => $fieldName,
-                '{{ max }}' => $max,
-            ],
-            $max
-        );
-    }
-}
diff --git a/lib/Core/Exporter/AbstractExporter.php b/lib/Core/Exporter/AbstractExporter.php
deleted file mode 100644
index fe7e5e5f..00000000
--- a/lib/Core/Exporter/AbstractExporter.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exporter;
-
-use Rollerworks\Component\Search\ConditionExporter;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * AbstractExporter provides the shared logic for the condition exporters.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-abstract class AbstractExporter implements ConditionExporter
-{
-    public function exportCondition(SearchCondition $condition)
-    {
-        return $this->exportGroup($condition->getValuesGroup(), $condition->getFieldSet(), true);
-    }
-
-    abstract protected function exportGroup(ValuesGroup $valuesGroup, FieldSet $fieldSet, bool $isRoot = false);
-
-    /**
-     * @internal
-     */
-    public function modelToView($value, FieldConfig $field): string
-    {
-        $transformer = $field->getViewTransformer();
-
-        // Scalar values should be converted to strings to
-        // facilitate differentiation between empty ("") and zero (0).
-        if ($value === null || ! $transformer) {
-            if ($value !== null && ! \is_scalar($value)) {
-                throw new \RuntimeException(
-                    \sprintf(
-                        'Model value of type %s is not a scalar value or null and not cannot be ' .
-                        'converted to a string. You must set a viewTransformer for field "%s" with type "%s".',
-                        \gettype($value),
-                        $field->getName(),
-                        $field->getType()->getInnerType()::class
-                    )
-                );
-            }
-
-            return (string) $value;
-        }
-
-        return (string) $transformer->transform($value);
-    }
-
-    /**
-     * @internal
-     */
-    public function modelToNorm($value, FieldConfig $field): string
-    {
-        $transformer = $field->getNormTransformer() ?? $field->getViewTransformer();
-
-        // Scalar values should be converted to strings to
-        // facilitate differentiation between empty ("") and zero (0).
-        if ($value === null || ! $transformer) {
-            if ($value !== null && ! \is_scalar($value)) {
-                throw new \RuntimeException(
-                    \sprintf(
-                        'Model value of type %s is not a scalar value or null and not cannot be ' .
-                        'converted to a string. You must set a normTransformer for field "%s" with type "%s".',
-                        \gettype($value),
-                        $field->getName(),
-                        $field->getType()->getInnerType()::class
-                    )
-                );
-            }
-
-            return (string) $value;
-        }
-
-        return (string) $transformer->transform($value);
-    }
-}
diff --git a/lib/Core/Exporter/JsonExporter.php b/lib/Core/Exporter/JsonExporter.php
deleted file mode 100644
index 7a9247e2..00000000
--- a/lib/Core/Exporter/JsonExporter.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exporter;
-
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * Exports the SearchCondition as a JSON object.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class JsonExporter extends AbstractExporter
-{
-    public function exportCondition(SearchCondition $condition): string
-    {
-        $fieldSet = $condition->getFieldSet();
-
-        return json_encode(
-            array_merge(
-                $this->exportOrder($condition, $fieldSet),
-                $this->exportGroup($condition->getValuesGroup(), $fieldSet, true)
-            ),
-            \JSON_THROW_ON_ERROR
-        );
-    }
-
-    protected function exportOrder(SearchCondition $condition, FieldSet $fieldSet): array
-    {
-        $order = $condition->getOrder();
-
-        if ($order === null) {
-            return [];
-        }
-
-        $result = [];
-
-        foreach ($order->getFields() as $name => $direction) {
-            $result[mb_substr($name, 1)] = $this->modelToNorm($direction, $fieldSet->get($name));
-        }
-
-        return $result ? ['order' => $result] : [];
-    }
-
-    protected function exportGroup(ValuesGroup $valuesGroup, FieldSet $fieldSet, bool $isRoot = false): array
-    {
-        $result = [];
-        $fields = $valuesGroup->getFields();
-
-        foreach ($fields as $name => $values) {
-            if ($fieldSet->isPrivate($name) || $values->count() === 0) {
-                continue;
-            }
-
-            $exportedValue = $this->exportValues($values, $fieldSet->get($name));
-
-            // Only export fields with actual values.
-            if (\count($exportedValue) > 0) {
-                $result['fields'][$name] = $exportedValue;
-            }
-        }
-
-        foreach ($valuesGroup->getGroups() as $group) {
-            $result['groups'][] = $this->exportGroup($group, $fieldSet, false);
-        }
-
-        if (isset($result['fields']) && $valuesGroup->getGroupLogical() === ValuesGroup::GROUP_LOGICAL_OR) {
-            $result['logical-case'] = 'OR';
-        }
-
-        return $result;
-    }
-
-    private function exportValues(ValuesBag $valuesBag, FieldConfig $field): array
-    {
-        $exportedValues = [];
-
-        foreach ($valuesBag->getSimpleValues() as $value) {
-            $exportedValues['simple-values'][] = $this->modelToNorm($value, $field);
-        }
-
-        foreach ($valuesBag->getExcludedSimpleValues() as $value) {
-            $exportedValues['excluded-simple-values'][] = $this->modelToNorm($value, $field);
-        }
-
-        foreach ($valuesBag->get(Range::class) as $value) {
-            /** @var Range $value */
-            $exportedValues['ranges'][] = $this->exportRangeValue($value, $field);
-        }
-
-        foreach ($valuesBag->get(ExcludedRange::class) as $value) {
-            /** @var ExcludedRange $value */
-            $exportedValues['excluded-ranges'][] = $this->exportRangeValue($value, $field);
-        }
-
-        foreach ($valuesBag->get(Compare::class) as $value) {
-            /** @var Compare $value */
-            $exportedValues['comparisons'][] = [
-                'operator' => $value->getOperator(),
-                'value' => $this->modelToNorm($value->getValue(), $field),
-            ];
-        }
-
-        foreach ($valuesBag->get(PatternMatch::class) as $value) {
-            /** @var PatternMatch $value */
-            $exportedValues['pattern-matchers'][] = [
-                'type' => $value->getType(),
-                'value' => $value->getValue(),
-                'case-insensitive' => $value->isCaseInsensitive(),
-            ];
-        }
-
-        return $exportedValues;
-    }
-
-    private function exportRangeValue(Range $range, FieldConfig $field): array
-    {
-        $result = [
-            'lower' => $this->modelToNorm($range->getLower(), $field),
-            'upper' => $this->modelToNorm($range->getUpper(), $field),
-        ];
-
-        if (! $range->isLowerInclusive()) {
-            $result['inclusive-lower'] = false;
-        }
-
-        if (! $range->isUpperInclusive()) {
-            $result['inclusive-upper'] = false;
-        }
-
-        return $result;
-    }
-}
diff --git a/lib/Core/Exporter/NormStringQueryExporter.php b/lib/Core/Exporter/NormStringQueryExporter.php
deleted file mode 100644
index ed640de6..00000000
--- a/lib/Core/Exporter/NormStringQueryExporter.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exporter;
-
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\Input\NormStringQueryInput;
-
-/**
- * Exports the SearchCondition as StringQuery string.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class NormStringQueryExporter extends StringExporter
-{
-    protected function modelToExported($value, FieldConfig $field, string $allowedNext = ',;)'): string
-    {
-        $valueExporter = $field->getOption(NormStringQueryInput::VALUE_EXPORTER_OPTION_NAME);
-
-        if ($valueExporter === true) {
-            return $this->modelToNorm($value, $field);
-        }
-
-        if (\is_callable($valueExporter)) {
-            return $valueExporter($value, $this->modelToNorm(...), $field);
-        }
-
-        return $this->exportValueAsString($this->modelToNorm($value, $field));
-    }
-
-    protected function resolveLabels(FieldSet $fieldSet): array
-    {
-        $labels = [];
-
-        foreach ($fieldSet->all() as $name => $field) {
-            $labels[$name] = $name;
-        }
-
-        return $labels;
-    }
-}
diff --git a/lib/Core/Exporter/StringExporter.php b/lib/Core/Exporter/StringExporter.php
deleted file mode 100644
index 2b4d2f3e..00000000
--- a/lib/Core/Exporter/StringExporter.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exporter;
-
-use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * Exports the SearchCondition as StringQuery string.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-abstract class StringExporter extends AbstractExporter
-{
-    /** @var array<string, string> */
-    protected array $fields = [];
-
-    public function exportCondition(SearchCondition $condition): string
-    {
-        $this->fields = $this->resolveLabels($fieldSet = $condition->getFieldSet());
-
-        $valuesGroup = $condition->getValuesGroup();
-        $result = '';
-
-        if ($valuesGroup->countValues() > 0 && $valuesGroup->getGroupLogical() === ValuesGroup::GROUP_LOGICAL_OR) {
-            $result .= '* ';
-        }
-
-        $result .= $this->exportOrder($condition, $fieldSet);
-
-        return mb_trim($result . $this->exportGroup($valuesGroup, $fieldSet, true));
-    }
-
-    abstract protected function resolveLabels(FieldSet $fieldSet): array;
-
-    protected function exportOrder(SearchCondition $condition, FieldSet $fieldSet): string
-    {
-        $order = $condition->getOrder();
-
-        if ($order === null) {
-            return '';
-        }
-
-        $result = '';
-
-        foreach ($order->getFields() as $name => $direction) {
-            $result .= $this->getFieldLabel($name);
-            $result .= ': ' . $this->modelToExported($direction, $fieldSet->get($name)) . '; ';
-        }
-
-        return mb_ltrim($result);
-    }
-
-    protected function exportGroup(ValuesGroup $valuesGroup, FieldSet $fieldSet, bool $isRoot = false): string
-    {
-        $result = '';
-        $exportedGroups = '';
-
-        foreach ($valuesGroup->getFields() as $name => $values) {
-            if ($fieldSet->isPrivate($name) || $values->count() === 0) {
-                continue;
-            }
-
-            $result .= $this->getFieldLabel($name);
-            $result .= ': ' . $this->exportValues($values, $fieldSet->get($name)) . '; ';
-        }
-
-        foreach ($valuesGroup->getGroups() as $group) {
-            $exportedGroup = '( ' . mb_trim($this->exportGroup($group, $fieldSet), ' ;') . ' ); ';
-
-            if ($exportedGroup !== '(  ); ' && $group->getGroupLogical() === ValuesGroup::GROUP_LOGICAL_OR) {
-                $exportedGroups .= '*';
-            }
-
-            $exportedGroups .= $exportedGroup;
-        }
-
-        $result .= $exportedGroups;
-
-        return mb_trim($result);
-    }
-
-    protected function modelToExported($value, FieldConfig $field): string
-    {
-        $valueExporter = $field->getOption(StringQueryInput::VALUE_EXPORTER_OPTION_NAME);
-
-        if ($valueExporter === true) {
-            return $this->modelToView($value, $field);
-        }
-
-        if (\is_callable($valueExporter)) {
-            return $valueExporter($value, $this->modelToView(...), $field);
-        }
-
-        return $this->exportValueAsString($this->modelToView($value, $field));
-    }
-
-    final protected function exportValueAsString($value, bool $force = false): string
-    {
-        $value = (string) $value;
-
-        if ($force || preg_match('/[<>[\](),;~!*?=&*"\s]/u', $value)) {
-            return '"' . str_replace('"', '""', $value) . '"';
-        }
-
-        return $value;
-    }
-
-    private function getFieldLabel(string $name): string
-    {
-        if (isset($this->fields[$name])) {
-            return $this->fields[$name];
-        }
-
-        throw new UnknownFieldException($name);
-    }
-
-    private function exportValues(ValuesBag $valuesBag, FieldConfig $field): string
-    {
-        $exportedValues = '';
-
-        foreach ($valuesBag->getSimpleValues() as $value) {
-            $exportedValues .= $this->modelToExported($value, $field) . ', ';
-        }
-
-        foreach ($valuesBag->getExcludedSimpleValues() as $value) {
-            $exportedValues .= '!' . $this->modelToExported($value, $field) . ', ';
-        }
-
-        foreach ($valuesBag->get(Range::class) as $value) {
-            /** @var Range $value */
-            $exportedValues .= $this->exportRangeValue($value, $field) . ', ';
-        }
-
-        foreach ($valuesBag->get(ExcludedRange::class) as $value) {
-            /** @var ExcludedRange $value */
-            $exportedValues .= '!' . $this->exportRangeValue($value, $field) . ', ';
-        }
-
-        foreach ($valuesBag->get(Compare::class) as $value) {
-            /** @var Compare $value */
-            $exportedValues .= $value->getOperator() . ' ' . $this->modelToExported($value->getValue(), $field) . ', ';
-        }
-
-        foreach ($valuesBag->get(PatternMatch::class) as $value) {
-            /** @var PatternMatch $value */
-            $exportedValues .= $this->getPatternMatchOperator($value) . ' ' . $this->exportValueAsString($value->getValue()) . ', ';
-        }
-
-        return mb_rtrim($exportedValues, ', ');
-    }
-
-    private function getPatternMatchOperator(PatternMatch $patternMatch): string
-    {
-        $operator = $patternMatch->isCaseInsensitive() ? '~i' : '~';
-
-        if ($patternMatch->isExclusive()) {
-            $operator .= '!';
-        }
-
-        match ($patternMatch->getType()) {
-            PatternMatch::PATTERN_CONTAINS, PatternMatch::PATTERN_NOT_CONTAINS => $operator .= '*',
-            PatternMatch::PATTERN_STARTS_WITH, PatternMatch::PATTERN_NOT_STARTS_WITH => $operator .= '>',
-            PatternMatch::PATTERN_ENDS_WITH, PatternMatch::PATTERN_NOT_ENDS_WITH => $operator .= '<',
-            PatternMatch::PATTERN_EQUALS, PatternMatch::PATTERN_NOT_EQUALS => $operator .= '=',
-            default => throw new \RuntimeException(
-                \sprintf(
-                    'Unsupported pattern-match type "%s" found. Please report this bug.',
-                    $patternMatch->getType()
-                )
-            ),
-        };
-
-        return $operator;
-    }
-
-    private function exportRangeValue(Range $range, FieldConfig $field): string
-    {
-        $result = ! $range->isLowerInclusive() ? ']' : '';
-        $result .= $this->modelToExported($range->getLower(), $field);
-        $result .= ' ~ ';
-        $result .= $this->modelToExported($range->getUpper(), $field);
-        $result .= ! $range->isUpperInclusive() ? '[' : '';
-
-        return $result;
-    }
-}
diff --git a/lib/Core/Exporter/StringQueryExporter.php b/lib/Core/Exporter/StringQueryExporter.php
deleted file mode 100644
index 89ad245a..00000000
--- a/lib/Core/Exporter/StringQueryExporter.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Exporter;
-
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\FieldSet;
-
-/**
- * Exports the SearchCondition as StringQuery string.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class StringQueryExporter extends StringExporter
-{
-    /** @var callable */
-    private mixed $labelResolver;
-
-    /**
-     * @param callable|null $labelResolver a callable to resolve the actual label
-     *                                     of the field, receives a FieldConfig instance.
-     *                                     If the resolver is null, the `label` option value
-     *                                     of the field is tried instead
-     */
-    public function __construct(?callable $labelResolver = null)
-    {
-        $this->labelResolver = $labelResolver ?? static fn (FieldConfig $field) => $field->getOption('label') ?? $field->getName();
-    }
-
-    protected function resolveLabels(FieldSet $fieldSet): array
-    {
-        $labels = [];
-        $callable = $this->labelResolver;
-
-        foreach ($fieldSet->all() as $name => $field) {
-            $labels[$name] = $callable($field);
-        }
-
-        return $labels;
-    }
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/ArrayChoiceList.php b/lib/Core/Extension/Core/ChoiceList/ArrayChoiceList.php
deleted file mode 100644
index 2edd6361..00000000
--- a/lib/Core/Extension/Core/ChoiceList/ArrayChoiceList.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList;
-
-/**
- * A list of choices with arbitrary data types.
- *
- * The user of this class is responsible for assigning string values to the
- * choices. Both the choices and their values are passed to the constructor.
- * Each choice must have a corresponding value (with the same array key) in
- * the value array.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ArrayChoiceList implements ChoiceList
-{
-    /** @var array<array-key, string> */
-    protected array $choices;
-
-    /**
-     * The values indexed by the original keys.
-     *
-     * @var array<array-key, string>
-     */
-    protected array $structuredValues;
-
-    /** @var array<array-key, string> */
-    protected array $originalKeys;
-
-    /**
-     * The callback for creating the value for a choice.
-     *
-     * @var callable|null
-     */
-    protected mixed $valueCallback = null;
-
-    protected bool $valuesAreConstant;
-
-    /**
-     * The given choice array must have the same array keys as the value array.
-     *
-     * @param array|\Traversable $choices The selectable choices
-     * @param callable|null      $value   The callable for creating the value
-     *                                    for a choice. If `null` is passed,
-     *                                    incrementing integers are used as
-     *                                    values
-     */
-    public function __construct(array | \Traversable $choices, ?callable $value = null)
-    {
-        if ($choices instanceof \Traversable) {
-            $choices = iterator_to_array($choices);
-        }
-
-        if ($value === null && $this->castableToString($choices)) {
-            $value = static fn ($choice): string => $choice === false ? '0' : (string) $choice;
-        }
-
-        if ($value !== null) {
-            // If a deterministic value generator was passed, use it later
-            $this->valueCallback = $value;
-            $this->valuesAreConstant = true;
-        } else {
-            $this->valuesAreConstant = false;
-            // Otherwise simply generate incrementing integers as values
-            $i = 0;
-            $value = static function () use (&$i) {
-                return $i++;
-            };
-        }
-
-        // If the choices are given as recursive array (i.e. with explicit
-        // choice groups), flatten the array. The grouping information is needed
-        // in the view only.
-        $this->flatten($choices, $value, $choicesByValues, $keysByValues, $structuredValues);
-
-        $this->choices = $choicesByValues;
-        $this->originalKeys = $keysByValues;
-        $this->structuredValues = $structuredValues;
-    }
-
-    public function getChoices(): array
-    {
-        return $this->choices;
-    }
-
-    public function getValues(): array
-    {
-        return array_map(strval(...), array_keys($this->choices));
-    }
-
-    public function getStructuredValues(): array
-    {
-        return $this->structuredValues;
-    }
-
-    public function getOriginalKeys(): array
-    {
-        return $this->originalKeys;
-    }
-
-    public function getChoicesForValues(array $values): array
-    {
-        $choices = [];
-
-        foreach ($values as $i => $givenValue) {
-            if (\array_key_exists($givenValue, $this->choices)) {
-                $choices[$i] = $this->choices[$givenValue];
-            }
-        }
-
-        return $choices;
-    }
-
-    public function getValuesForChoices(array $choices): array
-    {
-        $values = [];
-
-        // Use the value callback to compare choices by their values, if present
-        if ($this->valueCallback) {
-            $givenValues = [];
-
-            foreach ($choices as $i => $givenChoice) {
-                $givenValues[$i] = (string) ($this->valueCallback)($givenChoice);
-            }
-
-            return array_intersect($givenValues, array_keys($this->choices));
-        }
-
-        // Otherwise compare choices by identity
-        foreach ($choices as $i => $givenChoice) {
-            foreach ($this->choices as $value => $choice) {
-                if ($choice === $givenChoice) {
-                    $values[$i] = (string) $value;
-
-                    break;
-                }
-            }
-        }
-
-        return $values;
-    }
-
-    public function isValuesConstant(): bool
-    {
-        return $this->valuesAreConstant;
-    }
-
-    /**
-     * Flattens an array into the given output variables.
-     *
-     * @param array      $choices          The array to flatten
-     * @param callable   $value            The callable for generating choice values
-     * @param array|null $choicesByValues  The flattened choices indexed by the
-     *                                     corresponding values
-     * @param array|null $keysByValues     The original keys indexed by the
-     *                                     corresponding values
-     * @param array|null $structuredValues The values indexed by the original keys
-     */
-    private function flatten(array $choices, callable $value, &$choicesByValues, &$keysByValues, &$structuredValues): void
-    {
-        if ($choicesByValues === null) {
-            $choicesByValues = [];
-            $keysByValues = [];
-            $structuredValues = [];
-        }
-
-        foreach ($choices as $key => $choice) {
-            if (\is_array($choice)) {
-                $this->flatten($choice, $value, $choicesByValues, $keysByValues, $structuredValues[$key]);
-
-                continue;
-            }
-
-            $choiceValue = (string) $value($choice);
-            $choicesByValues[$choiceValue] = $choice;
-            $keysByValues[$choiceValue] = $key;
-            $structuredValues[$key] = $choiceValue;
-        }
-    }
-
-    /**
-     * Checks whether the given choices can be cast to strings without
-     * generating duplicates.
-     *
-     * @param array $cache The cache for previously checked entries. Internal
-     */
-    private function castableToString(array $choices, array &$cache = []): bool
-    {
-        foreach ($choices as $choice) {
-            if (\is_array($choice)) {
-                if (! $this->castableToString($choice, $cache)) {
-                    return false;
-                }
-
-                continue;
-            }
-
-            if (! \is_scalar($choice)) {
-                return false;
-            }
-
-            $choice = $choice === false ? '0' : (string) $choice;
-
-            if (isset($cache[$choice])) {
-                return false;
-            }
-
-            $cache[$choice] = true;
-        }
-
-        return true;
-    }
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/ChoiceList.php b/lib/Core/Extension/Core/ChoiceList/ChoiceList.php
deleted file mode 100644
index 51dba840..00000000
--- a/lib/Core/Extension/Core/ChoiceList/ChoiceList.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList;
-
-/**
- * A list of choices that can be selected in a choice field.
- *
- * A choice list assigns unique string values to each of a list of choices.
- * These string values are displayed in the "value" attributes in HTML and
- * submitted back to the server.
- *
- * The acceptable data types for the choices depend on the implementation.
- * Values must always be strings and (within the list) free of duplicates.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ChoiceList
-{
-    /**
-     * Returns all selectable choices.
-     *
-     * @return array<array-key, string> The selectable choices indexed by the corresponding values
-     */
-    public function getChoices(): array;
-
-    /**
-     * Returns the values for the choices.
-     *
-     * The values are strings that do not contain duplicates.
-     *
-     * @return array<int, string>
-     */
-    public function getValues(): array;
-
-    /**
-     * Returns the values in the structure originally passed to the list.
-     *
-     * Contrary to {@link getValues()}, the result is indexed by the original
-     * keys of the choices. If the original array contained nested arrays, these
-     * nested arrays are represented here as well:
-     *
-     *     $builder->add('field', ChoiceType::class, [
-     *         'choices' => [
-     *             'Decided' => ['Yes' => true, 'No' => false],
-     *             'Undecided' => ['Maybe' => null],
-     *         ],
-     *     ]);
-     *
-     * In this example, the result of this method is:
-     *
-     *     [
-     *         'Decided' => ['Yes' => '0', 'No' => '1'],
-     *         'Undecided' => ['Maybe' => '2'],
-     *     ]
-     *
-     * @return array<array-key, string|array<array-key, string>> The choice values
-     */
-    public function getStructuredValues(): array;
-
-    /**
-     * Returns the original keys of the choices.
-     *
-     * The original keys are the keys of the choice array that was passed in the
-     * "choice" option of the choice type. Note that this array may contain
-     * duplicates if the "choice" option contained choice groups:
-     *
-     *     $builder->add('field', ChoiceType::class, [
-     *         'choices' => [
-     *             'Decided' => [true, false],
-     *             'Undecided' => [null],
-     *         ],
-     *     ]);
-     *
-     * In this example, the original key 0 appears twice, once for `true` and
-     * once for `null`.
-     *
-     * @return array<array-key, string|int> The original choice keys indexed by the
-     *                                      corresponding choice values
-     */
-    public function getOriginalKeys(): array;
-
-    /**
-     * Returns the choices corresponding to the given values.
-     *
-     * The choices are returned with the same keys and in the same order as the
-     * corresponding values in the given array.
-     *
-     * @param array<array-key, string> $values An array of choice values. Non-existing values in
-     *                                         this array are ignored
-     */
-    public function getChoicesForValues(array $values): array;
-
-    /**
-     * Returns the values corresponding to the given choices.
-     *
-     * The values are returned with the same keys and in the same order as the
-     * corresponding choices in the given array.
-     *
-     * @param array $choices An array of choices. Non-existing choices in this
-     *                       array are ignored
-     *
-     * @return array<array-key, string> An array of choice values
-     */
-    public function getValuesForChoices(array $choices): array;
-
-    /**
-     * Returns whether the values are constant (not dependent of there position).
-     *
-     * Whenever the 'generated' values are dependent on there position
-     * (like an incremented list). This method must return false.
-     *
-     * This method is used to determine whether the value or label must
-     * be used for the normalized input format. And ensures that input always
-     * relates to the correct choice and the value doesn't change whenever
-     * the provided order or length changes (between requests).
-     */
-    public function isValuesConstant(): bool;
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/ChoiceLoaderTrait.php b/lib/Core/Extension/Core/ChoiceList/ChoiceLoaderTrait.php
deleted file mode 100644
index 0a4f1a4c..00000000
--- a/lib/Core/Extension/Core/ChoiceList/ChoiceLoaderTrait.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList;
-
-/**
- * The ChoiceLoaderTrait can used for optimizing empty
- * choices/values in ChoiceLoaders.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-trait ChoiceLoaderTrait
-{
-    protected ?ArrayChoiceList $choiceList = null;
-
-    public function loadChoicesForValues(array $values, ?callable $value = null): array
-    {
-        // Optimize
-        if ($values === []) {
-            return [];
-        }
-
-        // If no callable is set, values are the same as choices
-        if ($value === null) {
-            return $values;
-        }
-
-        return $this->loadChoiceList($value)->getChoicesForValues($values);
-    }
-
-    public function loadValuesForChoices(array $choices, ?callable $value = null): array
-    {
-        // Optimize
-        if ($choices === []) {
-            return [];
-        }
-
-        // If no callable is set, choices are the same as values
-        if ($value === null) {
-            return $choices;
-        }
-
-        return $this->loadChoiceList($value)->getValuesForChoices($choices);
-    }
-
-    /**
-     * Loads a list of choices.
-     *
-     * @see Loader\ChoiceLoader::loadChoiceList
-     */
-    abstract public function loadChoiceList(?callable $value = null): ChoiceList;
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/Factory/CachingFactoryDecorator.php b/lib/Core/Extension/Core/ChoiceList/Factory/CachingFactoryDecorator.php
deleted file mode 100644
index 31fb9e6d..00000000
--- a/lib/Core/Extension/Core/ChoiceList/Factory/CachingFactoryDecorator.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
-
-/**
- * Caches the choice lists created by the decorated factory.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class CachingFactoryDecorator implements ChoiceListFactory
-{
-    /** @var ChoiceList[] */
-    private array $lists = [];
-
-    /** @var ChoiceListView[] */
-    private array $views = [];
-
-    public function __construct(
-        private readonly ChoiceListFactory $decoratedFactory,
-    ) {
-    }
-
-    public function getDecoratedFactory(): ChoiceListFactory
-    {
-        return $this->decoratedFactory;
-    }
-
-    public function createListFromChoices($choices, $value = null): ChoiceList
-    {
-        if ($choices instanceof \Traversable) {
-            $choices = iterator_to_array($choices);
-        }
-
-        // The value is not validated on purpose. The decorated factory may
-        // decide which values to accept and which not.
-
-        // We ignore the choice groups for caching. If two choice lists are
-        // requested with the same choices, but a different grouping, the same
-        // choice list is returned.
-        self::flatten($choices, $flatChoices);
-
-        $hash = self::generateHash([$flatChoices, $value], 'fromChoices');
-
-        if (! isset($this->lists[$hash])) {
-            $this->lists[$hash] = $this->decoratedFactory->createListFromChoices($choices, $value);
-        }
-
-        return $this->lists[$hash];
-    }
-
-    public function createListFromLoader(ChoiceLoader $loader, $value = null): ChoiceList
-    {
-        $hash = self::generateHash([$loader, $value], 'fromLoader');
-
-        if (! isset($this->lists[$hash])) {
-            $this->lists[$hash] = $this->decoratedFactory->createListFromLoader($loader, $value);
-        }
-
-        return $this->lists[$hash];
-    }
-
-    public function createView(ChoiceList $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null): ChoiceListView
-    {
-        // The input is not validated on purpose. This way, the decorated
-        // factory may decide which input to accept and which not.
-        $hash = self::generateHash([$list, $preferredChoices, $label, $index, $groupBy, $attr]);
-
-        if (! isset($this->views[$hash])) {
-            $this->views[$hash] = $this->decoratedFactory->createView(
-                $list,
-                $preferredChoices,
-                $label,
-                $index,
-                $groupBy,
-                $attr
-            );
-        }
-
-        return $this->views[$hash];
-    }
-
-    /**
-     * Generates a SHA-256 hash for the given value.
-     *
-     * Optionally, a namespace string can be passed. Calling this method will produce
-     * the same values, but different namespaces, will return different hashes.
-     *
-     * @param mixed  $value     The value to hash
-     * @param string $namespace Optional. The namespace
-     *
-     * @return string The SHA-256 hash
-     */
-    private static function generateHash($value, string $namespace = ''): string
-    {
-        if (\is_object($value)) {
-            $value = spl_object_hash($value);
-        } elseif (\is_array($value)) {
-            array_walk_recursive($value, static function (&$v): void {
-                if (\is_object($v)) {
-                    $v = spl_object_hash($v);
-                }
-            });
-        }
-
-        return hash('sha256', $namespace . ':' . serialize($value));
-    }
-
-    /**
-     * Flattens an array into the given output variable.
-     *
-     * @param array      $array  The array to flatten
-     * @param array|null $output The flattened output
-     */
-    private static function flatten(array $array, &$output): void
-    {
-        if ($output === null) {
-            $output = [];
-        }
-
-        foreach ($array as $key => $value) {
-            if (\is_array($value)) {
-                self::flatten($value, $output);
-
-                continue;
-            }
-
-            $output[$key] = $value;
-        }
-    }
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/Factory/ChoiceListFactory.php b/lib/Core/Extension/Core/ChoiceList/Factory/ChoiceListFactory.php
deleted file mode 100644
index 04b27343..00000000
--- a/lib/Core/Extension/Core/ChoiceList/Factory/ChoiceListFactory.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
-
-/**
- * Creates {@link ChoiceList} instances.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ChoiceListFactory
-{
-    /**
-     * Creates a choice list for the given choices.
-     *
-     * The choices should be passed in the values of the choices array.
-     *
-     * Optionally, a callable can be passed for generating the choice values.
-     * The callable receives the choice as first and the array key as the second
-     * argument.
-     *
-     * @param array|\Traversable $choices The choices
-     * @param callable|null      $value   The callable generating the choice
-     *                                    values
-     */
-    public function createListFromChoices($choices, $value = null): ChoiceList;
-
-    /**
-     * Creates a choice list that is loaded with the given loader.
-     *
-     * Optionally, a callable can be passed for generating the choice values.
-     * The callable receives the choice as first and the array key as the second
-     * argument.
-     *
-     * @param ChoiceLoader  $loader The choice loader
-     * @param callable|null $value  The callable generating the choice
-     *                              values
-     */
-    public function createListFromLoader(ChoiceLoader $loader, $value = null): ChoiceList;
-
-    /**
-     * Creates a view for the given choice list.
-     *
-     * Callables may be passed for all optional arguments. The callables receive
-     * the choice as first and the array key as the second argument.
-     *
-     *  * The callable for the label and the name should return the generated
-     *    label/choice name.
-     *  * The callable for the preferred choices should return true or false,
-     *    depending on whether the choice should be preferred or not.
-     *  * The callable for the grouping should return the group name or null if
-     *    a choice should not be grouped.
-     *  * The callable for the attributes should return an array of HTML
-     *    attributes that will be inserted in the tag of the choice.
-     *
-     * If no callable is passed, the labels will be generated from the choice
-     * keys. The view indices will be generated using an incrementing integer
-     * by default.
-     *
-     * The preferred choices can also be passed as array. Each choice that is
-     * contained in that array will be marked as preferred.
-     *
-     * The attributes can be passed as multi-dimensional array. The keys should
-     * match the keys of the choices. The values should be arrays of HTML
-     * attributes that should be added to the respective choice.
-     *
-     * @param ChoiceList          $list             The choice list
-     * @param array|callable|null $preferredChoices The preferred choices
-     * @param callable|null       $label            The callable generating the
-     *                                              choice labels
-     * @param callable|null       $index            The callable generating the
-     *                                              view indices
-     * @param callable|null       $groupBy          The callable generating the
-     *                                              group names
-     * @param array|callable|null $attr             The callable generating the
-     *                                              HTML attributes
-     */
-    public function createView(ChoiceList $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null): ChoiceListView;
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/Factory/DefaultChoiceListFactory.php b/lib/Core/Extension/Core/ChoiceList/Factory/DefaultChoiceListFactory.php
deleted file mode 100644
index 978daa7a..00000000
--- a/lib/Core/Extension/Core/ChoiceList/Factory/DefaultChoiceListFactory.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\LazyChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceGroupView;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceView;
-
-/**
- * Default implementation of {@link ChoiceListFactory}.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class DefaultChoiceListFactory implements ChoiceListFactory
-{
-    public function createListFromChoices($choices, $value = null): ChoiceList
-    {
-        return new ArrayChoiceList($choices, $value);
-    }
-
-    public function createListFromLoader(ChoiceLoader $loader, $value = null): ChoiceList
-    {
-        return new LazyChoiceList($loader, $value);
-    }
-
-    public function createView(ChoiceList $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null): ChoiceListView
-    {
-        $preferredViews = [];
-        $otherViews = [];
-        $choices = $list->getChoices();
-        $keys = $list->getOriginalKeys();
-
-        if (! \is_callable($preferredChoices) && ! empty($preferredChoices)) {
-            $preferredChoices = static fn ($choice): bool => array_search($choice, $preferredChoices, true) !== false;
-        }
-
-        // The names are generated from an incrementing integer by default
-        if ($index === null) {
-            $index = 0;
-        }
-
-        // If $groupBy is a callable, choices are added to the group with the
-        // name returned by the callable. If the callable returns null, the
-        // choice is not added to any group
-        if (\is_callable($groupBy)) {
-            foreach ($choices as $value => $choice) {
-                self::addChoiceViewGroupedBy(
-                    $groupBy,
-                    $choice,
-                    (string) $value,
-                    $label,
-                    $keys,
-                    $index,
-                    $attr,
-                    $preferredChoices,
-                    $preferredViews,
-                    $otherViews
-                );
-            }
-        } else {
-            // Otherwise use the original structure of the choices
-            self::addChoiceViewsGroupedBy(
-                $list->getStructuredValues(),
-                $label,
-                $choices,
-                $keys,
-                $index,
-                $attr,
-                $preferredChoices,
-                $preferredViews,
-                $otherViews
-            );
-        }
-
-        // Remove any empty group view that may have been created by
-        // addChoiceViewGroupedBy()
-        foreach ($preferredViews as $key => $view) {
-            if ($view instanceof ChoiceGroupView && \count($view->choices) === 0) {
-                unset($preferredViews[$key]);
-            }
-        }
-
-        foreach ($otherViews as $key => $view) {
-            if ($view instanceof ChoiceGroupView && \count($view->choices) === 0) {
-                unset($otherViews[$key]);
-            }
-        }
-
-        return new ChoiceListView($otherViews, $preferredViews);
-    }
-
-    private static function addChoiceView($choice, $value, $label, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews): void
-    {
-        // $value may be an integer or a string, since it's stored in the array
-        // keys. We want to guarantee it's a string though.
-        $key = $keys[$value];
-        $nextIndex = \is_int($index) ? $index++ : $index($choice, $key, $value);
-
-        // BC normalize label to accept a false value
-        if ($label === null) {
-            // If the labels are null, use the original choice key by default
-            $label = (string) $key;
-        } elseif ($label !== false) {
-            // If "choice_label" is set to false and "expanded" is true, the value false
-            // should be passed on to the "label" option of the checkboxes/radio buttons
-            $dynamicLabel = $label($choice, $key, $value);
-            $label = $dynamicLabel === false ? false : (string) $dynamicLabel;
-        }
-
-        $view = new ChoiceView(
-            $choice,
-            $value,
-            $label,
-            // The attributes may be a callable or a mapping from choice indices
-            // to nested arrays
-            \is_callable($attr) ? $attr($choice, $key, $value) : ($attr[$key] ?? [])
-        );
-
-        // $isPreferred may be null if no choices are preferred
-        if ($isPreferred && $isPreferred($choice, $key, $value)) {
-            $preferredViews[$nextIndex] = $view;
-        } else {
-            $otherViews[$nextIndex] = $view;
-        }
-    }
-
-    private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews): void
-    {
-        foreach ($groupBy as $key => $value) {
-            if ($value === null) {
-                continue;
-            }
-
-            // Add the contents of groups to new ChoiceGroupView instances
-            if (\is_array($value)) {
-                $preferredViewsForGroup = [];
-                $otherViewsForGroup = [];
-
-                self::addChoiceViewsGroupedBy(
-                    $value,
-                    $label,
-                    $choices,
-                    $keys,
-                    $index,
-                    $attr,
-                    $isPreferred,
-                    $preferredViewsForGroup,
-                    $otherViewsForGroup
-                );
-
-                if (\count($preferredViewsForGroup) > 0) {
-                    $preferredViews[$key] = new ChoiceGroupView($key, $preferredViewsForGroup);
-                }
-
-                if (\count($otherViewsForGroup) > 0) {
-                    $otherViews[$key] = new ChoiceGroupView($key, $otherViewsForGroup);
-                }
-
-                continue;
-            }
-
-            // Add ungrouped items directly
-            self::addChoiceView(
-                $choices[$value],
-                $value,
-                $label,
-                $keys,
-                $index,
-                $attr,
-                $isPreferred,
-                $preferredViews,
-                $otherViews
-            );
-        }
-    }
-
-    private static function addChoiceViewGroupedBy($groupBy, $choice, $value, $label, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews): void
-    {
-        $groupLabel = $groupBy($choice, $keys[$value], $value);
-
-        if ($groupLabel === null) {
-            // If the callable returns null, don't group the choice
-            self::addChoiceView(
-                $choice,
-                $value,
-                $label,
-                $keys,
-                $index,
-                $attr,
-                $isPreferred,
-                $preferredViews,
-                $otherViews
-            );
-
-            return;
-        }
-
-        $groupLabel = (string) $groupLabel;
-
-        // Initialize the group views if necessary. Unnecessarily built group
-        // views will be cleaned up at the end of createView()
-        if (! isset($preferredViews[$groupLabel])) {
-            $preferredViews[$groupLabel] = new ChoiceGroupView($groupLabel);
-            $otherViews[$groupLabel] = new ChoiceGroupView($groupLabel);
-        }
-
-        self::addChoiceView(
-            $choice,
-            $value,
-            $label,
-            $keys,
-            $index,
-            $attr,
-            $isPreferred,
-            $preferredViews[$groupLabel]->choices,
-            $otherViews[$groupLabel]->choices
-        );
-    }
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/Factory/PropertyAccessDecorator.php b/lib/Core/Extension/Core/ChoiceList/Factory/PropertyAccessDecorator.php
deleted file mode 100644
index fcdafb6b..00000000
--- a/lib/Core/Extension/Core/ChoiceList/Factory/PropertyAccessDecorator.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
-use Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException;
-use Symfony\Component\PropertyAccess\PropertyAccess;
-use Symfony\Component\PropertyAccess\PropertyAccessor;
-use Symfony\Component\PropertyAccess\PropertyPath;
-
-/**
- * Adds property path support to a choice list factory.
- *
- * Pass the decorated factory to the constructor:
- *
- * ```php
- * $decorator = new PropertyAccessDecorator($factory);
- * ```
- *
- * You can now pass property paths for generating choice values, labels, view
- * indices, HTML attributes and for determining the preferred choices and the
- * choice groups:
- *
- * ```php
- * // extract values from the $value property
- * $list = $createListFromChoices($objects, 'value');
- * ```
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class PropertyAccessDecorator implements ChoiceListFactory
-{
-    private readonly PropertyAccessor $propertyAccessor;
-
-    public function __construct(
-        private readonly ChoiceListFactory $decoratedFactory,
-        ?PropertyAccessor $propertyAccessor = null,
-    ) {
-        $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor();
-    }
-
-    public function getDecoratedFactory(): ChoiceListFactory
-    {
-        return $this->decoratedFactory;
-    }
-
-    /**
-     * @param array|\Traversable                $choices The choices
-     * @param callable|PropertyPath|string|null $value   The callable or path for
-     *                                                   generating the choice values
-     */
-    public function createListFromChoices($choices, $value = null): ChoiceList
-    {
-        if (\is_string($value)) {
-            $value = new PropertyPath($value);
-        }
-
-        if ($value instanceof PropertyPath) {
-            $accessor = $this->propertyAccessor;
-            $value = static function ($choice) use ($accessor, $value) {
-                // The callable may be invoked with a non-object/array value
-                // when such values are passed to
-                // ChoiceList::getValuesForChoices(). Handle this case
-                // so that the call to getValue() doesn't break.
-                if (\is_object($choice) || \is_array($choice)) {
-                    return $accessor->getValue($choice, $value);
-                }
-            };
-        }
-
-        return $this->decoratedFactory->createListFromChoices($choices, $value);
-    }
-
-    /**
-     * @param ChoiceLoader                      $loader The choice loader
-     * @param callable|PropertyPath|string|null $value  The callable or path for
-     *                                                  generating the choice values
-     */
-    public function createListFromLoader(ChoiceLoader $loader, $value = null): ChoiceList
-    {
-        if (\is_string($value)) {
-            $value = new PropertyPath($value);
-        }
-
-        if ($value instanceof PropertyPath) {
-            $accessor = $this->propertyAccessor;
-            $value = static function ($choice) use ($accessor, $value) {
-                // The callable may be invoked with a non-object/array value
-                // when such values are passed to
-                // ChoiceList::getValuesForChoices(). Handle this case
-                // so that the call to getValue() doesn't break.
-                if (\is_object($choice) || \is_array($choice)) {
-                    return $accessor->getValue($choice, $value);
-                }
-            };
-        }
-
-        return $this->decoratedFactory->createListFromLoader($loader, $value);
-    }
-
-    /**
-     * @param ChoiceList                              $list             The choice list
-     * @param array|callable|PropertyPath|string|null $preferredChoices The preferred choices
-     * @param callable|PropertyPath|string|null       $label            The callable or path generating the choice labels
-     * @param callable|PropertyPath|string|null       $index            The callable or path generating the view indices
-     * @param callable|PropertyPath|string|null       $groupBy          The callable or path generating the group names
-     * @param array|callable|PropertyPath|string|null $attr             The callable or path generating the HTML attributes
-     */
-    public function createView(ChoiceList $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null): ChoiceListView
-    {
-        $accessor = $this->propertyAccessor;
-
-        if (\is_string($label)) {
-            $label = new PropertyPath($label);
-        }
-
-        if ($label instanceof PropertyPath) {
-            $label = static fn ($choice) => $accessor->getValue($choice, $label);
-        }
-
-        if (\is_string($preferredChoices)) {
-            $preferredChoices = new PropertyPath($preferredChoices);
-        }
-
-        if ($preferredChoices instanceof PropertyPath) {
-            $preferredChoices = static function ($choice) use ($accessor, $preferredChoices) {
-                try {
-                    return $accessor->getValue($choice, $preferredChoices);
-                } catch (UnexpectedTypeException) {
-                    // Assume not preferred if not readable
-                    return false;
-                }
-            };
-        }
-
-        if (\is_string($index)) {
-            $index = new PropertyPath($index);
-        }
-
-        if ($index instanceof PropertyPath) {
-            $index = static fn ($choice) => $accessor->getValue($choice, $index);
-        }
-
-        if (\is_string($groupBy)) {
-            $groupBy = new PropertyPath($groupBy);
-        }
-
-        if ($groupBy instanceof PropertyPath) {
-            $groupBy = static function ($choice) use ($accessor, $groupBy) {
-                try {
-                    return $accessor->getValue($choice, $groupBy);
-                } catch (UnexpectedTypeException) {
-                    // Don't group if path is not readable
-                }
-            };
-        }
-
-        if (\is_string($attr)) {
-            $attr = new PropertyPath($attr);
-        }
-
-        if ($attr instanceof PropertyPath) {
-            $attr = static fn ($choice) => $accessor->getValue($choice, $attr);
-        }
-
-        return $this->decoratedFactory->createView($list, $preferredChoices, $label, $index, $groupBy, $attr);
-    }
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/LazyChoiceList.php b/lib/Core/Extension/Core/ChoiceList/LazyChoiceList.php
deleted file mode 100644
index 0286cb57..00000000
--- a/lib/Core/Extension/Core/ChoiceList/LazyChoiceList.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-
-/**
- * A choice list that loads its choices lazily.
- *
- * The choices are fetched using a {@link ChoiceLoaderInterface} instance.
- * If only {@link getChoicesForValues()} or {@link getValuesForChoices()} is
- * called, the choice list is only loaded partially for improved performance.
- *
- * Once {@link getChoices()} or {@link getValues()} is called, the list is
- * loaded fully.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class LazyChoiceList implements ChoiceList
-{
-    /**
-     * The callable creating string values for each choice.
-     *
-     * If null, choices are simply cast to strings.
-     *
-     * @var callable|null
-     */
-    private mixed $value;
-
-    /**
-     * Optionally, a callable can be passed for generating the choice values.
-     * The callable receives the choice as first and the array key as the second
-     * argument.
-     *
-     * @param ChoiceLoader  $loader The choice loader
-     * @param callable|null $value  The callable generating the choice
-     *                              values
-     */
-    public function __construct(
-        private readonly ChoiceLoader $loader,
-        ?callable $value = null,
-    ) {
-        $this->value = $value;
-    }
-
-    public function getChoices(): array
-    {
-        return $this->loader->loadChoiceList($this->value)->getChoices();
-    }
-
-    public function getValues(): array
-    {
-        return $this->loader->loadChoiceList($this->value)->getValues();
-    }
-
-    public function getStructuredValues(): array
-    {
-        return $this->loader->loadChoiceList($this->value)->getStructuredValues();
-    }
-
-    public function getOriginalKeys(): array
-    {
-        return $this->loader->loadChoiceList($this->value)->getOriginalKeys();
-    }
-
-    public function getChoicesForValues(array $values): array
-    {
-        return $this->loader->loadChoicesForValues($values, $this->value);
-    }
-
-    public function getValuesForChoices(array $choices): array
-    {
-        return $this->loader->loadValuesForChoices($choices, $this->value);
-    }
-
-    public function isValuesConstant(): bool
-    {
-        return $this->loader->isValuesConstant();
-    }
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/Loader/CallbackChoiceLoader.php b/lib/Core/Extension/Core/ChoiceList/Loader/CallbackChoiceLoader.php
deleted file mode 100644
index a6ac3894..00000000
--- a/lib/Core/Extension/Core/ChoiceList/Loader/CallbackChoiceLoader.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceLoaderTrait;
-
-/**
- * Loads an {@link ArrayChoiceList} instance from a callable returning an array of choices.
- *
- * @author Jules Pietri <jules@heahprod.com>
- */
-class CallbackChoiceLoader implements ChoiceLoader
-{
-    use ChoiceLoaderTrait;
-
-    /** @var callable */
-    private mixed $callback;
-
-    /**
-     * @param callable $callback          The callable returning an array of choices
-     * @param bool     $valuesAreConstant Indicate whether values are constant
-     *                                    (not dependent of there position)
-     */
-    public function __construct(
-        callable $callback,
-        private bool $valuesAreConstant = false,
-    ) {
-        $this->callback = $callback;
-    }
-
-    public function loadChoiceList(?callable $value = null): ChoiceList
-    {
-        if ($this->choiceList !== null) {
-            return $this->choiceList;
-        }
-
-        return $this->choiceList = new ArrayChoiceList(($this->callback)(), $value);
-    }
-
-    public function isValuesConstant(): bool
-    {
-        return $this->valuesAreConstant;
-    }
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/Loader/ChoiceLoader.php b/lib/Core/Extension/Core/ChoiceList/Loader/ChoiceLoader.php
deleted file mode 100644
index e043d9a8..00000000
--- a/lib/Core/Extension/Core/ChoiceList/Loader/ChoiceLoader.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-
-/**
- * Loads a choice list.
- *
- * The methods {@link loadChoicesForValues()} and {@link loadValuesForChoices()}
- * can be used to load the list only partially in cases where a fully-loaded
- * list is not necessary.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface ChoiceLoader
-{
-    /**
-     * Loads a list of choices.
-     *
-     * Optionally, a callable can be passed for generating the choice values.
-     * The callable receives the choice as first and the array key as the second
-     * argument.
-     *
-     * @param callable|null $value The callable which generates the values
-     *                             from choices
-     */
-    public function loadChoiceList(?callable $value = null): ChoiceList;
-
-    /**
-     * Loads the choices corresponding to the given values.
-     *
-     * The choices are returned with the same keys and in the same order as the
-     * corresponding values in the given array.
-     *
-     * Optionally, a callable can be passed for generating the choice values.
-     * The callable receives the choice as first and the array key as the second
-     * argument.
-     *
-     * @param string[]      $values An array of choice values. Non-existing
-     *                              values in this array are ignored
-     * @param callable|null $value  The callable generating the choice values
-     */
-    public function loadChoicesForValues(array $values, ?callable $value = null): array;
-
-    /**
-     * Loads the values corresponding to the given choices.
-     *
-     * The values are returned with the same keys and in the same order as the
-     * corresponding choices in the given array.
-     *
-     * Optionally, a callable can be passed for generating the choice values.
-     * The callable receives the choice as first and the array key as the second
-     * argument.
-     *
-     * @param array         $choices An array of choices. Non-existing choices in
-     *                               this array are ignored
-     * @param callable|null $value   The callable generating the choice values
-     *
-     * @return string[] An array of choice values
-     */
-    public function loadValuesForChoices(array $choices, ?callable $value = null): array;
-
-    /**
-     * Returns whether the values are constant (not dependent of there position).
-     *
-     * {@see ChoiceList::isValuesConstant}
-     */
-    public function isValuesConstant(): bool;
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/View/ChoiceGroupView.php b/lib/Core/Extension/Core/ChoiceList/View/ChoiceGroupView.php
deleted file mode 100644
index 78358971..00000000
--- a/lib/Core/Extension/Core/ChoiceList/View/ChoiceGroupView.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList\View;
-
-/**
- * Represents a group of choices in templates.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ChoiceGroupView implements \IteratorAggregate
-{
-    public string $label;
-
-    /** @var ChoiceGroupView[]|ChoiceView[] */
-    public array $choices;
-
-    /**
-     * @param string                         $label   The label of the group
-     * @param ChoiceGroupView[]|ChoiceView[] $choices the choice views in the
-     *                                                group
-     */
-    public function __construct(string $label, array $choices = [])
-    {
-        $this->label = $label;
-        $this->choices = $choices;
-    }
-
-    /**
-     * @return \ArrayIterator|ChoiceGroupView[]|ChoiceView[]
-     */
-    public function getIterator(): \Traversable
-    {
-        return new \ArrayIterator($this->choices);
-    }
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/View/ChoiceListView.php b/lib/Core/Extension/Core/ChoiceList/View/ChoiceListView.php
deleted file mode 100644
index cb5a0663..00000000
--- a/lib/Core/Extension/Core/ChoiceList/View/ChoiceListView.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList\View;
-
-/**
- * Represents a choice list in templates.
- *
- * A choice list contains choices and optionally preferred choices which are
- * displayed in the very beginning of the list. Both choices and preferred
- * choices may be grouped in {@link ChoiceGroupView} instances.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class ChoiceListView
-{
-    /** @var ChoiceGroupView[]|ChoiceView[] */
-    public array $choices = [];
-
-    /** @var ChoiceGroupView[]|ChoiceView[] */
-    public array $preferredChoices = [];
-
-    /**
-     * All the choices (without grouping).
-     *
-     * @var ChoiceView[]|null
-     */
-    public ?array $choicesByLabel = null;
-
-    /**
-     * Label by the choice-value.
-     *
-     * @var string[]
-     */
-    public array $labelsByValue = [];
-
-    /**
-     * @param ChoiceGroupView[]|ChoiceView[] $choices          The choice views
-     * @param ChoiceGroupView[]|ChoiceView[] $preferredChoices the preferred
-     *                                                         choice views
-     */
-    public function __construct(array $choices = [], array $preferredChoices = [])
-    {
-        $this->choices = $choices;
-        $this->preferredChoices = $preferredChoices;
-    }
-
-    public function initChoicesByLabel(): void
-    {
-        $this->choicesByLabel = [];
-
-        foreach ($this->choices as $view) {
-            if ($view instanceof ChoiceGroupView) {
-                foreach ($view->choices as $subView) {
-                    $this->choicesByLabel[$subView->label] = $subView;
-                    $this->labelsByValue[$subView->value] = $subView->label;
-                }
-            } else {
-                $this->choicesByLabel[$view->label] = $view;
-                $this->labelsByValue[$view->value] = $view->label;
-            }
-        }
-
-        foreach ($this->preferredChoices as $view) {
-            if ($view instanceof ChoiceGroupView) {
-                foreach ($view->choices as $subView) {
-                    $this->choicesByLabel[$subView->label] = $subView;
-                    $this->labelsByValue[$subView->value] = $subView->label;
-                }
-            } else {
-                $this->choicesByLabel[$view->label] = $view;
-                $this->labelsByValue[$view->value] = $view->label;
-            }
-        }
-    }
-}
diff --git a/lib/Core/Extension/Core/ChoiceList/View/ChoiceView.php b/lib/Core/Extension/Core/ChoiceList/View/ChoiceView.php
deleted file mode 100644
index c596b020..00000000
--- a/lib/Core/Extension/Core/ChoiceList/View/ChoiceView.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ChoiceList\View;
-
-/**
- * Represents a choice in templates.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ChoiceView
-{
-    /**
-     * @param mixed                $data  The original choice
-     * @param string               $value The view representation of the choice
-     * @param string               $label The label displayed to humans
-     * @param array<string, mixed> $attr  Additional attributes for the HTML tag
-     */
-    public function __construct(
-        public mixed $data,
-        public string $value,
-        public string $label,
-        public array $attr = [],
-    ) {
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/BaseDateTimeTransformer.php b/lib/Core/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
deleted file mode 100644
index 4a87092b..00000000
--- a/lib/Core/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Florian Eckerstorfer <florian@eckerstorfer.org>
- */
-abstract class BaseDateTimeTransformer implements DataTransformer
-{
-    /** @var int[] */
-    protected static $formats = [
-        \IntlDateFormatter::NONE,
-        \IntlDateFormatter::FULL,
-        \IntlDateFormatter::LONG,
-        \IntlDateFormatter::MEDIUM,
-        \IntlDateFormatter::SHORT,
-    ];
-
-    protected string $inputTimezone;
-    protected string $outputTimezone;
-
-    /**
-     * @throws InvalidArgumentException if a timezone is not valid
-     */
-    public function __construct(?string $inputTimezone = null, ?string $outputTimezone = null)
-    {
-        $this->inputTimezone = $inputTimezone ?: date_default_timezone_get();
-        $this->outputTimezone = $outputTimezone ?: date_default_timezone_get();
-
-        // Check if input and output timezones are valid
-        try {
-            new \DateTimeZone($this->inputTimezone);
-        } catch (\Exception $e) {
-            throw new InvalidArgumentException(\sprintf('Input timezone is invalid: "%s".', $this->inputTimezone), $e->getCode(), $e);
-        }
-
-        try {
-            new \DateTimeZone($this->outputTimezone);
-        } catch (\Exception $e) {
-            throw new InvalidArgumentException(\sprintf('Output timezone is invalid: "%s".', $this->outputTimezone), $e->getCode(), $e);
-        }
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/BirthdayTransformer.php b/lib/Core/Extension/Core/DataTransformer/BirthdayTransformer.php
deleted file mode 100644
index c166b384..00000000
--- a/lib/Core/Extension/Core/DataTransformer/BirthdayTransformer.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * Transforms between a date string and a DateTime object
- * and between a ISO string and an integer.
- */
-final class BirthdayTransformer implements DataTransformer
-{
-    public function __construct(
-        private readonly DataTransformer $transformer,
-        private readonly bool $allowAge = true,
-        private readonly bool $allowFutureDate = false,
-    ) {
-    }
-
-    public function transform($value)
-    {
-        if (\is_int($value)) {
-            if (! $this->allowAge) {
-                throw new TransformationFailedException('Age support is not enabled.');
-            }
-
-            return $value;
-        }
-
-        return $this->transformer->transform($value);
-    }
-
-    public function reverseTransform($value)
-    {
-        $value = $this->transformWhenInteger($value);
-
-        if (\is_int($value)) {
-            if (! $this->allowAge) {
-                throw new TransformationFailedException('Age support is not enabled.');
-            }
-
-            return $value;
-        }
-
-        $value = $this->transformer->reverseTransform($value);
-
-        // Force the UTC timezone with 00:00:00 for correct comparison.
-        $value = $value->setTimezone(new \DateTimeZone('UTC'));
-        $value = $value->setTime(0, 0, 0);
-
-        if (! $this->allowFutureDate) {
-            $this->validateDate($value);
-        }
-
-        return $value;
-    }
-
-    private function transformWhenInteger($value)
-    {
-        if (ctype_digit((string) $value)) {
-            return (int) $value;
-        }
-
-        return $value;
-    }
-
-    private function validateDate(\DateTimeImmutable $value): void
-    {
-        static $currentDate;
-
-        if (! $currentDate) {
-            $currentDate = new \DateTimeImmutable('now', new \DateTimeZone('UTC'));
-            $currentDate = $currentDate->setTime(0, 0);
-        }
-
-        if ($value > $currentDate) {
-            throw new TransformationFailedException(
-                \sprintf(
-                    'Date "%s" is higher then current date "%s". Are you a time traveler?',
-                    $value->format('Y-m-d'),
-                    $currentDate->format('Y-m-d')
-                )
-            );
-        }
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/BooleanToLocalizedValueTransformer.php b/lib/Core/Extension/Core/DataTransformer/BooleanToLocalizedValueTransformer.php
deleted file mode 100644
index f45ef9cd..00000000
--- a/lib/Core/Extension/Core/DataTransformer/BooleanToLocalizedValueTransformer.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-final class BooleanToLocalizedValueTransformer implements DataTransformer
-{
-    /**
-     * @param array<scalar> $trueValues
-     * @param array<scalar> $falseValues
-     */
-    public function __construct(
-        private readonly string $trueLabel = 'yes',
-        private readonly string $falseLabel = 'no',
-        private readonly array $trueValues = ['true', '1', 1, 'on', 'yes'],
-        private readonly array $falseValues = ['false', '0', 0, 'off', 'no'],
-    ) {
-    }
-
-    public function transform(mixed $value): mixed
-    {
-        if ($value === null) {
-            return null;
-        }
-
-        if (! \is_bool($value)) {
-            throw new TransformationFailedException(\sprintf('Expected a boolean value, got "%s".', get_debug_type($value)));
-        }
-
-        return $value ? $this->trueLabel : $this->falseLabel;
-    }
-
-    public function reverseTransform(mixed $value): mixed
-    {
-        if ($value === null || $value === '') {
-            return null;
-        }
-
-        if (! \is_scalar($value)) {
-            throw new TransformationFailedException(\sprintf('Expected a scalar value, got "%s".', get_debug_type($value)));
-        }
-
-        if (\is_string($value)) {
-            $value = mb_strtolower($value);
-        }
-
-        if (\in_array($value, $this->trueValues, true)) {
-            return true;
-        }
-
-        if (\in_array($value, $this->falseValues, true)) {
-            return false;
-        }
-
-        throw new TransformationFailedException(\sprintf('Expected one of ("%s") or ("%s"), got "%s".', implode('", "', $this->trueValues), implode('", "', $this->falseValues), $value));
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/BooleanToNormValueTransformer.php b/lib/Core/Extension/Core/DataTransformer/BooleanToNormValueTransformer.php
deleted file mode 100644
index 7d48c8aa..00000000
--- a/lib/Core/Extension/Core/DataTransformer/BooleanToNormValueTransformer.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-final class BooleanToNormValueTransformer implements DataTransformer
-{
-    public function __construct(
-        private readonly string $trueValue = 'true',
-        private readonly string $falseValue = 'false',
-    ) {
-    }
-
-    public function transform(mixed $value): mixed
-    {
-        if ($value === null) {
-            return null;
-        }
-
-        if (! \is_bool($value)) {
-            throw new TransformationFailedException(\sprintf('Expected a boolean value, got "%s".', \gettype($value)));
-        }
-
-        return $value ? $this->trueValue : $this->falseValue;
-    }
-
-    public function reverseTransform(mixed $value): mixed
-    {
-        if ($value === null || $value === '') {
-            return null;
-        }
-
-        if (\is_bool($value)) {
-            return $value;
-        }
-
-        if (! \is_string($value)) {
-            throw new TransformationFailedException(\sprintf('Expected a string or boolean value, got "%s".', \gettype($value)));
-        }
-
-        if ($value === $this->trueValue) {
-            return true;
-        }
-
-        if ($value === $this->falseValue) {
-            return false;
-        }
-
-        throw new TransformationFailedException(\sprintf('Expected one of "%s" or "%s", got "%s".', $this->trueValue, $this->falseValue, $value));
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/ChoiceToLabelTransformer.php b/lib/Core/Extension/Core/DataTransformer/ChoiceToLabelTransformer.php
deleted file mode 100644
index 8bfabd37..00000000
--- a/lib/Core/Extension/Core/DataTransformer/ChoiceToLabelTransformer.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class ChoiceToLabelTransformer implements DataTransformer
-{
-    public function __construct(
-        private readonly ChoiceList $choiceList,
-        private readonly ChoiceListView $choiceListView,
-    ) {
-    }
-
-    public function transform($choice)
-    {
-        if ($this->choiceListView->choicesByLabel === null) {
-            $this->choiceListView->initChoicesByLabel();
-        }
-
-        $value = $this->choiceList->getValuesForChoices([$choice]);
-        $value = current($value);
-
-        if (! \array_key_exists($value, $this->choiceListView->labelsByValue)) {
-            throw new TransformationFailedException(\sprintf('The choice "%s" does not exist or is not unique', $choice));
-        }
-
-        return $this->choiceListView->labelsByValue[$value];
-    }
-
-    public function reverseTransform($value)
-    {
-        if ($value !== null && ! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string or null.');
-        }
-
-        if ($value === null || $value === '') {
-            return null;
-        }
-
-        if ($this->choiceListView->choicesByLabel === null) {
-            $this->choiceListView->initChoicesByLabel();
-        }
-
-        if (! \array_key_exists($value, $this->choiceListView->choicesByLabel)) {
-            throw new TransformationFailedException(\sprintf('The choice "%s" does not exist or is not unique', $value));
-        }
-
-        return $this->choiceListView->choicesByLabel[$value]->data;
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/lib/Core/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
deleted file mode 100644
index 8a705cc4..00000000
--- a/lib/Core/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class ChoiceToValueTransformer implements DataTransformer
-{
-    public function __construct(
-        private readonly ChoiceList $choiceList,
-    ) {
-    }
-
-    public function transform(mixed $value): mixed
-    {
-        $value = $this->choiceList->getValuesForChoices([$value]);
-
-        return (string) current($value);
-    }
-
-    public function reverseTransform(mixed $value): mixed
-    {
-        if ($value !== null && ! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string or null.');
-        }
-
-        $choices = $this->choiceList->getChoicesForValues([(string) $value]);
-
-        if (\count($choices) !== 1) {
-            if ($value === null || $value === '') {
-                return null;
-            }
-
-            throw new TransformationFailedException(\sprintf('The choice "%s" does not exist or is not unique', $value));
-        }
-
-        return current($choices);
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/DateIntervalTransformer.php b/lib/Core/Extension/Core/DataTransformer/DateIntervalTransformer.php
deleted file mode 100644
index 002d3b77..00000000
--- a/lib/Core/Extension/Core/DataTransformer/DateIntervalTransformer.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Carbon\CarbonInterval;
-use Carbon\Translator;
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use function Symfony\Component\String\u;
-
-final class DateIntervalTransformer implements DataTransformer
-{
-    private string $toLocale;
-
-    public function __construct(
-        private readonly string $fromLocale,
-        ?string $toLocale = null,
-    ) {
-        $this->toLocale = $toLocale ?? $fromLocale;
-    }
-
-    /**
-     * @param CarbonInterval|null $value
-     */
-    public function transform($value): string
-    {
-        if ($value === null) {
-            return '';
-        }
-
-        if (! $value instanceof CarbonInterval) {
-            throw new TransformationFailedException('Expected a CarbonInterval instance or null.');
-        }
-
-        $value = clone $value;
-        $value->locale($this->toLocale);
-
-        if ($value->invert === 1) {
-            return u($value->forHumans())->prepend('-')->toString();
-        }
-
-        return $value->forHumans();
-    }
-
-    /**
-     * @param string $value
-     */
-    public function reverseTransform(mixed $value): mixed
-    {
-        if (! \is_scalar($value)) {
-            throw new TransformationFailedException('Expected a scalar.');
-        }
-
-        if ($value === '') {
-            return null;
-        }
-
-        try {
-            $value = $this->translateNumberWords($value);
-            $uValue = u($value)->trim();
-
-            if ($uValue->startsWith('-')) {
-                return CarbonInterval::parseFromLocale($uValue->trimStart('-')->toString(), $this->fromLocale)->invert();
-            }
-
-            return CarbonInterval::parseFromLocale($uValue->toString(), $this->fromLocale);
-        } catch (\Exception $e) {
-            throw new TransformationFailedException('Unable to parse value to DateInterval.', 0, $e);
-        }
-    }
-
-    private function translateNumberWords(string $timeString): string
-    {
-        $timeString = strtr($timeString, ['’' => "'"]);
-
-        $translator = Translator::get($this->fromLocale);
-        $translations = $translator->getMessages();
-
-        if (! isset($translations[$this->fromLocale])) {
-            return $timeString;
-        }
-
-        $messages = $translations[$this->fromLocale];
-
-        foreach (['year', 'month', 'week', 'day', 'hour', 'minute', 'second'] as $item) {
-            foreach (explode('|', (string) $messages[$item]) as $idx => $messagePart) {
-                if (preg_match('/[:%](count|time)/', $messagePart)) {
-                    continue;
-                }
-
-                if ($messagePart[0] === '{') {
-                    $idx = (int) mb_substr($messagePart, 1, mb_strpos($messagePart, '}'));
-                }
-
-                $messagePart = self::cleanWordFromTranslationString($messagePart);
-                $timeString = str_replace($messagePart, $idx . ' ' . $item, $timeString);
-            }
-        }
-
-        return $timeString;
-    }
-
-    /**
-     * Return the word cleaned from its translation codes.
-     */
-    private static function cleanWordFromTranslationString(string $word): string
-    {
-        $word = str_replace([':count', '%count', ':time'], '', $word);
-        $word = strtr($word, ['’' => "'"]);
-        $word = preg_replace('/({\d+(,(\d+|Inf))?}|[\[\]]\d+(,(\d+|Inf))?[\[\]])/', '', $word);
-
-        return mb_trim((string) $word);
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/lib/Core/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
deleted file mode 100644
index dbcd2a1a..00000000
--- a/lib/Core/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
-
-/**
- * Transforms between a normalized time and a localized time string.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Florian Eckerstorfer <florian@eckerstorfer.org>
- *
- * @psalm-type DateFormat \IntlDateFormatter::NONE|\IntlDateFormatter::FULL|\IntlDateFormatter::LONG|\IntlDateFormatter::MEDIUM|\IntlDateFormatter::SHORT|null
- * @psalm-type CalendarType \IntlDateFormatter::GREGORIAN|\IntlDateFormatter::TRADITIONAL|\IntlCalendar
- */
-final class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
-{
-    private int $dateFormat;
-    private int $timeFormat;
-    private int | \IntlCalendar $calendar;
-
-    /**
-     * @param int    $calendar One of the \IntlDateFormatter calendar constants
-     * @param string $pattern  A pattern to pass to \IntlDateFormatter
-     *
-     * @psalm-param DateFormat   $dateFormat
-     * @psalm-param DateFormat   $timeFormat
-     * @psalm-param CalendarType $calendar
-     *
-     * @throws UnexpectedTypeException If a format is not supported or if a timezone is not a string
-     */
-    public function __construct(
-        ?string $inputTimezone = null,
-        ?string $outputTimezone = null,
-        ?int $dateFormat = null,
-        ?int $timeFormat = null,
-        int | \IntlCalendar $calendar = \IntlDateFormatter::GREGORIAN,
-        private readonly ?string $pattern = null,
-    ) {
-        parent::__construct($inputTimezone, $outputTimezone);
-
-        $dateFormat ??= \IntlDateFormatter::MEDIUM;
-        $timeFormat ??= \IntlDateFormatter::SHORT;
-
-        if (! \in_array($dateFormat, self::$formats, true)) {
-            throw new UnexpectedTypeException($dateFormat, implode('", "', self::$formats));
-        }
-
-        if (! \in_array($timeFormat, self::$formats, true)) {
-            throw new UnexpectedTypeException($timeFormat, implode('", "', self::$formats));
-        }
-
-        if (\is_int($calendar) && ! \in_array($calendar, [\IntlDateFormatter::GREGORIAN, \IntlDateFormatter::TRADITIONAL], true)) {
-            throw new InvalidArgumentException('The "calendar" option should be either an \IntlDateFormatter constant or an \IntlCalendar instance.');
-        }
-
-        $this->dateFormat = $dateFormat;
-        $this->timeFormat = $timeFormat;
-        $this->calendar = $calendar;
-    }
-
-    /**
-     * Transforms a normalized date into a localized date string/array.
-     *
-     * @param \DateTimeImmutable|null $value
-     *
-     * @return string Localized date string
-     *
-     * @throws TransformationFailedException if the given value is not a \DateTimeImmutable
-     *                                       or if the date could not be transformed
-     */
-    public function transform(mixed $value): string
-    {
-        if ($value === null) {
-            return '';
-        }
-
-        if (! $value instanceof \DateTimeImmutable) {
-            throw new TransformationFailedException('Expected a \DateTimeImmutable.');
-        }
-
-        $value = $this->getIntlDateFormatter()->format($value->getTimestamp());
-
-        if (intl_get_error_code() !== 0) {
-            throw new TransformationFailedException(intl_get_error_message(), intl_get_error_code());
-        }
-
-        // Convert non-breaking and narrow non-breaking spaces to normal ones
-        return str_replace(["\xc2\xa0", "\xe2\x80\xaf"], ' ', $value);
-    }
-
-    /**
-     * Transforms a localized date string/array into a normalized date.
-     *
-     * @param string $value Localized date string
-     *
-     * @throws TransformationFailedException if the given value is not a string,
-     *                                       if the date could not be parsed
-     */
-    public function reverseTransform(mixed $value): ?\DateTimeImmutable
-    {
-        if (! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string.');
-        }
-
-        if ($value === '') {
-            return null;
-        }
-
-        // date-only patterns require parsing to be done in UTC, as midnight might not exist in the local timezone due
-        // to DST changes
-        $dateOnly = $this->isPatternDateOnly();
-        $dateFormatter = $this->getIntlDateFormatter($dateOnly, true);
-
-        // Non-breaking lines are required instead of spaces.
-        // And remove comma's to normalize the input
-        $value = str_replace([' ', ','], ["\xe2\x80\xaf", ''], $value);
-
-        try {
-            $timestamp = @$dateFormatter->parse($value);
-        } catch (\IntlException $e) {
-            throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
-        }
-
-        if (intl_get_error_code() != 0) {
-            throw new TransformationFailedException(intl_get_error_message(), intl_get_error_code());
-        }
-
-        if ($timestamp > 253402214400) {
-            // This timestamp represents UTC midnight of 9999-12-31 to prevent 5+ digit years
-            throw new TransformationFailedException('Years beyond 9999 are not supported.');
-        }
-
-        if ($timestamp === false) {
-            // the value couldn't be parsed but the Intl extension didn't report an error code, this
-            // could be the case when the Intl polyfill is used which always returns 0 as the error code
-            throw new TransformationFailedException(\sprintf('"%s" could not be parsed as a date.', $value));
-        }
-
-        try {
-            if ($dateOnly) {
-                // we only care about year-month-date, which has been delivered as a timestamp pointing to UTC midnight
-                $dateTime = new \DateTimeImmutable(gmdate('Y-m-d', $timestamp), new \DateTimeZone($this->inputTimezone));
-            } else {
-                // read timestamp into DateTime object - the formatter delivers a timestamp
-                $dateTime = new \DateTimeImmutable(\sprintf('@%s', $timestamp));
-            }
-
-            // set timezone separately, as it would be ignored if set via the constructor,
-            // see https://php.net/datetime.construct
-            $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
-        } catch (\Exception $e) {
-            throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
-        }
-
-        if ($this->outputTimezone !== $this->inputTimezone) {
-            $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
-        }
-
-        return $dateTime;
-    }
-
-    /**
-     * Returns a preconfigured IntlDateFormatter instance.
-     *
-     * @param bool $ignoreTimezone use UTC regardless of the configured timezone
-     *
-     * @throws TransformationFailedException in case the date formatter can not be constructed
-     */
-    private function getIntlDateFormatter(bool $ignoreTimezone = false, bool $ignoreStrict = false): \IntlDateFormatter
-    {
-        $dateFormat = $this->dateFormat;
-        $timeFormat = $this->timeFormat;
-        $timezone = new \DateTimeZone($ignoreTimezone ? 'UTC' : $this->outputTimezone);
-
-        $calendar = $this->calendar;
-        $pattern = $this->pattern;
-
-        $intlDateFormatter = new \IntlDateFormatter(\Locale::getDefault(), $dateFormat, $timeFormat, $timezone, $calendar, $pattern ?? '');
-        $intlDateFormatter->setLenient(false);
-
-        if ($ignoreStrict) {
-            // Some patterns use a comma for separation, but this interferes with string input.
-            $pattern = $intlDateFormatter->getPattern();
-            $intlDateFormatter->setPattern(str_replace(',', '', $pattern));
-        }
-
-        return $intlDateFormatter;
-    }
-
-    private function isPatternDateOnly(): bool
-    {
-        if ($this->pattern === null) {
-            return false;
-        }
-
-        // strip escaped text
-        $pattern = preg_replace("#'(.*?)'#", '', $this->pattern);
-
-        // check for the absence of time-related placeholders
-        return preg_match('#[ahHkKmsSAzZOvVxX]#', (string) $pattern) === 0;
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php b/lib/Core/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php
deleted file mode 100644
index cab37cbe..00000000
--- a/lib/Core/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer
-{
-    /**
-     * Transforms a normalized date into a localized date.
-     *
-     * @param \DateTimeImmutable|null $dateTime
-     *
-     * @return string The formatted date
-     *
-     * @throws TransformationFailedException If the given value is not a \DateTimeImmutable
-     */
-    public function transform($dateTime): string
-    {
-        if ($dateTime === null) {
-            return '';
-        }
-
-        if (! $dateTime instanceof \DateTimeImmutable) {
-            throw new TransformationFailedException('Expected a \DateTimeImmutable.');
-        }
-
-        if ($this->inputTimezone !== $this->outputTimezone) {
-            $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
-        }
-
-        return preg_replace('/\+00:00$/', 'Z', $dateTime->format('c'));
-    }
-
-    /**
-     * Transforms a formatted string following RFC 3339 into a normalized date.
-     *
-     * @param string $rfc3339 Formatted string
-     *
-     * @throws TransformationFailedException If the given value is not a string,
-     *                                       if the value could not be transformed
-     */
-    public function reverseTransform($rfc3339): ?\DateTimeImmutable
-    {
-        if (! \is_string($rfc3339)) {
-            throw new TransformationFailedException('Expected a string.');
-        }
-
-        if ($rfc3339 === '') {
-            return null;
-        }
-
-        if (! preg_match('/^(\d{4})-(\d{2})-(\d{2})T\d{2}:\d{2}(?::\d{2})?(?:\.\d+)?(?:Z|(?:(?:\+|-)\d{2}:\d{2}))$/', $rfc3339, $matches)) {
-            throw new TransformationFailedException(\sprintf('The date "%s" is not a valid date.', $rfc3339));
-        }
-
-        try {
-            $dateTime = new \DateTimeImmutable($rfc3339);
-        } catch (\Exception $e) {
-            throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
-        }
-
-        if ($this->inputTimezone !== $dateTime->getTimezone()->getName()) {
-            $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
-        }
-
-        if (! checkdate((int) $matches[2], (int) $matches[3], (int) $matches[1])) {
-            throw new TransformationFailedException(\sprintf('The date "%s-%s-%s" is not a valid date.', $matches[1], $matches[2], $matches[3]));
-        }
-
-        return $dateTime;
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/DateTimeToStringTransformer.php b/lib/Core/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
deleted file mode 100644
index fdde9130..00000000
--- a/lib/Core/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * Transforms between a date string and a DateTime object.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Florian Eckerstorfer <florian@eckerstorfer.org>
- */
-final class DateTimeToStringTransformer extends BaseDateTimeTransformer
-{
-    private readonly string $generateFormat;
-
-    /**
-     * Format used for parsing strings.
-     *
-     * Different from the {@link $generateFormat} because formats for parsing
-     * support additional characters in PHP that are not supported for
-     * generating strings.
-     */
-    private string $parseFormat;
-
-    /**
-     * Transforms a \DateTimeImmutable instance to a string.
-     *
-     * @see \DateTimeImmutable::format() for supported formats
-     */
-    public function __construct(?string $inputTimezone = null, ?string $outputTimezone = null, string $format = 'Y-m-d H:i:s')
-    {
-        parent::__construct($inputTimezone, $outputTimezone);
-
-        $this->generateFormat = $this->parseFormat = $format;
-
-        // See http://php.net/manual/en/datetime.createfromformat.php
-        // The character "|" in the format makes sure that the parts of a date
-        // that are *not* specified in the format are reset to the corresponding
-        // values from 1970-01-01 00:00:00 instead of the current time.
-        // Without "|" and "Y-m-d", "2010-02-03" becomes "2010-02-03 12:32:47",
-        // where the time corresponds to the current server time.
-        // With "|" and "Y-m-d", "2010-02-03" becomes "2010-02-03 00:00:00",
-        // which is at least deterministic and thus used here.
-        if (mb_strpos($this->parseFormat, '|') === false) {
-            $this->parseFormat .= '|';
-        }
-    }
-
-    /**
-     * Transforms a DateTime object into a date string with the configured format
-     * and timezone.
-     *
-     * @param \DateTimeImmutable|null $value
-     */
-    public function transform(mixed $value): string
-    {
-        if ($value === null) {
-            return '';
-        }
-
-        if (! $value instanceof \DateTimeImmutable) {
-            throw new TransformationFailedException('Expected a \DateTimeImmutable.');
-        }
-
-        return $value->setTimezone(new \DateTimeZone($this->outputTimezone))->format($this->generateFormat);
-    }
-
-    /**
-     * Transforms a date string in the configured timezone into a DateTimeImmutable object.
-     */
-    public function reverseTransform(mixed $value): ?\DateTimeImmutable
-    {
-        if (empty($value)) {
-            return null;
-        }
-
-        if (! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string.');
-        }
-
-        $outputTz = new \DateTimeZone($this->outputTimezone);
-        $dateTime = \DateTimeImmutable::createFromFormat($this->parseFormat, $value, $outputTz);
-
-        $lastErrors = \DateTimeImmutable::getLastErrors();
-
-        if ($lastErrors !== false && (0 < $lastErrors['warning_count'] || 0 < $lastErrors['error_count'])) {
-            throw new TransformationFailedException(implode(', ', array_merge(array_values($lastErrors['warnings']), array_values($lastErrors['errors']))));
-        }
-
-        try {
-            if ($this->inputTimezone !== $this->outputTimezone) {
-                $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
-            }
-        } catch (\Exception $e) {
-            throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
-        }
-
-        return $dateTime;
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php b/lib/Core/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php
deleted file mode 100644
index ccc2d971..00000000
--- a/lib/Core/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * Transforms between a timestamp and a DateTime object.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Florian Eckerstorfer <florian@eckerstorfer.org>
- */
-final class DateTimeToTimestampTransformer extends BaseDateTimeTransformer
-{
-    /**
-     * Transforms a DateTime object into a timestamp in the configured timezone.
-     *
-     * @param \DateTimeImmutable|null $dateTime
-     *
-     * @return int|null A timestamp
-     *
-     * @throws TransformationFailedException If the given value is not a \DateTimeImmutable
-     */
-    public function transform($dateTime): ?int
-    {
-        if ($dateTime === null) {
-            return null;
-        }
-
-        if (! $dateTime instanceof \DateTimeImmutable) {
-            throw new TransformationFailedException('Expected a \DateTimeImmutable.');
-        }
-
-        return $dateTime->getTimestamp();
-    }
-
-    /**
-     * Transforms a timestamp in the configured timezone into a DateTime object.
-     *
-     * @param int|string|null $value A timestamp
-     *
-     * @throws TransformationFailedException If the given value is not a timestamp
-     *                                       or if the given timestamp is invalid
-     */
-    public function reverseTransform($value): ?\DateTimeImmutable
-    {
-        if ($value === null) {
-            return null;
-        }
-
-        if (! is_numeric($value)) {
-            throw new TransformationFailedException('Expected a numeric.');
-        }
-
-        try {
-            $dateTime = new \DateTimeImmutable();
-            $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
-            $dateTime = $dateTime->setTimestamp((int) $value);
-
-            if ($this->inputTimezone !== $this->outputTimezone) {
-                $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
-            }
-        } catch (\Exception $e) {
-            throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
-        }
-
-        return $dateTime;
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/lib/Core/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
deleted file mode 100644
index 234b7f58..00000000
--- a/lib/Core/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * Transforms between an integer and a localized number with grouping
- * (each thousand) and comma separators.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransformer
-{
-    /**
-     * @param bool          $grouping     Whether thousands should be grouped
-     * @param self::ROUND_* $roundingMode One of the ROUND_ constants in this class
-     */
-    public function __construct(?bool $grouping = false, ?int $roundingMode = self::ROUND_DOWN)
-    {
-        parent::__construct(0, $grouping, $roundingMode);
-    }
-
-    public function reverseTransform($value): ?int
-    {
-        $decimalSeparator = $this->getNumberFormatter()->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
-
-        if (\is_string($value) && mb_strpos($value, $decimalSeparator) !== false) {
-            throw new TransformationFailedException(\sprintf('The value "%s" is not a valid integer.', $value));
-        }
-
-        $result = parent::reverseTransform($value);
-
-        return $result !== null ? (int) $result : null;
-    }
-
-    /**
-     * @internal
-     */
-    protected function castParsedValue(float | int $value): float | int
-    {
-        return $value;
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/IntegerToStringTransformer.php b/lib/Core/Extension/Core/DataTransformer/IntegerToStringTransformer.php
deleted file mode 100644
index cd981d34..00000000
--- a/lib/Core/Extension/Core/DataTransformer/IntegerToStringTransformer.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-/**
- * Transforms between an integer and a localized number with grouping
- * (each thousand) and comma separators.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class IntegerToStringTransformer extends NumberToStringTransformer
-{
-    /**
-     * @param self::ROUND_* $roundingMode
-     */
-    public function __construct(?int $roundingMode = self::ROUND_DOWN, bool $grouping = false)
-    {
-        if ($roundingMode === null) {
-            trigger_deprecation('rollerworks/search', '2.0-BETA13', 'Passing null as the first argument to "%s()" is deprecated, pass IntegerToStringTransformer::ROUND_DOWN instead. This will fail 3.0', __CLASS__);
-
-            $roundingMode = self::ROUND_DOWN;
-        }
-
-        parent::__construct(0, $grouping, $roundingMode);
-    }
-
-    public function reverseTransform($value): ?int
-    {
-        $result = parent::reverseTransform($value);
-
-        return $result !== null ? (int) $result : null;
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/LocalizedBirthdayTransformer.php b/lib/Core/Extension/Core/DataTransformer/LocalizedBirthdayTransformer.php
deleted file mode 100644
index a898dadc..00000000
--- a/lib/Core/Extension/Core/DataTransformer/LocalizedBirthdayTransformer.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * Transforms between a date string and a DateTime object
- * and between a localized string and a integer.
- */
-final class LocalizedBirthdayTransformer implements DataTransformer
-{
-    public function __construct(
-        private readonly DataTransformer $dateTransformer,
-        private readonly bool $allowAge = true,
-        private readonly bool $allowFutureDate = false,
-    ) {
-    }
-
-    public function transform($value)
-    {
-        if (\is_int($value)) {
-            if (! $this->allowAge) {
-                throw new TransformationFailedException('Age support is not enabled.');
-            }
-
-            $formatter = $this->getNumberFormatter();
-            $result = $formatter->format($value);
-
-            if (intl_is_failure($formatter->getErrorCode())) {
-                throw new TransformationFailedException($formatter->getErrorMessage());
-            }
-
-            return $result;
-        }
-
-        return $this->dateTransformer->transform($value);
-    }
-
-    /**
-     * @param int|string $value
-     *
-     * @return \DateTimeImmutable|int
-     */
-    public function reverseTransform($value)
-    {
-        $value = $this->transformWhenInteger($value);
-
-        if (\is_int($value)) {
-            if (! $this->allowAge) {
-                throw new TransformationFailedException('Age support is not enabled.');
-            }
-
-            return $value;
-        }
-
-        $value = $this->dateTransformer->reverseTransform($value);
-
-        // Force the UTC timezone with 00:00:00 for correct comparison.
-        $value = $value->setTimezone(new \DateTimeZone('UTC'));
-        $value = $value->setTime(0, 0, 0);
-
-        if (! $this->allowFutureDate) {
-            $this->validateDate($value);
-        }
-
-        return $value;
-    }
-
-    private function transformWhenInteger($value)
-    {
-        if (! preg_match('/^\p{N}+$/u', (string) $value)) {
-            return $value;
-        }
-
-        $position = 0;
-        $formatter = $this->getNumberFormatter();
-        $result = $formatter->parse($value, \NumberFormatter::TYPE_INT32, $position);
-
-        if (intl_is_failure($formatter->getErrorCode())) {
-            throw new TransformationFailedException($formatter->getErrorMessage());
-        }
-
-        if ($result >= \PHP_INT_MAX || $result <= -\PHP_INT_MAX) {
-            throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like.');
-        }
-
-        return $result;
-    }
-
-    private function validateDate(\DateTimeImmutable $value): void
-    {
-        static $currentDate;
-
-        if (! $currentDate) {
-            $currentDate = new \DateTimeImmutable('now', new \DateTimeZone('UTC'));
-            $currentDate = $currentDate->setTime(0, 0, 0);
-        }
-
-        if ($value > $currentDate) {
-            throw new TransformationFailedException(
-                \sprintf(
-                    'Date "%s" is higher then current date "%s". Are you a time traveler?',
-                    $value->format('Y-m-d'),
-                    $currentDate->format('Y-m-d')
-                )
-            );
-        }
-    }
-
-    private function getNumberFormatter(): \NumberFormatter
-    {
-        /** @var \NumberFormatter $formatter */
-        static $formatter;
-
-        if (! $formatter || $formatter->getLocale() !== \Locale::getDefault()) {
-            $formatter = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::TYPE_INT32);
-            $formatter->setAttribute(\NumberFormatter::GROUPING_USED, 0);
-        }
-
-        return $formatter;
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/lib/Core/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
deleted file mode 100644
index 580582cf..00000000
--- a/lib/Core/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Money\Currencies\ISOCurrencies;
-use Money\Formatter\IntlMoneyFormatter;
-use Money\Parser\IntlMoneyParser;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-
-/**
- * Transforms between a normalized format and a localized money string.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransformer
-{
-    /** @var array<string, array<string, array{0: string, 1: string}>> ['locale' => ['currency' => ['pattern', 'symbol']] */
-    private static $patterns = [];
-
-    public function __construct(
-        private readonly string $defaultCurrency,
-        bool $grouping = false,
-    ) {
-        parent::__construct(null, $grouping);
-    }
-
-    /**
-     * Transforms a normalized format into a localized money string.
-     *
-     * @param MoneyValue|null $value Normalized number
-     *
-     * @throws TransformationFailedException If the given value is not numeric or
-     *                                       if the value can not be transformed
-     */
-    public function transform($value): string
-    {
-        if ($value === null) {
-            return '';
-        }
-
-        if (! $value instanceof MoneyValue) {
-            throw new TransformationFailedException('Expected a MoneyValue object.');
-        }
-
-        $result = (new IntlMoneyFormatter($this->getNumberFormatter(), new ISOCurrencies()))->format($value->value);
-
-        // Convert fixed spaces to normal ones
-        $result = str_replace(["\xc2\xa0", "\xe2\x80\xaf"], ' ', $result);
-
-        if (! $value->withCurrency) {
-            $result = $this->removeCurrencySymbol($result, (string) $value->value->getCurrency());
-        }
-
-        return $result;
-    }
-
-    /**
-     * Transforms a localized number into an integer or float.
-     *
-     * @param string|null $value The localized value
-     *
-     * @throws TransformationFailedException if the given value is not a string
-     *                                       or if the value can not be transformed
-     */
-    public function reverseTransform(mixed $value): ?MoneyValue
-    {
-        if ($value === null || $value === '') {
-            return null;
-        }
-
-        if (! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string or null.');
-        }
-
-        if ($value === 'NaN') {
-            throw new TransformationFailedException('"NaN" is not a valid number.');
-        }
-
-        if (mb_strpos($value, '∞') !== false) {
-            throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like.');
-        }
-
-        // Convert normal spaces to fixed spaces.
-        $value = str_replace(' ', "\xc2\xa0", $value);
-
-        $formatter = $this->getNumberFormatter();
-
-        $groupSep = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
-        $decSep = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
-        $withCurrency = (bool) preg_match('#\p{Sc}#u', $value);
-
-        // Some locales use the space as group separation.
-        // The ICU data confirms this, but since v58.1 this can no longer be parsed
-        // in the currency format. Unless you use DECIMAL which doesn't work
-        // for currency. So... simple remove the spaces between numbers.
-        $value = preg_replace("/(\\p{N})\xc2\xa0(\\p{N})/u", '$1$2', $value);
-
-        if ($decSep !== '.' && (! $this->grouping || $groupSep !== '.')) {
-            $value = str_replace('.', $decSep, $value);
-        }
-
-        if ($decSep !== ',' && (! $this->grouping || $groupSep !== ',')) {
-            $value = str_replace(',', $decSep, $value);
-        }
-
-        if (! $withCurrency) {
-            $value = $this->addCurrencySymbol($value);
-        }
-
-        try {
-            $money = (new IntlMoneyParser($formatter, new ISOCurrencies()))->parse($value);
-
-            return new MoneyValue($money, $withCurrency);
-        } catch (\Exception $e) {
-            throw new TransformationFailedException($e->getMessage(), 0, $e);
-        }
-    }
-
-    protected function getNumberFormatter(): \NumberFormatter
-    {
-        $formatter = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::CURRENCY);
-        $formatter->setAttribute(\NumberFormatter::GROUPING_USED, $this->grouping ? 1 : 0);
-
-        return $formatter;
-    }
-
-    /**
-     * Adds the currency symbol when missing.
-     *
-     * ICU cannot parse() without a currency,
-     * and decimal doesn't include scale when 0.
-     */
-    private function addCurrencySymbol(string $value, ?string $currency = null): string
-    {
-        $currency ??= $this->defaultCurrency;
-        $locale = \Locale::getDefault();
-
-        if (! isset(self::$patterns[$locale])) {
-            self::$patterns[$locale] = [];
-        }
-
-        if (! isset(self::$patterns[$locale][$currency])) {
-            $formatter = new \NumberFormatter($locale, \NumberFormatter::CURRENCY);
-            $pattern = $formatter->formatCurrency(123.00, $currency);
-
-            // 1=left-position currency, 2=left-space, 3=right-space, 4=left-position currency.
-            // With non latin number scripts.
-            preg_match(
-                '/^([^\s\xc2\xa0]*)([\s\xc2\xa0]*)\p{N}{3}(?:[,.]\p{N}+)?([\s\xc2\xa0]*)([^\s\xc2\xa0]*)$/iu',
-                $pattern,
-                $matches
-            );
-
-            if (! empty($matches[1])) {
-                self::$patterns[$locale][$currency] = ['%1$s' . $matches[2] . '%2$s', $matches[1]];
-            } elseif (! empty($matches[4])) {
-                self::$patterns[$locale][$currency] = ['%2$s' . $matches[3] . '%1$s', $matches[4]];
-            } else {
-                throw new \InvalidArgumentException(
-                    \sprintf('Locale "%s" with currency "%s" does not provide a currency position.', $locale, $currency)
-                );
-            }
-        }
-
-        return \sprintf(self::$patterns[$locale][$currency][0], self::$patterns[$locale][$currency][1], $value);
-    }
-
-    /**
-     * Removes the currency symbol.
-     *
-     * ICU cannot format() with currency, as this
-     * produces a number with the `¤` symbol.
-     * And, decimal doesn't include scale when 0.
-     */
-    private function removeCurrencySymbol(string $value, string $currency): string
-    {
-        $locale = \Locale::getDefault();
-
-        if (! isset(self::$patterns[$locale][$currency])) {
-            // Initialize the cache, ignore return.
-            $this->addCurrencySymbol('123', $currency);
-        }
-
-        return preg_replace('#(\s?' . preg_quote((string) self::$patterns[$locale][$currency][1], '#') . '\s?)#u', '', $value);
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/MoneyToStringTransformer.php b/lib/Core/Extension/Core/DataTransformer/MoneyToStringTransformer.php
deleted file mode 100644
index 78fc4a06..00000000
--- a/lib/Core/Extension/Core/DataTransformer/MoneyToStringTransformer.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Money\Currencies\ISOCurrencies;
-use Money\Currency;
-use Money\Exception\ParserException;
-use Money\Exception\UnknownCurrencyException;
-use Money\Formatter\DecimalMoneyFormatter;
-use Money\Parser\DecimalMoneyParser;
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-
-/**
- * Transforms between a normalized format and a money string.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class MoneyToStringTransformer implements DataTransformer
-{
-    private Currency $defaultCurrency;
-    private DecimalMoneyParser $moneyParser;
-    private DecimalMoneyFormatter $formatter;
-
-    public function __construct(string $defaultCurrency)
-    {
-        $this->defaultCurrency = new Currency($defaultCurrency);
-    }
-
-    /**
-     * Transforms a normalized format into a localized money string.
-     *
-     * @param MoneyValue|null $value Normalized number
-     *
-     * @throws TransformationFailedException If the given value is not numeric or
-     *                                       if the value can not be transformed
-     */
-    public function transform($value): string
-    {
-        if ($value === null) {
-            return '';
-        }
-
-        if (! $value instanceof MoneyValue) {
-            throw new TransformationFailedException('Expected a MoneyValue object.');
-        }
-
-        if (! isset($this->formatter)) {
-            $this->formatter = new DecimalMoneyFormatter(new ISOCurrencies());
-        }
-
-        if (! $value->withCurrency) {
-            return $this->formatter->format($value->value);
-        }
-
-        return ((string) $value->value->getCurrency()) . ' ' . $this->formatter->format($value->value);
-    }
-
-    /**
-     * Transforms a localized money string into a normalized format.
-     *
-     * @param string|null $value Localized money string
-     *
-     * @throws TransformationFailedException If the given value is not a string
-     *                                       or if the value can not be transformed
-     */
-    public function reverseTransform($value): ?MoneyValue
-    {
-        if ($value === null || $value === '') {
-            return null;
-        }
-
-        if (! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string or null.');
-        }
-
-        $withCurrency = true;
-        $result = $value;
-
-        if (mb_strpos($value, ' ') !== false) {
-            [$currency, $result] = explode(' ', $value, 2);
-
-            if (mb_strlen($currency) !== 3) {
-                throw new TransformationFailedException(
-                    \sprintf('Value does not contain a valid 3 character currency code, got "%s".', $currency)
-                );
-            }
-
-            $currency = new Currency($currency);
-        } else {
-            $withCurrency = false;
-            $currency = $this->defaultCurrency;
-        }
-
-        if (! isset($this->moneyParser)) {
-            $this->moneyParser = new DecimalMoneyParser(new ISOCurrencies());
-        }
-
-        try {
-            return new MoneyValue($this->moneyParser->parse($result, $currency), $withCurrency);
-        } catch (ParserException | UnknownCurrencyException $e) {
-            throw new TransformationFailedException($e->getMessage(), 0, $e);
-        }
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/MultiTypeDataTransformer.php b/lib/Core/Extension/Core/DataTransformer/MultiTypeDataTransformer.php
deleted file mode 100644
index 8d010f32..00000000
--- a/lib/Core/Extension/Core/DataTransformer/MultiTypeDataTransformer.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * Allows to use multiple transformers based on their type.
- *
- * This transformer is mostly used by DateTimeType to support
- * both DateTime and DateInterval objects.
- *
- * @internal
- */
-final class MultiTypeDataTransformer implements DataTransformer
-{
-    /**
-     * @param array<class-string, DataTransformer> $transformers
-     */
-    public function __construct(
-        private readonly array $transformers,
-    ) {
-    }
-
-    public function transform(mixed $value): mixed
-    {
-        if ($value === null) {
-            return '';
-        }
-
-        $type = get_debug_type($value);
-
-        if (! isset($this->transformers[$type])) {
-            throw new TransformationFailedException(\sprintf('Unsupported type "%s".', $type));
-        }
-
-        return $this->transformers[$type]->transform($value);
-    }
-
-    public function reverseTransform(mixed $value): mixed
-    {
-        $finalException = null;
-
-        foreach ($this->transformers as $transformer) {
-            try {
-                return $transformer->reverseTransform($value);
-            } catch (\Throwable $e) {
-                $finalException = new TransformationFailedException($e->getMessage() . \PHP_EOL . $e->getTraceAsString(), $e->getCode(), $finalException);
-
-                continue;
-            }
-        }
-
-        throw $finalException;
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/lib/Core/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
deleted file mode 100644
index ee8822c2..00000000
--- a/lib/Core/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * Transforms between a number type and a localized number with grouping
- * (each thousand) and comma separators.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Florian Eckerstorfer <florian@eckerstorfer.org>
- */
-class NumberToLocalizedStringTransformer implements DataTransformer
-{
-    /**
-     * Rounds a number towards positive infinity.
-     *
-     * Rounds 1.4 to 2 and -1.4 to -1.
-     */
-    public const ROUND_CEILING = \NumberFormatter::ROUND_CEILING;
-
-    /**
-     * Rounds a number towards negative infinity.
-     *
-     * Rounds 1.4 to 1 and -1.4 to -2.
-     */
-    public const ROUND_FLOOR = \NumberFormatter::ROUND_FLOOR;
-
-    /**
-     * Rounds a number away from zero.
-     *
-     * Rounds 1.4 to 2 and -1.4 to -2.
-     */
-    public const ROUND_UP = \NumberFormatter::ROUND_UP;
-
-    /**
-     * Rounds a number towards zero.
-     *
-     * Rounds 1.4 to 1 and -1.4 to -1.
-     */
-    public const ROUND_DOWN = \NumberFormatter::ROUND_DOWN;
-
-    /**
-     * Rounds to the nearest number and halves to the next even number.
-     *
-     * Rounds 2.5, 1.6 and 1.5 to 2 and 1.4 to 1.
-     */
-    public const ROUND_HALF_EVEN = \NumberFormatter::ROUND_HALFEVEN;
-
-    /**
-     * Rounds to the nearest number and halves away from zero.
-     *
-     * Rounds 2.5 to 3, 1.6 and 1.5 to 2 and 1.4 to 1.
-     */
-    public const ROUND_HALF_UP = \NumberFormatter::ROUND_HALFUP;
-
-    /**
-     * Rounds to the nearest number and halves towards zero.
-     *
-     * Rounds 2.5 and 1.6 to 2, 1.5 and 1.4 to 1.
-     */
-    public const ROUND_HALF_DOWN = \NumberFormatter::ROUND_HALFDOWN;
-
-    /**
-     * @param self::ROUND_* $roundingMode
-     */
-    public function __construct(
-        private readonly ?int $scale = null,
-        protected ?bool $grouping = false,
-        protected ?int $roundingMode = self::ROUND_HALF_UP,
-        protected readonly ?string $locale = null,
-    ) {
-        if ($grouping === null) {
-            trigger_deprecation('rollerworks/search', '2.0-BETA13', 'Passing null as 2nd argument to "%s()" is deprecated, pass false instead. This will fail 3.0', __CLASS__);
-
-            $this->grouping = false;
-        }
-
-        if ($roundingMode === null) {
-            trigger_deprecation('rollerworks/search', '2.0-BETA13', 'Passing null as 3nd argument to "%s()" is deprecated, pass NumberToLocalizedStringTransformer::ROUND_HALF_UP instead. This will fail 3.0', __CLASS__);
-
-            $this->roundingMode = self::ROUND_HALF_UP;
-        }
-    }
-
-    /**
-     * Transforms a number type into localized number.
-     *
-     * @param float|int|string|null $value Number value
-     *
-     * @return string Localized value
-     *
-     * @throws TransformationFailedException if the given value is not numeric
-     *                                       or if the value can not be transformed
-     */
-    public function transform(mixed $value): ?string
-    {
-        if ($value === null) {
-            return '';
-        }
-
-        if (! is_numeric($value)) {
-            throw new TransformationFailedException('Expected a numeric.');
-        }
-
-        $formatter = $this->getNumberFormatter();
-        $value = (string) $formatter->format((float) $value);
-
-        if (intl_is_failure($formatter->getErrorCode())) {
-            throw new TransformationFailedException($formatter->getErrorMessage());
-        }
-
-        // Convert non-breaking and narrow non-breaking spaces to normal ones
-        return str_replace(["\xc2\xa0", "\xe2\x80\xaf"], ' ', $value);
-    }
-
-    /**
-     * Transforms a localized number into an integer or float.
-     *
-     * @param string $value The localized value
-     *
-     * @return float|int|null The numeric value
-     *
-     * @throws TransformationFailedException if the given value is not a string
-     *                                       or if the value can not be transformed
-     */
-    public function reverseTransform(mixed $value): mixed
-    {
-        if (! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string.');
-        }
-
-        if ($value === '') {
-            return null;
-        }
-
-        if (\in_array($value, ['NaN', 'NAN', 'nan'], true)) {
-            throw new TransformationFailedException('"NaN" is not a valid number.');
-        }
-
-        $position = 0;
-        $formatter = $this->getNumberFormatter();
-        $groupSep = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
-        $decSep = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
-
-        if ($decSep !== '.' && (! $this->grouping || $groupSep !== '.')) {
-            $value = str_replace('.', $decSep, $value);
-        }
-
-        if ($decSep !== ',' && (! $this->grouping || $groupSep !== ',')) {
-            $value = str_replace(',', $decSep, $value);
-        }
-
-        if (mb_strpos($value, $decSep) !== false) {
-            $type = \NumberFormatter::TYPE_DOUBLE;
-        } else {
-            $type = \PHP_INT_SIZE === 8
-                ? \NumberFormatter::TYPE_INT64
-                : \NumberFormatter::TYPE_INT32;
-        }
-
-        $result = $formatter->parse($value, $type, $position);
-
-        if (intl_is_failure($formatter->getErrorCode())) {
-            throw new TransformationFailedException($formatter->getErrorMessage());
-        }
-
-        if ($result >= \PHP_INT_MAX || $result <= -\PHP_INT_MAX) {
-            throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like.');
-        }
-
-        $result = $this->castParsedValue($result);
-
-        $encoding = mb_detect_encoding($value, null, true);
-
-        if ($encoding !== false) {
-            $length = mb_strlen($value, $encoding);
-            $remainder = mb_substr($value, $position, $length, $encoding);
-        } else {
-            $length = mb_strlen($value);
-            $remainder = mb_substr($value, $position, $length);
-        }
-
-        // After parsing, position holds the index of the character where the
-        // parsing stopped
-        if ($position < $length) {
-            // Check if there are unrecognized characters at the end of the
-            // number (excluding whitespace characters)
-            $remainder = mb_trim($remainder, " \t\n\r\0\x0b\xc2\xa0");
-
-            if ($remainder !== '') {
-                throw new TransformationFailedException(\sprintf('The number contains unrecognized characters: "%s"', $remainder));
-            }
-        }
-
-        // NumberFormatter::parse() does not round
-        return $this->round($result);
-    }
-
-    /**
-     * Returns a preconfigured \NumberFormatter instance.
-     */
-    protected function getNumberFormatter(): \NumberFormatter
-    {
-        $formatter = new \NumberFormatter($this->locale ?? \Locale::getDefault(), \NumberFormatter::DECIMAL);
-
-        if ($this->scale !== null) {
-            $formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $this->scale);
-            $formatter->setAttribute(\NumberFormatter::ROUNDING_MODE, $this->roundingMode);
-        }
-
-        $formatter->setAttribute(\NumberFormatter::GROUPING_USED, $this->grouping ? 1 : 0);
-
-        return $formatter;
-    }
-
-    /**
-     * @internal
-     */
-    protected function castParsedValue(float | int $value): float | int
-    {
-        $float = (float) $value;
-
-        if (\is_int($value) && $float < \PHP_INT_MAX && $value === (int) $float) {
-            return $float;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Rounds a number according to the configured scale and rounding mode.
-     */
-    protected function round(float | int | string $number): float | int | string
-    {
-        if ($this->scale === null || $this->roundingMode === null) {
-            return $number;
-        }
-
-        // shift number to maintain the correct scale during rounding
-        $roundingCoef = 10 ** $this->scale;
-        // string representation to avoid rounding errors, similar to bcmul()
-        $number = (float) (string) ($number * $roundingCoef);
-
-        switch ($this->roundingMode) {
-            case self::ROUND_CEILING:
-                $number = ceil($number);
-
-                break;
-
-            case self::ROUND_FLOOR:
-                $number = floor($number);
-
-                break;
-
-            case self::ROUND_UP:
-                $number = $number > 0 ? ceil($number) : floor($number);
-
-                break;
-
-            case self::ROUND_DOWN:
-                $number = $number > 0 ? floor($number) : ceil($number);
-
-                break;
-
-            case self::ROUND_HALF_EVEN:
-                $number = round($number, 0, \PHP_ROUND_HALF_EVEN);
-
-                break;
-
-            case self::ROUND_HALF_UP:
-                $number = round($number, 0, \PHP_ROUND_HALF_UP);
-
-                break;
-
-            case self::ROUND_HALF_DOWN:
-                $number = round($number, 0, \PHP_ROUND_HALF_DOWN);
-
-                break;
-
-            default:
-                throw new \Exception(\sprintf('Unknown rounding mode: %d.', $this->roundingMode));
-        }
-
-        return $number / $roundingCoef;
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/NumberToStringTransformer.php b/lib/Core/Extension/Core/DataTransformer/NumberToStringTransformer.php
deleted file mode 100644
index a24369d5..00000000
--- a/lib/Core/Extension/Core/DataTransformer/NumberToStringTransformer.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * Transforms between a number type and a number with rounding.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class NumberToStringTransformer extends NumberToLocalizedStringTransformer
-{
-    /**
-     * Transforms a number type into number.
-     *
-     * @param float|int|string|null $value Number value
-     *
-     * @throws TransformationFailedException If the given value is not numeric
-     *                                       or if the value can not be transformed
-     */
-    public function transform($value): string
-    {
-        if ($value === null || $value === '') {
-            return '';
-        }
-
-        if (! is_numeric($value)) {
-            throw new TransformationFailedException('Expected a numeric or null.');
-        }
-
-        if ($value >= \PHP_INT_MAX || $value <= -\PHP_INT_MAX) {
-            throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like.');
-        }
-
-        return (string) $this->round($value);
-    }
-
-    /**
-     * Transforms a normalized number into an integer or float.
-     *
-     * @param string $value The localized value
-     *
-     * @return float|int|null The numeric value
-     *
-     * @throws TransformationFailedException If the given value is not a string
-     *                                       or if the value can not be transformed
-     */
-    public function reverseTransform(mixed $value): int | float | null
-    {
-        if (! \is_scalar($value)) {
-            throw new TransformationFailedException('Expected a scalar.');
-        }
-
-        if ($value === '') {
-            return null;
-        }
-
-        $result = $value;
-
-        if (! is_numeric($result)) {
-            throw new TransformationFailedException('Value is not numeric.');
-        }
-
-        if (\is_string($result)) {
-            if (mb_strpos($result, '.') !== false) {
-                $result = (float) $result;
-            } else {
-                $result = (int) $result;
-            }
-        }
-
-        if ($result >= \PHP_INT_MAX || $result <= -\PHP_INT_MAX) {
-            throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like.');
-        }
-
-        return $this->round($result);
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/OrderToLocalizedTransformer.php b/lib/Core/Extension/Core/DataTransformer/OrderToLocalizedTransformer.php
deleted file mode 100644
index 92c5b118..00000000
--- a/lib/Core/Extension/Core/DataTransformer/OrderToLocalizedTransformer.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-final class OrderToLocalizedTransformer implements DataTransformer
-{
-    /**
-     * @param array<string, string[]> $alias
-     * @param array<string, string>   $viewLabel
-     */
-    public function __construct(
-        private array $alias,
-        private array $viewLabel,
-        private readonly string $case = OrderTransformer::CASE_UPPERCASE,
-    ) {
-    }
-
-    public function transform($value)
-    {
-        if ($value === null) {
-            return '';
-        }
-
-        if (! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string or null.');
-        }
-
-        switch ($this->case) {
-            case OrderTransformer::CASE_LOWERCASE:
-                $value = mb_strtolower($value);
-
-                break;
-
-            case OrderTransformer::CASE_UPPERCASE:
-                $value = mb_strtoupper($value);
-
-                break;
-        }
-
-        if (! isset($this->viewLabel[$value])) {
-            throw new TransformationFailedException(\sprintf('No localized label configured for "%s".', $value));
-        }
-
-        return $this->viewLabel[$value];
-    }
-
-    public function reverseTransform($value)
-    {
-        if ($value !== null && ! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string or null.');
-        }
-
-        if ($value === '' || $value === null) {
-            return null;
-        }
-
-        switch ($this->case) {
-            case OrderTransformer::CASE_LOWERCASE:
-                $value = mb_strtolower($value);
-
-                break;
-
-            case OrderTransformer::CASE_UPPERCASE:
-                $value = mb_strtoupper($value);
-
-                break;
-        }
-
-        if (! isset($this->alias[$value])) {
-            throw new TransformationFailedException(
-                \sprintf(
-                    'Invalid sort direction "%1$s" specified, expected one of: "%2$s"',
-                    $value,
-                    implode('", "', array_keys($this->alias))
-                ),
-                0,
-                null,
-                'This value is not a valid sorting direction. Accepted directions are: {{ directions }}.',
-                ['{{ directions }}' => array_unique(array_map(mb_strtolower(...), array_keys($this->alias)))]
-            );
-        }
-
-        return $this->alias[$value];
-    }
-}
diff --git a/lib/Core/Extension/Core/DataTransformer/OrderTransformer.php b/lib/Core/Extension/Core/DataTransformer/OrderTransformer.php
deleted file mode 100644
index ac6be766..00000000
--- a/lib/Core/Extension/Core/DataTransformer/OrderTransformer.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\DataTransformer;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-
-/**
- * @author Dalibor Karlović <dalibor@flexolabs.io>
- */
-final class OrderTransformer implements DataTransformer
-{
-    public const CASE_LOWERCASE = 'LOWERCASE';
-    public const CASE_UPPERCASE = 'UPPERCASE';
-
-    /**
-     * @param array<string, string[]> $alias
-     */
-    public function __construct(
-        private array $alias,
-        private readonly string $case = self::CASE_UPPERCASE,
-    ) {
-    }
-
-    public function transform($value)
-    {
-        if ($value !== null && ! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string or null.');
-        }
-
-        if ($value === null) {
-            return '';
-        }
-
-        return $this->alias[$value] ?? $value;
-    }
-
-    public function reverseTransform($value)
-    {
-        if ($value !== null && ! \is_string($value)) {
-            throw new TransformationFailedException('Expected a string or null.');
-        }
-
-        if ($value === '' || $value === null) {
-            return null;
-        }
-
-        switch ($this->case) {
-            case self::CASE_LOWERCASE:
-                $value = mb_strtolower($value);
-
-                break;
-
-            case self::CASE_UPPERCASE:
-                $value = mb_strtoupper($value);
-
-                break;
-        }
-
-        if (! isset($this->alias[$value])) {
-            throw new TransformationFailedException(
-                \sprintf(
-                    'Invalid sort direction "%1$s" specified, expected one of: "%2$s"',
-                    $value,
-                    implode('", "', array_keys($this->alias))
-                ),
-                0,
-                null,
-                'This value is not a valid sorting direction. Accepted directions are: {{ directions }}.',
-                ['{{ directions }}' => array_unique(array_map(mb_strtolower(...), array_keys($this->alias)))]
-            );
-        }
-
-        return $this->alias[$value];
-    }
-}
diff --git a/lib/Core/Extension/Core/Model/MoneyValue.php b/lib/Core/Extension/Core/Model/MoneyValue.php
deleted file mode 100644
index a5d262ce..00000000
--- a/lib/Core/Extension/Core/Model/MoneyValue.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Model;
-
-use Money\Money;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class MoneyValue
-{
-    /**
-     * @param bool $withCurrency indicate the input was provided with a currency.
-     *                           This is only used for exporting
-     */
-    public function __construct(
-        public readonly Money $value,
-        public readonly bool $withCurrency = true,
-    ) {
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/BaseDateTimeType.php b/lib/Core/Extension/Core/Type/BaseDateTimeType.php
deleted file mode 100644
index fad3b5b0..00000000
--- a/lib/Core/Extension/Core/Type/BaseDateTimeType.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Exception\InvalidConfigurationException;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-abstract class BaseDateTimeType extends AbstractFieldType
-{
-    public const DEFAULT_DATE_FORMAT = \IntlDateFormatter::MEDIUM;
-    public const DEFAULT_TIME_FORMAT = \IntlDateFormatter::MEDIUM;
-
-    protected static $acceptedFormats = [
-        \IntlDateFormatter::FULL,
-        \IntlDateFormatter::LONG,
-        \IntlDateFormatter::MEDIUM,
-        \IntlDateFormatter::SHORT,
-    ];
-
-    protected function validateFormat(string $name, $value): void
-    {
-        if (! \in_array($value, self::$acceptedFormats, true)) {
-            throw new InvalidConfigurationException(
-                'The "' . $name . '" option must be one of the IntlDateFormatter constants ' .
-                '(FULL, LONG, MEDIUM, SHORT) or the "pattern" option must be a string representing a custom format.'
-            );
-        }
-    }
-
-    protected function validateDateFormat(string $name, string $format): void
-    {
-        if (mb_strpos($format, 'y') === false || mb_strpos($format, 'M') === false || mb_strpos($format, 'd') === false) {
-            throw new InvalidConfigurationException(\sprintf('The "%s" option should contain the letters "y", "M" and "d". Its current value is "%s".', $name, $format));
-        }
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/BirthdayType.php b/lib/Core/Extension/Core/Type/BirthdayType.php
deleted file mode 100644
index 0b262c4a..00000000
--- a/lib/Core/Extension/Core/Type/BirthdayType.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\BirthdayTransformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\LocalizedBirthdayTransformer;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\BirthdayValueComparator;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\SearchFieldView;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\ValueComparator;
-use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class BirthdayType extends AbstractFieldType
-{
-    private ValueComparator $valueComparator;
-
-    public function __construct()
-    {
-        $this->valueComparator = new BirthdayValueComparator();
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $config->setValueComparator($this->valueComparator);
-        $config->setValueTypeSupport(Range::class, true);
-        $config->setValueTypeSupport(Compare::class, true);
-
-        $config->setViewTransformer(
-            new LocalizedBirthdayTransformer(
-                $config->getViewTransformer(),
-                $options['allow_age'],
-                $options['allow_future_date']
-            )
-        );
-
-        $config->setNormTransformer(
-            new BirthdayTransformer(
-                $config->getNormTransformer(),
-                $options['allow_age'],
-                $options['allow_future_date']
-            )
-        );
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-        $view->vars['allow_age'] = $options['allow_age'];
-        $view->vars['allow_future_date'] = $options['allow_future_date'];
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'allow_age' => true,
-            'allow_future_date' => false,
-            'invalid_message' => static function (Options $options) {
-                if ($options['allow_age']) {
-                    return 'This value is not a valid birthday or age.';
-                }
-
-                return 'This value is not a valid birthday.';
-            },
-        ]);
-
-        $resolver->setAllowedTypes('allow_age', ['bool']);
-        $resolver->setAllowedTypes('allow_future_date', ['bool']);
-    }
-
-    public function getParent(): string
-    {
-        return DateType::class;
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'birthday';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/BooleanType.php b/lib/Core/Extension/Core/Type/BooleanType.php
deleted file mode 100644
index 3f5ff94a..00000000
--- a/lib/Core/Extension/Core/Type/BooleanType.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\BooleanToLocalizedValueTransformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\BooleanToNormValueTransformer;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-final class BooleanType extends AbstractFieldType
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefault('invalid_message', 'This value is not a valid boolean.');
-
-        // Symfony 6.4 compatibility
-        if (! method_exists($resolver, 'setOptions')) {
-            $resolver->setDefault('view_label', static function (OptionsResolver $options): void {
-                $options->setDefaults([
-                    'true' => 'yes',
-                    'false' => 'no',
-                ]);
-
-                $options->setAllowedTypes('true', ['string']);
-                $options->setAllowedTypes('false', ['string']);
-            });
-
-            $resolver->setDefault('norm_label', static function (OptionsResolver $options): void {
-                $options->setDefaults([
-                    'true' => 'true',
-                    'false' => 'false',
-                ]);
-
-                $options->setAllowedTypes('true', ['string']);
-                $options->setAllowedTypes('false', ['string']);
-            });
-
-            $resolver->setDefault('view_aliases', static function (OptionsResolver $options, Options $parent): void {
-                $options->setDefaults([
-                    'true' => array_unique(['yes', 'y', '1', 1, 'on', 'true', $parent['view_label']['true']], \SORT_REGULAR),
-                    'false' => array_unique(['no', 'n', '0', 0, 'off', 'false', $parent['view_label']['false']], \SORT_REGULAR),
-                ]);
-
-                $options->setAllowedTypes('true', ['scalar[]']);
-                $options->setAllowedTypes('false', ['scalar[]']);
-            });
-
-            return;
-        }
-
-        $resolver->setOptions('view_label', static function (OptionsResolver $options): void {
-            $options->setDefaults([
-                'true' => 'yes',
-                'false' => 'no',
-            ]);
-
-            $options->setAllowedTypes('true', ['string']);
-            $options->setAllowedTypes('false', ['string']);
-        });
-
-        $resolver->setOptions('norm_label', static function (OptionsResolver $options): void {
-            $options->setDefaults([
-                'true' => 'true',
-                'false' => 'false',
-            ]);
-
-            $options->setAllowedTypes('true', ['string']);
-            $options->setAllowedTypes('false', ['string']);
-        });
-
-        $resolver->setOptions('view_aliases', static function (OptionsResolver $options, Options $parent): void {
-            $options->setDefaults([
-                'true' => array_unique(['yes', 'y', '1', 1, 'on', 'true', $parent['view_label']['true']], \SORT_REGULAR),
-                'false' => array_unique(['no', 'n', '0', 0, 'off', 'false', $parent['view_label']['false']], \SORT_REGULAR),
-            ]);
-
-            $options->setAllowedTypes('true', ['scalar[]']);
-            $options->setAllowedTypes('false', ['scalar[]']);
-        });
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $config->setNormTransformer(new BooleanToNormValueTransformer($options['norm_label']['true'], $options['norm_label']['false']));
-        $config->setViewTransformer(
-            new BooleanToLocalizedValueTransformer(
-                $options['view_label']['true'],
-                $options['view_label']['false'],
-                $options['view_aliases']['true'],
-                $options['view_aliases']['false'],
-            ),
-        );
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'boolean';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/ChoiceType.php b/lib/Core/Extension/Core/Type/ChoiceType.php
deleted file mode 100644
index b2d09394..00000000
--- a/lib/Core/Extension/Core/Type/ChoiceType.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\CachingFactoryDecorator;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\ChoiceListFactory;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\DefaultChoiceListFactory;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\PropertyAccessDecorator;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\ChoiceToLabelTransformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\ChoiceToValueTransformer;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\SearchFieldView;
-use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\PropertyAccess\PropertyPath;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class ChoiceType extends AbstractFieldType
-{
-    public function __construct(
-        private ?ChoiceListFactory $choiceListFactory = null,
-    ) {
-        $this->choiceListFactory ??= new CachingFactoryDecorator(
-            new PropertyAccessDecorator(
-                new DefaultChoiceListFactory()
-            )
-        );
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $choiceList = $this->createChoiceList($options);
-        $config->setAttribute('choice_list', $choiceList);
-
-        // Initialize all choices before doing the index check below.
-        // This helps in cases where index checks are optimized for non
-        // initialized choice lists. For example, when using an SQL driver,
-        // the index check would read in one SQL query and the initialization
-        // requires another SQL query. When the initialization is done first,
-        // one SQL query is sufficient.
-
-        $choiceListView = $this->createChoiceListView($choiceList, $options);
-        $config->setAttribute('choice_list_view', $choiceListView);
-
-        // Force label when values are not constant.
-        if (! $choiceList->isValuesConstant()) {
-            $options['view_format'] = 'label';
-            $options['norm_format'] = 'label';
-        }
-
-        if ($options['view_format'] === 'label') {
-            $config->setViewTransformer(new ChoiceToLabelTransformer($choiceList, $choiceListView));
-        } elseif ($options['view_format'] === 'value') {
-            $config->setViewTransformer(new ChoiceToValueTransformer($choiceList));
-        }
-
-        if ($options['norm_format'] === 'label') {
-            $config->setNormTransformer(new ChoiceToLabelTransformer($choiceList, $choiceListView));
-        } elseif ($options['norm_format'] === 'value') {
-            $config->setNormTransformer(new ChoiceToValueTransformer($choiceList));
-        }
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-        /** @var ChoiceListView $choiceListView */
-        $choiceListView = $config->getAttribute('choice_list_view');
-
-        $view->vars = array_replace($view->vars, [
-            'preferred_choices' => $choiceListView->preferredChoices,
-            'choices' => $choiceListView->choices,
-            'separator' => '-------------------',
-            'choice_translation_domain' => $options['choice_translation_domain'],
-        ]);
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $choiceTranslationDomainNormalizer = static function (Options $options, $choiceTranslationDomain) {
-            if ($choiceTranslationDomain === true) {
-                return $options['translation_domain'];
-            }
-
-            return $choiceTranslationDomain;
-        };
-
-        $resolver->setDefaults([
-            'choices' => [],
-            'view_format' => 'label',
-            'norm_format' => 'value',
-            'choice_loader' => null,
-            'choice_label' => null,
-            'choice_name' => null,
-            'choice_value' => null,
-            'choice_attr' => null,
-            'preferred_choices' => [],
-            'group_by' => null,
-            'choice_translation_domain' => true,
-        ]);
-
-        $resolver->setNormalizer('choice_translation_domain', $choiceTranslationDomainNormalizer);
-
-        $resolver->setAllowedTypes('choices', ['null', 'array', \Traversable::class]);
-        $resolver->setAllowedTypes('choice_translation_domain', ['null', 'bool', 'string']);
-        $resolver->setAllowedTypes('choice_loader', ['null', ChoiceLoader::class]);
-        $resolver->setAllowedTypes('choice_label', ['null', 'bool', 'callable', 'string', PropertyPath::class]);
-        $resolver->setAllowedTypes('choice_name', ['null', 'callable', 'string',  PropertyPath::class]);
-        $resolver->setAllowedTypes('choice_value', ['null', 'callable', 'string',  PropertyPath::class]);
-        $resolver->setAllowedTypes('choice_attr', ['null', 'array', 'callable', 'string',  PropertyPath::class]);
-        $resolver->setAllowedTypes('preferred_choices', ['array', '\Traversable', 'callable', 'string',  PropertyPath::class]);
-        $resolver->setAllowedTypes('group_by', ['null', 'callable', 'string',  PropertyPath::class]);
-
-        // Note that 'view_format' and 'norm_format' only affects the transformation.
-        // But not the Widget view display (which always uses the label).
-        $resolver->setAllowedValues('view_format', ['auto', 'label', 'value']);
-        $resolver->setAllowedValues('norm_format', ['auto', 'label', 'value']);
-        $resolver->setNormalizer(
-            'view_format',
-            static fn (Options $options, $value) => $value === 'auto' ? 'label' : $value
-        );
-        $resolver->setNormalizer(
-            'norm_format',
-            static fn (Options $options, $value) => $value === 'auto' ? 'value' : $value
-        );
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'choice';
-    }
-
-    private function createChoiceList(array $options): ChoiceList
-    {
-        if ($options['choice_loader'] !== null) {
-            return $this->choiceListFactory->createListFromLoader(
-                $options['choice_loader'],
-                $options['choice_value']
-            );
-        }
-
-        // Harden against NULL values
-        $choices = $options['choices'] ?? [];
-
-        return $this->choiceListFactory->createListFromChoices($choices, $options['choice_value']);
-    }
-
-    private function createChoiceListView(ChoiceList $choiceList, array $options): ChoiceListView
-    {
-        return $this->choiceListFactory->createView(
-            $choiceList,
-            $options['preferred_choices'],
-            $options['choice_label'],
-            $options['choice_name'],
-            $options['group_by'],
-            $options['choice_attr']
-        );
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/CountryType.php b/lib/Core/Extension/Core/Type/CountryType.php
deleted file mode 100644
index a72f6af9..00000000
--- a/lib/Core/Extension/Core/Type/CountryType.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceLoaderTrait;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Symfony\Component\Intl\Countries;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class CountryType extends AbstractFieldType implements ChoiceLoader
-{
-    use ChoiceLoaderTrait;
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'choice_loader' => $this,
-            'choice_translation_domain' => false,
-        ]);
-    }
-
-    public function getParent(): string
-    {
-        return ChoiceType::class;
-    }
-
-    public function loadChoiceList(?callable $value = null): ChoiceList
-    {
-        if ($this->choiceList !== null) {
-            return $this->choiceList;
-        }
-
-        return $this->choiceList = new ArrayChoiceList(array_flip(Countries::getNames()), $value);
-    }
-
-    public function isValuesConstant(): bool
-    {
-        return true;
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'country';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/CurrencyType.php b/lib/Core/Extension/Core/Type/CurrencyType.php
deleted file mode 100644
index c4ec874c..00000000
--- a/lib/Core/Extension/Core/Type/CurrencyType.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceLoaderTrait;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Symfony\Component\Intl\Currencies;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class CurrencyType extends AbstractFieldType implements ChoiceLoader
-{
-    use ChoiceLoaderTrait;
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'choice_loader' => $this,
-            'choice_translation_domain' => false,
-            'view_format' => 'value',
-        ]);
-    }
-
-    public function getParent(): string
-    {
-        return ChoiceType::class;
-    }
-
-    public function loadChoiceList(?callable $value = null): ChoiceList
-    {
-        if ($this->choiceList !== null) {
-            return $this->choiceList;
-        }
-
-        return $this->choiceList = new ArrayChoiceList(array_flip(Currencies::getNames()), $value);
-    }
-
-    public function isValuesConstant(): bool
-    {
-        return true;
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'currency';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/DateTimeType.php b/lib/Core/Extension/Core/Type/DateTimeType.php
deleted file mode 100644
index 5ee8dd48..00000000
--- a/lib/Core/Extension/Core/Type/DateTimeType.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Carbon\CarbonInterval;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateIntervalTransformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToRfc3339Transformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\MultiTypeDataTransformer;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\DateTimeIntervalValueComparator;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\DateTimeValueComparator;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\SearchFieldView;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\Range;
-use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class DateTimeType extends BaseDateTimeType
-{
-    public const DEFAULT_DATE_FORMAT = \IntlDateFormatter::MEDIUM;
-    public const DEFAULT_TIME_FORMAT = \IntlDateFormatter::MEDIUM;
-
-    private readonly DateTimeValueComparator $valueComparator;
-    private readonly DateTimeIntervalValueComparator $valueComparatorInterval;
-
-    public function __construct()
-    {
-        $this->valueComparator = new DateTimeValueComparator();
-        $this->valueComparatorInterval = new DateTimeIntervalValueComparator();
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $config->setValueComparator($this->valueComparator);
-        $config->setValueTypeSupport(Range::class, true);
-        $config->setValueTypeSupport(Compare::class, true);
-
-        if ($options['pattern'] === null) {
-            $this->validateFormat('date_format', $options['date_format']);
-            $this->validateFormat('time_format', $options['time_format']);
-        }
-
-        if ($options['allow_relative']) {
-            $config->setValueComparator($this->valueComparatorInterval);
-
-            $config->setViewTransformer(
-                new MultiTypeDataTransformer(
-                    [
-                        CarbonInterval::class => new DateIntervalTransformer(\Locale::getDefault()),
-                        \DateTimeImmutable::class => new DateTimeToLocalizedStringTransformer(
-                            $options['model_timezone'],
-                            $options['view_timezone'],
-                            $options['date_format'],
-                            $options['time_format'],
-                            \IntlDateFormatter::GREGORIAN,
-                            $options['pattern']
-                        ),
-                    ]
-                )
-            );
-
-            $config->setNormTransformer(
-                new MultiTypeDataTransformer(
-                    [
-                        CarbonInterval::class => new DateIntervalTransformer('en'),
-                        \DateTimeImmutable::class => new DateTimeToRfc3339Transformer(
-                            $options['model_timezone'],
-                            $options['view_timezone']
-                        ),
-                    ]
-                )
-            );
-        } else {
-            $config->setViewTransformer(
-                new DateTimeToLocalizedStringTransformer(
-                    $options['model_timezone'],
-                    $options['view_timezone'],
-                    $options['date_format'],
-                    $options['time_format'],
-                    \IntlDateFormatter::GREGORIAN,
-                    $options['pattern']
-                )
-            );
-
-            $config->setNormTransformer(
-                new DateTimeToRfc3339Transformer(
-                    $options['model_timezone'],
-                    $options['view_timezone']
-                )
-            );
-        }
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-        $pattern = $options['pattern'];
-
-        if ($pattern === null) {
-            $pattern = \IntlDateFormatter::create(
-                \Locale::getDefault(),
-                $options['date_format'],
-                $options['time_format'],
-                $options['view_timezone'],
-                \IntlDateFormatter::GREGORIAN
-            )->getPattern();
-        }
-
-        $view->vars['timezone'] = $options['view_timezone'] ?: date_default_timezone_get();
-        $view->vars['allow_relative'] = $options['allow_relative'];
-        $view->vars['pattern'] = str_replace("\u{202f}", ' ', $pattern);
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'model_timezone' => 'UTC',
-                'view_timezone' => null,
-                'pattern' => null,
-                'allow_relative' => false,
-                'date_format' => self::DEFAULT_DATE_FORMAT,
-                'time_format' => self::DEFAULT_TIME_FORMAT,
-                'invalid_message' => static function (Options $options) {
-                    if ($options['allow_relative']) {
-                        return 'This value is not a valid datetime or date interval.';
-                    }
-
-                    return 'This value is not a valid datetime.';
-                },
-            ]
-        );
-
-        $resolver->setAllowedTypes('pattern', ['string', 'null']);
-        $resolver->setAllowedTypes('allow_relative', 'bool');
-        $resolver->setAllowedTypes('date_format', ['int']);
-        $resolver->setAllowedTypes('time_format', ['int']);
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'datetime';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/DateType.php b/lib/Core/Extension/Core/Type/DateType.php
deleted file mode 100644
index 185f44c0..00000000
--- a/lib/Core/Extension/Core/Type/DateType.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\DateValueComparator;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\SearchFieldView;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\Range;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class DateType extends BaseDateTimeType
-{
-    public const DEFAULT_FORMAT = \IntlDateFormatter::MEDIUM;
-    public const HTML5_FORMAT = 'yyyy-MM-dd';
-
-    private DateValueComparator $valueComparator;
-
-    public function __construct()
-    {
-        $this->valueComparator = new DateValueComparator();
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $config->setValueComparator($this->valueComparator);
-        $config->setValueTypeSupport(Range::class, true);
-        $config->setValueTypeSupport(Compare::class, true);
-
-        if ($options['pattern'] === null) {
-            $this->validateFormat('format', $options['format']);
-        } else {
-            $this->validateDateFormat('pattern', $options['pattern']);
-        }
-
-        $config->setViewTransformer(
-            new DateTimeToLocalizedStringTransformer(
-                $options['model_timezone'],
-                $options['view_timezone'],
-                $options['format'],
-                \IntlDateFormatter::NONE,
-                \IntlDateFormatter::GREGORIAN,
-                $options['pattern']
-            )
-        );
-
-        $config->setNormTransformer(
-            new DateTimeToLocalizedStringTransformer(
-                $options['model_timezone'],
-                $options['view_timezone'],
-                $options['format'],
-                \IntlDateFormatter::NONE,
-                \IntlDateFormatter::GREGORIAN,
-                self::HTML5_FORMAT
-            )
-        );
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-        $pattern = $options['pattern'];
-
-        if ($pattern === null) {
-            $pattern = \IntlDateFormatter::create(
-                \Locale::getDefault(),
-                $options['format'],
-                \IntlDateFormatter::NONE,
-                $options['view_timezone'],
-                \IntlDateFormatter::GREGORIAN
-            )->getPattern();
-        }
-
-        $view->vars['html5'] = $options['html5'];
-        $view->vars['timezone'] = $options['view_timezone'] ?? date_default_timezone_get();
-        $view->vars['pattern'] = $pattern;
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'model_timezone' => null,
-                'view_timezone' => null,
-                'pattern' => null,
-                'format' => self::DEFAULT_FORMAT,
-                'html5' => true,
-            ]
-        );
-
-        $resolver->setAllowedTypes('format', ['int']);
-        $resolver->setAllowedTypes('pattern', ['string', 'null']);
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'date';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/IntegerType.php b/lib/Core/Extension/Core/Type/IntegerType.php
deleted file mode 100644
index 4f6c086b..00000000
--- a/lib/Core/Extension/Core/Type/IntegerType.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\IntegerToStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\NumberValueComparator;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\SearchFieldView;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\Range;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class IntegerType extends AbstractFieldType
-{
-    private NumberValueComparator $valueComparator;
-
-    public function __construct()
-    {
-        $this->valueComparator = new NumberValueComparator();
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $config->setValueComparator($this->valueComparator);
-        $config->setValueTypeSupport(Range::class, true);
-        $config->setValueTypeSupport(Compare::class, true);
-
-        $config->setNormTransformer(new IntegerToStringTransformer($options['rounding_mode']));
-        $config->setViewTransformer(
-            new IntegerToLocalizedStringTransformer($options['grouping'], $options['rounding_mode'])
-        );
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-        $view->vars['grouping'] = $options['grouping'];
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'grouping' => false,
-                // Integer cast rounds towards 0, so do the same when displaying fractions
-                'rounding_mode' => \NumberFormatter::ROUND_DOWN,
-            ]
-        );
-
-        $resolver->setAllowedValues(
-            'rounding_mode',
-            [
-                \NumberFormatter::ROUND_FLOOR,
-                \NumberFormatter::ROUND_DOWN,
-                \NumberFormatter::ROUND_HALFDOWN,
-                \NumberFormatter::ROUND_HALFEVEN,
-                \NumberFormatter::ROUND_HALFUP,
-                \NumberFormatter::ROUND_UP,
-                \NumberFormatter::ROUND_CEILING,
-            ]
-        );
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'integer';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/LanguageType.php b/lib/Core/Extension/Core/Type/LanguageType.php
deleted file mode 100644
index 4ff4ef0f..00000000
--- a/lib/Core/Extension/Core/Type/LanguageType.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceLoaderTrait;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Symfony\Component\Intl\Languages;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class LanguageType extends AbstractFieldType implements ChoiceLoader
-{
-    use ChoiceLoaderTrait;
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'choice_loader' => $this,
-            'choice_translation_domain' => false,
-        ]);
-    }
-
-    public function getParent(): string
-    {
-        return ChoiceType::class;
-    }
-
-    public function loadChoiceList(?callable $value = null): ChoiceList
-    {
-        if ($this->choiceList !== null) {
-            return $this->choiceList;
-        }
-
-        return $this->choiceList = new ArrayChoiceList(array_flip(Languages::getNames()), $value);
-    }
-
-    public function isValuesConstant(): bool
-    {
-        return true;
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'language';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/LocaleType.php b/lib/Core/Extension/Core/Type/LocaleType.php
deleted file mode 100644
index 0e1de18c..00000000
--- a/lib/Core/Extension/Core/Type/LocaleType.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceLoaderTrait;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Symfony\Component\Intl\Locales;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class LocaleType extends AbstractFieldType implements ChoiceLoader
-{
-    use ChoiceLoaderTrait;
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'choice_loader' => $this,
-            'choice_translation_domain' => false,
-            'view_format' => 'value',
-        ]);
-    }
-
-    public function getParent(): string
-    {
-        return ChoiceType::class;
-    }
-
-    public function loadChoiceList(?callable $value = null): ChoiceList
-    {
-        if ($this->choiceList !== null) {
-            return $this->choiceList;
-        }
-
-        return $this->choiceList = new ArrayChoiceList(array_flip(Locales::getNames()), $value);
-    }
-
-    public function isValuesConstant(): bool
-    {
-        return true;
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'locale';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/MoneyType.php b/lib/Core/Extension/Core/Type/MoneyType.php
deleted file mode 100644
index 3f6fd711..00000000
--- a/lib/Core/Extension/Core/Type/MoneyType.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Money\Parser\IntlMoneyParser;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\MoneyToStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\MoneyValueComparator;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\SearchFieldView;
-use Rollerworks\Component\Search\Input\NormStringQueryInput;
-use Rollerworks\Component\Search\Input\StringLexer;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\Range;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class MoneyType extends AbstractFieldType
-{
-    private MoneyValueComparator $valueComparator;
-
-    public function __construct()
-    {
-        if (! class_exists(IntlMoneyParser::class)) {
-            throw new \RuntimeException('Unable to use MoneyType without the "moneyphp/money" library.');
-        }
-
-        $this->valueComparator = new MoneyValueComparator();
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $config->setValueComparator($this->valueComparator);
-        $config->setValueTypeSupport(Range::class, true);
-        $config->setValueTypeSupport(Compare::class, true);
-
-        $config->setViewTransformer(
-            new MoneyToLocalizedStringTransformer(
-                $options['default_currency'],
-                $options['grouping']
-            )
-        );
-
-        $config->setNormTransformer(
-            new MoneyToStringTransformer($options['default_currency'])
-        );
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-        $view->vars['grouping'] = $options['grouping'];
-        $view->vars['default_currency'] = $options['default_currency'];
-        $view->vars['increase_by'] = $options['increase_by'];
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'grouping' => false,
-                'default_currency' => 'EUR',
-                'increase_by' => 'cents',
-                NormStringQueryInput::FIELD_LEXER_OPTION_NAME => static function (StringLexer $lexer, string $allowedNext): string {
-                    if ($lexer->isGlimpse('"')) {
-                        return $lexer->stringValue($allowedNext);
-                    }
-
-                    return $lexer->expects('/([A-Z]{3} )?(-?(\d+)?(\.\d+)?)/As', 'Money format as CUR xx.xx. Eg. EUR 12.00');
-                },
-                StringQueryInput::FIELD_LEXER_OPTION_NAME => static function (StringLexer $lexer, string $allowedNext): string {
-                    if ($lexer->isGlimpse('"')) {
-                        return $lexer->stringValue($allowedNext);
-                    }
-
-                    // Currencies can be more complex then you would expect. Some locales even use spaces!
-                    // And this needs to support as much combinations as possible.
-                    //
-                    // The currency is matched before and/or after. Again this is not about validating but matching.
-
-                    return $lexer->expects('/\p{Sc}?(\xc2\xa0|\h)?-?\p{N}+((\xc2\xa0|\h|\.)\p{N}{2,3})*-?((\xc2\xa0|\h)?\p{Sc})?/Aus', 'MoneyFormat');
-                },
-
-                StringQueryInput::VALUE_EXPORTER_OPTION_NAME => static function ($value, callable $transformer, FieldConfig $config) {
-                    $transformedValue = $transformer($value, $config);
-
-                    if (mb_strpos($transformedValue, ',') !== false) {
-                        $transformedValue = '"' . $transformedValue . '"';
-                    }
-
-                    return $transformedValue;
-                },
-                NormStringQueryInput::VALUE_EXPORTER_OPTION_NAME => true,
-            ]
-        );
-
-        $resolver->setAllowedValues('increase_by', ['cents', 'amount']);
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'money';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/NumberType.php b/lib/Core/Extension/Core/Type/NumberType.php
deleted file mode 100644
index c2faa765..00000000
--- a/lib/Core/Extension/Core/Type/NumberType.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\NumberToStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\NumberValueComparator;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\SearchFieldView;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\Range;
-use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class NumberType extends AbstractFieldType
-{
-    private NumberValueComparator $valueComparator;
-
-    public function __construct()
-    {
-        $this->valueComparator = new NumberValueComparator();
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $config->setValueComparator($this->valueComparator);
-        $config->setValueTypeSupport(Range::class, true);
-        $config->setValueTypeSupport(Compare::class, true);
-
-        $config->setViewTransformer(
-            new NumberToLocalizedStringTransformer(
-                $options['scale'],
-                $options['grouping'],
-                $options['rounding_mode']
-            )
-        );
-
-        $config->setNormTransformer(
-            new NumberToStringTransformer(
-                $options['scale'],
-                $options['grouping'],
-                $options['rounding_mode']
-            )
-        );
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-        $view->vars['scale'] = $options['scale'];
-        $view->vars['grouping'] = $options['grouping'];
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            // default scale is locale specific (usually around 3)
-            'scale' => null,
-            'grouping' => false,
-            'rounding_mode' => NumberToLocalizedStringTransformer::ROUND_HALF_UP,
-            'html5' => false,
-        ]);
-
-        $resolver->setAllowedValues('rounding_mode', [
-            NumberToLocalizedStringTransformer::ROUND_FLOOR,
-            NumberToLocalizedStringTransformer::ROUND_DOWN,
-            NumberToLocalizedStringTransformer::ROUND_HALF_DOWN,
-            NumberToLocalizedStringTransformer::ROUND_HALF_EVEN,
-            NumberToLocalizedStringTransformer::ROUND_HALF_UP,
-            NumberToLocalizedStringTransformer::ROUND_UP,
-            NumberToLocalizedStringTransformer::ROUND_CEILING,
-        ]);
-
-        $resolver->setAllowedTypes('scale', ['null', 'int']);
-        $resolver->setAllowedTypes('html5', 'bool');
-        $resolver->setNormalizer('grouping', static function (Options $options, $value) {
-            if ($value === true && $options['html5']) {
-                throw new \LogicException('Cannot use the "grouping" option when the "html5" option is enabled.');
-            }
-
-            return $value;
-        });
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'number';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/SearchFieldType.php b/lib/Core/Extension/Core/Type/SearchFieldType.php
deleted file mode 100644
index c26c6459..00000000
--- a/lib/Core/Extension/Core/Type/SearchFieldType.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\SimpleValueComparator;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Input\NormStringQueryInput;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class SearchFieldType extends AbstractFieldType
-{
-    private SimpleValueComparator $valueComparator;
-
-    public function __construct()
-    {
-        $this->valueComparator = new SimpleValueComparator();
-    }
-
-    public function getParent(): ?string
-    {
-        return null;
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $config->setValueComparator($this->valueComparator);
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'label' => null,
-                'translation_domain' => 'messages',
-                'invalid_message' => 'This value is not valid.',
-                'invalid_message_parameters' => [],
-                StringQueryInput::FIELD_LEXER_OPTION_NAME => null,
-                NormStringQueryInput::FIELD_LEXER_OPTION_NAME => null,
-                StringQueryInput::VALUE_EXPORTER_OPTION_NAME => null,
-                NormStringQueryInput::VALUE_EXPORTER_OPTION_NAME => null,
-            ]
-        );
-
-        $resolver->setAllowedTypes('label', ['null', 'string']);
-        $resolver->setAllowedTypes('invalid_message', ['string']);
-        $resolver->setAllowedTypes('invalid_message_parameters', ['array']);
-        $resolver->setAllowedTypes(StringQueryInput::FIELD_LEXER_OPTION_NAME, ['null', \Closure::class]);
-        $resolver->setAllowedTypes(StringQueryInput::VALUE_EXPORTER_OPTION_NAME, ['null', 'bool', \Closure::class]);
-        $resolver->setAllowedTypes(NormStringQueryInput::FIELD_LEXER_OPTION_NAME, ['null', \Closure::class]);
-        $resolver->setAllowedTypes(NormStringQueryInput::VALUE_EXPORTER_OPTION_NAME, ['null', 'bool', \Closure::class]);
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'field';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/TextType.php b/lib/Core/Extension/Core/Type/TextType.php
deleted file mode 100644
index 9e38c24d..00000000
--- a/lib/Core/Extension/Core/Type/TextType.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Value\PatternMatch;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class TextType extends AbstractFieldType
-{
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $config->setValueTypeSupport(PatternMatch::class, true);
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'text';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/TimeType.php b/lib/Core/Extension/Core/Type/TimeType.php
deleted file mode 100644
index 1d3755d5..00000000
--- a/lib/Core/Extension/Core/Type/TimeType.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Exception\InvalidConfigurationException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\DateTimeValueComparator;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\SearchFieldView;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\Range;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class TimeType extends AbstractFieldType
-{
-    private DateTimeValueComparator $valueComparator;
-
-    public function __construct()
-    {
-        $this->valueComparator = new DateTimeValueComparator();
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $format = 'H';
-
-        if ($options['with_seconds'] && ! $options['with_minutes']) {
-            throw new InvalidConfigurationException('You can not disable minutes if you have enabled seconds.');
-        }
-
-        if ($options['with_minutes']) {
-            $format .= ':i';
-        }
-
-        if ($options['with_seconds']) {
-            $format .= ':s';
-        }
-
-        $config->setValueTypeSupport(Range::class, true);
-        $config->setValueTypeSupport(Compare::class, true);
-        $config->setValueComparator($this->valueComparator);
-
-        $config->setViewTransformer(
-            new DateTimeToStringTransformer(
-                'UTC',
-                'UTC',
-                $format
-            )
-        );
-
-        $config->setNormTransformer(
-            new DateTimeToStringTransformer(
-                'UTC',
-                'UTC',
-                $format
-            )
-        );
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-        $pattern = 'H';
-
-        if ($options['with_minutes']) {
-            $pattern .= ':i';
-        }
-
-        if ($options['with_seconds']) {
-            $pattern .= ':s';
-        }
-
-        $view->vars['pattern'] = $pattern;
-        $view->vars['with_minutes'] = $options['with_minutes'];
-        $view->vars['with_seconds'] = $options['with_seconds'];
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'with_minutes' => true,
-                'with_seconds' => false,
-            ]
-        );
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'time';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/TimestampType.php b/lib/Core/Extension/Core/Type/TimestampType.php
deleted file mode 100644
index 1bfac197..00000000
--- a/lib/Core/Extension/Core/Type/TimestampType.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\DateTimeValueComparator;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\Range;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class TimestampType extends AbstractFieldType
-{
-    private DateTimeValueComparator $valueComparator;
-
-    public function __construct()
-    {
-        $this->valueComparator = new DateTimeValueComparator();
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $config->setValueComparator($this->valueComparator);
-        $config->setValueTypeSupport(Range::class, true);
-        $config->setValueTypeSupport(Compare::class, true);
-
-        $config->setViewTransformer(
-            new DateTimeToTimestampTransformer(
-                $options['model_timezone'],
-                $options['view_timezone']
-            )
-        );
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'model_timezone' => null,
-            'view_timezone' => null,
-        ]);
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'timestamp';
-    }
-}
diff --git a/lib/Core/Extension/Core/Type/TimezoneType.php b/lib/Core/Extension/Core/Type/TimezoneType.php
deleted file mode 100644
index 0be27c82..00000000
--- a/lib/Core/Extension/Core/Type/TimezoneType.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceLoaderTrait;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class TimezoneType extends AbstractFieldType implements ChoiceLoader
-{
-    use ChoiceLoaderTrait;
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'choice_loader' => $this,
-            'choice_translation_domain' => false,
-        ]);
-    }
-
-    public function getParent(): string
-    {
-        return ChoiceType::class;
-    }
-
-    public function loadChoiceList(?callable $value = null): ChoiceList
-    {
-        if ($this->choiceList !== null) {
-            return $this->choiceList;
-        }
-
-        return $this->choiceList = new ArrayChoiceList(self::getTimezones(), $value);
-    }
-
-    public function isValuesConstant(): bool
-    {
-        return true;
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'timezone';
-    }
-
-    /**
-     * Returns a normalized array of timezone choices.
-     *
-     * @return array The timezone choices
-     */
-    private static function getTimezones(): array
-    {
-        $timezones = [];
-
-        foreach (\DateTimeZone::listIdentifiers() as $timezone) {
-            $parts = explode('/', $timezone);
-
-            if (\count($parts) > 2) {
-                $region = $parts[0];
-                $name = $parts[1] . ' - ' . $parts[2];
-            } elseif (\count($parts) > 1) {
-                $region = $parts[0];
-                $name = $parts[1];
-            } else {
-                $region = 'Other';
-                $name = $parts[0];
-            }
-
-            $timezones[$region][str_replace('_', ' ', $name)] = $timezone;
-        }
-
-        return $timezones;
-    }
-}
diff --git a/lib/Core/Extension/Core/ValueComparator/BirthdayValueComparator.php b/lib/Core/Extension/Core/ValueComparator/BirthdayValueComparator.php
deleted file mode 100644
index c252bf05..00000000
--- a/lib/Core/Extension/Core/ValueComparator/BirthdayValueComparator.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ValueComparator;
-
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class BirthdayValueComparator implements ValueComparator
-{
-    /**
-     * @param \DateTimeImmutable|int $higher
-     * @param \DateTimeImmutable|int $lower
-     */
-    public function isHigher(mixed $higher, mixed $lower, array $options): bool
-    {
-        if (! \is_object($higher) xor ! \is_object($lower)) {
-            return false;
-        }
-
-        return $higher > $lower;
-    }
-
-    /**
-     * @param \DateTimeImmutable|int $lower
-     * @param \DateTimeImmutable|int $higher
-     */
-    public function isLower(mixed $lower, mixed $higher, array $options): bool
-    {
-        if (! \is_object($higher) xor ! \is_object($lower)) {
-            return false;
-        }
-
-        return $lower < $higher;
-    }
-
-    /**
-     * @param \DateTimeImmutable|int $value
-     * @param \DateTimeImmutable|int $nextValue
-     */
-    public function isEqual(mixed $value, mixed $nextValue, array $options): bool
-    {
-        if (! \is_object($value) xor ! \is_object($nextValue)) {
-            return false;
-        }
-
-        if ($value instanceof \DateTimeImmutable) {
-            $value = $value->getTimestamp();
-            $nextValue = $nextValue->getTimestamp();
-        }
-
-        return $value === $nextValue;
-    }
-}
diff --git a/lib/Core/Extension/Core/ValueComparator/DateTimeIntervalValueComparator.php b/lib/Core/Extension/Core/ValueComparator/DateTimeIntervalValueComparator.php
deleted file mode 100644
index 7fb14c99..00000000
--- a/lib/Core/Extension/Core/ValueComparator/DateTimeIntervalValueComparator.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ValueComparator;
-
-use Carbon\CarbonInterval;
-use Rollerworks\Component\Search\ValueComparator;
-
-final class DateTimeIntervalValueComparator implements ValueComparator
-{
-    /**
-     * @param CarbonInterval|\DateTimeImmutable $higher
-     * @param CarbonInterval|\DateTimeImmutable $lower
-     */
-    public function isHigher($higher, $lower, array $options): bool
-    {
-        if ($lower instanceof CarbonInterval && $higher instanceof CarbonInterval) {
-            return $higher->greaterThan($lower);
-        }
-
-        $lower = $this->ensureDateTime($lower);
-        $higher = $this->ensureDateTime($higher);
-
-        return $higher > $lower;
-    }
-
-    /**
-     * @param CarbonInterval|\DateTimeImmutable $value
-     */
-    private function ensureDateTime(object $value): \DateTimeImmutable
-    {
-        if ($value instanceof CarbonInterval) {
-            $value = (new \DateTimeImmutable())->add($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * @param CarbonInterval|\DateTimeImmutable $lower
-     * @param CarbonInterval|\DateTimeImmutable $higher
-     */
-    public function isLower($lower, $higher, array $options): bool
-    {
-        if ($lower instanceof CarbonInterval && $higher instanceof CarbonInterval) {
-            return $lower->lessThan($higher);
-        }
-
-        $lower = $this->ensureDateTime($lower);
-        $higher = $this->ensureDateTime($higher);
-
-        return $lower < $higher;
-    }
-
-    /**
-     * @param CarbonInterval|\DateTimeImmutable $value
-     * @param CarbonInterval|\DateTimeImmutable $nextValue
-     */
-    public function isEqual($value, $nextValue, array $options): bool
-    {
-        // Note that only values of the same type can be compared.
-        // As an interval is never equal to "now".
-        if (! is_a($value, $nextValue::class)) {
-            return false;
-        }
-
-        if ($value instanceof CarbonInterval) {
-            return $value->equalTo($nextValue);
-        }
-
-        return $value->getTimestamp() === $nextValue->getTimestamp();
-    }
-}
diff --git a/lib/Core/Extension/Core/ValueComparator/DateTimeValueComparator.php b/lib/Core/Extension/Core/ValueComparator/DateTimeValueComparator.php
deleted file mode 100644
index 8b40834d..00000000
--- a/lib/Core/Extension/Core/ValueComparator/DateTimeValueComparator.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ValueComparator;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class DateTimeValueComparator extends DateValueComparator
-{
-}
diff --git a/lib/Core/Extension/Core/ValueComparator/DateValueComparator.php b/lib/Core/Extension/Core/ValueComparator/DateValueComparator.php
deleted file mode 100644
index 522197c5..00000000
--- a/lib/Core/Extension/Core/ValueComparator/DateValueComparator.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ValueComparator;
-
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class DateValueComparator implements ValueComparator
-{
-    /**
-     * @param \DateTimeImmutable $higher
-     * @param \DateTimeImmutable $lower
-     */
-    public function isHigher($higher, $lower, array $options): bool
-    {
-        return $higher > $lower;
-    }
-
-    /**
-     * @param \DateTimeImmutable $lower
-     * @param \DateTimeImmutable $higher
-     */
-    public function isLower($lower, $higher, array $options): bool
-    {
-        return $lower < $higher;
-    }
-
-    /**
-     * @param \DateTimeImmutable $value
-     * @param \DateTimeImmutable $nextValue
-     */
-    public function isEqual($value, $nextValue, array $options): bool
-    {
-        return $value->getTimestamp() === $nextValue->getTimestamp();
-    }
-}
diff --git a/lib/Core/Extension/Core/ValueComparator/MoneyValueComparator.php b/lib/Core/Extension/Core/ValueComparator/MoneyValueComparator.php
deleted file mode 100644
index 27aa2b68..00000000
--- a/lib/Core/Extension/Core/ValueComparator/MoneyValueComparator.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ValueComparator;
-
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class MoneyValueComparator implements ValueComparator
-{
-    /**
-     * @param MoneyValue $higher
-     * @param MoneyValue $lower
-     */
-    public function isHigher($higher, $lower, array $options): bool
-    {
-        if (! $higher->value->isSameCurrency($lower->value)) {
-            return false;
-        }
-
-        return $higher->value->greaterThan($lower->value);
-    }
-
-    /**
-     * @param MoneyValue $lower
-     * @param MoneyValue $higher
-     */
-    public function isLower($lower, $higher, array $options): bool
-    {
-        if (! $higher->value->isSameCurrency($lower->value)) {
-            return false;
-        }
-
-        return $lower->value->lessThan($higher->value);
-    }
-
-    /**
-     * @param MoneyValue $value
-     * @param MoneyValue $nextValue
-     */
-    public function isEqual($value, $nextValue, array $options): bool
-    {
-        return $value->value->equals($nextValue->value);
-    }
-}
diff --git a/lib/Core/Extension/Core/ValueComparator/NumberValueComparator.php b/lib/Core/Extension/Core/ValueComparator/NumberValueComparator.php
deleted file mode 100644
index a91efeb7..00000000
--- a/lib/Core/Extension/Core/ValueComparator/NumberValueComparator.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ValueComparator;
-
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class NumberValueComparator implements ValueComparator
-{
-    /**
-     * @param float|int $higher
-     * @param float|int $lower
-     */
-    public function isHigher($higher, $lower, array $options): bool
-    {
-        return $higher > $lower;
-    }
-
-    /**
-     * @param float|int $lower
-     * @param float|int $higher
-     */
-    public function isLower($lower, $higher, array $options): bool
-    {
-        return $lower < $higher;
-    }
-
-    /**
-     * @param float|int $value
-     * @param float|int $nextValue
-     */
-    public function isEqual($value, $nextValue, array $options): bool
-    {
-        return $value === $nextValue;
-    }
-}
diff --git a/lib/Core/Extension/Core/ValueComparator/SimpleValueComparator.php b/lib/Core/Extension/Core/ValueComparator/SimpleValueComparator.php
deleted file mode 100644
index 567ad663..00000000
--- a/lib/Core/Extension/Core/ValueComparator/SimpleValueComparator.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Core\ValueComparator;
-
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * Default ValueComparator implementation, only able to compare equality.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class SimpleValueComparator implements ValueComparator
-{
-    public function isHigher($value, $nextValue, array $options): bool
-    {
-        return false;
-    }
-
-    public function isLower($lower, $higher, array $options): bool
-    {
-        return false;
-    }
-
-    public function isEqual($value, $nextValue, array $options): bool
-    {
-        // This does not work for objects, so they should have
-        // there own comparison classes.
-        return $value === $nextValue;
-    }
-}
diff --git a/lib/Core/Extension/LazyExtension.php b/lib/Core/Extension/LazyExtension.php
deleted file mode 100644
index 10836baa..00000000
--- a/lib/Core/Extension/LazyExtension.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension;
-
-use Psr\Container\ContainerInterface;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Field\FieldType;
-use Rollerworks\Component\Search\Field\FieldTypeExtension;
-use Rollerworks\Component\Search\Loader\ClosureContainer;
-use Rollerworks\Component\Search\SearchExtension;
-
-/**
- * Provides a way to lazy load types from the Container.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class LazyExtension implements SearchExtension
-{
-    /**
-     * @param array<string, array<string, FieldTypeExtension>> $typeExtensionServices
-     */
-    public function __construct(
-        private readonly ContainerInterface $typeContainer,
-        private array $typeExtensionServices,
-    ) {
-    }
-
-    /**
-     * Creates a new LazyExtension with easy factories for lazy loading.
-     *
-     * @param array<string, \Closure>                          $types          FQCN => \Closure factory
-     * @param array<string, array<string, FieldTypeExtension>> $typeExtensions
-     */
-    public static function create(array $types, array $typeExtensions = []): self
-    {
-        return new self(new ClosureContainer($types), $typeExtensions);
-    }
-
-    public function getType(string $name): FieldType
-    {
-        if (! $this->typeContainer->has($name)) {
-            throw new InvalidArgumentException(
-                \sprintf('The field type "%s" is not registered with the service container.', $name)
-            );
-        }
-
-        return $this->typeContainer->get($name);
-    }
-
-    public function hasType(string $name): bool
-    {
-        return $this->typeContainer->has($name);
-    }
-
-    public function getTypeExtensions(string $name): array
-    {
-        $extensions = [];
-
-        foreach ($this->typeExtensionServices[$name] ?? [] as $extensionId => $extension) {
-            $extensions[] = $extension;
-
-            // validate result of getExtendedType() to ensure it is consistent with the service definition
-            if ($extension->getExtendedType() !== $name) {
-                throw new InvalidArgumentException(
-                    \sprintf(
-                        'The extended type specified for the service "%s" does not match the actual extended type. Expected "%s", given "%s".',
-                        $extensionId,
-                        $name,
-                        $extension->getExtendedType()
-                    )
-                );
-            }
-        }
-
-        return $extensions;
-    }
-}
diff --git a/lib/Core/Field/AbstractFieldType.php b/lib/Core/Field/AbstractFieldType.php
deleted file mode 100644
index bf397314..00000000
--- a/lib/Core/Field/AbstractFieldType.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Util\StringUtil;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * The AbstractFieldType can be used as a base class implementation for FieldTypes.
- *
- * An added bonus for extending this class rather then the implementing the the
- * {@link FieldType} is that any new methods added the FieldType interface will
- * not break existing implementations.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-abstract class AbstractFieldType implements FieldType
-{
-    public function buildType(FieldConfig $config, array $options): void
-    {
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-    }
-
-    public function getParent(): ?string
-    {
-        return SearchFieldType::class;
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return StringUtil::fqcnToBlockPrefix(static::class);
-    }
-}
diff --git a/lib/Core/Field/AbstractFieldTypeExtension.php b/lib/Core/Field/AbstractFieldTypeExtension.php
deleted file mode 100644
index 97fdf400..00000000
--- a/lib/Core/Field/AbstractFieldTypeExtension.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * The AbstractFieldTypeExtension can be used as a base implementation
- * for FieldTypeExtensions.
- *
- * An added bonus for extending this class rather then the implementing the the
- * {@link FieldTypeExtension} is that any new methods added the FieldTypeExtension
- * Interface will not break existing implementations.
- */
-abstract class AbstractFieldTypeExtension implements FieldTypeExtension
-{
-    public function buildType(FieldConfig $builder, array $options): void
-    {
-    }
-
-    public function buildView(FieldConfig $config, SearchFieldView $view): void
-    {
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-    }
-}
diff --git a/lib/Core/Field/FieldConfig.php b/lib/Core/Field/FieldConfig.php
deleted file mode 100644
index 6fb10ce0..00000000
--- a/lib/Core/Field/FieldConfig.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Value\ValueHolder;
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * @method void finalizeConfig()
- */
-interface FieldConfig
-{
-    public function getName(): string;
-
-    /**
-     * Returns the field type used to construct the field.
-     */
-    public function getType(): ResolvedFieldType;
-
-    /**
-     * Returns whether value-type $type is accepted by the field.
-     *
-     * @param class-string<ValueHolder> $type
-     */
-    public function supportValueType(string $type): bool;
-
-    /**
-     * Sets whether value-type $type is accepted by the field.
-     *
-     * @param class-string<ValueHolder> $type
-     */
-    public function setValueTypeSupport(string $type, bool $enabled);
-
-    /**
-     * Set a {@link ValueComparator} used for validating specific value types.
-     *
-     * The range and compare value-types require a ValueComparator to be set.
-     */
-    public function setValueComparator(ValueComparator $comparator);
-
-    public function getValueComparator(): ?ValueComparator;
-
-    /**
-     * Sets a view transformer for the field.
-     *
-     * * The reverseTransform method of the transformer is used to convert
-     *   data from the model format to the view format.
-     *
-     * * The transform method of the transformer is used to convert from the
-     *   view to the model format.
-     *
-     * The view format is a user-friendly representation, mostly localized
-     * depending on the configuration of the field. For a date field,
-     * the view format is for example either 'd-m-Y' or 'm-d-Y', depending on the locale.
-     *
-     * @param DataTransformer|null $viewTransformer Use null to remove the transformer
-     */
-    public function setViewTransformer(?DataTransformer $viewTransformer = null);
-
-    /**
-     * Returns the view transformer of the field.
-     */
-    public function getViewTransformer(): ?DataTransformer;
-
-    /**
-     * Sets a normalize transformer for the field.
-     *
-     * * The transform method of the transformer is used to convert data from the
-     *   normalized format to the model format.
-     *
-     * * The reverseTransform method of the transformer is used to convert from the
-     *   model format to the normalized format.
-     *
-     * The normalized format is a normalized representation of the data,
-     * used for input provided from a query-string or API. This format is always
-     * the same regardless of the locale.
-     *
-     * For a date field, the normalized format is for example always in
-     * the 'Y-m-D' format.
-     *
-     * @param DataTransformer|null $viewTransformer Use null to remove the transformer
-     */
-    public function setNormTransformer(?DataTransformer $viewTransformer = null);
-
-    /**
-     * Returns the normalized-value transformer of the field.
-     */
-    public function getNormTransformer(): ?DataTransformer;
-
-    /**
-     * Returns whether the field's data is locked.
-     *
-     * A locked field is not allowed to be modified.
-     */
-    public function isConfigLocked(): bool;
-
-    /**
-     * Returns all options passed during the construction of the field.
-     *
-     * @return array<string, mixed>
-     */
-    public function getOptions(): array;
-
-    public function hasOption(string $name): bool;
-
-    /**
-     * Returns the value of a specific option.
-     */
-    public function getOption(string $name, $default = null);
-
-    /**
-     * Returns a new SearchFieldView for the SearchField.
-     */
-    public function createView(FieldSetView $fieldSet): SearchFieldView;
-
-    /**
-     * Sets the value for an attribute.
-     */
-    public function setAttribute(string $name, $value);
-
-    /**
-     * @param array<string, mixed> $attributes
-     */
-    public function setAttributes(array $attributes);
-
-    /**
-     * Returns additional attributes of the field.
-     *
-     * @return array<string, mixed>
-     */
-    public function getAttributes(): array;
-
-    public function hasAttribute(string $name): bool;
-
-    /**
-     * @param mixed $default The value returned if the attribute does not exist
-     */
-    public function getAttribute(string $name, $default = null);
-}
diff --git a/lib/Core/Field/FieldType.php b/lib/Core/Field/FieldType.php
deleted file mode 100644
index faa98699..00000000
--- a/lib/Core/Field/FieldType.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface FieldType
-{
-    /**
-     * Returns the name (FQCN) of the parent type.
-     */
-    public function getParent(): ?string;
-
-    /**
-     * Sets the default options for this type.
-     */
-    public function configureOptions(OptionsResolver $resolver): void;
-
-    /**
-     * This configures the {@link FieldConfig}.
-     *
-     * This method is called for each type in the hierarchy starting from the
-     * top most type. Type extensions can further modify the field.
-     */
-    public function buildType(FieldConfig $config, array $options): void;
-
-    /**
-     * Configures the SearchFieldView instance.
-     *
-     * This method is called for each type in the hierarchy starting from the
-     * top most type. Type extensions can further modify the view.
-     *
-     * @see FieldTypeExtension::buildView()
-     */
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void;
-
-    /**
-     * Returns the prefix of the template block name for this type.
-     *
-     * The block prefix defaults to the underscored short class name with
-     * the "Type" suffix removed (e.g. "UserIdType" => "user_id").
-     */
-    public function getBlockPrefix(): string;
-}
diff --git a/lib/Core/Field/FieldTypeExtension.php b/lib/Core/Field/FieldTypeExtension.php
deleted file mode 100644
index 6fc74900..00000000
--- a/lib/Core/Field/FieldTypeExtension.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface FieldTypeExtension
-{
-    /**
-     * This method is called after the extended type has built the type to
-     * further modify it.
-     *
-     * @see SearchFieldType::buildType()
-     */
-    public function buildType(FieldConfig $builder, array $options): void;
-
-    /**
-     * This method is called after the extended type has built the view to
-     * further modify it.
-     */
-    public function buildView(FieldConfig $config, SearchFieldView $view): void;
-
-    /**
-     * Overrides the default options from the extended type.
-     */
-    public function configureOptions(OptionsResolver $resolver): void;
-
-    /**
-     * @return string FQCN of the type class
-     */
-    public function getExtendedType(): string;
-}
diff --git a/lib/Core/Field/GenericResolvedFieldType.php b/lib/Core/Field/GenericResolvedFieldType.php
deleted file mode 100644
index 2d90be48..00000000
--- a/lib/Core/Field/GenericResolvedFieldType.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Symfony\Component\OptionsResolver\Exception\ExceptionInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class GenericResolvedFieldType implements ResolvedFieldType
-{
-    private ?OptionsResolver $optionsResolver = null;
-
-    /**
-     * @param FieldTypeExtension[] $typeExtensions
-     *
-     * @throws UnexpectedTypeException When at least one of the given extensions is not an FieldTypeExtension
-     */
-    public function __construct(
-        private readonly FieldType $innerType,
-        private readonly array $typeExtensions = [],
-        private readonly ?ResolvedFieldType $parent = null,
-    ) {
-        foreach ($typeExtensions as $extension) {
-            if (! $extension instanceof FieldTypeExtension) {
-                throw new UnexpectedTypeException($extension, FieldTypeExtension::class);
-            }
-        }
-    }
-
-    public function getParent(): ?ResolvedFieldType
-    {
-        return $this->parent;
-    }
-
-    public function getInnerType(): FieldType
-    {
-        return $this->innerType;
-    }
-
-    public function getTypeExtensions(): array
-    {
-        return $this->typeExtensions;
-    }
-
-    public function createField(string $name, array $options = []): FieldConfig
-    {
-        try {
-            $options = $this->getOptionsResolver()->resolve($options);
-        } catch (ExceptionInterface $e) {
-            throw new $e(\sprintf('An error has occurred resolving the options of the field "%s" with type "%s": ', $name, get_debug_type($this->getInnerType())) . $e->getMessage(), $e->getCode(), $e);
-        }
-
-        return $this->newField($name, $options);
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        if ($this->parent !== null) {
-            $this->parent->buildType($config, $options);
-        }
-
-        $this->innerType->buildType($config, $options);
-
-        foreach ($this->typeExtensions as $extension) {
-            $extension->buildType($config, $options);
-        }
-    }
-
-    public function createFieldView(FieldConfig $config, FieldSetView $view): SearchFieldView
-    {
-        $viewObj = $this->newView($view);
-        $viewObj->vars = array_merge($view->vars, [
-            'name' => $config->getName(),
-            'accept_ranges' => $config->supportValueType(Range::class),
-            'accept_compares' => $config->supportValueType(Compare::class),
-            'accept_pattern_matchers' => $config->supportValueType(PatternMatch::class),
-        ]);
-
-        return $viewObj;
-    }
-
-    public function buildFieldView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-        if ($this->parent !== null) {
-            $this->parent->buildFieldView($view, $config, $options);
-        }
-
-        $this->innerType->buildView($view, $config, $options);
-
-        foreach ($this->typeExtensions as $extension) {
-            $extension->buildView($config, $view);
-        }
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return $this->innerType->getBlockPrefix();
-    }
-
-    public function getOptionsResolver(): OptionsResolver
-    {
-        if ($this->optionsResolver !== null) {
-            return $this->optionsResolver;
-        }
-
-        $this->optionsResolver = $this->parent !== null ? clone $this->parent->getOptionsResolver() : new OptionsResolver();
-        $this->innerType->configureOptions($this->optionsResolver);
-
-        foreach ($this->typeExtensions as $extension) {
-            $extension->configureOptions($this->optionsResolver);
-        }
-
-        return $this->optionsResolver;
-    }
-
-    /**
-     * Creates a new SearchField instance.
-     *
-     * Override this method if you want to customize the field class.
-     */
-    protected function newField($name, array $options): FieldConfig
-    {
-        return OrderField::isOrder($name) ? new OrderField($name, $this, $options) : new SearchField($name, $this, $options);
-    }
-
-    /**
-     * Creates a new SearchFieldView instance.
-     *
-     * Override this method if you want to customize the view class.
-     */
-    protected function newView(FieldSetView $view): SearchFieldView
-    {
-        return new SearchFieldView($view);
-    }
-}
diff --git a/lib/Core/Field/GenericResolvedFieldTypeFactory.php b/lib/Core/Field/GenericResolvedFieldTypeFactory.php
deleted file mode 100644
index ce29a66a..00000000
--- a/lib/Core/Field/GenericResolvedFieldTypeFactory.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-final class GenericResolvedFieldTypeFactory implements ResolvedFieldTypeFactory
-{
-    public function createResolvedType(FieldType $type, array $typeExtensions, ?ResolvedFieldType $parent = null): ResolvedFieldType
-    {
-        return new GenericResolvedFieldType($type, $typeExtensions, $parent);
-    }
-}
diff --git a/lib/Core/Field/GenericTypeRegistry.php b/lib/Core/Field/GenericTypeRegistry.php
deleted file mode 100644
index 4b440c0e..00000000
--- a/lib/Core/Field/GenericTypeRegistry.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Exception\SearchException;
-use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
-use Rollerworks\Component\Search\SearchExtension;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class GenericTypeRegistry implements TypeRegistry
-{
-    /** @var array<string, ResolvedFieldType> */
-    private array $types = [];
-
-    /**
-     * @param SearchExtension[] $extensions
-     *
-     * @throws UnexpectedTypeException if an extension does not implement SearchExtension
-     */
-    public function __construct(
-        private readonly array $extensions,
-        private readonly ResolvedFieldTypeFactory $resolvedTypeFactory,
-    ) {
-        foreach ($extensions as $extension) {
-            if (! $extension instanceof SearchExtension) {
-                throw new UnexpectedTypeException($extension, SearchExtension::class);
-            }
-        }
-    }
-
-    public function getType(string $name): ResolvedFieldType
-    {
-        if (isset($this->types[$name])) {
-            return $this->types[$name];
-        }
-
-        $type = null;
-
-        foreach ($this->extensions as $extension) {
-            if ($extension->hasType($name)) {
-                $type = $extension->getType($name);
-
-                break;
-            }
-        }
-
-        if (! $type) {
-            // Support fully-qualified class names.
-            if (! class_exists($name) || ! \in_array(FieldType::class, class_implements($name), true)) {
-                throw new InvalidArgumentException(\sprintf('Could not load type "%s".', $name));
-            }
-
-            $type = new $name();
-        }
-
-        return $this->types[$name] = $this->resolveType($type);
-    }
-
-    public function hasType(string $name): bool
-    {
-        if (isset($this->types[$name])) {
-            return true;
-        }
-
-        try {
-            $this->getType($name);
-        } catch (SearchException) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function getExtensions(): array
-    {
-        return $this->extensions;
-    }
-
-    private function resolveType(FieldType $type): ResolvedFieldType
-    {
-        $parentType = $type->getParent();
-        $typeExtensions = [];
-
-        foreach ($this->extensions as $extension) {
-            $typeExtensions[] = $extension->getTypeExtensions($type::class);
-        }
-
-        return $this->resolvedTypeFactory->createResolvedType(
-            $type,
-            array_merge(...$typeExtensions),
-            $parentType ? $this->getType($parentType) : null
-        );
-    }
-}
diff --git a/lib/Core/Field/OrderField.php b/lib/Core/Field/OrderField.php
deleted file mode 100644
index 3856994a..00000000
--- a/lib/Core/Field/OrderField.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * @author Dalibor Karlović <dalibor@flexolabs.io>
- */
-final class OrderField implements FieldConfig
-{
-    private ?DataTransformer $normTransformer = null;
-    private ?DataTransformer $viewTransformer = null;
-
-    /** @var array<string, mixed> */
-    private array $attributes = [];
-
-    /**
-     * @param array<string, mixed> $options
-     *
-     * @throws \InvalidArgumentException When the name is invalid
-     */
-    public function __construct(
-        private readonly string $name,
-        private readonly ResolvedFieldType $type,
-        private readonly array $options = [],
-    ) {
-        if (! preg_match('/^@_?[a-zA-Z][a-zA-Z0-9_\-]*$/D', $name)) {
-            throw new InvalidArgumentException(
-                \sprintf(
-                    'The name "%s" contains illegal characters. Name must start with @' .
-                    'and only contain letters, digits, numbers, underscores ("_") and hyphens ("-").',
-                    $name
-                )
-            );
-        }
-    }
-
-    public static function isOrder(string $name): bool
-    {
-        return $name[0] === '@';
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function getType(): ResolvedFieldType
-    {
-        return $this->type;
-    }
-
-    public function supportValueType(string $type): bool
-    {
-        return false;
-    }
-
-    public function setValueTypeSupport(string $type, bool $enabled): never
-    {
-        throw new BadMethodCallException(
-            'OrderField does not support supporting custom value types'
-        );
-    }
-
-    public function setValueComparator(ValueComparator $comparator): never
-    {
-        throw new BadMethodCallException(
-            'OrderField does not support supporting custom value comparator'
-        );
-    }
-
-    public function getValueComparator(): ?ValueComparator
-    {
-        return null;
-    }
-
-    public function setViewTransformer(?DataTransformer $viewTransformer = null): void
-    {
-        $this->viewTransformer = $viewTransformer;
-    }
-
-    public function getViewTransformer(): ?DataTransformer
-    {
-        return $this->viewTransformer;
-    }
-
-    public function setNormTransformer(?DataTransformer $viewTransformer = null): void
-    {
-        $this->normTransformer = $viewTransformer;
-    }
-
-    public function getNormTransformer(): ?DataTransformer
-    {
-        return $this->normTransformer;
-    }
-
-    public function isConfigLocked(): bool
-    {
-        return false;
-    }
-
-    public function getOptions(): array
-    {
-        return $this->options;
-    }
-
-    public function hasOption(string $name): bool
-    {
-        return \array_key_exists($name, $this->options);
-    }
-
-    public function getOption(string $name, $default = null)
-    {
-        if (\array_key_exists($name, $this->options)) {
-            return $this->options[$name];
-        }
-
-        return $default;
-    }
-
-    public function createView(FieldSetView $fieldSet): SearchFieldView
-    {
-        $view = new SearchFieldView($fieldSet);
-
-        $this->type->buildFieldView($view, $this, $this->options);
-
-        return $view;
-    }
-
-    public function setAttribute(string $name, mixed $value)
-    {
-        $this->attributes[$name] = $value;
-
-        return $this;
-    }
-
-    public function setAttributes(array $attributes)
-    {
-        $this->attributes = $attributes;
-
-        return $this;
-    }
-
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
-
-    public function hasAttribute(string $name): bool
-    {
-        return \array_key_exists($name, $this->attributes);
-    }
-
-    public function getAttribute(string $name, mixed $default = null): mixed
-    {
-        return \array_key_exists($name, $this->attributes) ? $this->attributes[$name] : $default;
-    }
-
-    public function finalizeConfig(): void
-    {
-        // Noop
-    }
-}
diff --git a/lib/Core/Field/OrderFieldType.php b/lib/Core/Field/OrderFieldType.php
deleted file mode 100644
index bc2335af..00000000
--- a/lib/Core/Field/OrderFieldType.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\OrderToLocalizedTransformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\OrderTransformer;
-use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
-use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Dalibor Karlović <dalibor@flexolabs.io>
- */
-final class OrderFieldType implements FieldType
-{
-    public function getParent(): ?string
-    {
-        return null;
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'default' => null,
-            'always' => null,
-            'case' => OrderTransformer::CASE_UPPERCASE,
-            'alias' => ['ASC' => 'ASC', 'DESC' => 'DESC'],
-            'view_label' => ['ASC' => 'asc', 'DESC' => 'desc'],
-            'type' => null,
-            'type_options' => [],
-            'label' => null,
-        ]);
-
-        $resolver->setAllowedValues('case', [
-            OrderTransformer::CASE_LOWERCASE,
-            OrderTransformer::CASE_UPPERCASE,
-        ]);
-        $resolver->setAllowedValues('default', ['asc', 'desc', 'ASC', 'DESC', null]);
-        $resolver->setAllowedValues('always', ['append', 'prepend', null]);
-        $resolver->setAllowedTypes('alias', 'array');
-        $resolver->setAllowedTypes('view_label', ['array']);
-        $resolver->setAllowedTypes('type', ['string', 'null']);
-        $resolver->setAllowedTypes('type_options', ['array']);
-        $resolver->setAllowedTypes('label', ['null', 'string']);
-
-        // Ensure view-labels are part of the alias list.
-        $resolver->addNormalizer('alias', static function (Options $options, array $value): mixed {
-            // Must always exist for interoperability, but it's still possible to overwrite.
-            $value = array_merge(
-                $value,
-                $options['case'] === OrderTransformer::CASE_LOWERCASE ? ['asc' => 'ASC', 'desc' => 'DESC'] : ['ASC' => 'ASC', 'DESC' => 'DESC']
-            );
-
-            foreach ($options['view_label'] as $direction => $label) {
-                switch ($options['case']) {
-                    case OrderTransformer::CASE_LOWERCASE:
-                        $label = mb_strtolower($label);
-
-                        break;
-
-                    case OrderTransformer::CASE_UPPERCASE:
-                        $label = mb_strtoupper($label);
-
-                        break;
-                }
-
-                if (isset($value[$label])) {
-                    continue;
-                }
-
-                $value[$label] = $direction;
-            }
-
-            return $value;
-        });
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        if ($options['always'] !== null && $options['default'] === null) {
-            throw new InvalidOptionsException('Setting "always" requires the "default" option is set with a direction.');
-        }
-
-        $config->setNormTransformer(new OrderTransformer($options['alias'], $options['case']));
-        $config->setViewTransformer(new OrderToLocalizedTransformer($options['alias'], $options['view_label'], $options['case']));
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'order';
-    }
-}
diff --git a/lib/Core/Field/ResolvedFieldType.php b/lib/Core/Field/ResolvedFieldType.php
deleted file mode 100644
index d57c1610..00000000
--- a/lib/Core/Field/ResolvedFieldType.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\FieldSetView;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * A wrapper for a field type and its extensions.
- */
-interface ResolvedFieldType
-{
-    public function getParent(): ?self;
-
-    /**
-     * Returns the wrapped field type.
-     */
-    public function getInnerType(): FieldType;
-
-    /**
-     * Returns the extensions of the wrapped field type.
-     *
-     * @return FieldTypeExtension[]
-     */
-    public function getTypeExtensions(): array;
-
-    /**
-     * @param array<string, mixed> $options
-     */
-    public function createField(string $name, array $options = []): FieldConfig;
-
-    /**
-     * This configures the {@link FieldConfig}.
-     *
-     * This method is called for each type in the hierarchy starting from the
-     * top most type. Type extensions can further modify the field.
-     */
-    public function buildType(FieldConfig $config, array $options): void;
-
-    /**
-     * Creates a new SearchFieldView for a field of this type.
-     */
-    public function createFieldView(FieldConfig $config, FieldSetView $view): SearchFieldView;
-
-    /**
-     * Configures a SearchFieldView for the type hierarchy.
-     *
-     * @param array<string, mixed> $options
-     */
-    public function buildFieldView(SearchFieldView $view, FieldConfig $config, array $options): void;
-
-    /**
-     * Returns the prefix of the template block name for this type.
-     */
-    public function getBlockPrefix(): string;
-
-    /**
-     * Returns the configured options resolver used for this type.
-     */
-    public function getOptionsResolver(): OptionsResolver;
-}
diff --git a/lib/Core/Field/ResolvedFieldTypeFactory.php b/lib/Core/Field/ResolvedFieldTypeFactory.php
deleted file mode 100644
index 8cb89f2b..00000000
--- a/lib/Core/Field/ResolvedFieldTypeFactory.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface ResolvedFieldTypeFactory
-{
-    /**
-     * Resolves a field type.
-     *
-     * @param FieldTypeExtension[] $typeExtensions
-     *
-     * @throws InvalidArgumentException if the types parent cannot be retrieved from any extension
-     */
-    public function createResolvedType(FieldType $type, array $typeExtensions, ?ResolvedFieldType $parent = null): ResolvedFieldType;
-}
diff --git a/lib/Core/Field/SearchField.php b/lib/Core/Field/SearchField.php
deleted file mode 100644
index a29f953a..00000000
--- a/lib/Core/Field/SearchField.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Exception\InvalidConfigurationException;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Value\RequiresComparatorValueHolder;
-use Rollerworks\Component\Search\Value\ValueHolder;
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class SearchField implements FieldConfig
-{
-    /** @var array<string, mixed> */
-    private array $attributes = [];
-
-    /** @var array<class-string<ValueHolder>, bool> */
-    private array $supportedValueTypes = [];
-
-    private ?ValueComparator $valueComparator = null;
-    private ?DataTransformer $viewTransformer = null;
-    private ?DataTransformer $normTransformer = null;
-    private bool $locked = false;
-
-    /**
-     * @param array<string, mixed> $options
-     *
-     * @throws \InvalidArgumentException When the name contains illegal characters
-     */
-    public function __construct(
-        private readonly string $name,
-        private readonly ResolvedFieldType $type,
-        private readonly array $options = [],
-    ) {
-        if (! preg_match('/^_?[a-zA-Z][a-zA-Z0-9_\-]*$/D', $name)) {
-            throw new InvalidArgumentException(
-                \sprintf(
-                    'The name "%s" contains illegal characters. Name must start with a letter or underscore ' .
-                    'and only contain letters, digits, numbers, underscores ("_") and hyphens ("-").',
-                    $name
-                )
-            );
-        }
-    }
-
-    public function supportValueType(string $type): bool
-    {
-        return $this->supportedValueTypes[$type] ?? false;
-    }
-
-    /**
-     * @throws BadMethodCallException when the setter is called after the config is locked
-     */
-    public function setValueTypeSupport(string $type, bool $enabled)
-    {
-        if ($this->locked) {
-            throw new BadMethodCallException(
-                'SearchField setter methods cannot be accessed anymore once the data is locked.'
-            );
-        }
-
-        $this->supportedValueTypes[$type] = $enabled;
-
-        return $this;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function getType(): ResolvedFieldType
-    {
-        return $this->type;
-    }
-
-    /**
-     * @throws BadMethodCallException when the setter is called after the config is locked
-     */
-    public function setValueComparator(ValueComparator $comparator)
-    {
-        if ($this->locked) {
-            throw new BadMethodCallException(
-                'SearchField setter methods cannot be accessed anymore once the data is locked.'
-            );
-        }
-
-        $this->valueComparator = $comparator;
-
-        return $this;
-    }
-
-    public function getValueComparator(): ?ValueComparator
-    {
-        return $this->valueComparator;
-    }
-
-    /**
-     * @throws BadMethodCallException when the setter is called after the config is locked
-     */
-    public function setViewTransformer(?DataTransformer $viewTransformer = null)
-    {
-        if ($this->locked) {
-            throw new BadMethodCallException(
-                'SearchField setter methods cannot be accessed anymore once the data is locked.'
-            );
-        }
-
-        $this->viewTransformer = $viewTransformer;
-
-        return $this;
-    }
-
-    public function getViewTransformer(): ?DataTransformer
-    {
-        return $this->viewTransformer;
-    }
-
-    /**
-     * @throws BadMethodCallException when the setter is called after the config is locked
-     */
-    public function setNormTransformer(?DataTransformer $viewTransformer = null)
-    {
-        if ($this->locked) {
-            throw new BadMethodCallException(
-                'SearchField setter methods cannot be accessed anymore once the data is locked.'
-            );
-        }
-
-        $this->normTransformer = $viewTransformer;
-
-        return $this;
-    }
-
-    public function getNormTransformer(): ?DataTransformer
-    {
-        return $this->normTransformer;
-    }
-
-    /**
-     * Finalize the configuration and mark config as locked.
-     *
-     * After calling this method, setter methods can be no longer called.
-     *
-     * @throws InvalidConfigurationException when a supported value-type requires
-     *                                       a value comparator but none is set
-     */
-    public function finalizeConfig(): void
-    {
-        if ($this->locked) {
-            return;
-        }
-
-        if ($this->valueComparator === null) {
-            foreach ($this->supportedValueTypes as $type => $supported) {
-                if ($supported && isset(class_implements($type)[RequiresComparatorValueHolder::class])) {
-                    throw new InvalidConfigurationException(
-                        \sprintf(
-                            'Supported value-type "%s" requires a value comparator but none is set for field "%s" with type "%s".',
-                            $type,
-                            $this->getName(),
-                            $this->getType()->getInnerType()::class
-                        )
-                    );
-                }
-            }
-        }
-
-        $this->locked = true;
-    }
-
-    public function isConfigLocked(): bool
-    {
-        return $this->locked;
-    }
-
-    public function getOptions(): array
-    {
-        return $this->options;
-    }
-
-    public function hasOption(string $name): bool
-    {
-        return \array_key_exists($name, $this->options);
-    }
-
-    public function getOption(string $name, $default = null)
-    {
-        if (\array_key_exists($name, $this->options)) {
-            return $this->options[$name];
-        }
-
-        return $default;
-    }
-
-    /**
-     * @throws BadMethodCallException when the configuration is not locked
-     */
-    public function createView(FieldSetView $fieldSet): SearchFieldView
-    {
-        if (! $this->locked) {
-            throw new BadMethodCallException(
-                'Unable to create SearchFieldView when configuration is not locked.'
-            );
-        }
-
-        $view = new SearchFieldView($fieldSet);
-
-        $this->type->buildFieldView($view, $this, $this->options);
-
-        return $view;
-    }
-
-    /**
-     * @throws BadMethodCallException when the setter is called after the config is locked
-     */
-    public function setAttribute(string $name, mixed $value)
-    {
-        if ($this->locked) {
-            throw new BadMethodCallException(
-                'SearchField setter methods cannot be accessed anymore once the data is locked.'
-            );
-        }
-
-        $this->attributes[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * @throws BadMethodCallException when the setter is called after the config is locked
-     */
-    public function setAttributes(array $attributes)
-    {
-        if ($this->locked) {
-            throw new BadMethodCallException(
-                'SearchField setter methods cannot be accessed anymore once the data is locked.'
-            );
-        }
-
-        $this->attributes = $attributes;
-
-        return $this;
-    }
-
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
-
-    public function hasAttribute(string $name): bool
-    {
-        return \array_key_exists($name, $this->attributes);
-    }
-
-    public function getAttribute(string $name, mixed $default = null): mixed
-    {
-        return \array_key_exists($name, $this->attributes) ? $this->attributes[$name] : $default;
-    }
-}
diff --git a/lib/Core/Field/SearchFieldView.php b/lib/Core/Field/SearchFieldView.php
deleted file mode 100644
index 5fb1ae2a..00000000
--- a/lib/Core/Field/SearchFieldView.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\FieldSetView;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class SearchFieldView
-{
-    /**
-     * The variables assigned to this view.
-     *
-     * @var array<string, mixed>
-     */
-    public array $vars = [
-        'attr' => [],
-    ];
-
-    public function __construct(
-        public FieldSetView $fieldSet,
-    ) {
-    }
-}
diff --git a/lib/Core/Field/TypeRegistry.php b/lib/Core/Field/TypeRegistry.php
deleted file mode 100644
index 3dbcddef..00000000
--- a/lib/Core/Field/TypeRegistry.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Field;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\SearchExtension;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface TypeRegistry
-{
-    /**
-     * Returns a field type by name.
-     *
-     * @throws InvalidArgumentException if the type cannot be retrieved from any extension
-     */
-    public function getType(string $name): ResolvedFieldType;
-
-    /**
-     * Returns whether the given field type is supported.
-     */
-    public function hasType(string $name): bool;
-
-    /**
-     * Returns the extensions loaded on the registry.
-     *
-     * @return SearchExtension[]
-     */
-    public function getExtensions(): array;
-}
diff --git a/lib/Core/FieldSet.php b/lib/Core/FieldSet.php
deleted file mode 100644
index 86fc6f05..00000000
--- a/lib/Core/FieldSet.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-
-/**
- * A FieldSet holds all the search fields and there configuration.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface FieldSet
-{
-    /**
-     * Returns the name of the set (can be empty).
-     */
-    public function getSetName(): ?string;
-
-    /**
-     * Returns the field as a {@link FieldConfig} instance.
-     *
-     * @throws UnknownFieldException When the field is not registered at this FieldSet
-     */
-    public function get(string $name): FieldConfig;
-
-    /**
-     * Returns all the registered fields in the set.
-     *
-     * @return array<string, FieldConfig>
-     */
-    public function all(): array;
-
-    /**
-     * Returns whether the field is registered in the set.
-     */
-    public function has(string $name): bool;
-
-    /**
-     * Returns whether the field is registered to be used for ordering.
-     */
-    public function isOrder(string $name): bool;
-
-    /**
-     * Returns whether the field is a private field (primary condition only).
-     */
-    public function isPrivate(string $name): bool;
-}
diff --git a/lib/Core/FieldSetBuilder.php b/lib/Core/FieldSetBuilder.php
deleted file mode 100644
index fa50741e..00000000
--- a/lib/Core/FieldSetBuilder.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface FieldSetBuilder
-{
-    /**
-     * @param string               $name    Name of search field
-     * @param string               $type    The FQCN of the type
-     * @param array<string, mixed> $options Array of options for building the field
-     *
-     * @return $this
-     */
-    public function add(string $name, string $type, array $options = []);
-
-    /**
-     * @return $this
-     */
-    public function set(FieldConfig $field);
-
-    /**
-     * @return $this
-     *
-     * @throws BadMethodCallException When the FieldSet has been already turned into a FieldSet instance
-     */
-    public function remove(string $name);
-
-    public function has(string $name): bool;
-
-    public function get(string $name): FieldConfig;
-
-    /**
-     * Create the FieldSet using the fields set on the builder.
-     */
-    public function getFieldSet(?string $name = null): FieldSet;
-}
diff --git a/lib/Core/FieldSetConfigurator.php b/lib/Core/FieldSetConfigurator.php
deleted file mode 100644
index df058a1e..00000000
--- a/lib/Core/FieldSetConfigurator.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-/**
- * A FieldSetConfigurator configures a FieldSetBuilder instance.
- *
- * The purpose of a configurator is to allow re-usage of a FieldSet.
- *
- * And provide support for name expectations (to allow only specific FieldSets)
- * using {@link \Rollerworks\Component\Search\SearchCondition::assertFieldSetName}.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface FieldSetConfigurator
-{
-    /**
-     * Configures the FieldSet builder.
-     */
-    public function buildFieldSet(FieldSetBuilder $builder): void;
-}
diff --git a/lib/Core/FieldSetRegistry.php b/lib/Core/FieldSetRegistry.php
deleted file mode 100644
index 85507ff1..00000000
--- a/lib/Core/FieldSetRegistry.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-
-interface FieldSetRegistry
-{
-    /**
-     * Returns a FieldSetConfiguratorInterface by name.
-     *
-     * @throws InvalidArgumentException if the configurator can not be retrieved
-     */
-    public function getConfigurator(string $name): FieldSetConfigurator;
-
-    /**
-     * Returns whether the given FieldSetConfigurator is supported.
-     */
-    public function hasConfigurator(string $name): bool;
-}
diff --git a/lib/Core/FieldSetView.php b/lib/Core/FieldSetView.php
deleted file mode 100644
index 6b0dc3b8..00000000
--- a/lib/Core/FieldSetView.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Field\SearchFieldView;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class FieldSetView
-{
-    /** The variables assigned to this view. */
-    public array $vars = [
-        'attr' => [],
-    ];
-
-    /** @var SearchFieldView[] */
-    public array $fields;
-}
diff --git a/lib/Core/FieldSetWithView.php b/lib/Core/FieldSetWithView.php
deleted file mode 100644
index c68c5b10..00000000
--- a/lib/Core/FieldSetWithView.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface FieldSetWithView extends FieldSet
-{
-    /**
-     * Create a new FieldSetView instance of the FieldSet.
-     */
-    public function createView(): FieldSetView;
-}
diff --git a/lib/Core/GenericFieldSet.php b/lib/Core/GenericFieldSet.php
deleted file mode 100644
index 3c3dc86e..00000000
--- a/lib/Core/GenericFieldSet.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\OrderField;
-
-/**
- * A FieldSet holds all the search fields and there configuration.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class GenericFieldSet implements FieldSetWithView
-{
-    /** @var callable|null */
-    private mixed $viewBuilder;
-
-    /**
-     * @param array<string, FieldConfig> $fields
-     * @param string|null                $name        FQCN of the FieldSet configurator
-     * @param callable                   $viewBuilder A callable to finalize the FieldSetView
-     */
-    public function __construct(
-        private readonly array $fields,
-        private readonly ?string $name = null,
-        ?callable $viewBuilder = null,
-    ) {
-        $this->viewBuilder = $viewBuilder;
-    }
-
-    public function getSetName(): ?string
-    {
-        return $this->name;
-    }
-
-    public function get(string $name): FieldConfig
-    {
-        if (! isset($this->fields[$name])) {
-            throw new UnknownFieldException($name);
-        }
-
-        return $this->fields[$name];
-    }
-
-    public function all(): array
-    {
-        return $this->fields;
-    }
-
-    public function has(string $name): bool
-    {
-        return isset($this->fields[$name]);
-    }
-
-    public function isOrder(string $name): bool
-    {
-        return OrderField::isOrder($name);
-    }
-
-    public function isPrivate(string $name): bool
-    {
-        return $name[0] === '_';
-    }
-
-    public function createView(): FieldSetView
-    {
-        $view = new FieldSetView();
-
-        foreach ($this->fields as $name => $field) {
-            $view->fields[$name] = $field->createView($view);
-        }
-
-        if ($this->viewBuilder !== null) {
-            ($this->viewBuilder)($view);
-        }
-
-        return $view;
-    }
-}
diff --git a/lib/Core/GenericFieldSetBuilder.php b/lib/Core/GenericFieldSetBuilder.php
deleted file mode 100644
index 8b762483..00000000
--- a/lib/Core/GenericFieldSetBuilder.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-
-/**
- * The FieldSetBuilder helps with building a {@link FieldSet}.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class GenericFieldSetBuilder implements FieldSetBuilder
-{
-    /** @var array<string, FieldConfig> */
-    private array $fields = [];
-
-    /** @var array<string, array{type: string, options: array}> */
-    private array $unresolvedFields = [];
-
-    public function __construct(
-        private readonly SearchFactory $searchFactory,
-    ) {
-    }
-
-    public function set(FieldConfig $field): self
-    {
-        $name = $field->getName();
-
-        unset($this->unresolvedFields[$name]);
-        $this->fields[$name] = $field;
-
-        return $this;
-    }
-
-    public function add(string $name, string $type, array $options = []): self
-    {
-        $this->unresolvedFields[$name] = [
-            'type' => $type,
-            'options' => $options,
-        ];
-
-        return $this;
-    }
-
-    public function remove(string $name): self
-    {
-        unset($this->fields[$name], $this->unresolvedFields[$name]);
-
-        return $this;
-    }
-
-    public function has(string $name): bool
-    {
-        return isset($this->unresolvedFields[$name]) || isset($this->fields[$name]);
-    }
-
-    public function get(string $name): FieldConfig
-    {
-        if (isset($this->unresolvedFields[$name])) {
-            $this->fields[$name] = $this->searchFactory->createField(
-                $name,
-                $this->unresolvedFields[$name]['type'],
-                $this->unresolvedFields[$name]['options']
-            );
-
-            unset($this->unresolvedFields[$name]);
-        }
-
-        if (isset($this->fields[$name])) {
-            return $this->fields[$name];
-        }
-
-        throw new InvalidArgumentException(\sprintf('The field with the name "%s" does not exist.', $name));
-    }
-
-    public function getFieldSet(?string $name = null): FieldSet
-    {
-        foreach ($this->unresolvedFields as $fieldName => $config) {
-            $this->fields[$fieldName] = $this->searchFactory->createField(
-                $fieldName,
-                $config['type'],
-                $config['options']
-            );
-
-            unset($this->unresolvedFields[$fieldName]);
-        }
-
-        return new GenericFieldSet($this->fields, $name);
-    }
-}
diff --git a/lib/Core/GenericSearchFactory.php b/lib/Core/GenericSearchFactory.php
deleted file mode 100644
index 8369a6b5..00000000
--- a/lib/Core/GenericSearchFactory.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\Field\TypeRegistry;
-use Symfony\Component\OptionsResolver\Exception\ExceptionInterface;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class GenericSearchFactory implements SearchFactory
-{
-    public function __construct(
-        private readonly TypeRegistry $registry,
-        private readonly FieldSetRegistry $fieldSetRegistry,
-        private ?SearchConditionSerializer $serializer = null,
-    ) {
-        $this->serializer ??= new SearchConditionSerializer($this);
-    }
-
-    public function createFieldSet($configurator): FieldSet
-    {
-        if (! $configurator instanceof FieldSetConfigurator) {
-            $configurator = $this->fieldSetRegistry->getConfigurator($configurator);
-        }
-
-        $builder = $this->createFieldSetBuilder();
-        $configurator->buildFieldSet($builder);
-
-        return $builder->getFieldSet($configurator::class);
-    }
-
-    public function createField(string $name, string $type, array $options = []): FieldConfig
-    {
-        if (OrderField::isOrder($name) && isset($options['type'])) {
-            $options = $this->createOptionsForOrderField($name, $options);
-        }
-
-        $resolvedType = $this->registry->getType($type);
-        $field = $resolvedType->createField($name, $options);
-
-        // Explicitly call buildType() in order to be able to override either
-        // createField() or buildType() in the resolved field type
-        $resolvedType->buildType($field, $field->getOptions());
-
-        return $field;
-    }
-
-    /**
-     * @param array{type: string, type_options?: array<string, mixed>} $options
-     *
-     * @return array<string, mixed>
-     */
-    private function createOptionsForOrderField(string $name, array $options): array
-    {
-        $type = $this->registry->getType($options['type']);
-
-        try {
-            $options['type_options'] = $type->getOptionsResolver()->resolve($options['type_options'] ?? []);
-        } catch (ExceptionInterface $e) {
-            throw new $e(\sprintf('An error has occurred resolving the type-options of the order-field "%s"": ', $name) . $e->getMessage(), $e->getCode(), $e);
-        }
-
-        return $options;
-    }
-
-    public function createFieldSetBuilder(): FieldSetBuilder
-    {
-        return new GenericFieldSetBuilder($this);
-    }
-
-    public function getSerializer(): SearchConditionSerializer
-    {
-        return $this->serializer;
-    }
-}
diff --git a/lib/Core/Input/AbstractInput.php b/lib/Core/Input/AbstractInput.php
deleted file mode 100644
index 02889b61..00000000
--- a/lib/Core/Input/AbstractInput.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchOrder;
-
-/**
- * AbstractInput provides the shared logic for the InputProcessors.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-abstract class AbstractInput implements InputProcessor
-{
-    protected ProcessorConfig $config;
-    protected Validator $validator;
-    protected ErrorList $errors;
-
-    /** Current nesting level. */
-    protected int $level = 0;
-
-    public function __construct(?Validator $validator = null)
-    {
-        $this->validator = $validator ?? new NullValidator();
-    }
-
-    /**
-     * Finalize the ordering of the fields.
-     *
-     * - Sets the default ordering if no ordering is set.
-     * - Ensures that the always-ordered fields are present.
-     */
-    public static function finalizeOrdering(SearchCondition $condition): void
-    {
-        $ordering = $condition->getOrder()?->getFields() ?? [];
-        $hasOrder = $ordering !== [];
-
-        $apply = $hasOrder;
-        $prepend = $append = [];
-
-        foreach ($condition->getFieldSet()->all() as $field) {
-            $name = $field->getName();
-
-            if (! $condition->getFieldSet()->isOrder($name)) {
-                continue;
-            }
-
-            $default = $field->getOption('default');
-
-            if ($default === null) {
-                continue;
-            }
-
-            $always = $field->getOption('always');
-
-            if ($always === 'prepend') {
-                $prepend[$name] = $default;
-                $apply = true;
-            } elseif ($always === 'append') {
-                $append[$name] = $default;
-                $apply = true;
-            } elseif (! $hasOrder) {
-                $ordering[$name] = $default;
-                $apply = true;
-            }
-        }
-
-        if ($apply) {
-            $condition->setOrder(new SearchOrder($ordering, $prepend, $append));
-        }
-    }
-
-    /**
-     * This method is called after processing and helps with finding bugs.
-     */
-    protected function assertLevel0(): void
-    {
-        if ($this->level > 0) {
-            throw new \RuntimeException('Level nesting is not reset to 0, please report this bug.');
-        }
-    }
-}
diff --git a/lib/Core/Input/CachingInputProcessor.php b/lib/Core/Input/CachingInputProcessor.php
deleted file mode 100644
index 25f69249..00000000
--- a/lib/Core/Input/CachingInputProcessor.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Psr\SimpleCache\CacheInterface;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchConditionSerializer;
-
-/**
- * Caches the SearchCondition in a PSR-16 (SimpleCache) storage.
- *
- * Caching a processed input provides the most benefit for a large
- * search condition. Most conditions can be processed with easy, and the
- * overhead of caching is not worth it.
- *
- * The FieldSet name and input (as string) are used to generate the cache-key,
- * therefor any changes in the FieldSet configuration MUST invalidate the cache.
- *
- * The cache is should not be a filesystem or long-term storage!
- */
-final class CachingInputProcessor implements InputProcessor
-{
-    private \DateInterval | int | null $ttl;
-
-    /**
-     * @param \DateInterval|string|int|null $ttl The default Time to life for caches. If no value is sent and
-     *                                           the driver supports TTL then the library may set a default value
-     *                                           for it or let the driver take care of that. Null means no expiration.
-     *                                           A string is interpreted as a DateInterval.
-     */
-    public function __construct(
-        private readonly CacheInterface $cache,
-        private readonly SearchConditionSerializer $conditionSerializer,
-        private readonly InputProcessor $inputProcessor,
-        \DateInterval | string | int | null $ttl = null,
-    ) {
-        if (\is_string($ttl)) {
-            $ttl = new \DateInterval($ttl);
-        }
-
-        $this->ttl = $ttl;
-    }
-
-    public function process(ProcessorConfig $config, $input): SearchCondition
-    {
-        $ttl = $config->getCacheTTL() ?? $this->ttl;
-
-        if ($ttl === null || $ttl === 0 || ! \is_string($input)) {
-            return $this->inputProcessor->process($config, $input);
-        }
-
-        $cacheKey = $this->getConditionCacheKey($config, $input);
-
-        try {
-            return $this->conditionSerializer->unserialize($this->cache->get($cacheKey, []));
-        } catch (InvalidArgumentException) {
-            // No-op
-        }
-
-        $result = $this->inputProcessor->process($config, $input);
-
-        if (! $result->isEmpty()) {
-            $this->cache->set($cacheKey, $this->conditionSerializer->serialize($result), $ttl);
-        }
-
-        return $result;
-    }
-
-    private function getConditionCacheKey(ProcessorConfig $config, string $input): string
-    {
-        return hash('sha256', $config->getFieldSet()->getSetName() . '~' . $input . '~' . $this->inputProcessor::class);
-    }
-}
diff --git a/lib/Core/Input/ConditionStructureBuilder.php b/lib/Core/Input/ConditionStructureBuilder.php
deleted file mode 100644
index 36ab3a15..00000000
--- a/lib/Core/Input/ConditionStructureBuilder.php
+++ /dev/null
@@ -1,431 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Exception\GroupsNestingException;
-use Rollerworks\Component\Search\Exception\GroupsOverflowException;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Exception\UnsupportedValueTypeException;
-use Rollerworks\Component\Search\Exception\ValuesOverflowException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\StructureBuilder;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * Works as a wrapper around the ValuesGroup, and ValuesBag transforming
- * input while ensuring restrictions are honored.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class ConditionStructureBuilder implements StructureBuilder
-{
-    private readonly FieldSet $fieldSet;
-    private readonly int $maxCount;
-    private readonly int $maxNesting;
-    private readonly int $maxGroups;
-
-    /** @var array<string, bool> */
-    private array $checkedValueType = [];
-
-    private int $valuesCount = 0;
-    private int $nestingLevel = 0;
-
-    /** @var string[] */
-    private array $path = [];
-
-    /**
-     * Group count per nesting level.
-     *
-     * @var array<int, int> [group-level => group-count]
-     */
-    private array $groupsCount = [];
-
-    protected ?FieldConfig $fieldConfig = null;
-
-    /** @var ValuesGroup[] */
-    private array $valuesGroupLevels = [];
-
-    private ?ValuesBag $valuesBag = null;
-    protected ?DataTransformer $inputTransformer;
-
-    public function __construct(
-        ProcessorConfig $config,
-        private readonly Validator $validator,
-        private ErrorList $errorList,
-        string $path = '',
-    ) {
-        $this->fieldSet = $config->getFieldSet();
-        $this->maxCount = $config->getMaxValues();
-        $this->maxNesting = $config->getMaxNestingLevel();
-        $this->maxGroups = $config->getMaxGroups();
-        $this->valuesGroupLevels[0] = new ValuesGroup();
-        $this->path[] = $path;
-
-        // Future compatible, this is not part of the current API.
-        if (method_exists($validator, 'initialize')) {
-            $validator->initialize($config);
-        }
-    }
-
-    public function getErrors(): ErrorList
-    {
-        return $this->errorList;
-    }
-
-    public function getCurrentPath(): array
-    {
-        return $this->path;
-    }
-
-    public function getRootGroup(): ValuesGroup
-    {
-        return $this->valuesGroupLevels[0];
-    }
-
-    public function enterGroup(string $groupLocal = 'AND', string $path = '[%d]'): void
-    {
-        if (! isset($this->groupsCount[$this->nestingLevel])) {
-            $this->groupsCount[$this->nestingLevel] = 1;
-        } else {
-            ++$this->groupsCount[$this->nestingLevel];
-        }
-
-        $groupCount = $this->groupsCount[$this->nestingLevel];
-
-        // The new group is relative to it's current level (the group is declared at level x); and zero-indexed
-        $this->path[] = \sprintf($path, $groupCount - 1);
-
-        if ($groupCount > $this->maxGroups) {
-            throw new GroupsOverflowException($this->maxGroups, implode('', $this->path));
-        }
-
-        ++$this->nestingLevel;
-
-        if ($this->nestingLevel > $this->maxNesting) {
-            throw new GroupsNestingException($this->maxNesting, implode('', $this->path));
-        }
-
-        $this->valuesGroupLevels[$this->nestingLevel - 1]->addGroup(
-            $this->valuesGroupLevels[$this->nestingLevel] = new ValuesGroup($groupLocal)
-        );
-    }
-
-    public function leaveGroup(): void
-    {
-        if ($this->fieldConfig !== null) {
-            $this->endValues();
-        }
-
-        --$this->nestingLevel;
-        array_pop($this->path);
-    }
-
-    public function field(string $name, string $path): void
-    {
-        $this->checkedValueType = [];
-        $this->valuesCount = 0;
-
-        $this->fieldConfig = $this->fieldSet->get($name);
-        $this->valuesBag = new ValuesBag();
-
-        $this->initializeInputTransformer();
-
-        $this->valuesGroupLevels[$this->nestingLevel]->addField($name, $this->valuesBag);
-        $this->path[] = \sprintf($path, $name);
-
-        $this->validator->initializeContext($this->fieldConfig, $this->errorList);
-    }
-
-    public function simpleValue(mixed $value, string $path): void
-    {
-        $path = $this->createValuePath($path, 'simpleValue');
-        $this->increaseValuesCount($path);
-
-        if (($modelVal = $this->inputToNorm($value, $path)) !== null) {
-            $this->validator->validate($modelVal, 'simple', $value, $path);
-        }
-        $this->valuesBag->addSimpleValue($modelVal);
-    }
-
-    public function excludedSimpleValue(mixed $value, string $path): void
-    {
-        $path = $this->createValuePath($path, 'excludedSimpleValue');
-        $this->increaseValuesCount($path);
-
-        if (($modelVal = $this->inputToNorm($value, $path)) !== null) {
-            $this->validator->validate($modelVal, 'excluded-simple', $value, $path);
-        }
-        $this->valuesBag->addExcludedSimpleValue($modelVal);
-    }
-
-    public function rangeValue(mixed $lower, mixed $upper, bool $lowerInclusive, bool $upperInclusive, array $path): void
-    {
-        $path[0] = $this->createValuePath($path[0], Range::class);
-
-        $this->increaseValuesCount($path[0]);
-        $this->assertAcceptsType(Range::class);
-
-        $lowerNorm = $this->inputToNorm($lower, $path[0] . $path[1]);
-        $upperNorm = $this->inputToNorm($upper, $path[0] . $path[2]);
-
-        $range = new Range($lowerNorm, $upperNorm, $lowerInclusive, $upperInclusive);
-
-        if ($lowerNorm !== null && $upperNorm !== null) {
-            $this->validateRangeBounds($range, $path, $lower, $upper);
-        }
-        $this->valuesBag->add($range);
-    }
-
-    public function excludedRangeValue(mixed $lower, mixed $upper, bool $lowerInclusive, bool $upperInclusive, array $path): void
-    {
-        $path[0] = $this->createValuePath($path[0], ExcludedRange::class);
-
-        $this->increaseValuesCount($path[0]);
-        $this->assertAcceptsType(Range::class);
-
-        $lowerNorm = $this->inputToNorm($lower, $path[0] . $path[1]);
-        $upperNorm = $this->inputToNorm($upper, $path[0] . $path[2]);
-
-        $range = new ExcludedRange($lowerNorm, $upperNorm, $lowerInclusive, $upperInclusive);
-
-        if ($lowerNorm !== null && $upperNorm !== null) {
-            $this->validateRangeBounds($range, $path, $lower, $upper);
-        }
-        $this->valuesBag->add($range);
-    }
-
-    public function comparisonValue(mixed $operator, mixed $value, array $path): void
-    {
-        $path[0] = $this->createValuePath($path[0], Compare::class);
-
-        $this->increaseValuesCount($path[0]);
-        $this->assertAcceptsType(Compare::class);
-
-        $modelVal = $this->inputToNorm($value, $path[0] . $path[2]);
-
-        if (! \in_array($operator, Compare::OPERATORS, true)) {
-            $this->addError(
-                ConditionErrorMessage::withMessageTemplate(
-                    $path[0] . $path[1],
-                    'Unknown Comparison operator "{{ operator }}".',
-                    ['{{ operator }}' => \is_scalar($operator) ? $operator : \gettype($operator)]
-                )
-            );
-            $operator = '<>';
-        } elseif ($modelVal !== null) {
-            $this->validator->validate($modelVal, Compare::class, $value, $path[0] . $path[2]);
-        }
-
-        $this->valuesBag->add(new Compare($modelVal, $operator));
-    }
-
-    public function patterMatchValue(mixed $type, mixed $value, bool $caseInsensitive, array $path): void
-    {
-        $path[0] = $this->createValuePath($path[0], PatternMatch::class);
-        $valid = true;
-
-        $this->increaseValuesCount($path[0]);
-        $this->assertAcceptsType(PatternMatch::class);
-
-        if (! \is_scalar($value)) {
-            $this->addError(new ConditionErrorMessage($path[0] . $path[1], 'PatternMatch value must a string.'));
-
-            $valid = false;
-        }
-
-        if (! \is_string($type)) {
-            $this->addError(new ConditionErrorMessage($path[0] . $path[2], 'PatternMatch type must a string.'));
-
-            $valid = false;
-        }
-
-        if (! $valid) {
-            return;
-        }
-
-        try {
-            $patternMatch = new PatternMatch((string) $value, $type, $caseInsensitive);
-
-            if (! $this->validator->validate($value, PatternMatch::class, $value, $path[0] . $path[1])) {
-                return;
-            }
-
-            $this->valuesBag->add($patternMatch);
-        } catch (InvalidArgumentException $e) {
-            $this->addError(
-                ConditionErrorMessage::withMessageTemplate(
-                    $path[0] . $path[2],
-                    'Unknown PatternMatch type "{{ type }}".',
-                    ['{{ type }}' => $type],
-                    null,
-                    $e
-                )
-            );
-        }
-    }
-
-    public function endValues(): void
-    {
-        $this->fieldConfig = null;
-        $this->valuesBag = null;
-        $this->inputTransformer = null;
-
-        array_pop($this->path);
-    }
-
-    protected function initializeInputTransformer(): void
-    {
-        $this->inputTransformer = $this->fieldConfig->getNormTransformer();
-    }
-
-    /**
-     * Reverse transforms a value if a value transformer is set.
-     *
-     * @return mixed returns null when the value is empty or invalid.
-     *               Note: When the value is invalid an error is registered
-     */
-    protected function inputToNorm(mixed $value, string $path): mixed
-    {
-        if ($this->inputTransformer !== null) {
-            try {
-                return $this->inputTransformer->reverseTransform($value);
-            } catch (TransformationFailedException $e) {
-                $this->addError($this->transformationExceptionToError($e, $path));
-
-                return null;
-            }
-        }
-
-        if ($value !== null && ! \is_scalar($value)) {
-            $e = new \RuntimeException(
-                \sprintf(
-                    'Norm value of type %s is not a scalar value or null and not cannot be ' .
-                    'converted to a string. You must set a NormTransformer for field "%s" with type "%s".',
-                    \gettype($value),
-                    $this->fieldConfig->getName(),
-                    $this->fieldConfig->getType()->getInnerType()::class
-                )
-            );
-
-            $error = new ConditionErrorMessage(
-                $path,
-                $this->fieldConfig->getOption('invalid_message', $e->getMessage()),
-                $this->fieldConfig->getOption('invalid_message', $e->getMessage()),
-                $this->fieldConfig->getOption('invalid_message_parameters', []),
-                null,
-                $e
-            );
-
-            $this->addError($error);
-
-            return null;
-        }
-
-        return $value === '' ? null : $value;
-    }
-
-    protected function transformationExceptionToError(TransformationFailedException $e, string $path): ConditionErrorMessage
-    {
-        $invalidMessage = $e->getInvalidMessage();
-
-        if ($invalidMessage !== null) {
-            $error = new ConditionErrorMessage(
-                $path,
-                $invalidMessage,
-                $invalidMessage,
-                $e->getInvalidMessageParameters(),
-                null,
-                $e
-            );
-        } else {
-            $error = new ConditionErrorMessage(
-                $path,
-                $this->fieldConfig->getOption('invalid_message', $e->getMessage()),
-                $this->fieldConfig->getOption('invalid_message', $e->getMessage()),
-                $this->fieldConfig->getOption('invalid_message_parameters', []),
-                null,
-                $e
-            );
-        }
-
-        return $error;
-    }
-
-    protected function addError(ConditionErrorMessage $error): void
-    {
-        $this->errorList[] = $error;
-    }
-
-    private function createValuePath(string $path, string $type): string
-    {
-        if (mb_strpos($path, '{idx}') !== false) {
-            $path = str_replace('{idx}', (string) $this->valuesBag->count($type), $path);
-        } else {
-            $path = str_replace('{pos}', (string) $this->valuesCount, $path);
-        }
-
-        return implode('', $this->path) . $path;
-    }
-
-    private function increaseValuesCount(string $path): void
-    {
-        if (++$this->valuesCount > $this->maxCount) {
-            throw new ValuesOverflowException($this->fieldConfig->getName(), $this->maxCount, $path);
-        }
-    }
-
-    private function assertAcceptsType(string $type): void
-    {
-        if (isset($this->checkedValueType[$type])) {
-            return;
-        }
-
-        if (! $this->fieldConfig->supportValueType($type)) {
-            throw new UnsupportedValueTypeException($this->fieldConfig->getName(), $type);
-        }
-
-        $this->checkedValueType[$type] = true;
-    }
-
-    private function validateRangeBounds(Range $range, array $path, $lower, $upper): void
-    {
-        if (! $this->fieldConfig->getValueComparator()->isLower($range->getLower(), $range->getUpper(), $this->fieldConfig->getOptions())) {
-            $message = 'The lower range value {{ lower }} should be lower than the upper range value {{ upper }}.';
-            $params = [
-                '{{ lower }}' => mb_strpos((string) $lower, ' ') ? "'" . $lower . "'" : $lower,
-                '{{ upper }}' => mb_strpos((string) $upper, ' ') ? "'" . $upper . "'" : $upper,
-            ];
-
-            $this->addError(ConditionErrorMessage::withMessageTemplate($path[0], $message, $params));
-
-            return;
-        }
-
-        $class = $range::class;
-
-        // Perform validation for both bounds (don't move to bounds validator as that returns early).
-        $this->validator->validate($range->getLower(), $class, $lower, $path[0] . $path[1]);
-        $this->validator->validate($range->getUpper(), $class, $upper, $path[0] . $path[2]);
-    }
-}
diff --git a/lib/Core/Input/ConditionStructureByViewBuilder.php b/lib/Core/Input/ConditionStructureByViewBuilder.php
deleted file mode 100644
index 91937467..00000000
--- a/lib/Core/Input/ConditionStructureByViewBuilder.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class ConditionStructureByViewBuilder extends ConditionStructureBuilder
-{
-    protected function initializeInputTransformer(): void
-    {
-        $this->inputTransformer = $this->fieldConfig->getViewTransformer();
-    }
-}
diff --git a/lib/Core/Input/ErrorPathTranslator.php b/lib/Core/Input/ErrorPathTranslator.php
deleted file mode 100644
index ad80ad64..00000000
--- a/lib/Core/Input/ErrorPathTranslator.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\Exception\TranslatedArgument;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-/**
- * The ErrorPathTranslator translates an error-path from the {@see ConditionErrorMessage} path property.
- *
- * The following paths are translated as follow (positions starting at 1):
- *
- * - `[2]`                : `At root level, group 3:`
- * - `[email][0]`         : `At root level, field "email" value position 1:`
- * - `[email][2]`         : `At root level, field "email" value position 3:`
- * - `[0][email][1]`      : `In group 1, field "email" value position 2:`
- * - `[2][email][1]`      : `In group 3, field "email" value position 2:`
- * - `[2][email][5]`      : `In group 3, field "email" value position 2:`
- * - `[0][0][0][email][1]`: `In group 1.1.1, field "email" value position 2:`
- * - `[id][0][upper]`     : `Field "email" value position 1 (upper):`
- * - `[@id]`              : `Field @id:`
- */
-class ErrorPathTranslator
-{
-    public function __construct(
-        protected TranslatorInterface $translator,
-    ) {
-    }
-
-    public function translateFromQueryString(string $path): string
-    {
-        /**
-         * @var array<int, array<int, mixed>> $parts each root-index holds a path-chunk '[part]'
-         *                                    [index] => ['matched', 'chunk']
-         */
-        $parts = [];
-
-        if ($path === '' || preg_match_all('/\[([^]]+)]/', $path, $parts, \PREG_SET_ORDER) === 0) {
-            return '';
-        }
-
-        if (! isset($parts[1])) {
-            // [2]
-            if (self::isGroup($parts[0])) {
-                return $this->translator->trans('At root level, group {{ group }}:', ['{{ group }}' => self::getPos($parts[0])], 'RollerworksSearch');
-            }
-
-            // [field]
-            return $this->translator->trans('At root level, field {{ field }}:', ['{{ field }}' => self::getFieldName($parts[0])], 'RollerworksSearch');
-        }
-
-        if (self::isField($parts[0])) {
-            // [field][0][upper]
-            if (isset($parts[2])) {
-                return $this->translator->trans(
-                    'At root level, field {{ field }} value position {{ position }} {{ type }}:',
-                    [
-                        '{{ field }}' => self::getFieldName($parts[0]),
-                        '{{ position }}' => self::getPos($parts[1]),
-                        '{{ type }}' => new TranslatedArgument(self::getChunk($parts[2]), [], 'RollerworksSearch'),
-                    ],
-                    'RollerworksSearch',
-                );
-            }
-
-            // [field][0]
-            return $this->translator->trans(
-                'At root level, field {{ field }} value position {{ position }}:',
-                [
-                    '{{ field }}' => self::getFieldName($parts[0]),
-                    '{{ position }}' => self::getPos($parts[1]),
-                ],
-                'RollerworksSearch',
-            );
-        }
-
-        // In (nested) group.
-        $groupsPath = [];
-
-        foreach ($parts as $i => $chunk) {
-            if (self::isField($chunk)) {
-                $messagePrefix = \count($groupsPath) > 1 ? 'In nested group {{ group }}' : 'In group {{ group }}';
-
-                // [field][0][upper]
-                if (isset($parts[$i + 2])) {
-                    return $this->translator->trans(
-                        $messagePrefix . ', field {{ field }} value position {{ position }} {{ type }}:',
-                        [
-                            '{{ field }}' => self::getFieldName($chunk),
-                            '{{ position }}' => self::getPos($parts[$i + 1]),
-                            '{{ type }}' => new TranslatedArgument(self::getChunk($parts[$i + 2]), [], 'RollerworksSearch'),
-                            '{{ group }}' => implode('.', $groupsPath),
-                        ],
-                        'RollerworksSearch',
-                    );
-                }
-
-                // [field][0]
-                if (isset($parts[$i + 1])) {
-                    return $this->translator->trans(
-                        $messagePrefix . ', field {{ field }} value position {{ position }}:',
-                        [
-                            '{{ field }}' => self::getFieldName($chunk),
-                            '{{ position }}' => self::getPos($parts[$i + 1]),
-                            '{{ group }}' => implode('.', $groupsPath),
-                        ],
-                        'RollerworksSearch',
-                    );
-                }
-
-                // [field]
-                return $this->translator->trans(
-                    $messagePrefix . ', field {{ field }}:',
-                    [
-                        '{{ field }}' => self::getFieldName($chunk),
-                        '{{ group }}' => implode('.', $groupsPath),
-                    ],
-                    'RollerworksSearch',
-                );
-            }
-
-            // Not a field, so it can only a group.
-            $groupsPath[] = self::getPos($chunk);
-        }
-
-        // No field, so the last chunk is a group.
-        return $this->translator->trans(
-            \count($groupsPath) > 1 ? 'Nested group {{ group }}:' : 'Group {{ group }}:',
-            ['{{ group }}' => implode('.', $groupsPath)],
-            'RollerworksSearch',
-        );
-    }
-
-    /**
-     * Get the index is human friendly format (1 indexed, rather than 0 indexed).
-     *
-     * @param array{0: string, 1: string} $part
-     */
-    protected static function getPos(array $part): int
-    {
-        return ((int) self::getChunk($part)) + 1;
-    }
-
-    /**
-     * @param array{0: string, 1: string} $part
-     */
-    protected static function getChunk(array $part): string
-    {
-        return $part[1];
-    }
-
-    /**
-     * @param array{0: string, 1: string} $part
-     */
-    protected static function isGroup(array $part): bool
-    {
-        return ctype_digit(self::getChunk($part));
-    }
-
-    /**
-     * @param array{0: string, 1: string} $part
-     */
-    protected static function isField(array $part): bool
-    {
-        return ! ctype_digit(self::getChunk($part));
-    }
-
-    /**
-     * @param array{0: string, 1: string} $part
-     */
-    protected static function getFieldName(array $part): string
-    {
-        return '"' . self::getChunk($part) . '"';
-    }
-}
diff --git a/lib/Core/Input/JsonInput.php b/lib/Core/Input/JsonInput.php
deleted file mode 100644
index 28181482..00000000
--- a/lib/Core/Input/JsonInput.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Exception\InputProcessorException;
-use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
-use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\StructureBuilder;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * JsonInput processes input provided as an JSON object.
- *
- * The provided input must be structured as follow;
- *
- * Each entry must contain an array with 'fields' and/or 'groups' structures.
- * Optionally the array can contain 'logical-case' => 'OR' to make it OR-cased.
- *
- * The 'order' setting can only be applied at root level, and may begin with the @-sign.
- * The 'groups' array contains groups with the keys as described above ('fields' and/or 'groups').
- *
- * The 'fields' array is an hash-map where each key is the "field-name"
- * and the value as follow; All the types are optional, but at least one must exists:
- *
- * ```
- * {
- *     "field-name": {
- *         "simple-values": ["value1", "value2"],
- *         "simple-excluded-values": ["my value1", "my value2"],
- *         "ranges": [{
- *             "lower": 10,
- *             "upper": 20
- *         }],
- *         "excluded-ranges": [{
- *             "lower": 25,
- *             "upper": 30,
- *             "inclusive-lower": true,
- *             "inclusive-upper": true
- *         }],
- *         "comparisons": [{
- *             "value": 50,
- *             "operator": ">"
- *         }],
- *         "pattern-matchers": [{
- *             "value": "foo",
- *             "type": "STARTS_WITH",
- *             "case-insensitive": false
- *         }]
- *     }
- * }
- * ```
- *
- * Note: 'inclusive-lower', 'inclusive-upper' and 'case-insensitive' are optional.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class JsonInput extends AbstractInput
-{
-    private ?StructureBuilder $structureBuilder = null;
-    private ?OrderStructureBuilder $orderStructureBuilder = null;
-
-    public function process(ProcessorConfig $config, $input): SearchCondition
-    {
-        if (! \is_string($input)) {
-            throw new UnexpectedTypeException($input, 'string');
-        }
-
-        $input = mb_trim($input);
-
-        $fieldSet = $config->getFieldSet();
-
-        if (empty($input)) {
-            return new SearchCondition($fieldSet, new ValuesGroup());
-        }
-
-        $array = json_decode($input, true, 512, \JSON_BIGINT_AS_STRING);
-
-        if (json_last_error() !== \JSON_ERROR_NONE) {
-            throw new InvalidSearchConditionException([
-                ConditionErrorMessage::rawMessage(
-                    $input,
-                    'Input does not contain valid JSON: ' . "\n" . json_last_error_msg(),
-                    $input
-                ),
-            ]);
-        }
-
-        $condition = null;
-        $this->errors = new ErrorList();
-        $this->config = $config;
-        $this->level = 0;
-
-        $this->structureBuilder = new ConditionStructureBuilder($this->config, $this->validator, $this->errors);
-        $this->orderStructureBuilder = new OrderStructureBuilder($this->config, $this->validator, $this->errors);
-
-        try {
-            $this->assertArrayStructure($array, ['fields' => 'array', 'groups' => 'list', 'order' => 'array', 'logical-case' => ['OR', 'AND']]);
-
-            $valuesGroup = $this->structureBuilder->getRootGroup();
-            $valuesGroup->setGroupLogical($array['logical-case'] ?? ValuesGroup::GROUP_LOGICAL_AND);
-
-            $this->processGroup($array);
-
-            $condition = new SearchCondition($fieldSet, $valuesGroup);
-
-            $this->processOrder($condition, $array, $fieldSet);
-
-            $this->assertLevel0();
-        } catch (InputProcessorException $e) {
-            $this->errors[] = $e->toErrorMessageObj();
-        } finally {
-            $this->structureBuilder = null;
-        }
-
-        if (\count($this->errors)) {
-            $errors = $this->errors->getArrayCopy();
-
-            throw new InvalidSearchConditionException($errors);
-        }
-
-        self::finalizeOrdering($condition);
-
-        return $condition;
-    }
-
-    private function processGroup(array $group): void
-    {
-        $this->processFields($group['fields'] ?? []);
-
-        foreach ($group['groups'] ?? [] as $idx => $sub) {
-            $this->assertArrayStructure($sub, ['fields' => 'array', 'groups' => 'list', 'order' => 'array', 'logical-case' => ['OR', 'AND']], "[groups][{$idx}]");
-
-            $this->structureBuilder->enterGroup($sub['logical-case'] ?? ValuesGroup::GROUP_LOGICAL_AND, '[groups][%d]');
-            $this->processGroup($sub);
-            $this->structureBuilder->leaveGroup();
-        }
-    }
-
-    private function processFields(array $values): void
-    {
-        foreach ($values as $name => $value) {
-            if ($this->config->getFieldSet()->isPrivate($name)) {
-                throw new UnknownFieldException($name);
-            }
-
-            $this->structureBuilder->field($name, '[fields][%s]');
-
-            $this->assertArrayStructure(
-                $value,
-                ['simple-values' => 'list', 'excluded-simple-values' => 'list', 'ranges' => 'list', 'excluded-ranges' => 'list', 'comparisons' => 'list', 'pattern-matchers' => 'list'],
-            );
-
-            foreach ($value['simple-values'] ?? [] as $val) {
-                $this->structureBuilder->simpleValue($val, '[simple-values][{idx}]');
-            }
-
-            foreach ($value['excluded-simple-values'] ?? [] as $val) {
-                $this->structureBuilder->excludedSimpleValue($val, '[excluded-simple-values][{idx}]');
-            }
-
-            foreach ($value['ranges'] ?? [] as $index => $range) {
-                $this->assertValueArrayHasKeys($range, ['lower', 'upper'], "[ranges][{$index}]");
-                $this->assertArrayStructure($range, ['lower' => 'any', 'upper' => 'any', 'inclusive-lower' => 'bool', 'inclusive-upper' => 'bool'], "[ranges][{$index}]");
-
-                $this->structureBuilder->rangeValue(
-                    $range['lower'],
-                    $range['upper'],
-                    $range['inclusive-lower'] ?? true,
-                    $range['inclusive-upper'] ?? true,
-                    ['[ranges][{idx}]', '[lower]', '[upper]']
-                );
-            }
-
-            foreach ($value['excluded-ranges'] ?? [] as $index => $range) {
-                $this->assertValueArrayHasKeys($range, ['lower', 'upper'], "[excluded-ranges][{$index}]");
-                $this->assertArrayStructure($range, ['lower' => 'any', 'upper' => 'any', 'inclusive-lower' => 'bool', 'inclusive-upper' => 'bool'], "[excluded-ranges][{$index}]");
-
-                $this->structureBuilder->excludedRangeValue(
-                    $range['lower'],
-                    $range['upper'],
-                    $range['inclusive-lower'] ?? true,
-                    $range['inclusive-upper'] ?? true,
-                    ['[excluded-ranges][{idx}]', '[lower]', '[upper]']
-                );
-            }
-
-            foreach ($value['comparisons'] ?? [] as $index => $comparison) {
-                $this->assertValueArrayHasKeys($comparison, ['value', 'operator'], "[comparisons][{$index}]");
-                $this->assertArrayStructure($comparison, ['operator' => 'any', 'value' => 'any'], "[comparison][{$index}]");
-
-                $this->structureBuilder->comparisonValue(
-                    $comparison['operator'],
-                    $comparison['value'],
-                    ["[comparisons][{$index}]", '[operator]', '[value]']
-                );
-            }
-
-            foreach ($value['pattern-matchers'] ?? [] as $index => $matcher) {
-                $this->assertValueArrayHasKeys($matcher, ['value', 'type'], "[pattern-matchers][{$index}]");
-                $this->assertArrayStructure($matcher, ['type' => 'any', 'value' => 'string', 'case-insensitive' => 'bool'], "[pattern-matchers][{$index}]");
-
-                $this->structureBuilder->patterMatchValue(
-                    $matcher['type'],
-                    $matcher['value'],
-                    $matcher['case-insensitive'] ?? false,
-                    ["[pattern-matchers][{$index}]", '[value]', '[type]']
-                );
-            }
-
-            $this->structureBuilder->endValues();
-        }
-    }
-
-    private function processOrder(SearchCondition $condition, array $array, FieldSet $fieldSet): void
-    {
-        $order = $array['order'] ?? [];
-
-        if ($order === []) {
-            foreach ($fieldSet->all() as $name => $field) {
-                if (! OrderField::isOrder($name)) {
-                    continue;
-                }
-
-                $direction = $field->getOption('default');
-
-                if ($direction !== null) {
-                    $this->orderStructureBuilder->field($name, '');
-                    $this->orderStructureBuilder->simpleValue($direction, '[order][{pos}]');
-                    $this->orderStructureBuilder->endValues();
-                }
-            }
-
-            $condition->setOrder($this->orderStructureBuilder->getOrder());
-
-            return;
-        }
-
-        foreach ($order as $name => $direction) {
-            $this->orderStructureBuilder->field('@' . mb_ltrim($name, '@'), '');
-            $this->orderStructureBuilder->simpleValue($direction, '[order][{pos}]');
-            $this->orderStructureBuilder->endValues();
-        }
-
-        $condition->setOrder($this->orderStructureBuilder->getOrder());
-    }
-
-    /**
-     * @param array<string, string|string[]> $supported
-     */
-    private function assertArrayStructure(mixed $array, array $supported, string $path = ''): void
-    {
-        if (! \is_array($array)) {
-            throw new InputProcessorException(implode('', $this->structureBuilder->getCurrentPath()) . $path, \sprintf('Expected structure to be an array, got "%s" instead.', \gettype($array)));
-        }
-
-        foreach ($array as $key => $value) {
-            if (! \is_string($key)) {
-                throw new InputProcessorException(implode('', $this->structureBuilder->getCurrentPath()) . $path, 'Expected structure to be an array.');
-            }
-
-            if (! isset($supported[$key])) {
-                throw new InputProcessorException(implode('', $this->structureBuilder->getCurrentPath()) . $path, \sprintf('Unexpected key "%s" found in structure, expected only: "%s".', $key, implode('", "', array_keys($supported))));
-            }
-
-            $type = $supported[$key];
-
-            if ($type === 'any') {
-                continue;
-            }
-
-            if ($type === 'list' && (! \is_array($value) || ! array_is_list($value))) {
-                throw new InputProcessorException(implode('', $this->structureBuilder->getCurrentPath()) . $path . "[{$key}]", \sprintf('Expected structure to be an array, got "%s" instead.', ! \is_array($value) ? \gettype($value) : 'object'));
-            }
-
-            if ($type === 'array' && ! \is_array($value)) {
-                throw new InputProcessorException(implode('', $this->structureBuilder->getCurrentPath()) . $path . "[{$key}]", \sprintf('Expected structure to be an object, got "%s" instead.', \gettype($value)));
-            }
-
-            if ($type === 'string' && ! \is_string($value)) {
-                throw new InputProcessorException(implode('', $this->structureBuilder->getCurrentPath()) . $path . "[{$key}]", \sprintf('Expected value to be a string, got "%s" instead.', \gettype($value)));
-            }
-
-            if ($type === 'bool' && ! \is_bool($value)) {
-                throw new InputProcessorException(implode('', $this->structureBuilder->getCurrentPath()) . $path . "[{$key}]", \sprintf('Expected value to be a bool, got "%s" instead.', \gettype($value)));
-            }
-
-            if (\is_array($type) && ! \in_array($value, $type, true)) {
-                throw new InputProcessorException(implode('', $this->structureBuilder->getCurrentPath()) . $path . "[{$key}]", \sprintf('Expected value to be one of: "%s". got "%s" instead.', implode('", "', $type), \gettype($value)));
-            }
-        }
-    }
-
-    /**
-     * @param string[] $requiredKeys
-     */
-    private function assertValueArrayHasKeys(mixed $array, array $requiredKeys, string $path): void
-    {
-        if (! \is_array($array)) {
-            throw new InputProcessorException(implode('', $this->structureBuilder->getCurrentPath()) . $path, \sprintf('Expected value-structure to be an array, got "%s" instead.', \gettype($array)));
-        }
-
-        $missingKeys = [];
-
-        foreach ($requiredKeys as $key) {
-            if (! \array_key_exists($key, $array)) {
-                $missingKeys[] = $key;
-            }
-        }
-
-        if ($missingKeys) {
-            throw new InputProcessorException(
-                implode('', $this->structureBuilder->getCurrentPath()) . $path,
-                \sprintf(
-                    'Expected value-structure to contain the following keys: "%s". ' .
-                    'But the following keys are missing: "%s".',
-                    implode('", "', $requiredKeys),
-                    implode('", "', $missingKeys)
-                )
-            );
-        }
-    }
-}
diff --git a/lib/Core/Input/NormStringQueryInput.php b/lib/Core/Input/NormStringQueryInput.php
deleted file mode 100644
index 3c0488b7..00000000
--- a/lib/Core/Input/NormStringQueryInput.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-/**
- * Processes input in the StringInput syntax using the Normalized value format.
- */
-final class NormStringQueryInput extends StringInput
-{
-    public const FIELD_LEXER_OPTION_NAME = 'norm_string_query.value_lexer';
-    public const VALUE_EXPORTER_OPTION_NAME = 'norm_string_query.value_exporter';
-
-    protected function initForProcess(ProcessorConfig $config): void
-    {
-        $names = [];
-        $fieldSet = $config->getFieldSet();
-
-        foreach ($fieldSet->all() as $name => $field) {
-            if ($fieldSet->isPrivate($name)) {
-                continue;
-            }
-
-            $names[$name] = $name;
-
-            if (null !== $customerMatcher = $field->getOption(self::FIELD_LEXER_OPTION_NAME)) {
-                $this->valueLexers[$name] = $customerMatcher;
-            }
-        }
-
-        $this->fields = $names;
-        $this->structureBuilder = new ConditionStructureBuilder($this->config, $this->validator, $this->errors);
-        $this->orderStructureBuilder = new OrderStructureBuilder($this->config, $this->validator, $this->errors, '');
-    }
-}
diff --git a/lib/Core/Input/NullValidator.php b/lib/Core/Input/NullValidator.php
deleted file mode 100644
index 11db6041..00000000
--- a/lib/Core/Input/NullValidator.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Field\FieldConfig;
-
-final class NullValidator implements Validator
-{
-    public function initializeContext(FieldConfig $field, ErrorList $errorList): void
-    {
-        // no-op
-    }
-
-    public function validate($value, string $type, $originalValue, string $path): bool
-    {
-        return true;
-    }
-}
diff --git a/lib/Core/Input/OrderStructureBuilder.php b/lib/Core/Input/OrderStructureBuilder.php
deleted file mode 100644
index e96ed14f..00000000
--- a/lib/Core/Input/OrderStructureBuilder.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Exception\OrderStructureException;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\StructureBuilder;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @author Dalibor Karlović <dalibor@flexolabs.io>
- */
-final class OrderStructureBuilder implements StructureBuilder
-{
-    private readonly FieldSet $fieldSet;
-    private readonly ValuesGroup $valuesGroup;
-    private ?FieldConfig $fieldConfig = null;
-    private ?ValuesBag $valuesBag = null;
-    private ?DataTransformer $inputTransformer;
-
-    /** @var array<string, mixed> */
-    private array $order = [];
-
-    public function __construct(
-        ProcessorConfig $config,
-        private readonly Validator $validator,
-        private ErrorList $errorList,
-        private readonly string $path = 'order',
-        private readonly bool $viewFormat = false,
-    ) {
-        $this->fieldSet = $config->getFieldSet();
-        $this->valuesGroup = new ValuesGroup();
-
-        // Future compatible, this is not part of the current API.
-        if (method_exists($validator, 'initialize')) {
-            $validator->initialize($config);
-        }
-    }
-
-    public function getErrors(): ErrorList
-    {
-        return $this->errorList;
-    }
-
-    public function getCurrentPath(): string
-    {
-        return $this->path;
-    }
-
-    public function getRootGroup(): ValuesGroup
-    {
-        return $this->valuesGroup;
-    }
-
-    public function enterGroup(string $groupLocal = 'AND', string $path = '[%d]'): void
-    {
-        throw OrderStructureException::noGrouping();
-    }
-
-    public function leaveGroup(): void
-    {
-        throw OrderStructureException::noGrouping();
-    }
-
-    public function field(string $name, string $path): void
-    {
-        if (! $this->valuesGroup->hasField($name)) {
-            $this->valuesGroup->addField($name, new ValuesBag());
-        }
-
-        $this->fieldConfig = $this->fieldSet->get($name);
-        $this->inputTransformer = $this->viewFormat ? $this->fieldConfig->getViewTransformer() : $this->fieldConfig->getNormTransformer();
-
-        $this->valuesBag = $this->valuesGroup->getField($name);
-
-        $this->validator->initializeContext($this->fieldConfig, $this->errorList);
-    }
-
-    public function simpleValue(mixed $value, string $path): void
-    {
-        if ($this->valuesBag === null) {
-            throw new \LogicException('Cannot add value to unknown bag.');
-        }
-
-        $name = $this->fieldConfig->getName();
-
-        if ($this->valuesBag->count()) {
-            throw OrderStructureException::invalidValue($name);
-        }
-
-        $path = str_replace('{pos}', $name, $path);
-        $modelVal = $this->inputToNorm($value, $path);
-
-        if ($modelVal !== null) {
-            $this->validator->validate($modelVal, 'simple', $value, $path);
-        }
-
-        $this->valuesBag->addSimpleValue($modelVal);
-        $this->order[$name] = $modelVal;
-    }
-
-    public function excludedSimpleValue(mixed $value, string $path): void
-    {
-        throw OrderStructureException::invalidValue($this->fieldConfig->getName());
-    }
-
-    public function rangeValue(mixed $lower, mixed $upper, bool $lowerInclusive, bool $upperInclusive, array $path): void
-    {
-        throw OrderStructureException::invalidValue($this->fieldConfig->getName());
-    }
-
-    public function excludedRangeValue(mixed $lower, mixed $upper, bool $lowerInclusive, bool $upperInclusive, array $path): void
-    {
-        throw OrderStructureException::invalidValue($this->fieldConfig->getName());
-    }
-
-    public function comparisonValue(mixed $operator, mixed $value, array $path): void
-    {
-        throw OrderStructureException::invalidValue($this->fieldConfig->getName());
-    }
-
-    public function patterMatchValue(mixed $type, mixed $value, bool $caseInsensitive, array $path): void
-    {
-        throw OrderStructureException::invalidValue($this->fieldConfig->getName());
-    }
-
-    public function endValues(): void
-    {
-        $this->fieldConfig = null;
-        $this->valuesBag = null;
-    }
-
-    public function getOrder(): ?SearchOrder
-    {
-        return $this->order === [] ? null : new SearchOrder($this->order);
-    }
-
-    private function addError(ConditionErrorMessage $error): void
-    {
-        $this->errorList[] = $error;
-    }
-
-    /**
-     * Reverse transforms a value if a value transformer is set.
-     *
-     * @return mixed returns null when the value is empty or invalid.
-     *               Note: When the value is invalid an error is registered
-     */
-    private function inputToNorm(mixed $value, string $path): mixed
-    {
-        if ($this->inputTransformer !== null) {
-            try {
-                return $this->inputTransformer->reverseTransform($value);
-            } catch (TransformationFailedException $e) {
-                $this->addError($this->transformationExceptionToError($e, $path));
-
-                return null;
-            }
-        }
-
-        if ($value !== null && ! \is_scalar($value)) {
-            $e = new \RuntimeException(
-                \sprintf(
-                    'Norm value of type %s is not a scalar value or null and not cannot be ' .
-                    'converted to a string. You must set a NormTransformer for field "%s" with type "%s".',
-                    \gettype($value),
-                    $this->fieldConfig->getName(),
-                    $this->fieldConfig->getType()->getInnerType()::class
-                )
-            );
-
-            $error = new ConditionErrorMessage(
-                $path,
-                $this->fieldConfig->getOption('invalid_message', $e->getMessage()),
-                $this->fieldConfig->getOption('invalid_message', $e->getMessage()),
-                $this->fieldConfig->getOption('invalid_message_parameters', []),
-                null,
-                $e
-            );
-
-            $this->addError($error);
-
-            return null;
-        }
-
-        return $value === '' ? null : $value;
-    }
-
-    private function transformationExceptionToError($e, string $path): ConditionErrorMessage
-    {
-        $invalidMessage = $e->getInvalidMessage();
-
-        if ($invalidMessage !== null) {
-            $error = new ConditionErrorMessage(
-                $path,
-                $invalidMessage,
-                $invalidMessage,
-                $e->getInvalidMessageParameters(),
-                null,
-                $e
-            );
-        } else {
-            $error = new ConditionErrorMessage(
-                $path,
-                $this->fieldConfig->getOption('invalid_message', $e->getMessage()),
-                $this->fieldConfig->getOption('invalid_message', $e->getMessage()),
-                $this->fieldConfig->getOption('invalid_message_parameters', []),
-                null,
-                $e
-            );
-        }
-
-        return $error;
-    }
-}
diff --git a/lib/Core/Input/ProcessorConfig.php b/lib/Core/Input/ProcessorConfig.php
deleted file mode 100644
index b2de72cd..00000000
--- a/lib/Core/Input/ProcessorConfig.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\Exception\InputProcessorException;
-use Rollerworks\Component\Search\FieldSet;
-
-/**
- * Holds the configuration for an Input processor.
- */
-class ProcessorConfig
-{
-    private int $maxNestingLevel = 5;
-    private int $maxValues = 100;
-    private int $maxGroups = 10;
-    private int | \DateInterval | null $cacheTTL = null;
-    private ?string $defaultField = null;
-
-    public function __construct(
-        private readonly FieldSet $fieldSet,
-    ) {
-    }
-
-    public function getFieldSet(): FieldSet
-    {
-        return $this->fieldSet;
-    }
-
-    /**
-     * Set the maximum group nesting level.
-     *
-     * @return $this
-     */
-    public function setMaxNestingLevel(int $maxNestingLevel): static
-    {
-        $this->maxNestingLevel = $maxNestingLevel;
-
-        return $this;
-    }
-
-    /**
-     * Gets the maximum group nesting level.
-     */
-    public function getMaxNestingLevel(): int
-    {
-        return $this->maxNestingLevel;
-    }
-
-    /**
-     * Set the maximum number of values per group.
-     *
-     * @return $this
-     */
-    public function setMaxValues(int $maxValues): static
-    {
-        $this->maxValues = $maxValues;
-
-        return $this;
-    }
-
-    /**
-     * Get the maximum number of values per group.
-     */
-    public function getMaxValues(): int
-    {
-        return $this->maxValues;
-    }
-
-    /**
-     * Set the maximum number of groups per nesting level.
-     *
-     * To calculate an absolute maximum use following formula:
-     * maxGroups * maxNestingLevel.
-     *
-     * @return $this
-     */
-    public function setMaxGroups(int $maxGroups): static
-    {
-        $this->maxGroups = $maxGroups;
-
-        return $this;
-    }
-
-    /**
-     * Get the maximum number of groups per nesting level.
-     */
-    public function getMaxGroups(): int
-    {
-        return $this->maxGroups;
-    }
-
-    /**
-     * @param \DateInterval|int|null $cacheTTL use 0 to disable caching
-     *
-     * @return $this
-     */
-    public function setCacheTTL(\DateInterval | int | null $cacheTTL): self
-    {
-        $this->cacheTTL = $cacheTTL;
-
-        return $this;
-    }
-
-    public function getCacheTTL(): \DateInterval | int | null
-    {
-        return $this->cacheTTL;
-    }
-
-    public function getDefaultField(bool $error = false): ?string
-    {
-        if ($this->defaultField === null && $error) {
-            throw new InputProcessorException('', 'No default field configured. Please provide a field name.');
-        }
-
-        return $this->defaultField;
-    }
-
-    /**
-     * @return $this
-     */
-    public function setDefaultField(?string $defaultField): static
-    {
-        $this->defaultField = $defaultField;
-
-        return $this;
-    }
-}
diff --git a/lib/Core/Input/StringInput.php b/lib/Core/Input/StringInput.php
deleted file mode 100644
index 17ec7624..00000000
--- a/lib/Core/Input/StringInput.php
+++ /dev/null
@@ -1,416 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Exception\InputProcessorException;
-use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-use Rollerworks\Component\Search\Exception\OrderStructureException;
-use Rollerworks\Component\Search\Exception\StringLexerException;
-use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
-use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\StructureBuilder;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * StringInput - processes input in the StringQuery format.
- *
- *  Caution: The error message reports the character position, not the byte position.
- *  Multibyte may cause some problems when using substr() rather then mb_substr().
- *
- * Use the {@see ErrorPathTranslator} to translate the error-path to a
- * human readable format.
- *
- * The formats works as follow:
- *
- * Each query-pair is a 'field-name: value1, value2;' or 'value1, value2;'.
- *
- * Tip: The "field-name" can be omitted, which uses the default field-name configured
- * in the ProcessorConfig. This should only be used for the first values list.
- *
- *  Query-pairs can be nested inside a group `(field-name: value1, value2;)`
- *    Subgroups are threaded as AND-case to there parent,
- *    multiple groups inside the same group are OR-case to each other.
- *
- *    By default all fields in query-pairs and other subgroups are treated as AND-case.
- *    To make a group OR-case (any of the fields must match), prefix the group with `*`.
- *
- *    Example: `*( field1: values; field2: values );`
- *
- *    Groups are separated with a single semicolon `;`.
- *    If the subgroup is last in the group the semicolon can be omitted.
- *
- *  Query-Pairs are separated with a single semicolon `;`.
- *  If the query-pair is last in the group the semicolon can be omitted.
- *
- *  Each value inside a query-pair is separated with a single comma.
- *  A value containing special characters (`<>[](),;~!*?=`) or spaces
- *  must be surrounded by quotes or use a custom value lexer.
- *
- *  Note: surrounding spaces are ignored. Example: field: value , value2  ;
- *
- *  To escape a quote use it double.
- *  Example: `field: "va""lue"`
- *
- *  Escaped quotes will be normalized to a single one, as `"va"lue"`.
- *
- * Line separators are allowed for better readability, but are not allowed
- * within a value.
- *
- * Multiple value types are supported (depending on the field configuration);
- * Spaces between operators are supported, but not within the operator.
- *
- * Simple Values
- * =============
- *
- * A simple value is a single value without any operator.
- *
- * Example: `field: value, value2, "value 3", "!value4";`
- *
- * Excluded Values
- * ===============
- *
- * To mark a value as excluded prefix it with an `!`.
- *
- * Example: `field: !value, value2, !"value 3", ! "!value4";`
- *
- * Ranges
- * ======
- *
- * A range consists of two sides, a lower and upper bound (inclusive by default).
- * Each side is considered a value-part and must follow the value convention
- * (as described above).
- *
- * Example: `field: 1~100; field2: -1 ~ 100`
- *
- * Each side is inclusive by default, meaning 'the value' and anything lower/higher than it.
- * The left delimiter can be `[` (inclusive) or `]` (exclusive).
- * The right delimiter can be `[` (exclusive) or `]` (inclusive).
- *
- *   `]1 ~ 100`  is equal to `(> 1 and <= 100)`
- *   `[1 ~ 100`  is equal to` (>= 1 and <= 100)`
- *   `[1 ~ 100[` is equal to `(>= 1 and < 100)`
- *   `]1 ~ 100[` is equal to `(> 1 and < 100)`
- *
- *   Example:
- *     `field: ]1 ~ 100;`
- *     `field: [1 ~ 100;`
- *
- * To mark the range as excluded prefix it with an `!`
- * (same as single excluded values).
- *
- * Example: `field: !1 ~ 100, ![1 ~ 100;`
- *
- * Comparison
- * ==========
- *
- * Comparisons are as any programming language.
- * Supported operators are: `<`, `<=`, `<>`, `>`, `>=`
- *
- * * `<` lower than;
- * * `>` higher than;
- * * `<=` lower than or equal;
- * * `>=` higher than or equal;
- * * `<>` not higher or lower than (aka not equal).
- *
- * Followed by a value-part.
- *
- * Example: field: `>= 1, < -10;`
- *
- * Caution: Spaces are not allowed within the operator.
- * Invalid: `> =`
- *
- * PatternMatch
- * ============
- *
- * A PatternMatch works similar to a Comparison, everything that starts
- * with a tilde (`~`) is considered a pattern match.
- *
- * Supported operators are:
- *
- * * `~*` (contains)
- * * `~>` (starts with)
- * * `~<` (ends with)
- *
- * And the NOT equivalent:
- *
- * * `~!*` (does not contain)
- * * `~!>` (does not start with)
- * * `~!<` (does not end with)
- *
- * Example: `field: ~> foo, ~*"bar";`
- *
- * To mark the pattern case insensitive add an `i` directly after the '~':
- *
- * Example: `field: ~i> foo, ~i!* "bar";`
- *
- * Caution: Spaces are not allowed within the operator.
- * Invalid: `~ >`
- *
- * A PatternMatch does not allow a custom value-lexer and requires
- * quoting of special characters.
- *
- * Ordering
- * ========
- *
- * An ordering field can only be used at the root of the condition,
- * either as the first or last of the condition.
- *
- * Example: `@id: asc; @name: desc; id: 12, 50;`, `@id: asc; id: 12, 50; @name: desc;`
- */
-abstract class StringInput extends AbstractInput
-{
-    protected ?StructureBuilder $structureBuilder;
-    protected ?OrderStructureBuilder $orderStructureBuilder;
-
-    /** @var array<string, string> */
-    protected array $fields = [];
-
-    /** @var array<string, \Closure> */
-    protected array $valueLexers = [];
-
-    private StringLexer $lexer;
-
-    public function __construct(?Validator $validator = null)
-    {
-        $this->lexer = new StringLexer();
-        parent::__construct($validator);
-    }
-
-    /**
-     * @param string $input
-     *
-     * @throws InvalidSearchConditionException
-     */
-    public function process(ProcessorConfig $config, $input): SearchCondition
-    {
-        if (! \is_string($input)) {
-            throw new UnexpectedTypeException($input, 'string');
-        }
-
-        $input = mb_trim($input);
-
-        $fieldSet = $config->getFieldSet();
-        $condition = null;
-        $this->valueLexers = [];
-        $this->errors = new ErrorList();
-        $this->config = $config;
-        $this->level = 0;
-
-        $this->initForProcess($config);
-
-        try {
-            $this->parse($config, $input, $fieldSet);
-            $condition = new SearchCondition($fieldSet, $this->structureBuilder->getRootGroup());
-            $condition->setOrder($this->orderStructureBuilder->getOrder());
-
-            $this->assertLevel0();
-        } catch (InputProcessorException $e) {
-            $this->errors[] = $e->toErrorMessageObj();
-        } finally {
-            $this->structureBuilder = null;
-        }
-
-        if (\count($this->errors)) {
-            $errors = $this->errors->getArrayCopy();
-
-            throw new InvalidSearchConditionException($errors);
-        }
-
-        self::finalizeOrdering($condition);
-
-        return $condition;
-    }
-
-    abstract protected function initForProcess(ProcessorConfig $config): void;
-
-    private function getFieldName(string $name): string
-    {
-        if (isset($this->fields[$name])) {
-            return $this->fields[$name];
-        }
-
-        throw new UnknownFieldException($name);
-    }
-
-    final protected function parse(ProcessorConfig $config, string $input, FieldSet $fieldSet): void
-    {
-        $this->config = $config;
-        $this->lexer->parse($input, $this->valueLexers);
-
-        // If the first part is a group then ignore the match, let fieldValuesPairs() handle the
-        // group logical on this own.
-        if (! $this->lexer->isGlimpse('/[*&]?\s*\(/A')) {
-            $logical = $this->lexer->matchOptional('*') !== null ? ValuesGroup::GROUP_LOGICAL_OR : ValuesGroup::GROUP_LOGICAL_AND;
-            $this->structureBuilder->getRootGroup()->setGroupLogical($logical);
-        }
-
-        $this->lexer->skipEmptyLines();
-        $this->fieldValuesPairs();
-
-        if (! $this->orderStructureBuilder->getRootGroup()->countValues()) {
-            /** @var FieldConfig $field */
-            foreach ($fieldSet->all() as $name => $field) {
-                if (OrderField::isOrder($name) && null !== $direction = $field->getOption('default')) {
-                    $this->orderStructureBuilder->field($name, '');
-                    $this->orderStructureBuilder->simpleValue($direction, '[order][{pos}]');
-                    $this->orderStructureBuilder->endValues();
-                }
-            }
-        }
-    }
-
-    private function fieldValuesPairs(bool $inGroup = false): void
-    {
-        while (! $this->lexer->isEnd()) {
-            if ($this->lexer->isGlimpse('/[*&]?\s*\(/A')) {
-                ++$this->level;
-                $this->fieldGroup();
-                --$this->level;
-
-                continue;
-            }
-
-            if ($this->lexer->isGlimpse('/[*&]/A')) {
-                throw $this->lexer->createFormatException(StringLexerException::GROUP_LOGICAL_WITHOUT_GROUP);
-            }
-
-            if ($this->lexer->isGlimpse(')')) {
-                if ($inGroup) {
-                    break;
-                }
-
-                throw $this->lexer->createFormatException(StringLexerException::CANNOT_CLOSE_UNOPENED_GROUP);
-            }
-
-            if ($this->lexer->isGlimpse(StringLexer::FIELD_NAME)) {
-                $fieldName = $this->getFieldName($this->lexer->fieldIdentification());
-            } else {
-                $fieldName = $this->config->getDefaultField(true);
-            }
-
-            if (OrderField::isOrder($fieldName) && $inGroup) {
-                throw OrderStructureException::noGrouping();
-            }
-
-            $this->lexer->skipEmptyLines();
-            $this->fieldValues($fieldName);
-            $this->lexer->skipEmptyLines();
-        }
-    }
-
-    private function fieldGroup(): void
-    {
-        $logical = $this->lexer->matchOptional('*') !== null ? ValuesGroup::GROUP_LOGICAL_OR : ValuesGroup::GROUP_LOGICAL_AND;
-        $this->structureBuilder->enterGroup($logical, '[%d]');
-
-        $this->lexer->skipWhitespace();
-        $this->lexer->expects('(');
-        $this->lexer->skipEmptyLines();
-
-        $this->fieldValuesPairs(true);
-
-        $this->lexer->expects(')');
-        $this->lexer->skipEmptyLines();
-
-        $this->structureBuilder->leaveGroup();
-
-        $this->lexer->matchOptional(';');
-        $this->lexer->skipEmptyLines();
-    }
-
-    private function fieldValues(string $name): void
-    {
-        $isOrder = OrderField::isOrder($name);
-
-        /** @var StructureBuilder $structureBuilder */
-        $structureBuilder = $isOrder ? $this->orderStructureBuilder : $this->structureBuilder;
-
-        $structureBuilder->field($name, '[%s]');
-
-        $hasValues = false;
-        $pathVal = '[{pos}]';
-
-        while (! $this->lexer->isEnd() && ! $this->lexer->isGlimpse('/[);]/A')) {
-            $valueType = $this->lexer->detectValueType($name);
-
-            switch ($valueType) {
-                case StringLexer::COMPARE:
-                    [$operator, $value] = $this->lexer->comparisonValue($name);
-                    $structureBuilder->comparisonValue($operator, $value, [$pathVal, '', '']);
-
-                    break;
-
-                case StringLexer::PATTERN_MATCH:
-                    [$caseInsensitive, $type, $value] = $this->lexer->patternMatchValue();
-                    $structureBuilder->patterMatchValue($type, $value, $caseInsensitive, [$pathVal, '', '']);
-
-                    break;
-
-                case StringLexer::RANGE:
-                    $negative = $this->lexer->matchOptional('!') !== null;
-                    [$lowerInclusive, $lowerBound, $upperBound, $upperInclusive] = $this->lexer->rangeValue($name);
-
-                    if ($negative) {
-                        $structureBuilder->excludedRangeValue(
-                            $lowerBound,
-                            $upperBound,
-                            $lowerInclusive,
-                            $upperInclusive,
-                            [$pathVal, '[lower]', '[upper]']
-                        );
-                    } else {
-                        $structureBuilder->rangeValue(
-                            $lowerBound,
-                            $upperBound,
-                            $lowerInclusive,
-                            $upperInclusive,
-                            [$pathVal, '[lower]', '[upper]']
-                        );
-                    }
-
-                    break;
-
-                case StringLexer::SIMPLE_VALUE:
-                    if ($this->lexer->matchOptional('!') !== null) {
-                        $structureBuilder->excludedSimpleValue($this->lexer->valuePart($name), $pathVal);
-                    } else {
-                        $structureBuilder->simpleValue($this->lexer->valuePart($name), $pathVal);
-                    }
-
-                    break;
-            }
-
-            if ($this->lexer->matchOptional(',') !== null && $this->lexer->isGlimpse(';')) {
-                throw $this->lexer->createFormatException(StringLexerException::INCORRECT_VALUES_SEPARATOR);
-            }
-
-            $this->lexer->skipEmptyLines();
-
-            // We got here, so no errors.
-            $hasValues = true;
-        }
-
-        if (! $hasValues) {
-            throw $this->lexer->createFormatException(StringLexerException::FIELD_REQUIRES_VALUES);
-        }
-
-        $structureBuilder->endValues();
-        $this->lexer->matchOptional(';');
-    }
-}
diff --git a/lib/Core/Input/StringLexer.php b/lib/Core/Input/StringLexer.php
deleted file mode 100644
index 7c38421e..00000000
--- a/lib/Core/Input/StringLexer.php
+++ /dev/null
@@ -1,529 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\Exception\StringLexerException;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class StringLexer
-{
-    public const FIELD_NAME = '/@?_?(\p{L}[\p{L}\p{N}_-]*)\s*:/Au';
-    public const PATTERN_MATCH = 'pattern-match';
-    public const SIMPLE_VALUE = 'simple-value';
-    public const COMPARE = 'compare';
-    public const RANGE = 'range';
-
-    /** @var array<string, \Closure(self, string): string> */
-    private array $valueLexers;
-
-    private string $data;
-    private int $cursor;
-    private int $char;
-    private int $lineno;
-    private int $col;
-    private int $end;
-    private ?int $linenoSnapshot;
-    private ?int $colSnapshot;
-    private ?int $cursorSnapshot;
-    private ?int $charSnapshot;
-    private ?string $inValue = null;
-
-    /**
-     * @internal
-     *
-     * @param array<string, \Closure(self, string): string> $fieldLexers
-     */
-    public function parse(string $data, array $fieldLexers = []): void
-    {
-        $this->data = str_replace(["\r\n", "\r"], "\n", $data);
-        $this->end = mb_strlen($this->data, '8bit');
-        $this->valueLexers = $fieldLexers;
-
-        $this->lineno = 1;
-        $this->col = 0;
-        $this->cursor = 0;
-        $this->char = 0;
-
-        $this->linenoSnapshot = null;
-        $this->colSnapshot = null;
-        $this->cursorSnapshot = null;
-        $this->charSnapshot = null;
-
-        $this->skipEmptyLines();
-    }
-
-    /**
-     * Skip any form of whitespace (except for empty lines).
-     */
-    public function skipWhitespace(): void
-    {
-        if (preg_match('/\h+/A', $this->data, $match, 0, $this->cursor)) {
-            $this->moveCursor($match[0]);
-        }
-    }
-
-    /**
-     * Skip any form of whitespace (including for empty lines).
-     */
-    public function skipEmptyLines(): void
-    {
-        if (preg_match('/(?:\s*+)++/A', $this->data, $match, 0, $this->cursor)) {
-            $this->moveCursor($match[0]);
-        }
-    }
-
-    public function moveCursor(string $text): void
-    {
-        $this->lineno += mb_substr_count($text, "\n");
-        $this->char += mb_strlen($text);
-        $this->cursor += mb_strlen($text, '8bit');
-
-        if (str_contains($text, "\n")) {
-            // Find the last newline, start counting the characters from there as our new position.
-            $this->col = mb_strlen(mb_substr($text, mb_strrpos($text, "\n")));
-        } else {
-            $this->col += mb_strlen($text);
-        }
-    }
-
-    public function snapshot(bool $force = false): void
-    {
-        if (! $force && $this->charSnapshot !== null) {
-            return;
-        }
-
-        $this->linenoSnapshot = $this->lineno;
-        $this->colSnapshot = $this->col;
-        $this->cursorSnapshot = $this->cursor;
-        $this->charSnapshot = $this->char;
-    }
-
-    public function restoreCursor(): void
-    {
-        if ($this->cursorSnapshot === null) {
-            throw new \RuntimeException('Unable to restore cursor because no snapshot was stored.');
-        }
-
-        $this->lineno = $this->linenoSnapshot;
-        $this->col = $this->colSnapshot;
-        $this->cursor = $this->cursorSnapshot;
-        $this->char = $this->charSnapshot;
-
-        $this->linenoSnapshot = null;
-        $this->colSnapshot = null;
-        $this->cursorSnapshot = null;
-        $this->charSnapshot = null;
-    }
-
-    public function isGlimpse(string $data): bool
-    {
-        return $this->regexOrSingleChar($data) !== null;
-    }
-
-    /**
-     * Matches that the current position matches the $data attribute,
-     * and moves the cursor _only_ when there is a positive match.
-     *
-     * If there is no match the cursor is left at the current position.
-     *
-     * @param string $data A single character or a fully specified regex (with delimiters and options)
-     *
-     * @return string|null The matched result or null when not matched
-     */
-    public function matchOptional(string $data): ?string
-    {
-        $match = $this->regexOrSingleChar($data);
-
-        if ($match !== null) {
-            $this->moveCursor($match);
-            $this->skipWhitespace();
-
-            return $match;
-        }
-
-        return null;
-    }
-
-    /**
-     * Expects that the current position matches $data the attribute,
-     * and moves the cursor. Or fails with a syntax exception.
-     *
-     * Caution: When using a regex be sure to use the `A` modifier.
-     * Whitespace *after* the match is automatically ignored.
-     *
-     * @param string               $data     A single character or a fully specified regex (with delimiters and options)
-     * @param string|string[]|null $expected
-     *
-     * @throws StringLexerException when there no match or there is no further data
-     */
-    public function expects(string $data, array | string | null $expected = null): string
-    {
-        $match = $this->regexOrSingleChar($data);
-
-        if ($match !== null) {
-            $this->moveCursor($match);
-            $this->skipWhitespace();
-
-            return $match;
-        }
-
-        throw $this->createSyntaxException($expected ?? $data);
-    }
-
-    public function isEnd(): bool
-    {
-        return $this->cursor >= $this->end;
-    }
-
-    /**
-     * @param string|string[] $expected
-     */
-    public function createSyntaxException(string | array $expected): StringLexerException
-    {
-        $expected = (array) $expected;
-
-        if ($this->isEnd()) {
-            return StringLexerException::syntaxErrorUnexpectedEnd(
-                $this->col,
-                $this->lineno,
-                $expected,
-                'end of string'
-            );
-        }
-
-        if ($this->data[$this->cursor] === "\n") {
-            return StringLexerException::syntaxErrorUnexpectedEnd(
-                $this->col,
-                $this->lineno,
-                $expected,
-                'line end'
-            );
-        }
-
-        return StringLexerException::syntaxError(
-            $this->col,
-            $this->lineno,
-            $expected,
-            mb_substr($this->data, $this->cursor, min(10, $this->end))
-        );
-    }
-
-    public function createFormatException($string): StringLexerException
-    {
-        return StringLexerException::formatError(
-            $this->col,
-            $this->lineno,
-            $string
-        );
-    }
-
-    /**
-     * Expect a StringValue.
-     *
-     * A StringValue consists of non-special characters in any scripture (language)
-     * or a QuotedValue. Trailing whitespace are skipped.
-     */
-    public function stringValue(string $allowedNext = ',;)'): string
-    {
-        $value = '';
-
-        if ($this->isEnd()) {
-            throw $this->createSyntaxException('StringValue');
-        }
-
-        if ($this->data[$this->cursor] === '"') {
-            $this->moveCursor('"');
-
-            while (($c = mb_substr($this->data, $this->char, 1)) !== "\n") {
-                if ($c === '"') {
-                    if ($this->cursor + 1 === $this->end) {
-                        break;
-                    }
-
-                    if (mb_substr($this->data, $this->char + 1, 1) !== '"') {
-                        break;
-                    }
-
-                    $this->moveCursor($c);
-                }
-
-                $value .= $c = mb_substr($this->data, $this->char, 1);
-                $this->moveCursor($c);
-
-                if ($this->cursor === $this->end) {
-                    throw $this->createFormatException(StringLexerException::MISSING_END_QUOTE);
-                }
-            }
-
-            if ($c === "\n") {
-                throw $this->createFormatException(StringLexerException::MISSING_END_QUOTE);
-            }
-
-            $this->moveCursor('"');
-
-            $this->skipWhitespace();
-
-            // Detect an user error like: "foo"bar"
-            if ($this->cursor < $this->end && ! $this->isGlimpse('/[' . preg_quote($allowedNext, '/') . ']/A')) {
-                throw $this->createFormatException(StringLexerException::VALUE_QUOTES_MUST_ESCAPE);
-            }
-
-            return $value;
-        }
-
-        $allowedNextRegex = '/[' . preg_quote($allowedNext, '/') . ']/A';
-
-        while ($this->cursor < $this->end && "\n" !== $c = mb_substr($this->data, $this->char, 1)) {
-            if ($c === '"') {
-                throw $this->createFormatException(StringLexerException::QUOTED_VALUE_REQUIRE_QUOTING);
-            }
-
-            if ($this->isGlimpse($allowedNextRegex)) {
-                break;
-            }
-
-            if ($this->isGlimpse('/[<>[\](),;~!*?=&*]/A')) {
-                throw $this->createFormatException(StringLexerException::SPECIAL_CHARS_REQ_QUOTING);
-            }
-
-            $value .= $c;
-            $this->moveCursor($c);
-        }
-
-        $value = mb_rtrim($value);
-
-        if (preg_match('/\s+/', $value)) {
-            throw $this->createFormatException(StringLexerException::SPACES_REQ_QUOTING);
-        }
-
-        return $value;
-    }
-
-    public function fieldIdentification(): string
-    {
-        return mb_substr(mb_trim($this->expects(self::FIELD_NAME, 'FieldIdentification')), 0, -1);
-    }
-
-    //
-    // Internal methods. DO NOT USE FOR CUSTOM LEXERS!
-    // Write your own lexical parsers as reusing these methods.
-    // May result in an endless recursion.
-    //
-
-    /**
-     * @internal
-     */
-    public function valuePart(string $fieldName, string $allowedNext = ',;)'): string
-    {
-        if ($this->inValue) {
-            $this->throwForbiddenInternalOperation(__METHOD__);
-        }
-
-        // matches value syntax (with custom lexer) or string
-        if (isset($this->valueLexers[$fieldName])) {
-            $this->inValue = $fieldName;
-            $value = $this->valueLexers[$fieldName]($this, $allowedNext);
-            $this->inValue = null;
-
-            return $value;
-        }
-
-        return $this->stringValue($allowedNext);
-    }
-
-    /**
-     * @internal
-     *
-     * @return array{bool, string, string, bool} ['lowerInclusive', 'lowerBound', 'upperBound', 'upperInclusive']
-     */
-    public function rangeValue(string $name): array
-    {
-        if ($this->inValue) {
-            $this->throwForbiddenInternalOperation(__METHOD__);
-        }
-
-        $lowerInclusive = ($this->matchOptional('/[[\]]/A') ?? '[') === '[';
-
-        $this->skipWhitespace();
-        $lowerBound = $this->valuePart($name, '~');
-
-        $this->skipWhitespace();
-        $this->expects('~');
-
-        $this->skipWhitespace();
-        $upperBound = $this->valuePart($name, '/[[\],;)]/A');
-
-        $upperInclusive = ($this->matchOptional('/[[\]]/A') ?? ']') === ']';
-
-        $this->skipEmptyLines();
-
-        return [$lowerInclusive, $lowerBound, $upperBound, $upperInclusive];
-    }
-
-    /**
-     * @internal
-     *
-     * @return array{string, string} ['operator', 'value']
-     */
-    public function comparisonValue(string $name): array
-    {
-        if ($this->inValue) {
-            $this->throwForbiddenInternalOperation(__METHOD__);
-        }
-
-        $operator = $this->expects('/<>|(?:[<>]=?)/A', 'CompareOperator');
-
-        $this->skipWhitespace();
-        $value = $this->valuePart($name);
-        $this->skipEmptyLines();
-
-        return [$operator, $value];
-    }
-
-    /**
-     * @internal
-     *
-     * @return array{bool, string, string} ['caseInsensitive', 'type', 'value']
-     */
-    public function patternMatchValue(): array
-    {
-        if ($this->inValue) {
-            $this->throwForbiddenInternalOperation(__METHOD__);
-        }
-
-        $this->expects('~');
-
-        if ($this->cursor === $this->end) {
-            throw $this->createFormatException(StringLexerException::INCOMPLETE_VALUE_PATTERN);
-        }
-
-        $negative = false;
-        $caseInsensitive = false;
-
-        if (! preg_match('/([^*<>=]{0,2}\s*)([*<>=])/A', $this->data, $match, 0, $this->cursor)) {
-            throw $this->createSyntaxException('PatternMatch');
-        }
-
-        if (preg_match('/\s+/', $match[0])) {
-            throw $this->createFormatException(StringLexerException::NO_SPACES_IN_OPERATOR);
-        }
-
-        if ($match[1] !== '') {
-            if (! \in_array($match[1], ['i!', '!i', 'i', '!'], true)) {
-                throw $this->createFormatException(StringLexerException::UNKNOWN_PATTERN_MATCH_FLAG);
-            }
-
-            $negative = mb_strpos($match[1], '!') !== false;
-            $caseInsensitive = mb_strpos($match[1], 'i') !== false;
-        }
-
-        static $operatorToTypeMapping = [
-            '*' => 'CONTAINS',
-            '>' => 'STARTS_WITH',
-            '<' => 'ENDS_WITH',
-            '=' => 'EQUALS',
-        ];
-
-        $type = ($negative ? 'NOT_' : '') . $operatorToTypeMapping[$match[2]];
-
-        $this->moveCursor($match[0]);
-
-        $this->skipWhitespace();
-        $value = $this->stringValue();
-        $this->skipEmptyLines();
-
-        return [$caseInsensitive, $type, $value];
-    }
-
-    /**
-     * @internal
-     *
-     * The detection is very loosely and stops after
-     * the first positive detection. As a result, a value
-     * may not match unquoted special characters.
-     */
-    public function detectValueType(string $name): string
-    {
-        if ($this->inValue) {
-            $this->throwForbiddenInternalOperation(__METHOD__);
-        }
-
-        if ($this->cursor === $this->end) {
-            return '';
-        }
-
-        if ($this->isGlimpse('~')) {
-            return self::PATTERN_MATCH;
-        }
-
-        // Note that this will also match `><` which is not valid.
-        // But it's better to fail with a parse error in `comparisonValue`
-        // then accepting the value as a string.
-        if ($this->isGlimpse('/(?:[<>]=?)/A')) {
-            return self::COMPARE;
-        }
-
-        $this->snapshot(true);
-
-        $this->matchOptional('!');
-
-        if ($this->matchOptional('/[[\]]/A') !== null) {
-            $this->restoreCursor();
-
-            return self::RANGE;
-        }
-
-        $this->valuePart($name, ',;)~');
-
-        // There is still a chance the value is not a range, but that that's
-        // not important now. As a value starting with `~` is invalid already.
-        //
-        // A custom lexer that uses the range character should be specific in matching.
-        // Or consider using a combiner like `(value ~ something)`.
-        if ($this->matchOptional('~') !== null) {
-            $this->restoreCursor();
-
-            return self::RANGE;
-        }
-
-        $this->restoreCursor();
-
-        return self::SIMPLE_VALUE;
-    }
-
-    private function regexOrSingleChar(string $data): ?string
-    {
-        if ($this->cursor === $this->end) {
-            return null;
-        }
-
-        if (mb_strlen($data, '8bit') === 1) {
-            return $data === $this->data[$this->cursor] ? $data : null;
-        }
-
-        if (preg_match($data, $this->data, $match, 0, $this->cursor)) {
-            return $match[0];
-        }
-
-        return null;
-    }
-
-    private function throwForbiddenInternalOperation(string $method): never
-    {
-        throw new BadMethodCallException(\sprintf('Cannot call "%s" inside a custom value-lexer for field "%s".', mb_substr($method, mb_strrpos($method, '::') + 2), $this->inValue));
-    }
-}
diff --git a/lib/Core/Input/StringQueryInput.php b/lib/Core/Input/StringQueryInput.php
deleted file mode 100644
index 001a7914..00000000
--- a/lib/Core/Input/StringQueryInput.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\Field\FieldConfig;
-
-/**
- * Processes input in the StringInput syntax using the View value format.
- */
-final class StringQueryInput extends StringInput
-{
-    public const FIELD_LEXER_OPTION_NAME = 'string_query.value_lexer';
-    public const VALUE_EXPORTER_OPTION_NAME = 'string_query.value_export';
-
-    /** @var callable */
-    private mixed $labelResolver;
-
-    /**
-     * @param callable|null $labelResolver a callable to resolve the actual label
-     *                                     of the field, receives a FieldConfig instance.
-     *                                     When null, the `label` option value is used instead
-     */
-    public function __construct(?Validator $validator = null, ?callable $labelResolver = null)
-    {
-        parent::__construct($validator);
-
-        $this->labelResolver = $labelResolver ?? static fn (FieldConfig $field) => $field->getOption('label') ?? $field->getName();
-    }
-
-    protected function initForProcess(ProcessorConfig $config): void
-    {
-        $labels = [];
-        $callable = $this->labelResolver;
-        $fieldSet = $config->getFieldSet();
-
-        foreach ($fieldSet->all() as $name => $field) {
-            if ($fieldSet->isPrivate($name)) {
-                continue;
-            }
-
-            $label = $callable($field);
-            $labels[$label] = $name;
-
-            $customerMatcher = $field->getOption(self::FIELD_LEXER_OPTION_NAME);
-
-            if ($customerMatcher !== null) {
-                $this->valueLexers[$name] = $customerMatcher;
-            }
-        }
-
-        $this->fields = $labels;
-        $this->structureBuilder = new ConditionStructureByViewBuilder(
-            $this->config,
-            $this->validator,
-            $this->errors
-        );
-        $this->orderStructureBuilder = new OrderStructureBuilder(
-            $this->config,
-            $this->validator,
-            $this->errors,
-            '',
-            true
-        );
-    }
-}
diff --git a/lib/Core/Input/Validator.php b/lib/Core/Input/Validator.php
deleted file mode 100644
index 75282db1..00000000
--- a/lib/Core/Input/Validator.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Input;
-
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Field\FieldConfig;
-
-/**
- * The Validator validates field values.
- *
- * The validator is first initialized with the FieldConfig using the
- * `initializeConfig()` method (when present).
- *
- * For each field the validator is then initialized with `initializeContext()`.
- * Then for each value in the current field the `validate()` method is called.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * @method void initialize(ProcessorConfig $config)
- */
-interface Validator
-{
-    /**
-     * Initialize the validator context for the field.
-     *
-     * This method is called prior to the first call to validate().
-     * Errors need to be added to the ErrorList.
-     */
-    public function initializeContext(FieldConfig $field, ErrorList $errorList): void;
-
-    /**
-     * Validates and returns whether the value is valid.
-     *
-     * Any error (or violation) should be added to the ErrorList with the
-     * corresponding path. Multiple errors can be added for the same path.
-     *
-     * Example:
-     * ```
-     * // ErrorList was initialized in initializeContext()
-     *
-     * $this->errorList->append(new \Rollerworks\Component\Search\ConditionErrorMessage(
-     *      $path,
-     *      $violation->getMessage(),
-     *      $violation->getMessageTemplate(),
-     *      $violation->getParameters(),
-     *      $violation->getPlural(),
-     *      $violation, // Cause of the error (can be anything), optional used for debugging and profiling
-     * ));
-     * ```
-     */
-    public function validate($value, string $type, $originalValue, string $path): bool;
-}
diff --git a/lib/Core/InputProcessor.php b/lib/Core/InputProcessor.php
deleted file mode 100644
index 7f949fd0..00000000
--- a/lib/Core/InputProcessor.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-
-/**
- * The InputProcessor must be implemented by all input-processor.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface InputProcessor
-{
-    /**
-     * Process the input and returns the result.
-     *
-     * The processor should only handle fields that are registered in
-     * the FieldSet.
-     *
-     * @param ProcessorConfig $config Configuration for the processor
-     * @param mixed           $input  Input to process, actual format depends
-     *                                on the processor implementation
-     *
-     * @throws Exception\InvalidSearchConditionException When there are errors in the input
-     *                                                   this can be a failed transformation
-     *                                                   or processing error
-     */
-    public function process(ProcessorConfig $config, $input): SearchCondition;
-}
diff --git a/lib/Core/LICENSE b/lib/Core/LICENSE
deleted file mode 100644
index 7d4bb1bc..00000000
--- a/lib/Core/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012-present Sebastiaan Stok
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/lib/Core/LazyFieldSetRegistry.php b/lib/Core/LazyFieldSetRegistry.php
deleted file mode 100644
index 40592c73..00000000
--- a/lib/Core/LazyFieldSetRegistry.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Psr\Container\ContainerInterface;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Loader\ClosureContainer;
-
-/**
- * LazyFieldSetRegistry tries to lazily load the FieldSetConfigurator
- * from s PSR-11 compatible Container or by FQCN.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class LazyFieldSetRegistry implements FieldSetRegistry
-{
-    /** @var array<string, FieldSetConfigurator> */
-    private array $configurators = [];
-
-    /**
-     * Constructor.
-     *
-     * Note you don't have to register the Configurator when it has no constructor
-     * or setter dependencies. You can simple use the FQCN of the configurator class,
-     * and will be initialized upon first usage.
-     *
-     * @param ContainerInterface    $container  A Service locator able to lazily load
-     *                                          the FieldSet configurators
-     * @param array<string, string> $serviceIds Configurator name (FQCN) to service-id mapping
-     */
-    public function __construct(
-        private readonly ContainerInterface $container,
-        private readonly array $serviceIds,
-    ) {
-    }
-
-    /**
-     * Creates a new LazyFieldSetRegistry with easy factories for loading.
-     *
-     * @param array<string, \Closure> $configurators an array of lazy loading configurators.
-     *                                               The Closure when called is expected to return
-     *                                               a {@see FieldSetConfigurator} object
-     */
-    public static function create(array $configurators = []): self
-    {
-        $names = array_keys($configurators);
-
-        return new self(new ClosureContainer($configurators), array_combine($names, $names));
-    }
-
-    /**
-     * @param string $name The name of the FieldSet configurator
-     *
-     * @throws InvalidArgumentException if the configurator can not be retrieved
-     */
-    public function getConfigurator(string $name): FieldSetConfigurator
-    {
-        if (isset($this->configurators[$name])) {
-            return $this->configurators[$name];
-        }
-
-        if (isset($this->serviceIds[$name])) {
-            $configurator = $this->container->get($this->serviceIds[$name]);
-        } elseif (class_exists($name)) {
-            // Support fully-qualified class names.
-            $configurator = new $name();
-        } else {
-            throw new InvalidArgumentException(\sprintf('Could not load FieldSet configurator "%s".', $name));
-        }
-
-        if (! $configurator instanceof FieldSetConfigurator) {
-            throw new InvalidArgumentException(\sprintf('Configurator class "%s" is expected to be an instance of ' . FieldSetConfigurator::class, $name));
-        }
-
-        return $this->configurators[$name] = $configurator;
-    }
-
-    /**
-     * Returns whether the given FieldSetConfigurator is supported.
-     *
-     * @param string $name The name of the FieldSet configurator
-     */
-    public function hasConfigurator(string $name): bool
-    {
-        if (isset($this->configurators[$name]) || isset($this->serviceIds[$name])) {
-            return true;
-        }
-
-        return class_exists($name) && \in_array(FieldSetConfigurator::class, class_implements($name), true);
-    }
-}
diff --git a/lib/Core/Loader/ClosureContainer.php b/lib/Core/Loader/ClosureContainer.php
deleted file mode 100644
index e5414e3c..00000000
--- a/lib/Core/Loader/ClosureContainer.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Loader;
-
-use Psr\Container\ContainerInterface;
-
-/**
- * Helps with lazily loading dependencies.
- *
- * This class is provided for easy of use, it should not be used
- * directly within your own code.
- *
- * @internal
- */
-final class ClosureContainer implements ContainerInterface
-{
-    /** @var array<string, object> */
-    private array $values = [];
-
-    /**
-     * @param array<string, \Closure> $factories
-     */
-    public function __construct(
-        private array $factories,
-    ) {
-    }
-
-    public function has(string $id): bool
-    {
-        return isset($this->factories[$id]);
-    }
-
-    public function get(string $id): object
-    {
-        if (! isset($this->factories[$id])) {
-            throw new ServiceNotFoundException($id);
-        }
-
-        if (! isset($this->values[$id])) {
-            $this->values[$id] = $this->factories[$id]();
-        }
-
-        return $this->values[$id];
-    }
-}
diff --git a/lib/Core/Loader/ConditionExporterLoader.php b/lib/Core/Loader/ConditionExporterLoader.php
deleted file mode 100644
index 98894d78..00000000
--- a/lib/Core/Loader/ConditionExporterLoader.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Loader;
-
-use Psr\Container\ContainerInterface;
-use Rollerworks\Component\Search\ConditionExporter;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Exporter\JsonExporter;
-use Rollerworks\Component\Search\Exporter\NormStringQueryExporter;
-use Rollerworks\Component\Search\Exporter\StringQueryExporter;
-
-/**
- * ConditionExporterLoader provides lazy loading of ConditionExporters.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class ConditionExporterLoader
-{
-    /**
-     * @param ContainerInterface    $container  A PSR-11 compatible Service locator/container
-     * @param array<string, string> $serviceIds Format alias to service-id mapping,
-     *                                          eg. 'json' => 'service-id'
-     */
-    public function __construct(
-        private readonly ContainerInterface $container,
-        private readonly array $serviceIds,
-    ) {
-    }
-
-    /**
-     * Create a new ConditionExporterLoader with the build-in
-     * ConditionExporter loadable.
-     */
-    public static function create(): self
-    {
-        return new self(
-            new ClosureContainer(
-                [
-                    'rollerworks_search.condition_exporter.json' => static fn (): JsonExporter => new JsonExporter(),
-                    'rollerworks_search.condition_exporter.string_query' => static fn (): StringQueryExporter => new StringQueryExporter(),
-                    'rollerworks_search.condition_exporter.norm_string_query' => static fn (): NormStringQueryExporter => new NormStringQueryExporter(),
-                ]
-            ),
-            [
-                'json' => 'rollerworks_search.condition_exporter.json',
-                'string_query' => 'rollerworks_search.condition_exporter.string_query',
-                'norm_string_query' => 'rollerworks_search.condition_exporter.norm_string_query',
-            ]
-        );
-    }
-
-    /**
-     * @throws \InvalidArgumentException when there is no exporter for the given format
-     */
-    public function get(string $format): ConditionExporter
-    {
-        if (! isset($this->serviceIds[$format])) {
-            throw new InvalidArgumentException(
-                \sprintf('Enable to load exporter, format "%s" has no registered exporter.', $format)
-            );
-        }
-
-        return $this->container->get($this->serviceIds[$format]);
-    }
-}
diff --git a/lib/Core/Loader/InputProcessorLoader.php b/lib/Core/Loader/InputProcessorLoader.php
deleted file mode 100644
index 7ad0c048..00000000
--- a/lib/Core/Loader/InputProcessorLoader.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Loader;
-
-use Psr\Container\ContainerInterface;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Input\JsonInput;
-use Rollerworks\Component\Search\Input\NormStringQueryInput;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Rollerworks\Component\Search\Input\Validator;
-use Rollerworks\Component\Search\InputProcessor;
-
-/**
- * InputProcessorLoader provides lazy loading of Input processors.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class InputProcessorLoader
-{
-    /**
-     * @param ContainerInterface    $container  A PSR-11 compatible Service container
-     * @param array<string, string> $serviceIds Format alias to service-id mapping,
-     *                                          eg. 'json' => 'ServiceId of the container'
-     */
-    public function __construct(
-        private readonly ContainerInterface $container,
-        private readonly array $serviceIds,
-    ) {
-    }
-
-    /**
-     * Create a new InputProcessorLoader with the build-in InputProcessors loadable.
-     */
-    public static function create(?Validator $validator = null): self
-    {
-        return new self(
-            new ClosureContainer(
-                [
-                    'rollerworks_search.input.json' => static fn (): JsonInput => new JsonInput($validator),
-                    'rollerworks_search.input.string_query' => static fn (): StringQueryInput => new StringQueryInput($validator),
-                    'rollerworks_search.input.norm_string_query' => static fn (): NormStringQueryInput => new NormStringQueryInput($validator),
-                ]
-            ),
-            [
-                'json' => 'rollerworks_search.input.json',
-                'string_query' => 'rollerworks_search.input.string_query',
-                'norm_string_query' => 'rollerworks_search.input.norm_string_query',
-            ]
-        );
-    }
-
-    /**
-     * @throws \InvalidArgumentException when there is no input processor with the given name
-     */
-    public function get(string $name): InputProcessor
-    {
-        if (! isset($this->serviceIds[$name])) {
-            throw new InvalidArgumentException(
-                \sprintf('Enable to load input-processor, "%s" is not registered as processor.', $name)
-            );
-        }
-
-        return $this->container->get($this->serviceIds[$name]);
-    }
-}
diff --git a/lib/Core/Loader/ServiceNotFoundException.php b/lib/Core/Loader/ServiceNotFoundException.php
deleted file mode 100644
index d2f5fe06..00000000
--- a/lib/Core/Loader/ServiceNotFoundException.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Loader;
-
-use Psr\Container\NotFoundExceptionInterface;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-
-final class ServiceNotFoundException extends InvalidArgumentException implements NotFoundExceptionInterface
-{
-    public function __construct(string $id)
-    {
-        parent::__construct(\sprintf('You have requested a non-existent service "%s".', $id));
-    }
-}
diff --git a/lib/Core/ParameterBag.php b/lib/Core/ParameterBag.php
deleted file mode 100644
index 9386cf59..00000000
--- a/lib/Core/ParameterBag.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-class ParameterBag
-{
-    /** @var array<string, string> */
-    private array $parameters = [];
-
-    /**
-     * @param array<string, mixed> $parameters
-     */
-    public function __construct(array $parameters = [])
-    {
-        foreach ($parameters as $name => $value) {
-            $this->setParameter($name, $value);
-        }
-    }
-
-    public function setParameter(string $name, mixed $value): void
-    {
-        $this->parameters['{' . $name . '}'] = $value;
-    }
-
-    public function injectParameters($template): string
-    {
-        return str_replace(array_keys($this->parameters), array_values($this->parameters), (string) $template);
-    }
-}
diff --git a/lib/Core/PreloadedExtension.php b/lib/Core/PreloadedExtension.php
deleted file mode 100644
index d2ef7843..00000000
--- a/lib/Core/PreloadedExtension.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Field\FieldType;
-use Rollerworks\Component\Search\Field\FieldTypeExtension;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final readonly class PreloadedExtension implements SearchExtension
-{
-    /**
-     * @param array<string, FieldType>            $types
-     * @param array<string, FieldTypeExtension[]> $typeExtensions ['typeName' => [new MyTypeExtension()]
-     */
-    public function __construct(
-        private array $types,
-        private array $typeExtensions = [],
-    ) {
-    }
-
-    public function getType(string $name): FieldType
-    {
-        if (! isset($this->types[$name])) {
-            throw new InvalidArgumentException(
-                \sprintf('Type "%s" can not be loaded by this extension', $name)
-            );
-        }
-
-        return $this->types[$name];
-    }
-
-    public function hasType(string $name): bool
-    {
-        return isset($this->types[$name]);
-    }
-
-    public function getTypeExtensions(string $name): array
-    {
-        return $this->typeExtensions[$name] ?? [];
-    }
-}
diff --git a/lib/Core/README.md b/lib/Core/README.md
deleted file mode 100644
index 3548b24d..00000000
--- a/lib/Core/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-RollerworksSearch
-=================
-
-This package provides the core system of [RollerworksSearch][1].
-*See the main repository for full details and examples.*
-
-If you'd like to contribute to this project, please go the
-main [RollerworksSearch][1] repository and read the [Contributing][2] section.
-
-Installation
-------------
-
-To install this package, add the `rollerworks/search` to your composer.json
-
-```bash
-$ php composer.phar require rollerworks/search
-```
-
-License
--------
-
-The source of this package is subject to the MIT license that is bundled
-with this source code in the file [LICENSE](LICENSE).
-
-[1]: https://github.com/rollerworks/RollerworksSearch
-[2]: https://github.com/rollerworks/RollerworksSearch#contributing
diff --git a/lib/Core/Resources/translations/RollerworksSearch.en.xlf b/lib/Core/Resources/translations/RollerworksSearch.en.xlf
deleted file mode 100644
index 308b349b..00000000
--- a/lib/Core/Resources/translations/RollerworksSearch.en.xlf
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-    <file source-language="en" target-language="en" datatype="plaintext" original="RollerworksSearch.xlf">
-        <body>
-            <!-- Value types (all translated in lowercase) -->
-            <trans-unit id="1">
-                <source>FieldIdentification</source>
-                <target>field identification</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>StringValue</source>
-                <target>string-value</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>CompareOperator</source>
-                <target>compare-operator</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>Range</source>
-                <target>range</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>ExcludedValue</source>
-                <target>excluded-value</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>ExcludedRange</source>
-                <target>excluded-range</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>Compare</source>
-                <target>comparison</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>PatternMatch</source>
-                <target>pattern-matcher</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>end of string</source>
-                <target>end of string</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>line end</source>
-                <target>line end</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>lower</source>
-                <target>lower</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>upper</source>
-                <target>upper</target>
-            </trans-unit>
-            <!-- // -->
-
-            <!-- ErrorPathTranslator -->
-            <trans-unit id="13">
-                <source>At root level, group {{ group }}:</source>
-                <target>At root level, group {{ group }}:</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>At root level, field {{ field }}:</source>
-                <target>At root level, field {{ field }}:</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>At root level, field {{ field }} value position {{ position }} {{ type }}:</source>
-                <target>At root level, field {{ field }} value position {{ position }} {{ type }}:</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>At root level, field {{ field }} value position {{ position }}:</source>
-                <target>At root level, field {{ field }} value position {{ position }}:</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>In nested group {{ group }}, field {{ field }} value position {{ position }} {{ type }}:</source>
-                <target>In nested group {{ group }}, field {{ field }} value position {{ position }} {{ type }}:</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>In nested group {{ group }}, field {{ field }} value position {{ position }}:</source>
-                <target>In nested group {{ group }}, field {{ field }} value position {{ position }}:</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>In nested group {{ group }}, field {{ field }}:</source>
-                <target>In nested group {{ group }}, field {{ field }}:</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>In group {{ group }}, field {{ field }} value position {{ position }} {{ type }}:</source>
-                <target>In group {{ group }}, field {{ field }} value position {{ position }} {{ type }}:</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>In group {{ group }}, field {{ field }} value position {{ position }}:</source>
-                <target>In group {{ group }}, field {{ field }} value position {{ position }}:</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>In group {{ group }}, field {{ field }}:</source>
-                <target>In group {{ group }}, field {{ field }}:</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>Nested group {{ group }}:</source>
-                <target>Nested group {{ group }}:</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>Group {{ group }}::</source>
-                <target>Group {{ group }}::</target>
-            </trans-unit>
-            <!-- // -->
-
-            <trans-unit id="STRING_SYNTAX_ERROR_EXPECTED">
-                <source>[Syntax Error] line {{ line }} col {{ column }}: Expected {{ expected }}, got {{ got }}.</source>
-                <target>[Syntax Error] line {{ line }} col {{ column }}: Expected {{ expected }}, got {{ got }}.</target>
-            </trans-unit>
-            <trans-unit id="STRING_SYNTAX_ERROR_UNEXPECTED">
-                <source>[Syntax Error] line {{ line }} col {{ column }}: Unexpected {{ unexpected }}.</source>
-                <target>[Syntax Error] line {{ line }} col {{ column }}: Unexpected {{ unexpected }}.</target>
-            </trans-unit>
-            <trans-unit id="STRING_FORMAT_ERROR">
-                <source>[Format Error] line {{ line }} col {{ column }}: {{ message }}.</source>
-                <target>[Format Error] line {{ line }} col {{ column }}: {{ message }}.</target>
-            </trans-unit>
-            <trans-unit id="FIELD_REQUIRES_VALUES">
-                <source>A field must have at least one value</source>
-                <target>A field must have at least one value</target>
-            </trans-unit>
-            <trans-unit id="INCORRECT_VALUES_SEPARATOR">
-                <source>Values must be separated by a ",". A values list must end with ";" or ")"</source>
-                <target>Values must be separated by a ",". A values list must end with ";" or ")"</target>
-            </trans-unit>
-            <trans-unit id="CANNOT_CLOSE_UNOPENED_GROUP">
-                <source>Cannot close group as this field is not in a group</source>
-                <target>Cannot close group as this field is not in a group</target>
-            </trans-unit>
-            <trans-unit id="GROUP_LOGICAL_WITHOUT_GROUP">
-                <source>A group logical operator can only be used at the start of the input or before a group opening</source>
-                <target>A group logical operator can only be used at the start of the input or before a group opening</target>
-            </trans-unit>
-            <trans-unit id="UNKNOWN_PATTERN_MATCH_FLAG">
-                <source>Unknown operator flag, expected "i" and/or "!"</source>
-                <target>Unknown operator flag, expected "i" and/or "!"</target>
-            </trans-unit>
-            <trans-unit id="NO_SPACES_IN_OPERATOR">
-                <source>Spaces are not allowed within an operator</source>
-                <target>Spaces are not allowed within an operator</target>
-            </trans-unit>
-            <trans-unit id="INCOMPLETE_VALUE_PATTERN">
-                <source>Missing operator and value pattern</source>
-                <target>Missing operator and value pattern</target>
-            </trans-unit>
-            <trans-unit id="SPACES_REQ_QUOTING">
-                <source>A value containing spaces must be surrounded by quotes</source>
-                <target>A value containing spaces must be surrounded by quotes</target>
-            </trans-unit>
-            <trans-unit id="SPECIAL_CHARS_REQ_QUOTING">
-                <source>A value containing special characters must be surrounded by quotes</source>
-                <target>A value containing special characters must be surrounded by quotes</target>
-            </trans-unit>
-            <trans-unit id="QUOTED_VALUE_REQUIRE_QUOTING">
-                <source>A value containing quotes must be surrounded by quotes</source>
-                <target>A value containing quotes must be surrounded by quotes</target>
-            </trans-unit>
-            <trans-unit id="VALUE_QUOTES_MUST_ESCAPE">
-                <source>Quotes in a quoted value must be escaped</source>
-                <target>Quotes in a quoted value must be escaped</target>
-            </trans-unit>
-            <trans-unit id="MISSING_END_QUOTE">
-                <source>Missing quote to end the value</source>
-                <target>Missing quote to end the value</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/lib/Core/Resources/translations/RollerworksSearch.nl.xlf b/lib/Core/Resources/translations/RollerworksSearch.nl.xlf
deleted file mode 100644
index cc023878..00000000
--- a/lib/Core/Resources/translations/RollerworksSearch.nl.xlf
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-    <file source-language="en" target-language="nl" datatype="plaintext" original="RollerworksSearch.xlf">
-        <body>
-            <!-- Value types (all translated in lowercase) -->
-            <trans-unit id="1">
-                <source>FieldIdentification</source>
-                <target>veldidentificatie</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>StringValue</source>
-                <target>tekstwaarde</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>CompareOperator</source>
-                <target>vergelijk-operator</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>Range</source>
-                <target>bereik</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>ExcludedValue</source>
-                <target>uitgesloten waarde</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>ExcludedRange</source>
-                <target>uitgesloten bereik</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>Compare</source>
-                <target>vergelijking</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>PatternMatch</source>
-                <target>patroonvergelijking</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>end of string</source>
-                <target>einde van tekst</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>line end</source>
-                <target>lijn einde</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>lower</source>
-                <target>onderste</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>upper</source>
-                <target>bovenste</target>
-            </trans-unit>
-            <!-- // -->
-
-            <!-- ErrorPathTranslator -->
-            <trans-unit id="13">
-                <source>At root level, group {{ group }}:</source>
-                <target>Op hoofdniveau, groep {{ group }}:</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>At root level, field {{ field }}:</source>
-                <target>Op hoofdniveau, veld {{ field }}:</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>At root level, field {{ field }} value position {{ position }} {{ type }}:</source>
-                <target>Op hoofdniveau, veld {{ field }} waarde positie {{ position }} {{ type }}:</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>At root level, field {{ field }} value position {{ position }}:</source>
-                <target>Op hoofdniveau, veld {{ field }} waarde positie {{ position }}:</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>In nested group {{ group }}, field {{ field }} value position {{ position }} {{ type }}:</source>
-                <target>In geneste groep {{ group }}, veld {{ field }} waarde positie {{ position }} {{ type }}:</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>In nested group {{ group }}, field {{ field }} value position {{ position }}:</source>
-                <target>In geneste groep {{ group }}, veld {{ field }} waarde positie {{ position }}:</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>In nested group {{ group }}, field {{ field }}:</source>
-                <target>In geneste groep {{ group }}, veld {{ field }}:</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>In group {{ group }}, field {{ field }} value position {{ position }} {{ type }}:</source>
-                <target>In groep {{ group }}, veld {{ field }} waarde positie {{ position }} {{ type }}:</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>In group {{ group }}, field {{ field }} value position {{ position }}:</source>
-                <target>In groep {{ group }}, veld {{ field }} waarde positie {{ position }}:</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>In group {{ group }}, field {{ field }}:</source>
-                <target>In groep {{ group }}, veld {{ field }}:</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>Nested group {{ group }}:</source>
-                <target>Geneste groep {{ group }}:</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>Group {{ group }}:</source>
-                <target>Groep {{ group }}:</target>
-            </trans-unit>
-            <!-- // -->
-
-            <trans-unit id="STRING_SYNTAX_ERROR_EXPECTED">
-                <source>[Syntax Error] line {{ line }} col {{ column }}: Expected {{ expected }}, got {{ got }}.</source>
-                <target>[Syntaxisfout] regel {{ line }} kolom {{ column }}: Verwacht {{ expected }}, kreeg {{ got }}.</target>
-            </trans-unit>
-            <trans-unit id="STRING_SYNTAX_ERROR_UNEXPECTED">
-                <source>[Syntax Error] line {{ line }} col {{ column }}: Unexpected {{ unexpected }}.</source>
-                <target>[Syntaxisfout] regel {{ line }} kolom {{ column }}: Onverwachte {{ unexpected }}.</target>
-            </trans-unit>
-            <trans-unit id="STRING_FORMAT_ERROR">
-                <source>[Format Error] line {{ line }} col {{ column }}: {{ message }}.</source>
-                <target>[Opmaakfout] regel {{ line }} kolom {{ column }}: {{ message }}.</target>
-            </trans-unit>
-            <trans-unit id="FIELD_REQUIRES_VALUES">
-                <source>A field must have at least one value</source>
-                <target>Een veld moet ten minste één waarde hebben.</target>
-            </trans-unit>
-            <trans-unit id="INCORRECT_VALUES_SEPARATOR">
-                <source>Values must be separated by a ",". A values list must end with ";" or ")"</source>
-                <target>Waardes moeten gescheiden zijn met een ",". Een waarden lijst moet eindigen met ";" of ")".</target>
-            </trans-unit>
-            <trans-unit id="CANNOT_CLOSE_UNOPENED_GROUP">
-                <source>Cannot close group as this field is not in a group</source>
-                <target>Kan groep niet sluiten omdat dit veld zich niet in een groep bevindt</target>
-            </trans-unit>
-            <trans-unit id="GROUP_LOGICAL_WITHOUT_GROUP">
-                <source>A group logical operator can only be used at the start of the input or before a group opening</source>
-                <target>Een groepslogische operator kan alleen aan het begin van de invoer of vóór een groepsopening worden gebruikt</target>
-            </trans-unit>
-            <trans-unit id="UNKNOWN_PATTERN_MATCH_FLAG">
-                <source>Unknown operator flag, expected "i" and/or "!"</source>
-                <target>Onbekende operator vlag, verwacht "i" en/of "!"</target>
-            </trans-unit>
-            <trans-unit id="NO_SPACES_IN_OPERATOR">
-                <source>Spaces are not allowed within an operator</source>
-                <target>Spaties zijn niet toegestaan binnen een operator</target>
-            </trans-unit>
-            <trans-unit id="INCOMPLETE_VALUE_PATTERN">
-                <source>Missing operator and value pattern</source>
-                <target>Ontbrekende operator en waardepatroon</target>
-            </trans-unit>
-            <trans-unit id="SPACES_REQ_QUOTING">
-                <source>A value containing spaces must be surrounded by quotes</source>
-                <target>Een waarde met spaties, moet tussen aanhalingstekens worden geplaatst</target>
-            </trans-unit>
-            <trans-unit id="SPECIAL_CHARS_REQ_QUOTING">
-                <source>A value containing special characters must be surrounded by quotes</source>
-                <target>Een waarde met speciale tekens, moet tussen aanhalingstekens worden geplaatst</target>
-            </trans-unit>
-            <trans-unit id="QUOTED_VALUE_REQUIRE_QUOTING">
-                <source>A value containing quotes must be surrounded by quotes</source>
-                <target>Een waarde met aanhalingstekens, moet tussen aanhalingstekens worden geplaatst</target>
-            </trans-unit>
-            <trans-unit id="VALUE_QUOTES_MUST_ESCAPE">
-                <source>Quotes in a quoted value must be escaped</source>
-                <target>Aanhalingstekens in een aangehaalde waarde moeten worden geëscaped</target>
-            </trans-unit>
-            <trans-unit id="MISSING_END_QUOTE">
-                <source>Missing quote to end the value</source>
-                <target>Ontbrekend aanhalingsteken om de waarde te beëindigen</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/lib/Core/Resources/translations/validators.en.xlf b/lib/Core/Resources/translations/validators.en.xlf
deleted file mode 100644
index 608b2600..00000000
--- a/lib/Core/Resources/translations/validators.en.xlf
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-    <file source-language="en" target-language="en" datatype="plaintext" original="validators.xliff">
-        <body>
-            <trans-unit id="1">
-                <source>No default field configured. Please provide a field name.</source>
-                <target>No default field configured. Please provide a field name.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>The field {{ field }} is not registered in the FieldSet or available as alias.</source>
-                <target>The field {{ field }} is not registered in the FieldSet or available as alias.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>The field {{ field }} only accepts a single simple value.</source>
-                <target>The field {{ field }} only accepts a single simple value.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>The lower range value {{ lower }} should be lower than the upper range value {{ upper }}.</source>
-                <target>The lower range value {{ lower }} should be lower than the upper range value {{ upper }}.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>This group exceeds maximum nesting level of {{ max }}.</source>
-                <target>This group exceeds maximum nesting level of {{ max }}.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>This group exceeds maximum number of groups {{ max }}.</source>
-                <target>This group exceeds maximum number of groups {{ max }}.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>This value exceeds the maximum number of values. Maximum values are {{ max }}.</source>
-                <target>This value exceeds the maximum number of values. Maximum values are {{ max }}.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>The field {{ field }} does not accept {{ type }} values.</source>
-                <target>The field {{ field }} does not accept {{ type }} values.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This value is not a valid birthday or age.</source>
-                <target>This value is not a valid birthday or age.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This value is not a valid birthday.</source>
-                <target>This value is not a valid birthday.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid datetime or date interval.</source>
-                <target>This value is not a valid datetime or date interval.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>This value is not a valid datetime.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid sorting direction. Accepted directions are: {{ directions }}.</source>
-                <target>This value is not a valid sorting direction. Accepted directions are: {{ directions }}.</target>
-            </trans-unit>
-
-            <trans-unit id="ORDER_CLAUSE_NOT_IN_GROUP">
-                <source>Order clauses cannot be placed in a group.</source>
-                <target>Order clauses cannot be placed in a group.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/lib/Core/Resources/translations/validators.nl.xlf b/lib/Core/Resources/translations/validators.nl.xlf
deleted file mode 100644
index b3f37028..00000000
--- a/lib/Core/Resources/translations/validators.nl.xlf
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-    <file source-language="en" target-language="nl" datatype="plaintext" original="validators.xliff">
-        <body>
-            <trans-unit id="1">
-                <source>No default field configured. Please provide a field name.</source>
-                <target>Geen standaard veld geconfigureerd. Vul een veldnaam in.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>The field {{ field }} is not registered in the FieldSet or available as alias.</source>
-                <target>Veld {{ field }} is niet geregistreerd in de velden set en is niet beschikbaar als alias.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>The field {{ field }} only accepts a single simple value.</source>
-                <target>Het veld {{ field }} accepteert alleen één eenvoudige waarde.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>The lower range value {{ lower }} should be lower than the upper range value {{ upper }}.</source>
-                <target>De onderste bereik waarde {{ lower }} moet lager zijn dan de bovenste bereik waarde {{ upper }}.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>This group exceeds maximum nesting level of {{ max }}.</source>
-                <target>Deze groep overschrijdt het maximale nestingsniveau van {{ max }}.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>This group exceeds maximum number of groups {{ max }}.</source>
-                <target>Deze groep overschrijdt maximum aantal groepen {{ max }}.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>This value exceeds the maximum number of values. Maximum values are {{ max }}.</source>
-                <target>Deze waarde overschrijdt het maximum aantal waarden. Maximale waardes zijn {{ max }}.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>The field {{ field }} does not accept {{ type }} values.</source>
-                <target>Het veld {{ field }} accepteert geen {{ type }} waarden.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This value is not a valid birthday or age.</source>
-                <target>Deze waarde is geen geldige leeftijd of geboortedatum.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This value is not a valid birthday.</source>
-                <target>Deze waarde is geen geldige geboortedatum.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid datetime or date interval.</source>
-                <target>Deze waarde is geen geldige datum-tijd of datuminterval.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Deze waarde is geen geldige datum en tijd.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid sorting direction. Accepted directions are: {{ directions }}.</source>
-                <target>Deze waarde is geen geldige sorteer richting. De geaccepteerde richtingen zijn: {{ directions }}.</target>
-            </trans-unit>
-
-            <trans-unit id="ORDER_CLAUSE_NOT_IN_GROUP">
-                <source>Order clauses cannot be placed in a group.</source>
-                <target>Volgorde clausules kunnen niet in een groep worden geplaatst.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/lib/Core/SearchCondition.php b/lib/Core/SearchCondition.php
deleted file mode 100644
index e341fe84..00000000
--- a/lib/Core/SearchCondition.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\UnsupportedFieldSetException;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * SearchCondition contains the searching conditions and FieldSet.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class SearchCondition
-{
-    private ?SearchPrimaryCondition $primaryCondition = null;
-    private ?SearchOrder $order = null;
-
-    public function __construct(
-        private readonly FieldSet $fieldSet,
-        private readonly ValuesGroup $values,
-    ) {
-    }
-
-    public function getFieldSet(): FieldSet
-    {
-        return $this->fieldSet;
-    }
-
-    public function getValuesGroup(): ValuesGroup
-    {
-        return $this->values;
-    }
-
-    /**
-     * @return $this
-     */
-    public function setPrimaryCondition(?SearchPrimaryCondition $condition): self
-    {
-        $this->primaryCondition = $condition;
-
-        return $this;
-    }
-
-    public function getPrimaryCondition(): ?SearchPrimaryCondition
-    {
-        return $this->primaryCondition;
-    }
-
-    /**
-     * @return $this
-     */
-    public function setOrder(?SearchOrder $order): self
-    {
-        $this->order = $order;
-
-        return $this;
-    }
-
-    public function getOrder(): ?SearchOrder
-    {
-        return $this->order;
-    }
-
-    public function isEmpty(): bool
-    {
-        return $this->order === null && \count($this->values->getGroups()) === 0 && \count($this->values->getFields()) === 0;
-    }
-
-    /**
-     * Checks that the FieldSet of this condition is supported
-     * by the contexts it's used in.
-     *
-     * @param string ...$name One or more FieldSet names to check for
-     */
-    public function assertFieldSetName(string ...$name): void
-    {
-        if (! \in_array($providedName = $this->fieldSet->getSetName(), $name, true)) {
-            throw new UnsupportedFieldSetException($name, $providedName);
-        }
-    }
-}
diff --git a/lib/Core/SearchConditionBuilder.php b/lib/Core/SearchConditionBuilder.php
deleted file mode 100644
index c422facf..00000000
--- a/lib/Core/SearchConditionBuilder.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\Input\AbstractInput;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-final class SearchConditionBuilder
-{
-    /** @var array<string, 'ASC'|'DESC'> */
-    private ?array $order = [];
-
-    private ValuesGroup $valuesGroup;
-    private ?self $primaryCondition = null;
-
-    /**
-     * @param string $logical eg. one of the following ValuesGroup class constants value:
-     *                        GROUP_LOGICAL_OR or GROUP_LOGICAL_AND
-     */
-    public static function create(FieldSet $fieldSet, string $logical = ValuesGroup::GROUP_LOGICAL_AND): self
-    {
-        return new self($logical, $fieldSet);
-    }
-
-    private function __construct(
-        string $logical,
-        private readonly FieldSet $fieldSet,
-        private readonly ?self $parent = null,
-    ) {
-        $this->valuesGroup = new ValuesGroup($logical);
-    }
-
-    /**
-     * @param ValuesGroup::GROUP_LOGICAL_* $logical
-     *
-     * @return $this
-     */
-    public function setGroupLogical(string $logical): self
-    {
-        $this->valuesGroup->setGroupLogical($logical);
-
-        return $this;
-    }
-
-    /**
-     * Add the result-ordering of the (primary) search condition
-     * and returns the SearchConditionBuilder.
-     *
-     * Note: This method can only be used at the root-level of the condition,
-     * or at the root-level of a primary condition. Unlike the other methods
-     * this doesn't require calling end() to close the condition level.
-     *
-     * ```
-     * ->order('@name', 'ASC')
-     * ->order('@id', 'DESC')
-     * ->field('name')
-     *   ->addSimpleValue('my value')
-     *   ->addSimpleValue('my value 2')
-     * ->end() // return to the ValuesGroupBuilder or SearchConditionBuilder
-     * ```
-     *
-     * Or (with primary condition)
-     *
-     * ```
-     * ->order('@name', 'ASC')
-     * ->primaryCondition()
-     *     ->order('@id', 'DESC')
-     * ->end() // Returns to the main condition
-     * ```
-     *
-     * @param string                         $name      The field-name (must be a valid known ordering field like "@id")
-     * @param 'asc'|'desc'|'ASC'|'DESC'|null $direction Use null to remove the ordering for the field
-     *
-     * @return $this
-     */
-    public function order(string $name, ?string $direction = 'ASC'): self
-    {
-        if ($this->parent && $this->parent->primaryCondition !== $this) {
-            throw new BadMethodCallException('Cannot add ordering at nested levels.');
-        }
-
-        if (! OrderField::isOrder($name)) {
-            throw new InvalidArgumentException(\sprintf('Field "%s" is not a valid ordering field. Expected either "@%1$s".', $name));
-        }
-
-        $this->fieldSet->get($name);
-
-        if ($direction === null) {
-            unset($this->order[$name]);
-
-            return $this;
-        }
-
-        $direction = mb_strtoupper($direction);
-
-        if (! \in_array($direction, ['DESC', 'ASC'], true)) {
-            throw new InvalidArgumentException(\sprintf('Invalid direction provided "%s" for field "%s", must be either "ASC" OR "DESC" (case insensitive).', $direction, $name));
-        }
-
-        $this->order[$name] = $direction;
-
-        return $this;
-    }
-
-    /**
-     * Clears all the field sorting-orders (if any).
-     *
-     * @return $this
-     */
-    public function clearOrder(): self
-    {
-        $this->order = [];
-
-        return $this;
-    }
-
-    /**
-     * Create a new ValuesGroup level and returns a SearchConditionBuilder instance
-     * for for building the nested group structure.
-     *
-     * Afterwards the group can be expended with fields or additional subgroups:
-     *
-     * ```
-     * ->group()
-     *     ->field('name')
-     *         ->...
-     *     ->end() // return to the ValuesGroup.
-     * ->end() // return to the parent ValuesGroup level
-     * ```
-     *
-     * Note: Groups cannot be altered or removed with the builder after creation.
-     *
-     * @param string $logical eg. one of the following ValuesGroup class constants value:
-     *                        GROUP_LOGICAL_OR or GROUP_LOGICAL_AND
-     */
-    public function group(string $logical = ValuesGroup::GROUP_LOGICAL_AND): self
-    {
-        $builder = new self($logical, $this->fieldSet, $this);
-        $this->valuesGroup->addGroup($builder->valuesGroup);
-
-        return $builder;
-    }
-
-    /**
-     * Add/expend a field's ValuesBag on 'this' ValuesGroup and returns
-     * a ValuesBagBuilder for adding values to the field.
-     *
-     * Note: Values must be in the model format, they are not transformed!
-     *
-     * The ValuesBagBuilder is subset of ValuesBag, which provides a developer
-     * friendly interface to construct a ValuesBag structure for the field.
-     *
-     * ```
-     * ->field('name')
-     *   ->addSimpleValue('my value')
-     *   ->addSimpleValue('my value 2')
-     * ->end() // return to the ValuesGroup level
-     * ```
-     */
-    public function field(string $name): ValuesBagBuilder
-    {
-        if (OrderField::isOrder($name)) {
-            throw new InvalidArgumentException(\sprintf('Unable to configure ordering of "%s" with field(), use the order() method instead.', $name));
-        }
-
-        if ($this->valuesGroup->hasField($name)) {
-            /** @var ValuesBagBuilder $valuesBag */
-            $valuesBag = $this->valuesGroup->getField($name);
-        } else {
-            $this->fieldSet->get($name);
-
-            $valuesBag = new ValuesBagBuilder($this);
-            $this->valuesGroup->addField($name, $valuesBag);
-        }
-
-        return $valuesBag;
-    }
-
-    /**
-     * Add/overwrites a field's ValuesBag on this ValuesGroup and returns
-     * a ValuesBagBuilder for adding values to the field.
-     *
-     * Note: Values must be in the model format, they are not transformed!
-     *
-     * The ValuesBagBuilder is subset of ValuesBag, which provides a developer
-     * friendly interface to construct a ValuesBag structure for the field.
-     *
-     * ```
-     * ->overwriteField('name')
-     *   ->addSimpleValue('my value')
-     *   ->addSimpleValue('my value 2')
-     * ->end() // return to the ValuesGroup level
-     * ```
-     */
-    public function overwriteField(string $name): ValuesBagBuilder
-    {
-        if (OrderField::isOrder($name)) {
-            throw new InvalidArgumentException(\sprintf('Unable to configure ordering of "%s" with overwriteField(), use the order() method instead. Call clearOrder() if you need to remove previously set orderings.', $name));
-        }
-
-        $this->fieldSet->get($name);
-
-        $valuesBag = new ValuesBagBuilder($this);
-        $this->valuesGroup->addField($name, $valuesBag);
-
-        return $valuesBag;
-    }
-
-    /**
-     * Close the condition building level (field or group) and return
-     * to the previous builder level.
-     */
-    public function end(): self
-    {
-        return $this->parent ?? $this;
-    }
-
-    /**
-     * Build a SearchPrimaryCondition structure.
-     *
-     * Note: This will overwrite any existing primary-condition of this builder.
-     *
-     * @return self A SearchConditionBuilder for the primary-condition structure
-     *
-     * @throws BadMethodCallException when called at a nested level
-     */
-    public function primaryCondition(): self
-    {
-        if ($this->parent) {
-            throw new BadMethodCallException('Cannot add primaryCondition at nested level.');
-        }
-
-        $builder = new self(ValuesGroup::GROUP_LOGICAL_AND, $this->fieldSet, $this);
-        $this->primaryCondition = $builder;
-
-        return $builder;
-    }
-
-    /**
-     * Build and returns the SearchCondition object using the groups and fields.
-     *
-     * Tip: This method can be called at any level, explicitly calling end() is not required.
-     */
-    public function getSearchCondition(): SearchCondition
-    {
-        if ($this->parent) {
-            return $this->parent->getSearchCondition();
-        }
-
-        // This the root of the condition so now traverse back up the hierarchy.
-        // We need to re-create the condition using actual objects.
-        $rootValuesGroup = new ValuesGroup($this->valuesGroup->getGroupLogical());
-        $this->normalizeValueGroup($this->valuesGroup, $rootValuesGroup);
-
-        $searchCondition = new SearchCondition($this->fieldSet, $rootValuesGroup);
-
-        if ($this->order) {
-            $searchCondition->setOrder(new SearchOrder($this->order));
-        }
-
-        $searchCondition->setPrimaryCondition($this->getPrimaryCondition());
-
-        AbstractInput::finalizeOrdering($searchCondition);
-
-        return $searchCondition;
-    }
-
-    /**
-     * Normalize the SearchConditionBuilder structure to a ValuesGroup structure
-     * that can be used by the SearchCondition.
-     *
-     * Otherwise the final SearchCondition would contain a SearchConditionBuilder instance.
-     */
-    private function normalizeValueGroup(ValuesGroup $currentValuesGroup, ValuesGroup $rootValuesGroup): void
-    {
-        foreach ($currentValuesGroup->getGroups() as $group) {
-            $subGroup = new ValuesGroup($group->getGroupLogical());
-            $this->normalizeValueGroup($group, $subGroup);
-
-            $rootValuesGroup->addGroup($subGroup);
-        }
-
-        foreach ($currentValuesGroup->getFields() as $name => $values) {
-            if ($values instanceof ValuesBagBuilder) {
-                $values = $values->toValuesBag();
-            }
-
-            $rootValuesGroup->addField($name, $values);
-        }
-    }
-
-    /**
-     * Gets the resolved SearchPrimaryCondition (if any).
-     *
-     * This method can be used as an alternative to getSearchCondition()
-     * if you (only) need to get the PrimaryCondition.
-     */
-    public function getPrimaryCondition(): ?SearchPrimaryCondition
-    {
-        if (! $this->primaryCondition) {
-            return null;
-        }
-
-        $rootValuesGroup = new ValuesGroup($this->primaryCondition->valuesGroup->getGroupLogical());
-        $this->normalizeValueGroup($this->primaryCondition->valuesGroup, $rootValuesGroup);
-
-        $primaryCondition = new SearchPrimaryCondition($rootValuesGroup);
-
-        if ($this->primaryCondition->order) {
-            $primaryCondition->setOrder(new SearchOrder($this->primaryCondition->order));
-        }
-
-        return $primaryCondition;
-    }
-
-    public function __serialize(): array
-    {
-        throw new \LogicException('Unable serialize a SearchConditionBuilder. Call getSearchCondition() and serialize the SearchCondition itself.');
-    }
-}
diff --git a/lib/Core/SearchConditionSerializer.php b/lib/Core/SearchConditionSerializer.php
deleted file mode 100644
index ccf4daa4..00000000
--- a/lib/Core/SearchConditionSerializer.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-
-/**
- * SearchConditionSerializer, serializes a search condition for persistent storage.
- *
- * In practice this serializes the root ValuesGroup and of the condition
- * and bundles it with the FieldSet-name for further unserializing.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class SearchConditionSerializer
-{
-    public function __construct(
-        private readonly SearchFactory $searchFactory,
-    ) {
-    }
-
-    /**
-     * Serialize a SearchCondition.
-     *
-     * The returned value is an array you can safely serialize yourself.
-     * This is not done already because storing a serialized SearchCondition
-     * in a php session would serialize the serialized result again.
-     *
-     * Caution: The FieldSet must be loadable from the SearchFactory.
-     *
-     * @return array{0: string, 1: string} ['FieldSet-name', 'serialized ValuesGroup object']
-     */
-    public function serialize(SearchCondition $searchCondition): array
-    {
-        $setName = $searchCondition->getFieldSet()->getSetName();
-
-        return [$setName, serialize($searchCondition->getValuesGroup())];
-    }
-
-    /**
-     * Unserialize a serialized SearchCondition.
-     *
-     * @param array{0: string, 1: string} $searchCondition [FieldSet-name, serialized ValuesGroup object]
-     *
-     * @throws InvalidArgumentException when serialized SearchCondition is invalid
-     *                                  (invalid structure or failed to unserialize)
-     */
-    public function unserialize(array $searchCondition): SearchCondition
-    {
-        if (\count($searchCondition) !== 2 || ! isset($searchCondition[0], $searchCondition[1])) {
-            throw new InvalidArgumentException(
-                'Serialized search condition must be exactly two values ["FieldSet-name", "serialized ValuesGroup"].'
-            );
-        }
-
-        $fieldSet = $this->searchFactory->createFieldSet($searchCondition[0]);
-
-        set_error_handler(static function (int $errNo, string $errstr, string $errFile, int $errLine): void {
-            throw new InvalidArgumentException('Unable to unserialize invalid value.', $errNo, new \ErrorException($errstr, $errNo, $errNo, $errFile, $errLine));
-        });
-
-        try {
-            return new SearchCondition($fieldSet, unserialize($searchCondition[1], ['allowed_classes' => true]));
-        } finally {
-            restore_error_handler();
-        }
-    }
-}
diff --git a/lib/Core/SearchExtension.php b/lib/Core/SearchExtension.php
deleted file mode 100644
index 3efe88bf..00000000
--- a/lib/Core/SearchExtension.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Field\FieldType;
-use Rollerworks\Component\Search\Field\FieldTypeExtension;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface SearchExtension
-{
-    /**
-     * Returns a type by name.
-     *
-     * @throws Exception\InvalidArgumentException if the given type is not supported by this extension
-     */
-    public function getType(string $name): FieldType;
-
-    /**
-     * Returns whether the given type is supported.
-     */
-    public function hasType(string $name): bool;
-
-    /**
-     * Returns the extensions for the given type.
-     *
-     * @return FieldTypeExtension[]
-     */
-    public function getTypeExtensions(string $name): array;
-}
diff --git a/lib/Core/SearchFactory.php b/lib/Core/SearchFactory.php
deleted file mode 100644
index 18d4ec8f..00000000
--- a/lib/Core/SearchFactory.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Field\FieldConfig;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface SearchFactory
-{
-    /**
-     * Create a new FieldSet instance with the configurator name
-     * as FieldSet name.
-     *
-     * @param FieldSetConfigurator|string $configurator Configurator for building the FieldSet,
-     *                                                  a string will be resolved to a configurator
-     */
-    public function createFieldSet($configurator): FieldSet;
-
-    /**
-     * @param string $name    Name of the field
-     * @param string $type    Type of the field
-     * @param array  $options Array of options for building the field
-     */
-    public function createField(string $name, string $type, array $options = []): FieldConfig;
-
-    public function createFieldSetBuilder(): FieldSetBuilder;
-
-    public function getSerializer(): SearchConditionSerializer;
-}
diff --git a/lib/Core/SearchFactoryBuilder.php b/lib/Core/SearchFactoryBuilder.php
deleted file mode 100644
index b1cba795..00000000
--- a/lib/Core/SearchFactoryBuilder.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Field\FieldType;
-use Rollerworks\Component\Search\Field\FieldTypeExtension;
-use Rollerworks\Component\Search\Field\GenericResolvedFieldTypeFactory;
-use Rollerworks\Component\Search\Field\GenericTypeRegistry;
-use Rollerworks\Component\Search\Field\ResolvedFieldTypeFactory;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class SearchFactoryBuilder
-{
-    private ?ResolvedFieldTypeFactory $resolvedTypeFactory = null;
-
-    /** @var SearchExtension[] */
-    private array $extensions = [];
-
-    /** @var FieldType[] */
-    private array $types = [];
-
-    /** @var array<string, FieldTypeExtension[]> */
-    private array $typeExtensions = [];
-
-    private ?FieldSetRegistry $fieldSetRegistry = null;
-
-    /**
-     * Sets the factory for creating {@see ResolvedFieldType} instances.
-     *
-     * @return $this The builder
-     */
-    public function setResolvedTypeFactory(ResolvedFieldTypeFactory $resolvedTypeFactory)
-    {
-        $this->resolvedTypeFactory = $resolvedTypeFactory;
-
-        return $this;
-    }
-
-    /**
-     * Set the FieldSetRegistry to use for loading FieldSetConfigurators.
-     */
-    public function setFieldSetRegistry(FieldSetRegistry $fieldSetRegistry): self
-    {
-        $this->fieldSetRegistry = $fieldSetRegistry;
-
-        return $this;
-    }
-
-    /**
-     * Adds an extension to be loaded by the factory.
-     *
-     * @return $this The builder
-     */
-    public function addExtension(SearchExtension $extension): self
-    {
-        $this->extensions[] = $extension;
-
-        return $this;
-    }
-
-    /**
-     * Adds a list of extensions to be loaded by the factory.
-     *
-     * @param SearchExtension[] $extensions
-     *
-     * @return $this The builder
-     */
-    public function addExtensions(array $extensions): self
-    {
-        $this->extensions = array_merge($this->extensions, $extensions);
-
-        return $this;
-    }
-
-    /**
-     * Adds a field type to the factory.
-     *
-     * @return $this The builder
-     */
-    public function addType(FieldType $type): self
-    {
-        $this->types[$type::class] = $type;
-
-        return $this;
-    }
-
-    /**
-     * Adds a list of field types to the factory.
-     *
-     * @param FieldType[] $types
-     *
-     * @return $this The builder
-     */
-    public function addTypes(array $types): self
-    {
-        foreach ($types as $type) {
-            $this->types[$type::class] = $type;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds a field type extension to the factory.
-     *
-     * @return $this The builder
-     */
-    public function addTypeExtension(FieldTypeExtension $typeExtension): self
-    {
-        $this->typeExtensions[$typeExtension->getExtendedType()][] = $typeExtension;
-
-        return $this;
-    }
-
-    /**
-     * Adds a list of field type extension to the factory.
-     *
-     * @param FieldTypeExtension[] $typeExtensions
-     *
-     * @return $this The builder
-     */
-    public function addTypeExtensions(array $typeExtensions): self
-    {
-        foreach ($typeExtensions as $typeExtension) {
-            $this->typeExtensions[$typeExtension->getExtendedType()][] = $typeExtension;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Builds and returns the factory.
-     */
-    public function getSearchFactory(): SearchFactory
-    {
-        $extensions = $this->extensions;
-
-        if (\count($this->types) > 0 || \count($this->typeExtensions) > 0) {
-            $extensions[] = new PreloadedExtension($this->types, $this->typeExtensions);
-        }
-
-        $resolvedTypeFactory = $this->resolvedTypeFactory ?? new GenericResolvedFieldTypeFactory();
-        $registry = new GenericTypeRegistry($extensions, $resolvedTypeFactory);
-
-        return new GenericSearchFactory($registry, $this->fieldSetRegistry ?? LazyFieldSetRegistry::create());
-    }
-}
diff --git a/lib/Core/SearchOrder.php b/lib/Core/SearchOrder.php
deleted file mode 100644
index 51b807d0..00000000
--- a/lib/Core/SearchOrder.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @author Dalibor Karlović <dalibor@flexolabs.io>
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * @psalm-type Sorting = array<string, 'asc'|'desc'>
- */
-final class SearchOrder
-{
-    /** @psalm-var Sorting */
-    private readonly array $fields;
-
-    /** @psalm-var Sorting */
-    private readonly array $prepend;
-
-    /** @psalm-var Sorting */
-    private readonly array $append;
-
-    /** @psalm-var Sorting */
-    private array $finalSorting;
-
-    private readonly ValuesGroup $valuesGroup;
-
-    /**
-     * Creates a new SearchOrder.
-     *
-     * The $prepend fields always appear first in the sorting order.
-     * The $append fields always appear last in the sorting order.
-     *
-     * Any fields added with $values will always overwrite the values provided
-     * in $prepend and $append, while keeping there original position.
-     *
-     * @param ValuesGroup|array<string, 'desc'|'asc'|'DESC'|'ASC'> $values
-     * @param array<string, 'desc'|'asc'|'DESC'|'ASC'>             $prepend
-     * @param array<string, 'desc'|'asc'|'DESC'|'ASC'>             $append
-     */
-    public function __construct(
-        ValuesGroup | array $values,
-        array $prepend = [],
-        array $append = [],
-    ) {
-        if ($values instanceof ValuesGroup) {
-            trigger_deprecation('rollerworks/search', '2.0-BETA14', 'Passing a "%s" to "%s()" is deprecated, pass an associative array fields and there directions instead.', ValuesGroup::class, __METHOD__);
-
-            if ($values->hasGroups()) {
-                throw new InvalidArgumentException('A SearchOrder must have a single-level structure. Only fields with single values are accepted.');
-            }
-
-            $fields = [];
-
-            foreach ($values->getFields() as $fieldName => $valuesBag) {
-                if ($valuesBag->count() !== 1 || ! $valuesBag->hasSimpleValues()) {
-                    throw new InvalidArgumentException(\sprintf('Field "%s" must have a single value only.', $fieldName));
-                }
-
-                $fields[$fieldName] = current($valuesBag->getSimpleValues());
-            }
-
-            $values = $fields;
-        }
-
-        $this->prepend = $this->processFields($prepend);
-        $this->fields = $this->processFields($values);
-        $this->append = $this->processFields($append);
-        $this->finalSorting = array_merge($this->prepend, $this->fields);
-
-        // Only append fields that are not already in prepend or fields
-        $this->finalSorting += $this->append;
-
-        $valuesGroup = new ValuesGroup();
-
-        foreach ($this->finalSorting as $fieldName => $direction) {
-            $valuesGroup->addField($fieldName, (new ValuesBag())->addSimpleValue($direction));
-        }
-        $this->valuesGroup = $valuesGroup;
-    }
-
-    public function getValuesGroup(): ValuesGroup
-    {
-        return $this->valuesGroup;
-    }
-
-    /**
-     * @psalm-return Sorting
-     */
-    public function getFields(): array
-    {
-        return $this->fields;
-    }
-
-    /**
-     * @psalm-return Sorting
-     */
-    public function getAppend(): array
-    {
-        return $this->append;
-    }
-
-    /**
-     * @psalm-return Sorting
-     */
-    public function getPrepend(): array
-    {
-        return $this->prepend;
-    }
-
-    /**
-     * Gets the final sorting order.
-     *
-     * This is the final sorting order, which is the combination fields that are
-     * always-sorted fields and fields provided by user-input.
-     *
-     * @psalm-return Sorting
-     */
-    public function getSorting(): array
-    {
-        return $this->finalSorting;
-    }
-
-    /**
-     * @param array<string, mixed> $values
-     *
-     * @psalm-return Sorting
-     */
-    private function processFields(array $values): array
-    {
-        $fields = [];
-
-        foreach ($values as $fieldName => $direction) {
-            if (! OrderField::isOrder($fieldName)) {
-                throw new InvalidArgumentException(\sprintf('Field "%s" is not a valid ordering field. Expected either "@%1$s".', $fieldName));
-            }
-
-            if (! \is_string($direction)) {
-                throw new InvalidArgumentException(\sprintf('Field "%s" direction must be a string, "%s" given.', $fieldName, get_debug_type($direction)));
-            }
-
-            $direction = mb_strtolower($direction);
-
-            if (! \in_array($direction, ['desc', 'asc'], true)) {
-                throw new InvalidArgumentException(
-                    \sprintf(
-                        'Invalid direction provided "%s" for field "%s", must be either "asc" or "desc" (case insensitive).',
-                        $direction,
-                        $fieldName
-                    )
-                );
-            }
-
-            $fields[$fieldName] = $direction;
-        }
-
-        return $fields;
-    }
-}
diff --git a/lib/Core/SearchPrimaryCondition.php b/lib/Core/SearchPrimaryCondition.php
deleted file mode 100644
index a55c506a..00000000
--- a/lib/Core/SearchPrimaryCondition.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * SearchPrimaryCondition contains a condition that must be fulfilled at all times.
- *
- * A SearchPrimaryCondition is applied as `(SearchPrimaryCondition) AND (SearchCondition)`.
- *
- * Caution: It's important for a QueryGenerator to always apply
- * the primary-condition even if the search-condition itself is empty!
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class SearchPrimaryCondition
-{
-    private ?SearchOrder $order = null;
-
-    public function __construct(
-        private readonly ValuesGroup $values,
-    ) {
-    }
-
-    public function getValuesGroup(): ValuesGroup
-    {
-        return $this->values;
-    }
-
-    public function setOrder(?SearchOrder $order): void
-    {
-        $this->order = $order;
-    }
-
-    public function getOrder(): ?SearchOrder
-    {
-        return $this->order;
-    }
-}
diff --git a/lib/Core/Searches.php b/lib/Core/Searches.php
deleted file mode 100644
index 9192f2af..00000000
--- a/lib/Core/Searches.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-/**
- * Entry point of the Search system.
- *
- * Use this class to conveniently create new search factories:
- *
- * <code>
- * use Rollerworks\Component\Search\Searches;
- * use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
- * use Rollerworks\Component\Search\Extension\Core\Type\TextType;
- * use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
- * use Rollerworks\Component\Search\Extension\Core\Type\ChoiceType;
- * use Rollerworks\Component\Search\Input\StringQueryInput;
- *
- * // The factory is reusable, you create it only once.
- * $searchFactory = Searches::createSearchFactory();
- *
- * // Create a fieldset to inform the system about your configuration.
- * // Usually you will have a FieldSet for each data structure (users, invoices, etc).
- * $userFieldSet = $searchFactory->createFieldSetBuilder()
- *     ->add('firstName', TextType::class)
- *     ->add('lastName', TextType::class)
- *     ->add('age', IntegerType::class)
- *     ->add('gender', ChoiceType::class, [
- *         'choices' => ['Female' => 'f', 'Male' => 'm'],
- *     ])
- *     ->getFieldSet('users');
- *
- * // Now lets process a simple string query.
- * // Tip: the input processor is reusable.
- * $inputProcessor = new StringQueryInput();
- *
- * try {
- *     // The ProcessorConfig allows to limit the amount of values, groups
- *     // and maximum nesting level.
- *     $processorConfig = new ProcessorConfig($userFieldSet);
- *
- *     // The `process` method processes the input and produces
- *     // a valid SearchCondition (or throws an exception when something is wrong).
- *     $condition = $inputProcessor->process('firstName: sebastiaan, melany;');
- * } catch (InvalidSearchConditionException $e) {
- *     // Each error message can be easily transformed to a localized version.
- *     // Read the documentation for more details.
- *     foreach ($e->getErrors() as $error) {
- *         echo (string) $error.PHP_EOL;
- *     }
- * }
- * </code>
- *
- * You can also add custom extensions to the search factory:
- *
- * <code>
- * $searchFactory = Searches::createSearchFactoryBuilder();
- *     ->addExtension(new AcmeExtension())
- *     ->getSearchFactory();
- * </code>
- *
- * If you create custom field types or type extensions, it is
- * generally recommended to create your own extensions that lazily
- * loads these types and type extensions. In projects where performance
- * does not matter that much, you can also pass them directly to the
- * search factory:
- *
- * <code>
- * use Rollerworks\Component\Search\Searches;
- *
- * $searchFactory = Searches::createSearchFactoryBuilder();
- *     ->addType(new PersonType())
- *     ->addType(new PhoneNumberType())
- *     ->addTypeExtension(new DoctrineDbalExtension())
- *     ->getSearchFactory();
- * </code>
- *
- * Tip: Field types without dependency injection don't have to be
- * registered with the factory and can be loaded by there FQCN.
- * Field type-extensions must always be registered.
- *
- * Support for the Validator component is provided by ValidatorExtension,
- * located in another repository.
- *
- * This extension needs a Validator object to function properly:
- *
- * <code>
- * use Rollerworks\Component\Search\Searches;
- * use Rollerworks\Component\Search\Extension\Validator\ValidatorExtension;
- * use Rollerworks\Component\Search\Extension\Validator\InputValidator;
- * use Rollerworks\Component\Search\Input\StringQueryInput;
- * use Symfony\Component\Validator\Validation;
- *
- * $searchFactory = Searches::createSearchFactoryBuilder();
- *     ->addExtension(new ValidatorExtension())
- *     ->getSearchFactory();
- *
- * $validatorBuilder = Validation::createValidatorBuilder();
- * $validator = $validatorBuilder->getValidator();
- *
- * $inputProcessor = new StringQueryInput(new InputValidator($validator));
- * </code>
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class Searches
-{
-    /**
-     * Creates a SearchFactoryBuilder with the default configuration.
-     */
-    public static function createSearchFactoryBuilder(): SearchFactoryBuilder
-    {
-        return new SearchFactoryBuilder();
-    }
-
-    /**
-     * Creates a new GenericSearchFactory with the default configuration.
-     */
-    public static function createSearchFactory(): SearchFactory
-    {
-        return self::createSearchFactoryBuilder()->getSearchFactory();
-    }
-
-    /**
-     * This class cannot be instantiated.
-     */
-    private function __construct()
-    {
-    }
-}
diff --git a/lib/Core/StructureBuilder.php b/lib/Core/StructureBuilder.php
deleted file mode 100644
index 0403b762..00000000
--- a/lib/Core/StructureBuilder.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * Works as a wrapper around the ValuesGroup, and ValuesBag transforming
- * input while ensuring restrictions are honored.
- *
- * @psalm-type ErrorPath = array{0: string, 1: string, 2: string}
- *
- * @internal
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface StructureBuilder
-{
-    public function getErrors(): ErrorList;
-
-    /**
-     * @return string|string[]
-     */
-    public function getCurrentPath(): string | array;
-
-    public function getRootGroup(): ValuesGroup;
-
-    public function enterGroup(string $groupLocal = 'AND', string $path = '[%d]'): void;
-
-    public function leaveGroup(): void;
-
-    public function field(string $name, string $path): void;
-
-    public function simpleValue(mixed $value, string $path): void;
-
-    public function excludedSimpleValue(mixed $value, string $path): void;
-
-    /**
-     * @param ErrorPath $path [path, lower-path-pattern, upper-path-pattern]
-     */
-    public function rangeValue(mixed $lower, mixed $upper, bool $lowerInclusive, bool $upperInclusive, array $path): void;
-
-    /**
-     * @param ErrorPath $path [path, lower-path-pattern, upper-path-pattern]
-     */
-    public function excludedRangeValue(mixed $lower, mixed $upper, bool $lowerInclusive, bool $upperInclusive, array $path): void;
-
-    /**
-     * @param ErrorPath $path [base-path, operator-path, value-path]
-     */
-    public function comparisonValue(mixed $operator, mixed $value, array $path): void;
-
-    /**
-     * @param ErrorPath $path [base-path, value-path, type-path]
-     */
-    public function patterMatchValue(mixed $type, mixed $value, bool $caseInsensitive, array $path): void;
-
-    public function endValues();
-}
diff --git a/lib/Core/Test/CarbonIntervalComparator.php b/lib/Core/Test/CarbonIntervalComparator.php
deleted file mode 100644
index 3f14be51..00000000
--- a/lib/Core/Test/CarbonIntervalComparator.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Test;
-
-use Carbon\CarbonInterval;
-use SebastianBergmann\Comparator\Comparator;
-use SebastianBergmann\Comparator\ComparisonFailure;
-use SebastianBergmann\Exporter\Exporter;
-
-final class CarbonIntervalComparator extends Comparator
-{
-    public function accepts(mixed $expected, mixed $actual): bool
-    {
-        return $expected instanceof CarbonInterval && $actual instanceof CarbonInterval;
-    }
-
-    /**
-     * @param CarbonInterval $expected
-     * @param CarbonInterval $actual
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false): void
-    {
-        if ($expected->invert === $actual->invert && $expected->forHumans() === $actual->forHumans()) {
-            return;
-        }
-
-        $exporter = new Exporter();
-
-        throw new ComparisonFailure(
-            $expected,
-            $actual,
-            $exportedExpected = $exporter->export($expected),
-            $exportedActual = $exporter->export($actual),
-            \sprintf(
-                'Failed asserting that %s matches expected %s.',
-                $exportedActual,
-                $exportedExpected
-            )
-        );
-    }
-}
diff --git a/lib/Core/Test/FieldTransformationAssertion.php b/lib/Core/Test/FieldTransformationAssertion.php
deleted file mode 100644
index 7154ebd2..00000000
--- a/lib/Core/Test/FieldTransformationAssertion.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Test;
-
-use PHPUnit\Framework\Assert;
-use PHPUnit\Framework\ExpectationFailedException;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-
-/**
- * The FieldTransformationAssertion class provides a fluent interface for
- * testing field transformations.
- *
- * Both inputView and inputNorm are expected be strings, when no
- * inputNorm is provided the inputView is used as the norm value.
- *
- * Example:
- *
- * ```
- * FieldTransformationAssertion::assertThat($field)
- *      ->withInput('value')
- *      ->successfullyTransformsTo('transformed-value')
- *
- *      // Should be equal to the input (but may vary), and should still transform to the same value.
- *      ->andReverseTransformsTo('value')
- *
- *      // Or to expect a transformation failure:
- *      ->failsToTransforms(new TransformationFailedException('message'))
- * ```
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class FieldTransformationAssertion
-{
-    private string $inputView;
-    private string $inputNorm;
-    private bool $transformed = false;
-    private mixed $model;
-
-    private function __construct(
-        private readonly FieldConfig $field,
-    ) {
-    }
-
-    public static function assertThat(FieldConfig $field): self
-    {
-        return new self($field);
-    }
-
-    public function withInput(string $inputView, ?string $inputNorm = null): self
-    {
-        if ($this->transformed) {
-            throw new \LogicException('Cannot change input after transformation.');
-        }
-
-        $this->inputView = $inputView;
-        $this->inputNorm = $inputNorm ?? $this->inputView;
-
-        return $this;
-    }
-
-    public function successfullyTransformsTo(mixed $model): self
-    {
-        $normValue = $viewValue = null;
-
-        if (! isset($this->inputView)) {
-            throw new \LogicException('withInput() must be called first.');
-        }
-
-        try {
-            $viewValue = $this->viewToModel($this->inputView);
-        } catch (TransformationFailedException $e) {
-            Assert::fail('View->model: With input ' . var_export($this->inputView, true) . '. Message ' . $e->getMessage() . "\n" . $e->getTraceAsString());
-        }
-
-        try {
-            $normValue = $this->normToModel($this->inputNorm);
-        } catch (TransformationFailedException $e) {
-            Assert::fail('Norm->model: With input ' . var_export($this->inputNorm, true) . '. Message ' . $e->getMessage() . "\n" . $e->getTraceAsString());
-        }
-
-        Assert::assertEquals($model, $viewValue, 'View->model value does not equal');
-        Assert::assertEquals($model, $normValue, 'Norm->model value does not equal');
-
-        $this->transformed = true;
-        $this->model = $model;
-
-        return $this;
-    }
-
-    public function failsToTransforms(?TransformationFailedException $exceptionForView = null, ?TransformationFailedException $exceptionForModel = null): void
-    {
-        if (! isset($this->inputView)) {
-            throw new \LogicException('withInput() must be called first.');
-        }
-
-        if ($this->transformed) {
-            throw new \LogicException('Only successfullyTransformsTo() or failsToTransforms() can be called.');
-        }
-
-        try {
-            $this->viewToModel($this->inputView);
-
-            Assert::fail(\sprintf('Expected view-input "%s" to be invalid', $this->inputView));
-        } catch (TransformationFailedException $e) {
-            if ($exceptionForView) {
-                self::assertTransformationFailedExceptionEquals($exceptionForView, $e);
-            } else {
-                Assert::assertTrue(true); // no-op
-            }
-        }
-
-        try {
-            $this->normToModel($this->inputNorm);
-
-            Assert::fail(\sprintf('Expected norm-input "%s" to be invalid', $this->inputNorm));
-        } catch (TransformationFailedException $e) {
-            if ($exceptionForModel) {
-                self::assertTransformationFailedExceptionEquals($exceptionForModel, $e);
-            } else {
-                Assert::assertTrue(true); // no-op
-            }
-        }
-    }
-
-    public function andReverseTransformsTo(?string $expectedView = null, ?string $expectedNorm = null): void
-    {
-        $normValue = $viewValue = null;
-
-        if (! $this->transformed) {
-            throw new \LogicException('successfullyTransformsTo() must be called first.');
-        }
-
-        try {
-            $viewValue = $this->modelToView($this->model);
-        } catch (TransformationFailedException $e) {
-            Assert::fail('Model->view: With value ' . var_export($this->model, true) . '. Message ' . $e->getMessage() . "\n" . $e->getTraceAsString());
-        }
-
-        try {
-            $normValue = $this->modelToNorm($this->model);
-        } catch (TransformationFailedException $e) {
-            Assert::fail('Model->norm: With value ' . var_export($this->model, true) . '. Message ' . $e->getMessage() . "\n" . $e->getTraceAsString());
-        }
-
-        Assert::assertEquals($expectedView, $viewValue, 'View value does not equal');
-        Assert::assertEquals($expectedNorm ?? $expectedView, $normValue, 'Norm value does not equal');
-    }
-
-    private function viewToModel(string $value)
-    {
-        $transformer = $this->field->getViewTransformer();
-
-        return $transformer ? $transformer->reverseTransform($value) : ($value === '' ? null : $value);
-    }
-
-    private function modelToView(mixed $value): string
-    {
-        $transformer = $this->field->getViewTransformer();
-
-        // Scalar values should be converted to strings to
-        // facilitate differentiation between empty ("") and zero (0).
-        if ($value === null || ! $transformer) {
-            return (string) $value;
-        }
-
-        return (string) $transformer->transform($value);
-    }
-
-    private function normToModel(string $value): mixed
-    {
-        $transformer = $this->field->getNormTransformer() ?? $this->field->getViewTransformer();
-
-        return ! $transformer ? $value : $transformer->reverseTransform($value);
-    }
-
-    private function modelToNorm(mixed $value): string
-    {
-        $transformer = $this->field->getNormTransformer() ?? $this->field->getViewTransformer();
-
-        // Scalar values should be converted to strings to
-        // facilitate differentiation between empty ("") and zero (0).
-        if ($value === null || ! $transformer) {
-            return (string) $value;
-        }
-
-        return (string) $transformer->transform($value);
-    }
-
-    private static function assertTransformationFailedExceptionEquals(TransformationFailedException $expected, TransformationFailedException $actual): void
-    {
-        try {
-            if ($expected->getPrevious()) {
-                Assert::assertEquals($expected->getPrevious(), $actual->getPrevious(), 'Previous exception does not equal.');
-            }
-
-            Assert::assertEquals($expected->getMessage(), $actual->getMessage(), 'Message does not equal.');
-            Assert::assertEquals($expected->getCode(), $actual->getCode(), 'Code does not equal.');
-            Assert::assertEquals($expected->getInvalidMessage(), $actual->getInvalidMessage(), 'Invalid message does not equal.');
-            Assert::assertEquals($expected->getInvalidMessageParameters(), $actual->getInvalidMessageParameters(), 'Invalid-messages parameters does not equal.');
-
-            if ($expected->getInvalidValue() !== null) {
-                Assert::assertEquals($expected->getInvalidValue(), $actual->getInvalidValue(), 'Invalid value does not equal.');
-            }
-        } catch (ExpectationFailedException $e) {
-            Assert::assertEquals($expected, $actual, $e->getMessage());
-        }
-    }
-}
diff --git a/lib/Core/Test/SearchIntegrationTestCase.php b/lib/Core/Test/SearchIntegrationTestCase.php
deleted file mode 100644
index f7214821..00000000
--- a/lib/Core/Test/SearchIntegrationTestCase.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Test;
-
-use PHPUnit\Framework\TestCase;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-use Rollerworks\Component\Search\Exception\SearchException;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\GenericFieldSetBuilder;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Searches;
-use Rollerworks\Component\Search\SearchFactory;
-use Rollerworks\Component\Search\SearchFactoryBuilder;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-abstract class SearchIntegrationTestCase extends TestCase
-{
-    use ProphecyTrait;
-
-    protected SearchFactoryBuilder $factoryBuilder;
-    private ?SearchFactory $searchFactory = null;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->factoryBuilder = Searches::createSearchFactoryBuilder();
-    }
-
-    protected function getFactory(): SearchFactory
-    {
-        if ($this->searchFactory === null) {
-            $this->factoryBuilder->addExtensions($this->getExtensions());
-            $this->factoryBuilder->addTypes($this->getTypes());
-            $this->factoryBuilder->addTypeExtensions($this->getTypeExtensions());
-
-            $this->searchFactory = $this->factoryBuilder->getSearchFactory();
-        }
-
-        return $this->searchFactory;
-    }
-
-    protected function getExtensions(): array
-    {
-        return [];
-    }
-
-    protected function getTypes(): array
-    {
-        return [];
-    }
-
-    protected function getTypeExtensions(): array
-    {
-        return [];
-    }
-
-    /**
-     * @return FieldSet|GenericFieldSetBuilder
-     */
-    protected function getFieldSet(bool $build = true) // XXX This should be split into two separate methods, and moved to a Trait
-    {
-        $fieldSet = new GenericFieldSetBuilder($this->getFactory());
-        $fieldSet->set($this->getFactory()->createField('id', IntegerType::class));
-        $fieldSet->add('name', TextType::class);
-        $fieldSet->add('restrict', TextType::class);
-
-        return $build ? $fieldSet->getFieldSet() : $fieldSet;
-    }
-
-    protected static function assertConditionsEquals(SearchCondition $expectedCondition, SearchCondition $actualCondition): void
-    {
-        try {
-            // First try the "simple" method, it's possible this fails due to index mismatches.
-            self::assertEquals($expectedCondition, $actualCondition);
-        } catch (\Exception) {
-            // No need for custom implementations here.
-            // The reindexValuesGroup can be used for custom implementations (when needed).
-            $actualCondition = new SearchCondition(
-                $actualCondition->getFieldSet(),
-                self::reindexValuesGroup($actualCondition->getValuesGroup())
-            );
-
-            self::assertEquals($expectedCondition, $actualCondition);
-        }
-    }
-
-    /**
-     * @param ConditionErrorMessage[] $errors
-     */
-    protected function assertConditionContainsErrorsWithoutCause($input, ProcessorConfig $config, array $errors, ?InputProcessor $processor = null): void
-    {
-        if (! $processor) {
-            if (! method_exists($this, 'getProcessor')) {
-                throw new \InvalidArgumentException('When $processor is not provided, the getProcessor() method should be defined.');
-            }
-
-            $processor = $this->getProcessor();
-        }
-
-        try {
-            $processor->process($config, $input);
-
-            self::fail('Condition should be invalid.');
-        } catch (InvalidSearchConditionException $e) {
-            $errorsList = $e->getErrors();
-
-            foreach ($errorsList as $error) {
-                // Remove cause to make assertion possible.
-                $error->cause = null;
-            }
-
-            foreach ($errors as $error) {
-                $error->cause = null;
-            }
-
-            self::assertEquals($errors, $errorsList);
-        }
-    }
-
-    /**
-     * @param ConditionErrorMessage[] $errors
-     */
-    protected function assertConditionContainsErrors($input, ProcessorConfig $config, array $errors, ?InputProcessor $processor = null): void
-    {
-        if (! $processor) {
-            if (! method_exists($this, 'getProcessor')) {
-                throw new \InvalidArgumentException('When $processor is not provided, the getProcessor() method should be defined.');
-            }
-
-            $processor = $this->getProcessor();
-        }
-
-        try {
-            $processor->process($config, $input);
-
-            self::fail('Condition should be invalid: ' . var_export($input, true));
-        } catch (InvalidSearchConditionException $e) {
-            self::assertEquals($errors, $e->getErrors());
-        }
-    }
-
-    protected static function reindexValuesGroup(ValuesGroup $valuesGroup): ValuesGroup
-    {
-        $newValuesGroup = new ValuesGroup($valuesGroup->getGroupLogical());
-
-        foreach ($valuesGroup->getGroups() as $group) {
-            $newValuesGroup->addGroup(self::reindexValuesGroup($group));
-        }
-
-        foreach ($valuesGroup->getFields() as $name => $valuesBag) {
-            $newValuesBag = new ValuesBag();
-
-            foreach ($valuesBag->getSimpleValues() as $value) {
-                $newValuesBag->addSimpleValue($value);
-            }
-
-            foreach ($valuesBag->getExcludedSimpleValues() as $value) {
-                $newValuesBag->addExcludedSimpleValue($value);
-            }
-
-            // use array_merge to renumber indexes and prevent mismatches.
-            foreach ($valuesBag->all() as $values) {
-                foreach (array_merge([], $values) as $value) {
-                    $newValuesBag->add($value);
-                }
-            }
-
-            $newValuesGroup->addField($name, $newValuesBag);
-        }
-
-        return $newValuesGroup;
-    }
-
-    protected function assertConditionEquals($input, SearchCondition $condition, InputProcessor $processor, ProcessorConfig $config): void
-    {
-        try {
-            self::assertEquals($condition, $processor->process($config, $input));
-        } catch (\Exception $e) {
-            if (\function_exists('dump')) {
-                dump($e);
-            } else {
-                echo 'Please install symfony/var-dumper as dev-requirement to get a readable structure.' . \PHP_EOL;
-
-                // Don't use var-dump or print-r as this crashes php...
-                echo $e::class . '::' . (string) $e;
-            }
-
-            self::fail('Condition contains errors.');
-        }
-    }
-
-    /**
-     * @deprecated use a proper catch type instead
-     */
-    protected static function detectSystemException(\Exception $exception): void
-    {
-        trigger_deprecation('rollerworks/search', '2.0-BETA13', 'The "%s()" method is deprecated, use a proper catch type instead.', __METHOD__);
-
-        if (! $exception instanceof SearchException) {
-            throw $exception;
-        }
-    }
-}
diff --git a/lib/Core/Tests/Exporter/JsonExporterTest.php b/lib/Core/Tests/Exporter/JsonExporterTest.php
deleted file mode 100644
index 96123cce..00000000
--- a/lib/Core/Tests/Exporter/JsonExporterTest.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Exporter;
-
-use Rollerworks\Component\Search\ConditionExporter;
-use Rollerworks\Component\Search\Exporter\JsonExporter;
-use Rollerworks\Component\Search\Input\JsonInput;
-use Rollerworks\Component\Search\InputProcessor;
-
-/**
- * @internal
- */
-final class JsonExporterTest extends SearchConditionExporterTestCase
-{
-    public function provideSingleValuePairTest()
-    {
-        return json_encode(
-            [
-                'fields' => [
-                    'name' => [
-                        'simple-values' => [
-                            'value ',
-                            '-value2',
-                            'value2-',
-                            '10.00',
-                            '10,00',
-                            'hÌ',
-                            '٤٤٤٦٥٤٦٠٠',
-                            'doctor"who""',
-                        ],
-                        'excluded-simple-values' => ['value3'],
-                    ],
-                ],
-            ]
-        );
-    }
-
-    public function provideMultipleValuesTest()
-    {
-        return json_encode(
-            [
-                'fields' => [
-                    'name' => [
-                        'simple-values' => ['value', 'value2'],
-                    ],
-                    'date' => [
-                        'simple-values' => ['2014-12-16'],
-                    ],
-                ],
-            ]
-        );
-    }
-
-    public function providePrivateFieldsTest()
-    {
-        return json_encode(
-            [
-                'fields' => [
-                    'name' => [
-                        'simple-values' => ['value', 'value2'],
-                    ],
-                    'date' => [
-                        'simple-values' => ['2014-12-16'],
-                    ],
-                ],
-            ]
-        );
-    }
-
-    public function provideRangeValuesTest()
-    {
-        return json_encode(
-            [
-                'fields' => [
-                    'id' => [
-                        'ranges' => [
-                            ['lower' => '1', 'upper' => '10'],
-                            ['lower' => '15', 'upper' => '30'],
-                            ['lower' => '100', 'upper' => '200', 'inclusive-lower' => false],
-                            ['lower' => '310', 'upper' => '400', 'inclusive-upper' => false],
-                        ],
-                        'excluded-ranges' => [
-                            ['lower' => '50', 'upper' => '70'],
-                        ],
-                    ],
-                    'date' => [
-                        'ranges' => [
-                            ['lower' => '2014-12-16', 'upper' => '2014-12-20'],
-                        ],
-                    ],
-                ],
-            ]
-        );
-    }
-
-    public function provideComparisonValuesTest()
-    {
-        return json_encode(
-            [
-                'fields' => [
-                    'id' => [
-                        'comparisons' => [
-                            ['operator' => '>', 'value' => '1'],
-                            ['operator' => '<', 'value' => '2'],
-                            ['operator' => '<=', 'value' => '5'],
-                            ['operator' => '>=', 'value' => '8'],
-                        ],
-                    ],
-                    'date' => [
-                        'comparisons' => [
-                            ['operator' => '>=', 'value' => '2014-12-16'],
-                        ],
-                    ],
-                ],
-            ]
-        );
-    }
-
-    public function provideMatcherValuesTest()
-    {
-        return json_encode(
-            [
-                'fields' => [
-                    'name' => [
-                        'pattern-matchers' => [
-                            ['type' => 'CONTAINS', 'value' => 'value', 'case-insensitive' => false],
-                            ['type' => 'STARTS_WITH', 'value' => 'value2', 'case-insensitive' => true],
-                            ['type' => 'ENDS_WITH', 'value' => 'value3', 'case-insensitive' => false],
-                            ['type' => 'NOT_CONTAINS', 'value' => 'value4', 'case-insensitive' => false],
-                            ['type' => 'NOT_CONTAINS', 'value' => 'value5', 'case-insensitive' => true],
-                            ['type' => 'EQUALS', 'value' => 'value9', 'case-insensitive' => false],
-                            ['type' => 'NOT_EQUALS', 'value' => 'value10', 'case-insensitive' => false],
-                            ['type' => 'EQUALS', 'value' => 'value11', 'case-insensitive' => true],
-                            ['type' => 'NOT_EQUALS', 'value' => 'value12', 'case-insensitive' => true],
-                        ],
-                    ],
-                ],
-            ]
-        );
-    }
-
-    public function provideGroupTest()
-    {
-        return json_encode(
-            [
-                'fields' => [
-                    'name' => [
-                        'simple-values' => ['value', 'value2'],
-                    ],
-                ],
-                'groups' => [
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value3', 'value4'],
-                            ],
-                        ],
-                    ],
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value8', 'value10'],
-                            ],
-                        ],
-                        'logical-case' => 'OR',
-                    ],
-                ],
-            ]
-        );
-    }
-
-    public function provideMultipleSubGroupTest()
-    {
-        return json_encode(
-            [
-                'groups' => [
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value', 'value2'],
-                            ],
-                        ],
-                    ],
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value3', 'value4'],
-                            ],
-                        ],
-                    ],
-                ],
-            ]
-        );
-    }
-
-    public function provideNestedGroupTest()
-    {
-        return json_encode(
-            [
-                'groups' => [
-                    [
-                        'groups' => [
-                            [
-                                'fields' => [
-                                    'name' => [
-                                        'simple-values' => ['value', 'value2'],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ]
-        );
-    }
-
-    public function provideEmptyValuesTest()
-    {
-        return json_encode([]);
-    }
-
-    public function provideEmptyGroupTest()
-    {
-        return json_encode(['groups' => [[]]]);
-    }
-
-    public function provideOrderTest()
-    {
-        return json_encode(['order' => ['id' => 'desc', 'status' => 'asc']], \JSON_THROW_ON_ERROR);
-    }
-
-    protected function getExporter(): ConditionExporter
-    {
-        return new JsonExporter();
-    }
-
-    protected function getInputProcessor(): InputProcessor
-    {
-        return new JsonInput();
-    }
-}
diff --git a/lib/Core/Tests/Exporter/NormStringQueryExporterTest.php b/lib/Core/Tests/Exporter/NormStringQueryExporterTest.php
deleted file mode 100644
index 894a5a2a..00000000
--- a/lib/Core/Tests/Exporter/NormStringQueryExporterTest.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Exporter;
-
-use Rollerworks\Component\Search\ConditionExporter;
-use Rollerworks\Component\Search\Exporter\NormStringQueryExporter;
-use Rollerworks\Component\Search\Input\NormStringQueryInput;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class NormStringQueryExporterTest extends SearchConditionExporterTestCase
-{
-    /**
-     * @test
-     */
-    public function it_exporters_values(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value ');
-        $values->addSimpleValue('-value2');
-        $values->addSimpleValue('value2-');
-        $values->addSimpleValue('10.00');
-        $values->addSimpleValue('10,00');
-        $values->addSimpleValue('hÌ');
-        $values->addSimpleValue('٤٤٤٦٥٤٦٠٠');
-        $values->addSimpleValue('doctor"who""');
-        $values->addExcludedSimpleValue('value3');
-        $expectedGroup->addField('name', $values);
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('EUR 12.00');
-        $values->addSimpleValue('12');
-        $expectedGroup->addField('price', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideSingleValuePairTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideSingleValuePairTest(), $condition, $processor, $config);
-    }
-
-    public function provideSingleValuePairTest(): string
-    {
-        return 'name: "value ", -value2, value2-, 10.00, "10,00", hÌ, ٤٤٤٦٥٤٦٠٠, "doctor""who""""", !value3; price: EUR 12.00, 12;';
-    }
-
-    public function provideMultipleValuesTest(): string
-    {
-        return 'name: value, value2; date: 2014-12-16;';
-    }
-
-    public function providePrivateFieldsTest(): string
-    {
-        return 'name: value, value2; date: 2014-12-16;';
-    }
-
-    public function provideRangeValuesTest(): string
-    {
-        return 'id: 1 ~ 10, 15 ~ 30, ]100 ~ 200, 310 ~ 400[, !50 ~ 70; date: 2014-12-16 ~ 2014-12-20;';
-    }
-
-    public function provideComparisonValuesTest(): string
-    {
-        return 'id: > 1, < 2, <= 5, >= 8; date: >= 2014-12-16;';
-    }
-
-    public function provideMatcherValuesTest(): string
-    {
-        return 'name: ~* value, ~i> value2, ~< value3, ~!* value4, ~i!* value5, ~= value9, ~!= value10, ~i= value11, ~i!= value12;';
-    }
-
-    public function provideGroupTest(): string
-    {
-        return 'name: value, value2; ( name: value3, value4 ); *( name: value8, value10 );';
-    }
-
-    public function provideMultipleSubGroupTest(): string
-    {
-        return '( name: value, value2 ); ( name: value3, value4 );';
-    }
-
-    public function provideNestedGroupTest(): string
-    {
-        return '( ( name: value, value2 ) );';
-    }
-
-    public function provideEmptyValuesTest(): string
-    {
-        return '';
-    }
-
-    public function provideEmptyGroupTest(): string
-    {
-        return '(  );';
-    }
-
-    public function provideOrderTest(): string
-    {
-        return '@id: desc; @status: asc;';
-    }
-
-    protected function getExporter(): ConditionExporter
-    {
-        return new NormStringQueryExporter();
-    }
-
-    protected function getInputProcessor(): InputProcessor
-    {
-        return new NormStringQueryInput();
-    }
-}
diff --git a/lib/Core/Tests/Exporter/SearchConditionExporterTestCase.php b/lib/Core/Tests/Exporter/SearchConditionExporterTestCase.php
deleted file mode 100644
index 43f5f2c5..00000000
--- a/lib/Core/Tests/Exporter/SearchConditionExporterTestCase.php
+++ /dev/null
@@ -1,425 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Exporter;
-
-use Rollerworks\Component\Search\ConditionExporter;
-use Rollerworks\Component\Search\Extension\Core\Type\DateType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\GenericFieldSetBuilder;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * @internal
- */
-abstract class SearchConditionExporterTestCase extends SearchIntegrationTestCase
-{
-    abstract protected function getExporter(): ConditionExporter;
-
-    abstract protected function getInputProcessor(): InputProcessor;
-
-    protected function getFieldSet(bool $build = true)
-    {
-        $priceField = $this->getFactory()->createField('price', MoneyType::class);
-        $priceField->setNormTransformer(null);
-        $priceField->setViewTransformer(null);
-
-        $fieldSet = new GenericFieldSetBuilder($this->getFactory());
-        $fieldSet->add('id', IntegerType::class);
-        $fieldSet->add('name', TextType::class);
-        $fieldSet->add('lastname', TextType::class);
-        $fieldSet->add('date', DateType::class, ['pattern' => 'MM-dd-yyyy']);
-        $fieldSet->set($priceField);
-
-        $fieldSet->add('@id', OrderFieldType::class);
-        $fieldSet->add('@status', OrderFieldType::class);
-
-        return $build ? $fieldSet->getFieldSet() : $fieldSet;
-    }
-
-    /**
-     * @test
-     */
-    public function it_exporters_values(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value ');
-        $values->addSimpleValue('-value2');
-        $values->addSimpleValue('value2-');
-        $values->addSimpleValue('10.00');
-        $values->addSimpleValue('10,00');
-        $values->addSimpleValue('hÌ');
-        $values->addSimpleValue('٤٤٤٦٥٤٦٠٠');
-        $values->addSimpleValue('doctor"who""');
-        $values->addExcludedSimpleValue('value3');
-        $expectedGroup->addField('name', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideSingleValuePairTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideSingleValuePairTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideSingleValuePairTest();
-
-    /**
-     * @test
-     */
-    public function it_exporters_multiple_fields(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $expectedGroup->addField('name', $values);
-
-        $date = new \DateTimeImmutable('2014-12-16 00:00:00 UTC');
-
-        $values = new ValuesBag();
-        $values->addSimpleValue($date);
-        $expectedGroup->addField('date', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideMultipleValuesTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideMultipleValuesTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideMultipleValuesTest();
-
-    /**
-     * @test
-     */
-    public function it_ignores_private_fields(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $expectedGroup->addField('name', $values);
-
-        $date = new \DateTimeImmutable('2014-12-16 00:00:00 UTC');
-
-        $values = new ValuesBag();
-        $values->addSimpleValue($date);
-        $expectedGroup->addField('date', $values);
-
-        $values = new ValuesBag();
-        $values->addSimpleValue(1);
-        $expectedGroup->addField('_id', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideMultipleValuesTest(), $exporter->exportCondition($condition));
-    }
-
-    abstract public function providePrivateFieldsTest();
-
-    /**
-     * @test
-     */
-    public function it_exporters_range_values(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->add(new Range(1, 10));
-        $values->add(new Range(15, 30));
-        $values->add(new Range(100, 200, false));
-        $values->add(new Range(310, 400, true, false));
-        $values->add(new ExcludedRange(50, 70));
-        $expectedGroup->addField('id', $values);
-
-        $date = new \DateTimeImmutable('2014-12-16 00:00:00 UTC');
-        $date2 = new \DateTimeImmutable('2014-12-20 00:00:00 UTC');
-
-        $values = new ValuesBag();
-        $values->add(new Range($date, $date2, true, true));
-        $expectedGroup->addField('date', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideRangeValuesTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideRangeValuesTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideRangeValuesTest();
-
-    /**
-     * @test
-     */
-    public function it_exporters_comparisons(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->add(new Compare(1, '>'));
-        $values->add(new Compare(2, '<'));
-        $values->add(new Compare(5, '<='));
-        $values->add(new Compare(8, '>='));
-        $expectedGroup->addField('id', $values);
-
-        $date = new \DateTimeImmutable('2014-12-16 00:00:00 UTC');
-
-        $values = new ValuesBag();
-        $values->add(new Compare($date, '>='));
-        $expectedGroup->addField('date', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideComparisonValuesTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideComparisonValuesTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideComparisonValuesTest();
-
-    /**
-     * @test
-     */
-    public function it_exporters_matchers(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->add(new PatternMatch('value', PatternMatch::PATTERN_CONTAINS));
-        $values->add(new PatternMatch('value2', PatternMatch::PATTERN_STARTS_WITH, true));
-        $values->add(new PatternMatch('value3', PatternMatch::PATTERN_ENDS_WITH));
-        $values->add(new PatternMatch('value4', PatternMatch::PATTERN_NOT_CONTAINS));
-        $values->add(new PatternMatch('value5', PatternMatch::PATTERN_NOT_CONTAINS, true));
-        $values->add(new PatternMatch('value9', PatternMatch::PATTERN_EQUALS));
-        $values->add(new PatternMatch('value10', PatternMatch::PATTERN_NOT_EQUALS));
-        $values->add(new PatternMatch('value11', PatternMatch::PATTERN_EQUALS, true));
-        $values->add(new PatternMatch('value12', PatternMatch::PATTERN_NOT_EQUALS, true));
-        $expectedGroup->addField('name', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideMatcherValuesTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideMatcherValuesTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideMatcherValuesTest();
-
-    /**
-     * @test
-     */
-    public function it_exporters_groups(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $expectedGroup->addField('name', $values);
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value3');
-        $values->addSimpleValue('value4');
-
-        $subGroup = new ValuesGroup();
-        $subGroup->addField('name', $values);
-        $expectedGroup->addGroup($subGroup);
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value8');
-        $values->addSimpleValue('value10');
-
-        $subGroup = new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR);
-        $subGroup->addField('name', $values);
-        $expectedGroup->addGroup($subGroup);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideGroupTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideGroupTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideGroupTest();
-
-    /**
-     * @test
-     */
-    public function it_exporters_multiple_subgroups(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-
-        $subGroup = new ValuesGroup();
-        $subGroup->addField('name', $values);
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value3');
-        $values->addSimpleValue('value4');
-        $expectedGroup->addGroup($subGroup);
-
-        $subGroup2 = new ValuesGroup();
-        $subGroup2->addField('name', $values);
-        $expectedGroup->addGroup($subGroup2);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideMultipleSubGroupTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideMultipleSubGroupTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideMultipleSubGroupTest();
-
-    /**
-     * @test
-     */
-    public function it_exporters_nested_subgroups(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-        $nestedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $nestedGroup->addField('name', $values);
-
-        $subGroup = new ValuesGroup();
-        $subGroup->addGroup($nestedGroup);
-        $expectedGroup->addGroup($subGroup);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideNestedGroupTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideNestedGroupTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideNestedGroupTest();
-
-    /**
-     * @test
-     */
-    public function it_exporters_with_empty_fields(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideEmptyValuesTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideEmptyValuesTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideEmptyValuesTest();
-
-    /**
-     * @test
-     */
-    public function it_exporters_with_empty_group(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-        $expectedGroup->addGroup(new ValuesGroup());
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideEmptyGroupTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideEmptyGroupTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideEmptyGroupTest();
-
-    /**
-     * @test
-     */
-    public function it_exports_with_ordering(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $condition = new SearchCondition($config->getFieldSet(), new ValuesGroup());
-
-        $orderGroup = (new ValuesGroup())
-            ->addField('@id', (new ValuesBag())->addSimpleValue('DESC'))
-            ->addField('@status', (new ValuesBag())->addSimpleValue('ASC'))
-        ;
-        $condition->setOrder(new SearchOrder($orderGroup));
-
-        $this->assertExportEquals($this->provideOrderTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideOrderTest(), $condition, $processor, $config);
-    }
-
-    abstract public function provideOrderTest();
-
-    protected function assertExportEquals($expected, $actual): void
-    {
-        self::assertEquals($expected, $actual);
-    }
-}
diff --git a/lib/Core/Tests/Exporter/StringQueryExporterTest.php b/lib/Core/Tests/Exporter/StringQueryExporterTest.php
deleted file mode 100644
index 5aa2b235..00000000
--- a/lib/Core/Tests/Exporter/StringQueryExporterTest.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Exporter;
-
-use Rollerworks\Component\Search\ConditionExporter;
-use Rollerworks\Component\Search\Exporter\StringQueryExporter;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class StringQueryExporterTest extends SearchConditionExporterTestCase
-{
-    /**
-     * @test
-     */
-    public function it_exporters_with_field_label(): void
-    {
-        $labelResolver = static function (FieldConfig $field) {
-            $name = $field->getName();
-
-            if ($name === 'name') {
-                return 'firstname';
-            }
-
-            return $name;
-        };
-
-        $exporter = $this->getExporter($labelResolver);
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-
-        $expectedGroup->addField('name', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals('firstname: value, value2;', $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor($labelResolver);
-        $processor->process($config, 'firstname: value, value2;');
-    }
-
-    /**
-     * @test
-     */
-    public function it_exporters_values(): void
-    {
-        $exporter = $this->getExporter();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value ');
-        $values->addSimpleValue('-value2');
-        $values->addSimpleValue('value2-');
-        $values->addSimpleValue('10.00');
-        $values->addSimpleValue('10,00');
-        $values->addSimpleValue('hÌ');
-        $values->addSimpleValue('٤٤٤٦٥٤٦٠٠');
-        $values->addSimpleValue('doctor"who""');
-        $values->addExcludedSimpleValue('value3');
-        $expectedGroup->addField('name', $values);
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('€ 12.00');
-        $values->addSimpleValue('12,00 $');
-        $values->addSimpleValue('$ 12.00');
-        $expectedGroup->addField('price', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertExportEquals($this->provideSingleValuePairTest(), $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals($this->provideSingleValuePairTest(), $condition, $processor, $config);
-    }
-
-    /**
-     * @test
-     */
-    public function it_exports_with_ordering_aliases(): void
-    {
-        $exporter = $this->getExporter();
-        $fieldSet = $this->getFieldSet(false)
-            ->add('@id', OrderFieldType::class)
-            ->add('@status', OrderFieldType::class, ['view_label' => ['ASC' => 'down', 'DESC' => 'up']])
-            ->getFieldSet()
-        ;
-
-        $config = new ProcessorConfig($fieldSet);
-
-        $condition = new SearchCondition($config->getFieldSet(), new ValuesGroup());
-
-        $orderGroup = (new ValuesGroup())
-            ->addField('@id', (new ValuesBag())->addSimpleValue('DESC'))
-            ->addField('@status', (new ValuesBag())->addSimpleValue('ASC'))
-        ;
-        $condition->setOrder(new SearchOrder($orderGroup));
-
-        $this->assertExportEquals('@id: desc; @status: down;', $exporter->exportCondition($condition));
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals('@id: desc; @status: down;', $condition, $processor, $config);
-
-        $processor = $this->getInputProcessor();
-        $this->assertConditionEquals('@id: desc; @status: asc;', $condition, $processor, $config);
-    }
-
-    /**
-     * @test
-     */
-    public function it_exports_with_ordering_and_root_group_logical(): void
-    {
-        $exporter = $this->getExporter();
-        $fieldSet = $this->getFieldSet(false)
-            ->add('@id', OrderFieldType::class)
-            ->add('@status', OrderFieldType::class)
-            ->getFieldSet()
-        ;
-
-        $config = new ProcessorConfig($fieldSet);
-
-        $condition = new SearchCondition(
-            $config->getFieldSet(),
-            (new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR))->addField('name', (new ValuesBag())->addSimpleValue('value '))
-        );
-
-        $orderGroup = (new ValuesGroup())
-            ->addField('@id', (new ValuesBag())->addSimpleValue('DESC'))
-            ->addField('@status', (new ValuesBag())->addSimpleValue('ASC'))
-        ;
-        $condition->setOrder(new SearchOrder($orderGroup));
-
-        $this->assertExportEquals('* @id: desc; @status: asc; name: "value ";', $exporter->exportCondition($condition));
-        $this->assertConditionEquals('* @id: desc; @status: asc; name: "value ";', $condition, $this->getInputProcessor(), $config);
-    }
-
-    public function provideSingleValuePairTest(): string
-    {
-        return 'name: "value ", -value2, value2-, 10.00, "10,00", hÌ, ٤٤٤٦٥٤٦٠٠, "doctor""who""""", !value3; price: € 12.00, "12,00 $", $ 12.00;';
-    }
-
-    public function provideMultipleValuesTest(): string
-    {
-        return 'name: value, value2; date: 12-16-2014;';
-    }
-
-    public function providePrivateFieldsTest(): string
-    {
-        return 'name: value, value2; date: 12-16-2014;';
-    }
-
-    public function provideRangeValuesTest(): string
-    {
-        return 'id: 1 ~ 10, 15 ~ 30, ]100 ~ 200, 310 ~ 400[, !50 ~ 70; date: 12-16-2014 ~ 12-20-2014;';
-    }
-
-    public function provideComparisonValuesTest(): string
-    {
-        return 'id: > 1, < 2, <= 5, >= 8; date: >= 12-16-2014;';
-    }
-
-    public function provideMatcherValuesTest(): string
-    {
-        return 'name: ~* value, ~i> value2, ~< value3, ~!* value4, ~i!* value5, ~= value9, ~!= value10, ~i= value11, ~i!= value12;';
-    }
-
-    public function provideGroupTest(): string
-    {
-        return 'name: value, value2; ( name: value3, value4 ); *( name: value8, value10 );';
-    }
-
-    public function provideMultipleSubGroupTest(): string
-    {
-        return '( name: value, value2 ); ( name: value3, value4 );';
-    }
-
-    public function provideNestedGroupTest(): string
-    {
-        return '( ( name: value, value2 ) );';
-    }
-
-    public function provideEmptyValuesTest(): string
-    {
-        return '';
-    }
-
-    public function provideEmptyGroupTest(): string
-    {
-        return '(  );';
-    }
-
-    public function provideOrderTest(): string
-    {
-        return '@id: desc; @status: asc;';
-    }
-
-    protected function getExporter(?callable $labelResolver = null): ConditionExporter
-    {
-        return new StringQueryExporter($labelResolver);
-    }
-
-    protected function getInputProcessor(?callable $labelResolver = null): InputProcessor
-    {
-        return new StringQueryInput(null, $labelResolver);
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ChoiceList/AbstractChoiceListTestCase.php b/lib/Core/Tests/Extension/Core/ChoiceList/AbstractChoiceListTestCase.php
deleted file mode 100644
index 2f9b1cb7..00000000
--- a/lib/Core/Tests/Extension/Core/ChoiceList/AbstractChoiceListTestCase.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\ChoiceList;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @internal
- */
-abstract class AbstractChoiceListTestCase extends TestCase
-{
-    protected ChoiceList $list;
-
-    /** @var array<string, mixed> */
-    protected array $choices;
-
-    /** @var array<string, mixed> */
-    protected array $values;
-
-    /** @var array<string, mixed> */
-    protected array $structuredValues;
-
-    /** @var array<string, mixed> */
-    protected array $keys;
-
-    protected mixed $choice1;
-    protected mixed $choice2;
-    protected mixed $choice3;
-    protected mixed $choice4;
-    protected string $value1;
-    protected string $value2;
-    protected string $value3;
-    protected string $value4;
-    protected string $key1;
-    protected string $key2;
-    protected string $key3;
-    protected string $key4;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->list = $this->createChoiceList();
-
-        $choices = $this->getChoices();
-
-        $this->values = $this->getValues();
-        $this->structuredValues = array_combine(array_keys($choices), $this->values);
-        $this->choices = array_combine($this->values, $choices);
-        $this->keys = array_combine($this->values, array_keys($choices));
-
-        // allow access to the individual entries without relying on their indices
-        reset($this->choices);
-        reset($this->values);
-        reset($this->keys);
-
-        for ($i = 1; $i <= 4; ++$i) {
-            $this->{'choice' . $i} = current($this->choices);
-            $this->{'value' . $i} = current($this->values);
-            $this->{'key' . $i} = current($this->keys);
-
-            next($this->choices);
-            next($this->values);
-            next($this->keys);
-        }
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices(): void
-    {
-        self::assertSame($this->choices, $this->list->getChoices());
-    }
-
-    /**
-     * @test
-     */
-    public function get_values(): void
-    {
-        self::assertSame($this->values, $this->list->getValues());
-    }
-
-    /**
-     * @test
-     */
-    public function get_structured_values(): void
-    {
-        self::assertSame($this->values, $this->list->getStructuredValues());
-    }
-
-    /**
-     * @test
-     */
-    public function get_original_keys(): void
-    {
-        self::assertSame($this->keys, $this->list->getOriginalKeys());
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values(): void
-    {
-        $values = [$this->value1, $this->value2];
-        self::assertSame([$this->choice1, $this->choice2], $this->list->getChoicesForValues($values));
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_preserves_keys(): void
-    {
-        $values = [5 => $this->value1, 8 => $this->value2];
-        self::assertSame([5 => $this->choice1, 8 => $this->choice2], $this->list->getChoicesForValues($values));
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_preserves_order(): void
-    {
-        $values = [$this->value2, $this->value1];
-        self::assertSame([$this->choice2, $this->choice1], $this->list->getChoicesForValues($values));
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_ignores_non_existing_values(): void
-    {
-        $values = [$this->value1, $this->value2, 'foobar'];
-        self::assertSame([$this->choice1, $this->choice2], $this->list->getChoicesForValues($values));
-    }
-
-    // https://github.com/symfony/symfony/issues/3446
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_empty(): void
-    {
-        self::assertSame([], $this->list->getChoicesForValues([]));
-    }
-
-    /**
-     * @test
-     */
-    public function get_values_for_choices(): void
-    {
-        $choices = [$this->choice1, $this->choice2];
-        self::assertSame([$this->value1, $this->value2], $this->list->getValuesForChoices($choices));
-    }
-
-    /**
-     * @test
-     */
-    public function get_values_for_choices_preserves_keys(): void
-    {
-        $choices = [5 => $this->choice1, 8 => $this->choice2];
-        self::assertSame([5 => $this->value1, 8 => $this->value2], $this->list->getValuesForChoices($choices));
-    }
-
-    /**
-     * @test
-     */
-    public function get_values_for_choices_preserves_order(): void
-    {
-        $choices = [$this->choice2, $this->choice1];
-        self::assertSame([$this->value2, $this->value1], $this->list->getValuesForChoices($choices));
-    }
-
-    /**
-     * @test
-     */
-    public function get_values_for_choices_ignores_non_existing_choices(): void
-    {
-        $choices = [$this->choice1, $this->choice2, 'foobar'];
-        self::assertSame([$this->value1, $this->value2], $this->list->getValuesForChoices($choices));
-    }
-
-    /**
-     * @test
-     */
-    public function get_values_for_choices_empty(): void
-    {
-        self::assertSame([], $this->list->getValuesForChoices([]));
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_with_null(): void
-    {
-        $values = $this->list->getValuesForChoices([null]);
-
-        self::assertNotEmpty($this->list->getChoicesForValues($values));
-    }
-
-    abstract protected function createChoiceList(): ChoiceList;
-
-    abstract protected function getChoices();
-
-    abstract protected function getValues();
-}
diff --git a/lib/Core/Tests/Extension/Core/ChoiceList/ArrayChoiceListTestCase.php b/lib/Core/Tests/Extension/Core/ChoiceList/ArrayChoiceListTestCase.php
deleted file mode 100644
index 2d676fc4..00000000
--- a/lib/Core/Tests/Extension/Core/ChoiceList/ArrayChoiceListTestCase.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\ChoiceList;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @internal
- */
-final class ArrayChoiceListTestCase extends AbstractChoiceListTestCase
-{
-    private \stdClass $object;
-
-    protected function setUp(): void
-    {
-        $this->object = new \stdClass();
-
-        parent::setUp();
-    }
-
-    protected function createChoiceList(): ChoiceList
-    {
-        return new ArrayChoiceList($this->getChoices());
-    }
-
-    /**
-     * @return mixed[]
-     */
-    protected function getChoices(): array
-    {
-        return [0, 1, 1.5, '1', 'a', false, true, $this->object, null];
-    }
-
-    /**
-     * @return string[]
-     */
-    protected function getValues()
-    {
-        return ['0', '1', '2', '3', '4', '5', '6', '7', '8'];
-    }
-
-    /**
-     * @test
-     */
-    public function create_choice_list_with_value_callback(): void
-    {
-        $callback = static fn ($choice): string => ':' . $choice;
-
-        $choiceList = new ArrayChoiceList([2 => 'foo', 7 => 'bar', 10 => 'baz'], $callback);
-
-        self::assertSame([':foo', ':bar', ':baz'], $choiceList->getValues());
-        self::assertSame([':foo' => 'foo', ':bar' => 'bar', ':baz' => 'baz'], $choiceList->getChoices());
-        self::assertSame([':foo' => 2, ':bar' => 7, ':baz' => 10], $choiceList->getOriginalKeys());
-        self::assertSame([1 => 'foo', 2 => 'baz'], $choiceList->getChoicesForValues([1 => ':foo', 2 => ':baz']));
-        self::assertSame([1 => ':foo', 2 => ':baz'], $choiceList->getValuesForChoices([1 => 'foo', 2 => 'baz']));
-    }
-
-    /**
-     * @test
-     */
-    public function create_choice_list_without_value_callback_and_duplicate_free_to_string_choices(): void
-    {
-        $choiceList = new ArrayChoiceList([2 => 'foo', 7 => 'bar', 10 => 123]);
-
-        self::assertSame(['foo', 'bar', '123'], $choiceList->getValues());
-        self::assertSame(['foo' => 'foo', 'bar' => 'bar', '123' => 123], $choiceList->getChoices());
-        self::assertSame(['foo' => 2, 'bar' => 7, '123' => 10], $choiceList->getOriginalKeys());
-        self::assertSame([1 => 'foo', 2 => 123], $choiceList->getChoicesForValues([1 => 'foo', 2 => '123']));
-        self::assertSame([1 => 'foo', 2 => '123'], $choiceList->getValuesForChoices([1 => 'foo', 2 => 123]));
-    }
-
-    /**
-     * @test
-     */
-    public function create_choice_list_without_value_callback_and_to_string_duplicates(): void
-    {
-        $choiceList = new ArrayChoiceList([2 => 'foo', 7 => '123', 10 => 123]);
-
-        self::assertSame(['0', '1', '2'], $choiceList->getValues());
-        self::assertSame(['0' => 'foo', '1' => '123', '2' => 123], $choiceList->getChoices());
-        self::assertSame(['0' => 2, '1' => 7, '2' => 10], $choiceList->getOriginalKeys());
-        self::assertSame([1 => 'foo', 2 => 123], $choiceList->getChoicesForValues([1 => '0', 2 => '2']));
-        self::assertSame([1 => '0', 2 => '2'], $choiceList->getValuesForChoices([1 => 'foo', 2 => 123]));
-    }
-
-    /**
-     * @test
-     */
-    public function create_choice_list_without_value_callback_and_mixed_choices(): void
-    {
-        $object = new \stdClass();
-        $choiceList = new ArrayChoiceList([2 => 'foo', 5 => [7 => '123'], 10 => $object]);
-
-        self::assertSame(['0', '1', '2'], $choiceList->getValues());
-        self::assertSame(['0' => 'foo', '1' => '123', '2' => $object], $choiceList->getChoices());
-        self::assertSame(['0' => 2, '1' => 7, '2' => 10], $choiceList->getOriginalKeys());
-        self::assertSame([1 => 'foo', 2 => $object], $choiceList->getChoicesForValues([1 => '0', 2 => '2']));
-        self::assertSame([1 => '0', 2 => '2'], $choiceList->getValuesForChoices([1 => 'foo', 2 => $object]));
-    }
-
-    /**
-     * @test
-     */
-    public function create_choice_list_with_grouped_choices(): void
-    {
-        $choiceList = new ArrayChoiceList([
-            'Group 1' => ['A' => 'a', 'B' => 'b'],
-            'Group 2' => ['C' => 'c', 'D' => 'd'],
-        ]);
-
-        self::assertSame(['a', 'b', 'c', 'd'], $choiceList->getValues());
-        self::assertSame([
-            'Group 1' => ['A' => 'a', 'B' => 'b'],
-            'Group 2' => ['C' => 'c', 'D' => 'd'],
-        ], $choiceList->getStructuredValues());
-        self::assertSame(['a' => 'a', 'b' => 'b', 'c' => 'c', 'd' => 'd'], $choiceList->getChoices());
-        self::assertSame(['a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D'], $choiceList->getOriginalKeys());
-        self::assertSame([1 => 'a', 2 => 'b'], $choiceList->getChoicesForValues([1 => 'a', 2 => 'b']));
-        self::assertSame([1 => 'a', 2 => 'b'], $choiceList->getValuesForChoices([1 => 'a', 2 => 'b']));
-    }
-
-    /**
-     * @test
-     */
-    public function compare_choices_by_identity_by_default(): void
-    {
-        $callback = static fn ($choice) => $choice->value;
-
-        $obj1 = (object) ['value' => 'value1'];
-        $obj2 = (object) ['value' => 'value2'];
-
-        $choiceList = new ArrayChoiceList([$obj1, $obj2], $callback);
-        self::assertSame([2 => 'value2'], $choiceList->getValuesForChoices([2 => $obj2]));
-        self::assertSame([2 => 'value2'], $choiceList->getValuesForChoices([2 => (object) ['value' => 'value2']]));
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_with_containing_null(): void
-    {
-        $choiceList = new ArrayChoiceList(['Null' => null]);
-
-        self::assertSame([0 => null], $choiceList->getChoicesForValues(['0']));
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_with_containing_false_and_null(): void
-    {
-        $choiceList = new ArrayChoiceList(['False' => false, 'Null' => null]);
-
-        self::assertSame([0 => null], $choiceList->getChoicesForValues(['1']));
-        self::assertSame([0 => false], $choiceList->getChoicesForValues(['0']));
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_with_containing_empty_string_and_null(): void
-    {
-        $choiceList = new ArrayChoiceList(['Empty String' => '', 'Null' => null]);
-
-        self::assertSame([0 => ''], $choiceList->getChoicesForValues(['0']));
-        self::assertSame([0 => null], $choiceList->getChoicesForValues(['1']));
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_with_containing_empty_string_and_booleans(): void
-    {
-        $choiceList = new ArrayChoiceList(['Empty String' => '', 'True' => true, 'False' => false]);
-
-        self::assertSame([0 => ''], $choiceList->getChoicesForValues(['']));
-        self::assertSame([0 => true], $choiceList->getChoicesForValues(['1']));
-        self::assertSame([0 => false], $choiceList->getChoicesForValues(['0']));
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_with_containing_empty_string_and_floats(): void
-    {
-        $choiceList = new ArrayChoiceList(['Empty String' => '', '1/3' => 0.3, '1/2' => 0.5]);
-
-        self::assertSame([0 => ''], $choiceList->getChoicesForValues(['']));
-        self::assertSame([0 => 0.3], $choiceList->getChoicesForValues(['0.3']));
-        self::assertSame([0 => 0.5], $choiceList->getChoicesForValues(['0.5']));
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ChoiceList/ChoiceListAssertionTrait.php b/lib/Core/Tests/Extension/Core/ChoiceList/ChoiceListAssertionTrait.php
deleted file mode 100644
index d1ef23fa..00000000
--- a/lib/Core/Tests/Extension/Core/ChoiceList/ChoiceListAssertionTrait.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\ChoiceList;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\LazyChoiceList;
-
-trait ChoiceListAssertionTrait
-{
-    private static function assertEqualsArrayChoiceList(ArrayChoiceList $expected, mixed $actual): void
-    {
-        self::assertInstanceOf(ArrayChoiceList::class, $actual);
-        self::assertEquals($expected->getChoices(), $actual->getChoices());
-        self::assertEquals($expected->getStructuredValues(), $actual->getStructuredValues());
-        self::assertEquals($expected->getOriginalKeys(), $actual->getOriginalKeys());
-    }
-
-    private static function assertEqualsLazyChoiceList(LazyChoiceList $expected, mixed $actual): void
-    {
-        self::assertInstanceOf(LazyChoiceList::class, $actual);
-        self::assertEquals($expected->getChoices(), $actual->getChoices());
-        self::assertEquals($expected->getValues(), $actual->getValues());
-        self::assertEquals($expected->getOriginalKeys(), $actual->getOriginalKeys());
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ChoiceList/Factory/CachingFactoryDecoratorTest.php b/lib/Core/Tests/Extension/Core/ChoiceList/Factory/CachingFactoryDecoratorTest.php
deleted file mode 100644
index 6484aa33..00000000
--- a/lib/Core/Tests/Extension/Core/ChoiceList/Factory/CachingFactoryDecoratorTest.php
+++ /dev/null
@@ -1,431 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\ChoiceList\Factory;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\CachingFactoryDecorator;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\DefaultChoiceListFactory;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\LazyChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
-use Rollerworks\Component\Search\Tests\Extension\Core\ChoiceList\ChoiceListAssertionTrait;
-use Rollerworks\Component\Search\Tests\Fixtures\ArrayChoiceLoader;
-
-/**
- * @see Symfony\Component\Form\Tests\ChoiceList\Factory\CachingFactoryDecoratorTest
- *
- * @internal
- */
-final class CachingFactoryDecoratorTest extends TestCase
-{
-    use ChoiceListAssertionTrait;
-
-    private CachingFactoryDecorator $factory;
-
-    protected function setUp(): void
-    {
-        $this->factory = new CachingFactoryDecorator(new DefaultChoiceListFactory());
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_empty(): void
-    {
-        $list1 = $this->factory->createListFromChoices([]);
-        $list2 = $this->factory->createListFromChoices([]);
-
-        self::assertSame($list1, $list2);
-
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList([]), $list1);
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList([]), $list2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_compares_traversable_choices_as_array(): void
-    {
-        // The top-most traversable is converted to an array
-        $choices1 = new \ArrayIterator(['A' => 'a']);
-        $choices2 = ['A' => 'a'];
-
-        $list1 = $this->factory->createListFromChoices($choices1);
-        $list2 = $this->factory->createListFromChoices($choices2);
-
-        self::assertSame($list1, $list2);
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList(['A' => 'a']), $list1);
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList(['A' => 'a']), $list2);
-    }
-
-    /**
-     * @dataProvider provideSameChoices
-     *
-     * @test
-     */
-    public function create_from_choices_same_choices($choice1, $choice2): void
-    {
-        $list1 = $this->factory->createListFromChoices([$choice1]);
-        $list2 = $this->factory->createListFromChoices([$choice2]);
-
-        self::assertSame($list1, $list2);
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList([$choice1]), $list1);
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList([$choice2]), $list2);
-    }
-
-    public static function provideSameChoices(): iterable
-    {
-        $object = (object) ['foo' => 'bar'];
-
-        return [
-            [0, 0],
-            ['a', 'a'],
-            // https://github.com/symfony/symfony/issues/10409
-            [\chr(181) . 'meter', \chr(181) . 'meter'], // UTF-8
-            [$object, $object],
-        ];
-    }
-
-    /**
-     * @dataProvider provideDistinguishedChoices
-     *
-     * @test
-     */
-    public function create_from_choices_different_choices($choice1, $choice2): void
-    {
-        $list1 = $this->factory->createListFromChoices([$choice1]);
-        $list2 = $this->factory->createListFromChoices([$choice2]);
-
-        self::assertNotSame($list1, $list2);
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList([$choice1]), $list1);
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList([$choice2]), $list2);
-    }
-
-    public static function provideDistinguishedChoices(): iterable
-    {
-        return [
-            [0, false],
-            [0, null],
-            [0, '0'],
-            [0, ''],
-            [1, true],
-            [1, '1'],
-            [1, 'a'],
-            ['', false],
-            ['', null],
-            [false, null],
-            // Same properties, but not identical
-            [(object) ['foo' => 'bar'], (object) ['foo' => 'bar']],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_same_value_closure(): void
-    {
-        $choices = [1];
-        $closure = static function (): void {};
-
-        $list1 = $this->factory->createListFromChoices($choices, $closure);
-        $list2 = $this->factory->createListFromChoices($choices, $closure);
-
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList($choices, $closure), $list1);
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList($choices, $closure), $list2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_different_value_closure(): void
-    {
-        $choices = [1];
-        $closure1 = static function (): void {};
-        $closure2 = static function (): void {};
-        $list1 = $this->factory->createListFromChoices($choices, $closure1);
-        $list2 = $this->factory->createListFromChoices($choices, $closure2);
-
-        self::assertNotSame($list1, $list2);
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList($choices, $closure1), $list1);
-        self::assertEqualsArrayChoiceList(new ArrayChoiceList($choices, $closure2), $list2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_loader_same_loader(): void
-    {
-        $loader = new ArrayChoiceLoader();
-        $list1 = $this->factory->createListFromLoader($loader);
-        $list2 = $this->factory->createListFromLoader($loader);
-
-        self::assertEqualsLazyChoiceList(new LazyChoiceList($loader), $list1);
-        self::assertEqualsLazyChoiceList(new LazyChoiceList($loader), $list2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_loader_different_loader(): void
-    {
-        self::assertNotSame($this->factory->createListFromLoader(new ArrayChoiceLoader()), $this->factory->createListFromLoader(new ArrayChoiceLoader()));
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_loader_same_value_closure(): void
-    {
-        $loader = new ArrayChoiceLoader();
-        $closure = static function (): void {};
-        $list1 = $this->factory->createListFromLoader($loader, $closure);
-        $list2 = $this->factory->createListFromLoader($loader, $closure);
-
-        self::assertEqualsLazyChoiceList(new LazyChoiceList($loader, $closure), $list1);
-        self::assertEqualsLazyChoiceList(new LazyChoiceList($loader, $closure), $list2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_different_preferred_choices(): void
-    {
-        $preferred1 = ['a'];
-        $preferred2 = ['b'];
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, $preferred1);
-        $view2 = $this->factory->createView($list, $preferred2);
-
-        self::assertNotSame($view1, $view2);
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_same_preferred_choices(): void
-    {
-        $preferred = ['a'];
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, $preferred);
-        $view2 = $this->factory->createView($list, $preferred);
-
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_different_preferred_choices_closure(): void
-    {
-        $preferred1 = static function (): void {};
-        $preferred2 = static function (): void {};
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, $preferred1);
-        $view2 = $this->factory->createView($list, $preferred2);
-
-        self::assertNotSame($view1, $view2);
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_same_label_closure(): void
-    {
-        $labels = static function (): void {};
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, null, $labels);
-        $view2 = $this->factory->createView($list, null, $labels);
-
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_different_label_closure(): void
-    {
-        $labels1 = static function (): void {};
-        $labels2 = static function (): void {};
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, null, $labels1);
-        $view2 = $this->factory->createView($list, null, $labels2);
-
-        self::assertNotSame($view1, $view2);
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_same_index_closure(): void
-    {
-        $index = static function (): void {};
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, null, null, $index);
-        $view2 = $this->factory->createView($list, null, null, $index);
-
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_same_preferred_choices_closure(): void
-    {
-        $preferred = static function (): void {};
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, $preferred);
-        $view2 = $this->factory->createView($list, $preferred);
-
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_different_index_closure(): void
-    {
-        $index1 = static function (): void {};
-        $index2 = static function (): void {};
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, null, null, $index1);
-        $view2 = $this->factory->createView($list, null, null, $index2);
-
-        self::assertNotSame($view1, $view2);
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_same_group_by_closure(): void
-    {
-        $groupBy = static function (): void {};
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, null, null, null, $groupBy);
-        $view2 = $this->factory->createView($list, null, null, null, $groupBy);
-
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_different_group_by_closure(): void
-    {
-        $groupBy1 = static function (): void {};
-        $groupBy2 = static function (): void {};
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, null, null, null, $groupBy1);
-        $view2 = $this->factory->createView($list, null, null, null, $groupBy2);
-
-        self::assertNotSame($view1, $view2);
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_same_attributes(): void
-    {
-        $attr = ['class' => 'foobar'];
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, null, null, null, null, $attr);
-        $view2 = $this->factory->createView($list, null, null, null, null, $attr);
-
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_different_attributes(): void
-    {
-        $attr1 = ['class' => 'foobar1'];
-        $attr2 = ['class' => 'foobar2'];
-        $list = new ArrayChoiceList([]);
-
-        $view1 = $this->factory->createView($list, null, null, null, null, $attr1);
-        $view2 = $this->factory->createView($list, null, null, null, null, $attr2);
-
-        self::assertNotSame($view1, $view2);
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_same_attributes_closure(): void
-    {
-        $attr = static function (): void {};
-        $list = new ArrayChoiceList([]);
-        $view1 = $this->factory->createView($list, null, null, null, null, $attr);
-        $view2 = $this->factory->createView($list, null, null, null, null, $attr);
-
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_different_attributes_closure(): void
-    {
-        $attr1 = static function (): void {};
-        $attr2 = static function (): void {};
-        $list = new ArrayChoiceList([]);
-
-        $view1 = $this->factory->createView($list, null, null, null, null, $attr1);
-        $view2 = $this->factory->createView($list, null, null, null, null, $attr2);
-
-        self::assertNotSame($view1, $view2);
-        self::assertEquals(new ChoiceListView(), $view1);
-        self::assertEquals(new ChoiceListView(), $view2);
-    }
-
-    public static function provideSameKeyChoices(): iterable
-    {
-        // Only test types here that can be used as array keys
-        return [
-            [0, 0],
-            [0, '0'],
-            ['a', 'a'],
-            [\chr(181) . 'meter', \chr(181) . 'meter'],
-        ];
-    }
-
-    public static function provideDistinguishedKeyChoices(): iterable
-    {
-        // Only test types here that can be used as array keys
-        return [
-            [0, ''],
-            [1, 'a'],
-            ['', 'a'],
-        ];
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ChoiceList/Factory/DefaultChoiceListFactoryTest.php b/lib/Core/Tests/Extension/Core/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
deleted file mode 100644
index f25f4d32..00000000
--- a/lib/Core/Tests/Extension/Core/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
+++ /dev/null
@@ -1,958 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\ChoiceList\Factory;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\DefaultChoiceListFactory;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\LazyChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceGroupView;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceView;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @internal
- */
-final class DefaultChoiceListFactoryTest extends TestCase
-{
-    private object $obj1;
-    private object $obj2;
-    private object $obj3;
-    private object $obj4;
-    private ArrayChoiceList $list;
-    private DefaultChoiceListFactory $factory;
-
-    public function getValue(object $object): mixed
-    {
-        return $object->value;
-    }
-
-    public function getScalarValue(string $choice): string
-    {
-        switch ($choice) {
-            case 'a':
-                return 'a';
-
-            case 'b':
-                return 'b';
-
-            case 'c':
-                return '1';
-
-            case 'd':
-                return '2';
-
-            default:
-                throw new \InvalidArgumentException(\sprintf('Unexpected choice "%s".', $choice));
-        }
-    }
-
-    public function getLabel(object $object): string
-    {
-        return $object->label;
-    }
-
-    public function getFormIndex(object $object)
-    {
-        return $object->index;
-    }
-
-    public function isPreferred(object $object): bool
-    {
-        return $this->obj2 === $object || $this->obj3 === $object;
-    }
-
-    public function getAttr(object $object)
-    {
-        return $object->attr;
-    }
-
-    public function getGroup(object $object): string
-    {
-        return $this->obj1 === $object || $this->obj2 === $object ? 'Group 1' : 'Group 2';
-    }
-
-    public function getGroupAsObject(object $object): DefaultChoiceListFactoryTest_Castable
-    {
-        return $this->obj1 === $object || $this->obj2 === $object
-            ? new DefaultChoiceListFactoryTest_Castable('Group 1')
-            : new DefaultChoiceListFactoryTest_Castable('Group 2');
-    }
-
-    protected function setUp(): void
-    {
-        $this->obj1 = (object) [
-            'label' => 'A',
-            'index' => 'w',
-            'value' => 'a',
-            'preferred' => false,
-            'group' => 'Group 1',
-            'attr' => [],
-        ];
-
-        $this->obj2 = (object) [
-            'label' => 'B',
-            'index' => 'x',
-            'value' => 'b',
-            'preferred' => true,
-            'group' => 'Group 1',
-            'attr' => ['attr1' => 'value1'],
-        ];
-
-        $this->obj3 = (object) [
-            'label' => 'C',
-            'index' => 'y',
-            'value' => 1,
-            'preferred' => true,
-            'group' => 'Group 2',
-            'attr' => ['attr2' => 'value2'],
-        ];
-
-        $this->obj4 = (object) [
-            'label' => 'D',
-            'index' => 'z',
-            'value' => 2,
-            'preferred' => false,
-            'group' => 'Group 2',
-            'attr' => [],
-        ];
-
-        $this->factory = new DefaultChoiceListFactory();
-        $this->list = new ArrayChoiceList(
-            [
-                'A' => $this->obj1,
-                'B' => $this->obj2,
-                'C' => $this->obj3,
-                'D' => $this->obj4,
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_empty(): void
-    {
-        $list = $this->factory->createListFromChoices([]);
-
-        self::assertSame([], $list->getChoices());
-        self::assertSame([], $list->getValues());
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_flat(): void
-    {
-        $list = $this->factory->createListFromChoices(
-            ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4]
-        );
-
-        $this->assertObjectListWithGeneratedValues($list);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_flat_traversable(): void
-    {
-        $list = $this->factory->createListFromChoices(
-            new \ArrayIterator(['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4])
-        );
-
-        $this->assertObjectListWithGeneratedValues($list);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_flat_values_as_callable(): void
-    {
-        $list = $this->factory->createListFromChoices(
-            ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4],
-            $this->getValue(...)
-        );
-
-        $this->assertObjectListWithCustomValues($list);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_flat_values_as_closure(): void
-    {
-        $list = $this->factory->createListFromChoices(
-            ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4],
-            static fn ($object) => $object->value
-        );
-
-        $this->assertObjectListWithCustomValues($list);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_grouped(): void
-    {
-        $list = $this->factory->createListFromChoices(
-            [
-                'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
-                'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
-            ]
-        );
-
-        $this->assertObjectListWithGeneratedValues($list);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_grouped_traversable(): void
-    {
-        $list = $this->factory->createListFromChoices(
-            new \ArrayIterator([
-                'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
-                'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
-            ])
-        );
-
-        $this->assertObjectListWithGeneratedValues($list);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_grouped_values_as_callable(): void
-    {
-        $list = $this->factory->createListFromChoices(
-            [
-                'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
-                'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
-            ],
-            $this->getValue(...)
-        );
-
-        $this->assertObjectListWithCustomValues($list);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_grouped_values_as_closure(): void
-    {
-        $list = $this->factory->createListFromChoices(
-            [
-                'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
-                'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
-            ],
-            static fn ($object) => $object->value
-        );
-
-        $this->assertObjectListWithCustomValues($list);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_loader(): void
-    {
-        $loader = $this->createMock(ChoiceLoader::class);
-
-        $list = $this->factory->createListFromLoader($loader);
-
-        self::assertEquals(new LazyChoiceList($loader), $list);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_loader_with_values(): void
-    {
-        $loader = $this->createMock(ChoiceLoader::class);
-
-        $value = static function (): void {};
-        $list = $this->factory->createListFromLoader($loader, $value);
-
-        self::assertEquals(new LazyChoiceList($loader, $value), $list);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat(): void
-    {
-        $view = $this->factory->createView($this->list);
-
-        self::assertEquals(
-            new ChoiceListView(
-                [
-                    0 => new ChoiceView($this->obj1, '0', 'A'),
-                    1 => new ChoiceView($this->obj2, '1', 'B'),
-                    2 => new ChoiceView($this->obj3, '2', 'C'),
-                    3 => new ChoiceView($this->obj4, '3', 'D'),
-                ],
-                []
-            ),
-            $view
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_preferred_choices(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3]
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_preferred_choices_empty_array(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            []
-        );
-
-        self::assertEquals(
-            new ChoiceListView(
-                [
-                    0 => new ChoiceView($this->obj1, '0', 'A'),
-                    1 => new ChoiceView($this->obj2, '1', 'B'),
-                    2 => new ChoiceView($this->obj3, '2', 'C'),
-                    3 => new ChoiceView($this->obj4, '3', 'D'),
-                ],
-                []
-            ),
-            $view
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_preferred_choices_as_callable(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            $this->isPreferred(...)
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_preferred_choices_as_closure(): void
-    {
-        $obj2 = $this->obj2;
-        $obj3 = $this->obj3;
-
-        $view = $this->factory->createView(
-            $this->list,
-            static fn ($object): bool => $obj2 === $object || $obj3 === $object
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_preferred_choices_closure_receives_key(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            static fn ($object, $key): bool => $key === 'B' || $key === 'C'
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_preferred_choices_closure_receives_value(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            static fn ($object, $key, $value): bool => $value === '1' || $value === '2'
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_label_as_callable(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            $this->getLabel(...)
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_label_as_closure(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            static fn ($object) => $object->label
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_label_closure_receives_key(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            static fn ($object, $key) => $key
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_label_closure_receives_value(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            static function ($object, $key, $value) {
-                switch ($value) {
-                    case '0': return 'A';
-
-                    case '1': return 'B';
-
-                    case '2': return 'C';
-
-                    case '3': return 'D';
-                }
-            }
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_index_as_callable(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            $this->getFormIndex(...)
-        );
-
-        $this->assertFlatViewWithCustomIndices($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_index_as_closure(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            static fn ($object) => $object->index
-        );
-
-        $this->assertFlatViewWithCustomIndices($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_index_closure_receives_key(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            static function ($object, $key) {
-                switch ($key) {
-                    case 'A': return 'w';
-
-                    case 'B': return 'x';
-
-                    case 'C': return 'y';
-
-                    case 'D': return 'z';
-                }
-            }
-        );
-
-        $this->assertFlatViewWithCustomIndices($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_index_closure_receives_value(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            static function ($object, $key, $value) {
-                switch ($value) {
-                    case '0': return 'w';
-
-                    case '1': return 'x';
-
-                    case '2': return 'y';
-
-                    case '3': return 'z';
-                }
-            }
-        );
-
-        $this->assertFlatViewWithCustomIndices($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_group_by_original_structure(): void
-    {
-        $list = new ArrayChoiceList([
-            'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
-            'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
-            'Group empty' => [],
-        ]);
-
-        $view = $this->factory->createView(
-            $list,
-            [$this->obj2, $this->obj3]
-        );
-
-        $this->assertGroupedView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_group_by_empty(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            null // ignored
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_group_by_as_callable(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            $this->getGroup(...)
-        );
-
-        $this->assertGroupedView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_group_by_object_that_can_be_cast_to_string(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            $this->getGroupAsObject(...)
-        );
-
-        $this->assertGroupedView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_group_by_as_closure(): void
-    {
-        $obj1 = $this->obj1;
-        $obj2 = $this->obj2;
-
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            static fn ($object): string => $obj1 === $object || $obj2 === $object ? 'Group 1' : 'Group 2'
-        );
-
-        $this->assertGroupedView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_group_by_closure_receives_key(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            static fn ($object, $key): string => $key === 'A' || $key === 'B' ? 'Group 1' : 'Group 2'
-        );
-
-        $this->assertGroupedView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_group_by_closure_receives_value(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            static fn ($object, $key, $value): string => $value === '0' || $value === '1' ? 'Group 1' : 'Group 2'
-        );
-
-        $this->assertGroupedView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_attr_as_array(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            null, // group
-            [
-                'B' => ['attr1' => 'value1'],
-                'C' => ['attr2' => 'value2'],
-            ]
-        );
-
-        $this->assertFlatViewWithAttr($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_attr_empty(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            null, // group
-            []
-        );
-
-        $this->assertFlatView($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_attr_as_callable(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            null, // group
-            $this->getAttr(...)
-        );
-
-        $this->assertFlatViewWithAttr($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_attr_as_closure(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            null, // group
-            static fn ($object) => $object->attr
-        );
-
-        $this->assertFlatViewWithAttr($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_attr_closure_receives_key(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            null, // group
-            static fn ($object, $key): array => match ($key) {
-                'B' => ['attr1' => 'value1'],
-                'C' => ['attr2' => 'value2'],
-                default => [],
-            }
-        );
-
-        $this->assertFlatViewWithAttr($view);
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_flat_attr_closure_receives_value(): void
-    {
-        $view = $this->factory->createView(
-            $this->list,
-            [$this->obj2, $this->obj3],
-            null, // label
-            null, // index
-            null, // group
-            static fn ($object, $key, $value): array => match ($value) {
-                '1' => ['attr1' => 'value1'],
-                '2' => ['attr2' => 'value2'],
-                default => [],
-            }
-        );
-
-        $this->assertFlatViewWithAttr($view);
-    }
-
-    private function assertObjectListWithGeneratedValues(ChoiceList $list): void
-    {
-        self::assertSame(['0', '1', '2', '3'], $list->getValues());
-
-        self::assertSame([
-            0 => $this->obj1,
-            1 => $this->obj2,
-            2 => $this->obj3,
-            3 => $this->obj4,
-        ], $list->getChoices());
-
-        self::assertSame([
-            0 => 'A',
-            1 => 'B',
-            2 => 'C',
-            3 => 'D',
-        ], $list->getOriginalKeys());
-    }
-
-    private function assertScalarListWithCustomValues(ChoiceList $list): void
-    {
-        self::assertSame(['a', 'b', '1', '2'], $list->getValues());
-
-        self::assertSame(
-            [
-                'a' => 'a',
-                'b' => 'b',
-                1 => 'c',
-                2 => 'd',
-            ],
-            $list->getChoices()
-        );
-
-        self::assertSame(
-            [
-                'a' => 'A',
-                'b' => 'B',
-                1 => 'C',
-                2 => 'D',
-            ],
-            $list->getOriginalKeys()
-        );
-    }
-
-    private function assertObjectListWithCustomValues(ChoiceList $list): void
-    {
-        self::assertSame(['a', 'b', '1', '2'], $list->getValues());
-
-        self::assertSame(
-            [
-                'a' => $this->obj1,
-                'b' => $this->obj2,
-                1 => $this->obj3,
-                2 => $this->obj4,
-            ],
-            $list->getChoices()
-        );
-
-        self::assertSame(
-            [
-                'a' => 'A',
-                'b' => 'B',
-                1 => 'C',
-                2 => 'D',
-            ],
-            $list->getOriginalKeys()
-        );
-    }
-
-    private function assertFlatView($view): void
-    {
-        self::assertEquals(
-            new ChoiceListView(
-                [
-                    0 => new ChoiceView($this->obj1, '0', 'A'),
-                    3 => new ChoiceView($this->obj4, '3', 'D'),
-                ],
-                [
-                    1 => new ChoiceView($this->obj2, '1', 'B'),
-                    2 => new ChoiceView($this->obj3, '2', 'C'),
-                ]
-            ),
-            $view
-        );
-    }
-
-    private function assertFlatViewWithCustomIndices($view): void
-    {
-        self::assertEquals(
-            new ChoiceListView(
-                [
-                    'w' => new ChoiceView($this->obj1, '0', 'A'),
-                    'z' => new ChoiceView($this->obj4, '3', 'D'),
-                ],
-                [
-                    'x' => new ChoiceView($this->obj2, '1', 'B'),
-                    'y' => new ChoiceView($this->obj3, '2', 'C'),
-                ]
-            ),
-            $view
-        );
-    }
-
-    private function assertFlatViewWithAttr($view): void
-    {
-        self::assertEquals(
-            new ChoiceListView(
-                [
-                    0 => new ChoiceView($this->obj1, '0', 'A'),
-                    3 => new ChoiceView($this->obj4, '3', 'D'),
-                ],
-                [
-                    1 => new ChoiceView(
-                        $this->obj2,
-                        '1',
-                        'B',
-                        ['attr1' => 'value1']
-                    ),
-                    2 => new ChoiceView(
-                        $this->obj3,
-                        '2',
-                        'C',
-                        ['attr2' => 'value2']
-                    ),
-                ]
-            ),
-            $view
-        );
-    }
-
-    private function assertGroupedView($view): void
-    {
-        self::assertEquals(
-            new ChoiceListView(
-                [
-                    'Group 1' => new ChoiceGroupView(
-                        'Group 1',
-                        [0 => new ChoiceView($this->obj1, '0', 'A')]
-                    ),
-                    'Group 2' => new ChoiceGroupView(
-                        'Group 2',
-                        [3 => new ChoiceView($this->obj4, '3', 'D')]
-                    ),
-                ],
-                [
-                    'Group 1' => new ChoiceGroupView(
-                        'Group 1',
-                        [1 => new ChoiceView($this->obj2, '1', 'B')]
-                    ),
-                    'Group 2' => new ChoiceGroupView(
-                        'Group 2',
-                        [2 => new ChoiceView($this->obj3, '2', 'C')]
-                    ),
-                ]
-            ),
-            $view
-        );
-    }
-}
-
-/**
- * @ignore
- */
-final class DefaultChoiceListFactoryTest_Castable implements \Stringable
-{
-    public function __construct(
-        private mixed $property,
-    ) {
-    }
-
-    public function __toString(): string
-    {
-        return (string) $this->property;
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ChoiceList/Factory/PropertyAccessDecoratorTest.php b/lib/Core/Tests/Extension/Core/ChoiceList/Factory/PropertyAccessDecoratorTest.php
deleted file mode 100644
index 2341beb3..00000000
--- a/lib/Core/Tests/Extension/Core/ChoiceList/Factory/PropertyAccessDecoratorTest.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\ChoiceList\Factory;
-
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\ChoiceListFactory;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\PropertyAccessDecorator;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
-use Symfony\Component\PropertyAccess\PropertyPath;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @internal
- */
-final class PropertyAccessDecoratorTest extends TestCase
-{
-    /** @var MockObject&ChoiceListFactory */
-    private MockObject $decoratedFactory;
-
-    private PropertyAccessDecorator $factory;
-
-    protected function setUp(): void
-    {
-        $this->decoratedFactory = $this->createMock(ChoiceListFactory::class);
-        $this->factory = new PropertyAccessDecorator($this->decoratedFactory);
-    }
-
-    private static function assertChoiceListEquals(ChoiceList $list, $expectedValue = 'value'): void
-    {
-        self::assertSame([$expectedValue ?? 0 => $expectedValue], $list->getChoices(), 'Choices are not the same');
-        self::assertSame([0 => $expectedValue ?? '0'], $list->getStructuredValues(), 'StructuredValues are not the same');
-        self::assertSame([$expectedValue ?? 0 => 0], $list->getOriginalKeys(), 'Originals are not the same');
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_property_path(): void
-    {
-        $choices = [(object) ['property' => 'value']];
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createListFromChoices')
-            ->with($choices, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($choices, $callback): ArrayChoiceList => new ArrayChoiceList(array_map($callback, $choices)))
-        ;
-
-        self::assertChoiceListEquals($this->factory->createListFromChoices($choices, 'property'));
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_choices_property_path_instance(): void
-    {
-        $choices = [(object) ['property' => 'value']];
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createListFromChoices')
-            ->with($choices, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($choices, $callback): ArrayChoiceList => new ArrayChoiceList(array_map($callback, $choices)))
-        ;
-
-        self::assertChoiceListEquals($this->factory->createListFromChoices($choices, new PropertyPath('property')));
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_loader_property_path(): void
-    {
-        $loader = $this->createMock(ChoiceLoader::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createListFromLoader')
-            ->with($loader, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($loader, $callback): ArrayChoiceList => new ArrayChoiceList([$callback((object) ['property' => 'value'])]))
-        ;
-
-        self::assertChoiceListEquals($this->factory->createListFromLoader($loader, 'property'));
-    }
-
-    // https://github.com/symfony/symfony/issues/5494
-
-    /**
-     * @test
-     */
-    public function create_from_choices_assume_null_if_value_property_path_unreadable(): void
-    {
-        $choices = [null];
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createListFromChoices')
-            ->with($choices, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($choices, $callback): ArrayChoiceList => new ArrayChoiceList(array_map($callback, $choices)))
-        ;
-
-        self::assertChoiceListEquals($this->factory->createListFromChoices($choices, 'property'), null);
-    }
-
-    // https://github.com/symfony/symfony/issues/5494
-
-    /**
-     * @test
-     */
-    public function create_from_choice_loader_assume_null_if_value_property_path_unreadable(): void
-    {
-        $loader = $this->createMock(ChoiceLoader::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createListFromLoader')
-            ->with($loader, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($loader, $callback): ArrayChoiceList => new ArrayChoiceList([$callback(null)]))
-        ;
-
-        self::assertChoiceListEquals($this->factory->createListFromLoader($loader, 'property'), null);
-    }
-
-    /**
-     * @test
-     */
-    public function create_from_loader_property_path_instance(): void
-    {
-        $loader = $this->createMock(ChoiceLoader::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createListFromLoader')
-            ->with($loader, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($loader, $callback): ArrayChoiceList => new ArrayChoiceList([$callback((object) ['property' => 'value'])]))
-        ;
-
-        self::assertChoiceListEquals($this->factory->createListFromLoader($loader, new PropertyPath('property')));
-    }
-
-    // NB. The tests use the 'choices' of the view to transport the tested component
-    // to the tests. Symfony originally returned the value as-is, but RollerworksSearch
-    // uses strict return types.
-
-    /**
-     * @test
-     */
-    public function create_view_preferred_choices_as_property_path(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred): ChoiceListView => new ChoiceListView([], [$preferred((object) ['property' => true])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView([], [0 => true]),
-            $this->factory->createView(
-                $list,
-                'property'
-            )
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_preferred_choices_as_property_path_instance(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred): ChoiceListView => new ChoiceListView([], [$preferred((object) ['property' => true])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView([], [0 => true]),
-            $this->factory->createView(
-                $list,
-                new PropertyPath('property')
-            )
-        );
-    }
-
-    // https://github.com/symfony/symfony/issues/5494
-
-    /**
-     * @test
-     */
-    public function create_view_assume_null_if_preferred_choices_property_path_unreadable(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred): ChoiceListView => new ChoiceListView([], [$preferred((object) ['category' => null])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView([], [0 => false]),
-            $this->factory->createView(
-                $list,
-                'category.preferred'
-            )
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_labels_as_property_path(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, null, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred, $label): ChoiceListView => new ChoiceListView([$label((object) ['property' => 'label'])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView(['label']),
-            $this->factory->createView(
-                $list,
-                null, // preferred choices
-                'property'
-            )
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_labels_as_property_path_instance(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, null, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred, $label): ChoiceListView => new ChoiceListView([$label((object) ['property' => 'label'])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView(['label']),
-            $this->factory->createView(
-                $list,
-                null, // preferred choices
-                new PropertyPath('property')
-            )
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_indices_as_property_path(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, null, null, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred, $label, $index): ChoiceListView => new ChoiceListView([$index((object) ['property' => 'index'])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView(['index']),
-            $this->factory->createView(
-                $list,
-                null, // preferred choices
-                null, // label
-                'property'
-            )
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_indices_as_property_path_instance(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, null, null, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred, $label, $index): ChoiceListView => new ChoiceListView([$index((object) ['property' => 'index'])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView(['index']),
-            $this->factory->createView(
-                $list,
-                null, // preferred choices
-                null, // label
-                new PropertyPath('property')
-            )
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_groups_as_property_path(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, null, null, null, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred, $label, $index, $groupBy): ChoiceListView => new ChoiceListView([$groupBy((object) ['property' => 'group'])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView(['group']),
-            $this->factory->createView(
-                $list,
-                null, // preferred choices
-                null, // label
-                null, // index
-                'property'
-            )
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_groups_as_property_path_instance(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, null, null, null, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred, $label, $index, $groupBy): ChoiceListView => new ChoiceListView([$groupBy((object) ['property' => 'group'])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView(['group']),
-            $this->factory->createView(
-                $list,
-                null, // preferred choices
-                null, // label
-                null, // index
-                new PropertyPath('property')
-            )
-        );
-    }
-
-    // https://github.com/symfony/symfony/issues/5494
-
-    /**
-     * @test
-     */
-    public function create_view_assume_null_if_groups_property_path_unreadable(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, null, null, null, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred, $label, $index, $groupBy): ChoiceListView => new ChoiceListView([$groupBy((object) ['group' => null])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView([null]),
-            $this->factory->createView(
-                $list,
-                null, // preferred choices
-                null, // label
-                null, // index
-                'group.name'
-            )
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_attr_as_property_path(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, null, null, null, null, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred, $label, $index, $groupBy, $attr): ChoiceListView => new ChoiceListView([$attr((object) ['property' => 'attr'])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView(['attr']),
-            $this->factory->createView(
-                $list,
-                null, // preferred choices
-                null, // label
-                null, // index
-                null, // groups
-                'property'
-            )
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function create_view_attr_as_property_path_instance(): void
-    {
-        $list = $this->createMock(ChoiceList::class);
-
-        $this->decoratedFactory->expects(self::once())
-            ->method('createView')
-            ->with($list, null, null, null, null, self::isInstanceOf('\Closure'))
-            ->willReturnCallback(static fn ($list, $preferred, $label, $index, $groupBy, $attr): ChoiceListView => new ChoiceListView([$attr((object) ['property' => 'attr'])]))
-        ;
-
-        self::assertEquals(
-            new ChoiceListView(['attr']),
-            $this->factory->createView(
-                $list,
-                null, // preferred choices
-                null, // label
-                null, // index
-                null, // groups
-                new PropertyPath('property')
-            )
-        );
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php b/lib/Core/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php
deleted file mode 100644
index c0a95d01..00000000
--- a/lib/Core/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\ChoiceList;
-
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\LazyChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @internal
- */
-final class LazyChoiceListTest extends TestCase
-{
-    private LazyChoiceList $list;
-
-    /** @var MockObject&ChoiceList */
-    private MockObject $loadedList;
-
-    /** @var MockObject&ChoiceLoader */
-    private MockObject $loader;
-
-    private \Closure $value;
-
-    protected function setUp(): void
-    {
-        $this->loadedList = $this->createMock(ChoiceList::class);
-        $this->loader = $this->createMock(ChoiceLoader::class);
-        $this->value = static function (): void {};
-
-        $this->list = new LazyChoiceList($this->loader, $this->value);
-    }
-
-    /**
-     * @test
-     */
-    public function get_choice_loaders_loads_list(): void
-    {
-        $this->loader->expects(self::exactly(2))
-            ->method('loadChoiceList')
-            ->with($this->value)
-            ->willReturn($this->loadedList)
-        ;
-
-        // The same list is returned by the loader
-        $this->loadedList->expects(self::exactly(2))
-            ->method('getChoices')
-            ->willReturn(['RESULT'])
-        ;
-
-        self::assertSame(['RESULT'], $this->list->getChoices());
-        self::assertSame(['RESULT'], $this->list->getChoices());
-    }
-
-    /**
-     * @test
-     */
-    public function get_values_loads_loaded_list(): void
-    {
-        $this->loader->expects(self::exactly(2))
-            ->method('loadChoiceList')
-            ->with($this->value)
-            ->willReturn($this->loadedList)
-        ;
-
-        // The same list is returned by the loader
-        $this->loadedList->expects(self::exactly(2))
-            ->method('getValues')
-            ->willReturn(['RESULT'])
-        ;
-
-        self::assertSame(['RESULT'], $this->list->getValues());
-        self::assertSame(['RESULT'], $this->list->getValues());
-    }
-
-    /**
-     * @test
-     */
-    public function get_structured_values_loads_loaded_lis(): void
-    {
-        $this->loader->expects(self::exactly(2))
-            ->method('loadChoiceList')
-            ->with($this->value)
-            ->willReturn($this->loadedList)
-        ;
-
-        // The same list is returned by the loader
-        $this->loadedList->expects(self::exactly(2))
-            ->method('getStructuredValues')
-            ->willReturn(['RESULT'])
-        ;
-
-        self::assertSame(['RESULT'], $this->list->getStructuredValues());
-        self::assertSame(['RESULT'], $this->list->getStructuredValues());
-    }
-
-    /**
-     * @test
-     */
-    public function get_original_keys_loads_loaded_list(): void
-    {
-        $this->loader->expects(self::exactly(2))
-            ->method('loadChoiceList')
-            ->with($this->value)
-            ->willReturn($this->loadedList)
-        ;
-
-        // The same list is returned by the loader
-        $this->loadedList->expects(self::exactly(2))
-            ->method('getOriginalKeys')
-            ->willReturn(['RESULT'])
-        ;
-
-        self::assertSame(['RESULT'], $this->list->getOriginalKeys());
-        self::assertSame(['RESULT'], $this->list->getOriginalKeys());
-    }
-
-    /**
-     * @test
-     */
-    public function get_choices_for_values_forwards_call(): void
-    {
-        $this->loader->expects(self::exactly(2))
-            ->method('loadChoicesForValues')
-            ->with(['a', 'b'])
-            ->willReturn(['RESULT'])
-        ;
-
-        self::assertSame(['RESULT'], $this->list->getChoicesForValues(['a', 'b']));
-        self::assertSame(['RESULT'], $this->list->getChoicesForValues(['a', 'b']));
-    }
-
-    /**
-     * @test
-     */
-    public function get_values_for_choices_uses_loaded_list(): void
-    {
-        $this->loader->expects(self::exactly(2))
-            ->method('loadValuesForChoices')
-            ->with(['a', 'b'])
-            ->willReturn(['RESULT'])
-        ;
-
-        // load choice list
-        $this->list->getChoices();
-
-        self::assertSame(['RESULT'], $this->list->getValuesForChoices(['a', 'b']));
-        self::assertSame(['RESULT'], $this->list->getValuesForChoices(['a', 'b']));
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ChoiceList/Loader/CallbackChoiceLoaderTest.php b/lib/Core/Tests/Extension/Core/ChoiceList/Loader/CallbackChoiceLoaderTest.php
deleted file mode 100644
index 9b5383e3..00000000
--- a/lib/Core/Tests/Extension/Core/ChoiceList/Loader/CallbackChoiceLoaderTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\ChoiceList\Loader;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\LazyChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\CallbackChoiceLoader;
-
-/**
- * @author Jules Pietri <jules@heahprod.com>
- *
- * @internal
- */
-final class CallbackChoiceLoaderTest extends TestCase
-{
-    private static ?CallbackChoiceLoader $loader;
-    private static ?LazyChoiceList $lazyChoiceList;
-
-    /** @var callable|null */
-    private static $value;
-
-    /** @var object[] */
-    private static array $choices;
-
-    /** @var string[] */
-    private static array $choiceValues;
-
-    public static function setUpBeforeClass(): void
-    {
-        self::$loader = new CallbackChoiceLoader(static fn () => self::$choices);
-
-        self::$value = static fn ($choice) => $choice->value ?? null;
-
-        self::$choices = [
-            (object) ['value' => 'choice_one'],
-            (object) ['value' => 'choice_two'],
-        ];
-
-        self::$choiceValues = ['choice_one', 'choice_two'];
-        self::$lazyChoiceList = new LazyChoiceList(self::$loader, self::$value);
-    }
-
-    /**
-     * @test
-     */
-    public function load_choice_list_only_once(): void
-    {
-        $loadedChoiceList = self::$loader->loadChoiceList(self::$value);
-
-        self::assertSame($loadedChoiceList, self::$loader->loadChoiceList(self::$value));
-    }
-
-    /**
-     * @test
-     */
-    public function load_choices_for_values_loads_choice_list_on_first_call(): void
-    {
-        self::assertSame(
-            self::$loader->loadChoicesForValues(self::$choiceValues, self::$value),
-            self::$lazyChoiceList->getChoicesForValues(self::$choiceValues),
-            'Choice list should not be reloaded.'
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function load_values_for_choices_loads_choice_list_on_first_call(): void
-    {
-        self::assertSame(
-            self::$loader->loadValuesForChoices(self::$choices, self::$value),
-            self::$lazyChoiceList->getValuesForChoices(self::$choices),
-            'Choice list should not be reloaded.'
-        );
-    }
-
-    public static function tearDownAfterClass(): void
-    {
-        self::$loader = null;
-        self::$value = null;
-        self::$choices = [];
-        self::$choiceValues = [];
-        self::$lazyChoiceList = null;
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
deleted file mode 100644
index 42f23a7d..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\BaseDateTimeTransformer;
-
-/**
- * @internal
- */
-final class BaseDateTimeTransformerTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function construct_fails_if_input_timezone_is_invalid(): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('this_timezone_does_not_exist');
-
-        $this->getMockBuilder(BaseDateTimeTransformer::class)->setConstructorArgs(['this_timezone_does_not_exist'])->getMock();
-    }
-
-    /**
-     * @test
-     */
-    public function construct_fails_if_output_timezone_is_invalid(): void
-    {
-        $this->expectExceptionMessage('that_timezone_does_not_exist');
-        $this->expectException(InvalidArgumentException::class);
-
-        $this->getMockBuilder(BaseDateTimeTransformer::class)->setConstructorArgs([null, 'that_timezone_does_not_exist'])->getMock();
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/BirthdayTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/BirthdayTransformerTest.php
deleted file mode 100644
index 86c8cd69..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/BirthdayTransformerTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\BirthdayTransformer;
-
-/**
- * @internal
- */
-final class BirthdayTransformerTest extends TestCase
-{
-    use ProphecyTrait;
-
-    /**
-     * @test
-     */
-    public function it_transforms_age_to_integer(): void
-    {
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform(Argument::any())->shouldNotBeCalled();
-        $dateTransformer->transform(Argument::any())->shouldNotBeCalled();
-
-        $transformer = new BirthdayTransformer($dateTransformer->reveal());
-
-        self::assertEquals(18, $transformer->reverseTransform('18'));
-        self::assertEquals('18', $transformer->transform(18));
-    }
-
-    /**
-     * @test
-     */
-    public function it_transforms_with_date(): void
-    {
-        $date = new \DateTimeImmutable('2010-03-05 00:00:00 UTC');
-
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform('2010-03-05')->willReturn($date);
-        $dateTransformer->transform($date)->willReturn('2010-03-05');
-
-        $transformer = new BirthdayTransformer($dateTransformer->reveal());
-
-        self::assertEquals($date, $transformer->reverseTransform('2010-03-05'));
-        self::assertEquals('2010-03-05', $transformer->transform($date));
-
-        self::assertEquals(18, $transformer->reverseTransform('18'));
-        self::assertEquals('18', $transformer->transform(18));
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_disabled_age(): void
-    {
-        $date = new \DateTimeImmutable('2010-03-05 00:00:00 UTC');
-
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform('2010-03-05')->willReturn($date);
-        $dateTransformer->transform($date)->willReturn('2010-03-05');
-
-        $transformer = new BirthdayTransformer($dateTransformer->reveal(), false);
-
-        self::assertEquals($date, $transformer->reverseTransform('2010-03-05'));
-        self::assertEquals('2010-03-05', $transformer->transform($date));
-
-        try {
-            $transformer->reverseTransform('18');
-
-            self::fail('Age should not be reverseTransformed.');
-        } catch (TransformationFailedException $e) {
-            self::assertEquals('Age support is not enabled.', $e->getMessage());
-        }
-
-        try {
-            $transformer->transform(18);
-
-            self::fail('Age should not be transformed.');
-        } catch (TransformationFailedException $e) {
-            self::assertEquals('Age support is not enabled.', $e->getMessage());
-        }
-    }
-
-    /**
-     * @test
-     */
-    public function it_disallows_date_in_the_future_by_default(): void
-    {
-        $dateObj = new \DateTimeImmutable('tomorrow');
-
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform($dateObj->format('Y-m-d'))->willReturn($dateObj);
-
-        $transformer = new BirthdayTransformer($dateTransformer->reveal());
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage(\sprintf('Date "%s" is higher then current date ', $dateObj->format('Y-m-d')));
-
-        $transformer->reverseTransform($dateObj->format('Y-m-d'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_date_in_the_future_when_enabled(): void
-    {
-        $dateObj = new \DateTimeImmutable('tomorrow');
-
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform($dateObj->format('Y-m-d'))->willReturn($dateObj);
-        $dateTransformer->transform($dateObj)->willReturn($dateObj->format('Y-m-d'));
-
-        $transformer = new BirthdayTransformer($dateTransformer->reveal(), false, true);
-
-        self::assertEquals($dateObj, $transformer->reverseTransform($dateObj->format('Y-m-d')));
-        self::assertEquals($dateObj->format('Y-m-d'), $transformer->transform($dateObj));
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/BooleanToLocalizedValueTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/BooleanToLocalizedValueTransformerTest.php
deleted file mode 100644
index e36e82c8..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/BooleanToLocalizedValueTransformerTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\BooleanToLocalizedValueTransformer;
-
-/**
- * @internal
- */
-final class BooleanToLocalizedValueTransformerTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_transforms_from_string(): void
-    {
-        $transformer = new BooleanToLocalizedValueTransformer();
-
-        self::assertNull($transformer->transform(null));
-        self::assertNull($transformer->reverseTransform(null));
-        self::assertNull($transformer->reverseTransform(''));
-
-        self::assertEquals('yes', $transformer->transform(true));
-        self::assertEquals('no', $transformer->transform(false));
-
-        self::assertTrue($transformer->reverseTransform('true'));
-        self::assertFalse($transformer->reverseTransform('false'));
-
-        // Label Aliases
-        self::assertTrue($transformer->reverseTransform('yes'));
-        self::assertFalse($transformer->reverseTransform('no'));
-
-        // Case insensitive
-        self::assertTrue($transformer->reverseTransform('YES'));
-        self::assertFalse($transformer->reverseTransform('NO'));
-
-        // Numeric values
-        self::assertTrue($transformer->reverseTransform('1'));
-        self::assertFalse($transformer->reverseTransform('0'));
-        self::assertTrue($transformer->reverseTransform(1));
-        self::assertFalse($transformer->reverseTransform(0));
-    }
-
-    /**
-     * @test
-     */
-    public function it_fails_with_none_scalar(): void
-    {
-        $transformer = new BooleanToLocalizedValueTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('Expected a boolean value, got "array".');
-
-        $transformer->transform([]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_fails_with_none_scalar_reverse(): void
-    {
-        $transformer = new BooleanToLocalizedValueTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('Expected a scalar value, got "array".');
-
-        $transformer->reverseTransform([]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_when_reverse_value_is_not_supported(): void
-    {
-        $transformer = new BooleanToLocalizedValueTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('Expected one of ("true", "1", "1", "on", "yes") or ("false", "0", "0", "off", "no"), got "foo".');
-
-        $transformer->reverseTransform('foo');
-    }
-
-    /**
-     * @test
-     */
-    public function it_when_numeric_reverse_value_is_not_supported(): void
-    {
-        $transformer = new BooleanToLocalizedValueTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('Expected one of ("true", "1", "1", "on", "yes") or ("false", "0", "0", "off", "no"), got "4".');
-
-        $transformer->reverseTransform(4);
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/ChoiceToLabelTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/ChoiceToLabelTransformerTest.php
deleted file mode 100644
index 77b1e219..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/ChoiceToLabelTransformerTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceGroupView;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceView;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\ChoiceToLabelTransformer;
-
-/**
- * @internal
- */
-final class ChoiceToLabelTransformerTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_transforms_label_to_choice(): void
-    {
-        $choiceList = new ArrayChoiceList([null, 1, 2, 3, 4, 5, 6]);
-        $choices = new ChoiceListView(
-            [
-                '0' => new ChoiceView(null, '0', 'unknown'),
-                '1' => new ChoiceView(1, '1', 'active'),
-                '2' => new ChoiceView(2, '2', 'removed'),
-                'Foo' => new ChoiceGroupView('Foo', ['3' => new ChoiceView(3, '3', 'archived')]),
-            ],
-            [
-                '4' => new ChoiceView(4, '4', 'bar'),
-                '5' => new ChoiceView(5, '5', 'moo'),
-                'Bar' => new ChoiceGroupView('Bar', ['6' => new ChoiceView(6, '6', 'bla')]),
-            ]
-        );
-
-        $transformer = new ChoiceToLabelTransformer($choiceList, $choices);
-
-        self::assertSame('active', $transformer->transform(1));
-        self::assertSame('removed', $transformer->transform(2));
-        self::assertSame('archived', $transformer->transform(3));
-
-        self::assertSame('bar', $transformer->transform(4));
-        self::assertSame('moo', $transformer->transform(5));
-        self::assertSame('bla', $transformer->transform(6));
-        self::assertSame('unknown', $transformer->transform(null));
-    }
-
-    /**
-     * @test
-     */
-    public function it_reverse_transforms_label_to_choice(): void
-    {
-        $choiceList = new ArrayChoiceList([null, 1, 2, 3, 4, $val5 = new \stdClass(), 6]);
-        $choices = new ChoiceListView(
-            [
-                '0' => new ChoiceView(null, '0', 'unknown'),
-                '1' => new ChoiceView(1, '1', 'active'),
-                '2' => new ChoiceView(2, '2', 'removed'),
-                'Foo' => new ChoiceGroupView('Foo', ['3' => new ChoiceView(3, '3', 'archived')]),
-            ],
-            [
-                '4' => new ChoiceView(4, '4', 'bar'),
-                '5' => new ChoiceView($val5, '5', 'moo'),
-                'Bar' => new ChoiceGroupView('Bar', ['6' => new ChoiceView(6, '6', 'bla')]),
-            ]
-        );
-
-        $transformer = new ChoiceToLabelTransformer($choiceList, $choices);
-
-        self::assertSame(1, $transformer->reverseTransform('active'));
-        self::assertSame(2, $transformer->reverseTransform('removed'));
-        self::assertSame(3, $transformer->reverseTransform('archived'));
-
-        self::assertSame(4, $transformer->reverseTransform('bar'));
-        self::assertSame($val5, $transformer->reverseTransform('moo'));
-        self::assertSame(6, $transformer->reverseTransform('bla'));
-        self::assertNull($transformer->reverseTransform('unknown'));
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
deleted file mode 100644
index e7c9bd14..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\ChoiceToValueTransformer;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @internal
- */
-final class ChoiceToValueTransformerTest extends TestCase
-{
-    private ?ChoiceToValueTransformer $transformer;
-    private ?ChoiceToValueTransformer $transformerWithNull;
-
-    protected function setUp(): void
-    {
-        $list = new ArrayChoiceList(['', false, 'X', true]);
-        $listWithNull = new ArrayChoiceList(['', false, 'X', null]);
-
-        $this->transformer = new ChoiceToValueTransformer($list);
-        $this->transformerWithNull = new ChoiceToValueTransformer($listWithNull);
-    }
-
-    protected function tearDown(): void
-    {
-        $this->transformer = null;
-        $this->transformerWithNull = null;
-    }
-
-    /**
-     * @dataProvider transformProvider
-     *
-     * @test
-     */
-    public function transform($in, $out, $inWithNull, $outWithNull): void
-    {
-        self::assertSame($out, $this->transformer->transform($in));
-        self::assertSame($outWithNull, $this->transformerWithNull->transform($inWithNull));
-    }
-
-    public static function transformProvider(): iterable
-    {
-        return [
-            // more extensive test set can be found in FormUtilTest
-            ['', '', '', '0'],
-            [false, '0', false, '1'],
-            ['X', 'X', 'X', '2'],
-            [true, '1', null, '3'],
-        ];
-    }
-
-    /**
-     * @dataProvider reverseTransformProvider
-     *
-     * @test
-     */
-    public function reverse_transform($in, $out, $inWithNull, $outWithNull): void
-    {
-        self::assertSame($out, $this->transformer->reverseTransform($in));
-        self::assertSame($outWithNull, $this->transformerWithNull->reverseTransform($inWithNull));
-    }
-
-    public static function reverseTransformProvider(): iterable
-    {
-        return [
-            // values are expected to be valid choice keys already and stay
-            // the same
-            ['', '', '0', ''],
-            ['0', false, '1', false],
-            ['X', 'X', '2', 'X'],
-            ['1', true, '3', null],
-        ];
-    }
-
-    /**
-     * @dataProvider reverseTransformExpectsStringOrNullProvider
-     *
-     * @test
-     */
-    public function reverse_transform_expects_string_or_null($value): void
-    {
-        $this->expectException(TransformationFailedException::class);
-
-        $this->transformer->reverseTransform($value);
-    }
-
-    public static function reverseTransformExpectsStringOrNullProvider(): iterable
-    {
-        return [
-            [0],
-            [true],
-            [false],
-            [[]],
-        ];
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
deleted file mode 100644
index 5f5e48a1..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
+++ /dev/null
@@ -1,398 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
-use Rollerworks\Component\Search\Tests\assertDateTimeEqualsTrait;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- *
- * @psalm-type DateFormat \IntlDateFormatter::NONE|\IntlDateFormatter::FULL|\IntlDateFormatter::LONG|\IntlDateFormatter::MEDIUM|\IntlDateFormatter::SHORT|null
- */
-final class DateTimeToLocalizedStringTransformerTest extends TestCase
-{
-    use assertDateTimeEqualsTrait;
-
-    protected ?\DateTimeImmutable $dateTime;
-    protected ?\DateTimeImmutable $dateTimeWithoutSeconds;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        // Since we test against "de_AT", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '58.1');
-
-        \Locale::setDefault('de_AT');
-
-        $this->dateTime = new \DateTimeImmutable('2010-02-03 04:05:06 UTC');
-        $this->dateTimeWithoutSeconds = new \DateTimeImmutable('2010-02-03 04:05:00 UTC');
-    }
-
-    protected function tearDown(): void
-    {
-        $this->dateTime = null;
-        $this->dateTimeWithoutSeconds = null;
-    }
-
-    /**
-     * @psalm-param DateFormat $dateFormat
-     * @psalm-param DateFormat $timeFormat
-     *
-     * @dataProvider dataProvider
-     *
-     * @test
-     */
-    public function transform(?int $dateFormat, ?int $timeFormat, ?string $pattern, string $output, string $input): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer(
-            'UTC',
-            'UTC',
-            $dateFormat,
-            $timeFormat,
-            \IntlDateFormatter::GREGORIAN,
-            $pattern
-        );
-
-        $input = new \DateTimeImmutable($input);
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_full_time(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
-
-        self::assertEquals('03.02.2010, 04:05:06 Koordinierte Weltzeit', $transformer->transform($this->dateTime));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_to_different_locale(): void
-    {
-        \Locale::setDefault('en_US');
-
-        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
-
-        self::assertEquals('Feb 3, 2010, 4:05 AM', $transformer->transform($this->dateTime));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_empty(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer();
-
-        self::assertSame('', $transformer->transform(null));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_with_different_timezones(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('America/New_York', 'Asia/Hong_Kong');
-
-        $input = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');
-        $dateTime = $input->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
-
-        self::assertEquals($dateTime->format('d.m.Y, H:i'), $transformer->transform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_no_constructor_parameters(): void
-    {
-        $tz = date_default_timezone_get();
-        date_default_timezone_set('Europe/Rome');
-
-        $transformer = new DateTimeToLocalizedStringTransformer();
-
-        $dateTime = new \DateTimeImmutable('2010-02-03 04:05');
-
-        self::assertEquals(
-            $dateTime->format('c'),
-            $transformer->reverseTransform('03.02.2010, 04:05')->format('c')
-        );
-
-        date_default_timezone_set($tz);
-    }
-
-    /**
-     * @test
-     */
-    public function transform_with_different_patterns(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'MM*yyyy*dd HH|mm|ss');
-
-        self::assertEquals('02*2010*03 04|05|06', $transformer->transform($this->dateTime));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_date_time_immutable_timezones(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('America/New_York', 'Asia/Hong_Kong');
-
-        $input = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');
-
-        $dateTime = clone $input;
-        $dateTime = $dateTime->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
-
-        self::assertEquals($dateTime->format('d.m.Y, H:i'), $transformer->transform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_requires_valid_date_time(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->transform('2010-01-01');
-    }
-
-    /**
-     * @test
-     */
-    public function transform_wraps_intl_errors(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->transform(1.5);
-    }
-
-    /**
-     * @psalm-param DateFormat $dateFormat
-     * @psalm-param DateFormat $timeFormat
-     *
-     * @dataProvider dataProvider
-     *
-     * @test
-     */
-    public function reverse_transform(?int $dateFormat, ?int $timeFormat, ?string $pattern, string $input, string $output): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer(
-            'UTC',
-            'UTC',
-            $dateFormat,
-            $timeFormat,
-            \IntlDateFormatter::GREGORIAN,
-            $pattern
-        );
-
-        $output = new \DateTimeImmutable($output);
-
-        self::assertEquals($output, $transformer->reverseTransform($input));
-    }
-
-    public static function dataProvider(): iterable
-    {
-        return [
-            [\IntlDateFormatter::SHORT, null, null, '03.02.10, 04:05', '2010-02-03 04:05:00 UTC'],
-            [\IntlDateFormatter::MEDIUM, null, null, '03.02.2010, 04:05', '2010-02-03 04:05:00 UTC'],
-            [\IntlDateFormatter::LONG, null, null, '3. Februar 2010 um 04:05', '2010-02-03 04:05:00 UTC'],
-            [\IntlDateFormatter::FULL, null, null, 'Mittwoch, 3. Februar 2010 um 04:05', '2010-02-03 04:05:00 UTC'],
-            [\IntlDateFormatter::SHORT, \IntlDateFormatter::NONE, null, '03.02.10', '2010-02-03 00:00:00 UTC'],
-            [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, null, '03.02.2010', '2010-02-03 00:00:00 UTC'],
-            [\IntlDateFormatter::LONG, \IntlDateFormatter::NONE, null, '3. Februar 2010', '2010-02-03 00:00:00 UTC'],
-            [\IntlDateFormatter::FULL, \IntlDateFormatter::NONE, null, 'Mittwoch, 3. Februar 2010', '2010-02-03 00:00:00 UTC'],
-            [null, \IntlDateFormatter::SHORT, null, '03.02.2010, 04:05', '2010-02-03 04:05:00 UTC'],
-            [null, \IntlDateFormatter::MEDIUM, null, '03.02.2010, 04:05:06', '2010-02-03 04:05:06 UTC'],
-            [null, \IntlDateFormatter::LONG, null, '03.02.2010, 04:05:06 UTC', '2010-02-03 04:05:06 UTC'],
-            // see below for extra test case for time format FULL
-            [\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, null, '04:05', '1970-01-01 04:05:00 UTC'],
-            [\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, null, '04:05:06', '1970-01-01 04:05:06 UTC'],
-            [\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, '04:05:06 UTC', '1970-01-01 04:05:06 UTC'],
-            [null, null, 'yyyy-MM-dd HH:mm:00', '2010-02-03 04:05:00', '2010-02-03 04:05:00 UTC'],
-            [null, null, 'yyyy-MM-dd HH:mm', '2010-02-03 04:05', '2010-02-03 04:05:00 UTC'],
-            [null, null, 'yyyy-MM-dd HH', '2010-02-03 04', '2010-02-03 04:00:00 UTC'],
-            [null, null, 'yyyy-MM-dd', '2010-02-03', '2010-02-03 00:00:00 UTC'],
-            [null, null, 'yyyy-MM', '2010-02', '2010-02-01 00:00:00 UTC'],
-            [null, null, 'yyyy', '2010', '2010-01-01 00:00:00 UTC'],
-            [null, null, 'dd-MM-yyyy', '03-02-2010', '2010-02-03 00:00:00 UTC'],
-            [null, null, 'HH:mm:ss', '04:05:06', '1970-01-01 04:05:06 UTC'],
-            [null, null, 'HH:mm:00', '04:05:00', '1970-01-01 04:05:00 UTC'],
-            [null, null, 'HH:mm', '04:05', '1970-01-01 04:05:00 UTC'],
-            [null, null, 'HH', '04', '1970-01-01 04:00:00 UTC'],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_full_time(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
-
-        self::assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010, 04:05:06 GMT+00:00'));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_from_different_locale(): void
-    {
-        \Locale::setDefault('en_US');
-
-        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
-
-        self::assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010, 04:05 AM'));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_different_timezones(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('America/New_York', 'Asia/Hong_Kong');
-
-        $dateTime = new \DateTimeImmutable('2010-02-03 04:05:00 Asia/Hong_Kong');
-        $dateTime = $dateTime->setTimezone(new \DateTimeZone('America/New_York'));
-
-        self::assertDateTimeEquals($dateTime, $transformer->reverseTransform('03.02.2010, 04:05'));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_different_patterns(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'MM*yyyy*dd HH|mm|ss');
-
-        self::assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('02*2010*03 04|05|06'));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_date_only_with_dst_issue(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('Europe/Rome', 'Europe/Rome', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'dd/MM/yyyy');
-
-        self::assertDateTimeEquals(
-            new \DateTimeImmutable('1978-05-28', new \DateTimeZone('Europe/Rome')),
-            $transformer->reverseTransform('28/05/1978')
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_date_only_with_dst_issue_and_escaped_text(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('Europe/Rome', 'Europe/Rome', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, "'day': dd 'month': MM 'year': yyyy");
-
-        self::assertDateTimeEquals(
-            new \DateTimeImmutable('1978-05-28', new \DateTimeZone('Europe/Rome')),
-            $transformer->reverseTransform('day: 28 month: 05 year: 1978')
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_empty(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer();
-
-        self::assertNull($transformer->reverseTransform(''));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_requires_string(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform(12345);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_wraps_intl_errors(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('12345');
-    }
-
-    /**
-     * @test
-     */
-    public function validate_date_format_option(): void
-    {
-        $this->expectException(UnexpectedTypeException::class);
-
-        /** @phpstan-ignore-next-line */
-        new DateTimeToLocalizedStringTransformer(null, null, 99);
-    }
-
-    /**
-     * @test
-     */
-    public function validate_time_format_option(): void
-    {
-        $this->expectException(UnexpectedTypeException::class);
-
-        /** @phpstan-ignore-next-line */
-        new DateTimeToLocalizedStringTransformer(null, null, null, 99);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_non_existing_date(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::SHORT);
-
-        $this->expectException(TransformationFailedException::class);
-
-        self::assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('31.04.10 04:05'));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_out_of_timestamp_range(): void
-    {
-        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('1789-07-14');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
deleted file mode 100644
index 39d66baf..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToRfc3339Transformer;
-
-/**
- * @internal
- */
-final class DateTimeToRfc3339TransformerTest extends TestCase
-{
-    protected ?\DateTimeImmutable $dateTime;
-    protected ?\DateTimeImmutable $dateTimeWithoutSeconds;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->dateTime = new \DateTimeImmutable('2010-02-03 04:05:06 UTC');
-        $this->dateTimeWithoutSeconds = new \DateTimeImmutable('2010-02-03 04:05:00 UTC');
-    }
-
-    protected function tearDown(): void
-    {
-        $this->dateTime = null;
-        $this->dateTimeWithoutSeconds = null;
-    }
-
-    /**
-     * @dataProvider allProvider
-     *
-     * @test
-     */
-    public function transform($fromTz, $toTz, $from, $to): void
-    {
-        $transformer = new DateTimeToRfc3339Transformer($fromTz, $toTz);
-
-        self::assertSame($to, $transformer->transform($from !== null ? new \DateTimeImmutable($from) : null));
-    }
-
-    /**
-     * @dataProvider allProvider
-     *
-     * @test
-     */
-    public function transform_date_time_immutable($fromTz, $toTz, $from, $to): void
-    {
-        $transformer = new DateTimeToRfc3339Transformer($fromTz, $toTz);
-
-        self::assertSame($to, $transformer->transform($from !== null ? new \DateTimeImmutable($from) : null));
-    }
-
-    public static function allProvider(): iterable
-    {
-        return [
-            ['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06Z'],
-            ['UTC', 'UTC', null, ''],
-            ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:06 America/New_York', '2010-02-03T17:05:06+08:00'],
-            ['America/New_York', 'Asia/Hong_Kong', null, ''],
-            ['UTC', 'Asia/Hong_Kong', '2010-02-03 04:05:06 UTC', '2010-02-03T12:05:06+08:00'],
-            ['America/New_York', 'UTC', '2010-02-03 04:05:06 America/New_York', '2010-02-03T09:05:06Z'],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function transform_requires_valid_date_time(): void
-    {
-        $transformer = new DateTimeToRfc3339Transformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->transform('2010-01-01');
-    }
-
-    /**
-     * @dataProvider reverseTransformProvider
-     *
-     * @test
-     */
-    public function reverse_transform($toTz, $fromTz, $to, $from): void
-    {
-        $transformer = new DateTimeToRfc3339Transformer($toTz, $fromTz);
-
-        if ($to !== null) {
-            self::assertEquals(new \DateTimeImmutable($to), $transformer->reverseTransform($from));
-        } else {
-            self::assertSame($to, $transformer->reverseTransform($from));
-        }
-    }
-
-    public static function reverseTransformProvider(): array
-    {
-        return array_merge((array) self::allProvider(), [
-            // format without seconds, as appears in some browsers
-            ['UTC', 'UTC', '2010-02-03 04:05:00 UTC', '2010-02-03T04:05Z'],
-            ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:00 America/New_York', '2010-02-03T17:05+08:00'],
-            ['Europe/Amsterdam', 'Europe/Amsterdam', '2013-08-21 10:30:00 Europe/Amsterdam', '2013-08-21T08:30:00Z'],
-        ]);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_requires_string(): void
-    {
-        $transformer = new DateTimeToRfc3339Transformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform(12345);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_non_existing_date(): void
-    {
-        $transformer = new DateTimeToRfc3339Transformer('UTC', 'UTC');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('2010-04-31T04:05Z');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_date_string(): void
-    {
-        $transformer = new DateTimeToRfc3339Transformer('UTC', 'UTC');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('2010-2010-2010');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
deleted file mode 100644
index 97c7495a..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToStringTransformer;
-use Rollerworks\Component\Search\Tests\assertDateTimeEqualsTrait;
-
-/**
- * @internal
- */
-final class DateTimeToStringTransformerTest extends TestCase
-{
-    use assertDateTimeEqualsTrait;
-
-    /**
-     * @dataProvider dataProvider
-     *
-     * @test
-     */
-    public function transform($format, $output, $input): void
-    {
-        $transformer = new DateTimeToStringTransformer('UTC', 'UTC', $format);
-
-        $input = new \DateTimeImmutable($input);
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    public static function dataProvider(): iterable
-    {
-        return [
-            ['Y-m-d H:i:s', '2010-02-03 16:05:06', '2010-02-03 16:05:06 UTC'],
-            ['Y-m-d H:i:00', '2010-02-03 16:05:00', '2010-02-03 16:05:00 UTC'],
-            ['Y-m-d H:i', '2010-02-03 16:05', '2010-02-03 16:05:00 UTC'],
-            ['Y-m-d H', '2010-02-03 16', '2010-02-03 16:00:00 UTC'],
-            ['Y-m-d', '2010-02-03', '2010-02-03 00:00:00 UTC'],
-            ['Y-m', '2010-12', '2010-12-01 00:00:00 UTC'],
-            ['Y', '2010', '2010-01-01 00:00:00 UTC'],
-            ['d-m-Y', '03-02-2010', '2010-02-03 00:00:00 UTC'],
-            ['H:i:s', '16:05:06', '1970-01-01 16:05:06 UTC'],
-            ['H:i:00', '16:05:00', '1970-01-01 16:05:00 UTC'],
-            ['H:i', '16:05', '1970-01-01 16:05:00 UTC'],
-            ['H', '16', '1970-01-01 16:00:00 UTC'],
-            ['Y-z', '2010-33', '2010-02-03 00:00:00 UTC'],
-
-            // different day representations
-            ['Y-m-j', '2010-02-3', '2010-02-03 00:00:00 UTC'],
-            ['z', '33', '1970-02-03 00:00:00 UTC'],
-
-            // not bijective
-            // this will not work as PHP will use actual date to replace missing info
-            // and after change of date will lookup for closest Wednesday
-            // i.e. value: 2010-02, PHP value: 2010-02-(today i.e. 20), parsed date: 2010-02-24
-            // array('Y-m-D', '2010-02-Wed', '2010-02-03 00:00:00 UTC'),
-            // array('Y-m-l', '2010-02-Wednesday', '2010-02-03 00:00:00 UTC'),
-
-            // different month representations
-            ['Y-n-d', '2010-2-03', '2010-02-03 00:00:00 UTC'],
-            ['Y-M-d', '2010-Feb-03', '2010-02-03 00:00:00 UTC'],
-            ['Y-F-d', '2010-February-03', '2010-02-03 00:00:00 UTC'],
-
-            // different year representations
-            ['y-m-d', '10-02-03', '2010-02-03 00:00:00 UTC'],
-
-            // different time representations
-            ['G:i:s', '16:05:06', '1970-01-01 16:05:06 UTC'],
-            ['g:i:s a', '4:05:06 pm', '1970-01-01 16:05:06 UTC'],
-            ['h:i:s a', '04:05:06 pm', '1970-01-01 16:05:06 UTC'],
-
-            // seconds since Unix
-            ['U', '1265213106', '2010-02-03 16:05:06 UTC'],
-
-            ['Y-z', '2010-33', '2010-02-03 00:00:00 UTC'],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function transform_empty(): void
-    {
-        $transformer = new DateTimeToStringTransformer();
-
-        self::assertSame('', $transformer->transform(null));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_with_different_timezones(): void
-    {
-        $transformer = new DateTimeToStringTransformer('Asia/Hong_Kong', 'America/New_York', 'Y-m-d H:i:s');
-
-        $input = new \DateTimeImmutable('2010-02-03 12:05:06 America/New_York');
-        $output = $input->format('Y-m-d H:i:s');
-        $input = $input->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_date_time_immutable(): void
-    {
-        $transformer = new DateTimeToStringTransformer('Asia/Hong_Kong', 'America/New_York', 'Y-m-d H:i:s');
-
-        $input = new \DateTimeImmutable('2010-02-03 12:05:06 America/New_York');
-        $output = $input->format('Y-m-d H:i:s');
-        $input = $input->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_expects_date_time(): void
-    {
-        $transformer = new DateTimeToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->transform('1234');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_empty(): void
-    {
-        $reverseTransformer = new DateTimeToStringTransformer();
-
-        self::assertNull($reverseTransformer->reverseTransform(''));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_different_timezones(): void
-    {
-        $reverseTransformer = new DateTimeToStringTransformer('America/New_York', 'Asia/Hong_Kong', 'Y-m-d H:i:s');
-
-        $output = new \DateTimeImmutable('2010-02-03 16:05:06 Asia/Hong_Kong');
-        $input = $output->format('Y-m-d H:i:s');
-        $output = $output->setTimezone(new \DateTimeZone('America/New_York'));
-
-        $this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_string(): void
-    {
-        $reverseTransformer = new DateTimeToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $reverseTransformer->reverseTransform(1234);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_date_string(): void
-    {
-        $reverseTransformer = new DateTimeToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $reverseTransformer->reverseTransform('2010-2010-2010');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_non_existing_date(): void
-    {
-        $reverseTransformer = new DateTimeToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $reverseTransformer->reverseTransform('2010-04-31');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php
deleted file mode 100644
index e7b8058e..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
-use Rollerworks\Component\Search\Tests\assertDateTimeEqualsTrait;
-
-/**
- * @internal
- */
-final class DateTimeToTimestampTransformerTest extends TestCase
-{
-    use assertDateTimeEqualsTrait;
-
-    /**
-     * @test
-     */
-    public function transform(): void
-    {
-        $transformer = new DateTimeToTimestampTransformer('UTC', 'UTC');
-
-        $input = new \DateTimeImmutable('2010-02-03 04:05:06 UTC');
-        $output = $input->format('U');
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_empty(): void
-    {
-        $transformer = new DateTimeToTimestampTransformer();
-
-        self::assertNull($transformer->transform(null));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_with_different_timezones(): void
-    {
-        $transformer = new DateTimeToTimestampTransformer('Asia/Hong_Kong', 'America/New_York');
-
-        $input = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');
-        $output = $input->format('U');
-        $input = $input->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_from_different_timezone(): void
-    {
-        $transformer = new DateTimeToTimestampTransformer('Asia/Hong_Kong', 'UTC');
-
-        $input = new \DateTimeImmutable('2010-02-03 04:05:06 Asia/Hong_Kong');
-
-        $dateTime = clone $input;
-        $dateTime = $dateTime->setTimezone(new \DateTimeZone('UTC'));
-        $output = $dateTime->format('U');
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_date_time_immutable(): void
-    {
-        $transformer = new DateTimeToTimestampTransformer('Asia/Hong_Kong', 'America/New_York');
-
-        $input = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');
-        $output = $input->format('U');
-        $input = $input->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_expects_date_time(): void
-    {
-        $transformer = new DateTimeToTimestampTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->transform('1234');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform(): void
-    {
-        $reverseTransformer = new DateTimeToTimestampTransformer('UTC', 'UTC');
-
-        $output = new \DateTimeImmutable('2010-02-03 04:05:06 UTC');
-        $input = $output->format('U');
-
-        self::assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_empty(): void
-    {
-        $reverseTransformer = new DateTimeToTimestampTransformer();
-
-        self::assertNull($reverseTransformer->reverseTransform(null));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_different_timezones(): void
-    {
-        $reverseTransformer = new DateTimeToTimestampTransformer('Asia/Hong_Kong', 'America/New_York');
-
-        $output = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');
-        $input = $output->format('U');
-        $output = $output->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
-
-        self::assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_timestamp(): void
-    {
-        $reverseTransformer = new DateTimeToTimestampTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $reverseTransformer->reverseTransform('2010-2010-2010');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
deleted file mode 100644
index cdc8ac05..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class IntegerToLocalizedStringTransformerTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        \Locale::setDefault('en');
-    }
-
-    /**
-     * @param IntegerToLocalizedStringTransformer::ROUND_* $roundingMode
-     *
-     * @dataProvider transformWithRoundingProvider
-     *
-     * @test
-     */
-    public function transform_with_rounding(float $input, string $output, int $roundingMode): void
-    {
-        $transformer = new IntegerToLocalizedStringTransformer(false, $roundingMode);
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    public static function transformWithRoundingProvider(): iterable
-    {
-        return [
-            // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            [1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_CEILING],
-            [1234.4, '1235', IntegerToLocalizedStringTransformer::ROUND_CEILING],
-            [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_CEILING],
-            [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_CEILING],
-            // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
-            [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
-            [-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
-            [-1234.4, '-1235', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
-            // away from zero (1.6 -> 2, -1.6 -> 2)
-            [1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_UP],
-            [1234.4, '1235', IntegerToLocalizedStringTransformer::ROUND_UP],
-            [-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_UP],
-            [-1234.4, '-1235', IntegerToLocalizedStringTransformer::ROUND_UP],
-            // towards zero (1.6 -> 1, -1.6 -> -1)
-            [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
-            [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
-            [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
-            [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
-            // round halves (.5) to the next even number
-            [1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1233.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1232.5, '1232', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [-1233.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [-1232.5, '-1232', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            // round halves (.5) away from zero
-            [1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            [-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            [-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            // round halves (.5) towards zero
-            [1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform(): void
-    {
-        // Since we test against "de_AT", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('de_AT');
-
-        $transformer = new IntegerToLocalizedStringTransformer();
-
-        self::assertEquals(1, $transformer->reverseTransform('1'));
-        self::assertEquals(12345, $transformer->reverseTransform('12345'));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_empty(): void
-    {
-        $transformer = new IntegerToLocalizedStringTransformer();
-
-        self::assertNull($transformer->reverseTransform(''));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_grouping(): void
-    {
-        // Since we test against "de_DE", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('de_DE');
-
-        $transformer = new IntegerToLocalizedStringTransformer(true);
-
-        self::assertEquals(1234, $transformer->reverseTransform('1.234'));
-        self::assertEquals(12345, $transformer->reverseTransform('12.345'));
-        self::assertEquals(1234, $transformer->reverseTransform('1234'));
-        self::assertEquals(12345, $transformer->reverseTransform('12345'));
-    }
-
-    /**
-     * @param IntegerToLocalizedStringTransformer::ROUND_* $roundingMode
-     *
-     * @dataProvider reverseTransformWithRoundingProvider
-     *
-     * @test
-     */
-    public function reverse_transform_with_rounding(string $input, int $output, int $roundingMode): void
-    {
-        $transformer = new IntegerToLocalizedStringTransformer(false, $roundingMode);
-
-        self::assertEquals($output, $transformer->reverseTransform($input));
-    }
-
-    public static function reverseTransformWithRoundingProvider(): iterable
-    {
-        return [
-            // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            ['1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_CEILING],
-            ['1234,4', 1235, IntegerToLocalizedStringTransformer::ROUND_CEILING],
-            ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_CEILING],
-            ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_CEILING],
-            // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
-            ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
-            ['-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
-            ['-1234,4', -1235, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
-            // away from zero (1.6 -> 2, -1.6 -> 2)
-            ['1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_UP],
-            ['1234,4', 1235, IntegerToLocalizedStringTransformer::ROUND_UP],
-            ['-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_UP],
-            ['-1234,4', -1235, IntegerToLocalizedStringTransformer::ROUND_UP],
-            // towards zero (1.6 -> 1, -1.6 -> -1)
-            ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
-            ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
-            ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
-            ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
-            // round halves (.5) to the next even number
-            ['1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            ['1233,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            ['1232,5', 1232, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            ['-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            ['-1233,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            ['-1232,5', -1232, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            // round halves (.5) away from zero
-            ['1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            ['1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            ['-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            ['-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
-            // round halves (.5) towards zero
-            ['1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            ['-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_string(): void
-    {
-        $transformer = new IntegerToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform(1);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_number(): void
-    {
-        $transformer = new IntegerToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('foo');
-    }
-
-    /**
-     * @dataProvider floatNumberProvider
-     *
-     * @test
-     */
-    public function reverse_transform_expects_integer(string $number, string $locale): void
-    {
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault($locale);
-
-        $transformer = new IntegerToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform($number);
-    }
-
-    public static function floatNumberProvider(): iterable
-    {
-        return [
-            ['12345.912', 'en'],
-            ['1.234,5', 'de_DE'],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_na_n(): void
-    {
-        $transformer = new IntegerToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('NaN');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_na_n2(): void
-    {
-        $transformer = new IntegerToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('nan');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_infinity(): void
-    {
-        $transformer = new IntegerToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('∞');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_negative_infinity(): void
-    {
-        $transformer = new IntegerToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('-∞');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/IntegerToStringTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/IntegerToStringTransformerTest.php
deleted file mode 100644
index ff0f124e..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/IntegerToStringTransformerTest.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\IntegerToStringTransformer;
-
-/**
- * @internal
- */
-final class IntegerToStringTransformerTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        \Locale::setDefault('en');
-    }
-
-    /**
-     * @param IntegerToStringTransformer::ROUND_* $roundingMode
-     *
-     * @dataProvider transformWithRoundingProvider
-     *
-     * @test
-     */
-    public function transform_with_rounding(float $input, string $output, int $roundingMode): void
-    {
-        $transformer = new IntegerToStringTransformer($roundingMode);
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    public static function transformWithRoundingProvider(): iterable
-    {
-        return [
-            // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            [1234.5, '1235', IntegerToStringTransformer::ROUND_CEILING],
-            [1234.4, '1235', IntegerToStringTransformer::ROUND_CEILING],
-            [-1234.5, '-1234', IntegerToStringTransformer::ROUND_CEILING],
-            [-1234.4, '-1234', IntegerToStringTransformer::ROUND_CEILING],
-            // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            [1234.5, '1234', IntegerToStringTransformer::ROUND_FLOOR],
-            [1234.4, '1234', IntegerToStringTransformer::ROUND_FLOOR],
-            [-1234.5, '-1235', IntegerToStringTransformer::ROUND_FLOOR],
-            [-1234.4, '-1235', IntegerToStringTransformer::ROUND_FLOOR],
-            // away from zero (1.6 -> 2, -1.6 -> 2)
-            [1234.5, '1235', IntegerToStringTransformer::ROUND_UP],
-            [1234.4, '1235', IntegerToStringTransformer::ROUND_UP],
-            [-1234.5, '-1235', IntegerToStringTransformer::ROUND_UP],
-            [-1234.4, '-1235', IntegerToStringTransformer::ROUND_UP],
-            // towards zero (1.6 -> 1, -1.6 -> -1)
-            [1234.5, '1234', IntegerToStringTransformer::ROUND_DOWN],
-            [1234.4, '1234', IntegerToStringTransformer::ROUND_DOWN],
-            [-1234.5, '-1234', IntegerToStringTransformer::ROUND_DOWN],
-            [-1234.4, '-1234', IntegerToStringTransformer::ROUND_DOWN],
-            // round halves (.5) to the next even number
-            [1234.6, '1235', IntegerToStringTransformer::ROUND_HALF_EVEN],
-            [1234.5, '1234', IntegerToStringTransformer::ROUND_HALF_EVEN],
-            [1234.4, '1234', IntegerToStringTransformer::ROUND_HALF_EVEN],
-            [1233.5, '1234', IntegerToStringTransformer::ROUND_HALF_EVEN],
-            [1232.5, '1232', IntegerToStringTransformer::ROUND_HALF_EVEN],
-            [-1234.6, '-1235', IntegerToStringTransformer::ROUND_HALF_EVEN],
-            [-1234.5, '-1234', IntegerToStringTransformer::ROUND_HALF_EVEN],
-            [-1234.4, '-1234', IntegerToStringTransformer::ROUND_HALF_EVEN],
-            [-1233.5, '-1234', IntegerToStringTransformer::ROUND_HALF_EVEN],
-            [-1232.5, '-1232', IntegerToStringTransformer::ROUND_HALF_EVEN],
-            // round halves (.5) away from zero
-            [1234.6, '1235', IntegerToStringTransformer::ROUND_HALF_UP],
-            [1234.5, '1235', IntegerToStringTransformer::ROUND_HALF_UP],
-            [1234.4, '1234', IntegerToStringTransformer::ROUND_HALF_UP],
-            [-1234.6, '-1235', IntegerToStringTransformer::ROUND_HALF_UP],
-            [-1234.5, '-1235', IntegerToStringTransformer::ROUND_HALF_UP],
-            [-1234.4, '-1234', IntegerToStringTransformer::ROUND_HALF_UP],
-            // round halves (.5) towards zero
-            [1234.6, '1235', IntegerToStringTransformer::ROUND_HALF_DOWN],
-            [1234.5, '1234', IntegerToStringTransformer::ROUND_HALF_DOWN],
-            [1234.4, '1234', IntegerToStringTransformer::ROUND_HALF_DOWN],
-            [-1234.6, '-1235', IntegerToStringTransformer::ROUND_HALF_DOWN],
-            [-1234.5, '-1234', IntegerToStringTransformer::ROUND_HALF_DOWN],
-            [-1234.4, '-1234', IntegerToStringTransformer::ROUND_HALF_DOWN],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform(): void
-    {
-        $transformer = new IntegerToStringTransformer();
-
-        self::assertEquals(1, $transformer->reverseTransform('1'));
-        self::assertEquals(1, $transformer->reverseTransform('1.5'));
-        self::assertEquals(1234, $transformer->reverseTransform('1234.5'));
-        self::assertEquals(12345, $transformer->reverseTransform('12345.912'));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_empty(): void
-    {
-        $transformer = new IntegerToStringTransformer();
-
-        self::assertNull($transformer->reverseTransform(''));
-    }
-
-    /**
-     * @param IntegerToStringTransformer::ROUND_* $roundingMode
-     *
-     * @dataProvider reverseTransformWithRoundingProvider
-     *
-     * @test
-     */
-    public function reverse_transform_with_rounding(string $input, int $output, int $roundingMode): void
-    {
-        $transformer = new IntegerToStringTransformer($roundingMode);
-
-        self::assertEquals($output, $transformer->reverseTransform($input));
-    }
-
-    public static function reverseTransformWithRoundingProvider(): iterable
-    {
-        return [
-            // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            ['1234.5', 1235, IntegerToStringTransformer::ROUND_CEILING],
-            ['1234.4', 1235, IntegerToStringTransformer::ROUND_CEILING],
-            ['-1234.5', -1234, IntegerToStringTransformer::ROUND_CEILING],
-            ['-1234.4', -1234, IntegerToStringTransformer::ROUND_CEILING],
-            // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            ['1234.5', 1234, IntegerToStringTransformer::ROUND_FLOOR],
-            ['1234.4', 1234, IntegerToStringTransformer::ROUND_FLOOR],
-            ['-1234.5', -1235, IntegerToStringTransformer::ROUND_FLOOR],
-            ['-1234.4', -1235, IntegerToStringTransformer::ROUND_FLOOR],
-            // away from zero (1.6 -> 2, -1.6 -> 2)
-            ['1234.5', 1235, IntegerToStringTransformer::ROUND_UP],
-            ['1234.4', 1235, IntegerToStringTransformer::ROUND_UP],
-            ['-1234.5', -1235, IntegerToStringTransformer::ROUND_UP],
-            ['-1234.4', -1235, IntegerToStringTransformer::ROUND_UP],
-            // towards zero (1.6 -> 1, -1.6 -> -1)
-            ['1234.5', 1234, IntegerToStringTransformer::ROUND_DOWN],
-            ['1234.4', 1234, IntegerToStringTransformer::ROUND_DOWN],
-            ['-1234.5', -1234, IntegerToStringTransformer::ROUND_DOWN],
-            ['-1234.4', -1234, IntegerToStringTransformer::ROUND_DOWN],
-            // round halves (.5) to the next even number
-            ['1234.6', 1235, IntegerToStringTransformer::ROUND_HALF_EVEN],
-            ['1234.5', 1234, IntegerToStringTransformer::ROUND_HALF_EVEN],
-            ['1234.4', 1234, IntegerToStringTransformer::ROUND_HALF_EVEN],
-            ['1233.5', 1234, IntegerToStringTransformer::ROUND_HALF_EVEN],
-            ['1232.5', 1232, IntegerToStringTransformer::ROUND_HALF_EVEN],
-            ['-1234.6', -1235, IntegerToStringTransformer::ROUND_HALF_EVEN],
-            ['-1234.5', -1234, IntegerToStringTransformer::ROUND_HALF_EVEN],
-            ['-1234.4', -1234, IntegerToStringTransformer::ROUND_HALF_EVEN],
-            ['-1233.5', -1234, IntegerToStringTransformer::ROUND_HALF_EVEN],
-            ['-1232.5', -1232, IntegerToStringTransformer::ROUND_HALF_EVEN],
-            // round halves (.5) away from zero
-            ['1234.6', 1235, IntegerToStringTransformer::ROUND_HALF_UP],
-            ['1234.5', 1235, IntegerToStringTransformer::ROUND_HALF_UP],
-            ['1234.4', 1234, IntegerToStringTransformer::ROUND_HALF_UP],
-            ['-1234.6', -1235, IntegerToStringTransformer::ROUND_HALF_UP],
-            ['-1234.5', -1235, IntegerToStringTransformer::ROUND_HALF_UP],
-            ['-1234.4', -1234, IntegerToStringTransformer::ROUND_HALF_UP],
-            // round halves (.5) towards zero
-            ['1234.6', 1235, IntegerToStringTransformer::ROUND_HALF_DOWN],
-            ['1234.5', 1234, IntegerToStringTransformer::ROUND_HALF_DOWN],
-            ['1234.4', 1234, IntegerToStringTransformer::ROUND_HALF_DOWN],
-            ['-1234.6', -1235, IntegerToStringTransformer::ROUND_HALF_DOWN],
-            ['-1234.5', -1234, IntegerToStringTransformer::ROUND_HALF_DOWN],
-            ['-1234.4', -1234, IntegerToStringTransformer::ROUND_HALF_DOWN],
-        ];
-    }
-
-    /**
-     * @dataProvider reverseTransformWithRoundingProvider
-     *
-     * @test
-     */
-    public function reverse_transform_expects_scalar(): void
-    {
-        $transformer = new IntegerToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform(['1']);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_number(): void
-    {
-        $transformer = new IntegerToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('foo');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_na_n(): void
-    {
-        $transformer = new IntegerToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('NaN');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_na_n2(): void
-    {
-        $transformer = new IntegerToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('nan');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_infinity(): void
-    {
-        $transformer = new IntegerToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('∞');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_negative_infinity(): void
-    {
-        $transformer = new IntegerToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('-∞');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/LocalizedBirthdayTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/LocalizedBirthdayTransformerTest.php
deleted file mode 100644
index 32764bb9..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/LocalizedBirthdayTransformerTest.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\LocalizedBirthdayTransformer;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class LocalizedBirthdayTransformerTest extends TestCase
-{
-    use ProphecyTrait;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        \Locale::setDefault('en');
-    }
-
-    /**
-     * @test
-     */
-    public function it_transforms_age_to_integer(): void
-    {
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform(Argument::any())->shouldNotBeCalled();
-        $dateTransformer->transform(Argument::any())->shouldNotBeCalled();
-
-        $transformer = new LocalizedBirthdayTransformer($dateTransformer->reveal());
-
-        self::assertEquals(18, $transformer->reverseTransform('18'));
-        self::assertEquals('18', $transformer->transform(18));
-
-        self::assertEquals(18000, $transformer->reverseTransform('18000'));
-        self::assertEquals('18000', $transformer->transform(18000));
-    }
-
-    /**
-     * @test
-     */
-    public function it_transforms_ar_localized_age_to_integer(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('ar_BH');
-
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform(Argument::any())->shouldNotBeCalled();
-        $dateTransformer->transform(Argument::any())->shouldNotBeCalled();
-
-        $transformer = new LocalizedBirthdayTransformer($dateTransformer->reveal());
-
-        self::assertEquals(79, $transformer->reverseTransform('٧٩'));
-        self::assertEquals('٧٩', $transformer->transform(79));
-    }
-
-    /**
-     * @test
-     */
-    public function it_transforms_with_date(): void
-    {
-        $date = new \DateTimeImmutable('2010-03-05 00:00:00 UTC');
-
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform('2010-03-05')->willReturn($date);
-        $dateTransformer->transform($date)->willReturn('2010-03-05');
-
-        $transformer = new LocalizedBirthdayTransformer($dateTransformer->reveal());
-
-        self::assertEquals($date, $transformer->reverseTransform('2010-03-05'));
-        self::assertEquals('2010-03-05', $transformer->transform($date));
-
-        self::assertEquals(18, $transformer->reverseTransform('18'));
-        self::assertEquals('18', $transformer->transform(18));
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_disabled_age(): void
-    {
-        $date = new \DateTimeImmutable('2010-03-05 00:00:00 UTC');
-
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform('2010-03-05')->willReturn($date);
-        $dateTransformer->transform($date)->willReturn('2010-03-05');
-
-        $transformer = new LocalizedBirthdayTransformer($dateTransformer->reveal(), false);
-
-        self::assertEquals($date, $transformer->reverseTransform('2010-03-05'));
-        self::assertEquals('2010-03-05', $transformer->transform($date));
-
-        try {
-            $transformer->reverseTransform('18');
-
-            self::fail('Age should not be reverseTransformed.');
-        } catch (TransformationFailedException $e) {
-            self::assertEquals('Age support is not enabled.', $e->getMessage());
-        }
-
-        try {
-            $transformer->transform(18);
-
-            self::fail('Age should not be transformed.');
-        } catch (TransformationFailedException $e) {
-            self::assertEquals('Age support is not enabled.', $e->getMessage());
-        }
-    }
-
-    /**
-     * @test
-     */
-    public function it_disallows_date_in_the_future_by_default(): void
-    {
-        $dateObj = new \DateTimeImmutable('tomorrow');
-
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform($dateObj->format('Y-m-d'))->willReturn($dateObj);
-
-        $transformer = new LocalizedBirthdayTransformer($dateTransformer->reveal());
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage(\sprintf('Date "%s" is higher then current date ', $dateObj->format('Y-m-d')));
-
-        $transformer->reverseTransform($dateObj->format('Y-m-d'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_date_in_the_future_when_enabled(): void
-    {
-        $dateObj = new \DateTimeImmutable('tomorrow');
-
-        $dateTransformer = $this->prophesize(DataTransformer::class);
-        $dateTransformer->reverseTransform($dateObj->format('Y-m-d'))->willReturn($dateObj);
-        $dateTransformer->transform($dateObj)->willReturn($dateObj->format('Y-m-d'));
-
-        $transformer = new LocalizedBirthdayTransformer($dateTransformer->reveal(), false, true);
-
-        self::assertEquals($dateObj, $transformer->reverseTransform($dateObj->format('Y-m-d')));
-        self::assertEquals($dateObj->format('Y-m-d'), $transformer->transform($dateObj));
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
deleted file mode 100644
index 1759a9dd..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
+++ /dev/null
@@ -1,520 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use Money\Currencies\ISOCurrencies;
-use Money\Currency;
-use Money\Parser\DecimalMoneyParser;
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class MoneyToLocalizedStringTransformerTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        \Locale::setDefault('en');
-    }
-
-    private function parseMoneyAsDecimal($input, string $currency = 'EUR')
-    {
-        static $moneyParser;
-
-        if (! $moneyParser) {
-            $currencies = new ISOCurrencies();
-            $moneyParser = new DecimalMoneyParser($currencies);
-        }
-
-        return $moneyParser->parse((string) $input, new Currency($currency));
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function transform($from, $to, $locale): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault($locale);
-
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        if ($from !== null) {
-            $from = new MoneyValue($this->parseMoneyAsDecimal($from));
-        }
-
-        self::assertEquals($to, $transformer->transform($from));
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function transform_without_currency($from, $to, $locale): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault($locale);
-
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        if ($from !== null) {
-            $from = new MoneyValue($this->parseMoneyAsDecimal($from), false);
-        }
-
-        $to = preg_replace('#(\s?\p{Sc}\s?)#u', '', (string) $to);
-
-        self::assertEquals($to, $transformer->transform($from));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_without_currency_and_different_default_currency(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('de_DE');
-
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        $from = new MoneyValue($this->parseMoneyAsDecimal(1234.5, 'USD'), false);
-
-        self::assertEquals('1234,50', $transformer->transform($from));
-    }
-
-    /**
-     * @dataProvider provideTransformationsWithGrouping
-     *
-     * @test
-     */
-    public function transform_with_grouping($from, $to, $locale): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault($locale);
-
-        $transformer = new MoneyToLocalizedStringTransformer('EUR', true);
-
-        $from = new MoneyValue($this->parseMoneyAsDecimal($from));
-        self::assertEquals($to, $transformer->transform($from));
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function reverse_transform($to, $from, $locale): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '58.1');
-
-        \Locale::setDefault($locale);
-
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        if ($to !== null) {
-            $to = new MoneyValue($this->parseMoneyAsDecimal($to));
-        }
-
-        self::assertEquals($to, $transformer->reverseTransform($from));
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function reverse_transform_without_currency($to, $from, $locale): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault($locale);
-
-        $from = preg_replace('#(\s?\p{Sc}\s?)#u', '', (string) $from);
-        $transformer = new MoneyToLocalizedStringTransformer('USD');
-
-        if ($to !== null) {
-            $to = new MoneyValue($this->parseMoneyAsDecimal($to, 'USD'), false);
-        }
-
-        self::assertEquals($to, $transformer->reverseTransform($from));
-    }
-
-    public static function provideTransformations(): iterable
-    {
-        return [
-            [null, '', 'de_AT'],
-            [1, '€ 1,00', 'de_AT'],
-            [1.5, '€ 1,50', 'de_AT'],
-            [1234.5, '€ 1234,50', 'de_AT'],
-            [12345.912, '€ 12345,91', 'de_AT'],
-            [1234.5, '1234,50 €', 'ru'],
-            [1234.5, '1234,50 €', 'fi'],
-        ];
-    }
-
-    /**
-     * @dataProvider provideTransformationsWithGrouping
-     *
-     * @test
-     */
-    public function reverse_transform_with_grouping($to, $from, $locale): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '58.1');
-
-        \Locale::setDefault($locale);
-
-        $transformer = new MoneyToLocalizedStringTransformer('EUR', true);
-
-        $to = new MoneyValue($this->parseMoneyAsDecimal($to));
-        self::assertEquals($to, $transformer->reverseTransform($from));
-    }
-
-    public static function provideTransformationsWithGrouping(): iterable
-    {
-        return [
-            [1234.5, '1.234,50 €', 'de_DE'],
-            [12345.912, '12.345,91 €', 'de_DE'],
-            [1234.5, '1 234,50 €', 'fr'],
-            [1234.5, '1 234,50 €', 'ru'],
-            [1234.5, '1 234,50 €', 'fi'],
-        ];
-    }
-
-    /**
-     * @see https://github.com/symfony/symfony/issues/7609
-     *
-     * @test
-     */
-    public function reverse_transform_with_grouping_and_fixed_spaces(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('ru');
-
-        $transformer = new MoneyToLocalizedStringTransformer('EUR', true);
-
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform("1\xc2\xa0234,5")
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_grouping_but_without_group_separator(): void
-    {
-        // Since we test against "de_AT", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('de_AT');
-
-        $transformer = new MoneyToLocalizedStringTransformer('EUR', true);
-
-        // omit group separator
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1234,5')
-        );
-
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(12345.912), false),
-            $transformer->reverseTransform('12345,912')
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_be_dot_if_grouping_separator_is_not_dot(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('fr');
-        $transformer = new MoneyToLocalizedStringTransformer('EUR', true);
-
-        // completely valid format
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1 234,5')
-        );
-
-        // accept dots
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1 234.5')
-        );
-
-        // omit group separator
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1234,5')
-        );
-
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1234.5')
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_not_be_dot_if_grouping_separator_is_dot(): void
-    {
-        // Since we test against "de_DE", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '58.1');
-
-        \Locale::setDefault('de_DE');
-
-        $transformer = new MoneyToLocalizedStringTransformer('EUR', true);
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('1.234.5');
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_not_be_dot_if_grouping_separator_is_dot_with_no_group_sep(): void
-    {
-        // Since we test against "de_DE", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '58.1');
-
-        \Locale::setDefault('de_DE');
-
-        $transformer = new MoneyToLocalizedStringTransformer('EUR', true);
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('1234.5');
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_be_dot_if_grouping_separator_is_dot_but_no_grouping_used(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '58.1');
-
-        \Locale::setDefault('fr');
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1234,5')
-        );
-
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1234.5')
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_be_comma_if_grouping_separator_is_not_comma(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '58.1');
-
-        \Locale::setDefault('bg');
-        $transformer = new MoneyToLocalizedStringTransformer('EUR', true);
-
-        // completely valid format
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1 234,5')
-        );
-
-        // accept commas
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1234.5')
-        );
-
-        // omit group separator
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1234.5')
-        );
-
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1234,5')
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_not_be_comma_if_grouping_separator_is_comma(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR', true);
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('1,234,5');
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_not_be_comma_if_grouping_separator_is_comma_with_no_group_sep(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR', true);
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('1234,5');
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_be_comma_if_grouping_separator_is_comma_but_no_grouping_used(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1234,50')
-        );
-
-        self::assertEquals(
-            new MoneyValue($this->parseMoneyAsDecimal(1234.5), false),
-            $transformer->reverseTransform('1234.50')
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function transform_expects_money_value(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->transform('foo');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_string(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform(1);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_number(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('foo');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_na_n(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('NaN');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_na_n2(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('nan');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_infinity(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('∞');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_infinity2(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('∞,123');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_negative_infinity(): void
-    {
-        $transformer = new MoneyToLocalizedStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('-∞');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/MoneyToStringTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/MoneyToStringTransformerTest.php
deleted file mode 100644
index 4a604484..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/MoneyToStringTransformerTest.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use Money\Currencies\ISOCurrencies;
-use Money\Currency;
-use Money\Parser\DecimalMoneyParser;
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\MoneyToStringTransformer;
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-
-/**
- * @internal
- */
-final class MoneyToStringTransformerTest extends TestCase
-{
-    private function parseMoneyAsDecimal($input, string $currency = 'EUR')
-    {
-        static $moneyParser;
-
-        if (! $moneyParser) {
-            $currencies = new ISOCurrencies();
-            $moneyParser = new DecimalMoneyParser($currencies);
-        }
-
-        return $moneyParser->parse((string) $input, new Currency($currency));
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function transform($from, $to): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        if ($from !== null) {
-            $from = new MoneyValue($this->parseMoneyAsDecimal($from));
-        }
-
-        self::assertEquals($to, $transformer->transform($from));
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function transform_without_currency($from, $to): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        if ($from !== null) {
-            $from = new MoneyValue($this->parseMoneyAsDecimal($from), false);
-        }
-
-        $to = mb_substr((string) $to, 4);
-
-        self::assertEquals($to, $transformer->transform($from));
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function reverse_transform($to, $from): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        if ($to !== null) {
-            $to = new MoneyValue($this->parseMoneyAsDecimal($to));
-        }
-
-        self::assertEquals($to, $transformer->reverseTransform($from));
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function reverse_transform_without_currency($to, $from): void
-    {
-        $transformer = new MoneyToStringTransformer('USD');
-
-        if ($to !== null) {
-            $to = new MoneyValue($this->parseMoneyAsDecimal($to, 'USD'), false);
-            $from = mb_substr((string) $from, 4);
-        }
-
-        self::assertEquals($to, $transformer->reverseTransform($from));
-    }
-
-    public static function provideTransformations(): iterable
-    {
-        return [
-            [null, ''],
-            [1, 'EUR 1.00'],
-            [1.5, 'EUR 1.50'],
-            [1234.5, 'EUR 1234.50'],
-            [12345.912, 'EUR 12345.91'],
-            [1234.5, 'EUR 1234.50'],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function transform_expects_money_value(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->transform('foo');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_string(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform(1);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_number(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('foo');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_na_n(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('NaN');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_na_n2(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('nan');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_infinity(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('∞');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_infinity2(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('∞,123');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_negative_infinity(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('-∞');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_number_or_currency_with_number(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('Value does not contain a valid 3 character currency code, got "fool".');
-
-        $transformer->reverseTransform('fool 12.00');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_number_or_currency_with_number2(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('Value does not contain a valid 3 character currency code, got "fo".');
-
-        $transformer->reverseTransform('fo ol 12.00');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_currency_with_number(): void
-    {
-        $transformer = new MoneyToStringTransformer('EUR');
-
-        $this->expectException(TransformationFailedException::class);
-        $transformer->reverseTransform('foo 12.00');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
deleted file mode 100644
index 8f722d86..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
+++ /dev/null
@@ -1,740 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class NumberToLocalizedStringTransformerTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        \Locale::setDefault('en');
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function transform(float | int | null $from, string $to, string $locale): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault($locale);
-
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        self::assertSame($to, $transformer->transform($from));
-    }
-
-    /**
-     * @dataProvider provideTransformationsWithGrouping
-     *
-     * @test
-     */
-    public function transform_with_grouping(float $from, string $to, string $locale): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault($locale);
-
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        self::assertSame($to, $transformer->transform($from));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_with_scale(): void
-    {
-        // Since we test against "de_AT", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('de_AT');
-
-        $transformer = new NumberToLocalizedStringTransformer(2);
-
-        self::assertEquals('1234,50', $transformer->transform(1234.5));
-        self::assertEquals('678,92', $transformer->transform(678.916));
-    }
-
-    /**
-     * @dataProvider transformWithRoundingProvider
-     *
-     * @test
-     */
-    public function transform_with_rounding($scale, $input, $output, $roundingMode): void
-    {
-        // Since we test against "de_AT", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('de_AT');
-
-        $transformer = new NumberToLocalizedStringTransformer($scale, null, $roundingMode);
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    public static function transformWithRoundingProvider(): iterable
-    {
-        return [
-            // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            [0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [0, 1234.4, '1235', NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [1, 123.44, '123,5', NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_CEILING],
-            // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [0, -1234.4, '-1235', NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [1, -123.44, '-123,5', NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            // away from zero (1.6 -> 2, -1.6 -> 2)
-            [0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_UP],
-            [0, 1234.4, '1235', NumberToLocalizedStringTransformer::ROUND_UP],
-            [0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_UP],
-            [0, -1234.4, '-1235', NumberToLocalizedStringTransformer::ROUND_UP],
-            [1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_UP],
-            [1, 123.44, '123,5', NumberToLocalizedStringTransformer::ROUND_UP],
-            [1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_UP],
-            [1, -123.44, '-123,5', NumberToLocalizedStringTransformer::ROUND_UP],
-            // towards zero (1.6 -> 1, -1.6 -> -1)
-            [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
-            // round halves (.5) to the next even number
-            [0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, 1233.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, 1232.5, '1232', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, -1233.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, -1232.5, '-1232', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, 123.35, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, 123.25, '123,2', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, -123.35, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, -123.25, '-123,2', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            // round halves (.5) away from zero
-            [0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            // round halves (.5) towards zero
-            [0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function transform_does_not_round_if_no_scale(): void
-    {
-        // Since we test against "de_AT", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('de_AT');
-
-        $transformer = new NumberToLocalizedStringTransformer(null, false, NumberToLocalizedStringTransformer::ROUND_DOWN);
-
-        self::assertEquals('1234,547', $transformer->transform(1234.547));
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function reverse_transform($to, $from, $locale): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault($locale);
-
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        self::assertEquals($to, $transformer->reverseTransform($from));
-    }
-
-    public static function provideTransformations(): iterable
-    {
-        return [
-            [null, '', 'de_AT'],
-            [1, '1', 'de_AT'],
-            [1.5, '1,5', 'de_AT'],
-            [1234.5, '1234,5', 'de_AT'],
-            [12345.912, '12345,912', 'de_AT'],
-            [1234.5, '1234,5', 'ru'],
-            [1234.5, '1234,5', 'fi'],
-        ];
-    }
-
-    /**
-     * @dataProvider provideTransformationsWithGrouping
-     *
-     * @test
-     */
-    public function reverse_transform_with_grouping($to, $from, $locale): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault($locale);
-
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        self::assertEquals($to, $transformer->reverseTransform($from));
-    }
-
-    public static function provideTransformationsWithGrouping(): iterable
-    {
-        return [
-            [1234.5, '1.234,5', 'de_DE'],
-            [12345.912, '12.345,912', 'de_DE'],
-            [1234.5, '1 234,5', 'fr'],
-            [1234.5, '1 234,5', 'ru'],
-            [1234.5, '1 234,5', 'fi'],
-        ];
-    }
-
-    /**
-     * @see https://github.com/symfony/symfony/issues/7609
-     *
-     * @test
-     */
-    public function reverse_transform_with_grouping_and_fixed_spaces(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('ru');
-
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        self::assertEquals(1234.5, $transformer->reverseTransform("1\xc2\xa0234,5"));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_with_grouping_but_without_group_separator(): void
-    {
-        // Since we test against "de_AT", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('de_AT');
-
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        // omit group separator
-        self::assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
-        self::assertEquals(12345.912, $transformer->reverseTransform('12345,912'));
-    }
-
-    /**
-     * @dataProvider reverseTransformWithRoundingProvider
-     *
-     * @test
-     */
-    public function reverse_transform_with_rounding($scale, $input, $output, $roundingMode): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer($scale, null, $roundingMode);
-
-        self::assertEquals($output, $transformer->reverseTransform($input));
-    }
-
-    public static function reverseTransformWithRoundingProvider(): iterable
-    {
-        return [
-            // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            [0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [0, '1234,4', 1235, NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [1, '123,44', 123.5, NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_CEILING],
-            [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_CEILING],
-            // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [0, '-1234,4', -1235, NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            [1, '-123,44', -123.5, NumberToLocalizedStringTransformer::ROUND_FLOOR],
-            // away from zero (1.6 -> 2, -1.6 -> 2)
-            [0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_UP],
-            [0, '1234,4', 1235, NumberToLocalizedStringTransformer::ROUND_UP],
-            [0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_UP],
-            [0, '-1234,4', -1235, NumberToLocalizedStringTransformer::ROUND_UP],
-            [1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_UP],
-            [1, '123,44', 123.5, NumberToLocalizedStringTransformer::ROUND_UP],
-            [1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_UP],
-            [1, '-123,44', -123.5, NumberToLocalizedStringTransformer::ROUND_UP],
-            // towards zero (1.6 -> 1, -1.6 -> -1)
-            [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
-            [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
-            // round halves (.5) to the next even number
-            [0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, '1233,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, '1232,5', 1232, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, '-1233,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [0, '-1232,5', -1232, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, '123,35', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, '123,25', 123.2, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, '-123,35', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            [1, '-123,25', -123.2, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
-            // round halves (.5) away from zero
-            [0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
-            // round halves (.5) towards zero
-            [0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-            [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_does_not_round_if_no_scale(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer(null, false, NumberToLocalizedStringTransformer::ROUND_DOWN);
-
-        self::assertEquals(1234.547, $transformer->reverseTransform('1234,547'));
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_be_dot_if_grouping_separator_is_not_dot(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('fr');
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        // completely valid format
-        self::assertEquals(1234.5, $transformer->reverseTransform('1 234,5'));
-        // accept dots
-        self::assertEquals(1234.5, $transformer->reverseTransform('1 234.5'));
-        // omit group separator
-        self::assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
-        self::assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_not_be_dot_if_grouping_separator_is_dot(): void
-    {
-        // Since we test against "de_DE", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('de_DE');
-
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('1.234.5');
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_not_be_dot_if_grouping_separator_is_dot_with_no_group_sep(): void
-    {
-        // Since we test against "de_DE", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('de_DE');
-
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('1234.5');
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_be_dot_if_grouping_separator_is_dot_but_no_grouping_used(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('fr');
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        self::assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
-        self::assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_be_comma_if_grouping_separator_is_not_comma(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('bg');
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        // completely valid format
-        self::assertEquals(1234.5, $transformer->reverseTransform('1 234.5'));
-        // accept commas
-        self::assertEquals(1234.5, $transformer->reverseTransform('1 234,5'));
-        // omit group separator
-        self::assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
-        self::assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_not_be_comma_if_grouping_separator_is_comma(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('1,234,5');
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_not_be_comma_if_grouping_separator_is_comma_with_no_group_sep(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('1234,5');
-    }
-
-    /**
-     * @test
-     */
-    public function decimal_separator_may_be_comma_if_grouping_separator_is_comma_but_no_grouping_used(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        self::assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
-        self::assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_expects_numeric(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->transform('foo');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_string(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform(1);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_number(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('foo');
-    }
-
-    /**
-     * @see https://github.com/symfony/symfony/issues/3161
-     *
-     * @test
-     */
-    public function reverse_transform_disallows_na_n(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('NaN');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_na_n2(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('nan');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_infinity(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('∞');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_infinity2(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('∞,123');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_negative_infinity(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('-∞');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_leading_extra_characters(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('foo123');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_centered_extra_characters(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('The number contains unrecognized characters: "foo3"');
-
-        $transformer->reverseTransform('12foo3');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_centered_extra_characters_multibyte(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('ru');
-
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('The number contains unrecognized characters: "foo8"');
-
-        $transformer->reverseTransform("12\xc2\xa0345,67foo8");
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_ignores_trailing_spaces_in_exception_message(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('ru');
-
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('The number contains unrecognized characters: "foo8"');
-
-        $transformer->reverseTransform("12\xc2\xa0345,67foo8  \xc2\xa0\t");
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_trailing_extra_characters(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('The number contains unrecognized characters: "foo"');
-
-        $transformer->reverseTransform('123foo');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_trailing_extra_characters_multibyte(): void
-    {
-        // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '70.1');
-
-        \Locale::setDefault('ru');
-
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        $this->expectException(TransformationFailedException::class);
-        $this->expectExceptionMessage('The number contains unrecognized characters: "foo"');
-
-        $transformer->reverseTransform("12\xc2\xa0345,678foo");
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_big_int(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        self::assertEquals(\PHP_INT_MAX - 1, (int) $transformer->reverseTransform((string) (\PHP_INT_MAX - 1)));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_small_int(): void
-    {
-        $transformer = new NumberToLocalizedStringTransformer(null, true);
-
-        self::assertSame(1.0, $transformer->reverseTransform('1'));
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/DataTransformer/NumberToStringTransformerTest.php b/lib/Core/Tests/Extension/Core/DataTransformer/NumberToStringTransformerTest.php
deleted file mode 100644
index 0c6f2be4..00000000
--- a/lib/Core/Tests/Extension/Core/DataTransformer/NumberToStringTransformerTest.php
+++ /dev/null
@@ -1,438 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\DataTransformer;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\NumberToStringTransformer;
-
-/**
- * @internal
- */
-final class NumberToStringTransformerTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        \Locale::setDefault('en');
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function transform(mixed $from, string $to): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        self::assertSame($to, $transformer->transform($from));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_with_scale(): void
-    {
-        $transformer = new NumberToStringTransformer(2);
-
-        self::assertSame('1234.5', $transformer->transform(1234.5));
-        self::assertSame('678.92', $transformer->transform(678.916));
-    }
-
-    /**
-     * @param NumberToStringTransformer::ROUND_* $roundingMode
-     *
-     * @dataProvider transformWithRoundingProvider
-     *
-     * @test
-     */
-    public function transform_with_rounding(int $scale, $input, string $output, int $roundingMode): void
-    {
-        $transformer = new NumberToStringTransformer($scale, false, $roundingMode);
-
-        self::assertEquals($output, $transformer->transform($input));
-    }
-
-    public static function transformWithRoundingProvider(): iterable
-    {
-        return [
-            // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            [0, 1234.5, '1235', NumberToStringTransformer::ROUND_CEILING],
-            [0, 1234.4, '1235', NumberToStringTransformer::ROUND_CEILING],
-            [0, -1234.5, '-1234', NumberToStringTransformer::ROUND_CEILING],
-            [0, -1234.4, '-1234', NumberToStringTransformer::ROUND_CEILING],
-            [1, 123.45, '123.5', NumberToStringTransformer::ROUND_CEILING],
-            [1, 123.44, '123.5', NumberToStringTransformer::ROUND_CEILING],
-            [1, -123.45, '-123.4', NumberToStringTransformer::ROUND_CEILING],
-            [1, -123.44, '-123.4', NumberToStringTransformer::ROUND_CEILING],
-            // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            [0, 1234.5, '1234', NumberToStringTransformer::ROUND_FLOOR],
-            [0, 1234.4, '1234', NumberToStringTransformer::ROUND_FLOOR],
-            [0, -1234.5, '-1235', NumberToStringTransformer::ROUND_FLOOR],
-            [0, -1234.4, '-1235', NumberToStringTransformer::ROUND_FLOOR],
-            [1, 123.45, '123.4', NumberToStringTransformer::ROUND_FLOOR],
-            [1, 123.44, '123.4', NumberToStringTransformer::ROUND_FLOOR],
-            [1, -123.45, '-123.5', NumberToStringTransformer::ROUND_FLOOR],
-            [1, -123.44, '-123.5', NumberToStringTransformer::ROUND_FLOOR],
-            // away from zero (1.6 -> 2, -1.6 -> 2)
-            [0, 1234.5, '1235', NumberToStringTransformer::ROUND_UP],
-            [0, 1234.4, '1235', NumberToStringTransformer::ROUND_UP],
-            [0, -1234.5, '-1235', NumberToStringTransformer::ROUND_UP],
-            [0, -1234.4, '-1235', NumberToStringTransformer::ROUND_UP],
-            [1, 123.45, '123.5', NumberToStringTransformer::ROUND_UP],
-            [1, 123.44, '123.5', NumberToStringTransformer::ROUND_UP],
-            [1, -123.45, '-123.5', NumberToStringTransformer::ROUND_UP],
-            [1, -123.44, '-123.5', NumberToStringTransformer::ROUND_UP],
-            // towards zero (1.6 -> 1, -1.6 -> -1)
-            [0, 1234.5, '1234', NumberToStringTransformer::ROUND_DOWN],
-            [0, 1234.4, '1234', NumberToStringTransformer::ROUND_DOWN],
-            [0, -1234.5, '-1234', NumberToStringTransformer::ROUND_DOWN],
-            [0, -1234.4, '-1234', NumberToStringTransformer::ROUND_DOWN],
-            [1, 123.45, '123.4', NumberToStringTransformer::ROUND_DOWN],
-            [1, 123.44, '123.4', NumberToStringTransformer::ROUND_DOWN],
-            [1, -123.45, '-123.4', NumberToStringTransformer::ROUND_DOWN],
-            [1, -123.44, '-123.4', NumberToStringTransformer::ROUND_DOWN],
-            // round halves (.5) to the next even number
-            [0, 1234.6, '1235', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, 1234.5, '1234', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, 1234.4, '1234', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, 1233.5, '1234', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, 1232.5, '1232', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, -1234.6, '-1235', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, -1234.5, '-1234', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, -1234.4, '-1234', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, -1233.5, '-1234', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, -1232.5, '-1232', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, 123.46, '123.5', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, 123.45, '123.4', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, 123.44, '123.4', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, 123.35, '123.4', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, 123.25, '123.2', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, -123.46, '-123.5', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, -123.45, '-123.4', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, -123.44, '-123.4', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, -123.35, '-123.4', NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, -123.25, '-123.2', NumberToStringTransformer::ROUND_HALF_EVEN],
-            // round halves (.5) away from zero
-            [0, 1234.6, '1235', NumberToStringTransformer::ROUND_HALF_UP],
-            [0, 1234.5, '1235', NumberToStringTransformer::ROUND_HALF_UP],
-            [0, 1234.4, '1234', NumberToStringTransformer::ROUND_HALF_UP],
-            [0, -1234.6, '-1235', NumberToStringTransformer::ROUND_HALF_UP],
-            [0, -1234.5, '-1235', NumberToStringTransformer::ROUND_HALF_UP],
-            [0, -1234.4, '-1234', NumberToStringTransformer::ROUND_HALF_UP],
-            [1, 123.46, '123.5', NumberToStringTransformer::ROUND_HALF_UP],
-            [1, 123.45, '123.5', NumberToStringTransformer::ROUND_HALF_UP],
-            [1, 123.44, '123.4', NumberToStringTransformer::ROUND_HALF_UP],
-            [1, -123.46, '-123.5', NumberToStringTransformer::ROUND_HALF_UP],
-            [1, -123.45, '-123.5', NumberToStringTransformer::ROUND_HALF_UP],
-            [1, -123.44, '-123.4', NumberToStringTransformer::ROUND_HALF_UP],
-            // round halves (.5) towards zero
-            [0, 1234.6, '1235', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [0, 1234.5, '1234', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [0, 1234.4, '1234', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [0, -1234.6, '-1235', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [0, -1234.5, '-1234', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [0, -1234.4, '-1234', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, 123.46, '123.5', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, 123.45, '123.4', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, 123.44, '123.4', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, -123.46, '-123.5', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, -123.45, '-123.4', NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, -123.44, '-123.4', NumberToStringTransformer::ROUND_HALF_DOWN],
-        ];
-    }
-
-    /**
-     * @dataProvider transformWithRoundingProvider
-     *
-     * @test
-     */
-    public function transform_does_not_round_if_no_scale(): void
-    {
-        $transformer = new NumberToStringTransformer(null, false, NumberToStringTransformer::ROUND_DOWN);
-
-        self::assertEquals('1234.547', $transformer->transform(1234.547));
-    }
-
-    /**
-     * @dataProvider provideTransformations
-     *
-     * @test
-     */
-    public function reverse_transform(mixed $to, mixed $from): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        self::assertEquals($to, $transformer->reverseTransform($from));
-    }
-
-    public static function provideTransformations(): iterable
-    {
-        return [
-            [null, ''],
-            [1, '1'],
-            [1.5, '1.5'],
-            [1234.5, '1234.5'],
-            [12345.912, '12345.912'],
-        ];
-    }
-
-    /**
-     * @param NumberToStringTransformer::ROUND_* $roundingMode
-     *
-     * @dataProvider reverseTransformWithRoundingProvider
-     *
-     * @test
-     */
-    public function reverse_transform_with_rounding(int $scale, string $input, mixed $output, int $roundingMode): void
-    {
-        $transformer = new NumberToStringTransformer($scale, false, $roundingMode);
-
-        self::assertEquals($output, $transformer->reverseTransform($input));
-    }
-
-    public static function reverseTransformWithRoundingProvider(): iterable
-    {
-        return [
-            // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            [0, '1234.5', 1235, NumberToStringTransformer::ROUND_CEILING],
-            [0, '1234.4', 1235, NumberToStringTransformer::ROUND_CEILING],
-            [0, '-1234.5', -1234, NumberToStringTransformer::ROUND_CEILING],
-            [0, '-1234.4', -1234, NumberToStringTransformer::ROUND_CEILING],
-            [1, '123.45', 123.5, NumberToStringTransformer::ROUND_CEILING],
-            [1, '123.44', 123.5, NumberToStringTransformer::ROUND_CEILING],
-            [1, '-123.45', -123.4, NumberToStringTransformer::ROUND_CEILING],
-            [1, '-123.44', -123.4, NumberToStringTransformer::ROUND_CEILING],
-            // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            [0, '1234.5', 1234, NumberToStringTransformer::ROUND_FLOOR],
-            [0, '1234.4', 1234, NumberToStringTransformer::ROUND_FLOOR],
-            [0, '-1234.5', -1235, NumberToStringTransformer::ROUND_FLOOR],
-            [0, '-1234.4', -1235, NumberToStringTransformer::ROUND_FLOOR],
-            [1, '123.45', 123.4, NumberToStringTransformer::ROUND_FLOOR],
-            [1, '123.44', 123.4, NumberToStringTransformer::ROUND_FLOOR],
-            [1, '-123.45', -123.5, NumberToStringTransformer::ROUND_FLOOR],
-            [1, '-123.44', -123.5, NumberToStringTransformer::ROUND_FLOOR],
-            // away from zero (1.6 -> 2, -1.6 -> 2)
-            [0, '1234.5', 1235, NumberToStringTransformer::ROUND_UP],
-            [0, '1234.4', 1235, NumberToStringTransformer::ROUND_UP],
-            [0, '-1234.5', -1235, NumberToStringTransformer::ROUND_UP],
-            [0, '-1234.4', -1235, NumberToStringTransformer::ROUND_UP],
-            [1, '123.45', 123.5, NumberToStringTransformer::ROUND_UP],
-            [1, '123.44', 123.5, NumberToStringTransformer::ROUND_UP],
-            [1, '-123.45', -123.5, NumberToStringTransformer::ROUND_UP],
-            [1, '-123.44', -123.5, NumberToStringTransformer::ROUND_UP],
-            // towards zero (1.6 -> 1, -1.6 -> -1)
-            [0, '1234.5', 1234, NumberToStringTransformer::ROUND_DOWN],
-            [0, '1234.4', 1234, NumberToStringTransformer::ROUND_DOWN],
-            [0, '-1234.5', -1234, NumberToStringTransformer::ROUND_DOWN],
-            [0, '-1234.4', -1234, NumberToStringTransformer::ROUND_DOWN],
-            [1, '123.45', 123.4, NumberToStringTransformer::ROUND_DOWN],
-            [1, '123.44', 123.4, NumberToStringTransformer::ROUND_DOWN],
-            [1, '-123.45', -123.4, NumberToStringTransformer::ROUND_DOWN],
-            [1, '-123.44', -123.4, NumberToStringTransformer::ROUND_DOWN],
-            // round halves (.5) to the next even number
-            [0, '1234.6', 1235, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, '1234.5', 1234, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, '1234.4', 1234, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, '1233.5', 1234, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, '1232.5', 1232, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, '-1234.6', -1235, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, '-1234.5', -1234, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, '-1234.4', -1234, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, '-1233.5', -1234, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [0, '-1232.5', -1232, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, '123.46', 123.5, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, '123.45', 123.4, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, '123.44', 123.4, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, '123.35', 123.4, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, '123.25', 123.2, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, '-123.46', -123.5, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, '-123.45', -123.4, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, '-123.44', -123.4, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, '-123.35', -123.4, NumberToStringTransformer::ROUND_HALF_EVEN],
-            [1, '-123.25', -123.2, NumberToStringTransformer::ROUND_HALF_EVEN],
-            // round halves (.5) away from zero
-            [0, '1234.6', 1235, NumberToStringTransformer::ROUND_HALF_UP],
-            [0, '1234.5', 1235, NumberToStringTransformer::ROUND_HALF_UP],
-            [0, '1234.4', 1234, NumberToStringTransformer::ROUND_HALF_UP],
-            [0, '-1234.6', -1235, NumberToStringTransformer::ROUND_HALF_UP],
-            [0, '-1234.5', -1235, NumberToStringTransformer::ROUND_HALF_UP],
-            [0, '-1234.4', -1234, NumberToStringTransformer::ROUND_HALF_UP],
-            [1, '123.46', 123.5, NumberToStringTransformer::ROUND_HALF_UP],
-            [1, '123.45', 123.5, NumberToStringTransformer::ROUND_HALF_UP],
-            [1, '123.44', 123.4, NumberToStringTransformer::ROUND_HALF_UP],
-            [1, '-123.46', -123.5, NumberToStringTransformer::ROUND_HALF_UP],
-            [1, '-123.45', -123.5, NumberToStringTransformer::ROUND_HALF_UP],
-            [1, '-123.44', -123.4, NumberToStringTransformer::ROUND_HALF_UP],
-            // round halves (.5) towards zero
-            [0, '1234.6', 1235, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [0, '1234.5', 1234, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [0, '1234.4', 1234, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [0, '-1234.6', -1235, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [0, '-1234.5', -1234, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [0, '-1234.4', -1234, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, '123.46', 123.5, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, '123.45', 123.4, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, '123.44', 123.4, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, '-123.46', -123.5, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, '-123.45', -123.4, NumberToStringTransformer::ROUND_HALF_DOWN],
-            [1, '-123.44', -123.4, NumberToStringTransformer::ROUND_HALF_DOWN],
-        ];
-    }
-
-    /**
-     * @dataProvider reverseTransformWithRoundingProvider
-     *
-     * @test
-     */
-    public function reverse_transform_does_not_round_if_no_scale(): void
-    {
-        $transformer = new NumberToStringTransformer(null, false, NumberToStringTransformer::ROUND_DOWN);
-
-        self::assertEquals(1234.547, $transformer->reverseTransform('1234.547'));
-    }
-
-    /**
-     * @test
-     */
-    public function transform_expects_numeric(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->transform('foo');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_scalar(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform(['1']);
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_expects_valid_number(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('foo');
-    }
-
-    /**
-     * @see https://github.com/symfony/symfony/issues/3161
-     *
-     * @test
-     */
-    public function reverse_transform_disallows_na_n(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('NaN');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_na_n2(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('nan');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_infinity(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('∞');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_infinity2(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('∞,123');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_negative_infinity(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('-∞');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_disallows_leading_extra_characters(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        $this->expectException(TransformationFailedException::class);
-
-        $transformer->reverseTransform('foo123');
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_big_int(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        self::assertEquals(\PHP_INT_MAX - 1, (int) $transformer->reverseTransform((string) (\PHP_INT_MAX - 1)));
-    }
-
-    /**
-     * @test
-     */
-    public function reverse_transform_small_int(): void
-    {
-        $transformer = new NumberToStringTransformer();
-
-        self::assertSame(1.0, $transformer->reverseTransform('1.0'));
-        self::assertSame(1, $transformer->reverseTransform('1'));
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/BirthdayTypeTest.php b/lib/Core/Tests/Extension/Core/Type/BirthdayTypeTest.php
deleted file mode 100644
index 45aceb8a..00000000
--- a/lib/Core/Tests/Extension/Core/Type/BirthdayTypeTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-
-/**
- * @internal
- */
-final class BirthdayTypeTest extends SearchIntegrationTestCase
-{
-    /**
-     * @test
-     */
-    public function date_only_input(): void
-    {
-        $field = $this->getFactory()->createField('birthday', BirthdayType::class, [
-            'pattern' => 'yyyy-MM-dd',
-            'allow_age' => false,
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('2010-06-02', '2010-06-02')
-            ->successfullyTransformsTo(new \DateTimeImmutable('2010-06-02'))
-            ->andReverseTransformsTo('2010-06-02', '2010-06-02')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('21')
-            ->failsToTransforms()
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function allow_age_input(): void
-    {
-        $field = $this->getFactory()->createField('birthday', BirthdayType::class, [
-            'pattern' => 'yyyy-MM-dd',
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('2010-06-02', '2010-06-02')
-            ->successfullyTransformsTo(new \DateTimeImmutable('2010-06-02'))
-            ->andReverseTransformsTo('2010-06-02', '2010-06-02')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('15')
-            ->successfullyTransformsTo(15)
-            ->andReverseTransformsTo('15')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function wrong_input_fails(): void
-    {
-        $field = $this->getFactory()->createField('birthday', BirthdayType::class, [
-            'allow_age' => true,
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)->withInput('twenty')->failsToTransforms();
-        FieldTransformationAssertion::assertThat($field)->withInput('-21')->failsToTransforms();
-        FieldTransformationAssertion::assertThat($field)->withInput('+21')->failsToTransforms();
-    }
-
-    /**
-     * @test
-     */
-    public function age_in_the_future_fails(): void
-    {
-        $field = $this->getFactory()->createField('birthday', BirthdayType::class, [
-            'pattern' => 'yyyy-MM-dd',
-        ]);
-
-        $currentDate = new \DateTimeImmutable('now + 1 day', new \DateTimeZone('UTC'));
-
-        FieldTransformationAssertion::assertThat($field)->withInput($currentDate->format('Y-m-d'))->failsToTransforms();
-    }
-
-    /**
-     * @test
-     */
-    public function age_in_future_works_when_allowed(): void
-    {
-        $field = $this->getFactory()->createField('birthday', BirthdayType::class, [
-            'pattern' => 'yyyy-MM-dd',
-            'allow_future_date' => true,
-        ]);
-
-        $currentDate = new \DateTimeImmutable('now + 1 day', new \DateTimeZone('UTC'));
-        $currentDate = $currentDate->setTime(0, 0, 0);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput($currentDate->format('Y-m-d'))
-            ->successfullyTransformsTo($currentDate)
-            ->andReverseTransformsTo($currentDate->format('Y-m-d'))
-        ;
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/BooleanTypeTest.php b/lib/Core/Tests/Extension/Core/Type/BooleanTypeTest.php
deleted file mode 100644
index 33377d53..00000000
--- a/lib/Core/Tests/Extension/Core/Type/BooleanTypeTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\BooleanType;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-
-/**
- * @internal
- */
-final class BooleanTypeTest extends SearchIntegrationTestCase
-{
-    /**
-     * @test
-     */
-    public function transform_to_boolean(): void
-    {
-        $field = $this->getFactory()->createField('active', BooleanType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('')
-            ->successfullyTransformsTo(null)
-            ->andReverseTransformsTo('')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('true')
-            ->successfullyTransformsTo(true)
-            ->andReverseTransformsTo('yes', 'true')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('1', 'true')
-            ->successfullyTransformsTo(true)
-            ->andReverseTransformsTo('yes', 'true')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('false')
-            ->successfullyTransformsTo(false)
-            ->andReverseTransformsTo('no', 'false')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function transform_to_boolean_with_custom_label_and_norm(): void
-    {
-        $field = $this->getFactory()->createField('active', BooleanType::class, [
-            'view_label' => ['true' => 'ja', 'false' => 'nee'],
-            'norm_label' => ['true' => 'yes', 'false' => 'no'],
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('ja', 'yes')
-            ->successfullyTransformsTo(true)
-            ->andReverseTransformsTo('ja', 'yes')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('nee', 'no')
-            ->successfullyTransformsTo(false)
-            ->andReverseTransformsTo('nee', 'no')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function wrong_input_fails(): void
-    {
-        $field = $this->getFactory()->createField('active', BooleanType::class);
-
-        FieldTransformationAssertion::assertThat($field)->withInput('foo')->failsToTransforms();
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/ChoiceTypeTest.php b/lib/Core/Tests/Extension/Core/Type/ChoiceTypeTest.php
deleted file mode 100644
index 191f1ee9..00000000
--- a/lib/Core/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceGroupView;
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceView;
-use Rollerworks\Component\Search\Extension\Core\Type\ChoiceType;
-use Rollerworks\Component\Search\Field\SearchField;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
-
-/**
- * @internal
- */
-final class ChoiceTypeTest extends SearchIntegrationTestCase
-{
-    /** @var array<string, string> */
-    private array $choices = [
-        'Bernhard' => 'a',
-        'Fabien' => 'b',
-        'Kris' => 'c',
-        'Jon' => 'd',
-        'Roman' => 'e',
-    ];
-
-    /** @var array<string, bool|string> */
-    private array $scalarChoices = [
-        'Yes' => true,
-        'No' => false,
-        'n/a' => '',
-    ];
-
-    /** @var array<int, object> */
-    private ?array $objectChoices;
-
-    /** @var array<string, array<string, string>> */
-    protected array $groupedChoices = [
-        'Symfony' => [
-            'Bernhard' => 'a',
-            'Fabien' => 'b',
-            'Kris' => 'c',
-        ],
-        'Doctrine' => [
-            'Jon' => 'd',
-            'Roman' => 'e',
-        ],
-    ];
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->objectChoices = [
-            (object) ['id' => 1, 'name' => 'Bernhard'],
-            (object) ['id' => 2, 'name' => 'Fabien'],
-            (object) ['id' => 3, 'name' => 'Kris'],
-            (object) ['id' => 4, 'name' => 'Jon'],
-            (object) ['id' => 5, 'name' => 'Roman'],
-        ];
-    }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        $this->objectChoices = null;
-    }
-
-    /**
-     * @test
-     */
-    public function choices_option_expects_array_or_traversable(): void
-    {
-        $this->expectException(InvalidOptionsException::class);
-
-        $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choices' => new \stdClass(),
-        ]);
-    }
-
-    /**
-     * @test
-     */
-    public function choice_list_option_expects_choice_list(): void
-    {
-        $this->expectException(InvalidOptionsException::class);
-
-        $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choice_loader' => new \stdClass(),
-        ]);
-    }
-
-    /**
-     * @test
-     */
-    public function choice_list_and_choices_can_be_empty(): void
-    {
-        $field = $this->getFactory()->createField('choice', ChoiceType::class);
-        self::assertEquals([], $field->getOption('choices'));
-    }
-
-    /**
-     * @test
-     */
-    public function choice_list_with_scalar_values(): void
-    {
-        /** @var SearchField $field */
-        $field = $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choices' => $this->scalarChoices,
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('Yes', '1')
-            ->successfullyTransformsTo(true)
-            ->andReverseTransformsTo('Yes', '1')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('No', '0')
-            ->successfullyTransformsTo(false)
-            ->andReverseTransformsTo('No', '0')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('n/a', '')
-            ->successfullyTransformsTo('')
-            ->andReverseTransformsTo('n/a', '')
-        ;
-
-        $field->finalizeConfig();
-        $view = $field->createView(new FieldSetView());
-
-        self::assertSame('1', $view->vars['choices'][0]->value);
-        self::assertSame('0', $view->vars['choices'][1]->value);
-        self::assertSame('', $view->vars['choices'][2]->value);
-    }
-
-    /**
-     * @test
-     */
-    public function choice_list_with_scalar_values_and_norm_format_label(): void
-    {
-        /** @var SearchField $field */
-        $field = $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choices' => $this->scalarChoices,
-            'norm_format' => 'label',
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('Yes', 'Yes')
-            ->successfullyTransformsTo(true)
-            ->andReverseTransformsTo('Yes', 'Yes')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('No', 'No')
-            ->successfullyTransformsTo(false)
-            ->andReverseTransformsTo('No', 'No')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('n/a', 'n/a')
-            ->successfullyTransformsTo('')
-            ->andReverseTransformsTo('n/a', 'n/a')
-        ;
-
-        $field->finalizeConfig();
-        $view = $field->createView(new FieldSetView());
-
-        self::assertSame('1', $view->vars['choices'][0]->value);
-        self::assertSame('0', $view->vars['choices'][1]->value);
-        self::assertSame('', $view->vars['choices'][2]->value);
-    }
-
-    /**
-     * @test
-     */
-    public function choice_list_with_scalar_values_and_false_as_preferred_choice(): void
-    {
-        /** @var SearchField $field */
-        $field = $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choices' => $this->scalarChoices,
-            'preferred_choices' => [false],
-        ]);
-
-        $field->finalizeConfig();
-        $view = $field->createView(new FieldSetView());
-
-        self::assertEquals('No', $view->vars['preferred_choices'][1]->label, 'False value should be preferred.');
-    }
-
-    /**
-     * @test
-     */
-    public function object_choices(): void
-    {
-        /** @var SearchField $field */
-        $field = $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choices' => $this->objectChoices,
-            'choice_label' => 'name',
-            'choice_value' => 'id',
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput($this->objectChoices[2]->name, (string) $this->objectChoices[2]->id)
-            ->successfullyTransformsTo($this->objectChoices[2])
-            ->andReverseTransformsTo($this->objectChoices[2]->name, (string) $this->objectChoices[2]->id)
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function value_view_format_is_value(): void
-    {
-        /** @var SearchField $field */
-        $field = $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choices' => $this->objectChoices,
-            'choice_label' => 'name',
-            'choice_value' => 'id',
-            'view_format' => 'value',
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput((string) $this->objectChoices[2]->id)
-            ->successfullyTransformsTo($this->objectChoices[2])
-            ->andReverseTransformsTo((string) $this->objectChoices[2]->id)
-        ;
-
-        $field->finalizeConfig();
-        $view = $field->createView(new FieldSetView());
-
-        // Ensure widget views still have the label.
-        self::assertEquals([
-            new ChoiceView($this->objectChoices[0], '1', 'Bernhard'),
-            new ChoiceView($this->objectChoices[1], '2', 'Fabien'),
-            new ChoiceView($this->objectChoices[2], '3', 'Kris'),
-            new ChoiceView($this->objectChoices[3], '4', 'Jon'),
-            new ChoiceView($this->objectChoices[4], '5', 'Roman'),
-        ], $view->vars['choices']);
-    }
-
-    /**
-     * @test
-     */
-    public function array_choices(): void
-    {
-        /** @var SearchField $field */
-        $field = $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choices' => $this->choices,
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('Fabien', 'b')
-            ->successfullyTransformsTo('b')
-            ->andReverseTransformsTo('Fabien', 'b')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function pass_choices_to_view(): void
-    {
-        $choices = ['A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd'];
-
-        /** @var SearchField $field */
-        $field = $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choices' => $choices,
-        ]);
-
-        $field->finalizeConfig();
-        $view = $field->createView(new FieldSetView());
-
-        self::assertEquals([
-            new ChoiceView('a', 'a', 'A'),
-            new ChoiceView('b', 'b', 'B'),
-            new ChoiceView('c', 'c', 'C'),
-            new ChoiceView('d', 'd', 'D'),
-        ], $view->vars['choices']);
-    }
-
-    /**
-     * @test
-     */
-    public function pass_preferred_choices_to_view(): void
-    {
-        $choices = ['A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd'];
-
-        /** @var SearchField $field */
-        $field = $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choices' => $choices,
-            'preferred_choices' => ['b', 'd'],
-        ]);
-
-        $field->finalizeConfig();
-        $view = $field->createView(new FieldSetView());
-
-        self::assertEquals([
-            0 => new ChoiceView('a', 'a', 'A'),
-            2 => new ChoiceView('c', 'c', 'C'),
-        ], $view->vars['choices']);
-
-        self::assertEquals([
-            1 => new ChoiceView('b', 'b', 'B'),
-            3 => new ChoiceView('d', 'd', 'D'),
-        ], $view->vars['preferred_choices']);
-    }
-
-    /**
-     * @test
-     */
-    public function pass_hierarchical_choices_to_view(): void
-    {
-        /** @var SearchField $field */
-        $field = $this->getFactory()->createField('choice', ChoiceType::class, [
-            'choices' => $this->groupedChoices,
-            'preferred_choices' => ['b', 'd'],
-        ]);
-
-        $field->finalizeConfig();
-        $view = $field->createView(new FieldSetView());
-
-        self::assertEquals([
-            'Symfony' => new ChoiceGroupView('Symfony', [
-                0 => new ChoiceView('a', 'a', 'Bernhard'),
-                2 => new ChoiceView('c', 'c', 'Kris'),
-            ]),
-            'Doctrine' => new ChoiceGroupView('Doctrine', [
-                4 => new ChoiceView('e', 'e', 'Roman'),
-            ]),
-        ], $view->vars['choices']);
-
-        self::assertEquals([
-            'Symfony' => new ChoiceGroupView('Symfony', [
-                1 => new ChoiceView('b', 'b', 'Fabien'),
-            ]),
-            'Doctrine' => new ChoiceGroupView('Doctrine', [
-                3 => new ChoiceView('d', 'd', 'Jon'),
-            ]),
-        ], $view->vars['preferred_choices']);
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/CountryTypeTest.php b/lib/Core/Tests/Extension/Core/Type/CountryTypeTest.php
deleted file mode 100644
index 7b2cfcfc..00000000
--- a/lib/Core/Tests/Extension/Core/Type/CountryTypeTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceView;
-use Rollerworks\Component\Search\Extension\Core\Type\CountryType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class CountryTypeTest extends SearchIntegrationTestCase
-{
-    protected function setUp(): void
-    {
-        IntlTestHelper::requireIntl($this, '70.1');
-
-        parent::setUp();
-    }
-
-    /**
-     * @test
-     */
-    public function countries_are_selectable(): void
-    {
-        $field = $this->getFactory()->createField('choice', CountryType::class);
-        $field->finalizeConfig();
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('Germany', 'DE')
-            ->successfullyTransformsTo('DE')
-            ->andReverseTransformsTo('Germany', 'DE')
-        ;
-
-        $view = $field->createView(new FieldSetView());
-        $choices = $view->vars['choices'];
-
-        // Don't check objects for identity
-        self::assertContainsEquals(new ChoiceView('DE', 'DE', 'Germany'), $choices);
-        self::assertContainsEquals(new ChoiceView('GB', 'GB', 'United Kingdom'), $choices);
-        self::assertContainsEquals(new ChoiceView('US', 'US', 'United States'), $choices);
-        self::assertContainsEquals(new ChoiceView('FR', 'FR', 'France'), $choices);
-        self::assertContainsEquals(new ChoiceView('MY', 'MY', 'Malaysia'), $choices);
-    }
-
-    /**
-     * @test
-     */
-    public function unknown_country_is_not_included(): void
-    {
-        $field = $this->getFactory()->createField('choice', CountryType::class);
-        $field->finalizeConfig();
-
-        $view = $field->createView(new FieldSetView());
-
-        $choices = $view->vars['choices'];
-
-        foreach ($choices as $choice) {
-            if ($choice->value === 'ZZ') {
-                self::fail('Should not contain choice "ZZ"');
-            }
-        }
-
-        self::assertStringContainsString('AF', $choices[0]->value ?? 'ZZ');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/CurrencyTypeTest.php b/lib/Core/Tests/Extension/Core/Type/CurrencyTypeTest.php
deleted file mode 100644
index 783c0d5d..00000000
--- a/lib/Core/Tests/Extension/Core/Type/CurrencyTypeTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceView;
-use Rollerworks\Component\Search\Extension\Core\Type\CurrencyType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class CurrencyTypeTest extends SearchIntegrationTestCase
-{
-    protected function setUp(): void
-    {
-        IntlTestHelper::requireIntl($this, '70.1');
-
-        parent::setUp();
-    }
-
-    /**
-     * @test
-     */
-    public function currencies_are_selectable(): void
-    {
-        $field = $field = $this->getFactory()->createField('choice', CurrencyType::class);
-        $field->finalizeConfig();
-
-        // NB. Use the ISO value as view-format for easier input.
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('EUR')
-            ->successfullyTransformsTo('EUR')
-            ->andReverseTransformsTo('EUR')
-        ;
-
-        $view = $field->createView(new FieldSetView());
-
-        $choices = $view->vars['choices'];
-
-        self::assertContainsEquals(new ChoiceView('EUR', 'EUR', 'Euro'), $choices);
-        self::assertContainsEquals(new ChoiceView('USD', 'USD', 'US Dollar'), $choices);
-        self::assertContainsEquals(new ChoiceView('SIT', 'SIT', 'Slovenian Tolar'), $choices);
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/DateTimeTypeTest.php b/lib/Core/Tests/Extension/Core/Type/DateTimeTypeTest.php
deleted file mode 100644
index 7a9dfc12..00000000
--- a/lib/Core/Tests/Extension/Core/Type/DateTimeTypeTest.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Carbon\CarbonInterval;
-use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\CarbonIntervalComparator;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use SebastianBergmann\Comparator\Factory as ComparatorFactory;
-use Symfony\Component\Intl\Intl;
-use Symfony\Component\Intl\Util\IcuVersion;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class DateTimeTypeTest extends SearchIntegrationTestCase
-{
-    private static ?CarbonIntervalComparator $violationComparator = null;
-
-    /**
-     * @test
-     */
-    public function view_timezone_can_be_transformed_to_model_timezone(): void
-    {
-        $field = $this->getFactory()->createField('datetime', DateTimeType::class, [
-            'model_timezone' => 'America/New_York',
-            'view_timezone' => 'Pacific/Tahiti',
-            'pattern' => 'yyyy-MM-dd\'T\'HH:mm:ssZZZZZ',
-        ]);
-
-        $outputTime = new \DateTimeImmutable('2010-06-02 03:04:00 Pacific/Tahiti');
-        $outputTime = $outputTime->setTimezone(new \DateTimeZone('America/New_York'));
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('2010-06-02T03:04:00-10:00', '2010-06-02T03:04:00-10:00')
-            ->successfullyTransformsTo($outputTime)
-            ->andReverseTransformsTo('2010-06-02T03:04:00-10:00', '2010-06-02T03:04:00-10:00')
-        ;
-
-        self::assertEquals('This value is not a valid datetime.', $field->getOption('invalid_message'));
-    }
-
-    /**
-     * @test
-     */
-    public function pattern_can_be_configured(): void
-    {
-        $field = $this->getFactory()->createField('datetime', DateTimeType::class, [
-            'pattern' => 'MM*yyyy*dd HH:mm',
-        ]);
-
-        $outputTime = new \DateTimeImmutable('2010-06-02T13:12:00.000000+0000');
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput($outputTime->format('m*Y*d H:i'), $outputTime->format('c'))
-            ->successfullyTransformsTo($outputTime)
-            ->andReverseTransformsTo('06*2010*02 13:12', '2010-06-02T13:12:00Z')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function time_format_can_be_configurable(): void
-    {
-        $field = $this->getFactory()->createField('datetime', DateTimeType::class, [
-            'model_timezone' => 'UTC',
-            'view_timezone' => 'UTC',
-            'time_format' => \IntlDateFormatter::SHORT,
-        ]);
-
-        $outputTime = new \DateTimeImmutable('2010-06-02 03:04:00 UTC');
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('Jun 2, 2010, 3:04 AM', '2010-06-02T03:04:00Z')
-            ->successfullyTransformsTo($outputTime)
-            ->andReverseTransformsTo('Jun 2, 2010, 3:04 AM', '2010-06-02T03:04:00Z')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function invalid_input_should_fail_transformation(): void
-    {
-        $field = $this->getFactory()->createField('datetime', DateTimeType::class, [
-            'pattern' => 'MM-yyyy-dd',
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('06*2010*02', '2010-06-02T13:12:00ZZ')
-            ->failsToTransforms()
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('06-2010-40', '2010-06*02T13:12:00Z')
-            ->failsToTransforms()
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('1 week + 2 years')
-            ->failsToTransforms()
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function view_is_configured_properly(): void
-    {
-        $field = $this->getFactory()->createField('datetime', DateTimeType::class, [
-            'date_format' => \IntlDateFormatter::SHORT,
-            'time_format' => \IntlDateFormatter::SHORT,
-        ]);
-
-        $field->finalizeConfig();
-        $fieldView = $field->createView(new FieldSetView());
-
-        self::assertArrayHasKey('timezone', $fieldView->vars);
-        self::assertArrayHasKey('pattern', $fieldView->vars);
-
-        self::assertEquals(date_default_timezone_get(), $fieldView->vars['timezone']);
-        self::assertEquals('M/d/yy, h:mm a', $fieldView->vars['pattern']);
-    }
-
-    /**
-     * @test
-     */
-    public function interval_valid_input(): void
-    {
-        \Locale::setDefault('nl');
-
-        $field = $this->getFactory()->createField('datetime', DateTimeType::class, ['allow_relative' => true]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('1 week 2 jaar', '1 week 2 years')
-            ->successfullyTransformsTo(CarbonInterval::fromString('1 weeks 2 years'))
-            ->andReverseTransformsTo('2 jaar 1 week', '2 years 1 week')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('-1 week + 2 jaar', '-1 week + 2 years')
-            ->successfullyTransformsTo(CarbonInterval::fromString('1 week + 2 years')->invert())
-            ->andReverseTransformsTo('-2 jaar 1 week', '-2 years 1 week')
-        ;
-
-        self::assertEquals('This value is not a valid datetime or date interval.', $field->getOption('invalid_message'));
-    }
-
-    /**
-     * @test
-     */
-    public function interval_valid_input_in_rtl(): void
-    {
-        \Locale::setDefault('ar');
-
-        $field = $this->getFactory()->createField('datetime', DateTimeType::class, ['allow_relative' => true]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('3 أيام ساعتين', '3 days 2 hours')
-            ->successfullyTransformsTo(CarbonInterval::fromString('3 days 2 hours'))
-            ->andReverseTransformsTo('3 أيام ساعتين', '3 days 2 hours')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('-3 أيام ساعتين', '-3 days 2 hours')
-            ->successfullyTransformsTo(CarbonInterval::fromString('3 days 2 hour')->invert())
-            ->andReverseTransformsTo('-3 أيام ساعتين', '-3 days 2 hours')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function interval_valid_input_with_iso_format(): void
-    {
-        \Locale::setDefault('nl');
-
-        $field = $this->getFactory()->createField('datetime', DateTimeType::class, ['allow_relative' => true]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('1 week + 2 jaar', '2Y1W')
-            ->successfullyTransformsTo(CarbonInterval::fromString('1 week + 2 years'))
-            ->andReverseTransformsTo('2 jaar 1 week', '2 years 1 week')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function interval_with_time_format_can_be_configurable(): void
-    {
-        \Locale::setDefault('nl');
-
-        $field = $this->getFactory()->createField('datetime', DateTimeType::class, [
-            'model_timezone' => 'UTC',
-            'view_timezone' => 'UTC',
-            'time_format' => \IntlDateFormatter::SHORT,
-            'allow_relative' => true,
-        ]);
-
-        $outputTime = new \DateTimeImmutable('2010-06-02 03:04:00 UTC');
-
-        if (IcuVersion::compare(Intl::getIcuVersion(), '73.2', '>=', 1)) {
-            FieldTransformationAssertion::assertThat($field)
-                ->withInput('2 Juni 2010, 03:04', '2010-06-02T03:04:00Z')
-                ->successfullyTransformsTo($outputTime)
-                ->andReverseTransformsTo('2 jun 2010, 03:04', '2010-06-02T03:04:00Z')
-            ;
-
-            FieldTransformationAssertion::assertThat($field)
-                ->withInput('2 Juni 2010 03:04', '2010-06-02T03:04:00Z')
-                ->successfullyTransformsTo($outputTime)
-                ->andReverseTransformsTo('2 jun 2010, 03:04', '2010-06-02T03:04:00Z')
-            ;
-        } else {
-            FieldTransformationAssertion::assertThat($field)
-                ->withInput('2 Juni 2010 03:04', '2010-06-02T03:04:00Z')
-                ->successfullyTransformsTo($outputTime)
-                ->andReverseTransformsTo('2 jun. 2010 03:04', '2010-06-02T03:04:00Z')
-            ;
-        }
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('1 week + 2 jaar', '2Y1W')
-            ->successfullyTransformsTo(CarbonInterval::fromString('1 week + 2 years'))
-            ->andReverseTransformsTo('2 jaar 1 week', '2 years 1 week')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('')
-            ->successfullyTransformsTo(null)
-            ->andReverseTransformsTo('')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function interval_wrong_input_fails(): void
-    {
-        $field = $this->getFactory()->createField('datetime', DateTimeType::class, ['allow_relative' => true]);
-
-        // Technically invalid, but Carbon silently ignores them.
-        // FieldTransformationAssertion::assertThat($field)->withInput('twe nty', 'twenty')->failsToTransforms();
-        // FieldTransformationAssertion::assertThat($field)->withInput('twenty')->failsToTransforms();
-        FieldTransformationAssertion::assertThat($field)->withInput('6WW')->failsToTransforms();
-        FieldTransformationAssertion::assertThat($field)->withInput('2 wee')->failsToTransforms();
-        FieldTransformationAssertion::assertThat($field)->withInput('2 Juni 2010 3:04')->failsToTransforms();
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        // we test against "nl", so we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '66.1');
-    }
-
-    /**
-     * @beforeClass
-     */
-    public static function setUpValidatorComparator(): void
-    {
-        self::$violationComparator = new CarbonIntervalComparator();
-
-        $comparatorFactory = ComparatorFactory::getInstance();
-        $comparatorFactory->register(self::$violationComparator);
-    }
-
-    /**
-     * @afterClass
-     */
-    public static function tearDownValidatorComparator(): void
-    {
-        if (self::$violationComparator === null) {
-            return;
-        }
-
-        $comparatorFactory = ComparatorFactory::getInstance();
-        $comparatorFactory->unregister(self::$violationComparator);
-        self::$violationComparator = null;
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/DateTypeTest.php b/lib/Core/Tests/Extension/Core/Type/DateTypeTest.php
deleted file mode 100644
index 21f5b903..00000000
--- a/lib/Core/Tests/Extension/Core/Type/DateTypeTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\DateType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class DateTypeTest extends SearchIntegrationTestCase
-{
-    /**
-     * @test
-     */
-    public function pattern_can_be_configured(): void
-    {
-        $field = $this->getFactory()->createField('datetime', DateType::class, [
-            'pattern' => 'MM*yyyy*dd',
-        ]);
-
-        $outputTime = new \DateTimeImmutable('2010-06-02T00:00:00.000000+0000');
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput($outputTime->format('m*Y*d'), $outputTime->format('Y-m-d'))
-            ->successfullyTransformsTo($outputTime)
-            ->andReverseTransformsTo('06*2010*02', '2010-06-02')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function invalid_input_should_fail_transformation(): void
-    {
-        $field = $this->getFactory()->createField('datetime', DateType::class, [
-            'pattern' => 'MM-yyyy-dd',
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('06*2010*02', '06-2010-02')
-            ->failsToTransforms()
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('22-2010-02', '2010-06*02')
-            ->failsToTransforms()
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function view_is_configured_properly_without_explicit_pattern(): void
-    {
-        $field = $this->getFactory()->createField('datetime', DateType::class, [
-            'format' => \IntlDateFormatter::SHORT,
-        ]);
-
-        $field->finalizeConfig();
-        $fieldView = $field->createView(new FieldSetView());
-
-        self::assertArrayHasKey('timezone', $fieldView->vars);
-        self::assertArrayHasKey('pattern', $fieldView->vars);
-
-        self::assertEquals(date_default_timezone_get(), $fieldView->vars['timezone']);
-        self::assertEquals('M/d/yy', $fieldView->vars['pattern']);
-    }
-
-    /**
-     * @test
-     */
-    public function view_is_configured_properly(): void
-    {
-        $field = $this->getFactory()->createField('datetime', DateType::class, [
-            'pattern' => 'MM-yyyy-dd',
-        ]);
-
-        $field->finalizeConfig();
-        $fieldView = $field->createView(new FieldSetView());
-
-        self::assertArrayHasKey('timezone', $fieldView->vars);
-        self::assertArrayHasKey('pattern', $fieldView->vars);
-
-        self::assertEquals(date_default_timezone_get(), $fieldView->vars['timezone']);
-        self::assertEquals('MM-yyyy-dd', $fieldView->vars['pattern']);
-    }
-
-    protected function setUp(): void
-    {
-        IntlTestHelper::requireIntl($this, '58.1');
-
-        parent::setUp();
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/IntegerTypeTest.php b/lib/Core/Tests/Extension/Core/Type/IntegerTypeTest.php
deleted file mode 100644
index 887e85e9..00000000
--- a/lib/Core/Tests/Extension/Core/Type/IntegerTypeTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class IntegerTypeTest extends SearchIntegrationTestCase
-{
-    /**
-     * @test
-     */
-    public function create(): void
-    {
-        $field = $this->getFactory()->createField('integer', IntegerType::class);
-
-        self::assertFalse($field->getOption('grouping'));
-    }
-
-    /**
-     * @test
-     */
-    public function casts_to_integer(): void
-    {
-        $field = $this->getFactory()->createField('integer', IntegerType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('678')
-            ->successfullyTransformsTo(678)
-            ->andReverseTransformsTo('678')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('1')
-            ->successfullyTransformsTo(1)
-            ->andReverseTransformsTo('1')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('-1')
-            ->successfullyTransformsTo(-1)
-            ->andReverseTransformsTo('-1')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function non_western_formatting(): void
-    {
-        \Locale::setDefault('ar_BH');
-
-        $field = $this->getFactory()->createField('number', IntegerType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('١٢٣٤٥', '12345')
-            ->successfullyTransformsTo(12345)
-            ->andReverseTransformsTo('١٢٣٤٥', '12345')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function wrong_input_fails(): void
-    {
-        $field = $this->getFactory()->createField('integer', IntegerType::class);
-
-        FieldTransformationAssertion::assertThat($field)->withInput('foo')->failsToTransforms();
-    }
-
-    /**
-     * @test
-     */
-    public function view_is_configured_properly(): void
-    {
-        $field = $this->getFactory()->createField(
-            'integer',
-            IntegerType::class,
-            [
-                'grouping' => false,
-            ]
-        );
-
-        $field->finalizeConfig();
-        $fieldView = $field->createView(new FieldSetView());
-
-        self::assertArrayHasKey('grouping', $fieldView->vars);
-        self::assertArrayNotHasKey('precision', $fieldView->vars);
-        self::assertFalse($fieldView->vars['grouping']);
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        // we test against "ar", so we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '58.1');
-
-        \Locale::setDefault('en_us');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/LanguageTypeTest.php b/lib/Core/Tests/Extension/Core/Type/LanguageTypeTest.php
deleted file mode 100644
index 7d2f1a3a..00000000
--- a/lib/Core/Tests/Extension/Core/Type/LanguageTypeTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceView;
-use Rollerworks\Component\Search\Extension\Core\Type\LanguageType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class LanguageTypeTest extends SearchIntegrationTestCase
-{
-    protected function setUp(): void
-    {
-        IntlTestHelper::requireIntl($this, '70.1');
-
-        parent::setUp();
-    }
-
-    /**
-     * @test
-     */
-    public function choices_are_selectable(): void
-    {
-        $field = $field = $this->getFactory()->createField('choice', LanguageType::class);
-        $field->finalizeConfig();
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('English', 'en')
-            ->successfullyTransformsTo('en')
-            ->andReverseTransformsTo('English', 'en')
-        ;
-
-        $view = $field->createView(new FieldSetView());
-
-        $choices = $view->vars['choices'];
-
-        self::assertContainsEquals(new ChoiceView('en', 'en', 'English'), $choices);
-        self::assertContainsEquals(new ChoiceView('fr', 'fr', 'French'), $choices);
-        self::assertContainsEquals(new ChoiceView('my', 'my', 'Burmese'), $choices);
-    }
-
-    /**
-     * @test
-     */
-    public function multiple_languages_is_not_included(): void
-    {
-        $field = $field = $this->getFactory()->createField('choice', LanguageType::class);
-        $field->finalizeConfig();
-
-        $view = $field->createView(new FieldSetView());
-        $choices = $view->vars['choices'];
-
-        self::assertNotContainsEquals(new ChoiceView('mul', 'mul', 'Mehrsprachig'), $choices);
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/LocaleTypeTest.php b/lib/Core/Tests/Extension/Core/Type/LocaleTypeTest.php
deleted file mode 100644
index dd8f5e4f..00000000
--- a/lib/Core/Tests/Extension/Core/Type/LocaleTypeTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceView;
-use Rollerworks\Component\Search\Extension\Core\Type\LocaleType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class LocaleTypeTest extends SearchIntegrationTestCase
-{
-    protected function setUp(): void
-    {
-        IntlTestHelper::requireIntl($this, '70.1');
-
-        parent::setUp();
-    }
-
-    /**
-     * @test
-     */
-    public function currencies_are_selectable(): void
-    {
-        $field = $this->getFactory()->createField('choice', LocaleType::class);
-        $field->finalizeConfig();
-
-        // NB. Use the ISO value as view-format for easier input.
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('en_GB')
-            ->successfullyTransformsTo('en_GB')
-            ->andReverseTransformsTo('en_GB')
-        ;
-
-        $view = $field->createView(new FieldSetView());
-
-        $choices = $view->vars['choices'];
-
-        self::assertContainsEquals(new ChoiceView('en', 'en', 'English'), $choices);
-        self::assertContainsEquals(new ChoiceView('en_GB', 'en_GB', 'English (United Kingdom)'), $choices);
-        self::assertContainsEquals(new ChoiceView('zh_Hant_MO', 'zh_Hant_MO', 'Chinese (Traditional, Macao SAR China)'), $choices);
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/MoneyTypeTest.php b/lib/Core/Tests/Extension/Core/Type/MoneyTypeTest.php
deleted file mode 100644
index c3c666a6..00000000
--- a/lib/Core/Tests/Extension/Core/Type/MoneyTypeTest.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Money\Money;
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Input\NormStringQueryInput;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class MoneyTypeTest extends SearchIntegrationTestCase
-{
-    protected function setUp(): void
-    {
-        // we test against different locales, so we need the full
-        // implementation
-        IntlTestHelper::requireFullIntl($this, '58.1');
-
-        parent::setUp();
-    }
-
-    /**
-     * @test
-     */
-    public function pass_money_nl(): void
-    {
-        \Locale::setDefault('nl_NL');
-
-        $field = $this->getFactory()->createField('money', MoneyType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('€ 12,20', 'EUR 12.20')
-            ->successfullyTransformsTo(new MoneyValue(Money::EUR('1220')))
-            ->andReverseTransformsTo('€ 12,20', 'EUR 12.20')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12,00', '12.00')
-            ->successfullyTransformsTo(new MoneyValue(Money::EUR('1200'), false))
-            ->andReverseTransformsTo('12,00', '12.00')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function pass_money_de(): void
-    {
-        \Locale::setDefault('de_DE');
-
-        $field = $this->getFactory()->createField('money', MoneyType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12,00 €', 'EUR 12.00')
-            ->successfullyTransformsTo(new MoneyValue(Money::EUR('1200')))
-            ->andReverseTransformsTo('12,00 €', 'EUR 12.00')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12,00', '12.00')
-            ->successfullyTransformsTo(new MoneyValue(Money::EUR('1200'), false))
-            ->andReverseTransformsTo('12,00', '12.00')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function money_pattern_works_for_yen(): void
-    {
-        \Locale::setDefault('en_US');
-
-        $field = $this->getFactory()->createField('money', MoneyType::class, ['default_currency' => 'JPY']);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('¥12,00', 'JPY 12.00')
-            ->successfullyTransformsTo(new MoneyValue(Money::JPY('12')))
-            ->andReverseTransformsTo('¥12', 'JPY 12')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('¥12', 'JPY 12')
-            ->successfullyTransformsTo(new MoneyValue(Money::JPY('12')))
-            ->andReverseTransformsTo('¥12', 'JPY 12')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12', '12.00')
-            ->successfullyTransformsTo(new MoneyValue(Money::JPY('12'), false))
-            ->andReverseTransformsTo('12', '12')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('€12.00', 'EUR 12.00')
-            ->successfullyTransformsTo(new MoneyValue(Money::EUR('1200')))
-            ->andReverseTransformsTo('€12.00', 'EUR 12.00')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function view_is_configured_properly(): void
-    {
-        $field = $this->getFactory()->createField('money', MoneyType::class, [
-            'grouping' => false,
-            'default_currency' => 'EUR',
-        ]);
-
-        $field->finalizeConfig();
-        $fieldView = $field->createView(new FieldSetView());
-
-        self::assertArrayHasKey('grouping', $fieldView->vars);
-        self::assertArrayHasKey('default_currency', $fieldView->vars);
-
-        self::assertFalse($fieldView->vars['grouping']);
-        self::assertEquals('EUR', $fieldView->vars['default_currency']);
-    }
-
-    /**
-     * @test
-     */
-    public function value_lexing(): void
-    {
-        $field = $this->getFactory()->createField('money', MoneyType::class);
-        $field->setNormTransformer(null);
-        $field->setViewTransformer(null);
-
-        $fieldSet = $this->getFactory()->createFieldSetBuilder()
-            ->set($field)
-            ->getFieldSet()
-        ;
-
-        $condition = SearchConditionBuilder::create($fieldSet)
-            ->field('money')
-                ->addSimpleValue('12.00 €')
-                ->addSimpleValue('€ 12.00')
-                ->addSimpleValue('€ 12.00')
-                ->addSimpleValue('€ 12000.00')
-                ->addSimpleValue('€ 12000.00')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $this->assertConditionEquals(
-            'money: 12.00 €, € 12.00, € 12.00, € 12000.00, "€ 12000.00"',
-            $condition,
-            new StringQueryInput(),
-            new ProcessorConfig($fieldSet)
-        );
-
-        $condition2 = SearchConditionBuilder::create($fieldSet)
-            ->field('money')
-                ->addSimpleValue('EUR 12.00')
-                ->addSimpleValue('EUR 12.00')
-                ->addSimpleValue('12.00')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $this->assertConditionEquals(
-            'money: EUR 12.00, "EUR 12.00", 12.00',
-            $condition2,
-            new NormStringQueryInput(),
-            new ProcessorConfig($fieldSet)
-        );
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/NumberTypeTest.php b/lib/Core/Tests/Extension/Core/Type/NumberTypeTest.php
deleted file mode 100644
index 87046850..00000000
--- a/lib/Core/Tests/Extension/Core/Type/NumberTypeTest.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\NumberType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class NumberTypeTest extends SearchIntegrationTestCase
-{
-    /**
-     * @test
-     */
-    public function casts_to_integer(): void
-    {
-        $field = $this->getFactory()->createField('number', NumberType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('1,678', '1.678')
-            ->successfullyTransformsTo('1.678')
-            ->andReverseTransformsTo('1,678', '1.678')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('1', '1')
-            ->successfullyTransformsTo('1')
-            ->andReverseTransformsTo('1', '1')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('01', '01')
-            ->successfullyTransformsTo('1')
-            ->andReverseTransformsTo('1', '1')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('-1')
-            ->successfullyTransformsTo('-1')
-            ->andReverseTransformsTo('-1')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function wrong_input_fails(): void
-    {
-        $field = $this->getFactory()->createField('integer', NumberType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('foo')
-            ->failsToTransforms()
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function default_formatting(): void
-    {
-        $field = $this->getFactory()->createField('number', NumberType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12345,67890', '12345.67890')
-            ->successfullyTransformsTo('12345.67890')
-            ->andReverseTransformsTo('12345,679', '12345.67890')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12345,679', '12345.679')
-            ->successfullyTransformsTo('12345.679')
-            ->andReverseTransformsTo('12345,679', '12345.679')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function non_western_formatting(): void
-    {
-        \Locale::setDefault('ar_BH');
-
-        $field = $this->getFactory()->createField('number', NumberType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('١٢٣٤٥٫٦٧٨٩٠', '12345.67890')
-            ->successfullyTransformsTo('12345.6789')
-            ->andReverseTransformsTo('١٢٣٤٥٫٦٧٩', '12345.6789')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('١٢٣٤٥٫٦٧٩', '12345.679')
-            ->successfullyTransformsTo('12345.679')
-            ->andReverseTransformsTo('١٢٣٤٥٫٦٧٩', '12345.679')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function default_formatting_with_grouping(): void
-    {
-        $field = $this->getFactory()->createField('number', NumberType::class, ['grouping' => true]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12.345,679', '12345.679')
-            ->successfullyTransformsTo('12345.679')
-            ->andReverseTransformsTo('12.345,679', '12345.679')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12345,679', '12345.679')
-            ->successfullyTransformsTo('12345.679')
-            ->andReverseTransformsTo('12.345,679', '12345.679')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function default_formatting_with_precision(): void
-    {
-        $field = $this->getFactory()->createField('number', NumberType::class, ['scale' => 2]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12345,67890', '12345.67890')
-            ->successfullyTransformsTo('12345.68')
-            ->andReverseTransformsTo('12345,68', '12345.68')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12345,67', '12345.67')
-            ->successfullyTransformsTo('12345.67')
-            ->andReverseTransformsTo('12345,67', '12345.67')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function default_formatting_with_rounding(): void
-    {
-        $field = $this->getFactory()->createField('number', NumberType::class, [
-            'scale' => 0, 'rounding_mode' => \NumberFormatter::ROUND_UP,
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12345,54321', '12345.54321')
-            ->successfullyTransformsTo('12346')
-            ->andReverseTransformsTo('12346')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('12345')
-            ->successfullyTransformsTo('12345')
-            ->andReverseTransformsTo('12345')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function view_is_configured_properly(): void
-    {
-        $field = $this->getFactory()->createField('number', NumberType::class, [
-            'scale' => 0, 'grouping' => false,
-        ]);
-
-        $field->finalizeConfig();
-        $fieldView = $field->createView(new FieldSetView());
-
-        self::assertArrayHasKey('scale', $fieldView->vars);
-        self::assertArrayHasKey('grouping', $fieldView->vars);
-
-        self::assertEquals(0, $fieldView->vars['scale']);
-        self::assertFalse($fieldView->vars['grouping']);
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        // we test against "de_DE", so we need the full implementation
-        IntlTestHelper::requireFullIntl($this, '58.1');
-
-        \Locale::setDefault('de_DE');
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/TextTypeTest.php b/lib/Core/Tests/Extension/Core/Type/TextTypeTest.php
deleted file mode 100644
index 3b8611ea..00000000
--- a/lib/Core/Tests/Extension/Core/Type/TextTypeTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-
-/**
- * @internal
- */
-final class TextTypeTest extends SearchIntegrationTestCase
-{
-    /**
-     * @test
-     */
-    public function accepts_any_scalar_input(): void
-    {
-        $field = $this->getFactory()->createField('name', TextType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('foobar')
-            ->successfullyTransformsTo('foobar')
-            ->andReverseTransformsTo('foobar')
-        ;
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/TimeTypeTest.php b/lib/Core/Tests/Extension/Core/Type/TimeTypeTest.php
deleted file mode 100644
index f31d72b0..00000000
--- a/lib/Core/Tests/Extension/Core/Type/TimeTypeTest.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Exception\InvalidConfigurationException;
-use Rollerworks\Component\Search\Extension\Core\Type\TimeType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class TimeTypeTest extends SearchIntegrationTestCase
-{
-    private string $defaultTimezone;
-
-    protected function setUp(): void
-    {
-        IntlTestHelper::requireIntl($this, '58.1');
-
-        parent::setUp();
-
-        $this->defaultTimezone = date_default_timezone_get();
-    }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        date_default_timezone_set($this->defaultTimezone);
-    }
-
-    /**
-     * @test
-     */
-    public function can_transform_time_without_seconds(): void
-    {
-        $field = $this->getFactory()->createField('time', TimeType::class);
-
-        $outputTime = new \DateTimeImmutable('1970-01-01 03:04:00 UTC');
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('03:04')
-            ->successfullyTransformsTo($outputTime)
-            ->andReverseTransformsTo('03:04')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function can_transform_time_with_seconds(): void
-    {
-        $field = $this->getFactory()->createField('time', TimeType::class, ['with_seconds' => true]);
-
-        $outputTime = new \DateTimeImmutable('1970-01-01 03:04:05 UTC');
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('03:04:05')
-            ->successfullyTransformsTo($outputTime)
-            ->andReverseTransformsTo('03:04:05')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function view_is_configured_properly_with_minutes_and_seconds(): void
-    {
-        $field = $this->getFactory()->createField('datetime', TimeType::class, [
-            'with_minutes' => true,
-            'with_seconds' => true,
-        ]);
-
-        $field->finalizeConfig();
-        $fieldView = $field->createView(new FieldSetView());
-
-        self::assertArrayHasKey('pattern', $fieldView->vars);
-        self::assertArrayHasKey('with_seconds', $fieldView->vars);
-        self::assertArrayHasKey('with_seconds', $fieldView->vars);
-
-        self::assertEquals('H:i:s', $fieldView->vars['pattern']);
-    }
-
-    /**
-     * @test
-     */
-    public function view_is_configured_properly_with_minutes_and_no_seconds(): void
-    {
-        $field = $this->getFactory()->createField('datetime', TimeType::class, [
-            'with_minutes' => true,
-            'with_seconds' => false,
-        ]);
-
-        $field->finalizeConfig();
-        $fieldView = $field->createView(new FieldSetView());
-
-        self::assertArrayHasKey('pattern', $fieldView->vars);
-        self::assertArrayHasKey('with_seconds', $fieldView->vars);
-        self::assertArrayHasKey('with_seconds', $fieldView->vars);
-
-        self::assertEquals('H:i', $fieldView->vars['pattern']);
-    }
-
-    /**
-     * @test
-     */
-    public function view_is_configured_properly_with_no_minutes_and_no_seconds(): void
-    {
-        $field = $this->getFactory()->createField('datetime', TimeType::class, [
-            'with_minutes' => false,
-            'with_seconds' => false,
-        ]);
-
-        $field->finalizeConfig();
-        $fieldView = $field->createView(new FieldSetView());
-
-        self::assertArrayHasKey('pattern', $fieldView->vars);
-        self::assertArrayHasKey('with_seconds', $fieldView->vars);
-        self::assertArrayHasKey('with_seconds', $fieldView->vars);
-
-        self::assertEquals('H', $fieldView->vars['pattern']);
-    }
-
-    /**
-     * @test
-     */
-    public function cannot_initialize_with_seconds_but_without_minutes(): void
-    {
-        $this->expectException(InvalidConfigurationException::class);
-
-        $this->getFactory()->createField('time', TimeType::class, [
-            'with_minutes' => false,
-            'with_seconds' => true,
-        ]);
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/TimestampTypeTest.php b/lib/Core/Tests/Extension/Core/Type/TimestampTypeTest.php
deleted file mode 100644
index 31b12d52..00000000
--- a/lib/Core/Tests/Extension/Core/Type/TimestampTypeTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\TimestampType;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-
-/**
- * @internal
- */
-final class TimestampTypeTest extends SearchIntegrationTestCase
-{
-    /**
-     * @test
-     */
-    public function transform_with_different_timezones(): void
-    {
-        $field = $this->getFactory()->createField('datetime', TimestampType::class, [
-            'model_timezone' => 'Asia/Hong_Kong',
-            'view_timezone' => 'America/New_York',
-        ]);
-
-        $output = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');
-        $input = $output->format('U');
-
-        $output = $output->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput($input)
-            ->successfullyTransformsTo($output)
-            ->andReverseTransformsTo($input)
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function invalid_input_should_fail_transformation(): void
-    {
-        $field = $this->getFactory()->createField('datetime', TimestampType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('06*2010*02', '06*2010*02')
-            ->failsToTransforms()
-        ;
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/Type/TimezoneTypeTest.php b/lib/Core/Tests/Extension/Core/Type/TimezoneTypeTest.php
deleted file mode 100644
index 70c1d4dd..00000000
--- a/lib/Core/Tests/Extension/Core/Type/TimezoneTypeTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\Type;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceView;
-use Rollerworks\Component\Search\Extension\Core\Type\TimezoneType;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Intl\Util\IntlTestHelper;
-
-/**
- * @internal
- */
-final class TimezoneTypeTest extends SearchIntegrationTestCase
-{
-    protected function setUp(): void
-    {
-        IntlTestHelper::requireIntl($this, '70.1');
-
-        parent::setUp();
-    }
-
-    /**
-     * @test
-     */
-    public function currencies_are_selectable(): void
-    {
-        $field = $field = $this->getFactory()->createField('choice', TimezoneType::class);
-        $field->finalizeConfig();
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('Kinshasa', 'Africa/Kinshasa')
-            ->successfullyTransformsTo('Africa/Kinshasa')
-            ->andReverseTransformsTo('Kinshasa', 'Africa/Kinshasa')
-        ;
-
-        $view = $field->createView(new FieldSetView());
-
-        $choices = $view->vars['choices'];
-
-        self::assertArrayHasKey('Africa', $choices);
-        self::assertContainsEquals(new ChoiceView('Africa/Kinshasa', 'Africa/Kinshasa', 'Kinshasa'), $choices['Africa']);
-
-        self::assertArrayHasKey('America', $choices);
-        self::assertContainsEquals(new ChoiceView('America/New_York', 'America/New_York', 'New York'), $choices['America']);
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ValueComparison/BirthdayValueComparatorTest.php b/lib/Core/Tests/Extension/Core/ValueComparison/BirthdayValueComparatorTest.php
deleted file mode 100644
index 164f56ca..00000000
--- a/lib/Core/Tests/Extension/Core/ValueComparison/BirthdayValueComparatorTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Extension\Core\ValueComparison;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\BirthdayValueComparator;
-
-/**
- * @internal
- */
-final class BirthdayValueComparatorTest extends TestCase
-{
-    private BirthdayValueComparator $comparison;
-
-    protected function setUp(): void
-    {
-        $this->comparison = new BirthdayValueComparator();
-    }
-
-    /**
-     * @test
-     */
-    public function value_equals(): void
-    {
-        self::assertTrue($this->comparison->isEqual(new \DateTimeImmutable('2013-09-21 12:46:00'), new \DateTimeImmutable('2013-09-21 12:46:00'), []));
-        self::assertTrue($this->comparison->isEqual(1, 1, []));
-    }
-
-    /**
-     * @test
-     */
-    public function value_not_equals(): void
-    {
-        self::assertFalse($this->comparison->isEqual(1, 2, []));
-        self::assertFalse($this->comparison->isEqual(new \DateTimeImmutable('2013-09-21 12:46:00'), new \DateTimeImmutable('2013-09-22 12:46:00'), []));
-        self::assertFalse($this->comparison->isEqual(new \DateTimeImmutable('2013-09-21 12:46:00'), 0, []));
-    }
-
-    /**
-     * @test
-     */
-    public function first_value_is_higher(): void
-    {
-        self::assertTrue($this->comparison->isHigher(5, 1, []));
-        self::assertTrue($this->comparison->isHigher(new \DateTimeImmutable('2013-09-23 12:46:00'), new \DateTimeImmutable('2013-09-21 12:46:00'), []));
-
-        // Difference types cannot be compared
-        self::assertFalse($this->comparison->isHigher(new \DateTimeImmutable('2013-09-23 12:46:00'), 1, []));
-        self::assertFalse($this->comparison->isHigher(1, new \DateTimeImmutable('2013-09-23 12:46:00'), []));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_true_when_first_value_is_lower(): void
-    {
-        self::assertTrue($this->comparison->isLower(2, 5, []));
-        self::assertTrue($this->comparison->isLower(new \DateTimeImmutable('2013-09-21 12:46:00'), new \DateTimeImmutable('2013-09-23 12:46:00'), []));
-
-        // Difference types cannot be compared
-        self::assertFalse($this->comparison->isLower(new \DateTimeImmutable('2013-09-23 12:46:00'), 1, []));
-        self::assertFalse($this->comparison->isLower(1, new \DateTimeImmutable('2013-09-23 12:46:00'), []));
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ValueComparison/DateTimeIntervalValueComparatorTest.php b/lib/Core/Tests/Extension/Core/ValueComparison/DateTimeIntervalValueComparatorTest.php
deleted file mode 100644
index 8f2c1931..00000000
--- a/lib/Core/Tests/Extension/Core/ValueComparison/DateTimeIntervalValueComparatorTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Extension\Core\ValueComparison;
-
-use Carbon\CarbonInterval;
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\DateTimeIntervalValueComparator;
-
-/**
- * @internal
- */
-final class DateTimeIntervalValueComparatorTest extends TestCase
-{
-    private DateTimeIntervalValueComparator $comparison;
-
-    protected function setUp(): void
-    {
-        $this->comparison = new DateTimeIntervalValueComparator();
-    }
-
-    /**
-     * @test
-     */
-    public function true_when_equal(): void
-    {
-        self::assertTrue($this->comparison->isEqual(CarbonInterval::fromString('32m'), CarbonInterval::fromString('32m'), []));
-        self::assertTrue($this->comparison->isEqual(CarbonInterval::fromString('1w 3d 4h 32m 23s'), CarbonInterval::fromString('1w 3d 4h 32m 23s'), []));
-        self::assertTrue($this->comparison->isEqual(new \DateTimeImmutable('2013-09-22 12:46:00'), new \DateTimeImmutable('2013-09-22 12:46:00'), []));
-    }
-
-    /**
-     * @test
-     */
-    public function false_when_not_equal(): void
-    {
-        self::assertFalse($this->comparison->isEqual(CarbonInterval::fromString('2w'), CarbonInterval::fromString('1w'), []));
-        self::assertFalse($this->comparison->isEqual(new \DateTimeImmutable('2013-09-21 12:46:00'), new \DateTimeImmutable('2013-09-22 12:46:00'), []));
-        self::assertFalse($this->comparison->isEqual(new \DateTimeImmutable('2013-09-21 12:46:00'), new \DateTimeImmutable('2013-09-21 12:40:00'), []));
-
-        // Difference types cannot be compared
-        self::assertFalse($this->comparison->isEqual(CarbonInterval::fromString('2w'), new \DateTimeImmutable('2013-09-21 12:40:00'), []));
-    }
-
-    /**
-     * @test
-     */
-    public function first_higher(): void
-    {
-        self::assertTrue($this->comparison->isHigher(new \DateTimeImmutable('2013-09-23 12:46:00'), new \DateTimeImmutable('2013-09-21 12:46:00'), []));
-        self::assertTrue($this->comparison->isHigher(CarbonInterval::fromString('35m'), new \DateTimeImmutable('2013-09-21 12:46:00'), []));
-        self::assertTrue($this->comparison->isHigher(CarbonInterval::fromString('35m'), CarbonInterval::fromString('32m'), []));
-    }
-
-    /**
-     * @test
-     */
-    public function is_lower(): void
-    {
-        self::assertTrue($this->comparison->isLower(new \DateTimeImmutable('2013-09-21 12:46:00'), new \DateTimeImmutable('2013-09-23 12:46:00'), []));
-        self::assertTrue($this->comparison->isLower(new \DateTimeImmutable('2013-09-21 12:46:00'), CarbonInterval::fromString('30m'), []));
-        self::assertTrue($this->comparison->isLower(CarbonInterval::fromString('30m'), CarbonInterval::fromString('32m'), []));
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ValueComparison/DateValueComparisonTest.php b/lib/Core/Tests/Extension/Core/ValueComparison/DateValueComparisonTest.php
deleted file mode 100644
index 414c29e3..00000000
--- a/lib/Core/Tests/Extension/Core/ValueComparison/DateValueComparisonTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\ValueComparison;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\DateValueComparator;
-
-/**
- * @internal
- */
-final class DateValueComparisonTest extends TestCase
-{
-    private DateValueComparator $comparison;
-
-    protected function setUp(): void
-    {
-        $this->comparison = new DateValueComparator();
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_true_when_dates_equal(): void
-    {
-        $date1 = new \DateTimeImmutable('2013-09-21 12:46:00');
-        $date2 = new \DateTimeImmutable('2013-09-21 12:46:00');
-
-        self::assertTrue($this->comparison->isEqual($date1, $date2, []));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_false_when_dates_are_not_equal(): void
-    {
-        $date1 = new \DateTimeImmutable('2013-09-21 12:46:00');
-        $date2 = new \DateTimeImmutable('2013-09-22 12:46:00');
-
-        self::assertFalse($this->comparison->isEqual($date1, $date2, []));
-
-        $date1 = new \DateTimeImmutable('2013-09-21 12:46:00');
-        $date2 = new \DateTimeImmutable('2013-09-21 12:40:00');
-
-        self::assertFalse($this->comparison->isEqual($date1, $date2, []));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_true_when_first_date_is_higher(): void
-    {
-        $date1 = new \DateTimeImmutable('2013-09-23 12:46:00');
-        $date2 = new \DateTimeImmutable('2013-09-21 12:46:00');
-
-        self::assertTrue($this->comparison->isHigher($date1, $date2, []));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_true_when_first_date_is_lower(): void
-    {
-        $date1 = new \DateTimeImmutable('2013-09-21 12:46:00');
-        $date2 = new \DateTimeImmutable('2013-09-23 12:46:00');
-
-        self::assertTrue($this->comparison->isLower($date1, $date2, []));
-    }
-}
diff --git a/lib/Core/Tests/Extension/Core/ValueComparison/MoneyValueComparisonTest.php b/lib/Core/Tests/Extension/Core/ValueComparison/MoneyValueComparisonTest.php
deleted file mode 100644
index d6f94fca..00000000
--- a/lib/Core/Tests/Extension/Core/ValueComparison/MoneyValueComparisonTest.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension\Core\ValueComparison;
-
-use Money\Money;
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-use Rollerworks\Component\Search\Extension\Core\ValueComparator\MoneyValueComparator;
-
-/**
- * @internal
- */
-final class MoneyValueComparisonTest extends TestCase
-{
-    private MoneyValueComparator $comparison;
-
-    protected function setUp(): void
-    {
-        $this->comparison = new MoneyValueComparator();
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_true_equal(): void
-    {
-        $value1 = new MoneyValue(Money::EUR(1200));
-        $value2 = new MoneyValue(Money::EUR(1200));
-
-        self::assertTrue($this->comparison->isEqual($value1, $value2, []));
-
-        $value1 = new MoneyValue(Money::EUR(1200));
-        $value2 = new MoneyValue(Money::EUR(1200), false);
-
-        self::assertTrue($this->comparison->isEqual($value1, $value2, []));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_false_when_not_equal(): void
-    {
-        $value1 = new MoneyValue(Money::EUR(1200));
-        $value2 = new MoneyValue(Money::EUR(1215));
-
-        self::assertFalse($this->comparison->isEqual($value1, $value2, []));
-
-        // Compare with same amount but different currency
-        $value1 = new MoneyValue(Money::EUR(1200));
-        $value2 = new MoneyValue(Money::USD(1200));
-
-        self::assertFalse($this->comparison->isEqual($value1, $value2, []));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_true_when_first_value_is_higher(): void
-    {
-        $value1 = new MoneyValue(Money::EUR(1500));
-        $value2 = new MoneyValue(Money::EUR(1200));
-
-        self::assertTrue($this->comparison->isHigher($value1, $value2, []));
-
-        $value1 = new MoneyValue(Money::EUR(1210));
-        $value2 = new MoneyValue(Money::EUR(1200));
-
-        self::assertTrue($this->comparison->isHigher($value1, $value2, []));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_true_when_first_value_is_lower(): void
-    {
-        $value1 = new MoneyValue(Money::EUR(1000));
-        $value2 = new MoneyValue(Money::EUR(1200));
-
-        self::assertTrue($this->comparison->isLower($value1, $value2, []));
-
-        $value1 = new MoneyValue(Money::EUR(1200));
-        $value2 = new MoneyValue(Money::EUR(1210));
-
-        self::assertTrue($this->comparison->isLower($value1, $value2, []));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_false_when_first_value_is_not_higher(): void
-    {
-        $value1 = new MoneyValue(Money::EUR(1200));
-        $value2 = new MoneyValue(Money::EUR(1500));
-
-        self::assertFalse($this->comparison->isHigher($value1, $value2, []));
-
-        // Diff currency.
-        $value1 = new MoneyValue(Money::EUR(1210));
-        $value2 = new MoneyValue(Money::USD(1200));
-
-        self::assertFalse($this->comparison->isHigher($value1, $value2, []));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_false_when_first_value_is_not_lower(): void
-    {
-        $value1 = new MoneyValue(Money::EUR(1200));
-        $value2 = new MoneyValue(Money::EUR(1000));
-
-        self::assertFalse($this->comparison->isLower($value1, $value2, []));
-
-        $value1 = new MoneyValue(Money::EUR(1000));
-        $value2 = new MoneyValue(Money::USD(1200));
-
-        self::assertFalse($this->comparison->isLower($value1, $value2, []));
-    }
-}
diff --git a/lib/Core/Tests/Extension/LazyExtensionTest.php b/lib/Core/Tests/Extension/LazyExtensionTest.php
deleted file mode 100644
index 76cff730..00000000
--- a/lib/Core/Tests/Extension/LazyExtensionTest.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Extension;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\NumberType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Extension\LazyExtension;
-use Rollerworks\Component\Search\Field\FieldTypeExtension;
-
-/**
- * @internal
- */
-final class LazyExtensionTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_allows_creating_without_types(): void
-    {
-        $extension = LazyExtension::create([]);
-
-        self::assertFalse($extension->hasType('something'));
-        self::assertFalse($extension->hasType(TextType::class));
-        self::assertEmpty($extension->getTypeExtensions(TextType::class));
-    }
-
-    /**
-     * @test
-     */
-    public function it_loads_registered_type(): void
-    {
-        $extension = LazyExtension::create(
-            [
-                TextType::class => static fn (): TextType => new TextType(),
-            ]
-        );
-
-        self::assertTrue($extension->hasType(TextType::class));
-        self::assertInstanceOf(TextType::class, $type = $extension->getType(TextType::class));
-        self::assertSame($type, $extension->getType(TextType::class));
-    }
-
-    /**
-     * @test
-     */
-    public function it_fails_when_requested_type_is_not_registered(): void
-    {
-        $extension = LazyExtension::create([]);
-
-        self::assertFalse($extension->hasType(TextType::class));
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The field type "' . TextType::class . '" is not registered with the service container.');
-
-        $extension->getType(TextType::class);
-    }
-
-    /**
-     * @test
-     */
-    public function it_loads_type_extensions(): void
-    {
-        $typeExtension1 = $this->createTypeExtension(TextType::class);
-        $typeExtension2 = $this->createTypeExtension(TextType::class);
-        $typeExtension3 = $this->createTypeExtension(IntegerType::class);
-
-        $extension = LazyExtension::create(
-            [
-                TextType::class => static fn (): TextType => new TextType(),
-            ],
-            [
-                TextType::class => ['ext1' => $typeExtension1, 'ext' => $typeExtension2],
-                IntegerType::class => ['ext3' => $typeExtension3],
-            ]
-        );
-
-        self::assertTrue($extension->hasType(TextType::class));
-        self::assertInstanceOf(TextType::class, $type = $extension->getType(TextType::class));
-        self::assertSame($type, $extension->getType(TextType::class));
-
-        self::assertSame([$typeExtension1, $typeExtension2], $extension->getTypeExtensions(TextType::class));
-        self::assertSame([$typeExtension3], $extension->getTypeExtensions(IntegerType::class));
-        self::assertEmpty($extension->getTypeExtensions(NumberType::class));
-    }
-
-    /**
-     * @test
-     */
-    public function it_checks_type_extension_parent_equality(): void
-    {
-        $typeExtension1 = $this->createTypeExtension(TextType::class);
-
-        $extension = LazyExtension::create(
-            [
-                TextType::class => static fn (): TextType => new TextType(),
-            ],
-            [
-                IntegerType::class => ['extension_1' => $typeExtension1],
-            ]
-        );
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage(
-            \sprintf(
-                'The extended type specified for the service "%s" does not match the actual extended type. Expected "%s", given "%s".',
-                'extension_1',
-                IntegerType::class,
-                TextType::class
-            )
-        );
-
-        $extension->getTypeExtensions(IntegerType::class);
-    }
-
-    public function createTypeExtension(string $type): FieldTypeExtension
-    {
-        $typeExtension = $this->createMock(FieldTypeExtension::class);
-        $typeExtension
-            ->expects(self::any())
-            ->method('getExtendedType')
-            ->willReturn($type)
-        ;
-
-        return $typeExtension;
-    }
-}
diff --git a/lib/Core/Tests/Field/OrderFieldTest.php b/lib/Core/Tests/Field/OrderFieldTest.php
deleted file mode 100644
index c524e9de..00000000
--- a/lib/Core/Tests/Field/OrderFieldTest.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Field;
-
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\Field\ResolvedFieldType;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * @internal
- */
-final class OrderFieldTest extends TestCase
-{
-    /** @var MockObject&ResolvedFieldType */
-    private MockObject $resolvedType;
-
-    private OrderField $field;
-
-    protected function setUp(): void
-    {
-        $this->resolvedType = $this->getMockBuilder(ResolvedFieldType::class)->getMock();
-        $this->field = new OrderField('@foobar', $this->resolvedType, ['name' => 'value']);
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_a_name(): void
-    {
-        self::assertEquals('@foobar', $this->field->getName());
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_a_type(): void
-    {
-        self::assertEquals($this->resolvedType, $this->field->getType());
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_options(): void
-    {
-        self::assertEquals(['name' => 'value'], $this->field->getOptions());
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_return_if_an_option_exists(): void
-    {
-        self::assertTrue($this->field->hasOption('name'));
-        self::assertFalse($this->field->hasOption('foo'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_return_an_options_value(): void
-    {
-        self::assertEquals('value', $this->field->getOption('name'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_return_null_by_default_if_the_option_does_exist(): void
-    {
-        self::assertNull($this->field->getOption('foo'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_return_default_value_if_the_option_does_exist(): void
-    {
-        self::assertEquals('value1', $this->field->getOption('foo', 'value1'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_supports_no_special_value_types_by_default(): void
-    {
-        self::assertFalse($this->field->supportValueType(Range::class));
-    }
-
-    /**
-     * @test
-     */
-    public function it_does_not_allow_configuring_value_support(): void
-    {
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('does not support supporting custom value types');
-
-        self::assertFalse($this->field->supportValueType(Range::class));
-        $this->field->setValueTypeSupport(Range::class, true);
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_no_comparison_class_by_default(): void
-    {
-        self::assertNull($this->field->getValueComparator());
-    }
-
-    /**
-     * @test
-     */
-    public function it_does_not_allow_setting_a_comparison_class(): void
-    {
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('does not support supporting custom value comparator');
-
-        $comparisonObj = $this->getMockBuilder(ValueComparator::class)->getMock();
-
-        self::assertNull($this->field->getValueComparator());
-        $this->field->setValueComparator($comparisonObj);
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_no__view_transformer_by_default(): void
-    {
-        self::assertNull($this->field->getViewTransformer());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_setting_a__view_transformer(): void
-    {
-        $viewTransformer = $this->getMockBuilder(DataTransformer::class)->getMock();
-        $this->field->setViewTransformer($viewTransformer);
-
-        self::assertEquals($viewTransformer, $this->field->getViewTransformer());
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_no_norm_transformer_by_default(): void
-    {
-        self::assertNull($this->field->getNormTransformer());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_setting_a_norm_transformer(): void
-    {
-        $normTransformer = $this->getMockBuilder(DataTransformer::class)->getMock();
-        $this->field->setNormTransformer($normTransformer);
-
-        self::assertEquals($normTransformer, $this->field->getNormTransformer());
-    }
-}
diff --git a/lib/Core/Tests/Field/OrderFieldTypeTest.php b/lib/Core/Tests/Field/OrderFieldTypeTest.php
deleted file mode 100644
index dea334e9..00000000
--- a/lib/Core/Tests/Field/OrderFieldTypeTest.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Field;
-
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\OrderTransformer;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\Test\FieldTransformationAssertion;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
-
-/**
- * @internal
- */
-final class OrderFieldTypeTest extends SearchIntegrationTestCase
-{
-    /**
-     * @test
-     */
-    public function it_transforms_with_default_configuration(): void
-    {
-        /** @var OrderField $field */
-        $field = $this->getFactory()->createField('@id', OrderFieldType::class);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('DESC')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('desc', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('desc')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('desc', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('ASC')
-            ->successfullyTransformsTo('ASC')
-            ->andReverseTransformsTo('asc', 'ASC')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function it_transforms_with_alias(): void
-    {
-        /** @var OrderField $field */
-        $field = $this->getFactory()->createField('@id', OrderFieldType::class, ['alias' => [
-            'UP' => 'ASC',
-            'DOWN' => 'DESC',
-
-            'OMHOOR' => 'ASC',
-            'NEER' => 'DESC',
-        ]]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('down')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('desc', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('NEER')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('desc', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('desc')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('desc', 'DESC')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function it_transforms_with_view_label(): void
-    {
-        /** @var OrderField $field */
-        $field = $this->getFactory()->createField('@id', OrderFieldType::class, ['view_label' => [
-            'ASC' => 'up',
-            'DESC' => 'down',
-        ]]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('down')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('Up')
-            ->successfullyTransformsTo('ASC')
-            ->andReverseTransformsTo('up', 'ASC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('desc')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function it_transforms_with_alias_and_view_label(): void
-    {
-        /** @var OrderField $field */
-        $field = $this->getFactory()->createField('@id', OrderFieldType::class, [
-            'view_label' => [
-                'ASC' => 'up',
-                'DESC' => 'down',
-            ],
-            'alias' => [
-                'UP' => 'ASC',
-                'DOWN' => 'DESC',
-                'OMHOOR' => 'ASC',
-                'NEER' => 'DESC',
-            ],
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('down')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('Up')
-            ->successfullyTransformsTo('ASC')
-            ->andReverseTransformsTo('up', 'ASC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('desc')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('down')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('NEER')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('desc')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function it_transforms_with_alias_and_view_label_and_lowercase(): void
-    {
-        /** @var OrderField $field */
-        $field = $this->getFactory()->createField('@id', OrderFieldType::class, [
-            'view_label' => [
-                'asc' => 'up',
-                'desc' => 'down',
-            ],
-            'alias' => [
-                'up' => 'ASC',
-                'down' => 'DESC',
-                'omhoor' => 'ASC',
-                'neer' => 'DESC',
-            ],
-            'case' => OrderTransformer::CASE_LOWERCASE,
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('down')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('Up')
-            ->successfullyTransformsTo('ASC')
-            ->andReverseTransformsTo('up', 'ASC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('desc')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('down')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('NEER')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('desc')
-            ->successfullyTransformsTo('DESC')
-            ->andReverseTransformsTo('down', 'DESC')
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function it_fails_to_transform_with_invalid_direction(): void
-    {
-        /** @var OrderField $field */
-        $field = $this->getFactory()->createField('@id', OrderFieldType::class, [
-            'view_label' => [
-                'asc' => 'up',
-                'desc' => 'down',
-            ],
-        ]);
-
-        FieldTransformationAssertion::assertThat($field)
-            ->withInput('neer')
-            ->failsToTransforms(
-                new TransformationFailedException(
-                    'Invalid sort direction "NEER" specified, expected one of: "ASC", "DESC", "UP", "DOWN"',
-                    0,
-                    null,
-                    'This value is not a valid sorting direction. Accepted directions are: {{ directions }}.',
-                    ['{{ directions }}' => ['asc', 'desc', 'up', 'down']]
-                )
-            )
-        ;
-    }
-
-    /**
-     * @test
-     */
-    public function error_with_always_append_and_no_default_value(): void
-    {
-        $this->expectException(InvalidOptionsException::class);
-        $this->expectExceptionMessage('Setting "always" requires the "default" option is set with a direction.');
-
-        $this->getFactory()->createField('@id', OrderFieldType::class, [
-            'always' => 'append',
-        ]);
-    }
-}
diff --git a/lib/Core/Tests/Field/ResolvedFieldTypeTest.php b/lib/Core/Tests/Field/ResolvedFieldTypeTest.php
deleted file mode 100644
index 6b53c5ae..00000000
--- a/lib/Core/Tests/Field/ResolvedFieldTypeTest.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Field;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\FieldType;
-use Rollerworks\Component\Search\Field\GenericResolvedFieldType;
-use Rollerworks\Component\Search\Field\SearchFieldView;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\Tests\Fixtures\Extension\ConfigurableColumnType;
-use Rollerworks\Component\Search\Tests\Fixtures\Extension\FBooType;
-use Rollerworks\Component\Search\Tests\Fixtures\Extension\Foo;
-use Rollerworks\Component\Search\Tests\Fixtures\Extension\Foo1Bar2Type;
-use Rollerworks\Component\Search\Tests\Fixtures\Extension\FooBarHTMLType;
-use Rollerworks\Component\Search\Tests\Fixtures\Extension\FooType;
-use Rollerworks\Component\Search\Tests\Fixtures\Extension\Type;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @internal
- *
- * @see \Symfony\Component\Form\Tests\ResolvedFormTypeTest
- */
-final class ResolvedFieldTypeTest extends TestCase
-{
-    /** @var array<string, mixed[]> */
-    private array $calls;
-
-    private UsageTrackingParentFieldType $parentType;
-    private UsageTrackingFieldType $type;
-    private UsageTrackingFieldTypeExtension $extension1;
-    private UsageTrackingFieldTypeExtension $extension2;
-    private GenericResolvedFieldType $parentResolvedType;
-    private GenericResolvedFieldType $resolvedType;
-
-    protected function setUp(): void
-    {
-        $this->calls = [];
-        $this->parentType = new UsageTrackingParentFieldType($this->calls);
-        $this->type = new UsageTrackingFieldType($this->calls);
-        $this->extension1 = new UsageTrackingFieldTypeExtension($this->calls, ['c' => 'c_default']);
-        $this->extension2 = new UsageTrackingFieldTypeExtension($this->calls, ['d' => 'd_default']);
-        $this->parentResolvedType = new GenericResolvedFieldType($this->parentType);
-        $this->resolvedType = new GenericResolvedFieldType(
-            $this->type,
-            [$this->extension1, $this->extension2],
-            $this->parentResolvedType
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function its_resolved_options_in_correct_order(): void
-    {
-        $givenOptions = ['a' => 'a_custom', 'c' => 'c_custom', 'foo' => 'bar'];
-        $resolvedOptions = ['a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default', 'foo' => 'bar'];
-
-        $resolver = $this->resolvedType->getOptionsResolver();
-
-        $this->assertStructureCalled('configureOptions');
-
-        self::assertEquals($resolvedOptions, $resolver->resolve($givenOptions));
-    }
-
-    /**
-     * @test
-     */
-    public function it_creates_a_field(): void
-    {
-        $givenOptions = ['a' => 'a_custom', 'c' => 'c_custom', 'foo' => 'bar'];
-        $resolvedOptions = ['b' => 'b_default', 'd' => 'd_default', 'a' => 'a_custom', 'c' => 'c_custom', 'foo' => 'bar'];
-
-        $field = $this->resolvedType->createField('name', $givenOptions);
-
-        $this->assertStructureCalled('configureOptions');
-
-        self::assertSame('name', $field->getName());
-        self::assertSame($this->resolvedType, $field->getType());
-        self::assertSame($resolvedOptions, $field->getOptions());
-    }
-
-    /**
-     * @test
-     */
-    public function it_builds_the_type(): void
-    {
-        $options = ['a' => 'Foo', 'b' => 'Bar'];
-        $field = $this->createFieldMock();
-
-        $this->resolvedType->buildType($field, $options);
-
-        $this->assertStructureCalled('buildType');
-    }
-
-    /**
-     * @test
-     */
-    public function create_view(): void
-    {
-        $rootView = new FieldSetView();
-        $rootView->vars['fieldset'] = 'users';
-
-        $field = $this->createFieldMock();
-        $view = $this->resolvedType->createFieldView($field, $rootView);
-
-        self::assertEquals('name', $view->vars['name']);
-        self::assertEquals('users', $view->vars['fieldset']);
-        self::assertFalse($view->vars['accept_ranges']);
-    }
-
-    /**
-     * @test
-     */
-    public function get_block_prefix(): void
-    {
-        $resolvedType = new GenericResolvedFieldType($this->type);
-        self::assertSame('usage_tracking_field', $resolvedType->getBlockPrefix());
-    }
-
-    /**
-     * @test
-     */
-    public function build_view(): void
-    {
-        $options = ['a' => '1', 'b' => '2'];
-        $field = $this->createFieldMock();
-        $view = $this->createSearchFieldViewMock();
-
-        $this->resolvedType->buildFieldView($view, $field, $options);
-
-        $this->assertStructureCalled('buildView');
-    }
-
-    /**
-     * @test
-     */
-    public function it_gets_block_prefix(): void
-    {
-        $resolvedType = new GenericResolvedFieldType(new ConfigurableColumnType());
-
-        self::assertSame('configurable_form_prefix', $resolvedType->getBlockPrefix());
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideTypeClassBlockPrefixTuples
-     *
-     * @param class-string<FieldType> $typeClass
-     */
-    public function it_gets_block_prefix_defaults_to_fqcn_if_no_name(string $typeClass, string $blockPrefix): void
-    {
-        $resolvedType = new GenericResolvedFieldType(new $typeClass());
-
-        self::assertSame($blockPrefix, $resolvedType->getBlockPrefix());
-    }
-
-    /**
-     * @return iterable<array{0: class-string, 1: string}>
-     */
-    public static function provideTypeClassBlockPrefixTuples(): iterable
-    {
-        yield [FooType::class, 'foo'];
-        yield [Foo::class, 'foo'];
-        yield [Type::class, 'type'];
-        yield [FooBarHTMLType::class, 'foo_bar_html'];
-        yield [Foo1Bar2Type::class, 'foo1_bar2'];
-        yield [FBooType::class, 'f_boo'];
-    }
-
-    private function createFieldMock(string $name = 'name'): FieldConfig
-    {
-        $mock = $this->getMockBuilder(FieldConfig::class)->getMock();
-        $mock->expects(self::any())->method('getName')->willReturn($name);
-        $mock->expects(self::any())->method('getType')->willReturn($this->resolvedType);
-        $mock->expects(self::any())->method('getOptions')->willReturn([]);
-
-        return $mock;
-    }
-
-    private function createSearchFieldViewMock(): SearchFieldView
-    {
-        return $this->createMock(SearchFieldView::class);
-    }
-
-    private function assertStructureCalled(string $name): void
-    {
-        if (! isset($this->calls[$name])) {
-            self::fail(\sprintf('No call found with name "%s", found: "%s"', $name, implode('", "', array_keys($this->calls))));
-        }
-
-        self::assertSame([$this->parentType, $this->type, $this->extension1, $this->extension2], $this->calls[$name]);
-    }
-}
-
-/**
- * @internal
- */
-final class UsageTrackingFieldType extends AbstractFieldType
-{
-    use FieldUsageTrackingTrait;
-
-    public function getParent(): string
-    {
-        return UsageTrackingParentFieldType::class;
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $this->calls['configureOptions'][] = $this;
-
-        $resolver->setDefault('b', 'b_default');
-        $resolver->setDefined('label');
-        $resolver->setRequired('foo');
-    }
-}
-
-/**
- * @internal
- */
-final class UsageTrackingParentFieldType extends AbstractFieldType
-{
-    use FieldUsageTrackingTrait;
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $this->calls['configureOptions'][] = $this;
-
-        $resolver->setDefault('a', 'a_default');
-    }
-}
-
-/**
- * @internal
- */
-final class UsageTrackingFieldTypeExtension extends AbstractFieldTypeExtension
-{
-    use ExtensionUsageTrackingTrait;
-
-    /**
-     * @param mixed[]              $calls
-     * @param array<string, mixed> $defaultOptions
-     */
-    public function __construct(
-        array &$calls,
-        private array $defaultOptions,
-    ) {
-        $this->calls = &$calls;
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $this->calls['configureOptions'][] = $this;
-
-        $resolver->setDefaults($this->defaultOptions);
-    }
-
-    public function getExtendedType(): string
-    {
-        return SearchFieldType::class;
-    }
-}
-
-/**
- * @internal
- */
-trait FieldUsageTrackingTrait
-{
-    /** @var array<string, array<int, object>> */
-    private array $calls;
-
-    /**
-     * @param mixed[] $calls
-     */
-    public function __construct(array &$calls)
-    {
-        $this->calls = &$calls;
-    }
-
-    public function buildType(FieldConfig $config, array $options): void
-    {
-        $this->calls['buildType'][] = $this;
-    }
-
-    public function buildView(SearchFieldView $view, FieldConfig $config, array $options): void
-    {
-        $this->calls['buildView'][] = $this;
-    }
-}
-
-/**
- * @internal
- */
-trait ExtensionUsageTrackingTrait
-{
-    /** @var array<string, array<int, object>> */
-    private array $calls;
-
-    public function buildType(FieldConfig $builder, array $options): void
-    {
-        $this->calls['buildType'][] = $this;
-    }
-
-    public function buildView(FieldConfig $config, SearchFieldView $view): void
-    {
-        $this->calls['buildView'][] = $this;
-    }
-}
diff --git a/lib/Core/Tests/Field/SearchFieldTest.php b/lib/Core/Tests/Field/SearchFieldTest.php
deleted file mode 100644
index b89963b2..00000000
--- a/lib/Core/Tests/Field/SearchFieldTest.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Field;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\Exception\InvalidConfigurationException;
-use Rollerworks\Component\Search\Field\ResolvedFieldType;
-use Rollerworks\Component\Search\Field\SearchField;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * @internal
- */
-final class SearchFieldTest extends TestCase
-{
-    private ResolvedFieldType $resolvedType;
-    private SearchField $field;
-
-    protected function setUp(): void
-    {
-        $this->resolvedType = $this->createMock(ResolvedFieldType::class);
-        $this->field = new SearchField('foobar', $this->resolvedType, ['name' => 'value']);
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_a_name(): void
-    {
-        self::assertEquals('foobar', $this->field->getName());
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_a_type(): void
-    {
-        self::assertEquals($this->resolvedType, $this->field->getType());
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_options(): void
-    {
-        self::assertEquals(['name' => 'value'], $this->field->getOptions());
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_return_if_an_option_exists(): void
-    {
-        self::assertTrue($this->field->hasOption('name'));
-        self::assertFalse($this->field->hasOption('foo'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_return_an_options_value(): void
-    {
-        self::assertEquals('value', $this->field->getOption('name'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_return_null_by_default_if_the_option_does_exist(): void
-    {
-        self::assertNull($this->field->getOption('foo'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_return_default_value_if_the_option_does_exist(): void
-    {
-        self::assertEquals('value1', $this->field->getOption('foo', 'value1'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_supports_no_special_value_types_by_default(): void
-    {
-        self::assertFalse($this->field->supportValueType(Range::class));
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_configuring_value_support(): void
-    {
-        $this->field->setValueTypeSupport(Range::class, true);
-
-        self::assertTrue($this->field->supportValueType(Range::class));
-        self::assertFalse($this->field->supportValueType(Compare::class));
-
-        // And now disable it
-        $this->field->setValueTypeSupport(Range::class, false);
-
-        self::assertFalse($this->field->supportValueType(Range::class));
-        self::assertFalse($this->field->supportValueType(Compare::class));
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_no_comparison_class_by_default(): void
-    {
-        self::assertNull($this->field->getValueComparator());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_setting_a_comparison_class(): void
-    {
-        $comparisonObj = $this->getMockBuilder(ValueComparator::class)->getMock();
-
-        $this->field->setValueComparator($comparisonObj);
-        self::assertEquals($comparisonObj, $this->field->getValueComparator());
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_no__view_transformer_by_default(): void
-    {
-        self::assertNull($this->field->getViewTransformer());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_setting_a__view_transformer(): void
-    {
-        $viewTransformer = $this->createTransformerMock();
-        $this->field->setViewTransformer($viewTransformer);
-
-        self::assertEquals($viewTransformer, $this->field->getViewTransformer());
-    }
-
-    /**
-     * @test
-     */
-    public function its_data_is_unlocked_by_default(): void
-    {
-        self::assertFalse($this->field->isConfigLocked());
-    }
-
-    /**
-     * @test
-     */
-    public function its_data_is_lockable(): void
-    {
-        $this->field->finalizeConfig();
-        self::assertTrue($this->field->isConfigLocked());
-    }
-
-    /**
-     * @test
-     */
-    public function it_ignores_comparator_requirement_for_non_implemented_or_disabled_types(): void
-    {
-        $this->field->setValueTypeSupport(PatternMatch::class, true);
-        $this->field->setValueTypeSupport(Range::class, false);
-        $this->field->finalizeConfig();
-
-        self::assertTrue($this->field->isConfigLocked());
-    }
-
-    /**
-     * @test
-     */
-    public function it_checks_comparator_requirements_and_throws_when_invalid(): void
-    {
-        $this->field->setValueTypeSupport(Range::class, true);
-
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage(
-            'Supported value-type "' . Range::class . '" requires a value comparator but none is set for field "foobar"'
-        );
-
-        $this->field->finalizeConfig();
-    }
-
-    /**
-     * @test
-     */
-    public function its_data_is_not_changeable_when_locked(): void
-    {
-        $this->field->finalizeConfig();
-
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('SearchField setter methods cannot be accessed anymore once the data is locked.');
-
-        $this->field->setViewTransformer(null);
-    }
-
-    private function createTransformerMock(): DataTransformer
-    {
-        return $this->getMockBuilder(DataTransformer::class)->getMock();
-    }
-}
diff --git a/lib/Core/Tests/Field/TypeRegistryTest.php b/lib/Core/Tests/Field/TypeRegistryTest.php
deleted file mode 100644
index c7527e44..00000000
--- a/lib/Core/Tests/Field/TypeRegistryTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Field;
-
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Rollerworks\Component\Search\Field\FieldType;
-use Rollerworks\Component\Search\Field\FieldTypeExtension;
-use Rollerworks\Component\Search\Field\GenericTypeRegistry;
-use Rollerworks\Component\Search\Field\ResolvedFieldType;
-use Rollerworks\Component\Search\Field\ResolvedFieldTypeFactory;
-use Rollerworks\Component\Search\PreloadedExtension;
-use Rollerworks\Component\Search\Tests\Fixtures\BarType;
-use Rollerworks\Component\Search\Tests\Fixtures\FooSubType;
-use Rollerworks\Component\Search\Tests\Fixtures\FooType;
-
-/**
- * @internal
- */
-final class TypeRegistryTest extends TestCase
-{
-    use ProphecyTrait;
-
-    /**
-     * @test
-     */
-    public function it_loads_types_from_extensions(): void
-    {
-        $extension = new PreloadedExtension([FooType::class => $fooType = new FooType()]);
-        $extension2 = new PreloadedExtension([FooSubType::class => $fooSubType = new FooSubType()]);
-        $barType = new BarType();
-
-        $resolvedFieldTypeFactory = $this->prophesize(ResolvedFieldTypeFactory::class);
-        $resolvedFieldTypeFactory->createResolvedType(Argument::type(FooType::class), [], null)->willReturn($resolvedFooType = $this->createResolvedTypeMock($fooType));
-        $resolvedFieldTypeFactory->createResolvedType(Argument::type(FooSubType::class), [], $resolvedFooType)->willReturn($this->createResolvedTypeMock($fooSubType));
-        $resolvedFieldTypeFactory->createResolvedType(Argument::type(BarType::class), [], null)->willReturn($this->createResolvedTypeMock($barType));
-
-        $registry = new GenericTypeRegistry([$extension, $extension2], $resolvedFieldTypeFactory->reveal());
-
-        self::assertTrue($registry->hasType(FooType::class));
-        self::assertTrue($registry->hasType(FooType::class)); // once the type is loaded it's cached internally
-        self::assertTrue($registry->hasType(FooSubType::class));
-        self::assertTrue($registry->hasType(BarType::class)); // auto loaded by FQCN
-        self::assertFalse($registry->hasType('text'));
-
-        self::assertInstanceOf(FooType::class, $registry->getType(FooType::class)->getInnerType());
-        self::assertInstanceOf(FooSubType::class, $registry->getType(FooSubType::class)->getInnerType());
-        self::assertInstanceOf(BarType::class, $registry->getType(BarType::class)->getInnerType());
-    }
-
-    /**
-     * @test
-     */
-    public function it_loads_type_extensions(): void
-    {
-        $extension = new PreloadedExtension([FooType::class => $fooType = new FooType()]);
-        $extension2 = new PreloadedExtension(
-            [
-                FooSubType::class => $fooSubType = new FooSubType(),
-            ],
-            [
-                BarType::class => [$barTypeExtension = $this->createTypeExtensionMock(BarType::class)],
-                FooSubType::class => [$fooSubTypeExtension = $this->createTypeExtensionMock(FooSubType::class)],
-            ]
-        );
-
-        $barType = new BarType();
-
-        $resolvedFieldTypeFactory = $this->prophesize(ResolvedFieldTypeFactory::class);
-        $resolvedFieldTypeFactory->createResolvedType(Argument::type(FooType::class), [], null)->willReturn($resolvedFooType = $this->createResolvedTypeMock($fooType));
-        $resolvedFieldTypeFactory->createResolvedType(Argument::type(FooSubType::class), [$fooSubTypeExtension], $resolvedFooType)->willReturn($this->createResolvedTypeMock($fooSubType));
-        $resolvedFieldTypeFactory->createResolvedType(Argument::type(BarType::class), [$barTypeExtension], null)->willReturn($this->createResolvedTypeMock($barType));
-
-        $registry = new GenericTypeRegistry([$extension, $extension2], $resolvedFieldTypeFactory->reveal());
-
-        self::assertTrue($registry->hasType(FooType::class));
-        self::assertTrue($registry->hasType(FooSubType::class));
-        self::assertTrue($registry->hasType(BarType::class)); // auto loaded by FQCN
-        self::assertFalse($registry->hasType('text'));
-
-        self::assertInstanceOf(FooType::class, $registry->getType(FooType::class)->getInnerType());
-        self::assertInstanceOf(FooSubType::class, $registry->getType(FooSubType::class)->getInnerType());
-        self::assertInstanceOf(BarType::class, $registry->getType(BarType::class)->getInnerType());
-    }
-
-    private function createResolvedTypeMock(FieldType $type): ResolvedFieldType
-    {
-        $resolvedType = $this->createMock(ResolvedFieldType::class);
-        $resolvedType->expects(self::any())->method('getInnerType')->willReturn($type);
-
-        return $resolvedType;
-    }
-
-    private function createTypeExtensionMock(string $name): FieldTypeExtension
-    {
-        $fieldExtension = $this->createMock(FieldTypeExtension::class);
-        $fieldExtension->expects(self::any())->method('getExtendedType')->willReturn($name);
-
-        return $fieldExtension;
-    }
-}
diff --git a/lib/Core/Tests/Fixtures/ArrayChoiceLoader.php b/lib/Core/Tests/Fixtures/ArrayChoiceLoader.php
deleted file mode 100644
index efda9d4f..00000000
--- a/lib/Core/Tests/Fixtures/ArrayChoiceLoader.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures;
-
-use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\CallbackChoiceLoader;
-
-/** @internal */
-final class ArrayChoiceLoader extends CallbackChoiceLoader
-{
-    public function __construct(array $choices = [])
-    {
-        parent::__construct(static fn (): array => $choices);
-    }
-}
diff --git a/lib/Core/Tests/Fixtures/BarType.php b/lib/Core/Tests/Fixtures/BarType.php
deleted file mode 100644
index 41127682..00000000
--- a/lib/Core/Tests/Fixtures/BarType.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-/**
- * @internal
- */
-final class BarType extends AbstractFieldType
-{
-    public function getParent(): ?string
-    {
-        return null;
-    }
-}
diff --git a/lib/Core/Tests/Fixtures/Extension/BarType.php b/lib/Core/Tests/Fixtures/Extension/BarType.php
deleted file mode 100644
index 243498fd..00000000
--- a/lib/Core/Tests/Fixtures/Extension/BarType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures\Extension;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-final class BarType extends AbstractFieldType
-{
-}
diff --git a/lib/Core/Tests/Fixtures/Extension/ConfigurableColumnType.php b/lib/Core/Tests/Fixtures/Extension/ConfigurableColumnType.php
deleted file mode 100644
index 32780060..00000000
--- a/lib/Core/Tests/Fixtures/Extension/ConfigurableColumnType.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures\Extension;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class ConfigurableColumnType extends AbstractFieldType
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefined(['a', 'b']);
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'configurable_form_prefix';
-    }
-}
diff --git a/lib/Core/Tests/Fixtures/Extension/DateTypeExtension.php b/lib/Core/Tests/Fixtures/Extension/DateTypeExtension.php
deleted file mode 100644
index f97d0f5d..00000000
--- a/lib/Core/Tests/Fixtures/Extension/DateTypeExtension.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures\Extension;
-
-use Lifthill\Component\Datagrid\Column\AbstractTypeExtension;
-use Lifthill\Component\Datagrid\Extension\Core\Type\DateTimeType;
-
-final class DateTypeExtension extends AbstractTypeExtension
-{
-    public static function getExtendedTypes(): iterable
-    {
-        return [DateTimeType::class];
-    }
-}
diff --git a/lib/Core/Tests/Fixtures/Extension/FBooType.php b/lib/Core/Tests/Fixtures/Extension/FBooType.php
deleted file mode 100644
index e79aa694..00000000
--- a/lib/Core/Tests/Fixtures/Extension/FBooType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures\Extension;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-final class FBooType extends AbstractFieldType
-{
-}
diff --git a/lib/Core/Tests/Fixtures/Extension/Foo.php b/lib/Core/Tests/Fixtures/Extension/Foo.php
deleted file mode 100644
index 6f8437be..00000000
--- a/lib/Core/Tests/Fixtures/Extension/Foo.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures\Extension;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-final class Foo extends AbstractFieldType
-{
-}
diff --git a/lib/Core/Tests/Fixtures/Extension/Foo1Bar2Type.php b/lib/Core/Tests/Fixtures/Extension/Foo1Bar2Type.php
deleted file mode 100644
index 08bebd8c..00000000
--- a/lib/Core/Tests/Fixtures/Extension/Foo1Bar2Type.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures\Extension;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-final class Foo1Bar2Type extends AbstractFieldType
-{
-}
diff --git a/lib/Core/Tests/Fixtures/Extension/FooBarHTMLType.php b/lib/Core/Tests/Fixtures/Extension/FooBarHTMLType.php
deleted file mode 100644
index e80ec0b4..00000000
--- a/lib/Core/Tests/Fixtures/Extension/FooBarHTMLType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures\Extension;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-final class FooBarHTMLType extends AbstractFieldType
-{
-}
diff --git a/lib/Core/Tests/Fixtures/Extension/FooType.php b/lib/Core/Tests/Fixtures/Extension/FooType.php
deleted file mode 100644
index 29a2d944..00000000
--- a/lib/Core/Tests/Fixtures/Extension/FooType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures\Extension;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-final class FooType extends AbstractFieldType
-{
-}
diff --git a/lib/Core/Tests/Fixtures/Extension/Type.php b/lib/Core/Tests/Fixtures/Extension/Type.php
deleted file mode 100644
index 168daeda..00000000
--- a/lib/Core/Tests/Fixtures/Extension/Type.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures\Extension;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-final class Type extends AbstractFieldType
-{
-}
diff --git a/lib/Core/Tests/Fixtures/FooSubType.php b/lib/Core/Tests/Fixtures/FooSubType.php
deleted file mode 100644
index 96bd3d6a..00000000
--- a/lib/Core/Tests/Fixtures/FooSubType.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-/**
- * @internal
- */
-final class FooSubType extends AbstractFieldType
-{
-    public function getParent(): string
-    {
-        return FooType::class;
-    }
-}
diff --git a/lib/Core/Tests/Fixtures/FooType.php b/lib/Core/Tests/Fixtures/FooType.php
deleted file mode 100644
index 5547883e..00000000
--- a/lib/Core/Tests/Fixtures/FooType.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Fixtures;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-/**
- * @internal
- */
-final class FooType extends AbstractFieldType
-{
-    public function getParent(): ?string
-    {
-        return null;
-    }
-}
diff --git a/lib/Core/Tests/GenericFieldSetBuilderTest.php b/lib/Core/Tests/GenericFieldSetBuilderTest.php
deleted file mode 100644
index a7314034..00000000
--- a/lib/Core/Tests/GenericFieldSetBuilderTest.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\ResolvedFieldType;
-use Rollerworks\Component\Search\Field\SearchField;
-use Rollerworks\Component\Search\GenericFieldSetBuilder;
-use Rollerworks\Component\Search\SearchFactory;
-use Rollerworks\Component\Search\Tests\Fixtures\BarType;
-use Rollerworks\Component\Search\Tests\Fixtures\FooSubType;
-use Rollerworks\Component\Search\Tests\Fixtures\FooType;
-
-/**
- * @internal
- */
-final class GenericFieldSetBuilderTest extends TestCase
-{
-    use ProphecyTrait;
-
-    private GenericFieldSetBuilder $builder;
-
-    protected function setUp(): void
-    {
-        // Prophecy binds the callback to the ObjectProphecy.
-        $test = $this;
-
-        $factory = $this->prophesize(SearchFactory::class);
-        $factory->createField(Argument::cetera())->will(
-            static function ($args) use ($test) {
-                $type = $test->prophesize(ResolvedFieldType::class);
-                $type->getInnerType()->willReturn(new $args[1]());
-
-                return new SearchField($args[0], $type->reveal(), $args[2]);
-            }
-        );
-
-        $this->builder = new GenericFieldSetBuilder($factory->reveal());
-    }
-
-    /**
-     * @test
-     */
-    public function add_fields(): void
-    {
-        $this->builder->add('id', FooType::class, ['foo' => 'bar']);
-        $this->builder->add('name', BarType::class);
-
-        self::assertTrue($this->builder->has('id'));
-        self::assertTrue($this->builder->has('name'));
-
-        $this->assertBuilderFieldConfigurationEquals('id', FooType::class, ['foo' => 'bar']);
-        $this->assertBuilderFieldConfigurationEquals('name', BarType::class);
-    }
-
-    /**
-     * @test
-     */
-    public function always_gives_a_resolved_field(): void
-    {
-        $this->builder->add('id', FooType::class, ['foo' => 'bar']);
-
-        $this->assertBuilderFieldConfigurationEquals('id', FooType::class, ['foo' => 'bar']);
-        self::assertFalse($this->builder->has('name'));
-    }
-
-    /**
-     * @test
-     */
-    public function set_pre_configured_field(): void
-    {
-        $field = $this->createFieldConfigMock('id');
-        $this->builder->set($field);
-
-        self::assertTrue($this->builder->has('id'));
-        self::assertFalse($this->builder->has('name'));
-        self::assertSame($field, $this->builder->get('id'));
-    }
-
-    /**
-     * @test
-     */
-    public function remove_field(): void
-    {
-        $this->builder->add('id', FooType::class);
-        $this->builder->add('name', 'text');
-
-        $this->builder->remove('id');
-
-        self::assertTrue($this->builder->has('name'));
-        self::assertFalse($this->builder->has('id'));
-    }
-
-    /**
-     * @test
-     */
-    public function get_build_field_set(): void
-    {
-        $this->builder->add('id', FooType::class, ['max' => 5000]);
-        $this->builder->add('gid', FooType::class);
-
-        $fieldSet = $this->builder->getFieldSet('test');
-
-        self::assertEquals('test', $fieldSet->getSetName());
-        self::assertFieldConfigurationEquals($fieldSet->get('id'), 'id', FooType::class, ['max' => 5000]);
-        self::assertFieldConfigurationEquals($fieldSet->get('gid'), 'gid', FooType::class);
-    }
-
-    /**
-     * @test
-     */
-    public function remove_existing_unresolved_when_setting_explicit(): void
-    {
-        $this->builder->add('id', FooType::class, ['max' => 5000]);
-
-        $this->builder->set($field = $this->createFieldConfigMock('id'));
-        $this->builder->set($field2 = $this->createFieldConfigMock('name'));
-
-        self::assertSame($field, $this->builder->get('id'));
-        self::assertSame($field2, $this->builder->get('name'));
-
-        $fieldSet = $this->builder->getFieldSet('test');
-
-        self::assertEquals('test', $fieldSet->getSetName());
-        self::assertFieldConfigurationEquals($fieldSet->get('id'), 'id', FooSubType::class);
-        self::assertFieldConfigurationEquals($fieldSet->get('name'), 'name', FooSubType::class);
-    }
-
-    /**
-     * @param array<string, mixed> $options
-     */
-    private function assertBuilderFieldConfigurationEquals(string $name, string $type, array $options = []): void
-    {
-        $field = $this->builder->get($name);
-        self::assertEquals($name, $field->getName());
-        self::assertInstanceOf($type, $field->getType()->getInnerType());
-        self::assertEquals($options, $field->getOptions());
-    }
-
-    /**
-     * @param array<string, mixed> $options
-     */
-    private static function assertFieldConfigurationEquals(FieldConfig $field, string $name, string $type, array $options = []): void
-    {
-        self::assertEquals($name, $field->getName());
-        self::assertInstanceOf($type, $field->getType()->getInnerType(), 'Expected type to be ' . $type . ', got ' . $field->getType()->getInnerType()::class . ' instead.');
-        self::assertEquals($options, $field->getOptions());
-    }
-
-    private function createFieldConfigMock(string $name, string $typeName = FooSubType::class): FieldConfig
-    {
-        $type = $this->createMock(ResolvedFieldType::class);
-        $type->method('getInnerType')->willReturn(new $typeName());
-
-        $field = $this->createMock(FieldConfig::class);
-        $field->method('getName')->willReturn($name);
-        $field->method('getType')->willReturn($type);
-
-        return $field;
-    }
-}
diff --git a/lib/Core/Tests/GenericFieldSetTest.php b/lib/Core/Tests/GenericFieldSetTest.php
deleted file mode 100644
index 373c3189..00000000
--- a/lib/Core/Tests/GenericFieldSetTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests;
-
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\SearchFieldView;
-use Rollerworks\Component\Search\FieldSetView;
-use Rollerworks\Component\Search\GenericFieldSet;
-
-/**
- * @internal
- */
-final class GenericFieldSetTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_gets_a_field(): void
-    {
-        $fieldSet = new GenericFieldSet([
-            'id' => $idField = $this->createFieldMock('id'),
-            'name' => $nameField = $this->createFieldMock('name'),
-        ]);
-
-        self::assertSame($idField, $fieldSet->get('id'));
-        self::assertSame($nameField, $fieldSet->get('name'));
-
-        self::assertTrue($fieldSet->has('id'));
-        self::assertTrue($fieldSet->has('name'));
-        self::assertFalse($fieldSet->has('foo'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_creates_a_view(): void
-    {
-        $fieldSet = new GenericFieldSet([
-            'id' => $idField = $this->createFieldMock('id', true),
-            'name' => $nameField = $this->createFieldMock('name', true),
-        ]);
-
-        $view = $fieldSet->createView();
-        $expectedView = new FieldSetView();
-
-        $idView = new SearchFieldView($expectedView);
-        $idView->vars['name'] = 'id';
-        $expectedView->fields['id'] = $idView;
-
-        $nameView = new SearchFieldView($expectedView);
-        $nameView->vars['name'] = 'name';
-        $expectedView->fields['name'] = $nameView;
-
-        self::assertEquals($expectedView, $view);
-    }
-
-    /**
-     * @test
-     */
-    public function it_creates_a_view_with_builder(): void
-    {
-        $fieldSet = new GenericFieldSet(
-            [
-                'id' => $idField = $this->createFieldMock('id', true),
-                'name' => $nameField = $this->createFieldMock('name', true),
-            ],
-            'test',
-            static function (FieldSetView $view): void {
-                $view->vars['name'] = 'something';
-            }
-        );
-
-        $view = $fieldSet->createView();
-        $expectedView = new FieldSetView();
-        $expectedView->vars['name'] = 'something';
-
-        $idView = new SearchFieldView($expectedView);
-        $idView->vars['name'] = 'id';
-        $expectedView->fields['id'] = $idView;
-
-        $nameView = new SearchFieldView($expectedView);
-        $nameView->vars['name'] = 'name';
-        $expectedView->fields['name'] = $nameView;
-
-        self::assertEquals($expectedView, $view);
-    }
-
-    /**
-     * @return MockObject&FieldConfig
-     */
-    private function createFieldMock(string $name, bool $withView = false): object
-    {
-        $field = $this->createMock(FieldConfig::class);
-        $field->expects(self::any())->method('getName')->willReturn($name);
-
-        if ($withView) {
-            $field->expects(self::once())
-                ->method('createView')
-                ->willReturnCallback(static function (FieldSetView $view) use ($name) {
-                    $fieldView = new SearchFieldView($view);
-                    $fieldView->vars['name'] = $name;
-
-                    return $fieldView;
-                })
-            ;
-        }
-
-        return $field;
-    }
-}
diff --git a/lib/Core/Tests/GenericSearchFactoryTest.php b/lib/Core/Tests/GenericSearchFactoryTest.php
deleted file mode 100644
index 1ee75ee4..00000000
--- a/lib/Core/Tests/GenericSearchFactoryTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests;
-
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\ResolvedFieldType;
-use Rollerworks\Component\Search\Field\TypeRegistry;
-use Rollerworks\Component\Search\FieldSetRegistry;
-use Rollerworks\Component\Search\GenericSearchFactory;
-
-/**
- * @internal
- */
-final class GenericSearchFactoryTest extends TestCase
-{
-    /** @var MockObject&TypeRegistry */
-    private MockObject $registry;
-
-    /** @var MockObject&FieldConfig */
-    private MockObject $fieldConfig;
-
-    private GenericSearchFactory $factory;
-
-    protected function setUp(): void
-    {
-        $this->registry = $this->createMock(TypeRegistry::class);
-        $this->fieldConfig = $this->createMock(FieldConfig::class);
-
-        $this->factory = new GenericSearchFactory($this->registry, $this->createMock(FieldSetRegistry::class));
-    }
-
-    /**
-     * @test
-     */
-    public function create_field_with_type_name(): void
-    {
-        $options = ['a' => '1', 'b' => '2'];
-        $resolvedOptions = ['a' => '2', 'b' => '3'];
-        $resolvedType = $this->getMockResolvedType();
-
-        $this->registry->expects(self::once())
-            ->method('getType')
-            ->with(TextType::class)
-            ->willReturn($resolvedType)
-        ;
-
-        $resolvedType->expects(self::once())
-            ->method('createField')
-            ->with('name', $options)
-            ->willReturn($this->fieldConfig)
-        ;
-
-        $this->fieldConfig->expects(self::any())
-            ->method('getOptions')
-            ->willReturn($resolvedOptions)
-        ;
-
-        $resolvedType->expects(self::once())
-            ->method('buildType')
-            ->with($this->fieldConfig, $resolvedOptions)
-        ;
-
-        self::assertSame($this->fieldConfig, $this->factory->createField('name', TextType::class, $options));
-    }
-
-    private function getMockResolvedType(): MockObject
-    {
-        return $this->getMockBuilder(ResolvedFieldType::class)->getMock();
-    }
-}
diff --git a/lib/Core/Tests/Input/CachingInputProcessorTest.php b/lib/Core/Tests/Input/CachingInputProcessorTest.php
deleted file mode 100644
index e945eef3..00000000
--- a/lib/Core/Tests/Input/CachingInputProcessorTest.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Input;
-
-use PHPUnit\Framework\TestCase;
-use Psr\SimpleCache\CacheInterface;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Input\CachingInputProcessor;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchConditionSerializer;
-use Rollerworks\Component\Search\Tests\Mock\EmptyInputProcessorStub;
-use Rollerworks\Component\Search\Tests\Mock\FieldSetStub;
-use Rollerworks\Component\Search\Tests\Mock\SpyingInputProcessor;
-use Rollerworks\Component\Search\Tests\Mock\StubInputProcessor;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Psr16Cache;
-
-/**
- * @internal
- */
-final class CachingInputProcessorTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_ignores_caching_for_non_string_input(): void
-    {
-        $serializer = $this->createMock(SearchConditionSerializer::class);
-        $inputProcessor = new SpyingInputProcessor();
-        $cache = new Psr16Cache($arrayCache = new ArrayAdapter());
-        $processor = new CachingInputProcessor($cache, $serializer, $inputProcessor);
-
-        $processor->process($config = new ProcessorConfig(new FieldSetStub()), $input = ['Hello']);
-
-        self::assertEmpty($arrayCache->getValues());
-        self::assertEquals($config, $inputProcessor->getConfig());
-        self::assertEquals($input, $inputProcessor->getInput());
-    }
-
-    /**
-     * @test
-     */
-    public function it_ignores_caching_when_ttl_is_0(): void
-    {
-        $cache = $this->createMock(CacheInterface::class);
-        $cache->expects(self::never())->method('get');
-
-        $serializer = $this->createMock(SearchConditionSerializer::class);
-        $inputProcessor = new SpyingInputProcessor();
-        $processor = new CachingInputProcessor($cache, $serializer, $inputProcessor);
-
-        $processor->process($config = (new ProcessorConfig(new FieldSetStub()))->setCacheTTL(0), $input = ['Hello']);
-
-        self::assertEquals($config, $inputProcessor->getConfig());
-        self::assertEquals($input, $inputProcessor->getInput());
-    }
-
-    /**
-     * @test
-     */
-    public function it_processes_with_no_existing_cache(): void
-    {
-        $serializer = $this->createMock(SearchConditionSerializer::class);
-        $serializer
-            ->expects(self::once())
-            ->method('unserialize')
-            ->willThrowException(new InvalidArgumentException())
-        ;
-
-        $inputProcessor = new SpyingInputProcessor();
-        $cache = new Psr16Cache($arrayCache = new ArrayAdapter());
-        $processor = new CachingInputProcessor($cache, $serializer, $inputProcessor);
-
-        $processor->process($config = (new ProcessorConfig(new FieldSetStub()))->setCacheTTL(10), $input = 'Hello');
-
-        self::assertCount(1, $arrayCache->getValues());
-        self::assertEquals($config, $inputProcessor->getConfig());
-        self::assertEquals($input, $inputProcessor->getInput());
-    }
-
-    /**
-     * @test
-     */
-    public function it_uses_cached_version_when_cache_is_valid(): void
-    {
-        $serializer = $this->createMock(SearchConditionSerializer::class);
-        $serializer
-            ->expects(self::once())
-            ->method('unserialize')
-            ->with(['cachedResult'])
-            ->willReturn($condition = new SearchCondition(new FieldSetStub(), new ValuesGroup()))
-        ;
-
-        $inputProcessor = new SpyingInputProcessor();
-
-        $cache = $this->createMock(CacheInterface::class);
-        $cache
-            ->expects(self::once())
-            ->method('get')
-            ->willReturn(['cachedResult'])
-        ;
-
-        $processor = new CachingInputProcessor($cache, $serializer, $inputProcessor);
-
-        self::assertSame($condition, $processor->process((new ProcessorConfig(new FieldSetStub()))->setCacheTTL(10), 'Hello'));
-        self::assertNull($inputProcessor->getConfig());
-        self::assertNull($inputProcessor->getInput());
-    }
-
-    /**
-     * @test
-     */
-    public function it_stores_processed_result_in_cache(): void
-    {
-        $serializer = $this->createMock(SearchConditionSerializer::class);
-        $serializer
-            ->expects(self::once())
-            ->method('unserialize')
-            ->willThrowException(new InvalidArgumentException())
-        ;
-
-        $serializer
-            ->expects(self::once())
-            ->method('serialize')
-            ->with(SpyingInputProcessor::getCondition())
-            ->willReturn(['noop', 'serializedResult'])
-        ;
-
-        $cache = $this->createMock(CacheInterface::class);
-        $cache
-            ->expects(self::once())
-            ->method('get')
-            ->willReturn([])
-        ;
-
-        $cache
-            ->expects(self::once())
-            ->method('set')
-            ->with('57844014a80a2251e25a05e3c94ffdc2f47cb6ff06b3e2dcc27c5d5124dff22a', ['noop', 'serializedResult'])
-        ;
-
-        $inputProcessor = new SpyingInputProcessor();
-        $processor = new CachingInputProcessor($cache, $serializer, $inputProcessor);
-
-        $processor->process($config = (new ProcessorConfig(new FieldSetStub()))->setCacheTTL(10), $input = 'Hello');
-
-        self::assertEquals($config, $inputProcessor->getConfig());
-        self::assertEquals($input, $inputProcessor->getInput());
-    }
-
-    /**
-     * @test
-     */
-    public function it_stores_processed_result_in_cache_with_processor_config_ttl(): void
-    {
-        $serializer = $this->createMock(SearchConditionSerializer::class);
-        $serializer
-            ->expects(self::once())
-            ->method('unserialize')
-            ->willThrowException(new InvalidArgumentException())
-        ;
-
-        $serializer
-            ->expects(self::once())
-            ->method('serialize')
-            ->with(SpyingInputProcessor::getCondition())
-            ->willReturn(['noop', 'serializedResult'])
-        ;
-
-        $cache = $this->createMock(CacheInterface::class);
-        $cache
-            ->expects(self::once())
-            ->method('get')
-            ->willReturn([])
-        ;
-
-        $cache
-            ->expects(self::once())
-            ->method('set')
-            ->with('57844014a80a2251e25a05e3c94ffdc2f47cb6ff06b3e2dcc27c5d5124dff22a', ['noop', 'serializedResult'], new \DateInterval('P1D'))
-        ;
-
-        $inputProcessor = new SpyingInputProcessor();
-        $processor = new CachingInputProcessor($cache, $serializer, $inputProcessor, new \DateInterval('P2D'));
-
-        $config = new ProcessorConfig(new FieldSetStub());
-        $config->setCacheTTL(new \DateInterval('P1D'));
-
-        $processor->process($config, $input = 'Hello');
-
-        self::assertEquals($config, $inputProcessor->getConfig());
-        self::assertEquals($input, $inputProcessor->getInput());
-    }
-
-    /**
-     * @test
-     */
-    public function it_stores_processed_result_in_cache_with_default_ttl(): void
-    {
-        $serializer = $this->createMock(SearchConditionSerializer::class);
-        $serializer
-            ->expects(self::once())
-            ->method('unserialize')
-            ->willThrowException(new InvalidArgumentException())
-        ;
-
-        $serializer
-            ->expects(self::once())
-            ->method('serialize')
-            ->with(SpyingInputProcessor::getCondition())
-            ->willReturn(['noop', 'serializedResult'])
-        ;
-
-        $ttl = new \DateInterval('P1D');
-
-        $cache = $this->createMock(CacheInterface::class);
-        $cache
-            ->expects(self::once())
-            ->method('get')
-            ->willReturn([])
-        ;
-
-        $cache
-            ->expects(self::once())
-            ->method('set')
-            ->with('57844014a80a2251e25a05e3c94ffdc2f47cb6ff06b3e2dcc27c5d5124dff22a', ['noop', 'serializedResult'], $ttl)
-        ;
-
-        $inputProcessor = new SpyingInputProcessor();
-        $processor = new CachingInputProcessor($cache, $serializer, $inputProcessor, $ttl);
-
-        $processor->process($config = new ProcessorConfig(new FieldSetStub()), $input = 'Hello');
-
-        self::assertEquals($config, $inputProcessor->getConfig());
-        self::assertEquals($input, $inputProcessor->getInput());
-    }
-
-    /**
-     * @test
-     */
-    public function it_does_not_store_empty_condition(): void
-    {
-        $serializer = $this->createMock(SearchConditionSerializer::class);
-        $serializer
-            ->expects(self::once())
-            ->method('unserialize')
-            ->willThrowException(new InvalidArgumentException())
-        ;
-
-        $serializer
-            ->expects(self::never())
-            ->method('serialize')
-        ;
-
-        $cache = $this->createMock(CacheInterface::class);
-        $cache
-            ->expects(self::once())
-            ->method('get')
-            ->willReturn([])
-        ;
-
-        $cache
-            ->expects(self::never())
-            ->method('set')
-        ;
-
-        $inputProcessor = new EmptyInputProcessorStub();
-        $processor = new CachingInputProcessor($cache, $serializer, $inputProcessor);
-
-        $processor->process((new ProcessorConfig(new FieldSetStub()))->setCacheTTL(10), 'Hello');
-    }
-
-    /**
-     * @test
-     */
-    public function it_separates_caches_by_processor_class(): void
-    {
-        $serializer = $this->createMock(SearchConditionSerializer::class);
-        $serializer
-            ->expects(self::any())
-            ->method('unserialize')
-            ->willThrowException(new InvalidArgumentException())
-        ;
-
-        $cache = new Psr16Cache($arrayCache = new ArrayAdapter());
-
-        $processor = new CachingInputProcessor($cache, $serializer, new SpyingInputProcessor());
-        $processor->process((new ProcessorConfig(new FieldSetStub()))->setCacheTTL(10), 'Hello');
-
-        $processor2 = new CachingInputProcessor($cache, $serializer, new StubInputProcessor());
-        $processor2->process((new ProcessorConfig(new FieldSetStub()))->setCacheTTL(10), 'Hello');
-
-        self::assertCount(2, $arrayCache->getValues());
-    }
-}
diff --git a/lib/Core/Tests/Input/ErrorPathTranslatorTest.php b/lib/Core/Tests/Input/ErrorPathTranslatorTest.php
deleted file mode 100644
index 3e6f80b6..00000000
--- a/lib/Core/Tests/Input/ErrorPathTranslatorTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Input;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Input\ErrorPathTranslator;
-use Symfony\Component\Translation\Translator;
-
-/**
- * @internal
- */
-final class ErrorPathTranslatorTest extends TestCase
-{
-    /**
-     * @test
-     *
-     * @dataProvider provide_it_translates_to_human_friendly_format
-     */
-    public function it_translates_to_human_friendly_format(string $input, string $expected): void
-    {
-        $translator = new Translator('en');
-        $humanizer = new ErrorPathTranslator($translator);
-
-        self::assertEquals($expected, $humanizer->translateFromQueryString($input), 'With input:' . $input);
-    }
-
-    public static function provide_it_translates_to_human_friendly_format(): iterable
-    {
-        // Empty
-        yield ['', ''];
-
-        // No value position
-        yield ['[@id]', 'At root level, field "@id":'];
-
-        // Fields at root level
-        yield ['[email][0]', 'At root level, field "email" value position 1:'];
-        yield ['[email][1]', 'At root level, field "email" value position 2:'];
-
-        // Field value with type
-        yield ['[id][2][lower]', 'At root level, field "id" value position 3 lower:'];
-        yield ['[id][2][upper]', 'At root level, field "id" value position 3 upper:'];
-
-        // At group at root level (no field)
-        yield ['[2]', 'At root level, group 3:'];
-
-        // In (nested) group
-        yield ['[2][email][3]', 'In group 3, field "email" value position 4:'];
-        yield ['[0][0][email][0]', 'In nested group 1.1, field "email" value position 1:'];
-        yield ['[1][2][email][3]', 'In nested group 2.3, field "email" value position 4:'];
-        yield ['[1][2][email][3][upper]', 'In nested group 2.3, field "email" value position 4 upper:'];
-        yield ['[1][2][email]', 'In nested group 2.3, field "email":'];
-    }
-}
diff --git a/lib/Core/Tests/Input/InputProcessorTestCase.php b/lib/Core/Tests/Input/InputProcessorTestCase.php
deleted file mode 100644
index 4b11d0fc..00000000
--- a/lib/Core/Tests/Input/InputProcessorTestCase.php
+++ /dev/null
@@ -1,673 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Input;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\DataTransformer;
-use Rollerworks\Component\Search\Exception\GroupsNestingException;
-use Rollerworks\Component\Search\Exception\GroupsOverflowException;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\Exception\UnsupportedValueTypeException;
-use Rollerworks\Component\Search\Exception\ValuesOverflowException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\OrderTransformer;
-use Rollerworks\Component\Search\Extension\Core\Type\DateType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\GenericFieldSetBuilder;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-abstract class InputProcessorTestCase extends SearchIntegrationTestCase
-{
-    abstract protected function getProcessor(): InputProcessor;
-
-    protected function getFieldSet(bool $build = true, bool $order = false)
-    {
-        $fieldSet = new GenericFieldSetBuilder($this->getFactory());
-        $fieldSet->add('id', IntegerType::class);
-        $fieldSet->add('_id', IntegerType::class);
-        $fieldSet->add('_group', IntegerType::class);
-        $fieldSet->add('name', TextType::class);
-        $fieldSet->add('lastname', TextType::class);
-        $fieldSet->add('date', DateType::class, ['pattern' => 'MM-dd-yyyy']);
-
-        if ($order) {
-            $fieldSet->add('@date', OrderFieldType::class, ['case' => OrderTransformer::CASE_LOWERCASE, 'alias' => ['up' => 'ASC', 'down' => 'DESC'], 'default' => 'desc']);
-            $fieldSet->add('@id', OrderFieldType::class, ['default' => 'ASC']);
-        }
-
-        $fieldSet->set(
-            $this->getFactory()->createField('no-range-field', IntegerType::class)
-                ->setValueTypeSupport(Range::class, false)
-        );
-
-        $fieldSet->set(
-            $this->getFactory()->createField('no-compares-field', IntegerType::class)->setValueTypeSupport(
-                Compare::class,
-                false
-            )
-        );
-
-        $fieldSet->set(
-            $this->getFactory()->createField('no-matchers-field', IntegerType::class)->setValueTypeSupport(
-                PatternMatch::class,
-                false
-            )
-        );
-
-        return $build ? $fieldSet->getFieldSet() : $fieldSet;
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideEmptyInputTests
-     */
-    public function it_processes_an_empty_input($input): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideEmptyInputTests(): iterable;
-
-    /**
-     * @test
-     *
-     * @dataProvider provideSingleValuePairTests
-     */
-    public function it_processes_values($input, array $order = []): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet(true, true));
-        $config->setDefaultField('id');
-
-        $expectedGroup = new ValuesGroup();
-
-        if (! \in_array($input, ['', '[]'], true)) {
-            $values = new ValuesBag();
-            $values->addSimpleValue('value');
-            $values->addSimpleValue('value2');
-            $values->addSimpleValue('٤٤٤٦٥٤٦٠٠'); // number in Arab
-            $values->addSimpleValue('30');
-            $values->addSimpleValue('30L');
-            $values->addExcludedSimpleValue('value3');
-            $expectedGroup->addField('name', $values);
-        }
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-
-        if ($order) {
-            $expectedOrderGroup = new ValuesGroup();
-
-            foreach ($order as $name => $direction) {
-                $orderValueBag = new ValuesBag();
-                $orderValueBag->addSimpleValue($direction);
-                $expectedOrderGroup->addField($name, $orderValueBag);
-            }
-            $condition->setOrder(new SearchOrder($expectedOrderGroup));
-        }
-
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideSingleValuePairTests();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideMultipleValues
-     */
-    public function it_processes_multiple_fields($input): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setDefaultField('name');
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $expectedGroup->addField('name', $values);
-
-        $date = new \DateTimeImmutable('2014-12-16 00:00:00 UTC');
-
-        $values = new ValuesBag();
-        $values->addSimpleValue($date);
-        $expectedGroup->addField('date', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideMultipleValues();
-
-    /**
-     * @dataProvider provideRangeValues
-     *
-     * @test
-     */
-    public function it_processes_range_values($input): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setDefaultField('id');
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->add(new Range(1, 10));
-        $values->add(new Range(15, 30));
-        $values->add(new Range(100, 200, false));
-        $values->add(new Range(310, 400, true, false));
-        $values->add(new ExcludedRange(50, 70));
-        $expectedGroup->addField('id', $values);
-
-        $date = new \DateTimeImmutable('2014-12-16 00:00:00 UTC');
-        $date2 = new \DateTimeImmutable('2014-12-20 00:00:00 UTC');
-
-        $values = new ValuesBag();
-        $values->add(new Range($date, $date2, true, true));
-        $expectedGroup->addField('date', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideRangeValues();
-
-    /**
-     * @dataProvider provideComparisonValues
-     *
-     * @test
-     */
-    public function it_processes_comparisons($input): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setDefaultField('id');
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->add(new Compare(1, '>'));
-        $values->add(new Compare(2, '<'));
-        $values->add(new Compare(5, '<='));
-        $values->add(new Compare(8, '>='));
-        $values->add(new Compare(20, '<>'));
-        $expectedGroup->addField('id', $values);
-
-        $date = new \DateTimeImmutable('2014-12-16 00:00:00 UTC');
-
-        $values = new ValuesBag();
-        $values->add(new Compare($date, '>='));
-        $expectedGroup->addField('date', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideComparisonValues();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideMatcherValues
-     */
-    public function it_processes_matchers($input): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->add(new PatternMatch('value', PatternMatch::PATTERN_CONTAINS));
-        $values->add(new PatternMatch('value2', PatternMatch::PATTERN_STARTS_WITH, true));
-        $values->add(new PatternMatch('value3', PatternMatch::PATTERN_ENDS_WITH));
-        $values->add(new PatternMatch('value4', PatternMatch::PATTERN_NOT_CONTAINS));
-        $values->add(new PatternMatch('value5', PatternMatch::PATTERN_NOT_CONTAINS, true));
-        $values->add(new PatternMatch('value9', PatternMatch::PATTERN_EQUALS));
-        $values->add(new PatternMatch('value10', PatternMatch::PATTERN_NOT_EQUALS));
-        $values->add(new PatternMatch('value11', PatternMatch::PATTERN_EQUALS, true));
-        $values->add(new PatternMatch('value12', PatternMatch::PATTERN_NOT_EQUALS, true));
-        $expectedGroup->addField('name', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideMatcherValues();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideGroupTests
-     */
-    public function it_processes_groups($input): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setDefaultField('name');
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $expectedGroup->addField('name', $values);
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value3');
-        $values->addSimpleValue('value4');
-
-        $subGroup = new ValuesGroup();
-        $subGroup->addField('name', $values);
-        $expectedGroup->addGroup($subGroup);
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value8');
-        $values->addSimpleValue('value10');
-
-        $subGroup = new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR);
-        $subGroup->addField('name', $values);
-        $expectedGroup->addGroup($subGroup);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideGroupTests();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideRootLogicalTests
-     */
-    public function it_processes_root_logical($input, string $logical = ValuesGroup::GROUP_LOGICAL_AND): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setDefaultField('name');
-
-        $expectedGroup = new ValuesGroup($logical);
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $expectedGroup->addField('name', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideRootLogicalTests();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideMultipleSubGroupTests
-     */
-    public function it_processes_multiple_subgroups($input): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setDefaultField('name');
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-
-        $subGroup = new ValuesGroup();
-        $subGroup->addField('name', $values);
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value3');
-        $values->addSimpleValue('value4');
-        $expectedGroup->addGroup($subGroup);
-
-        $subGroup2 = new ValuesGroup();
-        $subGroup2->addField('name', $values);
-        $expectedGroup->addGroup($subGroup2);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideMultipleSubGroupTests();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideNestedGroupTests
-     */
-    public function it_processes_nested_subgroups($input): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setDefaultField('name');
-
-        $expectedGroup = new ValuesGroup();
-        $nestedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $nestedGroup->addField('name', $values);
-
-        $subGroup = new ValuesGroup();
-        $subGroup->addGroup($nestedGroup);
-        $expectedGroup->addGroup($subGroup);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideNestedGroupTests();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideValueOverflowTests
-     */
-    public function it_errors_when_maximum_values_count_is_exceeded($input, string $fieldName, string $path): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setMaxValues(3);
-
-        $e = new ValuesOverflowException($fieldName, 3, $path);
-        $error = $e->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors($input, $config, [$error]);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideValueOverflowTests();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideGroupsOverflowTests
-     */
-    public function it_errors_when_maximum_groups_count_is_exceeded($input, string $path): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setMaxGroups(3);
-
-        $e = new GroupsOverflowException(3, $path);
-        $error = $e->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors($input, $config, [$error]);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideGroupsOverflowTests();
-
-    /**
-     * This tests ensures a private field will throw an UnknownFieldException.
-     *
-     * @test
-     *
-     * @dataProvider providePrivateFieldTests
-     */
-    public function it_errors_when_private_field_was_used($input, string $fieldName): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $e = new UnknownFieldException($fieldName);
-        $error = $e->toErrorMessageObj();
-
-        $this->assertConditionContainsErrorsWithoutCause($input, $config, [$error]);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function providePrivateFieldTests();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideNestingLevelExceededTests
-     */
-    public function it_errors_when_maximum_nesting_level_is_reached($input, string $path): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setMaxNestingLevel(1);
-
-        $e = new GroupsNestingException(1, $path);
-        $error = $e->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors($input, $config, [$error]);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideNestingLevelExceededTests();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideUnknownFieldTests
-     */
-    public function it_errors_when_the_field_does_not_exist_in_fieldset($input): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $e = new UnknownFieldException('field2');
-        $error = $e->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors($input, $config, [$error]);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideUnknownFieldTests();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideUnsupportedValueTypeExceptionTests
-     */
-    public function it_errors_when_the_field_does_not_support_the_value_type($input, string $fieldName, string $valueType): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $e = new UnsupportedValueTypeException($fieldName, $valueType);
-        $error = $e->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors($input, $config, [$error]);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideUnsupportedValueTypeExceptionTests();
-
-    /**
-     * @test
-     *
-     * @dataProvider provideInvalidRangeTests
-     */
-    public function it_errors_when_a_range_has_invalid_bounds($input, array $path): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $errors = [
-            ConditionErrorMessage::withMessageTemplate($path[0], 'The lower range value {{ lower }} should be lower than the upper range value {{ upper }}.', ['{{ lower }}' => '30', '{{ upper }}' => '10']),
-            ConditionErrorMessage::withMessageTemplate($path[1], 'The lower range value {{ lower }} should be lower than the upper range value {{ upper }}.', ['{{ lower }}' => '40', '{{ upper }}' => '20']),
-        ];
-
-        $this->assertConditionContainsErrorsWithoutCause($input, $config, $errors);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideInvalidRangeTests();
-
-    /**
-     * @param ConditionErrorMessage[] $errors
-     *
-     * @test
-     *
-     * @dataProvider provideInvalidValueTests
-     */
-    public function it_errors_when_transformation_fails($input, array $errors): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $this->assertConditionContainsErrorsWithoutCause($input, $config, $errors);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideInvalidValueTests();
-
-    /**
-     * @param ConditionErrorMessage[] $errors
-     *
-     * @test
-     *
-     * @dataProvider provideInvalidWithMessageValueTests
-     */
-    public function it_errors_with_invalid_message_when_transformation_fails($input, array $errors): void
-    {
-        $alwaysFailTransformer = new class implements DataTransformer {
-            public function transform($value): void
-            {
-                // No-op
-            }
-
-            public function reverseTransform($value): never
-            {
-                throw new TransformationFailedException('Error.', 0, null, 'I explicitly refuse the accept this value.', ['value' => $value]);
-            }
-        };
-
-        $this->factoryBuilder->addTypeExtensions([
-            new class($alwaysFailTransformer) extends AbstractFieldTypeExtension {
-                public function __construct(
-                    private readonly DataTransformer $transformer,
-                ) {
-                }
-
-                public function buildType(FieldConfig $builder, array $options): void
-                {
-                    $builder->setNormTransformer($this->transformer);
-                    $builder->setViewTransformer($this->transformer);
-                }
-
-                public function getExtendedType(): string
-                {
-                    return TextType::class;
-                }
-            },
-        ]);
-
-        $fieldSetBuilder = new GenericFieldSetBuilder($this->getFactory());
-        $fieldSetBuilder->add('name', TextType::class);
-        $fieldSet = $fieldSetBuilder->getFieldSet();
-
-        $config = new ProcessorConfig($fieldSet);
-
-        $this->assertConditionContainsErrorsWithoutCause($input, $config, $errors);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideInvalidWithMessageValueTests();
-
-    /**
-     * @param ConditionErrorMessage[] $errors
-     *
-     * @test
-     *
-     * @dataProvider provideNestedErrorsTests
-     */
-    public function it_checks_nested_fields($input, array $errors): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setMaxNestingLevel(10);
-
-        $this->assertConditionContainsErrorsWithoutCause($input, $config, $errors);
-    }
-
-    /**
-     * @return array[]
-     */
-    abstract public static function provideNestedErrorsTests();
-}
diff --git a/lib/Core/Tests/Input/JsonInputTest.php b/lib/Core/Tests/Input/JsonInputTest.php
deleted file mode 100644
index 6a56fff4..00000000
--- a/lib/Core/Tests/Input/JsonInputTest.php
+++ /dev/null
@@ -1,1051 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Input;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Input\JsonInput;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\Input\Validator;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class JsonInputTest extends InputProcessorTestCase
-{
-    protected function getProcessor(): InputProcessor
-    {
-        return new JsonInput();
-    }
-
-    /**
-     * @test
-     */
-    public function it_errors_on_invalid_json(): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-        $error = ConditionErrorMessage::rawMessage(
-            '{]',
-            "Input does not contain valid JSON: \nState mismatch (invalid or malformed JSON)"
-        );
-
-        $this->assertConditionContainsErrorsWithoutCause('{]', $config, [$error]);
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provide_invalid_structures
-     */
-    public function it_validates_structure(array $structure, array $errors): void
-    {
-        $this->assertConditionContainsErrorsWithoutCause(
-            json_encode($structure, \JSON_THROW_ON_ERROR),
-            new ProcessorConfig($this->getFieldSet(order: true)),
-            $errors
-        );
-    }
-
-    public static function provide_invalid_structures(): iterable
-    {
-        yield 'Unknown key at root level' => [
-            [
-                'date' => [],
-            ],
-            [new ConditionErrorMessage('', 'Unexpected key "date" found in structure, expected only: "fields", "groups", "order", "logical-case".')],
-        ];
-
-        yield 'Unknown key at field level' => [
-            [
-                'fields' => [
-                    'date' => [
-                        'values' => ['1'],
-                    ],
-                ],
-            ],
-            [new ConditionErrorMessage('[fields][date]', 'Unexpected key "values" found in structure, expected only: "simple-values", "excluded-simple-values", "ranges", "excluded-ranges", "comparisons", "pattern-matchers".')],
-        ];
-
-        yield 'Wrong key at field level' => [
-            [
-                'fields' => [
-                    'date' => [
-                        '1',
-                    ],
-                ],
-            ],
-            [new ConditionErrorMessage('[fields][date]', 'Expected structure to be an array.')],
-        ];
-
-        yield 'Unknown key at nested level' => [
-            [
-                'groups' => [
-                    'date' => [],
-                ],
-            ],
-            [new ConditionErrorMessage('[groups]', 'Expected structure to be an array, got "object" instead.')],
-        ];
-
-        yield 'Unexpected value for single-values' => [
-            [
-                'fields' => [
-                    'date' => [
-                        'simple-values' => ['first' => '2014-12-16'],
-                    ],
-                ],
-            ],
-            [new ConditionErrorMessage('[fields][date][simple-values]', 'Expected structure to be an array, got "object" instead.')],
-        ];
-
-        yield 'Unexpected value for excluded-single-values' => [
-            [
-                'fields' => [
-                    'date' => [
-                        'excluded-simple-values' => ['first' => '2014-12-16'],
-                    ],
-                ],
-            ],
-            [new ConditionErrorMessage('[fields][date][excluded-simple-values]', 'Expected structure to be an array, got "object" instead.')],
-        ];
-
-        yield 'Unexpected value for ranges' => [
-            [
-                'fields' => [
-                    'date' => [
-                        'ranges' => [['lower' => '2014-12-16', 'upper' => '2014-12-18', 'bounded' => 'first']],
-                    ],
-                ],
-            ],
-            [new ConditionErrorMessage('[fields][date][ranges][0]', 'Unexpected key "bounded" found in structure, expected only: "lower", "upper", "inclusive-lower", "inclusive-upper".')],
-        ];
-
-        yield 'Unexpected bound-type for ranges' => [
-            [
-                'fields' => [
-                    'date' => [
-                        'ranges' => [['lower' => '2014-12-16', 'upper' => '2014-12-18', 'inclusive-lower' => 'no']],
-                    ],
-                ],
-            ],
-            [new ConditionErrorMessage('[fields][date][ranges][0][inclusive-lower]', 'Expected value to be a bool, got "string" instead.')],
-        ];
-
-        yield 'Missing lower-bound for ranges' => [
-            [
-                'fields' => [
-                    'date' => [
-                        'ranges' => [['upper' => '2014-12-18']],
-                    ],
-                ],
-            ],
-            [new ConditionErrorMessage('[fields][date][ranges][0]', 'Expected value-structure to contain the following keys: "lower", "upper". But the following keys are missing: "lower".')],
-        ];
-
-        yield 'Missing type for comparison' => [
-            [
-                'fields' => [
-                    'date' => [
-                        'comparisons' => [['upper' => '2014-12-18']],
-                    ],
-                ],
-            ],
-            [new ConditionErrorMessage('[fields][date][comparisons][0]', 'Expected value-structure to contain the following keys: "value", "operator". But the following keys are missing: "value", "operator".')],
-        ];
-
-        yield 'Missing type for pattern-matchers' => [
-            [
-                'fields' => [
-                    'name' => [
-                        'pattern-matchers' => [['value' => '2014-12-18']],
-                    ],
-                ],
-            ],
-            [new ConditionErrorMessage('[fields][name][pattern-matchers][0]', 'Expected value-structure to contain the following keys: "value", "type". But the following keys are missing: "type".')],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function it_validates_values(): void
-    {
-        $validator = new class implements Validator {
-            private ?string $currentField = null;
-
-            /** @var array<string, mixed> */
-            public array $calls = [];
-
-            public function initialize(ProcessorConfig $config): void
-            {
-                $this->calls = [];
-                $this->calls['initialize'] = $config;
-            }
-
-            public function initializeContext(FieldConfig $field, ErrorList $errorList): void
-            {
-                $this->currentField = $field->getName();
-                $this->calls[$this->currentField] = [];
-            }
-
-            public function validate($value, string $type, $originalValue, string $path): bool
-            {
-                if ($value instanceof \DateTimeImmutable) {
-                    $value = '{DateTime}' . $value->format('Y-m-d');
-                }
-
-                $this->calls[$this->currentField][] = [$value, $type, $originalValue, $path];
-
-                return false;
-            }
-        };
-
-        $processor = new JsonInput($validator);
-        $config = new ProcessorConfig($this->getFieldSet(order: true));
-
-        $processor->process(
-            $config,
-            json_encode(
-                [
-                    'fields' => [
-                        'name' => ['simple-values' => ['value', 'value2']],
-                    ],
-                    'groups' => [
-                        [
-                            'fields' => [
-                                'date' => [
-                                    'simple-values' => ['2014-12-16'],
-                                    'ranges' => [
-                                        ['lower' => '2014-12-16', 'upper' => '2015-12-16'],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                    'order' => [
-                        'id' => 'asc',
-                    ],
-                ],
-                \JSON_THROW_ON_ERROR,
-            ),
-        );
-
-        self::assertSame([
-            'initialize' => $config,
-            'name' => [
-                ['value', 'simple', 'value', '[fields][name][simple-values][0]'],
-                ['value2', 'simple', 'value2', '[fields][name][simple-values][1]'],
-            ],
-            'date' => [
-                ['{DateTime}2014-12-16', 'simple', '2014-12-16', '[groups][0][fields][date][simple-values][0]'],
-                ['{DateTime}2014-12-16', Range::class, '2014-12-16', '[groups][0][fields][date][ranges][0][lower]'],
-                ['{DateTime}2015-12-16', Range::class, '2015-12-16', '[groups][0][fields][date][ranges][0][upper]'],
-            ],
-            '@id' => [
-                ['ASC', 'simple', 'asc', '[order][@id]'],
-            ],
-        ], $validator->calls);
-
-        $processor->process(
-            $config,
-            json_encode(
-                [
-                    'fields' => [
-                        'name' => ['simple-values' => ['value3', 'value4']],
-                    ],
-                    'groups' => [
-                        [
-                            'fields' => [
-                                'date' => [
-                                    'simple-values' => ['2014-12-14'],
-                                    'ranges' => [
-                                        ['lower' => '2014-12-16', 'upper' => '2015-12-16'],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                    'order' => [
-                        'id' => 'asc',
-                    ],
-                ],
-                \JSON_THROW_ON_ERROR,
-            ),
-        );
-
-        self::assertSame([
-            'initialize' => $config,
-            'name' => [
-                ['value3', 'simple', 'value3', '[fields][name][simple-values][0]'],
-                ['value4', 'simple', 'value4', '[fields][name][simple-values][1]'],
-            ],
-            'date' => [
-                ['{DateTime}2014-12-14', 'simple', '2014-12-14', '[groups][0][fields][date][simple-values][0]'],
-                ['{DateTime}2014-12-16', Range::class, '2014-12-16', '[groups][0][fields][date][ranges][0][lower]'],
-                ['{DateTime}2015-12-16', Range::class, '2015-12-16', '[groups][0][fields][date][ranges][0][upper]'],
-            ],
-            '@id' => [
-                ['ASC', 'simple', 'asc', '[order][@id]'],
-            ],
-        ], $validator->calls);
-    }
-
-    public static function provideEmptyInputTests(): iterable
-    {
-        return [
-            [''],
-            ['{}'],
-        ];
-    }
-
-    public static function provideSingleValuePairTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value', 'value2', '٤٤٤٦٥٤٦٠٠', '30', '30L'],
-                                'excluded-simple-values' => ['value3'],
-                            ],
-                        ],
-                        'order' => [
-                            'date' => 'uP',
-                        ],
-                    ]
-                ),
-                ['@date' => 'ASC'],
-            ],
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value', 'value2', '٤٤٤٦٥٤٦٠٠', '30', '30L'],
-                                'excluded-simple-values' => ['value3'],
-                            ],
-                        ],
-                    ]
-                ),
-                ['@date' => 'DESC', '@id' => 'ASC'],
-            ],
-            [
-                json_encode(
-                    []
-                ),
-                ['@date' => 'DESC', '@id' => 'ASC'],
-            ],
-        ];
-    }
-
-    public static function provideMultipleValues(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value', 'value2'],
-                            ],
-                            'date' => [
-                                'simple-values' => ['2014-12-16T00:00:00Z'],
-                            ],
-                        ],
-                    ]
-                ),
-            ],
-        ];
-    }
-
-    public static function provideRangeValues(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'id' => [
-                                'ranges' => [
-                                    ['lower' => 1, 'upper' => 10],
-                                    ['lower' => 15, 'upper' => 30],
-                                    ['lower' => 100, 'upper' => 200, 'inclusive-lower' => false],
-                                    ['lower' => 310, 'upper' => 400, 'inclusive-upper' => false],
-                                ],
-                                'excluded-ranges' => [
-                                    ['lower' => 50, 'upper' => 70, 'inclusive-lower' => true],
-                                ],
-                            ],
-                            'date' => [
-                                'ranges' => [
-                                    ['lower' => '2014-12-16T00:00:00Z', 'upper' => '2014-12-20T00:00:00Z'],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-            ],
-        ];
-    }
-
-    public static function provideComparisonValues(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'id' => [
-                                'comparisons' => [
-                                    ['value' => 1, 'operator' => '>'],
-                                    ['value' => 2, 'operator' => '<'],
-                                    ['value' => 5, 'operator' => '<='],
-                                    ['value' => 8, 'operator' => '>='],
-                                    ['value' => 20, 'operator' => '<>'],
-                                ],
-                            ],
-                            'date' => [
-                                'comparisons' => [
-                                    ['value' => '2014-12-16T00:00:00Z', 'operator' => '>='],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-            ],
-        ];
-    }
-
-    public static function provideMatcherValues(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'name' => [
-                                'pattern-matchers' => [
-                                    ['value' => 'value', 'type' => 'CONTAINS'],
-                                    ['value' => 'value2', 'type' => 'STARTS_WITH', 'case-insensitive' => true],
-                                    ['value' => 'value3', 'type' => 'ENDS_WITH'],
-                                    ['value' => 'value4', 'type' => 'NOT_CONTAINS'],
-                                    ['value' => 'value5', 'type' => 'NOT_CONTAINS', 'case-insensitive' => true],
-                                    ['value' => 'value9', 'type' => 'EQUALS'],
-                                    ['value' => 'value10', 'type' => 'NOT_EQUALS'],
-                                    ['value' => 'value11', 'type' => 'EQUALS', 'case-insensitive' => true],
-                                    ['value' => 'value12', 'type' => 'NOT_EQUALS', 'case-insensitive' => true],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-            ],
-        ];
-    }
-
-    public static function provideGroupTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value', 'value2'],
-                            ],
-                        ],
-                        'groups' => [
-                            [
-                                'fields' => [
-                                    'name' => [
-                                        'simple-values' => ['value3', 'value4'],
-                                    ],
-                                ],
-                            ],
-                            [
-                                'logical-case' => 'OR',
-                                'fields' => [
-                                    'name' => [
-                                        'simple-values' => ['value8', 'value10'],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-            ],
-        ];
-    }
-
-    public static function provideRootLogicalTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value', 'value2'],
-                            ],
-                        ],
-                    ]
-                ),
-            ],
-            [
-                json_encode(
-                    [
-                        'logical-case' => 'AND',
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value', 'value2'],
-                            ],
-                        ],
-                    ]
-                ),
-            ],
-            [
-                json_encode(
-                    [
-                        'logical-case' => 'OR',
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value', 'value2'],
-                            ],
-                        ],
-                    ]
-                ),
-                ValuesGroup::GROUP_LOGICAL_OR,
-            ],
-        ];
-    }
-
-    public static function provideMultipleSubGroupTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'groups' => [
-                            [
-                                'fields' => [
-                                    'name' => [
-                                        'simple-values' => ['value', 'value2'],
-                                    ],
-                                ],
-                            ],
-                            [
-                                'fields' => [
-                                    'name' => [
-                                        'simple-values' => ['value3', 'value4'],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-            ],
-        ];
-    }
-
-    public static function provideNestedGroupTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'groups' => [
-                            [
-                                'groups' => [
-                                    [
-                                        'fields' => [
-                                            'name' => [
-                                                'simple-values' => ['value', 'value2'],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-            ],
-        ];
-    }
-
-    public static function provideValueOverflowTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['value', 'value2', 'value3', 'value4'],
-                            ],
-                        ],
-                    ]
-                ),
-                'name',
-                '[fields][name][simple-values][3]',
-            ],
-            [
-                json_encode(
-                    [
-                        'groups' => [
-                            [
-                                'fields' => [
-                                    'name' => [
-                                        'simple-values' => ['value', 'value2', 'value3', 'value4'],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-                'name',
-                '[groups][0][fields][name][simple-values][3]',
-            ],
-            [
-                json_encode(
-                    [
-                        'groups' => [
-                            [
-                                'groups' => [
-                                    [
-                                        'fields' => [
-                                            'name' => [
-                                                'simple-values' => ['value', 'value2', 'value3', 'value4'],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-                'name',
-                '[groups][0][groups][0][fields][name][simple-values][3]',
-            ],
-            [
-                json_encode(
-                    [
-                        'groups' => [
-                            [
-                                'groups' => [
-                                    [
-                                        'fields' => [
-                                            'name' => [
-                                                'simple-values' => ['value', 'value2'],
-                                            ],
-                                        ],
-                                    ],
-                                    [
-                                        'fields' => [
-                                            'name' => [
-                                                'simple-values' => ['value', 'value2', 'value3', 'value4'],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-                'name',
-                '[groups][0][groups][1][fields][name][simple-values][3]',
-            ],
-        ];
-    }
-
-    public static function provideGroupsOverflowTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'groups' => [
-                            [
-                                'fields' => [
-                                    'name' => [
-                                        'simple-values' => ['value', 'value2'],
-                                    ],
-                                ],
-                            ],
-                            [
-                                'fields' => [
-                                    'name' => [
-                                        'simple-values' => ['value', 'value2'],
-                                    ],
-                                ],
-                            ],
-                            [
-                                'fields' => [
-                                    'name' => [
-                                        'simple-values' => ['value', 'value2'],
-                                    ],
-                                ],
-                            ],
-                            [
-                                'fields' => [
-                                    'name' => [
-                                        'simple-values' => ['value', 'value2'],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-                '[groups][3]',
-            ],
-            [
-                json_encode(
-                    [
-                        'groups' => [
-                            [
-                                'groups' => [
-                                    [
-                                        'groups' => [
-                                            [
-                                                'fields' => [
-                                                    'name' => [
-                                                        'simple-values' => ['value', 'value2'],
-                                                    ],
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                    [
-                                        'groups' => [
-                                            [
-                                                'fields' => [
-                                                    'name' => [
-                                                        'simple-values' => ['value', 'value2'],
-                                                    ],
-                                                ],
-                                            ],
-                                            [
-                                                'fields' => [
-                                                    'name' => [
-                                                        'simple-values' => ['value', 'value2'],
-                                                    ],
-                                                ],
-                                            ],
-                                            [
-                                                'fields' => [
-                                                    'name' => [
-                                                        'simple-values' => ['value', 'value2'],
-                                                    ],
-                                                ],
-                                            ],
-                                            [
-                                                'fields' => [
-                                                    'name' => [
-                                                        'simple-values' => ['value', 'value2'],
-                                                    ],
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-                '[groups][0][groups][1][groups][3]',
-            ],
-        ];
-    }
-
-    public static function provideNestingLevelExceededTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'groups' => [
-                            [
-                                'groups' => [
-                                    [
-                                        'fields' => [
-                                            'name' => [
-                                                'simple-values' => ['value', 'value2'],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-                '[groups][0][groups][0]',
-            ],
-        ];
-    }
-
-    public static function providePrivateFieldTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            '_id' => [
-                                'simple-values' => [1, 2],
-                            ],
-                        ],
-                    ]
-                ),
-                '_id',
-            ],
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'id' => [
-                                'simple-values' => [1, 2],
-                            ],
-                            '_id' => [
-                                'simple-values' => [1, 2],
-                            ],
-                        ],
-                    ]
-                ),
-                '_id',
-            ],
-        ];
-    }
-
-    public static function provideUnknownFieldTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'field2' => [
-                                'simple-values' => ['value', 'value2'],
-                            ],
-                        ],
-                    ]
-                ),
-            ],
-        ];
-    }
-
-    public static function provideUnsupportedValueTypeExceptionTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'no-range-field' => [
-                                'ranges' => [['lower' => 10, 'upper' => 20]],
-                            ],
-                        ],
-                    ]
-                ),
-                'no-range-field',
-                Range::class,
-            ],
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'no-range-field' => [
-                                'excluded-ranges' => [['lower' => 10, 'upper' => 20]],
-                            ],
-                        ],
-                    ]
-                ),
-                'no-range-field',
-                Range::class,
-            ],
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'no-compares-field' => [
-                                'comparisons' => [['value' => 10, 'operator' => '>']],
-                            ],
-                        ],
-                    ]
-                ),
-                'no-compares-field',
-                Compare::class,
-            ],
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'no-matchers-field' => [
-                                'pattern-matchers' => [['value' => 'foo', 'type' => 'CONTAINS']],
-                            ],
-                        ],
-                    ]
-                ),
-                'no-matchers-field',
-                PatternMatch::class,
-            ],
-        ];
-    }
-
-    /**
-     * @return array[]
-     */
-    public static function provideInvalidRangeTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'id' => [
-                                'ranges' => [
-                                    ['lower' => 30, 'upper' => 10],
-                                    ['lower' => 50, 'upper' => 60],
-                                    ['lower' => 40, 'upper' => 20],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-                ['[fields][id][ranges][0]', '[fields][id][ranges][2]'],
-            ],
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'id' => [
-                                'excluded-ranges' => [
-                                    ['lower' => 30, 'upper' => 10],
-                                    ['lower' => 50, 'upper' => 60],
-                                    ['lower' => 40, 'upper' => 20],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-                ['[fields][id][excluded-ranges][0]', '[fields][id][excluded-ranges][2]'],
-            ],
-        ];
-    }
-
-    public static function provideInvalidValueTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'id' => [
-                                'simple-values' => ['foo', '30', 'bar'],
-                                'comparisons' => [['operator' => '>', 'value' => 'life']],
-                            ],
-                        ],
-                    ]
-                ),
-                [
-                    new ConditionErrorMessage('[fields][id][simple-values][0]', 'This value is not valid.'),
-                    new ConditionErrorMessage('[fields][id][simple-values][2]', 'This value is not valid.'),
-                    new ConditionErrorMessage('[fields][id][comparisons][0][value]', 'This value is not valid.'),
-                ],
-            ],
-        ];
-    }
-
-    public static function provideInvalidWithMessageValueTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'fields' => [
-                            'name' => [
-                                'simple-values' => ['foo', '30'],
-                            ],
-                        ],
-                    ]
-                ),
-                [
-                    new ConditionErrorMessage('[fields][name][simple-values][0]', 'I explicitly refuse the accept this value.', 'I explicitly refuse the accept this value.', ['value' => 'foo']),
-                    new ConditionErrorMessage('[fields][name][simple-values][1]', 'I explicitly refuse the accept this value.', 'I explicitly refuse the accept this value.', ['value' => '30']),
-                ],
-            ],
-        ];
-    }
-
-    public static function provideNestedErrorsTests(): iterable
-    {
-        return [
-            [
-                json_encode(
-                    [
-                        'groups' => [
-                            [
-                                'groups' => [
-                                    [
-                                        'fields' => [
-                                            'date' => [
-                                                'simple-values' => ['value'],
-                                            ],
-                                        ],
-                                    ],
-                                    [
-                                        'fields' => [
-                                            'date' => [
-                                                'simple-values' => ['value', 'value2'],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ]
-                ),
-                [
-                    new ConditionErrorMessage('[groups][0][groups][0][fields][date][simple-values][0]', 'This value is not valid.'),
-                    new ConditionErrorMessage('[groups][0][groups][1][fields][date][simple-values][0]', 'This value is not valid.'),
-                    new ConditionErrorMessage('[groups][0][groups][1][fields][date][simple-values][1]', 'This value is not valid.'),
-                ],
-            ],
-        ];
-    }
-
-    protected function onNotSuccessfulTest(\Throwable $t): never
-    {
-        if ($t instanceof InvalidSearchConditionException) {
-            echo 'Error: ' . $t->getMessage() . \PHP_EOL;
-
-            foreach ($t->getErrors() as $error) {
-                echo \sprintf('- %s: %s', $error->path, $error->message);
-
-                if ($error->cause instanceof \Exception) {
-                    echo ' Cause: ' . $error->cause->getMessage();
-                }
-
-                echo \PHP_EOL;
-            }
-        }
-
-        parent::onNotSuccessfulTest($t);
-    }
-}
diff --git a/lib/Core/Tests/Input/NormStringQueryInputTest.php b/lib/Core/Tests/Input/NormStringQueryInputTest.php
deleted file mode 100644
index 1a6b2099..00000000
--- a/lib/Core/Tests/Input/NormStringQueryInputTest.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Input;
-
-use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-use Rollerworks\Component\Search\Exception\OrderStructureException;
-use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\Extension\Core\Type\DateType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\GenericFieldSetBuilder;
-use Rollerworks\Component\Search\Input\NormStringQueryInput;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\Input\StringLexer;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * Testing for the NormStringQueryInput.
- *
- * Note that NormStringQueryInput derives from StringInput
- * and most of this logic is already tested by StringQueryInputTest.
- *
- * @internal
- */
-final class NormStringQueryInputTest extends SearchIntegrationTestCase
-{
-    protected function getProcessor(): InputProcessor
-    {
-        return new NormStringQueryInput();
-    }
-
-    protected function getFieldSet(bool $build = true)
-    {
-        $fieldSet = new GenericFieldSetBuilder($this->getFactory());
-        $fieldSet->add('id', IntegerType::class);
-        $fieldSet->add('name', TextType::class);
-        $fieldSet->add('lastname', TextType::class);
-        $fieldSet->add('date', DateType::class, ['pattern' => 'MM-dd-yyyy']);
-        $fieldSet->set(
-            $this->getFactory()->createField('no-range-field', IntegerType::class)
-                ->setValueTypeSupport(Range::class, false)
-        );
-        $fieldSet->add('@id', OrderFieldType::class);
-
-        $fieldSet->set(
-            $this->getFactory()->createField('no-compares-field', IntegerType::class)->setValueTypeSupport(
-                Compare::class,
-                false
-            )
-        );
-
-        $fieldSet->set(
-            $this->getFactory()->createField('no-matchers-field', IntegerType::class)->setValueTypeSupport(
-                PatternMatch::class,
-                false
-            )
-        );
-
-        $field = $this->getFactory()->createField(
-            'geo',
-            TextType::class,
-            [
-                NormStringQueryInput::FIELD_LEXER_OPTION_NAME => static function (StringLexer $lexer): string {
-                    $result = $lexer->expects('(');
-                    $result .= $lexer->expects('/-?\d+,\h*-?\d+/A', 'Geographic points 12,24');
-                    $result .= $lexer->expects(')');
-
-                    return $result;
-                },
-            ]
-        );
-
-        $field->setValueTypeSupport(Compare::class, true);
-        $field->setValueTypeSupport(Range::class, true);
-        $field->setValueTypeSupport(PatternMatch::class, false);
-        $field->setValueComparator(new class implements ValueComparator {
-            public function isHigher($higher, $lower, array $options): bool
-            {
-                return false;
-            }
-
-            public function isLower($lower, $higher, array $options): bool
-            {
-                return true;
-            }
-
-            public function isEqual($value, $nextValue, array $options): bool
-            {
-                return false;
-            }
-        });
-
-        $fieldSet->set($field);
-
-        return $build ? $fieldSet->getFieldSet() : $fieldSet;
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideMultipleValues
-     */
-    public function it_processes_multiple_fields(string $input): void
-    {
-        $processor = new NormStringQueryInput();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $expectedGroup->addField('name', $values);
-
-        $date = new \DateTimeImmutable('2014-12-16 00:00:00 UTC');
-
-        $values = new ValuesBag();
-        $values->addSimpleValue($date);
-        $expectedGroup->addField('date', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    public static function provideMultipleValues(): iterable
-    {
-        return [
-            ['name: value, value2; date: "2014-12-16 00:00:00 UTC";'],
-            ['name: value, value2; date: "2014-12-16 00:00:00"'],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function it_processes_with_customer_value_lexer(): void
-    {
-        $processor = new NormStringQueryInput();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('(12,24)');
-        $values->add(new Compare('(12,24)', '>'));
-        $values->add(new Range('(12,24)', '(12,25)'));
-        $expectedGroup->addField('geo', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals('geo: (12,24), >(12,24), (12,24)~(12,25);', $condition, $processor, $config);
-    }
-
-    /**
-     * @test
-     */
-    public function it_errors_when_the_field_does_not_exist_in_fieldset(): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $e = new UnknownFieldException('field2');
-        $error = $e->toErrorMessageObj();
-
-        try {
-            $processor = new NormStringQueryInput();
-            $processor->process($config, 'field2: value;');
-
-            self::fail('Condition should be invalid.');
-        } catch (\Exception $e) {
-            /* @var InvalidSearchConditionException $e */
-            self::detectSystemException($e);
-            self::assertInstanceOf(InvalidSearchConditionException::class, $e);
-            self::assertEquals([$error], $e->getErrors());
-        }
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideNestedOrderClauseTests
-     */
-    public function it_errors_when_order_clause_is_nested(string $input): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-        $error = OrderStructureException::noGrouping()->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors($input, $config, [$error]);
-    }
-
-    public static function provideNestedOrderClauseTests(): iterable
-    {
-        yield ['(@id: asc;)'];
-        yield ['((@id: asc;))'];
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideInvalidOrderClauseValueTests
-     */
-    public function it_errors_when_order_clause_is_has_unsupported_values($input): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-        $error = OrderStructureException::invalidValue('@id')->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors($input, $config, [$error]);
-    }
-
-    public static function provideInvalidOrderClauseValueTests(): iterable
-    {
-        yield 'multiple values' => ['@id: desc, asc;'];
-        yield 'negated value' => ['@id: !desc;'];
-        yield 'range' => ['@id: 1 ~ 12;'];
-        yield 'negated range' => ['@id: !1 ~ 12;'];
-        yield 'comparison' => ['@id: >1;'];
-        yield 'pattern' => ['@id: ~> desc;'];
-    }
-}
diff --git a/lib/Core/Tests/Input/StringLexerTest.php b/lib/Core/Tests/Input/StringLexerTest.php
deleted file mode 100644
index 28c73cd8..00000000
--- a/lib/Core/Tests/Input/StringLexerTest.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Input;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\Exception\StringLexerException;
-use Rollerworks\Component\Search\Input\StringLexer;
-
-/**
- * @internal
- */
-final class StringLexerTest extends TestCase
-{
-    private StringLexer $lexer;
-
-    /**
-     * @before
-     */
-    public function setUpLexer(): void
-    {
-        $this->lexer = new StringLexer();
-    }
-
-    /**
-     * @test
-     */
-    public function it_skips_all_whitespace_at_the_beginning(): void
-    {
-        $this->lexer->parse("   \nhe:\n there;");
-
-        self::assertTrue($this->lexer->isGlimpse('/he:/A'));
-    }
-
-    /**
-     * @test
-     */
-    public function skips_whitespace_with_exception_of_new_lines(): void
-    {
-        $this->lexer->parse("he:\n there;");
-
-        $this->lexer->moveCursor('he:');
-        $this->lexer->skipWhitespace();
-
-        self::assertTrue($this->lexer->isGlimpse("/\n/A"));
-    }
-
-    /**
-     * @test
-     */
-    public function it_reports_the_correct_col(): void
-    {
-        $this->lexer->parse('he:');
-        $this->lexer->fieldIdentification();
-
-        $this->expectExceptionObject(StringLexerException::syntaxErrorUnexpectedEnd(3, 1, 'StringValue', 'end of string'));
-
-        $this->lexer->stringValue();
-    }
-
-    /**
-     * @test
-     */
-    public function it_reports_the_correct_col_with_multiline(): void
-    {
-        $this->lexer->parse("he:\nid:");
-        $this->lexer->fieldIdentification();
-        $this->lexer->skipEmptyLines();
-
-        $this->lexer->fieldIdentification();
-
-        $this->expectExceptionObject(StringLexerException::syntaxErrorUnexpectedEnd(4, 2, 'StringValue', 'end of string'));
-
-        $this->lexer->stringValue();
-    }
-
-    /**
-     * @test
-     */
-    public function it_reports_the_correct_col_when_start_at_newline(): void
-    {
-        $this->lexer->parse("he:\n");
-        $this->lexer->fieldIdentification();
-        $this->lexer->skipEmptyLines();
-
-        $this->expectExceptionObject(StringLexerException::syntaxErrorUnexpectedEnd(1, 2, 'StringValue', 'end of string'));
-
-        $this->lexer->stringValue();
-    }
-
-    /**
-     * @dataProvider provideInternalLexerMethods
-     *
-     * @test
-     */
-    public function it_forbids_internal_lexer_methods_in_custom_value_lexer(string $method): void
-    {
-        $customLexer = static function (StringLexer $lexer, string $expectedNext) use ($method): string {
-            $lexer->{$method}('custom');
-
-            return 'error';
-        };
-
-        $this->lexer->parse('id: 12;', ['id' => $customLexer]);
-        $this->lexer->fieldIdentification();
-
-        $this->expectExceptionObject(new BadMethodCallException(\sprintf('Cannot call "%s" inside a custom value-lexer for field "%s".', $method, 'id')));
-
-        $this->lexer->valuePart('id');
-    }
-
-    public static function provideInternalLexerMethods(): iterable
-    {
-        yield ['valuePart'];
-        yield ['rangeValue'];
-        yield ['comparisonValue'];
-        yield ['patternMatchValue'];
-        yield ['detectValueType'];
-    }
-}
diff --git a/lib/Core/Tests/Input/StringQueryInputTest.php b/lib/Core/Tests/Input/StringQueryInputTest.php
deleted file mode 100644
index acab67cd..00000000
--- a/lib/Core/Tests/Input/StringQueryInputTest.php
+++ /dev/null
@@ -1,643 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Input;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Exception\InputProcessorException;
-use Rollerworks\Component\Search\Exception\OrderStructureException;
-use Rollerworks\Component\Search\Exception\StringLexerException;
-use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\Input\StringLexer;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Rollerworks\Component\Search\Input\Validator;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-use Rollerworks\Component\Search\ValueComparator;
-
-/**
- * @internal
- */
-final class StringQueryInputTest extends InputProcessorTestCase
-{
-    protected function getProcessor(?callable $labelResolver = null): InputProcessor
-    {
-        return new StringQueryInput(null, $labelResolver);
-    }
-
-    protected function getFieldSet(bool $build = true, bool $order = false)
-    {
-        $fieldSet = parent::getFieldSet(false, $order);
-        $field = $this->getFactory()->createField(
-            'geo',
-            TextType::class,
-            [
-                StringQueryInput::FIELD_LEXER_OPTION_NAME => static function (StringLexer $lexer): string {
-                    $result = $lexer->expects('(');
-                    $result .= $lexer->expects('/-?\d+,\h*-?\d+/A', 'Geographic points 12,24');
-                    $result .= $lexer->expects(')');
-
-                    return $result;
-                },
-            ]
-        );
-
-        $field->setValueTypeSupport(Compare::class, true);
-        $field->setValueTypeSupport(Range::class, true);
-        $field->setValueTypeSupport(PatternMatch::class, false);
-        $field->setValueComparator(new class implements ValueComparator {
-            public function isHigher($higher, $lower, array $options): bool
-            {
-                return false;
-            }
-
-            public function isLower($lower, $higher, array $options): bool
-            {
-                return true;
-            }
-
-            public function isEqual($value, $nextValue, array $options): bool
-            {
-                return false;
-            }
-        });
-
-        $fieldSet->set($field);
-
-        return $build ? $fieldSet->getFieldSet() : $fieldSet;
-    }
-
-    /**
-     * @test
-     */
-    public function it_validates_values(): void
-    {
-        $validator = new class implements Validator {
-            private ?string $currentField = null;
-
-            /** @var array<string, mixed> */
-            public array $calls = [];
-
-            public function initialize(ProcessorConfig $config): void
-            {
-                $this->calls = [];
-                $this->calls['initialize'] = $config;
-            }
-
-            public function initializeContext(FieldConfig $field, ErrorList $errorList): void
-            {
-                $this->currentField = $field->getName();
-                $this->calls[$this->currentField] = [];
-            }
-
-            public function validate($value, string $type, $originalValue, string $path): bool
-            {
-                if ($value instanceof \DateTimeImmutable) {
-                    $value = '{DateTime}' . $value->format('Y-m-d');
-                }
-
-                $this->calls[$this->currentField][] = [$value, $type, $originalValue, $path];
-
-                return false;
-            }
-        };
-
-        $processor = new StringQueryInput($validator, null);
-        $config = new ProcessorConfig($this->getFieldSet(order: true));
-
-        $processor->process($config, 'name: value, value2; (date: "12-16-2014", "12-16-2014" ~ "12-16-2015"); @id: asc;');
-        self::assertSame([
-            'initialize' => $config,
-            'name' => [
-                ['value', 'simple', 'value', '[name][0]'],
-                ['value2', 'simple', 'value2', '[name][1]'],
-            ],
-            'date' => [
-                ['{DateTime}2014-12-16', 'simple', '12-16-2014', '[0][date][0]'],
-                ['{DateTime}2014-12-16', Range::class, '12-16-2014', '[0][date][1][lower]'],
-                ['{DateTime}2015-12-16', Range::class, '12-16-2015', '[0][date][1][upper]'],
-            ],
-            '@id' => [
-                ['ASC', 'simple', 'asc', '[@id]'],
-            ],
-        ], $validator->calls);
-
-        $processor->process($config, 'name: value4, value3; (date: "12-16-2014", "12-16-2014" ~ "12-16-2015"); @id: asc;');
-        self::assertSame([
-            'initialize' => $config,
-            'name' => [
-                ['value4', 'simple', 'value4', '[name][0]'],
-                ['value3', 'simple', 'value3', '[name][1]'],
-            ],
-            'date' => [
-                ['{DateTime}2014-12-16', 'simple', '12-16-2014', '[0][date][0]'],
-                ['{DateTime}2014-12-16', Range::class, '12-16-2014', '[0][date][1][lower]'],
-                ['{DateTime}2015-12-16', Range::class, '12-16-2015', '[0][date][1][upper]'],
-            ],
-            '@id' => [
-                ['ASC', 'simple', 'asc', '[@id]'],
-            ],
-        ], $validator->calls);
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideAliasedFieldsTests
-     */
-    public function it_processes_aliased_fields($input): void
-    {
-        $labelResolver = static function (FieldConfig $field) {
-            $name = $field->getName();
-
-            if ($name === 'name') {
-                return 'first-name';
-            }
-
-            return $name;
-        };
-
-        $processor = $this->getProcessor($labelResolver);
-        $config = new ProcessorConfig($this->getFieldSet());
-        $config->setDefaultField('name');
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $expectedGroup->addField('name', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-
-        $this->assertConditionEquals($input, $condition, $processor, $config);
-    }
-
-    public static function provideAliasedFieldsTests(): iterable
-    {
-        return [
-            ['first-name: value1; first-name: value, value2;'],
-            ['first-name: value, value2;'],
-            ['value, value2;'],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function it_expects_a_string_input(): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $this->expectException(UnexpectedTypeException::class);
-        $this->expectExceptionMessage((new UnexpectedTypeException([], 'string'))->getMessage());
-
-        $processor->process($config, []);
-    }
-
-    /**
-     * This is a special case as the dash is also used for ranges.
-     *
-     * @test
-     */
-    public function it_parses_field_names_with_dash(): void
-    {
-        $fieldSet = $this->getFieldSet(false)->add('field-1', TextType::class)->getFieldSet();
-
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($fieldSet);
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value2');
-        $expectedGroup->addField('field-1', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-
-        self::assertEquals($condition, $processor->process($config, 'field-1: value, value2;'));
-        self::assertEquals($condition, $processor->process($config, 'field-1: value, value2'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_parses_a_quoted_value(): void
-    {
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('value');
-        $values->addSimpleValue('value"2');
-        $values->addSimpleValue('!foo');
-        $expectedGroup->addField('name', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        self::assertEquals($condition, $processor->process($config, 'name: "value", "value""2", "!foo";'));
-    }
-
-    /**
-     * @test
-     */
-    public function pattern_match_lexer_no_end_less_loop(): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $e = StringLexerException::formatError(7, 1, 'Unknown operator flag, expected "i" and/or "!"');
-        $error = $e->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors('name: ~!!*"value";', $config, [$error]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_fails_with_unbound_values_and_no_default_field(): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $e = new InputProcessorException('', 'No default field configured. Please provide a field name.');
-        $error = $e->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors('value;', $config, [$error]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_processes_with_customer_value_lexer(): void
-    {
-        $processor = new StringQueryInput();
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        $expectedGroup = new ValuesGroup();
-
-        $values = new ValuesBag();
-        $values->addSimpleValue('(12,24)');
-        $values->add(new Compare('(12,24)', '>'));
-        $values->add(new Range('(12,24)', '(12,25)'));
-        $expectedGroup->addField('geo', $values);
-
-        $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);
-        $this->assertConditionEquals('geo: (12,24), >(12,24), (12,24)~(12,25);', $condition, $processor, $config);
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideQueryExceptionTests
-     */
-    public function it_errors_when_the_syntax_is_invalid(string $input, StringLexerException $exception): void
-    {
-        $fieldSet = $this->getFieldSet(false)->add('field1', TextType::class)->getFieldSet();
-        $config = new ProcessorConfig($fieldSet);
-
-        $error = $exception->toErrorMessageObj();
-        $this->assertConditionContainsErrors($input, $config, [$error]);
-    }
-
-    public static function provideQueryExceptionTests(): iterable
-    {
-        return [
-            [
-                'field1: value, value2, value3, value4, value5;)',
-                StringLexerException::formatError(46, 1, 'Cannot close group as this field is not in a group'),
-            ],
-            [
-                'field1: value; field1: ;',
-                StringLexerException::formatError(23, 1, 'A field must have at least one value'),
-            ],
-            [
-                'field1: value , ;',
-                StringLexerException::formatError(16, 1, 'Values must be separated by a ",". A values list must end with ";" or ")"'),
-            ],
-            [
-                '(field1: value, value2, value3, value4, value5;))',
-                StringLexerException::formatError(48, 1, 'Cannot close group as this field is not in a group'),
-            ],
-            [
-                '(field1: value, value2, value3, value4, value5;);)',
-                StringLexerException::formatError(49, 1, 'Cannot close group as this field is not in a group'),
-            ],
-            [
-                'field1: value, value2, value3, value4, value5; &',
-                StringLexerException::formatError(47, 1, 'A group logical operator can only be used at the start of the input or before a group opening'),
-            ],
-            [
-                "(field1: value, value2, value3, value4, value5; ); \n&",
-                StringLexerException::formatError(1, 2, 'A group logical operator can only be used at the start of the input or before a group opening'),
-            ],
-            [
-                'field1: value value2)',
-                StringLexerException::formatError(20, 1, 'A value containing spaces must be surrounded by quotes'),
-            ],
-            [
-                'field1: value, value2; *',
-                StringLexerException::formatError(23, 1, 'A group logical operator can only be used at the start of the input or before a group opening'),
-            ],
-            // Customer value-lexer
-            [
-                'geo: value, value2;',
-                StringLexerException::syntaxError(5, 1, ['('], 'value, val'),
-            ],
-            [
-                'geo: (value, value2);',
-                StringLexerException::syntaxError(6, 1, ['Geographic points 12,24'], 'value, val'),
-            ],
-            [
-                'geo: (12, 24) ~ (value, value2);',
-                StringLexerException::syntaxError(17, 1, ['Geographic points 12,24'], 'value, val'),
-            ],
-        ];
-    }
-
-    /**
-     * @test
-     *
-     * @see https://github.com/rollerworks/search/issues/246
-     */
-    public function it_parses_group_logical_when_group_is_provided_first_in(): void
-    {
-        $fieldSet = $this->getFactory()->createFieldSetBuilder();
-        $fieldSet->add('title', TextType::class);
-        $fieldSet->add('subtitle', TextType::class);
-        $fieldSet->add('teaser', TextType::class);
-        $fieldSet = $fieldSet->getFieldSet();
-
-        $processor = $this->getProcessor();
-        $config = new ProcessorConfig($fieldSet);
-
-        $condition = SearchConditionBuilder::create($fieldSet)
-            ->group(ValuesGroup::GROUP_LOGICAL_OR)
-                ->field('title')
-                    ->addSimpleValue('paris')
-                ->end()
-                ->field('subtitle')
-                    ->addSimpleValue('paris')
-                ->end()
-                ->field('teaser')
-                    ->addSimpleValue('paris')
-                ->end()
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        self::assertEquals($condition, $processor->process($config, '*(title:paris;subtitle:paris;teaser:paris)'));
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideNestedOrderClauseTests
-     */
-    public function it_errors_when_order_clause_is_nested(string $input): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet(true, true));
-        $error = OrderStructureException::noGrouping()->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors($input, $config, [$error]);
-    }
-
-    public static function provideNestedOrderClauseTests(): iterable
-    {
-        yield ['(@id: asc;)'];
-        yield ['((@id: asc;))'];
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideInvalidOrderClauseValueTests
-     */
-    public function it_errors_when_order_clause_is_has_unsupported_values($input): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet(true, true));
-        $error = OrderStructureException::invalidValue('@id')->toErrorMessageObj();
-
-        $this->assertConditionContainsErrors($input, $config, [$error]);
-    }
-
-    public static function provideInvalidOrderClauseValueTests(): iterable
-    {
-        yield 'multiple values' => ['@id: desc, asc;'];
-        yield 'negated value' => ['@id: !desc;'];
-        yield 'range' => ['@id: 1 ~ 12;'];
-        yield 'negated range' => ['@id: !1 ~ 12;'];
-        yield 'comparison' => ['@id: >1;'];
-        yield 'pattern' => ['@id: ~> desc;'];
-    }
-
-    public static function provideEmptyInputTests(): iterable
-    {
-        return [
-            [''],
-            [' '],
-        ];
-    }
-
-    public static function provideSingleValuePairTests(): iterable
-    {
-        return [
-            ['name: value, value2, ٤٤٤٦٥٤٦٠٠, 30, 30L, !value3; @date: uP', ['@date' => 'ASC']],
-            ['name: value, value2, ٤٤٤٦٥٤٦٠٠, 30, 30L, !value3; @date: Up', ['@date' => 'ASC']],
-            ['name: value, value2, ٤٤٤٦٥٤٦٠٠, 30, 30L, !value3;', ['@date' => 'DESC', '@id' => 'ASC']],
-            ['', ['@date' => 'DESC', '@id' => 'ASC']],
-        ];
-    }
-
-    public static function provideMultipleValues(): iterable
-    {
-        return [
-            ['name: value, value2; date: "12-16-2014";'],
-            ['name: value, value2; date: "12-16-2014"'],
-            ['value1; date: "12-16-2014"; value, value2'], // Possible, but not recommended
-        ];
-    }
-
-    public static function provideRangeValues(): iterable
-    {
-        return [
-            ['id: 1~10, 15 ~ 30, ] 100~200 ], 310~400[, !50~70; date: [12-16-2014 ~ 12-20-2014];'],
-            ['1~10, 15 ~ 30, ] 100~200 ], 310~400[, !50~70; date: [12-16-2014 ~ 12-20-2014];'],
-        ];
-    }
-
-    public static function provideComparisonValues(): iterable
-    {
-        return [
-            ['id: >1, <2, <=5, >=8, <>20; date: >="12-16-2014";'],
-            ['>1, <2, <=5, >=8, <>20; date: >="12-16-2014";'],
-        ];
-    }
-
-    public static function provideMatcherValues(): iterable
-    {
-        return [
-            ['name: ~*value, ~i>value2, ~<value3, ~!*value4, ~i!*value5, ~=value9, ~!=value10, ~i=value11, ~i!=value12;'],
-        ];
-    }
-
-    public static function provideGroupTests(): iterable
-    {
-        return [
-            ['name: value, value2; (name: value3, value4;); *(name: value8, value10;);'],
-            ['name: value, value2; (name: value3, value4); *(name: value8, value10)'],
-            ['name: value, value2; (name: value3, value4); *(name: value8, value10;)'],
-            ['value, value2; (value3, value4); *(value8, value10;)'],
-        ];
-    }
-
-    public static function provideRootLogicalTests(): iterable
-    {
-        return [
-            ['name: value, value2;'],
-            ['value, value2;'],
-            ['*name: value, value2;', ValuesGroup::GROUP_LOGICAL_OR],
-            ['*value, value2;', ValuesGroup::GROUP_LOGICAL_OR],
-        ];
-    }
-
-    public static function provideMultipleSubGroupTests(): iterable
-    {
-        return [
-            ['(name: value, value2); (name: value3, "value4");'],
-            ['(name: value, value2); (value3, "value4");'],
-        ];
-    }
-
-    public static function provideNestedGroupTests(): iterable
-    {
-        return [
-            ['((name: value, value2;););'],
-            ['((name: value, value2;);)'],
-            ['((name: value, value2;))'],
-            ['((name: value, value2))'],
-            ['((value, value2))'],
-        ];
-    }
-
-    public static function provideValueOverflowTests(): iterable
-    {
-        return [
-            ['first level' => 'name: value, value2, value3, value4, value5;', 'name', '[name][3]'],
-            ['nested level' => '((name: value, value2, value3, value4, value5));', 'name', '[0][0][name][3]'],
-            ['deeper level' => '((name: value); (name: value, value2, value3, value4, value5));', 'name', '[0][1][name][3]'],
-            ['overwriting' => 'name: value1, value22; name: value, value2, value3, value4, value5;', 'name', '[name][3]'],
-        ];
-    }
-
-    public static function provideGroupsOverflowTests(): iterable
-    {
-        return [
-            ['(name: value, value2;); (name: value, value2;); (name: value, value2;); (name: value, value2;)', '[3]'],
-            ['( ((name: value, value2)); ((name: value, value2;); (name: value, value2;); (name: value, value2;); (name: value, value2;)) )', '[0][1][3]'],
-        ];
-    }
-
-    public static function provideNestingLevelExceededTests(): iterable
-    {
-        return [
-            ['((field2: value;))', '[0][0]'],
-        ];
-    }
-
-    public static function providePrivateFieldTests(): iterable
-    {
-        return [
-            ['_id: 1;', '_id'],
-            ['id: 1; _id: 2;', '_id'],
-        ];
-    }
-
-    public static function provideUnknownFieldTests(): iterable
-    {
-        return [
-            ['field2: value;'],
-        ];
-    }
-
-    public static function provideUnsupportedValueTypeExceptionTests(): iterable
-    {
-        return [
-            ['no-range-field: 1~12;', 'no-range-field', Range::class],
-            ['no-compares-field: >12;', 'no-compares-field', Compare::class],
-            ['no-matchers-field: ~>12;', 'no-matchers-field', PatternMatch::class],
-        ];
-    }
-
-    public static function provideInvalidRangeTests(): iterable
-    {
-        return [
-            ['id: 30~10, 50~60, 40~20;', ['[id][0]', '[id][2]']],
-            ['id: !30~10, !50~60, !40~20;', ['[id][0]', '[id][2]']],
-        ];
-    }
-
-    public static function provideInvalidValueTests(): iterable
-    {
-        return [
-            [
-                'id: foo, 30, bar, >life;',
-                [
-                    new ConditionErrorMessage('[id][0]', 'This value is not valid.'),
-                    new ConditionErrorMessage('[id][2]', 'This value is not valid.'),
-                    new ConditionErrorMessage('[id][3]', 'This value is not valid.'),
-                ],
-            ],
-            [
-                'id: foo~10, 50~60, 50~bar;',
-                [
-                    new ConditionErrorMessage('[id][0][lower]', 'This value is not valid.'),
-                    new ConditionErrorMessage('[id][2][upper]', 'This value is not valid.'),
-                ],
-            ],
-        ];
-    }
-
-    public static function provideInvalidWithMessageValueTests(): iterable
-    {
-        return [
-            [
-                'name: foo, 30;',
-                [
-                    new ConditionErrorMessage('[name][0]', 'I explicitly refuse the accept this value.', 'I explicitly refuse the accept this value.', ['value' => 'foo']),
-                    new ConditionErrorMessage('[name][1]', 'I explicitly refuse the accept this value.', 'I explicitly refuse the accept this value.', ['value' => '30']),
-                ],
-            ],
-        ];
-    }
-
-    public static function provideNestedErrorsTests(): iterable
-    {
-        return [
-            ['date: 1;', [new ConditionErrorMessage('[date][0]', 'This value is not valid.')]],
-            ['(date: 1;)', [new ConditionErrorMessage('[0][date][0]', 'This value is not valid.')]],
-            ['((((((date: 1;))))))', [new ConditionErrorMessage('[0][0][0][0][0][0][date][0]', 'This value is not valid.')]],
-        ];
-    }
-}
diff --git a/lib/Core/Tests/LazyFieldSetRegistryTest.php b/lib/Core/Tests/LazyFieldSetRegistryTest.php
deleted file mode 100644
index efa95128..00000000
--- a/lib/Core/Tests/LazyFieldSetRegistryTest.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\FieldSetConfigurator;
-use Rollerworks\Component\Search\LazyFieldSetRegistry;
-
-/**
- * @internal
- */
-final class LazyFieldSetRegistryTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_loads_configurator_lazily(): void
-    {
-        $configurator = $this->createMock(FieldSetConfigurator::class);
-        $configurator2 = $this->createMock(FieldSetConfigurator::class);
-
-        $registry = LazyFieldSetRegistry::create([
-            'set' => static fn (): FieldSetConfigurator => $configurator,
-            'set2' => static fn (): FieldSetConfigurator => $configurator2,
-        ]);
-
-        self::assertTrue($registry->hasConfigurator('set'));
-        self::assertTrue($registry->hasConfigurator('set2'));
-
-        self::assertSame($configurator, $registry->getConfigurator('set'));
-        self::assertSame($configurator2, $registry->getConfigurator('set2'));
-
-        // Ensure they still work, after initializing.
-        self::assertFalse($registry->hasConfigurator('set3'));
-        self::assertTrue($registry->hasConfigurator('set'));
-
-        self::assertSame($configurator, $registry->getConfigurator('set'));
-        self::assertSame($configurator2, $registry->getConfigurator('set2'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_loads_configurator_by_fqcn(): void
-    {
-        $configurator = $this->createMock(FieldSetConfigurator::class);
-        $configurator2 = $this->createMock(FieldSetConfigurator::class);
-
-        $registry = LazyFieldSetRegistry::create([
-            'set' => static fn (): FieldSetConfigurator => $configurator,
-        ]);
-
-        $name = $configurator2::class;
-
-        self::assertTrue($registry->hasConfigurator('set'));
-        self::assertTrue($registry->hasConfigurator($name));
-        self::assertFalse($registry->hasConfigurator('set2'));
-
-        self::assertSame($configurator, $registry->getConfigurator('set'));
-        self::assertSame($name, $registry->getConfigurator($name)::class);
-    }
-
-    /**
-     * @test
-     */
-    public function it_checks_registered_before_class_name(): void
-    {
-        $configurator = $this->createMock(FieldSetConfigurator::class);
-        $configurator2 = $this->createMock(FieldSetConfigurator::class);
-        $name = $configurator2::class;
-
-        $registry = LazyFieldSetRegistry::create([
-            'set' => static fn (): FieldSetConfigurator => $configurator,
-            $name => static fn (): FieldSetConfigurator => $configurator2,
-        ]);
-
-        $name = $configurator2::class;
-
-        self::assertTrue($registry->hasConfigurator('set'));
-        self::assertTrue($registry->hasConfigurator($name));
-        self::assertFalse($registry->hasConfigurator('set2'));
-
-        self::assertSame($configurator, $registry->getConfigurator('set'));
-        self::assertSame($configurator2, $registry->getConfigurator($name));
-    }
-
-    /**
-     * @test
-     */
-    public function it_errors_when_configurator_is_not_registered_and_class_is_a_configurator(): void
-    {
-        $configurator = $this->createMock(FieldSetConfigurator::class);
-        $configurator2 = \stdClass::class;
-
-        $registry = LazyFieldSetRegistry::create([
-            'set' => static fn (): FieldSetConfigurator => $configurator,
-        ]);
-
-        self::assertTrue($registry->hasConfigurator('set'));
-        self::assertFalse($registry->hasConfigurator('set2'));
-        self::assertFalse($registry->hasConfigurator($configurator2));
-
-        self::assertSame($configurator, $registry->getConfigurator('set'));
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Configurator class "stdClass" is expected to be an instance of ');
-
-        $registry->getConfigurator($configurator2);
-    }
-
-    /**
-     * @test
-     */
-    public function it_errors_when_configurator_is_not_registered_class_does_not_exist(): void
-    {
-        $configurator = $this->createMock(FieldSetConfigurator::class);
-        $configurator2 = 'f4394832948_foobar_cow';
-
-        $registry = LazyFieldSetRegistry::create([
-            'set' => static fn (): FieldSetConfigurator => $configurator,
-        ]);
-
-        self::assertTrue($registry->hasConfigurator('set'));
-        self::assertFalse($registry->hasConfigurator('set2'));
-        self::assertFalse($registry->hasConfigurator($configurator2));
-
-        self::assertSame($configurator, $registry->getConfigurator('set'));
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Could not load FieldSet configurator "f4394832948_foobar_cow"');
-
-        $registry->getConfigurator($configurator2);
-    }
-}
diff --git a/lib/Core/Tests/Loader/ConditionExporterLoaderTest.php b/lib/Core/Tests/Loader/ConditionExporterLoaderTest.php
deleted file mode 100644
index f60270e2..00000000
--- a/lib/Core/Tests/Loader/ConditionExporterLoaderTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Loader;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Exporter;
-use Rollerworks\Component\Search\Loader\ConditionExporterLoader;
-
-/**
- * @internal
- */
-final class ConditionExporterLoaderTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_lazily_loads_a_condition_exporter(): void
-    {
-        $loader = ConditionExporterLoader::create();
-        $processor = $loader->get('json');
-
-        self::assertSame($processor, $loader->get('json'));
-    }
-
-    /**
-     * @dataProvider provideProcessors
-     *
-     * @test
-     */
-    public function it_can_load_bundled_processor(string $alias, string $className): void
-    {
-        $loader = ConditionExporterLoader::create();
-
-        self::assertInstanceOf($className, $loader->get($alias));
-    }
-
-    public static function provideProcessors(): iterable
-    {
-        return [
-            ['json', Exporter\JsonExporter::class],
-            ['string_query', Exporter\StringQueryExporter::class],
-            ['norm_string_query', Exporter\NormStringQueryExporter::class],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function it_fails_for_unsupported_processor(): void
-    {
-        $loader = ConditionExporterLoader::create();
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Enable to load exporter, format "form" has no registered exporter.');
-
-        $loader->get('form');
-    }
-}
diff --git a/lib/Core/Tests/Loader/InputProcessorLoaderTest.php b/lib/Core/Tests/Loader/InputProcessorLoaderTest.php
deleted file mode 100644
index c3a3db01..00000000
--- a/lib/Core/Tests/Loader/InputProcessorLoaderTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Loader;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Input;
-use Rollerworks\Component\Search\Loader\InputProcessorLoader;
-
-/**
- * @internal
- */
-final class InputProcessorLoaderTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_lazily_loads_an_input_processor(): void
-    {
-        $loader = InputProcessorLoader::create();
-        $processor = $loader->get('json');
-
-        self::assertSame($processor, $loader->get('json'));
-    }
-
-    /**
-     * @dataProvider provideProcessors
-     *
-     * @test
-     */
-    public function it_can_load_bundled_processor(string $alias, string $className): void
-    {
-        $loader = InputProcessorLoader::create();
-
-        self::assertInstanceOf($className, $loader->get($alias));
-    }
-
-    public static function provideProcessors(): iterable
-    {
-        return [
-            ['json', Input\JsonInput::class],
-            ['string_query', Input\StringQueryInput::class],
-            ['norm_string_query', Input\NormStringQueryInput::class],
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function it_fails_for_unsupported_processor(): void
-    {
-        $loader = InputProcessorLoader::create();
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Enable to load input-processor, "form" is not registered as processor.');
-
-        $loader->get('form');
-    }
-}
diff --git a/lib/Core/Tests/Mock/EmptyInputProcessorStub.php b/lib/Core/Tests/Mock/EmptyInputProcessorStub.php
deleted file mode 100644
index af8c7210..00000000
--- a/lib/Core/Tests/Mock/EmptyInputProcessorStub.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Mock;
-
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class EmptyInputProcessorStub implements InputProcessor
-{
-    public function process(ProcessorConfig $config, $input): SearchCondition
-    {
-        $valuesGroup = new ValuesGroup();
-
-        return new SearchCondition(new FieldSetStub(), $valuesGroup);
-    }
-}
diff --git a/lib/Core/Tests/Mock/FieldSetStub.php b/lib/Core/Tests/Mock/FieldSetStub.php
deleted file mode 100644
index 778ec5d9..00000000
--- a/lib/Core/Tests/Mock/FieldSetStub.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Mock;
-
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\FieldSet;
-
-/**
- * @internal
- */
-final class FieldSetStub implements FieldSet
-{
-    public function getSetName(): string
-    {
-        return 'stub';
-    }
-
-    public function get(string $name): FieldConfig
-    {
-        throw new \BadMethodCallException('Cannot be called');
-    }
-
-    public function all(): array
-    {
-        return [];
-    }
-
-    public function has(string $name): bool
-    {
-        return false;
-    }
-
-    public function isOrder(string $name): bool
-    {
-        return OrderField::isOrder($name);
-    }
-
-    public function isPrivate(string $name): bool
-    {
-        return $name[0] === '_';
-    }
-}
diff --git a/lib/Core/Tests/Mock/SpyingInputProcessor.php b/lib/Core/Tests/Mock/SpyingInputProcessor.php
deleted file mode 100644
index 19c90e6c..00000000
--- a/lib/Core/Tests/Mock/SpyingInputProcessor.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Mock;
-
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class SpyingInputProcessor implements InputProcessor
-{
-    private ?ProcessorConfig $config = null;
-    private mixed $input = null;
-
-    public static function getCondition(): SearchCondition
-    {
-        $valuesGroup = new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR);
-        $valuesGroup->addField('id', (new ValuesBag())->addSimpleValue('1'));
-
-        return new SearchCondition(new FieldSetStub(), $valuesGroup);
-    }
-
-    public function process(ProcessorConfig $config, mixed $input): SearchCondition
-    {
-        $this->config = $config;
-        $this->input = $input;
-
-        return self::getCondition();
-    }
-
-    public function getConfig(): ?ProcessorConfig
-    {
-        return $this->config;
-    }
-
-    public function getInput(): mixed
-    {
-        return $this->input;
-    }
-}
diff --git a/lib/Core/Tests/Mock/StubInputProcessor.php b/lib/Core/Tests/Mock/StubInputProcessor.php
deleted file mode 100644
index fd48d3a3..00000000
--- a/lib/Core/Tests/Mock/StubInputProcessor.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Mock;
-
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\InputProcessor;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class StubInputProcessor implements InputProcessor
-{
-    public function process(ProcessorConfig $config, $input): SearchCondition
-    {
-        $valuesGroup = new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR);
-        $valuesGroup->addField('id', (new ValuesBag())->addSimpleValue('2'));
-
-        return new SearchCondition(new FieldSetStub(), $valuesGroup);
-    }
-}
diff --git a/lib/Core/Tests/SearchConditionBuilderTest.php b/lib/Core/Tests/SearchConditionBuilderTest.php
deleted file mode 100644
index e21d4d33..00000000
--- a/lib/Core/Tests/SearchConditionBuilderTest.php
+++ /dev/null
@@ -1,644 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\Searches;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\SearchPrimaryCondition;
-use Rollerworks\Component\Search\Tests\Mock\FieldSetStub;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class SearchConditionBuilderTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_produces_an_empty_condition(): void
-    {
-        $fieldSet = new FieldSetStub();
-
-        $builder = SearchConditionBuilder::create($fieldSet);
-        self::assertEquals(new SearchCondition($fieldSet, new ValuesGroup()), $builder->getSearchCondition());
-
-        $builder = SearchConditionBuilder::create($fieldSet, ValuesGroup::GROUP_LOGICAL_OR);
-        self::assertEquals(new SearchCondition($fieldSet, new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR)), $builder->getSearchCondition());
-    }
-
-    /**
-     * @test
-     */
-    public function it_disallows_serialization(): void
-    {
-        $fieldSet = new FieldSetStub();
-        $builder = SearchConditionBuilder::create($fieldSet);
-
-        $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('Unable serialize a SearchConditionBuilder. Call getSearchCondition() and serialize the SearchCondition itself.');
-
-        serialize($builder);
-    }
-
-    /**
-     * @test
-     */
-    public function it_sorting_at_nested_levels(): void
-    {
-        $searchFactory = Searches::createSearchFactory();
-
-        $fieldSetBuilder = $searchFactory->createFieldSetBuilder();
-        $fieldSetBuilder
-            ->add('id', IntegerType::class)
-            ->add('@id', OrderFieldType::class)
-        ;
-        $fieldSet = $fieldSetBuilder->getFieldSet('users');
-        $condBuilder = SearchConditionBuilder::create($fieldSet);
-
-        $this->expectException(\BadMethodCallException::class);
-        $this->expectExceptionMessage('Cannot add ordering at nested levels.');
-
-        $condBuilder->group()
-            ->order('@id')
-        ;
-    }
-
-    /**
-     * @test
-     *
-     * @dataProvider provideBuilderExpectations
-     */
-    public function it_produces_a_condition_with_expected_structure(callable $conditionProvider, callable $builder): void
-    {
-        $searchFactory = Searches::createSearchFactory();
-
-        $fieldSetBuilder = $searchFactory->createFieldSetBuilder();
-        $fieldSetBuilder
-            ->add('id', IntegerType::class)
-            ->add('fist-name', TextType::class)
-            ->add('last-name', TextType::class)
-
-            ->add('_user', IntegerType::class)
-            ->add('@id', OrderFieldType::class)
-            ->add('@date', OrderFieldType::class)
-        ;
-        $fieldSet = $fieldSetBuilder->getFieldSet('users');
-        $condBuilder = SearchConditionBuilder::create($fieldSet);
-
-        $builder($condBuilder);
-
-        self::assertEquals($conditionProvider($fieldSet), $condBuilder->getSearchCondition());
-    }
-
-    public static function provideBuilderExpectations(): iterable
-    {
-        yield 'root (AND)' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                ;
-
-                $root = new ValuesGroup();
-                $root->addField('id', $idValues);
-
-                return new SearchCondition($fieldSet, $root);
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->field('id')
-                        ->addSimpleValue(10)
-                        ->addSimpleValue(30)
-                    ->end()
-                ;
-            },
-        ];
-
-        yield 'root (OR)' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                ;
-
-                $root = new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR);
-                $root->addField('id', $idValues);
-
-                return new SearchCondition($fieldSet, $root);
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->setGroupLogical(ValuesGroup::GROUP_LOGICAL_OR)
-                    ->field('id')
-                        ->addSimpleValue(10)
-                        ->addSimpleValue(30)
-                    ->end()
-                ;
-            },
-        ];
-
-        yield 'nested group (AND)' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                ;
-
-                $root = new ValuesGroup();
-                $root->addGroup(
-                    (new ValuesGroup())
-                        ->addField('id', $idValues)
-                );
-
-                return new SearchCondition($fieldSet, $root);
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->group()
-                        ->field('id')
-                            ->addSimpleValue(10)
-                            ->addSimpleValue(30)
-                        ->end()
-                    ->end()
-                ;
-            },
-        ];
-
-        yield 'nested group (OR)' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                ;
-
-                $root = new ValuesGroup();
-                $root->addGroup(
-                    (new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR))
-                        ->addField('id', $idValues)
-                );
-
-                return new SearchCondition($fieldSet, $root);
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->group(ValuesGroup::GROUP_LOGICAL_OR)
-                        ->field('id')
-                            ->addSimpleValue(10)
-                            ->addSimpleValue(30)
-                        ->end()
-                    ->end()
-                ;
-            },
-        ];
-
-        yield 'expend field' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                    ->addSimpleValue(20)
-                    ->addSimpleValue(50)
-                ;
-
-                $root = new ValuesGroup();
-                $root->addField('id', $idValues);
-
-                return new SearchCondition($fieldSet, $root);
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->field('id')
-                        ->addSimpleValue(10)
-                        ->addSimpleValue(30)
-                    ->end()
-                    ->field('id')
-                        ->addSimpleValue(20)
-                        ->addSimpleValue(50)
-                    ->end()
-                ;
-            },
-        ];
-
-        yield 'overwrite field' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(20)
-                    ->addSimpleValue(50)
-                ;
-
-                $root = new ValuesGroup();
-                $root->addField('id', $idValues);
-
-                return new SearchCondition($fieldSet, $root);
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->field('id')
-                        ->addSimpleValue(10)
-                        ->addSimpleValue(30)
-                    ->end()
-                    ->overwriteField('id')
-                        ->addSimpleValue(20)
-                        ->addSimpleValue(50)
-                    ->end()
-                ;
-            },
-        ];
-
-        yield 'result order' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                ;
-
-                $root = new ValuesGroup();
-                $root->addField('id', $idValues);
-
-                $sortGroup = new ValuesGroup();
-                $sortGroup->addField('@id', (new ValuesBag())->addSimpleValue('DESC'));
-                $sortGroup->addField('@date', (new ValuesBag())->addSimpleValue('ASC'));
-
-                $condition = new SearchCondition($fieldSet, $root);
-                $condition->setOrder(new SearchOrder($sortGroup));
-
-                return $condition;
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->field('id')
-                        ->addSimpleValue(10)
-                        ->addSimpleValue(30)
-                    ->end()
-                    ->order('@id', 'DESC')
-                    ->order('@date')
-                ;
-            },
-        ];
-
-        yield 'reset previous orders' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                ;
-
-                $root = new ValuesGroup();
-                $root->addField('id', $idValues);
-
-                $sortGroup = new ValuesGroup();
-                $sortGroup->addField('@date', (new ValuesBag())->addSimpleValue('ASC'));
-
-                $condition = new SearchCondition($fieldSet, $root);
-                $condition->setOrder(new SearchOrder($sortGroup));
-
-                return $condition;
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->field('id')
-                        ->addSimpleValue(10)
-                        ->addSimpleValue(30)
-                    ->end()
-                    ->order('@id', 'DESC')
-                    ->clearOrder()
-                    ->order('@date')
-                ;
-            },
-        ];
-
-        yield 'only primary-condition' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $idValuesPrimary = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                ;
-
-                $rootPrimary = new ValuesGroup();
-                $rootPrimary->addField('id', $idValuesPrimary);
-
-                $searchCondition = new SearchCondition($fieldSet, new ValuesGroup());
-                $searchCondition->setPrimaryCondition(new SearchPrimaryCondition($rootPrimary));
-
-                return $searchCondition;
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->primaryCondition()
-                        ->field('id')
-                            ->addSimpleValue(10)
-                            ->addSimpleValue(30)
-                        ->end()
-                    ->end()
-                ;
-            },
-        ];
-
-        yield 'with primary-condition' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $primaryIdValues = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                ;
-                $primaryRoot = new ValuesGroup();
-                $primaryRoot->addField('id', $primaryIdValues);
-
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(20)
-                    ->addSimpleValue(50)
-                ;
-                $root = new ValuesGroup();
-                $root->addField('id', $idValues);
-
-                $searchCondition = new SearchCondition($fieldSet, $root);
-                $searchCondition->setPrimaryCondition(new SearchPrimaryCondition($primaryRoot));
-
-                return $searchCondition;
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->primaryCondition()
-                        ->field('id')
-                            ->addSimpleValue(10)
-                            ->addSimpleValue(30)
-                        ->end()
-                    ->end()
-                    ->field('id')
-                        ->addSimpleValue(20)
-                        ->addSimpleValue(50)
-                    ->end()
-                ;
-            },
-        ];
-
-        yield 'with primary-condition (sorting)' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $primaryIdValues = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                ;
-                $primaryRoot = new ValuesGroup();
-                $primaryRoot->addField('id', $primaryIdValues);
-
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(20)
-                    ->addSimpleValue(50)
-                ;
-                $root = new ValuesGroup();
-                $root->addField('id', $idValues);
-
-                $primaryCondition = new SearchPrimaryCondition($primaryRoot);
-                $primaryCondition->setOrder(
-                    new SearchOrder((new ValuesGroup())
-                        ->addField('@id', (new ValuesBag())
-                            ->addSimpleValue('DESC')))
-                );
-
-                $searchCondition = new SearchCondition($fieldSet, $root);
-                $searchCondition->setPrimaryCondition($primaryCondition);
-
-                return $searchCondition;
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->primaryCondition()
-                        ->order('@id', 'DESC')
-                        ->field('id')
-                            ->addSimpleValue(10)
-                            ->addSimpleValue(30)
-                        ->end()
-                    ->end()
-                    ->field('id')
-                        ->addSimpleValue(20)
-                        ->addSimpleValue(50)
-                    ->end()
-                ;
-            },
-        ];
-
-        yield 'with primary-condition (private field)' => [
-            static function (FieldSet $fieldSet): SearchCondition {
-                $primaryIdValues = (new ValuesBag())
-                    ->addSimpleValue(10)
-                    ->addSimpleValue(30)
-                ;
-                $primaryRoot = new ValuesGroup();
-                $primaryRoot->addField('_user', $primaryIdValues);
-
-                $idValues = (new ValuesBag())
-                    ->addSimpleValue(20)
-                    ->addSimpleValue(50)
-                ;
-                $root = new ValuesGroup();
-                $root->addField('id', $idValues);
-
-                $searchCondition = new SearchCondition($fieldSet, $root);
-                $searchCondition->setPrimaryCondition(new SearchPrimaryCondition($primaryRoot));
-
-                return $searchCondition;
-            },
-            static function (SearchConditionBuilder $builder): void {
-                $builder
-                    ->primaryCondition()
-                        ->field('_user')
-                            ->addSimpleValue(10)
-                            ->addSimpleValue(30)
-                        ->end()
-                    ->end()
-                    ->field('id')
-                        ->addSimpleValue(20)
-                        ->addSimpleValue(50)
-                    ->end()
-                ;
-            },
-        ];
-    }
-
-    /**
-     * @test
-     */
-    public function finalizes_ordering_fields_without_existing(): void
-    {
-        $searchFactory = Searches::createSearchFactory();
-
-        $fieldSetBuilder = $searchFactory->createFieldSetBuilder();
-        $fieldSetBuilder
-            ->add('id', IntegerType::class)
-            ->add('@id', OrderFieldType::class)
-            ->add('@name', OrderFieldType::class, ['default' => 'ASC'])
-        ;
-
-        $fieldSet = $fieldSetBuilder->getFieldSet('users');
-        $condBuilder = SearchConditionBuilder::create($fieldSet)
-            ->field('id')
-                ->addSimpleValue(10)
-                ->addSimpleValue(30)
-            ->end()
-        ;
-
-        $expected = new SearchCondition($fieldSet, (new ValuesGroup())->addField('id', (new ValuesBag())->addSimpleValue(10)->addSimpleValue(30)));
-        $expected->setOrder(new SearchOrder(['@name' => 'ASC']));
-
-        self::assertEquals($expected, $condBuilder->getSearchCondition());
-    }
-
-    /**
-     * @test
-     */
-    public function finalizes_ordering_fields_with_existing(): void
-    {
-        $searchFactory = Searches::createSearchFactory();
-
-        $fieldSetBuilder = $searchFactory->createFieldSetBuilder();
-        $fieldSetBuilder
-            ->add('id', IntegerType::class)
-            ->add('@id', OrderFieldType::class)
-            ->add('@name', OrderFieldType::class, ['default' => 'ASC'])
-        ;
-
-        $fieldSet = $fieldSetBuilder->getFieldSet('users');
-        $condBuilder = SearchConditionBuilder::create($fieldSet)
-            ->field('id')
-                ->addSimpleValue(10)
-                ->addSimpleValue(30)
-            ->end()
-            ->order('@id', 'DESC')
-        ;
-
-        $expected = new SearchCondition($fieldSet, (new ValuesGroup())->addField('id', (new ValuesBag())->addSimpleValue(10)->addSimpleValue(30)));
-        $expected->setOrder(new SearchOrder(['@id' => 'DESC']));
-
-        self::assertEquals($expected, $condBuilder->getSearchCondition());
-    }
-
-    /**
-     * @test
-     */
-    public function finalize_appended_fields_without_existing(): void
-    {
-        $fieldSetBuilder = Searches::createSearchFactory()->createFieldSetBuilder();
-        $fieldSetBuilder
-            ->add('id', IntegerType::class)
-            ->add('@id', OrderFieldType::class)
-            ->add('@name', OrderFieldType::class, ['always' => 'append', 'default' => 'ASC'])
-        ;
-
-        $fieldSet = $fieldSetBuilder->getFieldSet('users');
-        $condBuilder = SearchConditionBuilder::create($fieldSet)
-            ->field('id')
-                ->addSimpleValue(10)
-                ->addSimpleValue(30)
-            ->end()
-        ;
-
-        $expected = new SearchCondition($fieldSet, (new ValuesGroup())->addField('id', (new ValuesBag())->addSimpleValue(10)->addSimpleValue(30)));
-        $expected->setOrder(new SearchOrder([], append: ['@name' => 'ASC']));
-
-        self::assertEquals($expected, $condBuilder->getSearchCondition());
-    }
-
-    /**
-     * @test
-     */
-    public function finalize_appended_fields_without_existing_default_set(): void
-    {
-        $fieldSetBuilder = Searches::createSearchFactory()->createFieldSetBuilder();
-        $fieldSetBuilder
-            ->add('id', IntegerType::class)
-            ->add('@id', OrderFieldType::class, ['default' => 'desc'])
-            ->add('@name', OrderFieldType::class, ['always' => 'append', 'default' => 'ASC'])
-        ;
-
-        $fieldSet = $fieldSetBuilder->getFieldSet('users');
-        $condBuilder = SearchConditionBuilder::create($fieldSet)
-            ->field('id')
-                ->addSimpleValue(10)
-                ->addSimpleValue(30)
-            ->end()
-        ;
-
-        $expected = new SearchCondition($fieldSet, (new ValuesGroup())->addField('id', (new ValuesBag())->addSimpleValue(10)->addSimpleValue(30)));
-        $expected->setOrder(new SearchOrder(['@id' => 'desc'], append: ['@name' => 'ASC']));
-
-        self::assertEquals($expected, $condBuilder->getSearchCondition());
-    }
-
-    /**
-     * @test
-     */
-    public function finalize_prepend_fields_merge(): void
-    {
-        $searchFactory = Searches::createSearchFactory();
-
-        $fieldSetBuilder = $searchFactory->createFieldSetBuilder();
-        $fieldSetBuilder
-            ->add('id', IntegerType::class)
-            ->add('@id', OrderFieldType::class)
-            ->add('@name', OrderFieldType::class, ['always' => 'prepend', 'default' => 'ASC'])
-        ;
-
-        $fieldSet = $fieldSetBuilder->getFieldSet('users');
-        $condBuilder = SearchConditionBuilder::create($fieldSet)
-            ->field('id')
-                ->addSimpleValue(10)
-                ->addSimpleValue(30)
-            ->end()
-            ->order('@id', 'DESC')
-        ;
-
-        $expected = new SearchCondition($fieldSet, (new ValuesGroup())->addField('id', (new ValuesBag())->addSimpleValue(10)->addSimpleValue(30)));
-        $expected->setOrder(new SearchOrder(['@id' => 'DESC'], prepend: ['@name' => 'ASC']));
-
-        self::assertEquals($expected, $condBuilder->getSearchCondition());
-    }
-
-    /**
-     * @test
-     */
-    public function finalize_prepend_and_appended_fields_merge(): void
-    {
-        $searchFactory = Searches::createSearchFactory();
-
-        $fieldSetBuilder = $searchFactory->createFieldSetBuilder();
-        $fieldSetBuilder
-            ->add('id', IntegerType::class)
-            ->add('@id', OrderFieldType::class)
-            ->add('@name', OrderFieldType::class, ['always' => 'append', 'default' => 'ASC'])
-            ->add('@group', OrderFieldType::class, ['always' => 'prepend', 'default' => 'DESC'])
-        ;
-
-        $fieldSet = $fieldSetBuilder->getFieldSet('users');
-        $condBuilder = SearchConditionBuilder::create($fieldSet)
-            ->field('id')
-                ->addSimpleValue(10)
-                ->addSimpleValue(30)
-            ->end()
-            ->order('@id', 'DESC')
-        ;
-
-        $expected = new SearchCondition($fieldSet, (new ValuesGroup())->addField('id', (new ValuesBag())->addSimpleValue(10)->addSimpleValue(30)));
-        $expected->setOrder(new SearchOrder(['@id' => 'DESC'], prepend: ['@group' => 'desc'], append: ['@name' => 'ASC']));
-
-        self::assertEquals($expected, $condBuilder->getSearchCondition());
-    }
-}
diff --git a/lib/Core/Tests/SearchConditionSerializerTest.php b/lib/Core/Tests/SearchConditionSerializerTest.php
deleted file mode 100644
index e719f7ba..00000000
--- a/lib/Core/Tests/SearchConditionSerializerTest.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\GenericFieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchConditionSerializer;
-use Rollerworks\Component\Search\SearchFactory;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class SearchConditionSerializerTest extends TestCase
-{
-    private SearchConditionSerializer $serializer;
-    private GenericFieldSet $fieldSet;
-
-    protected function setUp(): void
-    {
-        $field = $this->createMock(FieldConfig::class);
-        $field->method('getName')->willReturn('id');
-
-        $this->fieldSet = new GenericFieldSet(['id' => $field], 'foobar');
-
-        $factory = $this->createMock(SearchFactory::class);
-        $factory
-            ->method('createFieldSet')
-            ->with('foobar')
-            ->willReturn($this->fieldSet)
-        ;
-
-        $this->serializer = new SearchConditionSerializer($factory);
-    }
-
-    /**
-     * @test
-     */
-    public function serialize_un_serialize(): void
-    {
-        $date = new \DateTimeImmutable();
-
-        $fieldId = new ValuesBag();
-        $fieldId->addSimpleValue(10);
-        $fieldId->addSimpleValue($date);
-
-        $valuesGroup0 = new ValuesGroup();
-        $valuesGroup0->addField('id', $fieldId);
-
-        $fieldName = new ValuesBag();
-        $fieldName->addSimpleValue(10);
-        $fieldName->addSimpleValue($date);
-
-        $valuesGroup1 = new ValuesGroup();
-
-        $valuesGroup1->addField('name', $fieldName);
-        $valuesGroup0->addGroup($valuesGroup1);
-
-        $searchCondition = new SearchCondition($this->fieldSet, $valuesGroup0);
-
-        $serialized = serialize($this->serializer->serialize($searchCondition));
-        $unSerialized = $this->serializer->unserialize(unserialize($serialized));
-
-        self::assertEquals($searchCondition, $unSerialized);
-    }
-
-    /**
-     * @test
-     */
-    public function un_serialize_missing_fields(): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage(
-            'Serialized search condition must be exactly two values ["FieldSet-name", "serialized ValuesGroup"].'
-        );
-
-        $this->serializer->unserialize(['foobar']);
-    }
-
-    /**
-     * @test
-     */
-    public function un_serialize_wrong_field(): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage(
-            'Serialized search condition must be exactly two values ["FieldSet-name", "serialized ValuesGroup"].'
-        );
-
-        $this->serializer->unserialize(['foobar', 'foo' => 'bar']);
-    }
-
-    /**
-     * @test
-     */
-    public function un_serialize_invalid_data(): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Unable to unserialize invalid value.');
-
-        $this->serializer->unserialize(['foobar', '{i-am-invalid}']);
-    }
-}
diff --git a/lib/Core/Tests/SearchConditionTest.php b/lib/Core/Tests/SearchConditionTest.php
deleted file mode 100644
index 64b6f0d9..00000000
--- a/lib/Core/Tests/SearchConditionTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\UnsupportedFieldSetException;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\SearchPrimaryCondition;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class SearchConditionTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_can_check_if_field_set_is_supported(): void
-    {
-        $fieldSet = $this->createMock(FieldSet::class);
-        $fieldSet->expects(self::any())->method('getSetName')->willReturn('test');
-
-        $condition = new SearchCondition($fieldSet, new ValuesGroup());
-        $condition->assertFieldSetName('test');
-        $condition->assertFieldSetName('test', 'foo');
-
-        // Dummy tests, no error means it works.
-        self::assertEquals(new ValuesGroup(), $condition->getValuesGroup());
-    }
-
-    /**
-     * @test
-     */
-    public function it_gives_an_exception_when_checked_field_set_is_not_supported(): void
-    {
-        $fieldSet = $this->createMock(FieldSet::class);
-        $fieldSet->expects(self::any())->method('getSetName')->willReturn('test');
-
-        $condition = new SearchCondition($fieldSet, new ValuesGroup());
-
-        $this->expectException(UnsupportedFieldSetException::class);
-        $this->expectExceptionMessage((new UnsupportedFieldSetException(['bar', 'foo'], 'test'))->getMessage());
-
-        $condition->assertFieldSetName('bar', 'foo');
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_setting_a_primary_condition(): void
-    {
-        $fieldSet = $this->createMock(FieldSet::class);
-        $fieldSet->expects(self::any())->method('getSetName')->willReturn('test');
-
-        $primaryCondition = new SearchPrimaryCondition((new ValuesGroup())->addField('id', new ValuesBag()));
-
-        $condition = new SearchCondition($fieldSet, new ValuesGroup());
-        $condition->setPrimaryCondition($primaryCondition);
-
-        self::assertEquals($primaryCondition, $condition->getPrimaryCondition());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_unsetting_the_primary_condition(): void
-    {
-        $fieldSet = $this->createMock(FieldSet::class);
-        $fieldSet->expects(self::any())->method('getSetName')->willReturn('test');
-
-        $primaryCondition = new SearchPrimaryCondition((new ValuesGroup())->addField('id', new ValuesBag()));
-
-        $condition = new SearchCondition($fieldSet, new ValuesGroup());
-        $condition->setPrimaryCondition($primaryCondition);
-        $condition->setPrimaryCondition(null);
-
-        self::assertNull($condition->getPrimaryCondition());
-    }
-
-    /**
-     * @test
-     */
-    public function it_gives_whether_condition_is_empty(): void
-    {
-        $fieldSet = $this->createMock(FieldSet::class);
-        $fieldSet->expects(self::any())->method('getSetName')->willReturn('test');
-
-        // Empty condition
-        self::assertTrue((new SearchCondition($fieldSet, new ValuesGroup()))->isEmpty());
-
-        // With primary condition (not part of the cached condition)
-        self::assertTrue(
-            (new SearchCondition($fieldSet, new ValuesGroup()))
-                ->setPrimaryCondition(
-                    new SearchPrimaryCondition(
-                        (new ValuesGroup())->addField('id', new ValuesBag())
-                    ),
-                )->isEmpty(),
-        );
-
-        // -- None empty --
-
-        // Field
-        $condition = new SearchCondition($fieldSet, new ValuesGroup());
-        $condition->getValuesGroup()->addField('id', new ValuesBag());
-        self::assertFalse($condition->isEmpty());
-
-        // Nested group
-        $condition = new SearchCondition($fieldSet, new ValuesGroup());
-        $condition->getValuesGroup()->addGroup(new ValuesGroup());
-        self::assertFalse($condition->isEmpty());
-
-        // Ordering
-        self::assertFalse(
-            (new SearchCondition($fieldSet, new ValuesGroup()))
-                ->setOrder(new SearchOrder(['@id' => 'desc']))
-                ->isEmpty(),
-        );
-    }
-}
diff --git a/lib/Core/Tests/SearchFactoryBuilderTest.php b/lib/Core/Tests/SearchFactoryBuilderTest.php
deleted file mode 100644
index 49cffaa9..00000000
--- a/lib/Core/Tests/SearchFactoryBuilderTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\GenericSearchFactory;
-use Rollerworks\Component\Search\SearchFactoryBuilder;
-use Rollerworks\Component\Search\Tests\Fixtures\FooType;
-
-/**
- * @internal
- */
-final class SearchFactoryBuilderTest extends TestCase
-{
-    private \ReflectionProperty $registry;
-    private FooType $type;
-
-    protected function setUp(): void
-    {
-        $factory = new \ReflectionClass(GenericSearchFactory::class);
-        $this->registry = $factory->getProperty('registry');
-
-        $this->type = new FooType();
-    }
-
-    /**
-     * @test
-     */
-    public function add_type(): void
-    {
-        $factoryBuilder = new SearchFactoryBuilder();
-        $factoryBuilder->addType($this->type);
-
-        $factory = $factoryBuilder->getSearchFactory();
-        $registry = $this->registry->getValue($factory);
-        $extensions = $registry->getExtensions();
-
-        self::assertCount(1, $extensions);
-        self::assertTrue($extensions[0]->hasType(FooType::class));
-    }
-}
diff --git a/lib/Core/Tests/SearchOrderTest.php b/lib/Core/Tests/SearchOrderTest.php
deleted file mode 100644
index e9da1675..00000000
--- a/lib/Core/Tests/SearchOrderTest.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- *
- * @psalm-type Sorting = array<string, 'asc'|'desc'>
- */
-final class SearchOrderTest extends TestCase
-{
-    /**
-     * @test
-     *
-     * @group legacy
-     */
-    public function construct_with_values_group(): void
-    {
-        $valuesGroup = new ValuesGroup();
-        $valuesGroup->addField('@id', (new ValuesBag())->addSimpleValue('desc'));
-
-        $order = new SearchOrder($valuesGroup);
-
-        self::assertSame(['@id' => 'desc'], $order->getFields());
-        self::assertEquals($valuesGroup, $order->getValuesGroup());
-    }
-
-    /**
-     * @test
-     */
-    public function construct_with_multiple_fields_at_value_group(): void
-    {
-        $valuesGroup = new ValuesGroup();
-        $valuesGroup->addField('@id', (new ValuesBag())->addSimpleValue('desc'));
-        $valuesGroup->addField('@name', (new ValuesBag())->addSimpleValue('asc'));
-        $order = new SearchOrder($valuesGroup);
-
-        self::assertSame(['@id' => 'desc', '@name' => 'asc'], $order->getFields());
-        self::assertEquals($valuesGroup, $order->getValuesGroup());
-    }
-
-    /**
-     * @test
-     */
-    public function construct_with_array(): void
-    {
-        $order = new SearchOrder(['@id' => 'desc']);
-
-        self::assertEquals((new ValuesGroup())->addField('@id', (new ValuesBag())->addSimpleValue('desc')), $order->getValuesGroup());
-        self::assertSame(['@id' => 'desc'], $order->getFields());
-    }
-
-    /**
-     * @test
-     */
-    public function construct_with_multiple_fields_array(): void
-    {
-        $order = new SearchOrder(['@id' => 'desc', '@name' => 'asc']);
-
-        self::assertEquals(
-            (new ValuesGroup())
-                ->addField('@id', (new ValuesBag())->addSimpleValue('desc'))
-                ->addField('@name', (new ValuesBag())->addSimpleValue('asc')),
-            $order->getValuesGroup(),
-        );
-        self::assertSame(['@id' => 'desc', '@name' => 'asc'], $order->getFields());
-    }
-
-    /**
-     * @test
-     */
-    public function construct_with_uppercase_direction(): void
-    {
-        $order = new SearchOrder(['@id' => 'DESC', '@name' => 'ASC']);
-
-        self::assertSame(['@id' => 'desc', '@name' => 'asc'], $order->getFields());
-        self::assertEquals(
-            (new ValuesGroup())
-                ->addField('@id', (new ValuesBag())->addSimpleValue('desc'))
-                ->addField('@name', (new ValuesBag())->addSimpleValue('asc')),
-            $order->getValuesGroup(),
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function construct_with_prepend(): void
-    {
-        // Prepend should be placed before any user sorting
-        self::assertSortingSame(
-            finalSorting: ['@date' => 'asc', '@id' => 'desc', '@name' => 'asc'],
-            prepend: ['@date' => 'asc'],
-            append: [],
-            fields: ['@id' => 'desc', '@name' => 'asc'],
-            actual: new SearchOrder(['@id' => 'DESC', '@name' => 'ASC'], prepend: ['@date' => 'ASC']),
-        );
-
-        // Prepend should keep the original position
-        self::assertSortingSame(
-            finalSorting: ['@name' => 'asc', '@id' => 'desc'],
-            prepend: ['@name' => 'desc'],
-            append: [],
-            fields: ['@id' => 'desc', '@name' => 'asc'],
-            actual: new SearchOrder(['@id' => 'DESC', '@name' => 'ASC'], prepend: ['@name' => 'DESC']),
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function construct_with_append(): void
-    {
-        // Append should be placed after the user sorting
-        self::assertSortingSame(
-            finalSorting: ['@id' => 'desc', '@name' => 'asc', '@date' => 'asc'],
-            prepend: [],
-            append: ['@date' => 'asc'],
-            fields: ['@id' => 'desc', '@name' => 'asc'],
-            actual: new SearchOrder(['@id' => 'DESC', '@name' => 'ASC'], append: ['@date' => 'ASC']),
-        );
-
-        // Append should ignore already existing sorting
-        self::assertSortingSame(
-            finalSorting: ['@id' => 'desc', '@name' => 'asc', '@date' => 'desc'],
-            prepend: [],
-            append: ['@id' => 'asc', '@date' => 'desc'],
-            fields: ['@id' => 'desc', '@name' => 'asc'],
-            actual: new SearchOrder(['@id' => 'DESC', '@name' => 'ASC'], append: ['@id' => 'ASC', '@date' => 'desc']),
-        );
-
-        // Prepend and append
-        self::assertSortingSame(
-            finalSorting: ['@name' => 'asc', '@group' => 'desc', '@id' => 'desc', '@date' => 'desc'],
-            prepend: ['@name' => 'desc', '@group' => 'desc'],
-            append: ['@id' => 'asc', '@date' => 'desc'],
-            fields: ['@id' => 'desc', '@name' => 'asc'],
-            actual: new SearchOrder(
-                values: ['@id' => 'DESC', '@name' => 'ASC'],
-                prepend: ['@name' => 'DESC', '@group' => 'DESC'],
-                append: ['@id' => 'ASC', '@date' => 'desc']
-            ),
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function fail_with_invalid_field_name(): void
-    {
-        $valuesGroup = new ValuesGroup();
-        $valuesGroup->addField('id', (new ValuesBag())->addSimpleValue('desc'));
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Field "id" is not a valid ordering field. Expected either "@id".');
-
-        new SearchOrder($valuesGroup);
-    }
-
-    /**
-     * @test
-     */
-    public function fail_with_invalid_value_type(): void
-    {
-        $valuesGroup = new ValuesGroup();
-        $valuesGroup->addField('@id', (new ValuesBag())->addSimpleValue(['up']));
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Field "@id" direction must be a string, "array" given.');
-
-        new SearchOrder($valuesGroup);
-    }
-
-    /**
-     * @test
-     */
-    public function fail_with_invalid_direction(): void
-    {
-        $valuesGroup = new ValuesGroup();
-        $valuesGroup->addField('@id', (new ValuesBag())->addSimpleValue('up'));
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Invalid direction provided "up" for field "@id", must be either "asc" or "desc" (case insensitive).');
-
-        new SearchOrder($valuesGroup);
-    }
-
-    /**
-     * @test
-     */
-    public function fail_with_nested_groups(): void
-    {
-        $valuesGroup = new ValuesGroup();
-        $valuesGroup->addField('@id', (new ValuesBag())->addSimpleValue('up'));
-        $valuesGroup->addGroup(new ValuesGroup());
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('A SearchOrder must have a single-level structure. Only fields with single values are accepted.');
-
-        new SearchOrder($valuesGroup);
-    }
-
-    /**
-     * @test
-     */
-    public function fail_with_multi_value(): void
-    {
-        $valuesGroup = new ValuesGroup();
-        $valuesGroup->addField('@id', (new ValuesBag())->addSimpleValue('desc')->addSimpleValue('asc'));
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Field "@id" must have a single value only.');
-
-        new SearchOrder($valuesGroup);
-    }
-
-    /**
-     * @test
-     */
-    public function fail_with_multi_value_types(): void
-    {
-        $valuesGroup = new ValuesGroup();
-        $valuesGroup->addField('@id', (new ValuesBag())->addSimpleValue('desc')->add(new Range('10', '20')));
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Field "@id" must have a single value only.');
-
-        new SearchOrder($valuesGroup);
-    }
-
-    /**
-     * @test
-     */
-    public function fail_with_invalid_type_value(): void
-    {
-        $valuesGroup = new ValuesGroup();
-        $valuesGroup->addField('@id', (new ValuesBag())->addExcludedSimpleValue('desc'));
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Field "@id" must have a single value only.');
-
-        new SearchOrder($valuesGroup);
-    }
-
-    /**
-     * @param Sorting $finalSorting
-     * @param Sorting $prepend
-     * @param Sorting $append
-     * @param Sorting $fields
-     */
-    private static function assertSortingSame(array $finalSorting, array $prepend, array $append, array $fields, SearchOrder $actual): void
-    {
-        $valuesGroup = new ValuesGroup();
-
-        foreach ($finalSorting as $field => $direction) {
-            $valuesGroup->addField($field, (new ValuesBag())->addSimpleValue($direction));
-        }
-
-        self::assertEquals($valuesGroup, $actual->getValuesGroup(), 'The values group does not match the expected values group.');
-        self::assertSame(array_keys($finalSorting), array_keys($actual->getValuesGroup()->getFields()), 'The fields do not match the expected fields order.');
-
-        self::assertSame($finalSorting, $actual->getSorting(), 'The final sorting does not match the expected sorting.');
-        self::assertSame($prepend, $actual->getPrepend(), 'The prepend does not match.');
-        self::assertSame($fields, $actual->getFields(), 'The fields do not match.');
-        self::assertSame($append, $actual->getAppend(), 'The append does not match.');
-    }
-}
diff --git a/lib/Core/Tests/Uitil/StringUtilTest.php b/lib/Core/Tests/Uitil/StringUtilTest.php
deleted file mode 100644
index 1e533354..00000000
--- a/lib/Core/Tests/Uitil/StringUtilTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Uitil;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Util\StringUtil;
-
-/**
- * @internal
- */
-final class StringUtilTest extends TestCase
-{
-    /**
-     * @dataProvider fqcnToBlockPrefixProvider
-     *
-     * @test
-     */
-    public function fqcn_to_block_prefix($fqcn, $expectedBlockPrefix): void
-    {
-        $blockPrefix = StringUtil::fqcnToBlockPrefix($fqcn);
-
-        self::assertSame($expectedBlockPrefix, $blockPrefix);
-    }
-
-    public static function fqcnToBlockPrefixProvider(): iterable
-    {
-        return [
-            ['TYPE', 'type'],
-            ['\Type', 'type'],
-            ['\UserType', 'user'],
-            ['UserType', 'user'],
-            ['Vendor\Name\Space\Type', 'type'],
-            ['Vendor\Name\Space\UserForm', 'user_form'],
-            ['Vendor\Name\Space\UserType', 'user'],
-            ['Vendor\Name\Space\usertype', 'user'],
-            ['Symfony\Component\Form\Form', 'form'],
-            ['Vendor\Name\Space\BarTypeBazType', 'bar_type_baz'],
-            ['FooBarBazType', 'foo_bar_baz'],
-        ];
-    }
-}
diff --git a/lib/Core/Tests/Value/CompareTest.php b/lib/Core/Tests/Value/CompareTest.php
deleted file mode 100644
index 36dd6405..00000000
--- a/lib/Core/Tests/Value/CompareTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Value;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Value\Compare;
-
-/**
- * @internal
- */
-final class CompareTest extends TestCase
-{
-    private Compare $value;
-
-    protected function setUp(): void
-    {
-        $this->value = new Compare(10, '>');
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_a_value(): void
-    {
-        self::assertEquals(10, $this->value->getValue());
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_an_operator(): void
-    {
-        self::assertEquals('>', $this->value->getOperator());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_an_object_as_value(): void
-    {
-        $value = new \DateTimeImmutable();
-
-        $this->value = new Compare($value, '<');
-
-        self::assertEquals($value, $this->value->getValue());
-        self::assertEquals('<', $this->value->getOperator());
-    }
-}
diff --git a/lib/Core/Tests/Value/PatternMatchTest.php b/lib/Core/Tests/Value/PatternMatchTest.php
deleted file mode 100644
index adaf2b1c..00000000
--- a/lib/Core/Tests/Value/PatternMatchTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Value;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Value\PatternMatch;
-
-/**
- * @internal
- */
-final class PatternMatchTest extends TestCase
-{
-    private PatternMatch $value;
-
-    protected function setUp(): void
-    {
-        $this->value = new PatternMatch('foo', PatternMatch::PATTERN_CONTAINS);
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_a_value(): void
-    {
-        self::assertEquals('foo', $this->value->getValue());
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_a_pattern_type(): void
-    {
-        self::assertEquals(PatternMatch::PATTERN_CONTAINS, $this->value->getType());
-    }
-
-    /**
-     * @test
-     */
-    public function it_is_case_sensitive_by_default(): void
-    {
-        self::assertFalse($this->value->isCaseInsensitive());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_case_insensitive(): void
-    {
-        $this->value = new PatternMatch('foo', PatternMatch::PATTERN_CONTAINS, true);
-        self::assertTrue($this->value->isCaseInsensitive());
-    }
-
-    /**
-     * @test
-     */
-    public function it_accepts_a_pattern_type_as_string(): void
-    {
-        $this->value = new PatternMatch('foo', 'CONTAINS');
-        self::assertEquals(PatternMatch::PATTERN_CONTAINS, $this->value->getType());
-    }
-}
diff --git a/lib/Core/Tests/Value/RangeTest.php b/lib/Core/Tests/Value/RangeTest.php
deleted file mode 100644
index b9956af5..00000000
--- a/lib/Core/Tests/Value/RangeTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Value;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Value\Range;
-
-/**
- * @internal
- */
-final class RangeTest extends TestCase
-{
-    private Range $value;
-
-    /**
-     * @test
-     */
-    public function it_has_a_lower_value(): void
-    {
-        $this->value = new Range(10, 20);
-        self::assertEquals(10, $this->value->getLower());
-    }
-
-    /**
-     * @test
-     */
-    public function it_has_an_upper_value(): void
-    {
-        $this->value = new Range(10, 20);
-        self::assertEquals(20, $this->value->getUpper());
-    }
-
-    /**
-     * @test
-     */
-    public function its_lower_value_is_inclusive_by_default(): void
-    {
-        $this->value = new Range(10, 20);
-        self::assertTrue($this->value->isLowerInclusive());
-    }
-
-    /**
-     * @test
-     */
-    public function its_upper_value_should_be_inclusive_by_default(): void
-    {
-        $this->value = new Range(10, 20);
-        self::assertTrue($this->value->isUpperInclusive());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_exclusive_lower_value(): void
-    {
-        $this->value = new Range(10, 20, false);
-        self::assertFalse($this->value->isLowerInclusive());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_exclusive_upper_value(): void
-    {
-        $this->value = new Range(10, 20, true, false);
-        self::assertFalse($this->value->isUpperInclusive());
-    }
-}
diff --git a/lib/Core/Tests/Value/ValuesBagTest.php b/lib/Core/Tests/Value/ValuesBagTest.php
deleted file mode 100644
index 2d00398f..00000000
--- a/lib/Core/Tests/Value/ValuesBagTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Value;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-
-/**
- * @internal
- */
-final class ValuesBagTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_allows_adding_simple_values(): void
-    {
-        $valuesBag = new ValuesBag();
-        $valuesBag->addSimpleValue('value');
-        $valuesBag->addSimpleValue('value2');
-
-        self::assertTrue($valuesBag->hasSimpleValues());
-        self::assertEquals(['value', 'value2'], $valuesBag->getSimpleValues());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_adding_values(): void
-    {
-        $valuesBag = new ValuesBag();
-        $valuesBag->add($val1 = new Range(10, 20));
-        $valuesBag->add($val2 = new Compare(10, '>'));
-
-        self::assertEquals(2, $valuesBag->count());
-
-        self::assertTrue($valuesBag->has(Range::class));
-        self::assertTrue($valuesBag->has(Compare::class));
-        self::assertFalse($valuesBag->has(PatternMatch::class));
-
-        self::assertEquals([$val1], $valuesBag->get(Range::class));
-        self::assertEquals([$val2], $valuesBag->get(Compare::class));
-        self::assertEquals([], $valuesBag->get(PatternMatch::class));
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_removing_values(): void
-    {
-        $valuesBag = new ValuesBag();
-        $valuesBag->add($val1 = new Range(10, 20));
-        $valuesBag->add($val2 = new Compare(10, '>'));
-
-        self::assertEquals(2, $valuesBag->count());
-
-        $valuesBag->remove(Range::class, 0);
-        $valuesBag->remove(Range::class, 1); // should not decrease the counter
-
-        self::assertEquals(1, $valuesBag->count());
-
-        self::assertFalse($valuesBag->has(Range::class));
-        self::assertEquals([], $valuesBag->get(Range::class));
-        self::assertEquals([$val2], $valuesBag->get(Compare::class));
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_removing_simple_values(): void
-    {
-        $valuesBag = new ValuesBag();
-        $valuesBag->addSimpleValue('value');
-        $valuesBag->addSimpleValue('value2');
-
-        $valuesBag->removeSimpleValue(0);
-
-        self::assertTrue($valuesBag->hasSimpleValues());
-        self::assertEquals([1 => 'value2'], $valuesBag->getSimpleValues());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_adding_excluded_simple_values(): void
-    {
-        $valuesBag = new ValuesBag();
-        $valuesBag->addExcludedSimpleValue('value');
-        $valuesBag->addExcludedSimpleValue('value2');
-
-        self::assertTrue($valuesBag->hasExcludedSimpleValues());
-        self::assertEquals(['value', 'value2'], $valuesBag->getExcludedSimpleValues());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_removing_excluded_simple_values(): void
-    {
-        $valuesBag = new ValuesBag();
-        $valuesBag->addExcludedSimpleValue('value');
-        $valuesBag->addExcludedSimpleValue('value2');
-
-        $valuesBag->removeExcludedSimpleValue(0);
-
-        self::assertTrue($valuesBag->hasExcludedSimpleValues());
-        self::assertEquals([1 => 'value2'], $valuesBag->getExcludedSimpleValues());
-    }
-}
diff --git a/lib/Core/Tests/Value/ValuesGroupTest.php b/lib/Core/Tests/Value/ValuesGroupTest.php
deleted file mode 100644
index 0dad1762..00000000
--- a/lib/Core/Tests/Value/ValuesGroupTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Value;
-
-use PHPUnit\Framework\TestCase;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class ValuesGroupTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function it_contains_no_values_when_initialized(): void
-    {
-        $valuesGroup = new ValuesGroup();
-
-        self::assertEquals([], $valuesGroup->getFields());
-        self::assertFalse($valuesGroup->hasField('user'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_allow_adding_values(): void
-    {
-        $valuesGroup = new ValuesGroup();
-
-        $field = new ValuesBag();
-        $field2 = new ValuesBag();
-
-        $valuesGroup->addField('user', $field);
-        $valuesGroup->addField('date', $field2);
-
-        self::assertEquals(['user' => $field, 'date' => $field2], $valuesGroup->getFields());
-        self::assertTrue($valuesGroup->hasField('user'));
-        self::assertFalse($valuesGroup->hasField('foo'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_allow_removing_values(): void
-    {
-        $valuesGroup = new ValuesGroup();
-
-        $field = new ValuesBag();
-        $field2 = new ValuesBag();
-
-        $valuesGroup->addField('user', $field);
-        $valuesGroup->addField('date', $field2);
-
-        $valuesGroup->removeField('user');
-
-        self::assertEquals(['date' => $field2], $valuesGroup->getFields());
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_have_subgroups(): void
-    {
-        $valuesGroup = new ValuesGroup();
-
-        self::assertFalse($valuesGroup->hasGroups());
-        self::assertEquals([], $valuesGroup->getGroups());
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_allow_adding_subgroups(): void
-    {
-        $valuesGroup = new ValuesGroup();
-
-        $group = new ValuesGroup();
-        $group2 = new ValuesGroup();
-
-        $valuesGroup->addGroup($group);
-        $valuesGroup->addGroup($group2);
-
-        self::assertTrue($valuesGroup->hasGroups());
-        self::assertEquals([$group, $group2], $valuesGroup->getGroups());
-    }
-
-    /**
-     * @test
-     */
-    public function it_should_allow_removing_subgroups(): void
-    {
-        $valuesGroup = new ValuesGroup();
-
-        $group = new ValuesGroup();
-        $group2 = new ValuesGroup();
-
-        $valuesGroup->addGroup($group);
-        $valuesGroup->addGroup($group2);
-
-        $valuesGroup->removeGroup(0);
-
-        self::assertTrue($valuesGroup->hasGroups());
-        self::assertEquals([1 => $group2], $valuesGroup->getGroups());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allows_getting_subgroups(): void
-    {
-        $valuesGroup = new ValuesGroup();
-
-        $group = new ValuesGroup();
-        $group2 = new ValuesGroup();
-
-        $valuesGroup->addGroup($group);
-        $valuesGroup->addGroup($group2);
-
-        self::assertEquals($group, $valuesGroup->getGroup(0));
-        self::assertEquals($group2, $valuesGroup->getGroup(1));
-    }
-}
diff --git a/lib/Core/Tests/assertDateTimeEqualsTrait.php b/lib/Core/Tests/assertDateTimeEqualsTrait.php
deleted file mode 100644
index 347ff261..00000000
--- a/lib/Core/Tests/assertDateTimeEqualsTrait.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests;
-
-use PHPUnit\Framework\Assert;
-
-trait assertDateTimeEqualsTrait
-{
-    public static function assertDateTimeEquals(\DateTimeInterface $expected, \DateTimeInterface $actual): void
-    {
-        Assert::assertEquals(
-            $expected->format('U'),
-            $actual->format('U'),
-            $expected->format('c') . ' <=> ' . $actual->format('c')
-        );
-    }
-}
diff --git a/lib/Core/Util/StringUtil.php b/lib/Core/Util/StringUtil.php
deleted file mode 100644
index 112757c1..00000000
--- a/lib/Core/Util/StringUtil.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Util;
-
-/**
- * @author Issei Murasawa <issei.m7@gmail.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class StringUtil
-{
-    /**
-     * This class should not be instantiated.
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Converts a fully-qualified class name to a block prefix.
-     *
-     * @param string $fqcn The fully-qualified class name
-     *
-     * @return string|null The block prefix or null if not a valid FQCN
-     */
-    public static function fqcnToBlockPrefix(string $fqcn): ?string
-    {
-        // Non-greedy ("+?") to match "type" suffix, if present
-        if (preg_match('~([^\\\]+?)(type)?$~i', $fqcn, $matches)) {
-            return mb_strtolower((string) preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], ['\1_\2', '\1_\2'], $matches[1]));
-        }
-
-        return null;
-    }
-}
diff --git a/lib/Core/Value/Compare.php b/lib/Core/Value/Compare.php
deleted file mode 100644
index 83e7ffb3..00000000
--- a/lib/Core/Value/Compare.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Value;
-
-final readonly class Compare implements RequiresComparatorValueHolder
-{
-    public const OPERATORS = ['>=', '<=', '<>', '<', '>'];
-
-    public function __construct(
-        private readonly mixed $value,
-        private readonly string $operator,
-    ) {
-        if (! \in_array($operator, self::OPERATORS, true)) {
-            throw new \InvalidArgumentException(
-                \sprintf('Unknown operator "%s".', $operator)
-            );
-        }
-    }
-
-    public function getOperator(): string
-    {
-        return $this->operator;
-    }
-
-    public function getValue()
-    {
-        return $this->value;
-    }
-}
diff --git a/lib/Core/Value/ExcludedRange.php b/lib/Core/Value/ExcludedRange.php
deleted file mode 100644
index cae7c8ea..00000000
--- a/lib/Core/Value/ExcludedRange.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Value;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class ExcludedRange extends Range
-{
-}
diff --git a/lib/Core/Value/PatternMatch.php b/lib/Core/Value/PatternMatch.php
deleted file mode 100644
index 9aa5d412..00000000
--- a/lib/Core/Value/PatternMatch.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Value;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final readonly class PatternMatch implements ValueHolder
-{
-    public const PATTERN_CONTAINS = 'CONTAINS';
-    public const PATTERN_STARTS_WITH = 'STARTS_WITH';
-    public const PATTERN_ENDS_WITH = 'ENDS_WITH';
-    public const PATTERN_NOT_CONTAINS = 'NOT_CONTAINS';
-    public const PATTERN_NOT_STARTS_WITH = 'NOT_STARTS_WITH';
-    public const PATTERN_NOT_ENDS_WITH = 'NOT_ENDS_WITH';
-    public const PATTERN_EQUALS = 'EQUALS';
-    public const PATTERN_NOT_EQUALS = 'NOT_EQUALS';
-
-    private readonly string $patternType;
-
-    /**
-     * @throws \InvalidArgumentException When the pattern-match type is invalid
-     */
-    public function __construct(
-        private readonly string $value,
-        string $patternType,
-        private readonly bool $caseInsensitive = false,
-    ) {
-        $typeConst = self::class . '::PATTERN_' . mb_strtoupper($patternType);
-
-        if (! \defined($typeConst)) {
-            throw new InvalidArgumentException(\sprintf('Unknown PatternMatch type "%s".', $patternType));
-        }
-        $this->patternType = mb_strtoupper($patternType);
-    }
-
-    public function getValue(): string
-    {
-        return $this->value;
-    }
-
-    public function getType(): string
-    {
-        return $this->patternType;
-    }
-
-    public function isCaseInsensitive(): bool
-    {
-        return $this->caseInsensitive;
-    }
-
-    public function isExclusive(): bool
-    {
-        return \in_array(
-            $this->patternType,
-            [
-                self::PATTERN_NOT_STARTS_WITH,
-                self::PATTERN_NOT_CONTAINS,
-                self::PATTERN_NOT_ENDS_WITH,
-                self::PATTERN_NOT_EQUALS,
-            ],
-            true
-        );
-    }
-}
diff --git a/lib/Core/Value/Range.php b/lib/Core/Value/Range.php
deleted file mode 100644
index 875f7a49..00000000
--- a/lib/Core/Value/Range.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Value;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class Range implements RequiresComparatorValueHolder
-{
-    public function __construct(
-        private readonly mixed $lower,
-        private readonly mixed $upper,
-        private readonly bool $inclusiveLower = true,
-        private readonly bool $inclusiveUpper = true,
-    ) {
-    }
-
-    public function getLower()
-    {
-        return $this->lower;
-    }
-
-    public function getUpper()
-    {
-        return $this->upper;
-    }
-
-    public function isLowerInclusive(): bool
-    {
-        return $this->inclusiveLower;
-    }
-
-    public function isUpperInclusive(): bool
-    {
-        return $this->inclusiveUpper;
-    }
-}
diff --git a/lib/Core/Value/RequiresComparatorValueHolder.php b/lib/Core/Value/RequiresComparatorValueHolder.php
deleted file mode 100644
index 3e6c3cfe..00000000
--- a/lib/Core/Value/RequiresComparatorValueHolder.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Value;
-
-/**
- * RequiresComparatorValueHolder indicates the value-holder
- * requires a comparator in the field's type.
- */
-interface RequiresComparatorValueHolder extends ValueHolder
-{
-}
diff --git a/lib/Core/Value/ValueHolder.php b/lib/Core/Value/ValueHolder.php
deleted file mode 100644
index e0e9c4e9..00000000
--- a/lib/Core/Value/ValueHolder.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Value;
-
-/**
- * ValueHolder is the marker interface for all value-holders.
- *
- * Note that all value-holders are considered read-only.
- *
- * Do not use this interface directly for any custom implementations
- * as this is not supported.
- */
-interface ValueHolder
-{
-}
diff --git a/lib/Core/Value/ValuesBag.php b/lib/Core/Value/ValuesBag.php
deleted file mode 100644
index 6a8fd538..00000000
--- a/lib/Core/Value/ValuesBag.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Value;
-
-/**
- * A ValuesBag holds all the values per type.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class ValuesBag implements \Countable
-{
-    private int $valuesCount = 0;
-
-    /** @var array<int, mixed> */
-    private array $simpleValues = [];
-
-    /** @var array<int, mixed> */
-    private array $simpleExcludedValues = [];
-
-    /** @var array<class-string<ValueHolder>, ValueHolder[]> */
-    private array $values = [];
-
-    /**
-     * @param class-string<ValueHolder>|'simpleValues'|'simpleValue'|'simpleExcludedValue'|'simpleExcludedValues'|null $type
-     */
-    public function count(?string $type = null): int
-    {
-        if ($type === null) {
-            return $this->valuesCount;
-        }
-
-        return match ($type) {
-            'simpleValues', 'simpleValue' => \count($this->simpleValues),
-            'simpleExcludedValues', 'simpleExcludedValue' => \count($this->simpleExcludedValues),
-            default => \count($this->values[$type] ?? []),
-        };
-    }
-
-    /**
-     * @return array{simpleValues: array<int, mixed>, simpleExcludedValues: array<int, mixed>, values: array<class-string<ValueHolder>, ValueHolder[]>, valuesCount: int}
-     */
-    public function __serialize(): array
-    {
-        return [
-            'simpleValues' => $this->simpleValues,
-            'simpleExcludedValues' => $this->simpleExcludedValues,
-            'values' => $this->values,
-            'valuesCount' => $this->valuesCount,
-        ];
-    }
-
-    /**
-     * @param array{simpleValues: array<int, mixed>, simpleExcludedValues: array<int, mixed>, values: array<class-string<ValueHolder>, ValueHolder[]>, valuesCount: int} $data
-     */
-    public function __unserialize(array $data): void
-    {
-        [
-            'simpleValues' => $this->simpleValues,
-            'simpleExcludedValues' => $this->simpleExcludedValues,
-            'values' => $this->values,
-            'valuesCount' => $this->valuesCount,
-        ] = $data;
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function getSimpleValues(): array
-    {
-        return $this->simpleValues;
-    }
-
-    /**
-     * @return $this
-     */
-    public function addSimpleValue(mixed $value): static
-    {
-        $this->simpleValues[] = $value;
-        ++$this->valuesCount;
-
-        return $this;
-    }
-
-    public function hasSimpleValues(): bool
-    {
-        return \count($this->simpleValues) > 0;
-    }
-
-    /**
-     * @return $this
-     */
-    public function removeSimpleValue(int $index): static
-    {
-        if (isset($this->simpleValues[$index])) {
-            unset($this->simpleValues[$index]);
-
-            --$this->valuesCount;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return array<int, mixed>
-     */
-    public function getExcludedSimpleValues(): array
-    {
-        return $this->simpleExcludedValues;
-    }
-
-    /**
-     * @return $this
-     */
-    public function addExcludedSimpleValue(mixed $value): static
-    {
-        $this->simpleExcludedValues[] = $value;
-        ++$this->valuesCount;
-
-        return $this;
-    }
-
-    public function hasExcludedSimpleValues(): bool
-    {
-        return \count($this->simpleExcludedValues) > 0;
-    }
-
-    /**
-     * Remove a simple excluded value by index.
-     *
-     * @return $this
-     */
-    public function removeExcludedSimpleValue(int $index): static
-    {
-        if (isset($this->simpleExcludedValues[$index])) {
-            unset($this->simpleExcludedValues[$index]);
-
-            --$this->valuesCount;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get all values from a specific type.
-     *
-     * @template T of ValueHolder
-     *
-     * @param class-string<T> $type
-     *
-     * @return T[]
-     */
-    public function get(string $type): array
-    {
-        return $this->values[$type] ?? [];
-    }
-
-    /**
-     * Check if the bag has values for a specific type.
-     *
-     * @param class-string<ValueHolder> $type
-     */
-    public function has(string $type): bool
-    {
-        return isset($this->values[$type]) && \count($this->values[$type]) > 0;
-    }
-
-    /**
-     * Remove a value by type and index.
-     *
-     * @param class-string<ValueHolder> $type
-     *
-     * @return $this
-     */
-    public function remove(string $type, int $index): static
-    {
-        if (isset($this->values[$type][$index])) {
-            unset($this->values[$type][$index]);
-
-            --$this->valuesCount;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function add(ValueHolder $value): static
-    {
-        $this->values[$value::class][] = $value;
-        ++$this->valuesCount;
-
-        return $this;
-    }
-
-    /**
-     * @return array<string, ValueHolder[]>
-     */
-    public function all(): array
-    {
-        return $this->values;
-    }
-}
diff --git a/lib/Core/Value/ValuesGroup.php b/lib/Core/Value/ValuesGroup.php
deleted file mode 100644
index 2c04bc8d..00000000
--- a/lib/Core/Value/ValuesGroup.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Value;
-
-use Rollerworks\Component\Search\Exception\InvalidArgumentException;
-
-/**
- * The ValuesGroup holds sub-groups and values (per field).
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class ValuesGroup
-{
-    public const GROUP_LOGICAL_OR = 'OR';
-    public const GROUP_LOGICAL_AND = 'AND';
-
-    /** @var ValuesGroup[] */
-    private array $groups = [];
-
-    /** @var array<string, ValuesBag> */
-    private array $fields = [];
-
-    /**
-     * @param self::GROUP_LOGICAL_* $groupLogical
-     *
-     * @throws InvalidArgumentException When no an unsupported group logical is provided
-     */
-    public function __construct(
-        private string $groupLogical = self::GROUP_LOGICAL_AND,
-    ) {
-        $this->setGroupLogical($groupLogical);
-    }
-
-    /**
-     * @return $this
-     */
-    public function addGroup(self $group): self
-    {
-        $this->groups[] = $group;
-
-        return $this;
-    }
-
-    public function hasGroups(): bool
-    {
-        return \count($this->groups) > 0;
-    }
-
-    /**
-     * @throws InvalidArgumentException when no group exists at the given index
-     */
-    public function getGroup(int $index): self
-    {
-        if (! isset($this->groups[$index])) {
-            throw new InvalidArgumentException(\sprintf('Unable to get none existent group: "%d"', $index));
-        }
-
-        return $this->groups[$index];
-    }
-
-    /**
-     * @return array<int, ValuesGroup>
-     */
-    public function getGroups(): array
-    {
-        return $this->groups;
-    }
-
-    /**
-     * @return $this
-     */
-    public function removeGroup(int $index): self
-    {
-        if (isset($this->groups[$index])) {
-            unset($this->groups[$index]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function addField(string $name, ValuesBag $values)
-    {
-        $this->fields[$name] = $values;
-
-        return $this;
-    }
-
-    public function hasField(string $name): bool
-    {
-        return isset($this->fields[$name]);
-    }
-
-    /**
-     * @return array<string, ValuesBag>
-     */
-    public function getFields(): array
-    {
-        return $this->fields;
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     */
-    public function getField(string $name): ValuesBag
-    {
-        if (! isset($this->fields[$name])) {
-            throw new InvalidArgumentException(\sprintf('Unable to get none existent field: "%s"', $name));
-        }
-
-        return $this->fields[$name];
-    }
-
-    /**
-     * @return $this
-     */
-    public function removeField(string $name): self
-    {
-        if (isset($this->fields[$name])) {
-            unset($this->fields[$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Gets the total number of values in the fields list structure.
-     */
-    public function countValues(): int
-    {
-        $count = 0;
-
-        foreach ($this->fields as $field) {
-            $count += $field->count();
-        }
-
-        return $count;
-    }
-
-    /**
-     * This is either one of the following class constants:
-     * GROUP_LOGICAL_OR or GROUP_LOGICAL_AND.
-     */
-    public function getGroupLogical(): string
-    {
-        return $this->groupLogical;
-    }
-
-    /**
-     * @param self::GROUP_LOGICAL_* $groupLogical
-     *
-     * @return $this
-     *
-     * @throws InvalidArgumentException When an unsupported group-logical is provided
-     */
-    public function setGroupLogical(string $groupLogical): self
-    {
-        if (! \in_array($groupLogical, [self::GROUP_LOGICAL_OR, self::GROUP_LOGICAL_AND], true)) {
-            throw new InvalidArgumentException(\sprintf('Unsupported group logical "%s".', $groupLogical));
-        }
-
-        $this->groupLogical = $groupLogical;
-
-        return $this;
-    }
-
-    /**
-     * @return array{groupLogical: string, groups: ValuesGroup[], fields: array<string, ValuesBag>}
-     */
-    public function __serialize(): array
-    {
-        return [
-            'groupLogical' => $this->groupLogical,
-            'groups' => $this->groups,
-            'fields' => $this->fields,
-        ];
-    }
-
-    /**
-     * @param array{groupLogical: string, groups: ValuesGroup[], fields: array<string, ValuesBag>} $data
-     */
-    public function __unserialize(array $data): void
-    {
-        [
-            'groupLogical' => $this->groupLogical,
-            'groups' => $this->groups,
-            'fields' => $this->fields,
-        ] = $data;
-    }
-}
diff --git a/lib/Core/ValueComparator.php b/lib/Core/ValueComparator.php
deleted file mode 100644
index 084ed32d..00000000
--- a/lib/Core/ValueComparator.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-/**
- * ValueComparator.
- *
- * Each ValueComparator class must implement this interface.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface ValueComparator
-{
-    /**
-     * Returns whether the first value is higher then the second value.
-     */
-    public function isHigher($higher, $lower, array $options): bool;
-
-    /**
-     * Returns whether the first value is lower then the second value.
-     */
-    public function isLower($lower, $higher, array $options): bool;
-
-    /**
-     * Returns whether the first value equals the second value.
-     */
-    public function isEqual($value, $nextValue, array $options): bool;
-}
diff --git a/lib/Core/ValuesBagBuilder.php b/lib/Core/ValuesBagBuilder.php
deleted file mode 100644
index cf30dac2..00000000
--- a/lib/Core/ValuesBagBuilder.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search;
-
-use Rollerworks\Component\Search\Value\ValuesBag;
-
-/**
- * Helper class for the SearchConditionBuilder.
- */
-class ValuesBagBuilder extends ValuesBag
-{
-    public function __construct(
-        private readonly SearchConditionBuilder $parent,
-    ) {
-    }
-
-    public function end(): SearchConditionBuilder
-    {
-        return $this->parent;
-    }
-
-    /**
-     * @internal
-     */
-    public function toValuesBag(): ValuesBag
-    {
-        $valuesBag = new ValuesBag();
-        $valuesBag->__unserialize($this->__serialize());
-
-        return $valuesBag;
-    }
-}
diff --git a/lib/Core/composer.json b/lib/Core/composer.json
deleted file mode 100644
index f7521b87..00000000
--- a/lib/Core/composer.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "name": "rollerworks/search",
-    "description": "RollerworksSearch provides you with a powerful search system",
-    "license": "MIT",
-    "type": "library",
-    "keywords": [
-        "rollerworks",
-        "filter",
-        "search"
-    ],
-    "authors": [
-        {
-            "name": "Sebastiaan Stok",
-            "email": "s.stok@rollercapes.net"
-        },
-        {
-            "name": "Community contributions",
-            "homepage": "https://github.com/rollerworks/search/contributors"
-        }
-    ],
-    "homepage": "https://rollerworks.github.io/",
-    "require": {
-        "php": "^8.1",
-        "nesbot/carbon": "^2.38 || ^3.0",
-        "psr/container": "^1.1 || ^2.0",
-        "symfony/intl": "^6.4 || ^7.4 || ^8.0",
-        "symfony/options-resolver": "^6.4 || ^7.4 || ^8.0",
-        "symfony/polyfill-php84": "^1.33",
-        "symfony/property-access": "^6.4 || ^7.4 || ^8.0",
-        "symfony/string": "^6.4 || ^7.4 || ^8.0",
-        "symfony/translation-contracts": "^3.4"
-    },
-    "require-dev": {
-        "moneyphp/money": "^3.2.0 || ^4.0",
-        "phpunit/phpunit": "^10.5",
-        "symfony/phpunit-bridge": "^6.4 || ^7.4 || ^8.0",
-        "symfony/var-dumper": "^6.4 || ^7.4 || ^8.0"
-    },
-    "conflict": {
-        "moneyphp/money": "<3.2.0"
-    },
-    "suggest": {
-        "moneyphp/money": "To use the MoneyType"
-    },
-    "autoload": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\": ""
-        },
-        "exclude-from-classmap": [
-            "Test/"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\Tests\\": "Tests/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.0-dev"
-        }
-    }
-}
diff --git a/lib/Core/phpunit.xml.dist b/lib/Core/phpunit.xml.dist
deleted file mode 100644
index 2e9de8f3..00000000
--- a/lib/Core/phpunit.xml.dist
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
-         colors="true" verbose="true"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
->
-    <php>
-        <ini name="error_reporting" value="-1"/>
-        <ini name="date.timezone" value="UTC"/>
-        <ini name="intl.default_locale" value="en"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="memory_limit" value="-1"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="RollerworksSearch Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-            <exclude>
-                <directory>./vendor/</directory>
-                <directory>./tests/</directory>
-                <directory>./doc/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-</phpunit>
diff --git a/lib/Doctrine/Dbal/.gitattributes b/lib/Doctrine/Dbal/.gitattributes
deleted file mode 100644
index fbd8056d..00000000
--- a/lib/Doctrine/Dbal/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-/Tests/ export-ignore
-/phpunit.xml.dist export-ignore
-.git* export-ignore
diff --git a/lib/Doctrine/Dbal/.gitignore b/lib/Doctrine/Dbal/.gitignore
deleted file mode 100644
index 207f97e0..00000000
--- a/lib/Doctrine/Dbal/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/vendor/
-/composer.lock
-/phpunit.xml
diff --git a/lib/Doctrine/Dbal/AbstractCachedConditionGenerator.php b/lib/Doctrine/Dbal/AbstractCachedConditionGenerator.php
deleted file mode 100644
index e67fa234..00000000
--- a/lib/Doctrine/Dbal/AbstractCachedConditionGenerator.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\SearchCondition;
-
-abstract class AbstractCachedConditionGenerator
-{
-    protected ?string $cacheKey = null;
-    protected bool $isApplied = false;
-
-    /**
-     * @param Cache                  $cacheDriver   PSR-16 SimpleCache instance. Use a custom pool to ease
-     *                                              purging invalidated items
-     * @param \DateInterval|int|null $cacheLifeTime Optional. The TTL value of this item. If no value is sent and
-     *                                              the driver supports TTL then the library may set a default
-     *                                              value for it or let the driver take care of that.
-     */
-    protected function __construct(
-        protected Cache $cacheDriver,
-        protected SearchCondition $searchCondition,
-        protected \DateInterval | int | null $cacheLifeTime = null,
-    ) {
-    }
-
-    public function getSearchCondition(): SearchCondition
-    {
-        return $this->searchCondition;
-    }
-
-    protected function getCacheKey(array $config, string $prefix = 'sql'): string
-    {
-        if ($this->cacheKey === null) {
-            $searchCondition = $this->getSearchCondition();
-
-            $this->cacheKey = hash(
-                'sha256',
-                $prefix .
-                $searchCondition->getFieldSet()->getSetName() .
-                "\n" .
-                serialize($searchCondition->getValuesGroup()) .
-                "\n" .
-                serialize($searchCondition->getPrimaryCondition()?->getValuesGroup()) .
-                "\n" .
-                serialize($config)
-            );
-        }
-
-        return $this->cacheKey;
-    }
-
-    protected function getFromCache(string $cacheKey): ?array
-    {
-        $cached = $this->cacheDriver->get($cacheKey);
-
-        if (! \is_array($cached) || ! isset($cached[0], $cached[1]) || ! \is_string($cached[0]) || ! \is_array($cached[1])) {
-            return null;
-        }
-
-        try {
-            $cached[1] = $this->unpackParameters($cached[1]);
-
-            return $cached;
-        } catch (\Throwable) {
-            return null;
-        }
-    }
-
-    private function unpackParameters(array $provided): ArrayCollection
-    {
-        $parameters = new ArrayCollection();
-
-        foreach ($provided as $name => [$value, $type]) {
-            $parameters->set($name, [$value, $type]);
-        }
-
-        return $parameters;
-    }
-
-    protected function storeInCache(string $whereClause, string $cacheKey, ArrayCollection $parameters): void
-    {
-        if ($whereClause === '') {
-            return;
-        }
-
-        $this->cacheDriver->set(
-            $cacheKey,
-            [$whereClause, $this->packParameters($parameters)],
-            $this->cacheLifeTime
-        );
-    }
-
-    private function packParameters(ArrayCollection $provided): array
-    {
-        $parameters = [];
-
-        foreach ($provided as $name => [$value, $type]) {
-            $parameters[$name] = [$value, $type];
-        }
-
-        return $parameters;
-    }
-}
diff --git a/lib/Doctrine/Dbal/CachedConditionGenerator.php b/lib/Doctrine/Dbal/CachedConditionGenerator.php
deleted file mode 100644
index bdaef087..00000000
--- a/lib/Doctrine/Dbal/CachedConditionGenerator.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal;
-
-use Doctrine\DBAL\Query\QueryBuilder;
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\Doctrine\Dbal\Query\QueryGenerator;
-use Rollerworks\Component\Search\SearchCondition;
-
-/**
- * Handles caching of a Doctrine DBAL ConditionGenerator.
- *
- * Instead of using the ConditionGenerator directly you use the
- * CachedConditionGenerator as all related calls are delegated.
- *
- * The cache-key is a hashed (sha256) combination of the SearchCondition
- * (root ValuesGroup and FieldSet name) and configured field mappings.
- *
- * Caution: Any noticeable changes to your (FieldSet's) configuration
- * should purge all cached entries.
- */
-final class CachedConditionGenerator extends AbstractCachedConditionGenerator implements ConditionGenerator
-{
-    private readonly FieldConfigurationSet $fieldsConfig;
-
-    public function __construct(
-        private readonly QueryBuilder $qb,
-        SearchCondition $searchCondition,
-        Cache $cacheDriver,
-        \DateInterval | int | null $ttl = null,
-    ) {
-        parent::__construct($cacheDriver, $searchCondition, $ttl);
-        $this->fieldsConfig = new FieldConfigurationSet($searchCondition->getFieldSet());
-    }
-
-    public function setField(string $fieldName, string $column, ?string $alias = null, string $type = 'string')
-    {
-        $this->fieldsConfig->setField($fieldName, $column, $alias, $type);
-
-        return $this;
-    }
-
-    public function apply(): void
-    {
-        if ($this->isApplied) {
-            trigger_error('SearchCondition was already applied. Ignoring operation.', \E_USER_WARNING);
-
-            return;
-        }
-
-        $this->isApplied = true;
-
-        $fields = $this->fieldsConfig->fields;
-        $cacheKey = $this->getCacheKey($fields);
-        $cached = $this->getFromCache($cacheKey);
-
-        // Note that ordering is not part of the cache as this only applies at the root level
-        // And is handled by QueryBuilder itself, making it possible to reuse the same condition
-        // with a different ordering.
-
-        if ($cached !== null) {
-            [$whereClause, $parameters] = $cached;
-        } else {
-            if (method_exists($this->qb, 'getConnection')) {
-                $connection = $this->qb->getConnection();
-            } else {
-                // XXX This is the only way to get the connection from a QueryBuilder, unless this method is restored.
-                //
-                // The DBAL generator is executed multiple levels deep, passing this with the constructor requires
-                // too much for now. This is a workaround until the DBAL generator is refactored, or the method is restored.
-                $connection = (new \ReflectionClass(QueryBuilder::class))->getProperty('connection')->getValue($this->qb);
-            }
-
-            $generator = new QueryGenerator($connection, SqlConditionGenerator::getQueryPlatform($connection), $fields);
-
-            $whereClause = $generator->getWhereClause($this->searchCondition);
-            $parameters = $generator->getParameters();
-
-            $this->storeInCache($whereClause, $cacheKey, $parameters);
-        }
-
-        QueryGenerator::applySortingTo($this->searchCondition->getPrimaryCondition()?->getOrder(), $this->qb, $fields);
-        QueryGenerator::applySortingTo($this->searchCondition->getOrder(), $this->qb, $fields);
-
-        if ($whereClause !== '') {
-            $this->qb->andWhere($whereClause);
-
-            foreach ($parameters as $name => [$value, $type]) {
-                $this->qb->setParameter($name, $value, $type);
-            }
-        }
-    }
-
-    public function getQueryBuilder(): QueryBuilder
-    {
-        return $this->qb;
-    }
-}
diff --git a/lib/Doctrine/Dbal/ColumnConversion.php b/lib/Doctrine/Dbal/ColumnConversion.php
deleted file mode 100644
index 4d445ab9..00000000
--- a/lib/Doctrine/Dbal/ColumnConversion.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal;
-
-/**
- * A ColumnConversion allows to wrap the query's column in a custom
- * SQL statement (as-is).
- *
- * This interface can be combined with the ValueConversion interface.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface ColumnConversion
-{
-    /**
-     * Return the $column wrapped inside an SQL statement like: MY_FUNCTION(column).
-     *
-     * The returned result must a be a platform specific SQL statement
-     * that can be used as a column in query.
-     *
-     * @param string               $column  The column name and table alias, eg. i.id
-     * @param array<string, mixed> $options Options of the Field configuration
-     * @param ConversionHints      $hints   Special information for the conversion process
-     */
-    public function convertColumn(string $column, array $options, ConversionHints $hints): string;
-}
diff --git a/lib/Doctrine/Dbal/ConditionGenerator.php b/lib/Doctrine/Dbal/ConditionGenerator.php
deleted file mode 100644
index f5680291..00000000
--- a/lib/Doctrine/Dbal/ConditionGenerator.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal;
-
-use Doctrine\DBAL\Query\QueryBuilder;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\SearchCondition;
-
-/**
- * A Doctrine DBAL ConditionGenerator generates WHERE an SQL WHERE-clause
- * based on the provided SearchCondition.
- *
- * This interface is provided for type hinting and should not be
- * used for alternative implementations.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface ConditionGenerator
-{
-    /**
-     * Apply the SearchCondition to the QueryBuilder (as an AND-WHERE).
-     */
-    public function apply(): void;
-
-    /**
-     * Set the search field to database table-column mapping configuration.
-     *
-     * To map a field to more than one column use the `field-name#mapping-name`
-     * notation for for the $fieldName argument.
-     *
-     * The `field-name` is the field name as registered in the FieldSet, the
-     * `mapping-name` allows to configure a (secondary) mapping for a field.
-     *
-     * Caution: A field can only have multiple mappings _or_ one.
-     *
-     * * Omitting the `#` removes any existing mappings for that field.
-     * * Registering a field without `#` first, and then setting multiple mappings
-     *   for that field will reset the single mapping.
-     *
-     * Tip: The `mapping-name` doesn't have to be same as $column, but using a clear name
-     * helps greatly with trouble shooting.
-     *
-     * @param string $fieldName Name of the search field as registered in the FieldSet or
-     *                          `field-name#mapping-name` to configure a secondary mapping
-     * @param string $column    Database table column-name
-     * @param string $alias     Table alias as used in the query "u" for `FROM users AS u`
-     * @param string $type      Doctrine DBAL supported type, either "string" (not "text")
-     *
-     * @return static
-     *
-     * @throws UnknownFieldException  When the field is not registered in the fieldset
-     * @throws BadMethodCallException When the where-clause is already generated
-     */
-    public function setField(string $fieldName, string $column, ?string $alias = null, string $type = 'string');
-
-    public function getSearchCondition(): SearchCondition;
-
-    public function getQueryBuilder(): QueryBuilder;
-}
diff --git a/lib/Doctrine/Dbal/ConversionHints.php b/lib/Doctrine/Dbal/ConversionHints.php
deleted file mode 100644
index 2c63f0bc..00000000
--- a/lib/Doctrine/Dbal/ConversionHints.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Types\Type;
-use Rollerworks\Component\Search\Doctrine\Dbal\Query\QueryField;
-use Rollerworks\Component\Search\Doctrine\Dbal\QueryPlatform\AbstractQueryPlatform;
-use Rollerworks\Component\Search\Value\ValueHolder;
-
-class ConversionHints
-{
-    public const CONTEXT_RANGE_LOWER_BOUND = 'range.lower_bound';
-    public const CONTEXT_RANGE_UPPER_BOUND = 'range.upper_bound';
-    public const CONTEXT_SIMPLE_VALUE = 'simple_value';
-    public const CONTEXT_COMPARISON = 'comparison';
-
-    public QueryField $field;
-    public Connection $connection;
-    public string $column;
-
-    /** @var self::CONTEXT_* */
-    public string $context;
-
-    /** @var mixed|ValueHolder */
-    public mixed $originalValue;
-
-    public function __construct(
-        private readonly AbstractQueryPlatform $queryPlatform,
-    ) {
-    }
-
-    /**
-     * Returns a parameter-name to reference a value.
-     */
-    public function createParamReferenceFor($value, string | Type | null $type = 'string'): string
-    {
-        if (\is_object($type)) {
-            $type = Type::lookupName($type);
-
-            trigger_deprecation(
-                'rollerworks/search-doctrine-dbal',
-                'v2.0.0-BETA2',
-                \sprintf(
-                    'passing a %s object is deprecated and will no longer be accepted in v3.0.0, pass the type actual name "%s" instead.',
-                    Type::class,
-                    $type
-                )
-            );
-        }
-
-        if ($type === null) {
-            trigger_deprecation(
-                'rollerworks/search-doctrine-dbal',
-                'v2.0.0-BETA9',
-                'passing null as type is deprecated and will no longer be accepted in v3.0.0, pass a type name instead, defaults to "string" for now.".'
-            );
-        }
-
-        return $this->queryPlatform->createParamReferenceFor($value, $type ?? 'string');
-    }
-
-    /**
-     * Returns the value that is currently being processed (in context).
-     *
-     * The $this->originalValue might return a value-holder or actual
-     * processing value depending on the context.
-     */
-    public function getProcessingValue(): mixed
-    {
-        switch ($this->context) {
-            case self::CONTEXT_SIMPLE_VALUE:
-                return $this->originalValue;
-
-            case self::CONTEXT_COMPARISON:
-                return $this->originalValue->getValue();
-
-            case self::CONTEXT_RANGE_LOWER_BOUND:
-                return $this->originalValue->getLower();
-
-            case self::CONTEXT_RANGE_UPPER_BOUND:
-                return $this->originalValue->getUpper();
-
-            default:
-                throw new \LogicException(\sprintf('Unknown context "%s".', $this->context));
-        }
-    }
-
-    /**
-     * Returns the platform name, returns a class-name if the platform could not be detected.
-     *
-     * @return 'mysql'|'sqlite'|'pgsql'|'oci'|'sqlsrv'|'mock'|string
-     */
-    public function getPlatformName(): string
-    {
-        return $this->queryPlatform->platformName;
-    }
-}
diff --git a/lib/Doctrine/Dbal/DoctrineDbalFactory.php b/lib/Doctrine/Dbal/DoctrineDbalFactory.php
deleted file mode 100644
index d331afe7..00000000
--- a/lib/Doctrine/Dbal/DoctrineDbalFactory.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal;
-
-use Doctrine\DBAL\Query\QueryBuilder;
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\SearchCondition;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class DoctrineDbalFactory
-{
-    public function __construct(
-        private readonly ?Cache $cacheDriver = null,
-    ) {
-    }
-
-    /**
-     * Creates a new SqlConditionGenerator for the SearchCondition.
-     *
-     * Conversions are applied using the 'doctrine_dbal_conversion' option.
-     */
-    public function createConditionGenerator(QueryBuilder $queryBuilder, SearchCondition $searchCondition): ConditionGenerator
-    {
-        return new SqlConditionGenerator($queryBuilder, $searchCondition);
-    }
-
-    /**
-     * Creates a new CachedConditionGenerator for the SearchCondition.
-     *
-     * Note: When no cache driver was configured the original ConditionGenerator
-     * is returned instead.
-     *
-     * @param \DateInterval|int|null $ttl Optional. The TTL value of this item. If no value is sent and
-     *                                    the driver supports TTL then the library may set a default value
-     *                                    for it or let the driver take care of that.
-     */
-    public function createCachedConditionGenerator(QueryBuilder $queryBuilder, SearchCondition $searchCondition, \DateInterval | int | null $ttl = 0): ConditionGenerator
-    {
-        if ($this->cacheDriver === null) {
-            return new SqlConditionGenerator($queryBuilder, $searchCondition);
-        }
-
-        return new CachedConditionGenerator($queryBuilder, $searchCondition, $this->cacheDriver, $ttl);
-    }
-}
diff --git a/lib/Doctrine/Dbal/Extension/Conversion/AgeDateConversion.php b/lib/Doctrine/Dbal/Extension/Conversion/AgeDateConversion.php
deleted file mode 100644
index adcf5a10..00000000
--- a/lib/Doctrine/Dbal/Extension/Conversion/AgeDateConversion.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion;
-
-use Doctrine\DBAL\Types\Types;
-use Rollerworks\Component\Search\Doctrine\Dbal\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Dbal\ValueConversion;
-
-final class AgeDateConversion implements ColumnConversion, ValueConversion
-{
-    public function convertColumn(string $column, array $options, ConversionHints $hints): string
-    {
-        if ($hints->getProcessingValue() instanceof \DateTimeInterface) {
-            return "CAST({$column} AS DATE)";
-        }
-
-        $platform = $hints->getPlatformName();
-
-        $convertMap = [];
-        $convertMap['pgsql'] = "to_char(age(%1\$s), 'YYYY'::text)::integer";
-        $convertMap['mysql'] = "(DATE_FORMAT(NOW(), '%%Y') - DATE_FORMAT(%1\$s, '%%Y') - (DATE_FORMAT(NOW(), '00-%%m-%%d') < DATE_FORMAT(%1\$s, '00-%%m-%%d')))";
-        $convertMap['mssql'] = 'DATEDIFF(hour, %1$s, GETDATE())/8766';
-        $convertMap['oci'] = 'trunc((months_between(sysdate, (sysdate - %1$s)))/12)';
-        $convertMap['mock'] = 'search_conversion_age(%1$s)';
-
-        if (isset($convertMap[$platform])) {
-            return \sprintf($convertMap[$platform], $column);
-        }
-
-        throw new \RuntimeException(
-            \sprintf('Unsupported platform "%s" for AgeDateConversion.', $platform)
-        );
-    }
-
-    public function convertValue(mixed $value, array $options, ConversionHints $hints): string
-    {
-        if ($value instanceof \DateTimeImmutable) {
-            return $hints->createParamReferenceFor($value, Types::DATETIME_IMMUTABLE);
-        }
-
-        if ($value instanceof \DateTime) {
-            return $hints->createParamReferenceFor($value, Types::DATETIME_MUTABLE);
-        }
-
-        return $hints->createParamReferenceFor($value, 'integer');
-    }
-}
diff --git a/lib/Doctrine/Dbal/Extension/Conversion/ChildCountConversion.php b/lib/Doctrine/Dbal/Extension/Conversion/ChildCountConversion.php
deleted file mode 100644
index 18c166ad..00000000
--- a/lib/Doctrine/Dbal/Extension/Conversion/ChildCountConversion.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-
-/**
- * Allows counting the number of parent/children references.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class ChildCountConversion implements ColumnConversion
-{
-    public function convertColumn(string $column, array $options, ConversionHints $hints): string
-    {
-        return '(SELECT COUNT(*) FROM ' . $options['table_name'] . ' WHERE ' . $options['table_column'] . " = {$column})";
-    }
-}
diff --git a/lib/Doctrine/Dbal/Extension/Conversion/DateIntervalConversion.php b/lib/Doctrine/Dbal/Extension/Conversion/DateIntervalConversion.php
deleted file mode 100644
index 04ae7973..00000000
--- a/lib/Doctrine/Dbal/Extension/Conversion/DateIntervalConversion.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion;
-
-use Carbon\CarbonInterval;
-use Doctrine\DBAL\Types\Types;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Dbal\ValueConversion;
-
-final class DateIntervalConversion implements ValueConversion
-{
-    /**
-     * @param CarbonInterval|\DateTimeImmutable $value
-     */
-    public function convertValue(mixed $value, array $options, ConversionHints $hints): string
-    {
-        if ($value instanceof \DateTimeImmutable) {
-            return $hints->createParamReferenceFor($value, Types::DATETIME_IMMUTABLE);
-        }
-
-        $platform = $hints->getPlatformName();
-
-        $value = clone $value;
-        $value->locale('en');
-
-        if ($platform === 'pgsql' || $platform === 'mock') {
-            $intervalString = 'CAST(' . $hints->createParamReferenceFor($value->forHumans()) . ' AS interval)';
-        } elseif ($platform === 'mysql') {
-            $intervalString = self::convertForMysql($value);
-        } else {
-            throw new \RuntimeException(
-                \sprintf('Unsupported platform "%s" for DateIntervalConversion.', $platform)
-            );
-        }
-
-        if ($value->invert === 1) {
-            return 'NOW() - ' . $intervalString;
-        }
-
-        return 'NOW() + ' . $intervalString;
-    }
-
-    public static function convertForMysql(CarbonInterval $value): string
-    {
-        $negative = $value->invert === 1;
-
-        $handler = static function (array $units) use ($negative) {
-            foreach ($units as &$value) {
-                // MySQL doesn't support plural names.
-                $value = mb_strtoupper(mb_rtrim((string) $value, 's'));
-            }
-
-            return implode($negative ? ' - INTERVAL ' : ' + INTERVAL ', $units);
-        };
-
-        // Note. Don't use parameters here, values are already pre-formatted.
-        return 'INTERVAL ' . $value->forHumans(['join' => $handler]);
-    }
-}
diff --git a/lib/Doctrine/Dbal/Extension/Conversion/MoneyValueConversion.php b/lib/Doctrine/Dbal/Extension/Conversion/MoneyValueConversion.php
deleted file mode 100644
index a8b62285..00000000
--- a/lib/Doctrine/Dbal/Extension/Conversion/MoneyValueConversion.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion;
-
-use Doctrine\DBAL\Types\Types as DbType;
-use Money\Currencies\ISOCurrencies;
-use Money\Formatter\DecimalMoneyFormatter;
-use Rollerworks\Component\Search\Doctrine\Dbal\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Dbal\ValueConversion;
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-
-final class MoneyValueConversion implements ValueConversion, ColumnConversion
-{
-    private DecimalMoneyFormatter $formatter;
-    private ISOCurrencies $currencies;
-
-    public function __construct()
-    {
-        $this->currencies = new ISOCurrencies();
-        $this->formatter = new DecimalMoneyFormatter($this->currencies);
-    }
-
-    /**
-     * @param MoneyValue $value
-     */
-    public function convertValue(mixed $value, array $options, ConversionHints $hints): string
-    {
-        $sqlValue = $hints->createParamReferenceFor($this->formatter->format($value->value));
-        $castType = $this->getCastType($this->currencies->subunitFor($value->value->getCurrency()), $hints);
-
-        return "CAST({$sqlValue} AS {$castType})";
-    }
-
-    public function convertColumn(string $column, array $options, ConversionHints $hints): string
-    {
-        if ($hints->field->dbTypeName === DbType::DECIMAL) {
-            return $column;
-        }
-
-        $processingValue = $hints->getProcessingValue();
-        \assert($processingValue instanceof MoneyValue);
-
-        $substr = $hints->connection->getDatabasePlatform()->getSubstringExpression($column, '5');
-        $castType = $this->getCastType($this->currencies->subunitFor($processingValue->value->getCurrency()), $hints);
-
-        return "CAST({$substr} AS {$castType})";
-    }
-
-    private function getCastType(int $scale, ConversionHints $hints): string
-    {
-        if ($hints->getPlatformName() === 'mysql') {
-            return "DECIMAL(10, {$scale})";
-        }
-
-        return $hints->connection->getDatabasePlatform()->getDecimalTypeDeclarationSQL(
-            ['scale' => $scale, 'precision' => 10, 'name' => $hints->field->mappingName]
-        );
-    }
-}
diff --git a/lib/Doctrine/Dbal/Extension/DoctrineDbalExtension.php b/lib/Doctrine/Dbal/Extension/DoctrineDbalExtension.php
deleted file mode 100644
index 4e82f58f..00000000
--- a/lib/Doctrine/Dbal/Extension/DoctrineDbalExtension.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal;
-
-use Rollerworks\Component\Search\AbstractExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\BirthdayTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\ChildCountType;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\DateTimeTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\FieldTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\MoneyTypeExtension;
-
-class DoctrineDbalExtension extends AbstractExtension
-{
-    protected function loadTypesExtensions(): array
-    {
-        return [
-            new FieldTypeExtension(),
-            new DateTimeTypeExtension(),
-            new BirthdayTypeExtension(),
-            new MoneyTypeExtension(),
-        ];
-    }
-
-    protected function loadTypes(): array
-    {
-        return [
-            new ChildCountType(),
-        ];
-    }
-}
diff --git a/lib/Doctrine/Dbal/Extension/Type/BirthdayTypeExtension.php b/lib/Doctrine/Dbal/Extension/Type/BirthdayTypeExtension.php
deleted file mode 100644
index fb7f2dac..00000000
--- a/lib/Doctrine/Dbal/Extension/Type/BirthdayTypeExtension.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion\AgeDateConversion;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * Configures the AgeConversion for Doctrine ORM.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class BirthdayTypeExtension extends AbstractFieldTypeExtension
-{
-    public function __construct(
-        private readonly AgeDateConversion $conversion = new AgeDateConversion(),
-    ) {
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            ['doctrine_dbal_conversion' => $this->conversion]
-        );
-    }
-
-    public function getExtendedType(): string
-    {
-        return BirthdayType::class;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Extension/Type/ChildCountType.php b/lib/Doctrine/Dbal/Extension/Type/ChildCountType.php
deleted file mode 100644
index 71fa8041..00000000
--- a/lib/Doctrine/Dbal/Extension/Type/ChildCountType.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion\ChildCountConversion;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * ItemCountType allows a parent/children-reference counting.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class ChildCountType extends AbstractFieldType
-{
-    protected ChildCountConversion $conversion;
-
-    public function __construct()
-    {
-        $this->conversion = new ChildCountConversion();
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $conversion = $this->conversion;
-
-        $resolver->setRequired(['table_name', 'table_column']);
-        $resolver->setDefaults(
-            [
-                'doctrine_dbal_conversion' => static fn () => $conversion,
-            ]
-        );
-    }
-
-    public function getParent(): string
-    {
-        return IntegerType::class;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Extension/Type/DateTimeTypeExtension.php b/lib/Doctrine/Dbal/Extension/Type/DateTimeTypeExtension.php
deleted file mode 100644
index 8427bda8..00000000
--- a/lib/Doctrine/Dbal/Extension/Type/DateTimeTypeExtension.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion\DateIntervalConversion;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-final class DateTimeTypeExtension extends AbstractFieldTypeExtension
-{
-    private DateIntervalConversion $conversion;
-
-    public function __construct()
-    {
-        $this->conversion = new DateIntervalConversion();
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'doctrine_dbal_conversion' => fn (Options $options): ?DateIntervalConversion => $options['allow_relative'] ? $this->conversion : null,
-        ]);
-    }
-
-    public function getExtendedType(): string
-    {
-        return DateTimeType::class;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Extension/Type/FieldTypeExtension.php b/lib/Doctrine/Dbal/Extension/Type/FieldTypeExtension.php
deleted file mode 100644
index d0827e92..00000000
--- a/lib/Doctrine/Dbal/Extension/Type/FieldTypeExtension.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Dbal\ValueConversion;
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * Allow to configure Doctrine ORM conversions.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class FieldTypeExtension extends AbstractFieldTypeExtension
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(['doctrine_dbal_conversion' => null]);
-        $resolver->setAllowedTypes(
-            'doctrine_dbal_conversion',
-            [
-                'null',
-                \Closure::class,
-                ColumnConversion::class,
-                ValueConversion::class,
-            ]
-        );
-    }
-
-    public function getExtendedType(): string
-    {
-        return SearchFieldType::class;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Extension/Type/MoneyTypeExtension.php b/lib/Doctrine/Dbal/Extension/Type/MoneyTypeExtension.php
deleted file mode 100644
index 4405c266..00000000
--- a/lib/Doctrine/Dbal/Extension/Type/MoneyTypeExtension.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion\MoneyValueConversion;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * Configures the MoneyValueConversion for Doctrine DBAL.
- *
- * Note: Due to technical limitations currently the option
- * "doctrine_dbal_with_currency" has no effect and the
- * currency comparisons is always ignored.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class MoneyTypeExtension extends AbstractFieldTypeExtension
-{
-    public function __construct(
-        private readonly MoneyValueConversion $conversion = new MoneyValueConversion(),
-    ) {
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'doctrine_dbal_conversion' => $this->conversion,
-                'doctrine_dbal_with_currency' => false,
-            ]
-        );
-
-        $resolver->setAllowedTypes('doctrine_dbal_with_currency', ['bool']);
-    }
-
-    public function getExtendedType(): string
-    {
-        return MoneyType::class;
-    }
-}
diff --git a/lib/Doctrine/Dbal/FieldConfigurationSet.php b/lib/Doctrine/Dbal/FieldConfigurationSet.php
deleted file mode 100644
index 9f674f3b..00000000
--- a/lib/Doctrine/Dbal/FieldConfigurationSet.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\Query\QueryField;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\FieldSet;
-
-/**
- * @internal
- */
-final class FieldConfigurationSet
-{
-    /** @var array<string, array<string|null, QueryField>> */
-    public array $fields = [];
-
-    public function __construct(
-        private readonly FieldSet $fieldSet,
-    ) {
-    }
-
-    public function setField(string $mappingName, string $column, ?string $alias = null, string $type = 'string'): void
-    {
-        $mappingIdx = '';
-        $fieldName = $mappingName;
-
-        if (str_contains($mappingName, '#')) {
-            [$fieldName, $mappingIdx] = explode('#', $mappingName, 2);
-            unset($this->fields[$fieldName]['']);
-        } else {
-            $this->fields[$mappingName] = [];
-        }
-
-        if (OrderField::isOrder($fieldName) && str_contains($mappingName, '#')) {
-            throw new \RuntimeException(\sprintf('Ordering field "%s" cannot be registered with multiple mapping.', $fieldName));
-        }
-
-        $this->fields[$fieldName][$mappingIdx] = new QueryField(
-            $mappingName,
-            $this->fieldSet->get($fieldName),
-            $type,
-            $column,
-            $alias
-        );
-    }
-}
diff --git a/lib/Doctrine/Dbal/LICENSE b/lib/Doctrine/Dbal/LICENSE
deleted file mode 100644
index 5c5b0fa1..00000000
--- a/lib/Doctrine/Dbal/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014-present Sebastiaan Stok
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/lib/Doctrine/Dbal/Query/QueryField.php b/lib/Doctrine/Dbal/Query/QueryField.php
deleted file mode 100644
index 764364ee..00000000
--- a/lib/Doctrine/Dbal/Query/QueryField.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\Query;
-
-use Doctrine\DBAL\Types\Type as DbType;
-use Rollerworks\Component\Search\Doctrine\Dbal\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Dbal\ValueConversion;
-use Rollerworks\Component\Search\Field\FieldConfig;
-
-/**
- * Holds the mapping information of a search field for Doctrine DBAL.
- *
- * Information is provided in public properties for better performance.
- * This information is read-only and should not be changed afterwards.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-class QueryField
-{
-    public readonly DbType $dbType;
-    public readonly string $dbTypeName;
-    public readonly string $column;
-    public ?object $columnConversion;
-    public ?object $valueConversion;
-    public readonly string $tableColumn;
-
-    public function __construct(
-        public string $mappingName,
-        public FieldConfig $fieldConfig,
-        string $dbType,
-        string $column,
-        public ?string $alias = null,
-    ) {
-        $this->tableColumn = $column;
-        $this->column = ($alias ? $alias . '.' : '') . $column;
-        $this->dbType = DbType::getType($dbType);
-        $this->dbTypeName = $dbType;
-
-        $this->initConversions($fieldConfig);
-    }
-
-    /**
-     * @return array{mapping_name: string, field: string, db_type: string}
-     */
-    public function __serialize(): array
-    {
-        return [
-            'mapping_name' => $this->mappingName,
-            'field' => $this->fieldConfig->getName(),
-            'db_type' => $this->dbTypeName,
-        ];
-    }
-
-    /**
-     * @param mixed[] $data
-     */
-    public function __unserialize(array $data): void
-    {
-        // noop
-    }
-
-    protected function initConversions(FieldConfig $fieldConfig): void
-    {
-        $converter = $fieldConfig->getOption('doctrine_dbal_conversion');
-
-        if ($converter instanceof \Closure) {
-            $converter = $converter();
-        }
-
-        $this->columnConversion = $converter instanceof ColumnConversion ? $converter : null;
-        $this->valueConversion = $converter instanceof ValueConversion ? $converter : null;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Query/QueryGenerator.php b/lib/Doctrine/Dbal/Query/QueryGenerator.php
deleted file mode 100644
index f05fa6dc..00000000
--- a/lib/Doctrine/Dbal/Query/QueryGenerator.php
+++ /dev/null
@@ -1,402 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\Query;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Query\QueryBuilder;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Dbal\QueryPlatform\AbstractQueryPlatform;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * This class is only to be used by packages of RollerworksSearch
- * and is considered internal.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * @internal
- */
-final class QueryGenerator
-{
-    /**
-     * @param array<string, array<string|null, QueryField>> $fields [field-name][mapping-index] => {QueryField}
-     */
-    public function __construct(
-        private readonly Connection $connection,
-        private readonly AbstractQueryPlatform $queryPlatform,
-        private readonly array $fields,
-    ) {
-    }
-
-    /**
-     * @param array<string, array<string, QueryField>> $fields
-     */
-    public static function applySortingTo(?SearchOrder $order, QueryBuilder $qb, array $fields): void
-    {
-        if ($order === null) {
-            return;
-        }
-
-        foreach ($order->getFields() as $fieldName => $direction) {
-            if (! isset($fields[$fieldName])) {
-                continue;
-            }
-
-            if (\count($fields[$fieldName]) > 1) {
-                throw new BadMethodCallException(\sprintf('Field "%s" is registered as multiple mapping and cannot be used for sorting.', $fieldName));
-            }
-
-            $qb->addOrderBy($fields[$fieldName]['']->column, mb_strtoupper($direction));
-        }
-    }
-
-    public function getWhereClause(SearchCondition $searchCondition): string
-    {
-        $primaryCondition = $searchCondition->getPrimaryCondition();
-        $conditions = [];
-
-        if ($primaryCondition !== null) {
-            $conditions[] = $this->getGroupQuery($primaryCondition->getValuesGroup());
-        }
-
-        $conditions[] = $this->getGroupQuery($searchCondition->getValuesGroup());
-
-        return self::implodeWithValue(' AND ', $conditions);
-    }
-
-    public function getGroupQuery(ValuesGroup $valuesGroup): string
-    {
-        $query = [];
-
-        foreach ($valuesGroup->getFields() as $mappingConfig => $values) {
-            if (! isset($this->fields[$mappingConfig])) {
-                continue;
-            }
-
-            $groupSql = [];
-            $inclusiveSqlGroup = [];
-            $exclusiveSqlGroup = [];
-
-            foreach ($this->fields[$mappingConfig] as $mappingsConfig) {
-                $this->processFieldValues($values, $mappingsConfig, $inclusiveSqlGroup, $exclusiveSqlGroup);
-            }
-
-            $groupSql[] = self::implodeValuesWithWrapping(' OR ', $inclusiveSqlGroup, '(', ')');
-            $groupSql[] = self::implodeValuesWithWrapping(' AND ', $exclusiveSqlGroup, '(', ')');
-            $query[] = self::wrapIfNotEmpty(self::implodeWithValue(' AND ', $groupSql), '(', ')');
-        }
-
-        $finalQuery = [];
-
-        // Wrap all the fields as a group
-        $finalQuery[] = self::wrapIfNotEmpty(
-            self::implodeWithValue(' ' . mb_strtoupper($valuesGroup->getGroupLogical()) . ' ', $query),
-            '(',
-            ')'
-        );
-
-        $this->processGroups($valuesGroup->getGroups(), $finalQuery);
-
-        return self::implodeValuesWithWrapping(' AND ', $finalQuery, '(', ')');
-    }
-
-    /**
-     * @param ValuesGroup[] $groups
-     *
-     * @param-out string[]  $query
-     */
-    private function processGroups(array $groups, array &$query): void
-    {
-        /** @var string[] $groupSql */
-        $groupSql = [];
-
-        foreach ($groups as $group) {
-            $groupSql[] = $this->getGroupQuery($group);
-        }
-
-        $query[] = self::wrapIfNotEmpty(self::implodeWithValue(' OR ', $groupSql), '(', ')');
-    }
-
-    /**
-     * @param mixed[] $values
-     *
-     * @param-out string[] $query
-     */
-    private function processSingleValues(array $values, QueryField $mappingConfig, array &$query, bool $exclude, ConversionHints $hints): void
-    {
-        // NOTE. Using OR/AND seems to be less-performant on some vendors (*namely MySQL*) but this heavily depends
-        // on the engine's configuration and other aspects.
-
-        $patterns = ['%s = %s', '%s <> %s'];
-
-        $hints->context = ConversionHints::CONTEXT_SIMPLE_VALUE;
-
-        foreach ($values as $value) {
-            $hints->originalValue = $value;
-            $column = $this->queryPlatform->getFieldColumn($mappingConfig, $mappingConfig->column, $hints);
-
-            $query[] = \sprintf(
-                $patterns[(int) $exclude],
-                $column,
-                $this->queryPlatform->getValueAsSql($value, $mappingConfig, $hints)
-            );
-        }
-    }
-
-    /**
-     * @param Range[] $ranges
-     *
-     * @param-out string[] $query
-     */
-    private function processRanges(array $ranges, QueryField $mappingConfig, array &$query, bool $exclude, ConversionHints $hints): void
-    {
-        foreach ($ranges as $range) {
-            $hints->originalValue = $range;
-            $hints->context = ConversionHints::CONTEXT_RANGE_LOWER_BOUND;
-
-            $column = $this->queryPlatform->getFieldColumn($mappingConfig, $mappingConfig->column, $hints);
-            $lowerBound = $this->queryPlatform->getValueAsSql($range->getLower(), $mappingConfig, $hints);
-
-            $hints->context = ConversionHints::CONTEXT_RANGE_UPPER_BOUND;
-            $upperBound = $this->queryPlatform->getValueAsSql($range->getUpper(), $mappingConfig, $hints);
-
-            $query[] = \sprintf(
-                $this->getRangePattern($range, $exclude),
-                $column,
-                $lowerBound,
-                $column,
-                $upperBound
-            );
-        }
-    }
-
-    /**
-     * @return string either "(%s >= %s AND %s <= %s)"
-     */
-    private function getRangePattern(Range $range, bool $exclude = false): string
-    {
-        $pattern = '(%s ';
-
-        if ($exclude) {
-            $pattern .= ($range->isLowerInclusive() ? '<=' : '<');
-            $pattern .= ' %s OR %s '; // lower-bound value, AND fieldname
-            $pattern .= ($range->isUpperInclusive() ? '>=' : '>');
-            $pattern .= ' %s'; // upper-bound value
-        } else {
-            $pattern .= ($range->isLowerInclusive() ? '>=' : '>');
-            $pattern .= ' %s AND %s '; // lower-bound value, AND fieldname
-            $pattern .= ($range->isUpperInclusive() ? '<=' : '<');
-            $pattern .= ' %s'; // upper-bound value
-        }
-
-        $pattern .= ')';
-
-        return $pattern;
-    }
-
-    /**
-     * @param Compare[] $compares
-     *
-     * @param-out string[] $query
-     */
-    private function processCompares(array $compares, QueryField $mappingConfig, array &$query, bool $exclude, ConversionHints $hints): void
-    {
-        $valuesQuery = [];
-        $hints->context = ConversionHints::CONTEXT_COMPARISON;
-
-        foreach ($compares as $comparison) {
-            if ($exclude !== ($comparison->getOperator() === '<>')) {
-                continue;
-            }
-
-            $hints->originalValue = $comparison;
-            $column = $this->queryPlatform->getFieldColumn($mappingConfig, $mappingConfig->column, $hints);
-
-            $valuesQuery[] = \sprintf(
-                '%s %s %s',
-                $column,
-                $comparison->getOperator(),
-                $this->queryPlatform->getValueAsSql(
-                    $comparison->getValue(),
-                    $mappingConfig,
-                    $hints
-                )
-            );
-        }
-
-        if (\count($valuesQuery) > 1 && ! $exclude) {
-            $query[] = self::implodeValuesWithWrapping(' AND ', $valuesQuery, '(', ')');
-        } else {
-            $query[] = self::implodeWithValue(' AND ', $valuesQuery);
-        }
-    }
-
-    /**
-     * @param PatternMatch[] $patternMatchers
-     *
-     * @param-out string[] $query
-     */
-    private function processPatternMatchers(array $patternMatchers, QueryField $mappingConfig, array &$query, bool $exclude, ConversionHints $hints): void
-    {
-        $hints->context = ConversionHints::CONTEXT_SIMPLE_VALUE;
-
-        foreach ($patternMatchers as $patternMatch) {
-            if ($exclude !== $patternMatch->isExclusive()) {
-                continue;
-            }
-
-            $query[] = $this->queryPlatform->getPatternMatcher(
-                $patternMatch,
-                $this->queryPlatform->getFieldColumn($mappingConfig, $mappingConfig->column, $hints)
-            );
-        }
-    }
-
-    /**
-     * @param string[] $values
-     */
-    private static function implodeWithValue(string $glue, array $values): string
-    {
-        // Remove the empty values
-        $values = array_filter($values, static fn (string $val): bool => $val !== '');
-
-        if (\count($values) === 0) {
-            return '';
-        }
-
-        return implode($glue, $values);
-    }
-
-    /**
-     * @param string[] $values
-     */
-    private static function implodeValuesWithWrapping(string $glue, array $values, string $prefix, string $suffix): string
-    {
-        // Remove the empty values
-        $values = array_filter($values, static fn (string $val): bool => $val !== '');
-
-        if (\count($values) === 0) {
-            return '';
-        }
-
-        $value = implode($glue, $values);
-
-        if (\count($values) > 1) {
-            return $prefix . $value . $suffix;
-        }
-
-        return $value;
-    }
-
-    private static function wrapIfNotEmpty(string $value, string $prefix, string $suffix): string
-    {
-        if ($value === '') {
-            return '';
-        }
-
-        return $prefix . $value . $suffix;
-    }
-
-    /**
-     * @param-out string[] $inclusiveSqlGroup
-     * @param-out string[] $exclusiveSqlGroup
-     */
-    private function processFieldValues(ValuesBag $values, QueryField $mappingConfig, array &$inclusiveSqlGroup, array &$exclusiveSqlGroup): void
-    {
-        $hints = new ConversionHints($this->queryPlatform);
-        $hints->field = $mappingConfig;
-        $hints->column = $mappingConfig->column;
-        $hints->connection = $this->connection;
-
-        $this->processSingleValues(
-            $values->getSimpleValues(),
-            $mappingConfig,
-            $inclusiveSqlGroup,
-            false,
-            $hints
-        );
-
-        $this->processRanges(
-            $values->get(Range::class),
-            $mappingConfig,
-            $inclusiveSqlGroup,
-            false,
-            $hints
-        );
-
-        $this->processCompares(
-            $values->get(Compare::class),
-            $mappingConfig,
-            $inclusiveSqlGroup,
-            false,
-            $hints
-        );
-
-        $this->processPatternMatchers(
-            $values->get(PatternMatch::class),
-            $mappingConfig,
-            $inclusiveSqlGroup,
-            false,
-            $hints
-        );
-
-        $this->processSingleValues(
-            $values->getExcludedSimpleValues(),
-            $mappingConfig,
-            $exclusiveSqlGroup,
-            true,
-            $hints
-        );
-
-        $this->processRanges(
-            $values->get(ExcludedRange::class),
-            $mappingConfig,
-            $exclusiveSqlGroup,
-            true,
-            $hints
-        );
-
-        $this->processPatternMatchers(
-            $values->get(PatternMatch::class),
-            $mappingConfig,
-            $exclusiveSqlGroup,
-            true,
-            $hints
-        );
-
-        $this->processCompares(
-            $values->get(Compare::class),
-            $mappingConfig,
-            $exclusiveSqlGroup,
-            true,
-            $hints
-        );
-
-        $hints = null;
-    }
-
-    public function getParameters(): ArrayCollection
-    {
-        return $this->queryPlatform->getParameters();
-    }
-}
diff --git a/lib/Doctrine/Dbal/QueryPlatform/AbstractQueryPlatform.php b/lib/Doctrine/Dbal/QueryPlatform/AbstractQueryPlatform.php
deleted file mode 100644
index 8de7b6b9..00000000
--- a/lib/Doctrine/Dbal/QueryPlatform/AbstractQueryPlatform.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\QueryPlatform;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\DBAL\Connection;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Dbal\Query\QueryField;
-use Rollerworks\Component\Search\Value\PatternMatch;
-
-/**
- * The AbstractQueryPlatform provides a shared base functionality
- * for all the query platforms.
- *
- * Note that is class is also used by the Doctrine ORM processor and therefore
- * methods and properties must be protected and easy to overwrite.
- */
-abstract class AbstractQueryPlatform
-{
-    /** @var ArrayCollection<string, array{0: mixed, 1: string}> */
-    private readonly ArrayCollection $parameters;
-
-    private int $parameterIdx = -1;
-
-    public function __construct(
-        protected Connection $connection,
-        public readonly string $platformName,
-    ) {
-        $this->parameters = new ArrayCollection();
-    }
-
-    public function getValueAsSql(mixed $value, QueryField $mappingConfig, ConversionHints $hints): string
-    {
-        if ($mappingConfig->valueConversion !== null) {
-            return $mappingConfig->valueConversion->convertValue(
-                $value,
-                $mappingConfig->fieldConfig->getOptions(),
-                $hints
-            );
-        }
-
-        return $this->createParamReferenceFor($value, $mappingConfig->dbTypeName);
-    }
-
-    public function createParamReferenceFor(mixed $value, ?string $type = null): string
-    {
-        if ($type === null) {
-            $type = 'string';
-        }
-
-        $name = 'search_' . (++$this->parameterIdx);
-        $this->parameters->set($name, [$value, $type]);
-
-        return ':' . $name;
-    }
-
-    public function getFieldColumn(QueryField $mappingConfig, string $column, ConversionHints $hints): string
-    {
-        if ($mappingConfig->columnConversion !== null) {
-            return $mappingConfig->columnConversion->convertColumn(
-                $column,
-                $mappingConfig->fieldConfig->getOptions(),
-                $hints
-            );
-        }
-
-        return $column;
-    }
-
-    public function getPatternMatcher(PatternMatch $patternMatch, string $column): string
-    {
-        if (\in_array($patternMatch->getType(), [PatternMatch::PATTERN_EQUALS, PatternMatch::PATTERN_NOT_EQUALS], true)) {
-            $value = $this->createParamReferenceFor($patternMatch->getValue(), 'text');
-
-            if ($patternMatch->isCaseInsensitive()) {
-                $column = "LOWER({$column})";
-                $value = "LOWER({$value})";
-            }
-
-            return $column . ($patternMatch->isExclusive() ? ' <>' : ' =') . " {$value}";
-        }
-
-        $patternMap = [
-            PatternMatch::PATTERN_STARTS_WITH => ['%s', "'%%'"],
-            PatternMatch::PATTERN_NOT_STARTS_WITH => ['%s', "'%%'"],
-            PatternMatch::PATTERN_CONTAINS => ["'%%'", '%s', "'%%'"],
-            PatternMatch::PATTERN_NOT_CONTAINS => ["'%%'", '%s', "'%%'"],
-            PatternMatch::PATTERN_ENDS_WITH => ["'%%'", '%s'],
-            PatternMatch::PATTERN_NOT_ENDS_WITH => ["'%%'", '%s'],
-        ];
-
-        $value = addcslashes($patternMatch->getValue(), $this->getLikeEscapeChars());
-        $value = \sprintf($this->connection->getDatabasePlatform()->getConcatExpression(...$patternMap[$patternMatch->getType()]), $this->createParamReferenceFor($value, 'text'));
-
-        if ($patternMatch->isCaseInsensitive()) {
-            $column = "LOWER({$column})";
-            $value = "LOWER({$value})";
-        }
-
-        return $column . ($patternMatch->isExclusive() ? ' NOT' : '') . " LIKE {$value}";
-    }
-
-    /**
-     * Returns the list of characters to escape (per character).
-     */
-    protected function getLikeEscapeChars(): string
-    {
-        return '%_';
-    }
-
-    /**
-     * @return ArrayCollection<string, array{0: mixed, 1: string}>
-     */
-    public function getParameters(): ArrayCollection
-    {
-        return $this->parameters;
-    }
-}
diff --git a/lib/Doctrine/Dbal/QueryPlatform/MssqlQueryPlatform.php b/lib/Doctrine/Dbal/QueryPlatform/MssqlQueryPlatform.php
deleted file mode 100644
index 622e63ee..00000000
--- a/lib/Doctrine/Dbal/QueryPlatform/MssqlQueryPlatform.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\QueryPlatform;
-
-class MssqlQueryPlatform extends AbstractQueryPlatform
-{
-    protected function getLikeEscapeChars(): string
-    {
-        return '%_[]';
-    }
-}
diff --git a/lib/Doctrine/Dbal/QueryPlatform/SqlQueryPlatform.php b/lib/Doctrine/Dbal/QueryPlatform/SqlQueryPlatform.php
deleted file mode 100644
index c7d905c3..00000000
--- a/lib/Doctrine/Dbal/QueryPlatform/SqlQueryPlatform.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\QueryPlatform;
-
-final class SqlQueryPlatform extends AbstractQueryPlatform
-{
-}
diff --git a/lib/Doctrine/Dbal/README.md b/lib/Doctrine/Dbal/README.md
deleted file mode 100644
index db2e210c..00000000
--- a/lib/Doctrine/Dbal/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-RollerworksSearch Doctrine DBAL extension
-=========================================
-
-This package provides the Doctrine DBAL integration for [RollerworksSearch][1].
-
-If you'd like to contribute to this project, please go the
-main [RollerworksSearch][1] repository and read the [Contributing][2] section.
-
-Installation
-------------
-
-To install this extension, add the `search-doctrine-dbal` to your composer.json
-
-```bash
-$ php composer.phar require rollerworks/search-doctrine-dbal
-```
-
-License
--------
-
-The source of this package is subject to the MIT license that is bundled
-with this source code in the file [LICENSE](LICENSE).
-
-[1]: https://github.com/rollerworks/RollerworksSearch
-[2]: https://github.com/rollerworks/RollerworksSearch#contributing
diff --git a/lib/Doctrine/Dbal/SqlConditionGenerator.php b/lib/Doctrine/Dbal/SqlConditionGenerator.php
deleted file mode 100644
index 4b5ef6a4..00000000
--- a/lib/Doctrine/Dbal/SqlConditionGenerator.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
-use Doctrine\DBAL\Platforms\OraclePlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SQLitePlatform;
-use Doctrine\DBAL\Platforms\SQLServerPlatform;
-use Doctrine\DBAL\Query\QueryBuilder;
-use Rollerworks\Component\Search\Doctrine\Dbal\Query\QueryGenerator;
-use Rollerworks\Component\Search\Doctrine\Dbal\QueryPlatform\AbstractQueryPlatform;
-use Rollerworks\Component\Search\Doctrine\Dbal\QueryPlatform\SqlQueryPlatform;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\Mocks\DatabasePlatformMock;
-
-/**
- * SearchCondition Doctrine DBAL ConditionGenerator.
- *
- * This class provides the functionality for creating an SQL WHERE-clause
- * based on the provided SearchCondition.
- *
- * Note that only fields that have been configured with `setField()`
- * will be actually used in the generated query.
- *
- * Keep the following in mind when using conversions.
- *
- *  * Conversions are performed per search field and must be stateless,
- *    they receive the db-type and connection information for the conversion process.
- *  * Conversions apply at the SQL level, meaning they must be platform specific.
- *  * SQL conversions must be properly escaped to prevent SQL injections.
- */
-final class SqlConditionGenerator implements ConditionGenerator
-{
-    private readonly FieldConfigurationSet $fieldsConfig;
-    private bool $isApplied = false;
-
-    public function __construct(
-        private readonly QueryBuilder $qb,
-        private readonly SearchCondition $searchCondition,
-    ) {
-        $this->fieldsConfig = new FieldConfigurationSet($this->searchCondition->getFieldSet());
-    }
-
-    public function setField(string $fieldName, string $column, ?string $alias = null, string $type = 'string'): self
-    {
-        if ($this->isApplied) {
-            throw new BadMethodCallException(
-                'ConditionGenerator configuration cannot be changed anymore once the condition is applied.'
-            );
-        }
-
-        $this->fieldsConfig->setField($fieldName, $column, $alias, $type);
-
-        return $this;
-    }
-
-    public function getSearchCondition(): SearchCondition
-    {
-        return $this->searchCondition;
-    }
-
-    public function getQueryBuilder(): QueryBuilder
-    {
-        return $this->qb;
-    }
-
-    public function apply(): void
-    {
-        if ($this->isApplied) {
-            trigger_error('SearchCondition was already applied. Ignoring operation.', \E_USER_WARNING);
-
-            return;
-        }
-
-        $this->isApplied = true;
-        $fields = $this->fieldsConfig->fields;
-
-        QueryGenerator::applySortingTo($this->searchCondition->getPrimaryCondition()?->getOrder(), $this->qb, $fields);
-        QueryGenerator::applySortingTo($this->searchCondition->getOrder(), $this->qb, $fields);
-
-        if (method_exists($this->qb, 'getConnection')) {
-            $connection = $this->qb->getConnection();
-        } else {
-            // XXX This is the only way to get the connection from a QueryBuilder, unless this method is restored.
-            //
-            // The DBAL generator is executed multiple levels deep, passing this with the constructor requires
-            // too much for now. This is a workaround until the DBAL generator is refactored, or the method is restored.
-            $connection = (new \ReflectionClass(QueryBuilder::class))->getProperty('connection')->getValue($this->qb);
-        }
-
-        $generator = new QueryGenerator($connection, self::getQueryPlatform($connection), $fields);
-        $whereClause = $generator->getWhereClause($this->searchCondition);
-
-        if ($whereClause !== '') {
-            $this->qb->andWhere($whereClause);
-
-            foreach ($generator->getParameters() as $name => [$value, $type]) {
-                $this->qb->setParameter($name, $value, $type);
-            }
-        }
-    }
-
-    /**
-     * @internal
-     */
-    public static function getQueryPlatform(Connection $connection): AbstractQueryPlatform
-    {
-        $dbPlatform = self::getPlatformName($connection);
-        $platformClass = 'Rollerworks\Component\Search\Doctrine\Dbal\QueryPlatform\\' . ucfirst($dbPlatform) . 'QueryPlatform';
-
-        if (! class_exists($platformClass)) {
-            $platformClass = SqlQueryPlatform::class;
-        }
-
-        return new $platformClass($connection, $dbPlatform);
-    }
-
-    private static function getPlatformName(Connection $connection): string
-    {
-        $platform = $connection->getDatabasePlatform();
-
-        return match (true) {
-            $platform instanceof AbstractMySQLPlatform => 'mysql',
-            $platform instanceof SQLitePlatform => 'sqlite',
-            $platform instanceof PostgreSQLPlatform => 'pgsql',
-            $platform instanceof OraclePlatform => 'oci',
-            $platform instanceof SQLServerPlatform => 'sqlsrv',
-            $platform instanceof DatabasePlatformMock => 'mock',
-            default => $platform::class,
-        };
-    }
-}
diff --git a/lib/Doctrine/Dbal/Test/QueryBuilderAssertion.php b/lib/Doctrine/Dbal/Test/QueryBuilderAssertion.php
deleted file mode 100644
index a6743d8d..00000000
--- a/lib/Doctrine/Dbal/Test/QueryBuilderAssertion.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\Test;
-
-use Doctrine\DBAL\Query\QueryBuilder;
-use Doctrine\DBAL\Types\Type;
-use PHPUnit\Framework\Assert;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConditionGenerator;
-
-final class QueryBuilderAssertion
-{
-    /**
-     * @phpstan-param array<string, mixed|array{0: mixed, 1: string}> $parameters by name with value or [value, type name)]
-     */
-    public static function assertQueryBuilderEquals(ConditionGenerator $generator, string $where, ?array $parameters = []): void
-    {
-        $queryBuilder = $generator->getQueryBuilder();
-        $baseDql = $queryBuilder->getSQL();
-
-        $generator->apply();
-
-        $finalDql = $queryBuilder->getSQL();
-
-        Assert::assertEquals($baseDql . $where, $finalDql);
-
-        if ($parameters !== null) {
-            self::assertQueryParametersEquals($parameters, $queryBuilder);
-        }
-    }
-
-    public static function assertQueryParametersEquals(?array $parameters, QueryBuilder $qb): void
-    {
-        if ($parameters === null) {
-            return;
-        }
-
-        $actualParameters = $qb->getParameters();
-
-        foreach ($actualParameters as $name => $value) {
-            $type = $qb->getParameterType($name);
-
-            if ($type instanceof Type) {
-                $actualParameters[$name] = [$value, Type::lookupName($type)];
-            } elseif (\is_string($type) || $type instanceof \UnitEnum) {
-                $actualParameters[$name] = [$value, $type];
-            } else {
-                $actualParameters[$name] = $value;
-            }
-        }
-
-        Assert::assertEquals($parameters, $actualParameters);
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/CachedConditionGeneratorTest.php b/lib/Doctrine/Dbal/Tests/CachedConditionGeneratorTest.php
deleted file mode 100644
index 30f204f5..00000000
--- a/lib/Doctrine/Dbal/Tests/CachedConditionGeneratorTest.php
+++ /dev/null
@@ -1,370 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal;
-
-use Doctrine\DBAL\Query\QueryBuilder;
-use PHPUnit\Framework\MockObject\MockObject;
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\Doctrine\Dbal\CachedConditionGenerator;
-use Rollerworks\Component\Search\Doctrine\Dbal\Test\QueryBuilderAssertion;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-
-/**
- * @internal
- */
-final class CachedConditionGeneratorTest extends DbalTestCase
-{
-    private QueryBuilder $query;
-    private CachedConditionGenerator $conditionGenerator;
-
-    /** @var Cache&MockObject */
-    protected MockObject $cacheDriver;
-
-    public const CACHE_KEY = 'da80730b87c4750f8c619ac64b679586ac2f9d86c53508d1a53a7c0341b4e363';
-
-    /**
-     * @test
-     */
-    public function get_where_clause_no_cache(): void
-    {
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('has')
-        ;
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('get')
-            ->with(self::CACHE_KEY)
-            ->willReturn(null)
-        ;
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('set')
-            ->with(
-                self::CACHE_KEY,
-                [
-                    '(((c.id = :search_0 OR c.id = :search_1)))',
-                    [
-                        'search_0' => [2, 'integer'],
-                        'search_1' => [5, 'integer'],
-                    ],
-                ],
-                60
-            )
-        ;
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $this->conditionGenerator,
-            ' WHERE (((c.id = :search_0 OR c.id = :search_1)))',
-            ['search_0' => [2, 'integer'], 'search_1' => [5, 'integer']]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function get_where_clause_with_cache(): void
-    {
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('has')
-        ;
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('get')
-            ->with(self::CACHE_KEY)
-            ->willReturn(["me = 'foo'", [':search' => [1, 'integer']]])
-        ;
-
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('set')
-        ;
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $this->conditionGenerator,
-            " WHERE me = 'foo'",
-            [':search' => [1, 'integer']]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function with_sorting(): void
-    {
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('has')
-        ;
-
-        // Second-key is used for (non-empty) primary-condition
-        // Note: ordering doesn't change the cache-key as ordering is applied independently.
-        $this->cacheDriver
-            ->method('get')
-            ->with(self::matchesRegularExpression('/' . self::CACHE_KEY . '|b36fdf0d3a9e9d9c9ae83797cac20d07129502ed1992675fdac841cafe3bc9bb/'))
-            ->willReturn(["me = 'foo'", [':search' => [1, 'integer']]])
-        ;
-
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('set')
-        ;
-
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->order('@id', 'DESC')
-            ->getSearchCondition()
-        ;
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $this->createCachedConditionGenerator($this->cacheDriver, $searchCondition, $this->createQuery()),
-            " WHERE me = 'foo' ORDER BY i.id DESC",
-            [':search' => [1, 'integer']],
-        );
-
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->primaryCondition()
-                ->order('@id', 'DESC')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $this->createCachedConditionGenerator($this->cacheDriver, $searchCondition, $this->createQuery()),
-            " WHERE me = 'foo' ORDER BY i.id DESC",
-            [':search' => [1, 'integer']],
-        );
-
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->order('@customer', 'DESC')
-            ->primaryCondition()
-                ->order('@id', 'DESC')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $this->createCachedConditionGenerator($this->cacheDriver, $searchCondition, $this->createQuery()),
-            " WHERE me = 'foo' ORDER BY i.id DESC, c.id DESC",
-            [':search' => [1, 'integer']],
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function does_not_store_empty_condition(): void
-    {
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())->getSearchCondition();
-
-        $this->cacheDriver = $this->createMock(Cache::class);
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('has')
-        ;
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('get')
-            ->with('b158149acd0ecc74e27a5d6f0387d987c01760264a03e5324202d6dc8ab49b69')
-            ->willReturn(null)
-        ;
-
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('set')
-        ;
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $this->createCachedConditionGenerator($this->cacheDriver, $searchCondition),
-            '',
-            []
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function cannot_apply_multiple_times(): void
-    {
-        set_error_handler(
-            static function ($errno, $errstr): void {
-                restore_error_handler();
-
-                throw new \Exception($errstr, $errno);
-            },
-            \E_ALL
-        );
-
-        $this->conditionGenerator->apply();
-
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('SearchCondition was already applied. Ignoring operation.');
-
-        $this->conditionGenerator->apply();
-    }
-
-    /**
-     * @test
-     */
-    public function with_existing_caches_and_primary_cond(): void
-    {
-        $cacheDriverProphecy = $this->prophesize(Cache::class);
-        $cacheDriverProphecy->get('c26c585aab758c3797f9fd16f3831bcca97dde4db5cce381f43b027287495d69')->willReturn(["me = 'foo'", ['search_1' => ['duck', 'text']]])->shouldBeCalled();
-        $cacheDriverProphecy->get('72356eef163c9e3f2602ba1d8d8d47954e1480f379672cbf760380c05434ae71')->willReturn(["you = 'me' AND me = 'foo'", ['search_2' => ['roll', 'text']]])->shouldBeCalled();
-        $cacheDriver = $cacheDriverProphecy->reveal();
-
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('id')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $query1 = $this->createQuery();
-        $cachedConditionGenerator = $this->createCachedConditionGenerator($cacheDriver, $searchCondition, $query1);
-
-        $searchCondition2 = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('id')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->primaryCondition()
-                ->field('customer')
-                    ->addSimpleValue(2)
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $query2 = $this->createQuery();
-        $cachedConditionGenerator2 = $this->createCachedConditionGenerator($cacheDriver, $searchCondition2, $query2);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $cachedConditionGenerator,
-            " WHERE me = 'foo'",
-            ['search_1' => ['duck', 'text']],
-        );
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $cachedConditionGenerator2,
-            " WHERE you = 'me' AND me = 'foo'",
-            ['search_2' => ['roll', 'text']],
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function get_where_clause_invalid_cache(): void
-    {
-        $cacheKey = '';
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('get')
-            ->with(
-                self::callback(static function (string $key) use (&$cacheKey) {
-                    $cacheKey = $key;
-
-                    return true;
-                })
-            )
-            ->willReturn([])
-        ;
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('set')
-            ->with(
-                self::callback(
-                    static function (string $key) use (&$cacheKey) {
-                        return $cacheKey === $key;
-                    }
-                ),
-                [
-                    '(((c.id = :search_0 OR c.id = :search_1)))',
-                    [
-                        'search_0' => [2, 'integer'],
-                        'search_1' => [5, 'integer'],
-                    ],
-                ],
-                60
-            )
-        ;
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $this->conditionGenerator,
-            ' WHERE (((c.id = :search_0 OR c.id = :search_1)))',
-            ['search_0' => [2, 'integer'], 'search_1' => [5, 'integer']]
-        );
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->query = $this->createQuery();
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->cacheDriver = $this->createMock(Cache::class);
-        $this->conditionGenerator = $this->createCachedConditionGenerator($this->cacheDriver, $searchCondition);
-    }
-
-    private function createQuery(): QueryBuilder
-    {
-        return $this->getConnectionMock()->createQueryBuilder()
-            ->select('I')
-            ->from('invoice', 'I')
-            ->join('I', 'customer', 'C', 'C.id = I.customer')
-        ;
-    }
-
-    private function createCachedConditionGenerator(Cache $cacheDriver, SearchCondition $searchCondition, ?QueryBuilder $qb = null): CachedConditionGenerator
-    {
-        $conditionGenerator = new CachedConditionGenerator($qb ?? $this->query, $searchCondition, $cacheDriver, 60);
-        $conditionGenerator->setField('id', 'id', 'i', 'smallint');
-        $conditionGenerator->setField('@id', 'id', 'i');
-
-        $conditionGenerator->setField('customer', 'id', 'c', 'integer');
-        $conditionGenerator->setField('@customer', 'id', 'c');
-        $conditionGenerator->setField('customer_name#first_name', 'firstName', 'c');
-        $conditionGenerator->setField('customer_name#last_name', 'lastName', 'c');
-        $conditionGenerator->setField('customer_birthday', 'birthday', 'c');
-
-        return $conditionGenerator;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/DbalExtensions/Connection.php b/lib/Doctrine/Dbal/Tests/DbalExtensions/Connection.php
deleted file mode 100644
index 31c61b9c..00000000
--- a/lib/Doctrine/Dbal/Tests/DbalExtensions/Connection.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\Tests\DbalExtensions;
-
-use Doctrine\Common\EventManager;
-use Doctrine\DBAL\Configuration;
-use Doctrine\DBAL\Connection as BaseConnection;
-use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Logging\Middleware as LoggingMiddleware;
-
-/**
- * @internal
- *
- * @see \Doctrine\Tests\DbalExtensions\Connection
- */
-final class Connection extends BaseConnection
-{
-    public QueryLog $queryLog;
-
-    public function __construct(array $params, Driver $driver, ?Configuration $config = null, ?EventManager $eventManager = null)
-    {
-        $this->queryLog = new QueryLog();
-
-        if (class_exists(LoggingMiddleware::class)) {
-            $logging = new LoggingMiddleware(new SqlLogger($this->queryLog));
-            $driver = $logging->wrap($driver);
-        } else {
-            $config ??= new Configuration();
-            $config->setSQLLogger(new LegacySqlLogger($this->queryLog));
-        }
-
-        parent::__construct($params, $driver, $config, $eventManager);
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/DbalExtensions/LegacySqlLogger.php b/lib/Doctrine/Dbal/Tests/DbalExtensions/LegacySqlLogger.php
deleted file mode 100644
index 317d04e0..00000000
--- a/lib/Doctrine/Dbal/Tests/DbalExtensions/LegacySqlLogger.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\Tests\DbalExtensions;
-
-use Doctrine\DBAL\Logging\SQLLogger;
-
-/**
- * @internal
- *
- * @see \Doctrine\Tests\DbalExtensions\LegacySqlLogger
- */
-final class LegacySqlLogger implements SQLLogger
-{
-    public function __construct(
-        private readonly QueryLog $queryLog,
-    ) {
-    }
-
-    public function startQuery($sql, ?array $params = null, ?array $types = null): void
-    {
-        $this->queryLog->logQuery($sql, $params, $types);
-    }
-
-    public function stopQuery(): void
-    {
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/DbalExtensions/QueryLog.php b/lib/Doctrine/Dbal/Tests/DbalExtensions/QueryLog.php
deleted file mode 100644
index 5a3fb2ef..00000000
--- a/lib/Doctrine/Dbal/Tests/DbalExtensions/QueryLog.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\Tests\DbalExtensions;
-
-/**
- * @internal
- *
- * @see \Doctrine\Tests\DbalExtensions\QueryLog
- */
-final class QueryLog
-{
-    /** @var list<array{sql: string, params: array|null, types: array|null}> */
-    public array $queries = [];
-
-    private bool $enabled = false;
-
-    public function logQuery(string $sql, ?array $params = null, ?array $types = null): void
-    {
-        if (! $this->enabled) {
-            return;
-        }
-
-        $this->queries[] = [
-            'sql' => $sql,
-            'params' => $params,
-            'types' => $types,
-        ];
-    }
-
-    /**
-     * @return $this
-     */
-    public function reset(): self
-    {
-        $this->enabled = false;
-        $this->queries = [];
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function enable(): self
-    {
-        $this->enabled = true;
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function disable(): self
-    {
-        $this->enabled = false;
-
-        return $this;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/DbalExtensions/SqlLogger.php b/lib/Doctrine/Dbal/Tests/DbalExtensions/SqlLogger.php
deleted file mode 100644
index dff85848..00000000
--- a/lib/Doctrine/Dbal/Tests/DbalExtensions/SqlLogger.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\Tests\DbalExtensions;
-
-use Psr\Log\AbstractLogger;
-
-/**
- * @internal
- *
- * @see \Doctrine\Tests\DbalExtensions\SqlLogger
- */
-final class SqlLogger extends AbstractLogger
-{
-    public function __construct(
-        private readonly QueryLog $queryLog,
-    ) {
-    }
-
-    public function log($level, $message, array $context = []): void
-    {
-        if (! isset($context['sql'])) {
-            return;
-        }
-
-        $this->queryLog->logQuery(
-            $context['sql'],
-            $context['params'] ?? null,
-            $context['types'] ?? null
-        );
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/DbalTestCase.php b/lib/Doctrine/Dbal/Tests/DbalTestCase.php
deleted file mode 100644
index 148c9aed..00000000
--- a/lib/Doctrine/Dbal/Tests/DbalTestCase.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal;
-
-use Doctrine\DBAL\Driver\PDO\SQLite\Driver as PDOSqlite;
-use Psr\SimpleCache\CacheInterface;
-use Rollerworks\Component\Search\Doctrine\Dbal\DoctrineDbalFactory;
-use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\DoctrineDbalExtension;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\Mocks\ConnectionMock;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\Stub\Type\InvoiceLabelType;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\Stub\Type\InvoiceStatusType;
-
-abstract class DbalTestCase extends SearchIntegrationTestCase
-{
-    protected function getFieldSet(bool $build = true)
-    {
-        $fieldSet = $this->getFactory()->createFieldSetBuilder();
-
-        $fieldSet->add('id', IntegerType::class);
-        $fieldSet->add('@id', OrderFieldType::class);
-        $fieldSet->add('label', InvoiceLabelType::class);
-        $fieldSet->add('status', InvoiceStatusType::class);
-
-        $fieldSet->add('customer', IntegerType::class);
-        $fieldSet->add('@customer', OrderFieldType::class);
-        $fieldSet->add('customer_name', TextType::class);
-        $fieldSet->add('customer_birthday', DateTimeType::class, ['allow_relative' => true]);
-
-        return $build ? $fieldSet->getFieldSet('invoice') : $fieldSet;
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        if (isset($_SERVER['DB_HOST'])) {
-            $GLOBALS['db_host'] = $_SERVER['DB_HOST'];
-        }
-
-        if (isset($_SERVER['DB_PORT'])) {
-            $GLOBALS['db_port'] = $_SERVER['DB_PORT'];
-        }
-    }
-
-    protected function getExtensions(): array
-    {
-        return [new DoctrineDbalExtension()];
-    }
-
-    protected function getDbalFactory()
-    {
-        $cacheDriver = $this->getMockBuilder(CacheInterface::class)->getMock();
-
-        return new DoctrineDbalFactory($cacheDriver);
-    }
-
-    /**
-     * @return ConnectionMock
-     */
-    protected function getConnectionMock()
-    {
-        return new ConnectionMock([], new PDOSqlite());
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/DoctrineDbalFactoryTest.php b/lib/Doctrine/Dbal/Tests/DoctrineDbalFactoryTest.php
deleted file mode 100644
index 37cf128b..00000000
--- a/lib/Doctrine/Dbal/Tests/DoctrineDbalFactoryTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal;
-
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\Doctrine\Dbal\CachedConditionGenerator;
-use Rollerworks\Component\Search\Doctrine\Dbal\DoctrineDbalFactory;
-use Rollerworks\Component\Search\Doctrine\Dbal\SqlConditionGenerator;
-use Rollerworks\Component\Search\GenericFieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class DoctrineDbalFactoryTest extends DbalTestCase
-{
-    protected DoctrineDbalFactory $factory;
-
-    /**
-     * @test
-     */
-    public function create_condition_generator(): void
-    {
-        $queryBuilder = $this->getConnectionMock()->createQueryBuilder();
-        $searchCondition = new SearchCondition(new GenericFieldSet([], 'invoice'), new ValuesGroup());
-
-        $conditionGenerator = $this->factory->createConditionGenerator($queryBuilder, $searchCondition);
-        self::assertInstanceOf(SqlConditionGenerator::class, $conditionGenerator);
-
-        self::assertSame($searchCondition, $conditionGenerator->getSearchCondition());
-        self::assertSame($queryBuilder, $conditionGenerator->getQueryBuilder());
-    }
-
-    /**
-     * @test
-     */
-    public function create_cache_condition_generator(): void
-    {
-        $queryBuilder = $this->getConnectionMock()->createQueryBuilder();
-        $searchCondition = new SearchCondition(new GenericFieldSet([], 'invoice'), new ValuesGroup());
-
-        $conditionGenerator = $this->factory->createCachedConditionGenerator($queryBuilder, $searchCondition);
-        self::assertInstanceOf(CachedConditionGenerator::class, $conditionGenerator);
-
-        self::assertSame($searchCondition, $conditionGenerator->getSearchCondition());
-        self::assertSame($queryBuilder, $conditionGenerator->getQueryBuilder());
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $cacheDriver = $this->getMockBuilder(Cache::class)->getMock();
-        $this->factory = new DoctrineDbalFactory($cacheDriver);
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/Functional/Extension/Conversion/AgeConversionTest.php b/lib/Doctrine/Dbal/Tests/Functional/Extension/Conversion/AgeConversionTest.php
deleted file mode 100644
index e9066b0f..00000000
--- a/lib/Doctrine/Dbal/Tests/Functional/Extension/Conversion/AgeConversionTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal\Functional\Extension\Conversion;
-
-use Doctrine\DBAL\Query\QueryBuilder;
-use Doctrine\DBAL\Schema\Schema as DbSchema;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConditionGenerator;
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\Functional\FunctionalDbalTestCase;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\SchemaRecord;
-
-/**
- * @group functional
- *
- * @internal
- */
-final class AgeConversionTest extends FunctionalDbalTestCase
-{
-    protected function setUpDbSchema(DbSchema $schema): void
-    {
-        $invoiceTable = $schema->createTable('site_user');
-        $invoiceTable->addColumn('id', 'integer');
-        $invoiceTable->addColumn('birthday', 'date_immutable');
-    }
-
-    /**
-     * @return SchemaRecord[]
-     */
-    protected function getDbRecords(): array
-    {
-        return [
-            SchemaRecord::create('site_user', ['id' => 'integer', 'birthday' => 'date_immutable'])
-                ->add([1, new \DateTimeImmutable('2001-01-15', new \DateTimeZone('UTC'))])
-                ->add([2, new \DateTimeImmutable('2001-05-15', new \DateTimeZone('UTC'))])
-                ->add([3, new \DateTimeImmutable('2001-10-15', new \DateTimeZone('UTC'))])
-                ->add([4, new \DateTimeImmutable('-5 years', new \DateTimeZone('UTC'))])
-            ->end(),
-        ];
-    }
-
-    protected function getQuery(): QueryBuilder
-    {
-        return $this->conn->createQueryBuilder()
-            ->select('id')
-            ->from('site_user', 'u')
-        ;
-    }
-
-    protected function configureConditionGenerator(ConditionGenerator $conditionGenerator): void
-    {
-        $conditionGenerator->setField('birthday', 'birthday', 'u', 'date_immutable');
-    }
-
-    protected function getFieldSet(bool $build = true)
-    {
-        $fieldSet = $this->getFactory()->createFieldSetBuilder();
-        $fieldSet->add('id', IntegerType::class);
-        $fieldSet->add('birthday', BirthdayType::class);
-
-        return $build ? $fieldSet->getFieldSet('user') : $fieldSet;
-    }
-
-    /**
-     * @test
-     */
-    public function with_date(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('birthday')
-                ->addSimpleValue(new \DateTimeImmutable('2001-01-15', new \DateTimeZone('UTC')))
-                ->addSimpleValue(new \DateTimeImmutable('2001-10-15', new \DateTimeZone('UTC')))
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $this->assertRecordsAreFound($condition, [1, 3]);
-    }
-
-    /**
-     * @test
-     */
-    public function with_age(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('birthday')
-                ->addSimpleValue(5)
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $this->assertRecordsAreFound($condition, [4]);
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/Functional/Extension/Conversion/ChildCountTypeTest.php b/lib/Doctrine/Dbal/Tests/Functional/Extension/Conversion/ChildCountTypeTest.php
deleted file mode 100644
index e68585d3..00000000
--- a/lib/Doctrine/Dbal/Tests/Functional/Extension/Conversion/ChildCountTypeTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal\Functional\Extension\Conversion;
-
-use Doctrine\DBAL\Query\QueryBuilder;
-use Doctrine\DBAL\Schema\Schema as DbSchema;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConditionGenerator;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\ChildCountType;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\Functional\FunctionalDbalTestCase;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\SchemaRecord;
-
-/**
- * @group functional
- *
- * @internal
- */
-final class ChildCountTypeTest extends FunctionalDbalTestCase
-{
-    protected function setUpDbSchema(DbSchema $schema): void
-    {
-        $userTable = $schema->createTable('site_user');
-        $userTable->addColumn('id', 'integer');
-        $userTable->addColumn('birthday', 'date_immutable');
-
-        $userTable = $schema->createTable('user_contact');
-        $userTable->addColumn('id', 'integer');
-        $userTable->addColumn('user_id', 'integer');
-        $userTable->addColumn('name', 'string', ['length' => 255]);
-    }
-
-    protected function getDbRecords(): array
-    {
-        return [
-            SchemaRecord::create('site_user', ['id' => 'integer', 'birthday' => 'date_immutable'])
-                ->add([1, new \DateTimeImmutable('2001-01-15', new \DateTimeZone('UTC'))])
-                ->add([2, new \DateTimeImmutable('2001-05-15', new \DateTimeZone('UTC'))])
-                ->add([3, new \DateTimeImmutable('2001-10-15', new \DateTimeZone('UTC'))])
-                ->add([4, new \DateTimeImmutable('-5 years', new \DateTimeZone('UTC'))])
-            ->end(),
-            SchemaRecord::create('user_contact', ['id' => 'integer', 'user_id' => 'integer', 'name' => 'string'])
-                ->add([1, 1, 'Doctor'])
-                ->add([2, 1, 'Leroy'])
-                ->add([3, 2, 'Peter'])
-            ->end(),
-        ];
-    }
-
-    protected function getQuery(): QueryBuilder
-    {
-        return $this->conn->createQueryBuilder()
-            ->select('id')
-            ->from('site_user', 'u')
-        ;
-    }
-
-    protected function configureConditionGenerator(ConditionGenerator $conditionGenerator): void
-    {
-        $conditionGenerator->setField('contact_count', 'id', 'u', 'integer');
-    }
-
-    protected function getFieldSet(bool $build = true)
-    {
-        $fieldSet = $this->getFactory()->createFieldSetBuilder();
-        $fieldSet->add('id', IntegerType::class);
-        $fieldSet->add('contact_count', ChildCountType::class, [
-            'table_name' => 'user_contact',
-            'table_column' => 'user_id',
-        ]);
-
-        return $build ? $fieldSet->getFieldSet('user') : $fieldSet;
-    }
-
-    /**
-     * @test
-     */
-    public function matches_count(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('contact_count')
-                ->addSimpleValue(2)
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $this->assertRecordsAreFound($condition, [1]);
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/Functional/Extension/Conversion/MoneyValueConversionTest.php b/lib/Doctrine/Dbal/Tests/Functional/Extension/Conversion/MoneyValueConversionTest.php
deleted file mode 100644
index 17193364..00000000
--- a/lib/Doctrine/Dbal/Tests/Functional/Extension/Conversion/MoneyValueConversionTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal\Functional\Extension\Conversion;
-
-use Doctrine\DBAL\Query\QueryBuilder;
-use Doctrine\DBAL\Schema\Schema as DbSchema;
-use Money\Money;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConditionGenerator;
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\Functional\FunctionalDbalTestCase;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\SchemaRecord;
-use Rollerworks\Component\Search\Value\Range;
-
-/**
- * @group functional
- *
- * @internal
- */
-final class MoneyValueConversionTest extends FunctionalDbalTestCase
-{
-    protected function setUpDbSchema(DbSchema $schema): void
-    {
-        $invoiceTable = $schema->createTable('product');
-        $invoiceTable->addColumn('id', 'integer');
-        $invoiceTable->addColumn('price', 'string', ['length' => 255]);
-        $invoiceTable->addColumn('total', 'decimal', ['scale' => 2, 'precision' => 10]);
-    }
-
-    protected function getDbRecords(): array
-    {
-        return [
-            SchemaRecord::create('product', ['id' => 'integer', 'price' => 'string', 'total' => 'decimal'])
-                ->add([1, 'EUR 50.00', '80.00'])
-                ->add([2, 'EUR 30.00', '80.00'])
-                // --
-                ->add([3, 'EUR 66.00', '90.00'])
-                ->add([4, 'EUR 70.00', '100.00'])
-            ->end(),
-        ];
-    }
-
-    protected function getQuery(): QueryBuilder
-    {
-        return $this->conn->createQueryBuilder()
-            ->select('id')
-            ->from('product', 'p')
-        ;
-    }
-
-    protected function configureConditionGenerator(ConditionGenerator $conditionGenerator): void
-    {
-        $conditionGenerator->setField('price', 'price', 'p', 'string');
-        $conditionGenerator->setField('total', 'total', 'p', 'decimal');
-    }
-
-    protected function getFieldSet(bool $build = true)
-    {
-        $fieldSet = $this->getFactory()->createFieldSetBuilder();
-        $fieldSet->add('id', IntegerType::class);
-        $fieldSet->add('price', MoneyType::class);
-        $fieldSet->add('total', MoneyType::class);
-
-        return $build ? $fieldSet->getFieldSet('product') : $fieldSet;
-    }
-
-    /**
-     * @test
-     */
-    public function with_numeric_column(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('total')
-                ->addSimpleValue(new MoneyValue(Money::EUR('9000')))
-                ->addSimpleValue(new MoneyValue(Money::EUR('10000')))
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $this->assertRecordsAreFound($condition, [3, 4]);
-    }
-
-    /**
-     * @test
-     */
-    public function with_varchar_column(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('price')
-                ->addSimpleValue(new MoneyValue(Money::EUR('5000')))
-                ->addSimpleValue(new MoneyValue(Money::EUR('3000')))
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $this->assertRecordsAreFound($condition, [1, 2]);
-    }
-
-    /**
-     * @test
-     */
-    public function with_varchar_column_and_range(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('price')
-                ->add(new Range(new MoneyValue(Money::EUR('3000')), new MoneyValue(Money::EUR('5000')), true, true))
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $this->assertRecordsAreFound($condition, [1, 2]);
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php b/lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
deleted file mode 100644
index 74b614a5..00000000
--- a/lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal\Functional;
-
-use Doctrine\DBAL\ArrayParameterType;
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\ParameterType;
-use Doctrine\DBAL\Query\QueryBuilder;
-use Doctrine\DBAL\Schema\Schema as DbSchema;
-use Doctrine\DBAL\SQL\Builder\DropSchemaObjectsSQLBuilder;
-use Doctrine\DBAL\Types\Type;
-use PHPUnit\Framework\AssertionFailedError;
-use PHPUnit\Framework\Exception;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConditionGenerator;
-use Rollerworks\Component\Search\Doctrine\Dbal\Test\QueryBuilderAssertion;
-use Rollerworks\Component\Search\Doctrine\Dbal\Tests\TestUtil;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\DbalTestCase;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\SchemaRecord;
-
-abstract class FunctionalDbalTestCase extends DbalTestCase
-{
-    /**
-     * Shared connection for setting up the database in a single place
-     * during class setup and tear down.
-     */
-    private static ?Connection $sharedConn = null;
-
-    protected Connection $conn;
-
-    protected static function resetSharedConn(): void
-    {
-        if (self::$sharedConn) {
-            self::$sharedConn->close();
-            self::$sharedConn = null;
-        }
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        if (! isset(
-            $GLOBALS['db_driver'],
-            $GLOBALS['db_host'],
-            $GLOBALS['db_user'],
-            $GLOBALS['db_password'],
-            $GLOBALS['db_dbname'],
-            $GLOBALS['db_port']
-        )) {
-            self::markTestSkipped('GLOBAL variables not enabled');
-        }
-
-        if (! isset(self::$sharedConn)) {
-            self::$sharedConn = TestUtil::getConnection();
-
-            $schema = new DbSchema();
-            $this->setUpDbSchema($schema);
-
-            foreach ((new DropSchemaObjectsSQLBuilder(self::$sharedConn->getDatabasePlatform()))->buildSQL($schema) as $s) {
-                try {
-                    $this->conn->executeStatement($s);
-                } catch (\Throwable) {
-                    // Noop - tables might not exist yet
-                }
-            }
-
-            $this->updateSchema(self::$sharedConn, $schema);
-
-            foreach ($this->getDbRecords() as $set) {
-                $set->executeRecords(self::$sharedConn);
-            }
-        }
-
-        $this->conn = self::$sharedConn;
-    }
-
-    private function updateSchema(Connection $connection, DbSchema $providedSchema): void
-    {
-        $schemaManager = $connection->createSchemaManager();
-        $schemaDiff = $schemaManager->createComparator()
-            ->compareSchemas($schemaManager->introspectSchema(), $providedSchema)
-        ;
-
-        $platform = $connection->getDatabasePlatform();
-
-        if ($platform->supportsSchemas()) {
-            foreach ($schemaDiff->getCreatedSchemas() as $schema) {
-                $connection->executeStatement($platform->getCreateSchemaSQL($schema));
-            }
-        }
-
-        if ($platform->supportsSequences()) {
-            foreach ($schemaDiff->getAlteredSequences() as $sequence) {
-                $connection->executeStatement($platform->getAlterSequenceSQL($sequence));
-            }
-
-            foreach ($schemaDiff->getCreatedSequences() as $sequence) {
-                $connection->executeStatement($platform->getCreateSequenceSQL($sequence));
-            }
-        }
-
-        foreach ($platform->getCreateTablesSQL($schemaDiff->getCreatedTables()) as $sql) {
-            $connection->executeStatement($sql);
-        }
-
-        foreach ($schemaDiff->getAlteredTables() as $tableDiff) {
-            foreach ($platform->getAlterTableSQL($tableDiff) as $sql) {
-                $connection->executeStatement($sql);
-            }
-        }
-    }
-
-    public static function tearDownAfterClass(): void
-    {
-        // There were errors recorded so don't reset the connection.
-        if (\count(self::$sharedConn->queryLog->queries ?? []) > 0) {
-            return;
-        }
-
-        // Ensure the connection is reset between class-runs
-        self::resetSharedConn();
-    }
-
-    protected function setUpDbSchema(DbSchema $schema): void
-    {
-        $invoiceTable = $schema->createTable('invoice');
-        $invoiceTable->addOption('collation', 'utf8_bin');
-        $invoiceTable->addColumn('id', 'integer', ['notNull' => false]);
-        $invoiceTable->addColumn('status', 'integer', ['notNull' => false]);
-        $invoiceTable->addColumn('label', 'string', ['notNull' => false, 'length' => 255]);
-        $invoiceTable->addColumn('customer', 'integer', ['notNull' => false]);
-        $invoiceTable->setPrimaryKey(['id']);
-
-        $customerTable = $schema->createTable('customer');
-        $customerTable->addOption('collation', 'utf8_bin');
-        $customerTable->addColumn('id', 'integer', ['notNull' => false]);
-        $customerTable->addColumn('name', 'string', ['notNull' => false, 'length' => 255]);
-        $customerTable->addColumn('birthday', 'date_immutable', ['notNull' => false]);
-        $customerTable->setPrimaryKey(['id']);
-    }
-
-    /**
-     * @return SchemaRecord[]
-     */
-    protected function getDbRecords(): array
-    {
-        return [];
-    }
-
-    /**
-     * Returns the QueryBuilder for the ConditionGenerator.
-     */
-    abstract protected function getQuery(): QueryBuilder;
-
-    /**
-     * Configure fields of the ConditionGenerator.
-     */
-    protected function configureConditionGenerator(ConditionGenerator $conditionGenerator): void
-    {
-    }
-
-    /**
-     * @param (int|string)[] $ids
-     *
-     * @throws \Doctrine\DBAL\Exception
-     */
-    protected function assertRecordsAreFound(SearchCondition $condition, array $ids): void
-    {
-        $conditionGenerator = $this->getDbalFactory()->createConditionGenerator($this->getQuery(), $condition);
-        $this->configureConditionGenerator($conditionGenerator);
-
-        $qb = $conditionGenerator->getQueryBuilder();
-
-        $conditionGenerator->apply();
-        $result = $qb->executeQuery();
-
-        $paramsString = '';
-        $platform = $this->conn->getDatabasePlatform();
-
-        // Doctrine DBAL 4.0 introduced a new ParameterType class
-        if (is_a(ParameterType::class, \UnitEnum::class, true)) {
-            foreach ($qb->getParameters() as $name => $value) {
-                $type = $qb->getParameterType($name);
-
-                if ($type instanceof \UnitEnum) {
-                    $type = match ($type) {
-                        ParameterType::NULL => 'string',
-                        ParameterType::STRING => 'string',
-                        ParameterType::INTEGER => 'integer',
-                        ParameterType::BINARY => 'binary',
-                        ParameterType::BOOLEAN => 'boolean',
-                        ParameterType::ASCII => 'string',
-                        ParameterType::LARGE_OBJECT => 'blob',
-                        ArrayParameterType::INTEGER => 'integer',
-                        ArrayParameterType::STRING => 'string',
-                        ArrayParameterType::BINARY => 'binary',
-                        ArrayParameterType::ASCII => 'string',
-                        default => 'string',
-                    };
-                } elseif (\is_object($type)) {
-                    $type = Type::lookupName($type);
-                }
-
-                $paramsString .= \sprintf("%s = '%s'\n", $name, Type::getType($type)->convertToDatabaseValue($value, $platform));
-            }
-        } else {
-            static $bindingToType = [
-                ParameterType::NULL => 'string',
-                ParameterType::STRING => 'string',
-                ParameterType::INTEGER => 'integer',
-                ParameterType::BINARY => 'binary',
-                ParameterType::BOOLEAN => 'boolean',
-                ParameterType::ASCII => 'string',
-                ParameterType::LARGE_OBJECT => 'blob',
-            ];
-
-            foreach ($qb->getParameters() as $name => $value) {
-                $type = $qb->getParameterType($name) ?? 'string';
-
-                if (\is_int($type)) {
-                    $type = $bindingToType[$type];
-                } elseif (\is_object($type)) {
-                    $type = Type::lookupName($type);
-                }
-
-                $paramsString .= \sprintf("%s = '%s'\n", $name, Type::getType($type)->convertToDatabaseValue($value, $platform));
-            }
-        }
-
-        $rows = $result->fetchAllAssociative();
-        $idRows = array_map(
-            static fn ($value) => $value['id'],
-            $rows
-        );
-
-        sort($ids);
-        sort($idRows);
-
-        self::assertEquals(
-            $ids,
-            array_merge([], array_unique($idRows)),
-            \sprintf("Found these records instead: \n%s\nWith Query: %s\nAnd params: %s", print_r($rows, true), $qb->getSQL(), $paramsString)
-        );
-    }
-
-    /**
-     * @param ConditionGenerator|SearchCondition $conditionOrWhere Either a ConditionGenerator or a SearchCondition
-     * @param string                             $expectedSql      Expected generated SQL for the query
-     * @param array<string, mixed>|null          $parameters       Expected parameters for the query
-     */
-    protected function assertQueryIsExecutable(ConditionGenerator | SearchCondition $conditionOrWhere, string $expectedSql = '', ?array $parameters = null): void
-    {
-        if ($conditionOrWhere instanceof SearchCondition) {
-            $conditionGenerator = $this->getDbalFactory()->createConditionGenerator($this->getQuery(), $conditionOrWhere);
-            $this->configureConditionGenerator($conditionGenerator);
-        } else {
-            $conditionGenerator = $conditionOrWhere;
-        }
-
-        $qb = $conditionGenerator->getQueryBuilder();
-
-        if ($expectedSql !== '') {
-            QueryBuilderAssertion::assertQueryBuilderEquals(
-                $conditionGenerator,
-                $expectedSql,
-                $parameters
-            );
-        } else {
-            $conditionGenerator->apply();
-
-            $this->addToAssertionCount(1);
-        }
-
-        $qb->executeQuery();
-    }
-
-    protected function onNotSuccessfulTest(\Throwable $t): never
-    {
-        // Ignore deprecation warnings.
-        if ($t instanceof AssertionFailedError) {
-            throw $t;
-        }
-
-        $i = \count(self::$sharedConn->queryLog->queries ?? []);
-
-        if ($i) {
-            $queries = '';
-
-            foreach (array_reverse(self::$sharedConn->queryLog->queries) as $query) {
-                $params = array_map(
-                    static function ($p) {
-                        if (\is_object($p)) {
-                            return $p::class;
-                        }
-
-                        return "'" . var_export($p, true) . "'";
-                    },
-                    $query['params'] ?: []
-                );
-
-                $queries .= ($i + 1) . ". SQL: '" . $query['sql'] . "' Params: " . implode(', ', $params) . \PHP_EOL;
-                --$i;
-            }
-
-            $trace = $t->getTrace();
-            $traceMsg = '';
-
-            foreach ($trace as $part) {
-                if (isset($part['file'])) {
-                    if (mb_strpos($part['file'], 'PHPUnit/') !== false) {
-                        // Beginning with PHPUnit files we don't print the trace anymore.
-                        break;
-                    }
-
-                    $traceMsg .= $part['file'] . ':' . $part['line'] . \PHP_EOL;
-                }
-            }
-
-            $message =
-                '[' . $t::class . '] ' .
-                $t->getMessage() .
-                \PHP_EOL . \PHP_EOL .
-                'With queries:' . \PHP_EOL .
-                $queries . \PHP_EOL .
-                'Trace:' . \PHP_EOL .
-                $traceMsg;
-
-            throw new Exception($message, (int) $t->getCode(), $t);
-        }
-
-        throw $t;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/Functional/SqlConditionGeneratorResultsTest.php b/lib/Doctrine/Dbal/Tests/Functional/SqlConditionGeneratorResultsTest.php
deleted file mode 100644
index 6d9f75e2..00000000
--- a/lib/Doctrine/Dbal/Tests/Functional/SqlConditionGeneratorResultsTest.php
+++ /dev/null
@@ -1,416 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal\Functional;
-
-use Doctrine\DBAL\Query\QueryBuilder;
-use Doctrine\DBAL\Schema\Schema as DbSchema;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConditionGenerator;
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Extension\Core\Type\ChoiceType;
-use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-use Rollerworks\Component\Search\Extension\Core\Type\DateType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Rollerworks\Component\Search\SearchPrimaryCondition;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\SchemaRecord;
-
-/**
- * Ensures the expected results are actually found.
- *
- * Uses the StringQuery input-processor for a readable condition
- * and ensures the input values are properly transformed.
- *
- * This example uses a 'classic' invoice system
- * with three tables:
- *
- * * invoice
- * * invoice_details
- * * customer
- *
- * For simplicity this example doesn't do tax calculation.
- *
- * @group functional
- *
- * @internal
- */
-final class SqlConditionGeneratorResultsTest extends FunctionalDbalTestCase
-{
-    private StringQueryInput $inputProcessor;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->inputProcessor = new StringQueryInput();
-    }
-
-    protected function setUpDbSchema(DbSchema $schema): void
-    {
-        $customerTable = $schema->createTable('customer');
-        $customerTable->addOption('collation', 'utf8_bin');
-        $customerTable->addColumn('id', 'integer');
-        $customerTable->addColumn('first_name', 'string', ['length' => 255]);
-        $customerTable->addColumn('last_name', 'string', ['length' => 255]);
-        $customerTable->addColumn('birthday', 'date_immutable');
-        $customerTable->addColumn('regdate', 'date_immutable');
-        $customerTable->setPrimaryKey(['id']);
-
-        $invoiceTable = $schema->createTable('invoice');
-        $invoiceTable->addOption('collation', 'utf8_bin');
-        $invoiceTable->addColumn('id', 'integer');
-        $invoiceTable->addColumn('customer', 'integer');
-        $invoiceTable->addColumn('label', 'string', ['notnull' => false, 'length' => 255]);
-        $invoiceTable->addColumn('pub_date', 'date_immutable', ['notnull' => false]);
-        $invoiceTable->addColumn('status', 'integer');
-        $invoiceTable->addColumn('price_total', 'decimal', ['scale' => 2, 'precision' => 10]);
-        $invoiceTable->setPrimaryKey(['id']);
-        $invoiceTable->addUniqueIndex(['label']);
-
-        $invoiceDetailsTable = $schema->createTable('invoice_details');
-        $invoiceDetailsTable->addOption('collation', 'utf8_bin');
-        $invoiceDetailsTable->addColumn('id', 'integer');
-        $invoiceDetailsTable->addColumn('invoice', 'integer');
-        $invoiceDetailsTable->addColumn('label', 'string', ['length' => 255]);
-        $invoiceDetailsTable->addColumn('quantity', 'integer');
-        $invoiceDetailsTable->addColumn('price', 'decimal', ['scale' => 2, 'precision' => 10]);
-        $invoiceDetailsTable->addColumn('total', 'decimal', ['scale' => 2, 'precision' => 10]);
-        $invoiceDetailsTable->setPrimaryKey(['id']);
-    }
-
-    protected function getDbRecords(): array
-    {
-        $date = static fn (string $input): \DateTimeImmutable => new \DateTimeImmutable($input, new \DateTimeZone('UTC'));
-
-        return [
-            SchemaRecord::create(
-                'customer',
-                [
-                    'id' => 'integer',
-                    'first_name' => 'string',
-                    'last_name' => 'string',
-                    'birthday' => 'date_immutable',
-                    'regdate' => 'date_immutable',
-                ]
-            )
-            ->records()
-                ->add([1, 'Peter', 'Pang', $date('1980-11-20'), $date('2005-11-20')])
-                ->add([2, 'Leroy', 'Jenkins', $date('2000-05-15'), $date('2005-05-20')])
-                ->add([3, 'Doctor', 'Who', $date('2005-12-10'), $date('2005-02-20')])
-                ->add([4, 'Spider', 'Pig', $date('2012-06-10'), $date('2012-07-20')])
-                ->add([5, 'Nicklas', 'Cake', $date('1964-01-07'), $date('2006-09-31')])
-            ->end(),
-
-            // Two invoices are paid, one is a concept and three are unpaid, one is overdue
-            SchemaRecord::create(
-                'invoice',
-                [
-                    'id' => 'integer',
-                    'customer' => 'integer',
-                    'label' => 'string',
-                    'pub_date' => 'date_immutable',
-                    'status' => 'integer',
-                    'price_total' => 'decimal',
-                ]
-            )
-            ->records()
-                ->add([1, 1, '2010-001', $date('2010-05-10'), 2, '100.00']) // 'Peter', 'Pang'
-                ->add([2, 2, '2010-002', $date('2010-05-10'), 2, '90.00']) // 'Leroy', 'Jenkins'
-                ->add([3, 2, null, null, 0, '10.00']) // concept - 'Leroy', 'Jenkins'
-                // unpaid //
-                ->add([4, 2, '2015-001', $date('2015-05-10'), 1, '50.00']) // 'Leroy', 'Jenkins'
-                ->add([5, 3, '2015-002', $date('2015-05-01'), 1, '215.00']) // 'Doctor', 'Who'
-                ->add([6, 4, '2015-003', $date('2015-05-05'), 1, '55.00']) // 'Spider', 'Pig'
-                // Overdue, with relative dates
-                ->add([7, 5, '2019-001', $date('-7 days'), 3, '80.00']) // 'Nicklas', 'Cake'
-                ->add([8, 5, '2020-019', $date('+15 days'), 3, '70.00']) // 'Nicklas', 'Cake'
-                ->add([9, 5, '2021-005', $date('+1 year'), 3, '70.00']) // 'Nicklas', 'Cake'
-            ->end(),
-
-            SchemaRecord::create(
-                'invoice_details',
-                [
-                    'id' => 'integer',
-                    'invoice' => 'integer',
-                    'label' => 'string',
-                    'quantity' => 'integer',
-                    'price' => 'decimal',
-                    'total' => 'decimal',
-                ]
-            )
-            ->records()
-                // invoice 1
-                ->add([1, 1, 'Electric Guitar', 1, '200.00', '100.00'])
-                // invoice 2
-                ->add([2, 2, 'Sword', 1, '15.00', '15.00'])
-                ->add([3, 2, 'Shield', 1, '20.00', '20.00'])
-                ->add([4, 2, 'Armor', 1, '55.00', '55.00'])
-                // invoice 3
-                ->add([5, 3, 'Sword', 1, '10.00', '10.00'])
-                // invoice 4
-                ->add([6, 4, 'Armor repair kit', 2, '50.00', '100.00'])
-                // invoice 5
-                ->add([7, 5, 'TARDIS Chameleon circuit', 1, '15.00', '15.00'])
-                ->add([8, 5, 'Sonic Screwdriver', 10, '20.00', '200.00'])
-                // invoice 6
-                ->add([9, 6, 'Web shooter', 1, '10.00', '10.00'])
-                ->add([10, 6, 'Cape', 1, '10.00', '10.00'])
-                ->add([11, 6, 'Cape repair manual', 1, '10.00', '10.00'])
-                ->add([12, 6, 'Hoof polish', 3, '10.00', '30.00'])
-                // invoice 7
-                ->add([13, 7, 'Bee repellent', 1, '666.00', '666.00'])
-                ->add([14, 7, 'Badge', 1, '10.00', '10.00'])
-                ->add([15, 8, 'Wicker Beads', 5, '3.00', '15.00'])
-                ->add([16, 8, 'A Pair of Cloths', 1, '60.00', '60.00'])
-            ->end(),
-        ];
-    }
-
-    protected function getQuery(): QueryBuilder
-    {
-        return $this->conn->createQueryBuilder()
-            ->select('*', 'i.id AS id')
-            ->from('invoice', 'i')
-            ->join('i', 'customer', 'c', 'i.customer = c.id')
-            ->leftJoin('i', 'invoice_details', 'ir', 'ir.invoice = i.id')
-        ;
-    }
-
-    protected function configureConditionGenerator(ConditionGenerator $conditionGenerator): void
-    {
-        // Customer (by invoice relation)
-        $conditionGenerator->setField('customer-first-name', 'first_name', 'c', 'string');
-        $conditionGenerator->setField('customer-last-name', 'last_name', 'c', 'string');
-        $conditionGenerator->setField('customer-birthday', 'birthday', 'c', 'date_immutable');
-        $conditionGenerator->setField('customer-regdate', 'regdate', 'c', 'date_immutable');
-
-        $conditionGenerator->setField('customer-name#first_name', 'first_name', 'c', 'string');
-        $conditionGenerator->setField('customer-name#last_name', 'last_name', 'c', 'string');
-
-        // Invoice
-        $conditionGenerator->setField('id', 'id', 'i', 'integer');
-        $conditionGenerator->setField('customer', 'customer', 'i', 'integer');
-        $conditionGenerator->setField('label', 'label', 'i', 'string');
-        $conditionGenerator->setField('pub-date', 'pub_date', 'i', 'date_immutable');
-        $conditionGenerator->setField('status', 'status', 'i', 'integer');
-        $conditionGenerator->setField('total', 'price_total', 'i', 'decimal');
-
-        // Invoice Details
-        $conditionGenerator->setField('row-label', 'label', 'ir', 'string');
-        $conditionGenerator->setField('row-quantity', 'quantity', 'ir', 'integer');
-        $conditionGenerator->setField('row-price', 'price', 'ir', 'decimal');
-        $conditionGenerator->setField('row-total', 'total', 'ir', 'decimal');
-    }
-
-    protected function getFieldSet(bool $build = true)
-    {
-        $fieldSet = $this->getFactory()->createFieldSetBuilder();
-
-        // Customer (by invoice relation)
-        $fieldSet->add('customer-first-name', TextType::class);
-        $fieldSet->add('customer-last-name', TextType::class);
-        $fieldSet->add('customer-name', TextType::class);
-        $fieldSet->add('customer-birthday', BirthdayType::class, ['pattern' => 'yyyy-MM-dd']);
-        $fieldSet->add('customer-regdate', DateType::class, ['pattern' => 'yyyy-MM-dd']);
-
-        // Invoice
-        $fieldSet->add('id', IntegerType::class);
-        $fieldSet->add('customer', IntegerType::class);
-        $fieldSet->add('label', TextType::class);
-        $fieldSet->add('pub-date', DateTimeType::class, ['pattern' => 'yyyy-MM-dd', 'allow_relative' => true]);
-        $fieldSet->add('status', ChoiceType::class, ['choices' => ['concept' => 0, 'published' => 1, 'paid' => 2, 'overdue' => 3]]);
-        $fieldSet->add('total', MoneyType::class);
-
-        // Invoice Details
-        $fieldSet->add('row-label', TextType::class);
-        $fieldSet->add('row-quantity', IntegerType::class);
-        $fieldSet->add('row-price', MoneyType::class);
-        $fieldSet->add('row-total', MoneyType::class);
-
-        return $build ? $fieldSet->getFieldSet('invoice') : $fieldSet;
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_id(): void
-    {
-        $this->makeTest('id: 1, 5;', [1, 5]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_combined_field(): void
-    {
-        $this->makeTest('customer-name: Pang, Leroy;', [1, 2, 3, 4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_range_and_excluding(): void
-    {
-        $this->makeTest('id: 1~7[, !2;', [1, 3, 4, 5, 6]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_birthday(): void
-    {
-        $this->makeTest('customer-birthday: "2000-05-15";', range(2, 4));
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_birthdays(): void
-    {
-        $this->makeTest('customer-birthday: "2000-05-15", "1980-06-10";', [2, 3, 4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_date_relative(): void
-    {
-        $this->makeTest('pub-date: >"7 days";', [8, 9]);
-        $this->makeTest('pub-date: >"16 days";', [9]);
-        $this->makeTest('pub-date: "14 days" ~ "6 months";', [8]);
-        $this->makeTest('pub-date: >2015-05-10, <"-7 days";', [7]);
-        $this->makeTest('pub-date: >2015-05-10, <"-8 days";', []);
-        $this->makeTest('pub-date: >2015-05-10, >"-1 years", <"6 months";', [7, 8]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_or_group(): void
-    {
-        $this->makeTest('* customer-birthday: "1980-11-20"; pub-date: "2015-05-01";', [1, 5]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_pub_date_limited_by_price(): void
-    {
-        $this->makeTest('pub-date: "2015-05-10"; total: "50.00"', [4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status(): void
-    {
-        $this->makeTest('customer: 2; status: concept;', [3]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status_and_total(): void
-    {
-        $this->makeTest('customer: 2; status: paid; total: "90.00";', [2]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status_and_total_with_primary_cond(): void
-    {
-        $this->makeTestWithPrimaryCond('customer: 2;', 'customer: 3;', []);
-        $this->makeTestWithPrimaryCond('customer: 2;', 'status: paid; customer: 3;', []);
-        $this->makeTestWithPrimaryCond('customer: 2;', 'status: paid;', [2]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status_or_price(): void
-    {
-        $this->makeTest('customer: 2; *(status: paid; total: "50.00";)', [2, 4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_status_and_label_or_quantity_limited_by_price(): void
-    {
-        // Note there is no row with quantity 5, which is resolved as its in an OR'ed group
-        $this->makeTest('status: published; *(row-quantity: 5; row-label: ~*"repair"; (row-price: "50.00"));', [4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_excluding_equals_pattern(): void
-    {
-        $this->makeTest('row-label: ~=Armor, ~=sword;', [2]); // Invoice 3 doesn't match as "sword" is lowercase
-        $this->makeTest('row-price: "15.00"; row-label: ~!=Sword;', [5]);
-
-        // Lowercase
-        $this->makeTest('row-label: ~=Armor, ~i=sword;', [2, 3]);
-    }
-
-    private function makeTest($input, array $expectedRows): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        try {
-            $condition = $this->inputProcessor->process($config, $input);
-            $this->assertRecordsAreFound($condition, $expectedRows);
-        } catch (\Exception $e) {
-            self::detectSystemException($e);
-
-            if (\function_exists('dump')) {
-                dump($e);
-            } else {
-                echo 'Please install symfony/var-dumper as dev-requirement to get a readable structure.' . \PHP_EOL;
-
-                // Don't use var-dump or print-r as this crashes php...
-                echo $e::class . '::' . $e;
-            }
-
-            self::fail('Condition contains errors.');
-        }
-    }
-
-    private function makeTestWithPrimaryCond($primaryCondition, $input, array $expectedRows): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        try {
-            $condition = $this->inputProcessor->process($config, $input);
-            $condition->setPrimaryCondition(new SearchPrimaryCondition($this->inputProcessor->process($config, $primaryCondition)->getValuesGroup()));
-            $this->assertRecordsAreFound($condition, $expectedRows);
-        } catch (\Exception $e) {
-            self::detectSystemException($e);
-
-            if (\function_exists('dump')) {
-                dump($e);
-            } else {
-                echo 'Please install symfony/var-dumper as dev-requirement to get a readable structure.' . \PHP_EOL;
-
-                // Don't use var-dump or print-r as this crashes php...
-                echo $e::class . '::' . $e;
-            }
-
-            self::fail('Condition contains errors.');
-        }
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/Functional/SqlConditionGeneratorTest.php b/lib/Doctrine/Dbal/Tests/Functional/SqlConditionGeneratorTest.php
deleted file mode 100644
index 2651fa18..00000000
--- a/lib/Doctrine/Dbal/Tests/Functional/SqlConditionGeneratorTest.php
+++ /dev/null
@@ -1,488 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal\Functional;
-
-use Carbon\CarbonInterval;
-use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Query\QueryBuilder;
-use Doctrine\DBAL\Schema\Schema as DbSchema;
-use Doctrine\DBAL\Types\Types;
-use Rollerworks\Component\Search\Doctrine\Dbal\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConditionGenerator;
-use Rollerworks\Component\Search\Doctrine\Dbal\ValueConversion;
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * Functional ConditionGeneratorTest, ensures queries are executable.
- * This tests does not ensure the correct result is returned,
- * this handled by another test-class.
- *
- * @group functional
- *
- * @internal
- */
-final class SqlConditionGeneratorTest extends FunctionalDbalTestCase
-{
-    protected function setUpDbSchema(DbSchema $schema): void
-    {
-        $invoiceTable = $schema->createTable('invoice');
-        $invoiceTable->addColumn('id', 'integer', ['notNull' => false]);
-        $invoiceTable->addColumn('status', 'integer', ['notNull' => false]);
-        $invoiceTable->addColumn('label', 'string', ['notNull' => false, 'length' => 255]);
-        $invoiceTable->addColumn('customer', 'integer', ['notNull' => false]);
-        $invoiceTable->setPrimaryKey(['id']);
-
-        $customerTable = $schema->createTable('customer');
-        $customerTable->addColumn('id', 'integer', ['notNull' => false, 'length' => 255]);
-        $customerTable->addColumn('name', 'string', ['notNull' => false, 'length' => 255]);
-        $customerTable->addColumn('birthday', 'date_immutable', ['notNull' => false]);
-        $customerTable->setPrimaryKey(['id']);
-    }
-
-    protected function getQuery(): QueryBuilder
-    {
-        return $this->conn->createQueryBuilder()
-            ->select('i.*', 'c.*')
-            ->from('invoice', 'i')
-            ->join('i', 'customer', 'c', 'c.id = i.customer')
-        ;
-    }
-
-    /**
-     * Configure fields of the ConditionGenerator.
-     */
-    protected function configureConditionGenerator(ConditionGenerator $conditionGenerator): void
-    {
-        $conditionGenerator->setField('customer', 'customer', 'i', 'integer');
-        $conditionGenerator->setField('customer_name', 'name', 'c', 'string');
-        $conditionGenerator->setField('customer_birthday', 'birthday', 'c', 'string'); // don't use date as this breaks the binding
-        $conditionGenerator->setField('status', 'status', 'i', 'integer');
-        $conditionGenerator->setField('label', 'label', 'i', 'string');
-    }
-
-    /**
-     * @test
-     */
-    public function simple_query(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function query_with_embedded_values(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function excludes(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addExcludedSimpleValue(2)
-                ->addExcludedSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function includes_and_excludes(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addExcludedSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function ranges(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Range(2, 5))
-                ->add(new Range(10, 20))
-                ->add(new Range(60, 70, false))
-                ->add(new Range(100, 150, true, false))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function excluded_ranges(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new ExcludedRange(2, 5))
-                ->add(new ExcludedRange(10, 20))
-                ->add(new ExcludedRange(60, 70, false))
-                ->add(new ExcludedRange(100, 150, true, false))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function single_comparison(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(2, '>'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function multiple_comparisons(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(2, '>'))
-                ->add(new Compare(10, '<'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function multiple_comparisons_with_groups(): void
-    {
-        // Use two subgroups here as the comparisons are AND to each other
-        // but applying them in the head group would ignore subgroups
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->group()
-                ->field('customer')
-                    ->add(new Compare(2, '>'))
-                    ->add(new Compare(10, '<'))
-                ->end()
-            ->end()
-            ->group()
-                ->field('customer')
-                    ->add(new Compare(30, '>'))
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function excluding_comparisons(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(2, '<>'))
-                ->add(new Compare(5, '<>'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function excluding_comparisons_with_normal(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(2, '<>'))
-                ->add(new Compare(5, '<>'))
-                ->add(new Compare(30, '>'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function pattern_matchers(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer_name')
-                ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-                ->add(new PatternMatch('fo\\\'o', PatternMatch::PATTERN_STARTS_WITH))
-                ->add(new PatternMatch('bar', PatternMatch::PATTERN_NOT_ENDS_WITH, true))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function sub_groups(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->group()
-                ->field('customer')->addSimpleValue(2)->end()
-            ->end()
-            ->group()
-                ->field('customer')->addSimpleValue(3)->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function sub_group_with_root_condition(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-            ->end()
-            ->group()
-                ->field('customer_name')
-                    ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function or_group_root(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet(), ValuesGroup::GROUP_LOGICAL_OR)
-            ->field('customer')
-                ->addSimpleValue(2)
-            ->end()
-            ->field('customer_name')
-                ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function sub_or_group(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->group()
-                ->group(ValuesGroup::GROUP_LOGICAL_OR)
-                    ->field('customer')
-                        ->addSimpleValue(2)
-                    ->end()
-                    ->field('customer_name')
-                        ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-                    ->end()
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function column_conversion(): void
-    {
-        $type = $this->conn->getDatabasePlatform() instanceof AbstractMySQLPlatform ? 'SIGNED' : 'INTEGER';
-        $converter = $this->createMock(ColumnConversion::class);
-        $converter
-            ->expects(self::atLeastOnce())
-            ->method('convertColumn')
-            ->willReturnCallback(static fn ($column): string => "CAST({$column} AS {$type})")
-        ;
-
-        $fieldSetBuilder = $this->getFieldSet(false);
-        $fieldSetBuilder->add('customer', IntegerType::class, ['grouping' => true, 'doctrine_dbal_conversion' => $converter]);
-
-        $condition = SearchConditionBuilder::create($fieldSetBuilder->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function value_conversion(): void
-    {
-        $type = $this->conn->getDatabasePlatform() instanceof AbstractMySQLPlatform ? 'SIGNED' : 'INTEGER';
-        $converter = $this->createMock(ValueConversion::class);
-        $converter
-            ->expects(self::atLeastOnce())
-            ->method('convertValue')
-            ->willReturnCallback(static fn ($input): string => "CAST({$input} AS {$type})")
-        ;
-
-        $fieldSetBuilder = $this->getFieldSet(false);
-        $fieldSetBuilder->add('customer', IntegerType::class, ['grouping' => true, 'doctrine_dbal_conversion' => $converter]);
-
-        $condition = SearchConditionBuilder::create($fieldSetBuilder->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function conversion_strategy(): void
-    {
-        $date = new \DateTimeImmutable('2001-01-15', new \DateTimeZone('UTC'));
-
-        $fieldSet = $this->getFieldSet(false);
-        $fieldSet->add('customer_birthday', BirthdayType::class);
-
-        $fieldSet = $fieldSet->getFieldSet();
-
-        $condition = SearchConditionBuilder::create($fieldSet)
-            ->field('customer_birthday')
-                ->addSimpleValue(18)
-                ->addSimpleValue($date)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->assertQueryIsExecutable($condition);
-    }
-
-    /**
-     * @test
-     */
-    public function conversion_strategy2(): void
-    {
-        $date = new \DateTimeImmutable('2001-01-15', new \DateTimeZone('UTC'));
-
-        $fieldSet = $this->getFieldSet(false);
-        $fieldSet->add('customer_birthday', DateTimeType::class, ['allow_relative' => true]);
-
-        $fieldSet = $fieldSet->getFieldSet();
-
-        $condition = SearchConditionBuilder::create($fieldSet)
-            ->field('customer_birthday')
-                ->addSimpleValue(CarbonInterval::fromString('1 year 2 weeks 8 seconds'))
-                ->addSimpleValue(CarbonInterval::fromString('1 year 2 weeks 8 seconds')->invert())
-                ->addSimpleValue($date)
-                ->add(new Range(CarbonInterval::fromString('1 year'), CarbonInterval::fromString('10 year')))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        if ($this->conn->getDatabasePlatform() instanceof PostgreSQLPlatform) {
-            $this->assertQueryIsExecutable(
-                $condition,
-                ' WHERE (((c.birthday = NOW() + CAST(:search_0 AS interval) OR c.birthday = NOW() - CAST(:search_1 AS interval) OR c.birthday = :search_2 OR (c.birthday >= NOW() + CAST(:search_3 AS interval) AND c.birthday <= NOW() + CAST(:search_4 AS interval)))))',
-                [
-                    'search_0' => ['1 year 2 weeks 8 seconds', 'string'],
-                    'search_1' => ['1 year 2 weeks 8 seconds', 'string'],
-                    'search_2' => [$date, Types::DATETIME_IMMUTABLE],
-                    'search_3' => ['1 year', 'string'],
-                    'search_4' => ['10 years', 'string'],
-                ]
-            );
-        } elseif ($this->conn->getDatabasePlatform() instanceof AbstractMySQLPlatform) {
-            $this->assertQueryIsExecutable(
-                $condition,
-                ' WHERE (((c.birthday = NOW() + INTERVAL 1 YEAR + INTERVAL 2 WEEK + INTERVAL 8 SECOND OR c.birthday = NOW() - INTERVAL 1 YEAR - INTERVAL 2 WEEK - INTERVAL 8 SECOND OR c.birthday = :search_0 OR (c.birthday >= NOW() + INTERVAL 1 YEAR AND c.birthday <= NOW() + INTERVAL 10 YEAR))))',
-                [
-                    'search_0' => [$date, Types::DATETIME_IMMUTABLE],
-                ]
-            );
-        }
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/Mocks/ConnectionMock.php b/lib/Doctrine/Dbal/Tests/Mocks/ConnectionMock.php
deleted file mode 100644
index 69d12131..00000000
--- a/lib/Doctrine/Dbal/Tests/Mocks/ConnectionMock.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal\Mocks;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-
-class ConnectionMock extends Connection
-{
-    private $_fetchOneResult;
-    private $_platform;
-    private $_platformMock;
-    private $_lastInsertId = 0;
-    private $_inserts = [];
-
-    public function __construct(array $params, $driver, $config = null, $eventManager = null)
-    {
-        $this->_platformMock = new DatabasePlatformMock();
-
-        parent::__construct($params, $driver, $config, $eventManager);
-
-        // Override possible assignment of platform to database platform mock (Legacy support for for Doctrine DBAL < 4.0)
-        $this->_platform = $this->_platformMock;
-    }
-
-    /**
-     * @override
-     */
-    public function getDatabasePlatform(): AbstractPlatform
-    {
-        return $this->_platformMock;
-    }
-
-    /**
-     * @override
-     */
-    public function insert(string $table, array $data, array $types = []): int | string
-    {
-        $this->_inserts[$table][] = $data;
-
-        return 1;
-    }
-
-    /**
-     * @override
-     *
-     * @param mixed|null $seqName
-     */
-    public function lastInsertId($seqName = null): int | string
-    {
-        return $this->_lastInsertId;
-    }
-
-    /**
-     * @override
-     */
-    public function fetchColumn($statement, array $params = [], $column = 0, array $types = []): mixed
-    {
-        return $this->_fetchOneResult;
-    }
-
-    /**
-     * @override
-     *
-     * @param mixed|null $type
-     */
-    public function quote($value, $type = null): string
-    {
-        if (\is_string($value)) {
-            return "'" . $value . "'";
-        }
-
-        return (string) $value;
-    }
-
-    /* Mock API */
-
-    public function setFetchOneResult($fetchOneResult): void
-    {
-        $this->_fetchOneResult = $fetchOneResult;
-    }
-
-    public function setDatabasePlatform($platform): void
-    {
-        $this->_platformMock = $platform;
-    }
-
-    public function setLastInsertId($id): void
-    {
-        $this->_lastInsertId = $id;
-    }
-
-    public function getInserts(): array
-    {
-        return $this->_inserts;
-    }
-
-    public function reset(): void
-    {
-        $this->_inserts = [];
-        $this->_lastInsertId = 0;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/Mocks/DatabasePlatformMock.php b/lib/Doctrine/Dbal/Tests/Mocks/DatabasePlatformMock.php
deleted file mode 100644
index 83cafcb5..00000000
--- a/lib/Doctrine/Dbal/Tests/Mocks/DatabasePlatformMock.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal\Mocks;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Platforms\DateIntervalUnit;
-use Doctrine\DBAL\Platforms\Keywords\KeywordList;
-use Doctrine\DBAL\Schema\AbstractSchemaManager;
-use Doctrine\DBAL\Schema\TableDiff;
-use Doctrine\DBAL\TransactionIsolationLevel;
-
-class DatabasePlatformMock extends AbstractPlatform
-{
-    private $_sequenceNextValSql = '';
-    private $_prefersIdentityColumns = true;
-    private $_prefersSequences = false;
-
-    /**
-     * @override
-     */
-    public function prefersIdentityColumns(): bool
-    {
-        return $this->_prefersIdentityColumns;
-    }
-
-    /**
-     * @override
-     */
-    public function prefersSequences(): bool
-    {
-        return $this->_prefersSequences;
-    }
-
-    /**
-     * @override
-     */
-    public function getSequenceNextValSQL($sequence): string
-    {
-        return $this->_sequenceNextValSql;
-    }
-
-    /**
-     * @override
-     */
-    public function getBooleanTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    /**
-     * @override
-     */
-    public function getIntegerTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    /**
-     * @override
-     */
-    public function getBigIntTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    /**
-     * @override
-     */
-    public function getSmallIntTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    /**
-     * @override
-     */
-    protected function _getCommonIntegerTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    /**
-     * @override
-     */
-    public function getVarcharTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    /**
-     * @override
-     */
-    public function getClobTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    /**
-     * @override
-     */
-    public function getCurrentDatabaseExpression(): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    protected function getVarcharTypeDeclarationSQLSnippet($length): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    public function getBlobTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    public function getLocateExpression(string $string, string $substring, ?string $start = null): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    public function getDateDiffExpression(string $date1, string $date2): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    protected function getDateArithmeticIntervalExpression(string $date, string $operator, string $interval, DateIntervalUnit $unit): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    public function getAlterTableSQL(TableDiff $diff): array
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    public function getListViewsSQL(string $database): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    public function getSetTransactionIsolationSQL(TransactionIsolationLevel $level): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    public function getDateTimeTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    public function getDateTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    public function getTimeTypeDeclarationSQL(array $column): string
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    protected function createReservedKeywordsList(): KeywordList
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    public function createSchemaManager(Connection $connection): AbstractSchemaManager
-    {
-        throw new \LogicException(\sprintf('Method %s not implemented', __METHOD__));
-    }
-
-    /* MOCK API */
-
-    public function setPrefersIdentityColumns($bool): void
-    {
-        $this->_prefersIdentityColumns = $bool;
-    }
-
-    public function setPrefersSequences($bool): void
-    {
-        $this->_prefersSequences = $bool;
-    }
-
-    public function setSequenceNextValSql($sql): void
-    {
-        $this->_sequenceNextValSql = $sql;
-    }
-
-    public function getName(): string
-    {
-        return 'mock';
-    }
-
-    protected function initializeDoctrineTypeMappings(): void
-    {
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/SchemaRecord.php b/lib/Doctrine/Dbal/Tests/SchemaRecord.php
deleted file mode 100644
index 46198079..00000000
--- a/lib/Doctrine/Dbal/Tests/SchemaRecord.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal;
-
-use Doctrine\DBAL\Connection;
-
-final class SchemaRecord
-{
-    /** @var array<int, mixed[]> */
-    private array $records = [];
-
-    /**
-     * @param array<string, string> $columns ['column1' => 'type']
-     */
-    public function __construct(
-        private readonly string $table,
-        private readonly array $columns,
-    ) {
-    }
-
-    /**
-     * @param string                $tableName Fully qualified table-name
-     * @param array<string, string> $columns   ['column1' => 'type']
-     *
-     * @return SchemaRecord
-     */
-    public static function create(string $tableName, array $columns)
-    {
-        return new self($tableName, $columns);
-    }
-
-    public function getTable(): string
-    {
-        return $this->table;
-    }
-
-    /**
-     * @param mixed[] $values Values are expected in the same order as the columns
-     */
-    public function add(array $values)
-    {
-        if (\count($values) !== \count($this->columns)) {
-            throw new \InvalidArgumentException(
-                \sprintf(
-                    'Values count mismatch, expected %d got %d on table "%s" with record: %s',
-                    \count($this->columns),
-                    \count($values),
-                    $this->table,
-                    var_export($values, true)
-                )
-            );
-        }
-
-        $this->records[] = $values;
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function end(): self
-    {
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function records(): self
-    {
-        return $this;
-    }
-
-    /**
-     * @return array<string, string> ['column1' => 'type']
-     */
-    public function getColumns(): array
-    {
-        return $this->columns;
-    }
-
-    public function executeRecords(Connection $connection): void
-    {
-        foreach ($this->records as $values) {
-            $connection->insert(
-                $this->table,
-                array_combine(array_keys($this->columns), $values),
-                $this->columns
-            );
-        }
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/SqlConditionGeneratorTest.php b/lib/Doctrine/Dbal/Tests/SqlConditionGeneratorTest.php
deleted file mode 100644
index 27c7aa52..00000000
--- a/lib/Doctrine/Dbal/Tests/SqlConditionGeneratorTest.php
+++ /dev/null
@@ -1,897 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal;
-
-use Doctrine\DBAL\Query\QueryBuilder;
-use Rollerworks\Component\Search\Doctrine\Dbal\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Dbal\Test\QueryBuilderAssertion;
-use Rollerworks\Component\Search\Doctrine\Dbal\ValueConversion;
-use Rollerworks\Component\Search\Extension\Core\Type\DateType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\SearchPrimaryCondition;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class SqlConditionGeneratorTest extends DbalTestCase
-{
-    private function getConditionGenerator(SearchCondition $condition, ?QueryBuilder $qb = null)
-    {
-        $qb ??= $this->getConnectionMock()->createQueryBuilder()
-            ->select('i')
-            ->from('invoice', 'i')
-            ->join('i', 'customer', 'c', 'c.id = i.customer')
-        ;
-
-        $conditionGenerator = $this->getDbalFactory()->createConditionGenerator(
-            $qb,
-            $condition
-        );
-
-        $conditionGenerator->setField('customer', 'customer', 'i', 'integer');
-        $conditionGenerator->setField('customer_name', 'name', 'c', 'string');
-        $conditionGenerator->setField('customer_birthday', 'birthday', 'c', 'date');
-        $conditionGenerator->setField('status', 'status', 'i', 'integer');
-        $conditionGenerator->setField('label', 'label', 'i', 'string');
-
-        return $conditionGenerator;
-    }
-
-    /**
-     * @test
-     */
-    public function simple_query(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((i.customer = :search_0 OR i.customer = :search_1)))',
-            ['search_0' => [2, 'integer'], 'search_1' => [5, 'integer']]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function empty_query(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('id')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        QueryBuilderAssertion::assertQueryBuilderEquals($this->getConditionGenerator($condition), '');
-    }
-
-    /**
-     * @test
-     */
-    public function query_with_primary_cond(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $condition->setPrimaryCondition(
-            new SearchPrimaryCondition(
-                SearchConditionBuilder::create($this->getFieldSet())
-                    ->field('status')
-                        ->addSimpleValue(1)
-                        ->addSimpleValue(2)
-                    ->end()
-                ->getSearchCondition()
-                ->getValuesGroup()
-            )
-        );
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((i.status = :search_0 OR i.status = :search_1))) AND (((i.customer = :search_2 OR i.customer = :search_3)))',
-            [
-                'search_0' => [1, 'integer'],
-                'search_1' => [2, 'integer'],
-                'search_2' => [2, 'integer'],
-                'search_3' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function empty_query_with_primary_cond(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('id')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $condition->setPrimaryCondition(
-            new SearchPrimaryCondition(
-                SearchConditionBuilder::create($this->getFieldSet())
-                    ->field('status')
-                        ->addSimpleValue(1)
-                        ->addSimpleValue(2)
-                    ->end()
-                ->getSearchCondition()
-                ->getValuesGroup()
-            )
-        );
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $this->getConditionGenerator($condition),
-            ' WHERE (((i.status = :search_0 OR i.status = :search_1)))',
-            [
-                'search_0' => [1, 'integer'],
-                'search_1' => [2, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function query_with_multiple_fields(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->field('status')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((i.customer = :search_0 OR i.customer = :search_1)) AND ((i.status = :search_2 OR i.status = :search_3)))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-                'search_2' => [2, 'integer'],
-                'search_3' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function query_with_combined_field(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-        $conditionGenerator->setField('customer#1', 'id', null, 'integer');
-        $conditionGenerator->setField('customer#2', 'number2', null, 'integer');
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((id = :search_0 OR id = :search_1 OR number2 = :search_2 OR number2 = :search_3)))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-                'search_2' => [2, 'integer'],
-                'search_3' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function query_with_combined_field_and_custom_alias(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-        $conditionGenerator->setField('customer#1', 'id', null, 'integer');
-        $conditionGenerator->setField('customer#2', 'number2', 'c', 'string');
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((id = :search_0 OR id = :search_1 OR c.number2 = :search_2 OR c.number2 = :search_3)))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-                'search_2' => [2, 'string'],
-                'search_3' => [5, 'string'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function empty_condition(): void
-    {
-        $condition = new SearchCondition($this->getFieldSet(), new ValuesGroup());
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ''
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function excludes(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addExcludedSimpleValue(2)
-                ->addExcludedSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((i.customer <> :search_0 AND i.customer <> :search_1)))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function includes_and_excludes(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addExcludedSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE ((i.customer = :search_0 AND i.customer <> :search_1))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function ranges(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Range(2, 5))
-                ->add(new Range(10, 20))
-                ->add(new Range(60, 70, false))
-                ->add(new Range(100, 150, true, false))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE ((((i.customer >= :search_0 AND i.customer <= :search_1) OR (i.customer >= :search_2 AND i.customer <= :search_3) OR ' .
-            '(i.customer > :search_4 AND i.customer <= :search_5) OR (i.customer >= :search_6 AND i.customer < :search_7))))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-                'search_2' => [10, 'integer'],
-                'search_3' => [20, 'integer'],
-                'search_4' => [60, 'integer'],
-                'search_5' => [70, 'integer'],
-                'search_6' => [100, 'integer'],
-                'search_7' => [150, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function excluded_ranges(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new ExcludedRange(2, 5))
-                ->add(new ExcludedRange(10, 20))
-                ->add(new ExcludedRange(60, 70, false))
-                ->add(new ExcludedRange(100, 150, true, false))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE ((((i.customer <= :search_0 OR i.customer >= :search_1) AND (i.customer <= :search_2 OR ' .
-            'i.customer >= :search_3) AND (i.customer < :search_4 OR i.customer >= :search_5) AND ' .
-            '(i.customer <= :search_6 OR i.customer > :search_7))))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-                'search_2' => [10, 'integer'],
-                'search_3' => [20, 'integer'],
-                'search_4' => [60, 'integer'],
-                'search_5' => [70, 'integer'],
-                'search_6' => [100, 'integer'],
-                'search_7' => [150, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function single_comparison(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(2, '>'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE ((i.customer > :search_0))',
-            [
-                'search_0' => [2, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function multiple_comparisons(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(2, '>'))
-                ->add(new Compare(10, '<'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((i.customer > :search_0 AND i.customer < :search_1)))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [10, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function multiple_comparisons_with_groups(): void
-    {
-        // Use two subgroups here as the comparisons are AND to each other
-        // but applying them in the head group would ignore subgroups
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->group()
-                ->field('customer')
-                    ->add(new Compare(2, '>'))
-                    ->add(new Compare(10, '<'))
-                    ->addSimpleValue(20)
-                ->end()
-            ->end()
-            ->group()
-                ->field('customer')
-                    ->add(new Compare(30, '>'))
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE ((((i.customer = :search_0 OR (i.customer > :search_1 AND i.customer < :search_2)))) OR ((i.customer > :search_3)))',
-            [
-                'search_0' => [20, 'integer'],
-                'search_1' => [2, 'integer'],
-                'search_2' => [10, 'integer'],
-                'search_3' => [30, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function excluding_comparisons(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(2, '<>'))
-                ->add(new Compare(5, '<>'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE ((i.customer <> :search_0 AND i.customer <> :search_1))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function excluding_comparisons_with_normal(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(35, '<>'))
-                ->add(new Compare(45, '<>'))
-                ->add(new Compare(30, '>'))
-                ->add(new Compare(50, '<'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((i.customer > :search_0 AND i.customer < :search_1) AND i.customer <> :search_2 AND i.customer <> :search_3))',
-            [
-                'search_0' => [30, 'integer'],
-                'search_1' => [50, 'integer'],
-                'search_2' => [35, 'integer'],
-                'search_3' => [45, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function pattern_matchers(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer_name')
-                ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-                ->add(new PatternMatch('fo\\\'o', PatternMatch::PATTERN_STARTS_WITH))
-                ->add(new PatternMatch('bar', PatternMatch::PATTERN_NOT_ENDS_WITH, true))
-                ->add(new PatternMatch('My name', PatternMatch::PATTERN_EQUALS))
-                ->add(new PatternMatch('Last', PatternMatch::PATTERN_NOT_EQUALS))
-                ->add(new PatternMatch('Spider', PatternMatch::PATTERN_EQUALS, true))
-                ->add(new PatternMatch('Piggy', PatternMatch::PATTERN_NOT_EQUALS, true))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            " WHERE (((c.name LIKE :search_0 || '%' OR c.name LIKE :search_1 || '%' OR c.name = :search_2 OR LOWER(c.name) = LOWER(:search_3)) AND (LOWER(c.name) NOT LIKE LOWER('%' || :search_4) AND c.name <> :search_5 AND LOWER(c.name) <> LOWER(:search_6))))",
-            [
-                'search_0' => ['foo', 'text'],
-                'search_1' => ['fo\\\'o', 'text'],
-                'search_2' => ['My name', 'text'],
-                'search_3' => ['Spider', 'text'],
-                'search_4' => ['bar', 'text'],
-                'search_5' => ['Last', 'text'],
-                'search_6' => ['Piggy', 'text'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function sub_groups(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->group()
-                ->field('customer')->addSimpleValue(2)->end()
-            ->end()
-            ->group()
-                ->field('customer')->addSimpleValue(3)->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((i.customer = :search_0)) OR ((i.customer = :search_1)))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [3, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function sub_group_with_root_condition(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-            ->end()
-            ->group()
-                ->field('customer_name')
-                    ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            " WHERE (((i.customer = :search_0)) AND (((c.name LIKE :search_1 || '%'))))",
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => ['foo', 'text'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function or_group_root(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet(), ValuesGroup::GROUP_LOGICAL_OR)
-            ->field('customer')
-                ->addSimpleValue(2)
-            ->end()
-            ->field('customer_name')
-                ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            " WHERE ((i.customer = :search_0) OR (c.name LIKE :search_1 || '%'))",
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => ['foo', 'text'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function sub_or_group(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->group()
-                ->group(ValuesGroup::GROUP_LOGICAL_OR)
-                    ->field('customer')
-                        ->addSimpleValue(2)
-                    ->end()
-                    ->field('customer_name')
-                        ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-                    ->end()
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            " WHERE ((((i.customer = :search_0) OR (c.name LIKE :search_1 || '%'))))",
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => ['foo', 'text'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function column_conversion(): void
-    {
-        $converter = $this->createMock(ColumnConversion::class);
-        $converter
-            ->expects(self::atLeastOnce())
-            ->method('convertColumn')
-            ->willReturnCallback(static function ($column, array $options, ConversionHints $hints) {
-                self::assertArrayHasKey('grouping', $options);
-                self::assertTrue($options['grouping']);
-
-                self::assertEquals('i', $hints->field->alias);
-                self::assertEquals('i.customer', $hints->column);
-
-                return "CAST({$column} AS customer_type)";
-            })
-        ;
-
-        $fieldSetBuilder = $this->getFieldSet(false);
-        $fieldSetBuilder->add('customer', IntegerType::class, ['grouping' => true, 'doctrine_dbal_conversion' => $converter]);
-
-        $condition = SearchConditionBuilder::create($fieldSetBuilder->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((CAST(i.customer AS customer_type) = :search_0 OR CAST(i.customer AS customer_type) = :search_1)))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function value_conversion(): void
-    {
-        $converter = $this->createMock(ValueConversion::class);
-        $converter
-            ->expects(self::atLeastOnce())
-            ->method('convertValue')
-            ->willReturnCallback(static function ($value, array $options, ConversionHints $hints) {
-                self::assertArrayHasKey('grouping', $options);
-                self::assertTrue($options['grouping']);
-
-                $value = $hints->createParamReferenceFor($value, 'integer');
-
-                return "get_customer_type({$value})";
-            })
-        ;
-
-        $fieldSetBuilder = $this->getFieldSet(false);
-        $fieldSetBuilder->add('customer', IntegerType::class, ['grouping' => true, 'doctrine_dbal_conversion' => $converter]);
-
-        $condition = SearchConditionBuilder::create($fieldSetBuilder->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((i.customer = get_customer_type(:search_0) OR i.customer = get_customer_type(:search_1))))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function conversion_strategy_value(): void
-    {
-        $converter = $this->createMock(ValueConversion::class);
-        $converter
-            ->expects(self::atLeastOnce())
-            ->method('convertValue')
-            ->willReturnCallback(static function ($value, array $passedOptions, ConversionHints $hints) {
-                self::assertArrayHasKey('pattern', $passedOptions);
-                self::assertEquals('dd-MM-yy', $passedOptions['pattern']);
-
-                if ($value instanceof \DateTimeImmutable) {
-                    return 'CAST(' . $hints->createParamReferenceFor($value->format('Y-m-d'), 'string') . ' AS AGE)';
-                }
-
-                return $hints->createParamReferenceFor($value, 'integer');
-            })
-        ;
-
-        $fieldSet = $this->getFieldSet(false);
-        $fieldSet->add('customer_birthday', DateType::class, ['doctrine_dbal_conversion' => $converter, 'pattern' => 'dd-MM-yy']);
-
-        $condition = SearchConditionBuilder::create($fieldSet->getFieldSet())
-            ->field('customer_birthday')
-                ->addSimpleValue(18)
-                ->addSimpleValue(new \DateTimeImmutable('2001-01-15', new \DateTimeZone('UTC')))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((c.birthday = :search_0 OR c.birthday = CAST(:search_1 AS AGE))))',
-            [
-                'search_0' => [18, 'integer'],
-                'search_1' => ['2001-01-15', 'string'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function conversion_strategy_column(): void
-    {
-        $converter = $this->createMock(ColumnConversion::class);
-        $converter
-            ->expects(self::atLeastOnce())
-            ->method('convertColumn')
-            ->willReturnCallback(static function ($column, array $options, ConversionHints $hints) {
-                if (\is_int($hints->originalValue)) {
-                    return "search_conversion_age({$column})";
-                }
-
-                return $column;
-            })
-        ;
-
-        $fieldSetBuilder = $this->getFieldSet(false);
-        $fieldSetBuilder->add('customer_birthday', TextType::class, ['doctrine_dbal_conversion' => $converter]);
-
-        $condition = SearchConditionBuilder::create($fieldSetBuilder->getFieldSet())
-            ->field('customer_birthday')
-                ->addSimpleValue(18)
-                ->addSimpleValue('2001-01-15')
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-        $conditionGenerator->setField('customer_birthday', 'birthday', 'c', 'string');
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((search_conversion_age(c.birthday) = :search_0 OR c.birthday = :search_1)))',
-            [
-                'search_0' => [18, 'string'],
-                'search_1' => ['2001-01-15', 'string'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function lazy_conversion_loading(): void
-    {
-        $converter = $this->createMock(ColumnConversion::class);
-        $converter
-            ->expects(self::atLeastOnce())
-            ->method('convertColumn')
-            ->willReturnCallback(static function ($column, array $options, ConversionHints $hints) {
-                self::assertArrayHasKey('grouping', $options);
-                self::assertTrue($options['grouping']);
-                self::assertEquals('i', $hints->field->alias);
-                self::assertEquals('i.customer', $hints->column);
-
-                return "CAST({$column} AS customer_type)";
-            })
-        ;
-
-        $fieldSetBuilder = $this->getFieldSet(false);
-        $fieldSetBuilder->add('customer', IntegerType::class, [
-            'grouping' => true,
-            'doctrine_dbal_conversion' => static fn (): ColumnConversion => $converter,
-        ]);
-
-        $condition = SearchConditionBuilder::create($fieldSetBuilder->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        QueryBuilderAssertion::assertQueryBuilderEquals(
-            $conditionGenerator,
-            ' WHERE (((CAST(i.customer AS customer_type) = :search_0 OR CAST(i.customer AS customer_type) = :search_1)))',
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/Stub/Type/InvoiceLabelType.php b/lib/Doctrine/Dbal/Tests/Stub/Type/InvoiceLabelType.php
deleted file mode 100644
index 0c56b2db..00000000
--- a/lib/Doctrine/Dbal/Tests/Stub/Type/InvoiceLabelType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal\Stub\Type;
-
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-
-final class InvoiceLabelType extends AbstractFieldType
-{
-}
diff --git a/lib/Doctrine/Dbal/Tests/Stub/Type/InvoiceStatusType.php b/lib/Doctrine/Dbal/Tests/Stub/Type/InvoiceStatusType.php
deleted file mode 100644
index 5d46ae03..00000000
--- a/lib/Doctrine/Dbal/Tests/Stub/Type/InvoiceStatusType.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Dbal\Stub\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\ChoiceType;
-use Rollerworks\Component\Search\Field\AbstractFieldType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-final class InvoiceStatusType extends AbstractFieldType
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            ['choices' => ['concept' => 0, 'publish' => 1, 'paid' => 2]]
-        );
-    }
-
-    public function getParent(): string
-    {
-        return ChoiceType::class;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/TestUtil.php b/lib/Doctrine/Dbal/Tests/TestUtil.php
deleted file mode 100644
index 49dd9071..00000000
--- a/lib/Doctrine/Dbal/Tests/TestUtil.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal\Tests;
-
-use Doctrine\Common\EventSubscriber;
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Exception\DriverException;
-use Doctrine\DBAL\Schema\AbstractSchemaManager;
-use Doctrine\ORM\Configuration;
-
-/**
- * TestUtil is a class with static utility methods used during tests.
- *
- * @see \Doctrine\Tests\TestUtil
- */
-class TestUtil
-{
-    /** @var bool Whether the database schema is initialized. */
-    private static $initialized = false;
-
-    /**
-     * Gets a <b>real</b> database connection using the following parameters
-     * of the $GLOBALS array:
-     *
-     * 'db_driver' : The name of the Doctrine DBAL database driver to use.
-     * 'db_user' : The username to use for connecting.
-     * 'db_password' : The password to use for connecting.
-     * 'db_host' : The hostname of the database to connect to.
-     * 'db_server' : The server name of the database to connect to
-     *               (optional, some vendors allow multiple server instances with different names on the same host).
-     * 'db_dbname' : The name of the database to connect to.
-     * 'db_port' : The port of the database to connect to.
-     *
-     * These variables of the $GLOBALS array are filled by PHPUnit based on an XML configuration file.
-     *
-     * IMPORTANT:
-     * 1) Each invocation of this method returns a NEW database connection.
-     * 2) The database is dropped and recreated to ensure it's clean.
-     */
-    public static function getConnection(): DbalExtensions\Connection
-    {
-        if (! self::$initialized) {
-            self::initializeDatabase();
-            self::$initialized = true;
-        }
-
-        $connectionParameters = self::getTestConnectionParameters();
-        $configuration = new Configuration();
-
-        $connection = DriverManager::getConnection($connectionParameters, $configuration);
-        \assert($connection instanceof DbalExtensions\Connection);
-
-        self::addDbEventSubscribers($connection);
-
-        return $connection;
-    }
-
-    public static function getPrivilegedConnection(): DbalExtensions\Connection
-    {
-        $connection = DriverManager::getConnection(self::getPrivilegedConnectionParameters());
-        \assert($connection instanceof DbalExtensions\Connection);
-
-        return $connection;
-    }
-
-    private static function initializeDatabase(): void
-    {
-        $testConnParams = self::getTestConnectionParameters();
-        $privConnParams = self::getPrivilegedConnectionParameters();
-
-        $testConn = DriverManager::getConnection($testConnParams);
-
-        // Note, writes direct to STDERR to prevent phpunit detecting output - otherwise this would cause either an
-        // "unexpected output" warning or a failure on the first test case to call this method.
-        fwrite(\STDERR, \sprintf("\nUsing DB driver %s\n", get_debug_type($testConn->getDriver())));
-
-        // Connect as a privileged user to create and drop the test database.
-        $privConn = DriverManager::getConnection($privConnParams);
-
-        $dbname = $testConnParams['dbname'] ?? $testConn->getDatabase();
-        $testConn->close();
-
-        if ($dbname !== null) {
-            $schemaManager = self::createSchemaManager($privConn);
-
-            try {
-                $schemaManager->dropDatabase($dbname);
-            } catch (DriverException) {
-            }
-
-            $schemaManager->createDatabase($dbname);
-
-            $privConn->close();
-        }
-    }
-
-    private static function createSchemaManager(Connection $connection): AbstractSchemaManager
-    {
-        return method_exists(Connection::class, 'createSchemaManager')
-            ? $connection->createSchemaManager()
-            : $connection->getSchemaManager();
-    }
-
-    private static function addDbEventSubscribers(Connection $conn): void
-    {
-        if (! isset($GLOBALS['db_event_subscribers'])) {
-            return;
-        }
-
-        $evm = $conn->getEventManager();
-
-        /** @var class-string<EventSubscriber> $subscriberClass */
-        foreach (explode(',', (string) $GLOBALS['db_event_subscribers']) as $subscriberClass) {
-            $subscriberInstance = new $subscriberClass();
-            $evm->addEventSubscriber($subscriberInstance);
-        }
-    }
-
-    /**
-     * @psalm-return array<string, mixed>
-     */
-    private static function getPrivilegedConnectionParameters(): array
-    {
-        if (isset($GLOBALS['privileged_db_driver'])) {
-            return self::mapConnectionParameters($GLOBALS, 'privileged_db_');
-        }
-
-        $parameters = self::mapConnectionParameters($GLOBALS, 'db_');
-        unset($parameters['dbname']);
-
-        return $parameters;
-    }
-
-    /**
-     * @psalm-return array<string, mixed>
-     */
-    private static function getTestConnectionParameters(): array
-    {
-        if (! isset($GLOBALS['db_driver'])) {
-            throw new \UnexpectedValueException(
-                'You must provide database connection params including a db_driver value. See phpunit.xml.dist for details'
-            );
-        }
-
-        return self::mapConnectionParameters($GLOBALS, 'db_');
-    }
-
-    /**
-     * @param array<string,mixed> $configuration
-     *
-     * @return array<string,mixed>
-     */
-    private static function mapConnectionParameters(array $configuration, string $prefix): array
-    {
-        $parameters = [];
-
-        foreach (
-            [
-                'driver',
-                'user',
-                'password',
-                'host',
-                'dbname',
-                'port',
-                'server',
-                'memory',
-                'path',
-                'ssl_key',
-                'ssl_cert',
-                'ssl_ca',
-                'ssl_capath',
-                'ssl_cipher',
-                'unix_socket',
-            ] as $parameter
-        ) {
-            if (! isset($configuration[$prefix . $parameter])) {
-                continue;
-            }
-
-            $parameters[$parameter] = $configuration[$prefix . $parameter];
-        }
-
-        foreach ($configuration as $param => $value) {
-            if (! str_starts_with($param, $prefix . 'driver_option_')) {
-                continue;
-            }
-
-            $parameters['driverOptions'][mb_substr($param, mb_strlen($prefix . 'driver_option_'))] = $value;
-        }
-
-        $parameters['wrapperClass'] = DbalExtensions\Connection::class;
-
-        return $parameters;
-    }
-}
diff --git a/lib/Doctrine/Dbal/Tests/bootstrap.php b/lib/Doctrine/Dbal/Tests/bootstrap.php
deleted file mode 100644
index 55e405b0..00000000
--- a/lib/Doctrine/Dbal/Tests/bootstrap.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-error_reporting(\E_ALL | \E_STRICT);
-
-if (! file_exists(__DIR__ . '/../vendor/autoload.php')) {
-    throw new RuntimeException('Did not find vendor/autoload.php. Did you run "composer install --prefer-source --dev"?');
-}
-
-date_default_timezone_set('UTC');
-
-require __DIR__ . '/../vendor/autoload.php';
diff --git a/lib/Doctrine/Dbal/UPGRADE-2.0.md b/lib/Doctrine/Dbal/UPGRADE-2.0.md
deleted file mode 100644
index 849089fc..00000000
--- a/lib/Doctrine/Dbal/UPGRADE-2.0.md
+++ /dev/null
@@ -1,91 +0,0 @@
-UPGRADE FROM 2.0-ALPHA3 to 2.0-ALPHA8
-=====================================
-
-* `Rollerworks\Component\Search\Doctrine\Dbal\StrategySupportedConversion::getConversionStrategy`
-  method not must return an integer. And requires a return-type is set.
-
-UPGRADE FROM 1.x to 2.0
-=======================
-
- * Support PHP 5 is dropped you need at least PHP 7.1
-
- * The Cache implementation now depends on PSR-16 (SimpleCache) instead
-   of the Doctrine Cache library.
- 
- * The `WhereBuilder` class had been renamed to `SqlConditionGenerator`.
- 
- * The WhereBuilderInterface has been renamed to ConditionGenerator.
- 
- * The CachedConditionGenerator (was CacheWhereBuilder) class no longer allows
-   configuring the cache key. The Cache key is now automatically computed 
-   based on the FieldSet (name), serialized root ValuesGroup and Field mappings
-   (except field options).
- 
- * Not setting a Cache implementation for the Factory will simple disable the cache
-   and will no longer throw an exception when creating a CachedConditionGenerator.
- 
- * The CachedConditionGenerator and SqlConditionGenerator now strictly implements
-   the same interface. Meaning the CachedConditionGenerator can be used for configuring
-   the decorated SqlConditionGenerator.
-   
- * The `QueryField` properties are now public, all getter methods have been removed;
- 
-   The `column` property now includes the table alias (if any), use the `tableColumn` property
-   to get actual column name with alias.
-   
-## Mapping
-
- * The prototype signature setField changed to 
-   `setField(string $fieldName, string $column, string $alias = null, string $type = 'string')`.
-
- * The `setField` method now allows configure secondary mappings for the same
-   field. This replaces the `setCombinedField` method.
-   
-   Before:
-
-   ```php
-   $conditionGenerator->setCombinedField('customer-name', [
-       ['column' => 'first_name', 'type' => 'string', 'alias' => 'c'],
-       ['column' => 'last_name', 'type' => 'string', 'alias' => 'c'],
-   ]);
-   ```
-
-   After:
-
-   ```php
-   $conditionGenerator->setField('customer-name#first_name', 'first_name', 'c', 'string');
-   $conditionGenerator->setField('customer-name#last_name', 'last_name', 'c', 'string');
-   ```
-   
-   The name of a mapping begins with the field-name as registered in the FieldSet,
-   followed by `#` and the name of the mapping (used for debugging).
-   
-   **Caution:** A field can only have multiple mappings or one, omitting `#` will remove
-   any existing mappings for that field. Registering the field without `#` first and then
-   setting multiple mappings for that field will reset the single mapping. 
-
- * The `setCombinedField` method has been removed.
- 
- * The `setField` method no longer accepts DBAL types as object, use a string for the
-   type instead.
-  
-## Conversions
-
- * Conversions can no longer be configured on a ConditionGenerator,
-   use the FieldType to configure a Conversion for the field.
-   
-   The `getFieldConversions` and `getValueConversions` methods have been removed.
-
- * Conversions now always apply at the SQL level, the `ValueConversion::convertValue`
-   method is now expected to return an SQL value statement.
-   
-   **Caution:** The value is not escaped by the search system, the conversion
-   must handle proper escaping and quoting of the value!
-   
-   The `requiresBaseConversion` method is removed.
-   
- * Renamed SqlFieldConversionInterface to ColumnConversion
- 
- * Renamed SqlValueConversion to ValueConversion
- 
- * Renamed ConversionStrategyInterface to StrategySupportedConversion
diff --git a/lib/Doctrine/Dbal/UPGRADE.md b/lib/Doctrine/Dbal/UPGRADE.md
deleted file mode 100644
index ac9eec27..00000000
--- a/lib/Doctrine/Dbal/UPGRADE.md
+++ /dev/null
@@ -1,99 +0,0 @@
-UPGRADE
-=======
-
-## Upgrade FROM v1.0.0-beta6 to 1.0.0-beta7
-
-* The `Rollerworks\Component\Search\Doctrine\Dbal\AbstractWhereBuilder`
-  is merged with the `Rollerworks\Component\Search\Doctrine\Dbal\WhereBuilder`
-  class, the old `AbstractWhereBuilder` class is removed.
-  
-## Upgrade FROM v1.0.0-beta5 to 1.0.0-beta6
-
-No changes required.
-
-## Upgrade FROM v1.0.0-beta4 to 1.0.0-beta5
-
-No changes required.
-
-## Upgrade FROM v1.0.0-beta3 to 1.0.0-beta4
-
-This beta release is compatible with RollerworksSearch v1.0.0-beta5
-and up. **You are highly recommended to upgrade as the old versions will
-not receive any updates!**
-
-Just like the RollerworksSearch package there has been some major
-refactoring to make the Doctrine DBAL search-condition processor more
-robust and easier to use.
-
-* Query parameters are completely removed, there we to much problems with
-  type-binding and conversion handling. In practice this means all the values
-  are safely embedded within in the generated query. As a bonus, it's also
-  faster.
-  
-  Before:
-  
-  ```php
-    if ($whereClause = $whereBuilder->getWhereClause()) {
-       $query .= ' WHERE '.$whereClause;
-    }
-    
-    $queryStatement = $connection->prepare($query);
-
-    if ($whereClause) {
-        $cacheWhereBuilder->bindParameters($queryStatement);
-    }
-    
-    /* ... */
-    
-    $queryStatement->execute();
-    $cacheWhereBuilder->bindParameters($queryStatement);
-  ```
-  
-  After:
-  
-  ```php
-    if ($whereClause = $whereBuilder->getWhereClause()) {
-       $query .= ' WHERE '.$whereClause;
-    }
-    
-    $queryStatement = $connection->query($query);
-  ```
-  
-* Hints for conversions are now passed as an `Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints`
-  object instead of an array. The `ConversionHints` provides direct access to the properties.
-
-  Before:
-  
-  ```php
-    public function requiresBaseConversion($input, array $options, array $hints);
-    public function convertValue($input, array $options, array $hints);
-    public function convertSqlValue($input, array $options, array $hints);
-    public function convertSqlField($column, array $options, array $hints);
-  ```
-  
-  After:
-  
-  ```php
-      public function requiresBaseConversion($input, array $options, ConversionHints $hints);
-      public function convertValue($input, array $options, ConversionHints $hints);
-      public function convertSqlValue($input, array $options, ConversionHints $hints);
-      public function convertSqlField($column, array $options, ConversionHints $hints);
-  ```
-  
-* The `original_value` and `value_object` parameters are no longer available
-  for conversion hints.
-  
-* The internal cache structure of the `CacheWhereBuilder` has changed, purge
-  your cache to remove any invalid entries.
-
-The following changes don't affect how the system is used but may be of
-interest.
-
-* The internal classes are moved to the `Query` sub-namespace.
-  You should not never use these classes directly. 
-
-* Integers are no longer quoted as SQLite has some problems with automatic
-  casting.
-  
-* The `AgeDateConversion` class (used by the `birthday` type) now only
-  casts a column to a date when the column doesn't have the date type.
diff --git a/lib/Doctrine/Dbal/ValueConversion.php b/lib/Doctrine/Dbal/ValueConversion.php
deleted file mode 100644
index cba32344..00000000
--- a/lib/Doctrine/Dbal/ValueConversion.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Dbal;
-
-/**
- * A ValueConversion allows to convert the value "model" to a valid
- * SQL statement to be used a column value.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface ValueConversion
-{
-    /**
-     * Returns the converted value as an SQL statement.
-     *
-     * The returned result must a be a platform specific SQL statement
-     * that can be used as a column's value.
-     *
-     * Used values must be registered as parameters using `$hints->createParamReferenceFor($value)`
-     * with a DBAL Type as second argument (converted afterwards).
-     *
-     * @param mixed                $value   The "model" value format
-     * @param array<string, mixed> $options Options of the Field configuration
-     * @param ConversionHints      $hints   Special information for the conversion process
-     */
-    public function convertValue($value, array $options, ConversionHints $hints): string;
-}
diff --git a/lib/Doctrine/Dbal/composer.json b/lib/Doctrine/Dbal/composer.json
deleted file mode 100644
index 3a13abab..00000000
--- a/lib/Doctrine/Dbal/composer.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-    "name": "rollerworks/search-doctrine-dbal",
-    "description": "Doctrine DBAL extension for RollerworksSearch",
-    "license": "MIT",
-    "type": "library",
-    "keywords": [
-        "rollerworks",
-        "search",
-        "doctrine",
-        "dbal"
-    ],
-    "authors": [
-        {
-            "name": "Sebastiaan Stok",
-            "email": "s.stok@rollercapes.net"
-        },
-        {
-            "name": "Community contributions",
-            "homepage": "https://github.com/Rollerworks/rollerworks-search-doctrine-dbal/contributors"
-        }
-    ],
-    "require": {
-        "php": "^8.1",
-        "doctrine/dbal": "^3.8.0 || ^4.2",
-        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
-        "rollerworks/search": ">=2.0.0-BETA9 ^2.0@dev"
-    },
-    "require-dev": {
-        "moneyphp/money": "^3.2.0 || ^4.0",
-        "symfony/phpunit-bridge": "^6.4 || ^7.4 || ^8.0",
-        "symfony/var-dumper": "^6.4 || ^7.4 || ^8.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\Doctrine\\Dbal\\": "",
-            "Rollerworks\\Component\\Search\\Extension\\Doctrine\\Dbal\\": "Extension/"
-        },
-        "exclude-from-classmap": [
-            "Tests/"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\Tests\\Doctrine\\Dbal\\": "Tests/"
-        }
-    },
-    "config": {
-        "preferred-install": {
-            "doctrine/dbal": "source",
-            "*": "dist"
-        },
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.0-dev"
-        }
-    }
-}
diff --git a/lib/Doctrine/Dbal/phpunit.xml.dist b/lib/Doctrine/Dbal/phpunit.xml.dist
deleted file mode 100644
index 7c9cc098..00000000
--- a/lib/Doctrine/Dbal/phpunit.xml.dist
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
-         colors="true"
-         bootstrap="tests/bootstrap.php"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
->
-    <php>
-        <ini name="intl.default_locale" value="en"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="memory_limit" value="-1"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="RollerworksSearch Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <groups>
-        <exclude>
-            <group>functional</group>
-            <group>performance</group>
-        </exclude>
-    </groups>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-            <exclude>
-                <directory>./vendor/</directory>
-                <directory>./tests/</directory>
-                <directory>./doc/</directory>
-                <directory>./bin/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/lib/Doctrine/Orm/.gitattributes b/lib/Doctrine/Orm/.gitattributes
deleted file mode 100644
index fbd8056d..00000000
--- a/lib/Doctrine/Orm/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-/Tests/ export-ignore
-/phpunit.xml.dist export-ignore
-.git* export-ignore
diff --git a/lib/Doctrine/Orm/.gitignore b/lib/Doctrine/Orm/.gitignore
deleted file mode 100644
index 207f97e0..00000000
--- a/lib/Doctrine/Orm/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/vendor/
-/composer.lock
-/phpunit.xml
diff --git a/lib/Doctrine/Orm/CachedDqlConditionGenerator.php b/lib/Doctrine/Orm/CachedDqlConditionGenerator.php
deleted file mode 100644
index 39e35abe..00000000
--- a/lib/Doctrine/Orm/CachedDqlConditionGenerator.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm;
-
-use Doctrine\ORM\QueryBuilder;
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\Doctrine\Dbal\AbstractCachedConditionGenerator;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\SearchCondition;
-
-/**
- * SearchCondition Doctrine ORM DQL CachedConditionGenerator.
- *
- * Note: this class should not be relied upon as interface,
- * use the ConditionGenerator interface instead for type hinting
- *
- * The cache-key is a hashed (sha256) combination of the SearchCondition
- * (root ValuesGroup and FieldSet name) and configured field mappings.
- *
- * Caution: Any noticeable changes to your (FieldSet) configuration
- * should purge all cached entries.
- *
- * After the fields are configured call `apply()` to apply
- * the condition on the QueryBuilder.
- *
- * @final
- */
-class CachedDqlConditionGenerator extends AbstractCachedConditionGenerator implements ConditionGenerator
-{
-    private FieldConfigBuilder $fieldsConfig;
-    private QueryBuilder $qb;
-
-    public function __construct(QueryBuilder $query, SearchCondition $searchCondition, Cache $cacheDriver, \DateInterval | int | null $ttl = null)
-    {
-        parent::__construct($cacheDriver, $searchCondition, $ttl);
-
-        $this->fieldsConfig = new FieldConfigBuilder($query->getEntityManager(), $searchCondition->getFieldSet());
-        $this->qb = $query;
-    }
-
-    public function setDefaultEntity(string $entity, string $alias)
-    {
-        $this->guardNotGenerated();
-        $this->fieldsConfig->setDefaultEntity($entity, $alias);
-
-        return $this;
-    }
-
-    /**
-     * @throws BadMethodCallException When the where-clause is already generated
-     */
-    protected function guardNotGenerated(): void
-    {
-        if ($this->isApplied) {
-            throw new BadMethodCallException('ConditionGenerator configuration cannot be changed once the query is applied.');
-        }
-    }
-
-    public function setField(string $fieldName, string $property, ?string $alias = null, ?string $entity = null, ?string $dbType = null)
-    {
-        $this->guardNotGenerated();
-        $this->fieldsConfig->setField($fieldName, $property, $alias, $entity, $dbType);
-
-        return $this;
-    }
-
-    public function apply(): void
-    {
-        if ($this->isApplied) {
-            trigger_error('SearchCondition was already applied. Ignoring operation.', \E_USER_WARNING);
-
-            return;
-        }
-
-        $this->isApplied = true;
-
-        $cacheKey = $this->getCacheKey($this->fieldsConfig->getFields(), 'dql');
-        $cached = $this->getFromCache($cacheKey);
-
-        // Note that ordering is not part of the cache as this only applies at the root level
-        // And is handled by Doctrine DQL itself, making it possible to reuse the same condition
-        // with a different ordering.
-
-        if ($cached !== null) {
-            [$whereClause, $parameters] = $cached;
-        } else {
-            $generator = new DqlConditionGenerator($this->qb->getEntityManager(), $this->searchCondition, $this->fieldsConfig);
-            $whereClause = $generator->getWhereClause();
-            $parameters = $generator->getParameters();
-
-            $this->storeInCache($whereClause, $cacheKey, $parameters);
-        }
-
-        DqlConditionGenerator::applySortingTo($this->searchCondition->getPrimaryCondition()?->getOrder(), $this->qb, $this->fieldsConfig);
-        DqlConditionGenerator::applySortingTo($this->searchCondition->getOrder(), $this->qb, $this->fieldsConfig);
-
-        if ($whereClause !== '') {
-            $this->qb->andWhere($whereClause);
-
-            foreach ($parameters as $name => [$value, $type]) {
-                $this->qb->setParameter($name, $value, $type);
-            }
-        }
-    }
-
-    public function getQueryBuilder(): QueryBuilder
-    {
-        return $this->qb;
-    }
-}
diff --git a/lib/Doctrine/Orm/ColumnConversion.php b/lib/Doctrine/Orm/ColumnConversion.php
deleted file mode 100644
index 5f5f87b9..00000000
--- a/lib/Doctrine/Orm/ColumnConversion.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-
-/**
- * A ColumnConversion allows to wrap the query's column in a custom
- * DQL statement (as-is).
- *
- * This interface can be combined with the ValueConversion interface.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface ColumnConversion
-{
-    /**
-     * Return the $column wrapped inside an DQL statement like: MY_FUNCTION(column).
-     *
-     * @param string               $column  The column name and table alias, eg. i.id
-     * @param array<string, mixed> $options Options of the Field configuration
-     * @param ConversionHints      $hints   Special information for the conversion process
-     */
-    public function convertColumn(string $column, array $options, ConversionHints $hints): string;
-}
diff --git a/lib/Doctrine/Orm/ConditionGenerator.php b/lib/Doctrine/Orm/ConditionGenerator.php
deleted file mode 100644
index 9c902954..00000000
--- a/lib/Doctrine/Orm/ConditionGenerator.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm;
-
-use Doctrine\ORM\QueryBuilder;
-use Rollerworks\Component\Search\SearchCondition;
-
-/**
- * A Doctrine ORM ConditionGenerator generates an DQL/SQL WHERE-clause
- * based on the provided SearchCondition.
- *
- * This interface is provided for type hinting and should not be
- * used for alternative implementations.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface ConditionGenerator
-{
-    /**
-     * Set the default entity mapping configuration, only for fields
-     * configured *after* this method.
-     *
-     * Note: Calling this method after calling setField() will not affect
-     * fields that were already configured. Which means you can use this
-     * method to configure chunks of configuration.
-     *
-     * @param string $entity Entity name (FQCN)
-     * @param string $alias  Table alias as used in the query "u" for `FROM Acme:Users AS u`
-     *
-     * @return $this
-     */
-    public function setDefaultEntity(string $entity, string $alias);
-
-    /**
-     * Set the search field to Entity mapping mapping configuration.
-     *
-     * To map a field to more than one column use the `field-name#mapping-name`
-     * notation for for the $fieldName argument.
-     *
-     * The `field-name` is the field name as registered in the FieldSet, the
-     * `mapping-name` allows to configure a (secondary) mapping for a field.
-     *
-     * Caution: A field can only have multiple mappings _or_ one.
-     *
-     * * Omitting the `#` removes any existing mappings for that field.
-     * * Registering a field without `#` first, and then setting multiple mappings
-     *   for that field will reset the single mapping.
-     *
-     * Tip: The `mapping-name` doesn't have to be same as $column, but using a clear name
-     * helps greatly with trouble shooting.
-     *
-     * Note: Associations are automatically resolved, but can only work for a single
-     * property reference. If resolving is not possible the property must be owned by
-     * the entity (not reference another entity).
-     *
-     * If the entity field is used in a many-to-many relation you must to reference the
-     * targetEntity that is set on the ManyToMany mapping and use the entity field of
-     * that entity.
-     *
-     * @param string $fieldName Name of the search field as registered in the FieldSet or
-     *                          `field-name#mapping-name` to configure a secondary mapping
-     * @param string $property  Entity field name
-     * @param string $alias     Table alias as used in the query "u" for `FROM Acme\Entity\User AS u`
-     * @param string $entity    Entity name (FQCN or Doctrine aliased)
-     * @param string $dbType    Doctrine DBAL supported type, eg. string (not text)
-     *
-     * @return $this
-     */
-    public function setField(string $fieldName, string $property, ?string $alias = null, ?string $entity = null, ?string $dbType = null);
-
-    /**
-     * Apply the SearchCondition to the QueryBuilder (as an AND-WHERE).
-     */
-    public function apply();
-
-    public function getQueryBuilder(): QueryBuilder;
-}
diff --git a/lib/Doctrine/Orm/DoctrineOrmFactory.php b/lib/Doctrine/Orm/DoctrineOrmFactory.php
deleted file mode 100644
index df00da16..00000000
--- a/lib/Doctrine/Orm/DoctrineOrmFactory.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm;
-
-use Doctrine\ORM\QueryBuilder;
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\SearchCondition;
-
-/**
- * @final
- */
-class DoctrineOrmFactory
-{
-    public function __construct(
-        private readonly ?Cache $cacheDriver = null,
-    ) {
-    }
-
-    /**
-     * Creates a new ConditionGenerator for the SearchCondition.
-     *
-     * Conversions are applied using the 'doctrine_dbal_conversion' option (when present).
-     */
-    public function createConditionGenerator(QueryBuilder $query, SearchCondition $searchCondition): QueryBuilderConditionGenerator
-    {
-        return new QueryBuilderConditionGenerator($query, $searchCondition);
-    }
-
-    /**
-     * Creates a new CachedConditionGenerator for the SearchCondition.
-     *
-     * @param \DateInterval|int|null $ttl Optional. The TTL value of this item. If no value is sent and
-     *                                    the driver supports TTL then the library may set a default value
-     *                                    for it or let the driver take care of that.
-     */
-    public function createCachedConditionGenerator(QueryBuilder $query, SearchCondition $searchCondition, \DateInterval | int | null $ttl = null): ConditionGenerator
-    {
-        if ($this->cacheDriver === null) {
-            return $this->createConditionGenerator($query, $searchCondition);
-        }
-
-        return new CachedDqlConditionGenerator($query, $searchCondition, $this->cacheDriver, $ttl);
-    }
-}
diff --git a/lib/Doctrine/Orm/DqlConditionGenerator.php b/lib/Doctrine/Orm/DqlConditionGenerator.php
deleted file mode 100644
index 16b96707..00000000
--- a/lib/Doctrine/Orm/DqlConditionGenerator.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
-use Doctrine\DBAL\Platforms\OraclePlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SQLitePlatform;
-use Doctrine\DBAL\Platforms\SQLServerPlatform;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\QueryBuilder;
-use Rollerworks\Component\Search\Doctrine\Dbal\Query\QueryGenerator;
-use Rollerworks\Component\Search\Doctrine\Orm\QueryPlatform\DqlQueryPlatform;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\Mocks\DatabasePlatformMock;
-
-/**
- * SearchCondition Doctrine ORM DQL ConditionGenerator.
- *
- * This class provides the functionality for creating a DQL
- * WHERE-clause based on the provided SearchCondition.
- *
- * Note: This class should not be used directly, use the provided ConditionGenerators instead.
- */
-final class DqlConditionGenerator
-{
-    private string $whereClause;
-
-    /** @var ArrayCollection<string, array{0: mixed, 1: string}> */
-    private ArrayCollection $parameters;
-
-    public function __construct(
-        private readonly EntityManagerInterface $entityManager,
-        private readonly SearchCondition $searchCondition,
-        private readonly FieldConfigBuilder $fieldsConfig,
-    ) {
-    }
-
-    public function getWhereClause(): string
-    {
-        $fields = $this->fieldsConfig->getFields();
-        $connection = $this->entityManager->getConnection();
-        $platform = new DqlQueryPlatform($connection, self::getPlatformName($connection));
-        $queryGenerator = new QueryGenerator($connection, $platform, $fields);
-
-        $this->whereClause = $queryGenerator->getWhereClause($this->searchCondition);
-        $this->parameters = $platform->getParameters();
-
-        return $this->whereClause;
-    }
-
-    /**
-     * @return ArrayCollection<string, array{0: mixed, 1: string}>
-     */
-    public function getParameters(): ArrayCollection
-    {
-        if (! isset($this->parameters)) {
-            throw new BadMethodCallException('getParameters() cannot be called before getWhereClause().');
-        }
-
-        return $this->parameters;
-    }
-
-    public static function applySortingTo(?SearchOrder $order, QueryBuilder $qb, FieldConfigBuilder $configBuilder): void
-    {
-        if ($order === null) {
-            return;
-        }
-
-        $fields = $configBuilder->getFields();
-
-        foreach ($order->getSorting() as $fieldName => $direction) {
-            if (! isset($fields[$fieldName])) {
-                continue;
-            }
-
-            if (\count($fields[$fieldName]) > 1) {
-                throw new BadMethodCallException(\sprintf('Field "%s" is registered as multiple mapping and cannot be used for sorting.', $fieldName));
-            }
-
-            $qb->addOrderBy($fields[$fieldName]['']->column, mb_strtoupper($direction));
-        }
-    }
-
-    private static function getPlatformName(Connection $connection): string
-    {
-        $platform = $connection->getDatabasePlatform();
-
-        return match (true) {
-            $platform instanceof AbstractMySQLPlatform => 'mysql',
-            $platform instanceof SQLitePlatform => 'sqlite',
-            $platform instanceof PostgreSQLPlatform => 'pgsql',
-            $platform instanceof OraclePlatform => 'oci',
-            $platform instanceof SQLServerPlatform => 'sqlsrv',
-            $platform instanceof DatabasePlatformMock => 'mock',
-            default => $platform::class,
-        };
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Conversion/AgeDateConversion.php b/lib/Doctrine/Orm/Extension/Conversion/AgeDateConversion.php
deleted file mode 100644
index c2846db0..00000000
--- a/lib/Doctrine/Orm/Extension/Conversion/AgeDateConversion.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Orm\Conversion;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Orm\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Orm\ValueConversion;
-
-final class AgeDateConversion implements ColumnConversion, ValueConversion
-{
-    public function convertColumn(string $column, array $options, ConversionHints $hints): string
-    {
-        if ($hints->getProcessingValue() instanceof \DateTimeInterface) {
-            return "SEARCH_CONVERSION_CAST({$column}, 'DATE')";
-        }
-
-        return "SEARCH_CONVERSION_AGE({$column})";
-    }
-
-    public function convertValue($value, array $options, ConversionHints $hints): string
-    {
-        if ($value instanceof \DateTimeImmutable) {
-            return $hints->createParamReferenceFor($value, 'date_immutable');
-        }
-
-        if ($value instanceof \DateTime) {
-            return $hints->createParamReferenceFor($value, 'date');
-        }
-
-        return $hints->createParamReferenceFor($value, 'integer');
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Conversion/ChildCountConversion.php b/lib/Doctrine/Orm/Extension/Conversion/ChildCountConversion.php
deleted file mode 100644
index e1bc44e1..00000000
--- a/lib/Doctrine/Orm/Extension/Conversion/ChildCountConversion.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Orm\Conversion;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Orm\ColumnConversion;
-
-final class ChildCountConversion implements ColumnConversion
-{
-    public function convertColumn(string $column, array $options, ConversionHints $hints): string
-    {
-        return \sprintf('SEARCH_COUNT_CHILDREN(%s, %s, %s)', $options['table_name'], $options['table_column'], $column);
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Conversion/DateIntervalConversion.php b/lib/Doctrine/Orm/Extension/Conversion/DateIntervalConversion.php
deleted file mode 100644
index 4c433366..00000000
--- a/lib/Doctrine/Orm/Extension/Conversion/DateIntervalConversion.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Orm\Conversion;
-
-use Carbon\CarbonInterval;
-use Doctrine\DBAL\Types\Types;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Orm\ValueConversion;
-
-final class DateIntervalConversion implements ValueConversion
-{
-    /**
-     * @param CarbonInterval|\DateTimeImmutable $value
-     */
-    public function convertValue($value, array $options, ConversionHints $hints): string
-    {
-        if ($value instanceof \DateTimeImmutable) {
-            return $hints->createParamReferenceFor($value, Types::DATETIME_IMMUTABLE);
-        }
-
-        $value = clone $value;
-        $value->locale('en');
-
-        return \sprintf("SEARCH_CAST_INTERVAL('%s', %s)", $value->forHumans(), $value->invert === 1 ? 'true' : 'false');
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Conversion/MoneyValueConversion.php b/lib/Doctrine/Orm/Extension/Conversion/MoneyValueConversion.php
deleted file mode 100644
index e24de663..00000000
--- a/lib/Doctrine/Orm/Extension/Conversion/MoneyValueConversion.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Orm\Conversion;
-
-use Doctrine\DBAL\Types\Types as DbType;
-use Money\Currencies\ISOCurrencies;
-use Money\Formatter\DecimalMoneyFormatter;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Orm\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Orm\ValueConversion;
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-
-final class MoneyValueConversion implements ValueConversion, ColumnConversion
-{
-    private DecimalMoneyFormatter $formatter;
-    private ISOCurrencies $currencies;
-
-    public function __construct()
-    {
-        $this->currencies = new ISOCurrencies();
-        $this->formatter = new DecimalMoneyFormatter($this->currencies);
-    }
-
-    /**
-     * @param MoneyValue $value
-     */
-    public function convertValue(mixed $value, array $options, ConversionHints $hints): string
-    {
-        $sqlValue = $hints->createParamReferenceFor($this->formatter->format($value->value));
-        $scale = $this->currencies->subunitFor($value->value->getCurrency());
-
-        return "SEARCH_MONEY_AS_NUMERIC({$sqlValue}, {$scale})";
-    }
-
-    public function convertColumn(string $column, array $options, ConversionHints $hints): string
-    {
-        if ($hints->field->dbTypeName === DbType::DECIMAL) {
-            return $column;
-        }
-
-        $scale = $this->currencies->subunitFor($hints->getProcessingValue()->getCurrency());
-
-        return "SUBSTRING(SEARCH_MONEY_AS_NUMERIC({$column}, {$scale}), 5))";
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/DoctrineOrmExtension.php b/lib/Doctrine/Orm/Extension/DoctrineOrmExtension.php
deleted file mode 100644
index 1965565a..00000000
--- a/lib/Doctrine/Orm/Extension/DoctrineOrmExtension.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Orm;
-
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\Persistence\ManagerRegistry;
-use Rollerworks\Component\Search\AbstractExtension;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\AgeFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\CastFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\CastIntervalFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\CountChildrenFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\MoneyCastFunction;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\BirthdayTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\ChildCountType;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\DateTimeTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\FieldTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\MoneyTypeExtension;
-
-final class DoctrineOrmExtension extends AbstractExtension
-{
-    /**
-     * @param string[] $managerNames A list manager names for which to enable this extension
-     */
-    public function __construct(ManagerRegistry $registry, array $managerNames = ['default'])
-    {
-        foreach ($managerNames as $managerName) {
-            /** @var EntityManagerInterface $manager */
-            $manager = $registry->getManager($managerName);
-            $emConfig = $manager->getConfiguration();
-
-            $emConfig->addCustomStringFunction('SEARCH_CONVERSION_CAST', CastFunction::class);
-            $emConfig->addCustomNumericFunction('SEARCH_CONVERSION_AGE', AgeFunction::class);
-            $emConfig->addCustomNumericFunction('SEARCH_COUNT_CHILDREN', CountChildrenFunction::class);
-            $emConfig->addCustomNumericFunction('SEARCH_MONEY_AS_NUMERIC', MoneyCastFunction::class);
-            $emConfig->addCustomNumericFunction('SEARCH_CAST_INTERVAL', CastIntervalFunction::class);
-        }
-    }
-
-    protected function loadTypesExtensions(): array
-    {
-        return [
-            new BirthdayTypeExtension(),
-            new DateTimeTypeExtension(),
-            new ChildCountType(),
-            new FieldTypeExtension(),
-            new MoneyTypeExtension(),
-        ];
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Functions/AgeFunction.php b/lib/Doctrine/Orm/Extension/Functions/AgeFunction.php
deleted file mode 100644
index c0a5d78d..00000000
--- a/lib/Doctrine/Orm/Extension/Functions/AgeFunction.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions;
-
-use Doctrine\ORM\Query\AST\Node;
-use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\SqlWalker;
-use Doctrine\ORM\Query\TokenType;
-
-/**
- * "SEARCH_CONVERSION_AGE" "(" StringPrimary ")".
- */
-final class AgeFunction extends PlatformSpecificFunction
-{
-    public Node $stringPrimary;
-
-    public function getSql(SqlWalker $sqlWalker): string
-    {
-        $platform = $this->getPlatformName($sqlWalker->getConnection());
-        $expression = $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary);
-
-        $convertMap = [];
-        $convertMap['pgsql'] = "to_char(age(%1\$s), 'YYYY'::text)::integer";
-        $convertMap['mysql'] = "(DATE_FORMAT(NOW(), '%%Y') - DATE_FORMAT(%1\$s, '%%Y') - (DATE_FORMAT(NOW(), '00-%%m-%%d') < DATE_FORMAT(%1\$s, '00-%%m-%%d')))";
-        $convertMap['mssql'] = 'DATEDIFF(hour, %1$s, GETDATE())/8766';
-        $convertMap['oci'] = 'trunc((months_between(sysdate, (sysdate - %1$s)))/12)';
-        $convertMap['mock'] = $convertMap['pgsql'];
-
-        if (isset($convertMap[$platform])) {
-            return \sprintf($convertMap[$platform], $expression);
-        }
-
-        throw new \RuntimeException(
-            \sprintf('Unsupported platform "%s" for SEARCH_CONVERSION_AGE.', $platform)
-        );
-    }
-
-    public function parse(Parser $parser): void
-    {
-        $parser->match(TokenType::T_IDENTIFIER);
-        $parser->match(TokenType::T_OPEN_PARENTHESIS);
-
-        $this->stringPrimary = $parser->StringPrimary();
-
-        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Functions/CastFunction.php b/lib/Doctrine/Orm/Extension/Functions/CastFunction.php
deleted file mode 100644
index 41cf4c18..00000000
--- a/lib/Doctrine/Orm/Extension/Functions/CastFunction.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions;
-
-use Doctrine\ORM\Query\AST\Functions\FunctionNode;
-use Doctrine\ORM\Query\AST\Node;
-use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\SqlWalker;
-use Doctrine\ORM\Query\TokenType;
-
-/**
- * "SEARCH_CONVERSION_CAST" "(" StringPrimary ", " StringPrimary ")".
- */
-final class CastFunction extends FunctionNode
-{
-    public Node $stringPrimary;
-    public string $type;
-
-    public function getSql(SqlWalker $sqlWalker): string
-    {
-        $expression = $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary);
-
-        return \sprintf('CAST(%s AS %s)', $expression, $this->type);
-    }
-
-    public function parse(Parser $parser): void
-    {
-        $parser->match(TokenType::T_IDENTIFIER);
-        $parser->match(TokenType::T_OPEN_PARENTHESIS);
-
-        $this->stringPrimary = $parser->StringPrimary();
-
-        $parser->match(TokenType::T_COMMA);
-
-        $this->type = (string) $parser->Literal()->value;
-
-        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Functions/CastIntervalFunction.php b/lib/Doctrine/Orm/Extension/Functions/CastIntervalFunction.php
deleted file mode 100644
index c373aa63..00000000
--- a/lib/Doctrine/Orm/Extension/Functions/CastIntervalFunction.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions;
-
-use Carbon\CarbonInterval;
-use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\SqlWalker;
-use Doctrine\ORM\Query\TokenType;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion\DateIntervalConversion;
-
-/**
- * "SEARCH_CAST_INTERVAL" "(" string, boolean ")".
- */
-final class CastIntervalFunction extends PlatformSpecificFunction
-{
-    public string $intervalExpression;
-    public bool $inverted;
-
-    public function getSql(SqlWalker $sqlWalker): string
-    {
-        $connection = $sqlWalker->getConnection();
-        $platform = $this->getPlatformName($connection);
-        $expression = $this->intervalExpression;
-
-        if ($platform === 'pgsql' || $platform === 'mock') {
-            return \sprintf(
-                'NOW() %s CAST(%s AS interval)',
-                $this->inverted ? '-' : '+',
-                $connection->quote($expression)
-            );
-        }
-
-        if ($platform === 'mysql') {
-            $value = CarbonInterval::fromString($expression);
-            $value->locale('en');
-
-            if ($this->inverted) {
-                $value->invert();
-            }
-
-            return \sprintf(
-                'NOW() %s %s',
-                $this->inverted ? '-' : '+',
-                DateIntervalConversion::convertForMysql($value)
-            );
-        }
-
-        throw new \RuntimeException(
-            \sprintf('Unsupported platform "%s" for DateIntervalConversion.', $platform)
-        );
-    }
-
-    public function parse(Parser $parser): void
-    {
-        $parser->match(TokenType::T_IDENTIFIER);
-        $parser->match(TokenType::T_OPEN_PARENTHESIS);
-
-        $this->intervalExpression = (string) $parser->Literal()->value;
-
-        $parser->match(TokenType::T_COMMA);
-
-        $this->inverted = $parser->Literal()->value === 'true';
-
-        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Functions/CountChildrenFunction.php b/lib/Doctrine/Orm/Extension/Functions/CountChildrenFunction.php
deleted file mode 100644
index ca311272..00000000
--- a/lib/Doctrine/Orm/Extension/Functions/CountChildrenFunction.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions;
-
-use Doctrine\ORM\Query\AST\Functions\FunctionNode;
-use Doctrine\ORM\Query\AST\Node;
-use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\SqlWalker;
-use Doctrine\ORM\Query\TokenType;
-
-/**
- * "SEARCH_COUNT_CHILDREN" "(" StringPrimary "," StringPrimary "," StringPrimary ")".
- */
-final class CountChildrenFunction extends FunctionNode
-{
-    public Node $stringPrimary;
-    public Node $field;
-    public Node $column;
-
-    public function getSql(SqlWalker $sqlWalker): string
-    {
-        $table = $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary);
-        $field = $sqlWalker->walkSimpleArithmeticExpression($this->field);
-        $column = $sqlWalker->walkSimpleArithmeticExpression($this->column);
-
-        return '(SELECT COUNT(*) FROM ' . $table . ' WHERE ' . $field . " = {$column})";
-    }
-
-    public function parse(Parser $parser): void
-    {
-        $parser->match(TokenType::T_IDENTIFIER);
-        $parser->match(TokenType::T_OPEN_PARENTHESIS);
-
-        $this->stringPrimary = $parser->StringPrimary();
-
-        $parser->match(TokenType::T_COMMA);
-
-        $this->field = $parser->StringPrimary();
-        $parser->match(TokenType::T_COMMA);
-
-        $this->column = $parser->StringPrimary();
-
-        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Functions/MoneyCastFunction.php b/lib/Doctrine/Orm/Extension/Functions/MoneyCastFunction.php
deleted file mode 100644
index 6b3a02fa..00000000
--- a/lib/Doctrine/Orm/Extension/Functions/MoneyCastFunction.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions;
-
-use Doctrine\ORM\Query\AST\Node;
-use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\SqlWalker;
-use Doctrine\ORM\Query\TokenType;
-
-/**
- * "SEARCH_MONEY_AS_NUMERIC" "(" StringPrimary ", " Literal ")".
- */
-final class MoneyCastFunction extends PlatformSpecificFunction
-{
-    public Node $stringPrimary;
-    public int $scale;
-
-    public function getSql(SqlWalker $sqlWalker): string
-    {
-        $connection = $sqlWalker->getConnection();
-
-        $expression = $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary);
-        $scale = $this->scale;
-
-        if ($this->getPlatformName($connection) === 'mysql') {
-            $castType = "DECIMAL(10, {$scale})";
-        } else {
-            $castType = $connection->getDatabasePlatform()->getDecimalTypeDeclarationSQL(
-                ['scale' => $scale, 'precision' => 10, 'name' => $expression]
-            );
-        }
-
-        return \sprintf('CAST(%s AS %s)', $expression, $castType);
-    }
-
-    public function parse(Parser $parser): void
-    {
-        $parser->match(TokenType::T_IDENTIFIER);
-        $parser->match(TokenType::T_OPEN_PARENTHESIS);
-
-        $this->stringPrimary = $parser->StringPrimary();
-
-        $parser->match(TokenType::T_COMMA);
-
-        $this->scale = (int) $parser->Literal()->value;
-
-        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Functions/PlatformSpecificFunction.php b/lib/Doctrine/Orm/Extension/Functions/PlatformSpecificFunction.php
deleted file mode 100644
index 5e12ed22..00000000
--- a/lib/Doctrine/Orm/Extension/Functions/PlatformSpecificFunction.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
-use Doctrine\DBAL\Platforms\OraclePlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SQLitePlatform;
-use Doctrine\DBAL\Platforms\SQLServerPlatform;
-use Doctrine\ORM\Query\AST\Functions\FunctionNode;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\Mocks\DatabasePlatformMock;
-
-/**
- * Extend this class class for platform specific functionality.
- */
-abstract class PlatformSpecificFunction extends FunctionNode
-{
-    /**
-     * Returns the platform name, returns a class-name if the platform could not be detected.
-     *
-     * @return 'mysql'|'sqlite'|'pgsql'|'oci'|'sqlsrv'|'mock'|string
-     */
-    protected function getPlatformName(Connection $connection): string
-    {
-        $platform = $connection->getDatabasePlatform();
-
-        return match (true) {
-            $platform instanceof AbstractMySQLPlatform => 'mysql',
-            $platform instanceof SQLitePlatform => 'sqlite',
-            $platform instanceof PostgreSQLPlatform => 'pgsql',
-            $platform instanceof OraclePlatform => 'oci',
-            $platform instanceof SQLServerPlatform => 'sqlsrv',
-            $platform instanceof DatabasePlatformMock => 'mock',
-            default => $platform::class,
-        };
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Type/BirthdayTypeExtension.php b/lib/Doctrine/Orm/Extension/Type/BirthdayTypeExtension.php
deleted file mode 100644
index 0defb8e2..00000000
--- a/lib/Doctrine/Orm/Extension/Type/BirthdayTypeExtension.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Orm\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Conversion\AgeDateConversion;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-final class BirthdayTypeExtension extends AbstractFieldTypeExtension
-{
-    private AgeDateConversion $conversion;
-
-    public function __construct()
-    {
-        $this->conversion = new AgeDateConversion();
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefault('doctrine_orm_conversion', $this->conversion);
-    }
-
-    public function getExtendedType(): string
-    {
-        return BirthdayType::class;
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Type/ChildCountType.php b/lib/Doctrine/Orm/Extension/Type/ChildCountType.php
deleted file mode 100644
index eff89fd2..00000000
--- a/lib/Doctrine/Orm/Extension/Type/ChildCountType.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Orm\Type;
-
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\ChildCountType as DbalChildCountType;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Conversion\ChildCountConversion;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-final class ChildCountType extends AbstractFieldTypeExtension
-{
-    private ChildCountConversion $conversion;
-
-    public function __construct()
-    {
-        $this->conversion = new ChildCountConversion();
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefault('doctrine_orm_conversion', $this->conversion);
-    }
-
-    public function getExtendedType(): string
-    {
-        return DbalChildCountType::class;
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Type/DateTimeTypeExtension.php b/lib/Doctrine/Orm/Extension/Type/DateTimeTypeExtension.php
deleted file mode 100644
index bf1b0c3e..00000000
--- a/lib/Doctrine/Orm/Extension/Type/DateTimeTypeExtension.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Orm\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Conversion\DateIntervalConversion;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-final class DateTimeTypeExtension extends AbstractFieldTypeExtension
-{
-    private DateIntervalConversion $conversion;
-
-    public function __construct()
-    {
-        $this->conversion = new DateIntervalConversion();
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefault('doctrine_orm_conversion', $this->conversion);
-    }
-
-    public function getExtendedType(): string
-    {
-        return DateTimeType::class;
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Type/FieldTypeExtension.php b/lib/Doctrine/Orm/Extension/Type/FieldTypeExtension.php
deleted file mode 100644
index 2ab9c5bd..00000000
--- a/lib/Doctrine/Orm/Extension/Type/FieldTypeExtension.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Orm\Type;
-
-use Rollerworks\Component\Search\Doctrine\Orm\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Orm\ValueConversion;
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class FieldTypeExtension extends AbstractFieldTypeExtension
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(['doctrine_orm_conversion' => null]);
-        $resolver->setAllowedTypes(
-            'doctrine_orm_conversion',
-            [
-                'null',
-                \Closure::class,
-                ColumnConversion::class,
-                ValueConversion::class,
-            ]
-        );
-    }
-
-    public function getExtendedType(): string
-    {
-        return SearchFieldType::class;
-    }
-}
diff --git a/lib/Doctrine/Orm/Extension/Type/MoneyTypeExtension.php b/lib/Doctrine/Orm/Extension/Type/MoneyTypeExtension.php
deleted file mode 100644
index 7047fdde..00000000
--- a/lib/Doctrine/Orm/Extension/Type/MoneyTypeExtension.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Doctrine\Orm\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Conversion\MoneyValueConversion;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-final class MoneyTypeExtension extends AbstractFieldTypeExtension
-{
-    private MoneyValueConversion $conversion;
-
-    public function __construct()
-    {
-        $this->conversion = new MoneyValueConversion();
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefault('doctrine_orm_conversion', $this->conversion);
-    }
-
-    public function getExtendedType(): string
-    {
-        return MoneyType::class;
-    }
-}
diff --git a/lib/Doctrine/Orm/FieldConfigBuilder.php b/lib/Doctrine/Orm/FieldConfigBuilder.php
deleted file mode 100644
index 4b75505f..00000000
--- a/lib/Doctrine/Orm/FieldConfigBuilder.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm;
-
-use Doctrine\ORM\EntityManagerInterface;
-use Rollerworks\Component\Search\Field\OrderField;
-use Rollerworks\Component\Search\FieldSet;
-
-/**
- * @internal
- */
-final class FieldConfigBuilder
-{
-    /** @var array<string, array<string, OrmQueryField>> ['fieldName'][mappingIndex] => {OrmQueryField} */
-    private array $fields = [];
-
-    private ?string $defaultEntity = null;
-    private ?string $defaultAlias = null;
-
-    public function __construct(
-        private readonly EntityManagerInterface $entityManager,
-        private readonly FieldSet $fieldSet,
-    ) {
-    }
-
-    public function setDefaultEntity(string $entity, string $alias): void
-    {
-        $this->defaultEntity = $this->entityManager->getClassMetadata($entity)->getName();
-        $this->defaultAlias = $alias;
-    }
-
-    public function setField(string $mappingName, string $property, ?string $alias = null, ?string $entity = null, ?string $type = null): void
-    {
-        $mappingIdx = '';
-        $fieldName = $mappingName;
-
-        if ($entity === null && $this->defaultEntity === null) {
-            throw new \RuntimeException('No default entity is set, either provide the entity or set a default entity first.');
-        }
-
-        if (str_contains($mappingName, '#')) {
-            [$fieldName, $mappingIdx] = explode('#', $mappingName, 2);
-            unset($this->fields[$fieldName]['']);
-        } else {
-            $this->fields[$fieldName] = [];
-        }
-
-        if (OrderField::isOrder($fieldName) && str_contains($mappingName, '#')) {
-            throw new \RuntimeException(\sprintf('Ordering field "%s" cannot be registered with multiple mapping.', $fieldName));
-        }
-
-        [$entity, $property] = $this->getEntityAndProperty(
-            $mappingName,
-            $entity ?? $this->defaultEntity,
-            $property
-        );
-
-        $this->fields[$fieldName][$mappingIdx] = new OrmQueryField(
-            $mappingName,
-            $this->fieldSet->get($fieldName),
-            $this->getMappingType($mappingName, $entity, $property, $type),
-            $property,
-            $alias ?? $this->defaultAlias,
-            $entity
-        );
-    }
-
-    /**
-     * @return array<string, array<string, OrmQueryField>> ['fieldName'][mappingIndex] => {OrmQueryField}
-     */
-    public function getFields(): array
-    {
-        return $this->fields;
-    }
-
-    /**
-     * @return array<int, string>
-     */
-    private function getEntityAndProperty(string $fieldName, string $entity, string $property): array
-    {
-        $metadata = $this->entityManager->getClassMetadata($entity);
-
-        if (! $metadata->hasAssociation($property)) {
-            return [$entity, $property];
-        }
-
-        throw new \RuntimeException(
-            \sprintf(
-                'Entity field "%s"#%s is a JOIN association, you must explicitly set the ' .
-                'entity alias and column mapping for search field "%s" to point to the (head) reference and the ' .
-                'entity field you want to use, this entity field must be owned by the entity ' .
-                '(not reference another entity). If the entity field is used in a many-to-many relation you must ' .
-                'reference the targetEntity that is set on the ManyToMany mapping and use the entity field of ' .
-                'that entity.',
-                $entity,
-                $property,
-                $fieldName
-            )
-        );
-    }
-
-    private function getMappingType(string $fieldName, string $entity, string $propertyName, ?string $type = null): string
-    {
-        $type ??= $this->entityManager->getClassMetadata($entity)->getTypeOfField($propertyName);
-
-        if ($type === null) {
-            throw new \RuntimeException(
-                \sprintf(
-                    'Unable to determine DBAL type of field-mapping "%s" with entity reference "%s"#%s. ' .
-                    'Configure an explicit dbal type for the field.',
-                    $fieldName,
-                    $entity,
-                    $propertyName
-                )
-            );
-        }
-
-        return $type;
-    }
-}
diff --git a/lib/Doctrine/Orm/LICENSE b/lib/Doctrine/Orm/LICENSE
deleted file mode 100644
index 5c5b0fa1..00000000
--- a/lib/Doctrine/Orm/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014-present Sebastiaan Stok
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/lib/Doctrine/Orm/OrmQueryField.php b/lib/Doctrine/Orm/OrmQueryField.php
deleted file mode 100644
index 9da46148..00000000
--- a/lib/Doctrine/Orm/OrmQueryField.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\Query\QueryField;
-use Rollerworks\Component\Search\Field\FieldConfig;
-
-/**
- * @property ColumnConversion|null $columnConversion
- * @property ValueConversion|null  $valueConversion
- */
-final class OrmQueryField extends QueryField
-{
-    public function __construct(
-        string $mappingName,
-        FieldConfig $fieldConfig,
-        string $dbType,
-        string $column,
-        string $alias,
-        public string $entity,
-    ) {
-        parent::__construct(
-            $mappingName,
-            $fieldConfig,
-            $dbType,
-            $column,
-            $alias
-        );
-    }
-
-    protected function initConversions(FieldConfig $fieldConfig): void
-    {
-        $converter = $fieldConfig->getOption('doctrine_orm_conversion');
-
-        if ($converter instanceof \Closure) {
-            $converter = $converter();
-        }
-
-        $this->columnConversion = $converter instanceof ColumnConversion ? $converter : null;
-        $this->valueConversion = $converter instanceof ValueConversion ? $converter : null;
-    }
-}
diff --git a/lib/Doctrine/Orm/QueryBuilderConditionGenerator.php b/lib/Doctrine/Orm/QueryBuilderConditionGenerator.php
deleted file mode 100644
index afe277b6..00000000
--- a/lib/Doctrine/Orm/QueryBuilderConditionGenerator.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm;
-
-use Doctrine\ORM\QueryBuilder;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\SearchCondition;
-
-/**
- * SearchCondition Doctrine ORM DQL ConditionGenerator.
- *
- * Note that only fields that have been configured with `setField()`
- * will be actually used in the generated query.
- *
- * Keep the following in mind when using conversions.
- *
- *  * Conversions are performed per search field and must be stateless, they receive the db-type
- *    and connection information for the conversion process.
- *  * Unlike DBAL conversions the conversion must be DQL (not SQL)
- *  * Values must be registered as parameters (using the ConversionHints)
- *  * Conversion results must be properly escaped to prevent DQL injections.
- *
- * After the fields are configured call `apply()` to apply
- * the condition on the QueryBuilder.
- */
-final class QueryBuilderConditionGenerator implements ConditionGenerator
-{
-    private FieldConfigBuilder $fieldsConfig;
-    private SearchCondition $searchCondition;
-    private QueryBuilder $qb;
-    private bool $isApplied = false;
-
-    public function __construct(QueryBuilder $query, SearchCondition $searchCondition)
-    {
-        $this->fieldsConfig = new FieldConfigBuilder($query->getEntityManager(), $searchCondition->getFieldSet());
-        $this->searchCondition = $searchCondition;
-        $this->qb = $query;
-    }
-
-    public function setDefaultEntity(string $entity, string $alias)
-    {
-        $this->guardNotGenerated();
-        $this->fieldsConfig->setDefaultEntity($entity, $alias);
-
-        return $this;
-    }
-
-    /**
-     * @throws BadMethodCallException When the where-clause is already generated
-     */
-    private function guardNotGenerated(): void
-    {
-        if ($this->isApplied) {
-            throw new BadMethodCallException('ConditionGenerator configuration cannot be changed once the query is applied.');
-        }
-    }
-
-    public function setField(string $fieldName, string $property, ?string $alias = null, ?string $entity = null, ?string $dbType = null)
-    {
-        $this->guardNotGenerated();
-        $this->fieldsConfig->setField($fieldName, $property, $alias, $entity, $dbType);
-
-        return $this;
-    }
-
-    public function apply(): self
-    {
-        if ($this->isApplied) {
-            trigger_error('SearchCondition was already applied. Ignoring operation.', \E_USER_WARNING);
-
-            return $this;
-        }
-
-        $this->isApplied = true;
-        $generator = new DqlConditionGenerator($this->qb->getEntityManager(), $this->searchCondition, $this->fieldsConfig);
-        $whereClause = $generator->getWhereClause();
-
-        $primaryCondition = $this->searchCondition->getPrimaryCondition();
-
-        if ($primaryCondition !== null) {
-            DqlConditionGenerator::applySortingTo($primaryCondition->getOrder(), $this->qb, $this->fieldsConfig);
-        }
-
-        DqlConditionGenerator::applySortingTo($this->searchCondition->getOrder(), $this->qb, $this->fieldsConfig);
-
-        if ($whereClause === '') {
-            return $this;
-        }
-
-        $this->qb->andWhere($whereClause);
-
-        foreach ($generator->getParameters() as $name => [$value, $type]) {
-            $this->qb->setParameter($name, $value, $type);
-        }
-
-        return $this;
-    }
-
-    public function getQueryBuilder(): QueryBuilder
-    {
-        return $this->qb;
-    }
-}
diff --git a/lib/Doctrine/Orm/QueryPlatform/DqlQueryPlatform.php b/lib/Doctrine/Orm/QueryPlatform/DqlQueryPlatform.php
deleted file mode 100644
index e23ea085..00000000
--- a/lib/Doctrine/Orm/QueryPlatform/DqlQueryPlatform.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm\QueryPlatform;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\QueryPlatform\AbstractQueryPlatform;
-use Rollerworks\Component\Search\Value\PatternMatch;
-
-final class DqlQueryPlatform extends AbstractQueryPlatform
-{
-    public function getPatternMatcher(PatternMatch $patternMatch, string $column): string
-    {
-        if (\in_array($patternMatch->getType(), [PatternMatch::PATTERN_EQUALS, PatternMatch::PATTERN_NOT_EQUALS], true)) {
-            $value = $this->createParamReferenceFor($patternMatch->getValue(), 'text');
-
-            if ($patternMatch->isCaseInsensitive()) {
-                $column = "LOWER({$column})";
-                $value = "LOWER({$value})";
-            }
-
-            return $column . ($patternMatch->isExclusive() ? ' <>' : ' =') . " {$value}";
-        }
-
-        $patternMap = [
-            PatternMatch::PATTERN_STARTS_WITH => "CONCAT(%s, '%%')",
-            PatternMatch::PATTERN_NOT_STARTS_WITH => "CONCAT(%s, '%%')",
-            PatternMatch::PATTERN_CONTAINS => "CONCAT('%%', %s, '%%')",
-            PatternMatch::PATTERN_NOT_CONTAINS => "CONCAT('%%', %s, '%%')",
-            PatternMatch::PATTERN_ENDS_WITH => "CONCAT('%%', %s)",
-            PatternMatch::PATTERN_NOT_ENDS_WITH => "CONCAT('%%', %s)",
-        ];
-
-        $value = addcslashes($patternMatch->getValue(), $this->getLikeEscapeChars());
-        $value = \sprintf($patternMap[$patternMatch->getType()], $this->createParamReferenceFor($value, 'text'));
-
-        if ($patternMatch->isCaseInsensitive()) {
-            $column = "LOWER({$column})";
-            $value = "LOWER({$value})";
-        }
-
-        return $column . ($patternMatch->isExclusive() ? ' NOT' : '') . " LIKE {$value}";
-    }
-}
diff --git a/lib/Doctrine/Orm/README.md b/lib/Doctrine/Orm/README.md
deleted file mode 100644
index aec2a778..00000000
--- a/lib/Doctrine/Orm/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-RollerworksSearch Doctrine ORM extension
-========================================
-
-This package provides the Doctrine ORM extension for [RollerworksSearch][1].
-
-If you'd like to contribute to this project, please see the [contributing guide lines][2]
-for more information.
-
-Installation
-------------
-
-To install this extension, add the `search-doctrine-orm` to your composer.json
-
-```bash
-$ php composer.phar require rollerworks/search-doctrine-orm
-```
-
-License
--------
-
-The source of this package is subject to the MIT license that is bundled
-with this source code in the file [LICENSE](LICENSE).
-
-[1]: https://github.com/rollerworks/RollerworksSearch
-[2]: https://github.com/rollerworks/RollerworksSearch#contributing
diff --git a/lib/Doctrine/Orm/Tests/CachedDqlConditionGeneratorTest.php b/lib/Doctrine/Orm/Tests/CachedDqlConditionGeneratorTest.php
deleted file mode 100644
index 88664abe..00000000
--- a/lib/Doctrine/Orm/Tests/CachedDqlConditionGeneratorTest.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Orm;
-
-use Doctrine\ORM\QueryBuilder;
-use PHPUnit\Framework\MockObject\MockObject;
-use Prophecy\Argument;
-use Psr\SimpleCache\CacheInterface;
-use Rollerworks\Component\Search\Doctrine\Orm\CachedDqlConditionGenerator;
-use Rollerworks\Component\Search\Doctrine\Orm\ConditionGenerator;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceCustomer;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceInvoice;
-
-/**
- * @group non-functional
- *
- * @internal
- */
-final class CachedDqlConditionGeneratorTest extends OrmTestCase
-{
-    private QueryBuilder $query;
-    protected CachedDqlConditionGenerator $conditionGenerator;
-
-    /** @var CacheInterface|MockObject */
-    protected MockObject $cacheDriver;
-
-    public const CACHE_KEY = 'df58623bc959d1cf34d360c31f4d57b21ee51ffb5179059507b90c47035075dd';
-
-    /**
-     * @test
-     */
-    public function get_where_clause_no_cache(): void
-    {
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('has')
-        ;
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('get')
-            ->with(self::CACHE_KEY)
-            ->willReturn(null)
-        ;
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('set')
-            ->with(
-                self::CACHE_KEY,
-                [
-                    '(((C.id = :search_0 OR C.id = :search_1)))',
-                    [
-                        'search_0' => [2, 'integer'],
-                        'search_1' => [5, 'integer'],
-                    ],
-                ],
-                60
-            )
-        ;
-
-        $this->assertQueryBuilderEquals(
-            ' WHERE (((C.id = :search_0 OR C.id = :search_1)))',
-            ['search_0' => [2, 'integer'], 'search_1' => [5, 'integer']]
-        );
-    }
-
-    private function assertQueryBuilderEquals(string $where, array $parameters, ?ConditionGenerator $generator = null): void
-    {
-        if ($generator === null) {
-            $generator = $this->conditionGenerator;
-        }
-
-        $queryBuilder = $generator->getQueryBuilder();
-        $baseDql = $queryBuilder->getDQL();
-
-        $generator->apply();
-
-        $finalDql = $queryBuilder->getDQL();
-
-        self::assertEquals($baseDql . $where, $finalDql);
-        self::assertQueryParametersEquals($parameters, $queryBuilder);
-    }
-
-    /**
-     * @test
-     */
-    public function get_where_clause_with_cache(): void
-    {
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('has')
-        ;
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('get')
-            ->with(self::CACHE_KEY)
-            ->willReturn(["me = 'foo'", ['search' => [1, 'integer']]])
-        ;
-
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('set')
-        ;
-
-        $this->assertQueryBuilderEquals(" WHERE me = 'foo'", ['search' => [1, 'integer']]);
-    }
-
-    /**
-     * @test
-     */
-    public function with_sorting(): void
-    {
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('has')
-        ;
-
-        // Second-key is used for (non-empty) primary-condition
-        // Note: ordering doesn't change the cache-key as ordering is applied independently.
-        $this->cacheDriver
-            ->method('get')
-            ->with(self::matchesRegularExpression('/^' . self::CACHE_KEY . '|9e47d1142fc34088f14061a54fd42c6bee34e9d09c8397da3587f1cac4711cf7/'))
-            ->willReturn(["me = 'foo'", ['search' => [1, 'integer']]])
-        ;
-
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('set')
-        ;
-
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->order('@id', 'DESC')
-            ->getSearchCondition()
-        ;
-
-        $this->assertQueryBuilderEquals(
-            " WHERE me = 'foo' ORDER BY I.id DESC",
-            ['search' => [1, 'integer']],
-            $this->createCachedConditionGenerator($this->cacheDriver, $searchCondition, $this->getQuery())
-        );
-
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->primaryCondition()
-                ->order('@id', 'DESC')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $this->assertQueryBuilderEquals(
-            " WHERE me = 'foo' ORDER BY I.id DESC",
-            ['search' => [1, 'integer']],
-            $this->createCachedConditionGenerator($this->cacheDriver, $searchCondition, $this->getQuery())
-        );
-
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->order('@customer', 'DESC')
-            ->primaryCondition()
-                ->order('@id', 'DESC')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $this->assertQueryBuilderEquals(
-            " WHERE me = 'foo' ORDER BY I.id DESC, C.id DESC",
-            ['search' => [1, 'integer']],
-            $this->createCachedConditionGenerator($this->cacheDriver, $searchCondition, $this->getQuery())
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function does_not_store_empty_condition(): void
-    {
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())->getSearchCondition();
-
-        $this->cacheDriver = $this->createMock(CacheInterface::class);
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('has')
-        ;
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('get')
-            ->with('21d7d868aba516e1516bdefc51bad0ac19e1862d445641bb23dcdd6a6406bf3f')
-            ->willReturn(null)
-        ;
-
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('set')
-        ;
-
-        $this->conditionGenerator = $this->createCachedConditionGenerator($this->cacheDriver, $searchCondition);
-
-        $this->assertQueryBuilderEquals('', []);
-    }
-
-    /**
-     * @test
-     */
-    public function cannot_apply_multiple_times(): void
-    {
-        set_error_handler(
-            static function ($errno, $errstr): void {
-                restore_error_handler();
-
-                throw new \Exception($errstr, $errno);
-            },
-            \E_ALL
-        );
-
-        $this->conditionGenerator->apply();
-
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('SearchCondition was already applied. Ignoring operation.');
-
-        $this->conditionGenerator->apply();
-    }
-
-    /**
-     * @test
-     */
-    public function with_existing_caches_and_primary_cond(): void
-    {
-        $cacheDriverProphecy = $this->prophesize(CacheInterface::class);
-        $cacheDriverProphecy->get('bc4cf55a9b4956fb37ae36c4bb740c6c89196a7c29716fe37f733d91a1767331')->willReturn(["me = 'foo'", ['search_1' => ['duck', 'text']]])->shouldBeCalled();
-        $cacheDriverProphecy->get('1c4b0b7d0d8a7e21694898b730bcfffa04a05063af95a7de11b5872f61ee88c8')->willReturn(["you = 'me' AND me = 'foo'", ['search_2' => ['roll', 'text']]])->shouldBeCalled();
-        $cacheDriverProphecy->set(Argument::any(), Argument::any(), Argument::any())->shouldNotBeCalled();
-        $cacheDriver = $cacheDriverProphecy->reveal();
-
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('id')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $query1 = $this->getQuery();
-        $cachedConditionGenerator = $this->createCachedConditionGenerator($cacheDriver, $searchCondition, $query1);
-
-        $searchCondition2 = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('id')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->primaryCondition()
-            ->field('customer')
-                    ->addSimpleValue(2)
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $query2 = $this->getQuery();
-        $cachedConditionGenerator2 = $this->createCachedConditionGenerator($cacheDriver, $searchCondition2, $query2);
-
-        $this->assertQueryBuilderEquals(" WHERE me = 'foo'", ['search_1' => ['duck', 'text']], $cachedConditionGenerator);
-        $this->assertQueryBuilderEquals(" WHERE you = 'me' AND me = 'foo'", ['search_2' => ['roll', 'text']], $cachedConditionGenerator2);
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->cacheDriver = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
-        $this->query = $this->getQuery();
-
-        $searchCondition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $this->cacheDriver = $this->createMock(CacheInterface::class);
-        $this->conditionGenerator = $this->createCachedConditionGenerator($this->cacheDriver, $searchCondition);
-    }
-
-    protected function getQuery(): QueryBuilder
-    {
-        return $this->em->createQueryBuilder()
-            ->select('I')
-            ->from(ECommerceInvoice::class, 'I')
-            ->join('I.customer', 'C')
-        ;
-    }
-
-    private function createCachedConditionGenerator(CacheInterface $cacheDriver, SearchCondition $searchCondition, ?QueryBuilder $qb = null): CachedDqlConditionGenerator
-    {
-        $conditionGenerator = new CachedDqlConditionGenerator($qb ?? $this->query, $searchCondition, $cacheDriver, 60);
-        $conditionGenerator->setDefaultEntity(ECommerceInvoice::class, 'I');
-        $conditionGenerator->setField('id', 'id', null, null, 'smallint');
-        $conditionGenerator->setField('@id', 'id');
-
-        $conditionGenerator->setDefaultEntity(ECommerceCustomer::class, 'C');
-        $conditionGenerator->setField('customer', 'id', null, null, 'integer');
-        $conditionGenerator->setField('@customer', 'id');
-        $conditionGenerator->setField('customer_name#first_name', 'firstName');
-        $conditionGenerator->setField('customer_name#last_name', 'lastName');
-        $conditionGenerator->setField('customer_birthday', 'birthday');
-
-        return $conditionGenerator;
-    }
-}
diff --git a/lib/Doctrine/Orm/Tests/ConditionGeneratorResultsTestCase.php b/lib/Doctrine/Orm/Tests/ConditionGeneratorResultsTestCase.php
deleted file mode 100644
index 51ab7517..00000000
--- a/lib/Doctrine/Orm/Tests/ConditionGeneratorResultsTestCase.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Orm;
-
-use Rollerworks\Component\Search\Doctrine\Orm\FieldConfigBuilder;
-use Rollerworks\Component\Search\Exception\SearchException;
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Extension\Core\Type\ChoiceType;
-use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Rollerworks\Component\Search\SearchPrimaryCondition;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\SchemaRecord;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceCustomer;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceInvoice;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceInvoiceRow;
-
-/**
- * Ensures the expected results are actually found.
- *
- * Uses the FilterQuery input-processor for a readable condition
- * and ensures the input values are properly formatted.
- *
- * This example uses a 'classic' invoice system
- * with three tables:
- *
- * * invoices
- * * invoice_rows
- * * customers
- *
- * For simplicity this example doesn't do tax calculation.
- *
- * Complex structure tests are not done here as these tests are more about
- * "doesn't error".
- */
-abstract class ConditionGeneratorResultsTestCase extends OrmTestCase
-{
-    private StringQueryInput $inputProcessor;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->inputProcessor = new StringQueryInput();
-    }
-
-    /**
-     * @return SchemaRecord[]
-     */
-    protected function getDbRecords()
-    {
-        $date = static fn (string $input): \DateTimeImmutable => new \DateTimeImmutable($input, new \DateTimeZone('UTC'));
-
-        return [
-            SchemaRecord::create(
-                'customers',
-                [
-                    'id' => 'integer',
-                    'first_name' => 'string',
-                    'last_name' => 'string',
-                    'birthday' => 'date_immutable',
-                    'regdate' => 'date_immutable',
-                ]
-            )
-            ->records()
-                ->add([1, 'Peter', 'Pang', $date('1980-11-20'), $date('2005-11-20')])
-                ->add([2, 'Leroy', 'Jenkins', $date('2000-05-15'), $date('2005-05-20')])
-                ->add([3, 'Doctor', 'Who', $date('2005-12-10'), $date('2005-02-20')])
-                ->add([4, 'Spider', 'Pig', $date('2012-06-10'), $date('2012-07-20')])
-                ->add([6, 'Nicklas', 'Cake', $date('1964-01-07'), $date('2006-09-31')])
-            ->end(),
-
-            // Two invoices are paid, one is a concept and three are unpaid, one is overdue
-            SchemaRecord::create(
-                'invoices',
-                [
-                    'invoice_id' => 'integer',
-                    'customer' => 'integer',
-                    'label' => 'string',
-                    'pubdate' => 'date_immutable',
-                    'status' => 'integer',
-                    'price_total' => 'decimal',
-                ]
-            )
-            ->records()
-                ->add([1, 1, '2010-001', $date('2010-05-10'), 2, '100.00']) // 'Peter', 'Pang'
-                ->add([2, 2, '2010-002', $date('2010-05-10'), 2, '90.00']) // 'Leroy', 'Jenkins'
-                ->add([3, 2, null, null, 0, '10.00']) // concept - 'Leroy', 'Jenkins'
-                // unpaid //
-                ->add([4, 2, '2015-001', $date('2015-05-10'), 1, '50.00']) // 'Leroy', 'Jenkins'
-                ->add([5, 3, '2015-002', $date('2015-05-01'), 1, '215.00']) // 'Doctor', 'Who'
-                ->add([6, 4, '2015-003', $date('2015-05-05'), 1, '55.00']) // 'Spider', 'Pig'
-                // Overdue, with relative dates
-                ->add([7, 6, '2019-001', $date('-7 days'), 3, '80.00']) // 'Nicklas', 'Cake'
-                ->add([8, 6, '2020-019', $date('+15 days'), 3, '70.00']) // 'Nicklas', 'Cake'
-                ->add([9, 6, '2021-005', $date('+1 year'), 3, '70.00']) // 'Nicklas', 'Cake'
-            ->end(),
-
-            SchemaRecord::create(
-                'invoice_rows',
-                [
-                    'id' => 'integer',
-                    'invoice' => 'integer',
-                    'label' => 'string',
-                    'quantity' => 'integer',
-                    'price' => 'decimal',
-                    'total' => 'decimal',
-                ]
-            )
-            ->records()
-                // invoice 1
-                ->add([1, 1, 'Electric Guitar', 1, '200.00', '100.00'])
-                // invoice 2
-                ->add([2, 2, 'Sword', 1, '15.00', '15.00'])
-                ->add([3, 2, 'Shield', 1, '20.00', '20.00'])
-                ->add([4, 2, 'Armor', 1, '55.00', '55.00'])
-                // invoice 3
-                ->add([5, 3, 'Sword', 1, '10.00', '10.00'])
-                // invoice 4
-                ->add([6, 4, 'Armor repair kit', 2, '50.00', '100.00'])
-                // invoice 5
-                ->add([7, 5, 'TARDIS Chameleon circuit', 1, '15.00', '15.00'])
-                ->add([8, 5, 'Sonic Screwdriver', 10, '20.00', '200.00'])
-                // invoice 6
-                ->add([9, 6, 'Web shooter', 1, '10.00', '10.00'])
-                ->add([10, 6, 'Cape', 1, '10.00', '10.00'])
-                ->add([11, 6, 'Cape repair manual', 1, '10.00', '10.00'])
-                ->add([12, 6, 'Hoof polish', 3, '10.00', '30.00'])
-                // invoice 7
-                ->add([13, 7, 'Bee repellent', 1, '666.00', '666.00'])
-                ->add([14, 7, 'Badge', 1, '10.00', '10.00'])
-                ->add([15, 8, 'Wicker Beads', 5, '3.00', '15.00'])
-                ->add([16, 8, 'A Pair of Cloths', 1, '60.00', '60.00'])
-            ->end(),
-        ];
-    }
-
-    protected function configureConditionGenerator(FieldConfigBuilder $conditionGenerator): void
-    {
-        $conditionGenerator->setDefaultEntity(ECommerceInvoice::class, 'I');
-        $conditionGenerator->setField('id', 'id');
-        $conditionGenerator->setField('@id', 'id');
-        $conditionGenerator->setField('label', 'label');
-        $conditionGenerator->setField('pub-date', 'date');
-        $conditionGenerator->setField('status', 'status');
-        $conditionGenerator->setField('total', 'total');
-
-        $conditionGenerator->setDefaultEntity(ECommerceInvoiceRow::class, 'R');
-        $conditionGenerator->setField('row-label', 'label');
-        $conditionGenerator->setField('row-price', 'price');
-        $conditionGenerator->setField('row-quantity', 'quantity');
-        $conditionGenerator->setField('row-total', 'total');
-
-        $conditionGenerator->setDefaultEntity(ECommerceCustomer::class, 'C');
-        $conditionGenerator->setField('customer', 'id');
-        $conditionGenerator->setField('customer-first-name', 'firstName');
-        $conditionGenerator->setField('customer-name#first_name', 'firstName');
-        $conditionGenerator->setField('customer-name#last_name', 'lastName');
-        $conditionGenerator->setField('customer-birthday', 'birthday');
-    }
-
-    protected function getFieldSet(bool $build = true)
-    {
-        $fieldSet = $this->getFactory()->createFieldSetBuilder();
-
-        // Customer (by invoice relation)
-        $fieldSet->add('customer-first-name', TextType::class);
-        $fieldSet->add('customer-last-name', TextType::class);
-        $fieldSet->add('customer-name', TextType::class);
-        $fieldSet->add('customer-birthday', BirthdayType::class, ['pattern' => 'yyyy-MM-dd']);
-
-        // Invoice
-        $fieldSet->add('id', IntegerType::class);
-        $fieldSet->add('@id', OrderFieldType::class);
-        $fieldSet->add('customer', IntegerType::class);
-        $fieldSet->add('label', TextType::class);
-        $fieldSet->add('pub-date', DateTimeType::class, ['pattern' => 'yyyy-MM-dd', 'allow_relative' => true]);
-        $fieldSet->add('status', ChoiceType::class, ['choices' => ['concept' => 0, 'published' => 1, 'paid' => 2, 'overdue' => 3]]);
-        $fieldSet->add('total', MoneyType::class);
-
-        // Invoice Details
-        $fieldSet->add('row-label', TextType::class);
-        $fieldSet->add('row-quantity', IntegerType::class);
-        $fieldSet->add('row-price', MoneyType::class);
-        $fieldSet->add('row-total', MoneyType::class);
-
-        return $build ? $fieldSet->getFieldSet('invoice') : $fieldSet;
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_id(): void
-    {
-        $this->makeTest('id: 1, 5;', [1, 5]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_orders(): void
-    {
-        $this->makeTest('@id: ASC; id: 1, 5;', [1, 5]);
-        $this->makeTest('@id: DESC; id: 1, 5;', [5, 1]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_combined_field(): void
-    {
-        $this->makeTest('customer-name: Pang, Leroy;', [1, 2, 3, 4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_range_and_excluding(): void
-    {
-        $this->makeTest('id: 1~7[, !2;', [1, 3, 4, 5, 6]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_birthday(): void
-    {
-        $this->makeTest('customer-birthday: "2000-05-15";', range(2, 4));
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_birthdays(): void
-    {
-        $this->makeTest('customer-birthday: "2000-05-15", "1980-06-10";', [2, 3, 4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_date_relative(): void
-    {
-        $this->makeTest('pub-date: >"7 days";', [8, 9]);
-        $this->makeTest('pub-date: >"16 days";', [9]);
-        $this->makeTest('pub-date: "14 days" ~ "6 months";', [8]);
-        $this->makeTest('pub-date: >2015-05-10, <"-7 day";', [7]);
-        $this->makeTest('pub-date: >2015-05-10, <"-8 day";', []);
-        $this->makeTest('pub-date: >2015-05-10, >"-1 year", <"6 months";', [7, 8]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_or_group(): void
-    {
-        $this->makeTest('* customer-birthday: "1980-11-20"; pub-date: "2015-05-01";', [1, 5]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_pub_date_limited_by_price(): void
-    {
-        $this->makeTest('pub-date: "2015-05-10"; total: "50.00"', [4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status(): void
-    {
-        $this->makeTest('customer: 2; status: concept;', [3]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status_and_total(): void
-    {
-        $this->makeTest('customer: 2; status: paid; total: "90.00";', [2]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status_and_total_with_primary_cond(): void
-    {
-        $this->makeTestWithPrimaryCond('customer: 2;', 'customer: 3;', []);
-        $this->makeTestWithPrimaryCond('customer: 2;', 'status: paid; customer: 3;', []);
-        $this->makeTestWithPrimaryCond('customer: 2;', 'status: paid;', [2]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status_or_price(): void
-    {
-        $this->makeTest('customer: 2; *(status: paid; total: "50.00";)', [2, 4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_status_and_label_or_quantity_limited_by_price(): void
-    {
-        // Note there is no row with quantity 5, which is resolved as its in an OR'ed group
-        $this->makeTest('status: published; *(row-quantity: 5; row-label: ~*"repair"; (row-price: "50.00"));', [4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_excluding_equals_pattern(): void
-    {
-        $this->makeTest('row-label: ~=Armor, ~=sword;', [2]); // Invoice 3 doesn't match as "sword" is lowercase
-        $this->makeTest('row-price: "15.00"; row-label: ~!=Sword;', [5]);
-
-        // Lowercase
-        $this->makeTest('row-label: ~=Armor, ~i=sword;', [2, 3]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_pattern(): void
-    {
-        $this->makeTest('customer-first-name: ~>Doc', [5]);
-        $this->makeTest('customer-first-name: ~*Doc', [5]);
-        $this->makeTest('customer-first-name: ~<r', [1, 5, 6]);
-        $this->makeTest('customer-first-name: ~i<R', [1, 5, 6]);
-        $this->makeTest('customer-first-name: ~<R', []);
-
-        $this->makeTest('row-label: ~*TAR', [5]);
-        $this->makeTest('row-label: ~*tar', [1]);
-        $this->makeTest('row-label: ~i*Tar', [1, 5]);
-    }
-
-    private function makeTest($input, array $expectedRows): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        try {
-            $condition = $this->inputProcessor->process($config, $input);
-            $this->assertRecordsAreFound($condition, $expectedRows, $input);
-        } catch (SearchException $e) {
-            if (\function_exists('dump')) {
-                dump($e);
-            } else {
-                echo 'Please install symfony/var-dumper as dev-requirement to get a readable structure.' . \PHP_EOL;
-
-                // Don't use var-dump or print-r as this crashes php...
-                echo $e::class . '::' . $e;
-            }
-
-            self::fail('Condition contains errors.');
-        }
-    }
-
-    private function makeTestWithPrimaryCond($primaryCondition, $input, array $expectedRows): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        try {
-            $condition = $this->inputProcessor->process($config, $input);
-            $condition->setPrimaryCondition(new SearchPrimaryCondition($this->inputProcessor->process($config, $primaryCondition)->getValuesGroup()));
-            $this->assertRecordsAreFound($condition, $expectedRows, $input);
-        } catch (SearchException $e) {
-            if (\function_exists('dump')) {
-                dump($e);
-            } else {
-                echo 'Please install symfony/var-dumper as dev-requirement to get a readable structure.' . \PHP_EOL;
-
-                // Don't use var-dump or print-r as this crashes php...
-                echo $e::class . '::' . $e;
-            }
-
-            self::fail('Condition contains errors.');
-        }
-    }
-}
diff --git a/lib/Doctrine/Orm/Tests/DoctrineOrmFactoryTest.php b/lib/Doctrine/Orm/Tests/DoctrineOrmFactoryTest.php
deleted file mode 100644
index 6a7c0662..00000000
--- a/lib/Doctrine/Orm/Tests/DoctrineOrmFactoryTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Orm;
-
-use Doctrine\ORM\QueryBuilder;
-use Psr\SimpleCache\CacheInterface;
-use Rollerworks\Component\Search\Doctrine\Orm\CachedDqlConditionGenerator;
-use Rollerworks\Component\Search\Doctrine\Orm\DoctrineOrmFactory;
-use Rollerworks\Component\Search\GenericFieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceInvoice;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @group non-functional
- *
- * @internal
- */
-final class DoctrineOrmFactoryTest extends OrmTestCase
-{
-    protected DoctrineOrmFactory $factory;
-
-    /**
-     * @test
-     */
-    public function create_condition_generator(): void
-    {
-        $qb = $this->getQuery();
-        $condition = new SearchCondition(new GenericFieldSet([]), new ValuesGroup());
-
-        $conditionGenerator = $this->factory->createConditionGenerator($qb, $condition);
-        self::assertSame($qb, $conditionGenerator->getQueryBuilder());
-    }
-
-    /**
-     * @test
-     */
-    public function cached_dql_condition_generator(): void
-    {
-        $qb = $this->getQuery();
-        $searchCondition = new SearchCondition(new GenericFieldSet([]), new ValuesGroup());
-        $cachedConditionGenerator = $this->factory->createCachedConditionGenerator($qb, $searchCondition);
-
-        self::assertInstanceOf(CachedDqlConditionGenerator::class, $cachedConditionGenerator);
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $cacheDriver = $this->createMock(CacheInterface::class);
-        $this->factory = new DoctrineOrmFactory($cacheDriver);
-    }
-
-    protected function getQuery(): QueryBuilder
-    {
-        return $this->em->createQueryBuilder()
-            ->select('I')
-            ->from(ECommerceInvoice::class, 'I')
-            ->join('I.customer', 'C')
-        ;
-    }
-}
diff --git a/lib/Doctrine/Orm/Tests/DqlConditionGeneratorResultsTest.php b/lib/Doctrine/Orm/Tests/DqlConditionGeneratorResultsTest.php
deleted file mode 100644
index 8a24a028..00000000
--- a/lib/Doctrine/Orm/Tests/DqlConditionGeneratorResultsTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Orm;
-
-use Doctrine\ORM\QueryBuilder;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceInvoice;
-
-/**
- * @internal
- */
-final class DqlConditionGeneratorResultsTest extends ConditionGeneratorResultsTestCase
-{
-    protected function getQuery(): QueryBuilder
-    {
-        return $this->em->createQueryBuilder()
-            ->select('I')
-            ->from(ECommerceInvoice::class, 'I')
-            ->join('I.customer', 'C')
-            ->leftJoin('I.children', 'IP')
-            ->leftJoin('I.rows', 'R')
-        ;
-    }
-}
diff --git a/lib/Doctrine/Orm/Tests/DqlConditionGeneratorTest.php b/lib/Doctrine/Orm/Tests/DqlConditionGeneratorTest.php
deleted file mode 100644
index 1066b329..00000000
--- a/lib/Doctrine/Orm/Tests/DqlConditionGeneratorTest.php
+++ /dev/null
@@ -1,1082 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Orm;
-
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\ORM\Query\QueryException;
-use Doctrine\ORM\QueryBuilder;
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-use Rollerworks\Component\Search\Doctrine\Orm\ColumnConversion;
-use Rollerworks\Component\Search\Doctrine\Orm\ConditionGenerator;
-use Rollerworks\Component\Search\Doctrine\Orm\Tests\Fixtures\GetCustomerTypeFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\ValueConversion;
-use Rollerworks\Component\Search\Extension\Core\Type\ChoiceType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\SearchPrimaryCondition;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceCustomer;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceInvoice;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @internal
- */
-final class DqlConditionGeneratorTest extends OrmTestCase
-{
-    protected function getFieldSet(bool $build = true)
-    {
-        $fieldSet = parent::getFieldSet(false);
-        $fieldSet->add('id2', IntegerType::class);
-        $fieldSet->add('status', ChoiceType::class, ['choices' => ['concept' => 0, 'published' => 1, 'paid' => 2]]);
-        $fieldSet->add('customer_first_name', TextType::class);
-
-        return $build ? $fieldSet->getFieldSet('invoice') : $fieldSet;
-    }
-
-    protected function getQuery(): QueryBuilder
-    {
-        return $this->em->createQueryBuilder()
-            ->select('I')
-            ->from(ECommerceInvoice::class, 'I')
-            ->join('I.customer', 'C')
-        ;
-    }
-
-    private function getConditionGenerator(SearchCondition $condition, ?QueryBuilder $qb = null, bool $noMapping = false)
-    {
-        $qb ??= $this->getQuery();
-        $conditionGenerator = $this->getOrmFactory()->createConditionGenerator($qb, $condition);
-
-        if (! $noMapping) {
-            $conditionGenerator->setDefaultEntity(ECommerceInvoice::class, 'I');
-            $conditionGenerator->setField('id', 'id', null, null, 'smallint');
-            $conditionGenerator->setField('@id', 'id');
-            $conditionGenerator->setField('status', 'status');
-
-            $conditionGenerator->setDefaultEntity(ECommerceCustomer::class, 'C');
-            $conditionGenerator->setField('customer', 'id');
-            $conditionGenerator->setField('@customer', 'id');
-            $conditionGenerator->setField('customer_name#first_name', 'firstName');
-            $conditionGenerator->setField('customer_name#last_name', 'lastName');
-            $conditionGenerator->setField('customer_first_name', 'firstName');
-            $conditionGenerator->setField('customer_birthday', 'birthday');
-        }
-
-        return $conditionGenerator;
-    }
-
-    /**
-     * @test
-     */
-    public function simple_query(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((C.id = :search_0 OR C.id = :search_1)))',
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0,
-                    i0_.label AS label_1,
-                    i0_.pubdate AS pubdate_2,
-                    i0_.status AS status_3,
-                    i0_.price_total AS price_total_4,
-                    i0_.customer AS customer_5,
-                    i0_.parent_id AS parent_id_6
-                FROM invoices i0_
-                         INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                WHERE (((c1_.id = ? OR c1_.id = ?)))
-                SQL,
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function query_with_multiple_fields(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->field('status')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((C.id = :search_0 OR C.id = :search_1)) AND ((I.status = :search_2 OR I.status = :search_3)))',
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0,
-                    i0_.label AS label_1,
-                    i0_.pubdate AS pubdate_2,
-                    i0_.status AS status_3,
-                    i0_.price_total AS price_total_4,
-                    i0_.customer AS customer_5,
-                    i0_.parent_id AS parent_id_6
-                FROM
-                    invoices i0_
-                        INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                WHERE (((c1_.id = ? OR c1_.id = ?)) AND ((i0_.status = ? OR i0_.status = ?)))
-                SQL,
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-                'search_2' => [2, 'integer'],
-                'search_3' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function empty_result(): void
-    {
-        $condition = new SearchCondition($this->getFieldSet(), new ValuesGroup());
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles($conditionGenerator, '');
-    }
-
-    /**
-     * @test
-     */
-    public function excludes(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addExcludedSimpleValue(2)
-                ->addExcludedSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles($conditionGenerator, 'WHERE (((C.id <> :search_0 AND C.id <> :search_1)))');
-    }
-
-    /**
-     * @test
-     */
-    public function includes_and_excludes(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addExcludedSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles($conditionGenerator, 'WHERE ((C.id = :search_0 AND C.id <> :search_1))');
-    }
-
-    /**
-     * @test
-     */
-    public function with_primary_condition_and_user_condition(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->primaryCondition()
-                ->field('customer')
-                    ->addSimpleValue(2)
-                    ->addSimpleValue(5)
-                ->end()
-            ->end()
-            ->field('id')
-                ->addSimpleValue(6)
-                ->addSimpleValue(3)
-            ->end()
-            ->field('status')
-                ->addSimpleValue(8)
-                ->addSimpleValue(9)
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((C.id = :search_0 OR C.id = :search_1))) AND (((I.id = :search_2 OR I.id = :search_3)) AND ((I.status = :search_4 OR I.status = :search_5)))',
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0,
-                    i0_.label AS label_1,
-                    i0_.pubdate AS pubdate_2,
-                    i0_.status AS status_3,
-                    i0_.price_total AS price_total_4,
-                    i0_.customer AS customer_5,
-                    i0_.parent_id AS parent_id_6
-                FROM
-                    invoices i0_
-                        INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                WHERE (((c1_.id = ? OR c1_.id = ?))) AND (((i0_.invoice_id = ? OR i0_.invoice_id = ?)) AND ((i0_.status = ? OR i0_.status = ?)))
-                SQL,
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-                'search_2' => [6, 'smallint'],
-                'search_3' => [3, 'smallint'],
-                'search_4' => [8, 'integer'],
-                'search_5' => [9, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function with_primary_condition_and_no_user_condition(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->primaryCondition()
-                ->field('customer')
-                    ->addSimpleValue(2)
-                    ->addSimpleValue(5)
-                ->end()
-                ->field('status')
-                    ->addSimpleValue(2)
-                    ->addSimpleValue(5)
-                ->end()
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((C.id = :search_0 OR C.id = :search_1)) AND ((I.status = :search_2 OR I.status = :search_3)))',
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0,
-                    i0_.label AS label_1,
-                    i0_.pubdate AS pubdate_2,
-                    i0_.status AS status_3,
-                    i0_.price_total AS price_total_4,
-                    i0_.customer AS customer_5,
-                    i0_.parent_id AS parent_id_6
-                FROM
-                    invoices i0_
-                        INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                WHERE (((c1_.id = ? OR c1_.id = ?)) AND ((i0_.status = ? OR i0_.status = ?)))
-                SQL,
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-                'search_2' => [2, 'integer'],
-                'search_3' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function sorting_single_field(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->order('@id', 'DESC')
-            ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((C.id = :search_0 OR C.id = :search_1))) ORDER BY I.id DESC',
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0,
-                    i0_.label AS label_1,
-                    i0_.pubdate AS pubdate_2,
-                    i0_.status AS status_3,
-                    i0_.price_total AS price_total_4,
-                    i0_.customer AS customer_5,
-                    i0_.parent_id AS parent_id_6
-                FROM invoices i0_
-                         INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                WHERE (((c1_.id = ? OR c1_.id = ?)))
-                ORDER BY i0_.invoice_id DESC
-                SQL,
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function sorting_multiple_fields(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->order('@customer')
-            ->order('@id', 'DESC')
-            ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((C.id = :search_0 OR C.id = :search_1))) ORDER BY C.id ASC, I.id DESC',
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0,
-                    i0_.label AS label_1,
-                    i0_.pubdate AS pubdate_2,
-                    i0_.status AS status_3,
-                    i0_.price_total AS price_total_4,
-                    i0_.customer AS customer_5,
-                    i0_.parent_id AS parent_id_6
-                FROM invoices i0_
-                         INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                WHERE (((c1_.id = ? OR c1_.id = ?)))
-                ORDER BY c1_.id ASC, i0_.invoice_id DESC
-                SQL,
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function sorting_only(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->order('@id', 'DESC')
-            ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'ORDER BY I.id DESC',
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0,
-                    i0_.label AS label_1,
-                    i0_.pubdate AS pubdate_2,
-                    i0_.status AS status_3,
-                    i0_.price_total AS price_total_4,
-                    i0_.customer AS customer_5,
-                    i0_.parent_id AS parent_id_6
-                FROM invoices i0_
-                INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                ORDER BY i0_.invoice_id DESC
-                SQL
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function sorting_with_primary_condition(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->primaryCondition()
-                ->order('@id', 'DESC')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((C.id = :search_0 OR C.id = :search_1))) ORDER BY I.id DESC',
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0,
-                    i0_.label AS label_1,
-                    i0_.pubdate AS pubdate_2,
-                    i0_.status AS status_3,
-                    i0_.price_total AS price_total_4,
-                    i0_.customer AS customer_5,
-                    i0_.parent_id AS parent_id_6
-                FROM invoices i0_
-                         INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                WHERE (((c1_.id = ? OR c1_.id = ?)))
-                ORDER BY i0_.invoice_id DESC
-                SQL,
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function sorting_user_and_primary_condition(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->order('@customer', 'DESC')
-            ->primaryCondition()
-                ->order('@id', 'DESC') // Must be applied first
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((C.id = :search_0 OR C.id = :search_1))) ORDER BY I.id DESC, C.id DESC',
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0,
-                    i0_.label AS label_1,
-                    i0_.pubdate AS pubdate_2,
-                    i0_.status AS status_3,
-                    i0_.price_total AS price_total_4,
-                    i0_.customer AS customer_5,
-                    i0_.parent_id AS parent_id_6
-                FROM invoices i0_
-                         INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                WHERE (((c1_.id = ? OR c1_.id = ?)))
-                ORDER BY i0_.invoice_id DESC, c1_.id DESC
-                SQL,
-            [
-                'search_0' => [2, 'integer'],
-                'search_1' => [5, 'integer'],
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function sorting_only_with_primary_condition(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->primaryCondition()
-                ->order('@id', 'DESC')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'ORDER BY I.id DESC',
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0,
-                    i0_.label AS label_1,
-                    i0_.pubdate AS pubdate_2,
-                    i0_.status AS status_3,
-                    i0_.price_total AS price_total_4,
-                    i0_.customer AS customer_5,
-                    i0_.parent_id AS parent_id_6
-                FROM invoices i0_
-                         INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                ORDER BY i0_.invoice_id DESC
-                SQL
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function ranges(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Range(2, 5))
-                ->add(new Range(10, 20))
-                ->add(new Range(60, 70, false))
-                ->add(new Range(100, 150, true, false))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE ((((C.id >= :search_0 AND C.id <= :search_1) OR (C.id >= :search_2 AND C.id <= :search_3) OR (C.id > :search_4 AND C.id <= :search_5) OR (C.id >= :search_6 AND C.id < :search_7))))'
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function excluded_ranges(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new ExcludedRange(2, 5))
-                ->add(new ExcludedRange(10, 20))
-                ->add(new ExcludedRange(60, 70, false))
-                ->add(new ExcludedRange(100, 150, true, false))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE ((((C.id <= :search_0 OR C.id >= :search_1) AND (C.id <= :search_2 OR C.id >= :search_3) AND (C.id < :search_4 OR C.id >= :search_5) AND (C.id <= :search_6 OR C.id > :search_7))))'
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function single_comparison(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(2, '>'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles($conditionGenerator, 'WHERE ((C.id > :search_0))');
-    }
-
-    /**
-     * @test
-     */
-    public function multiple_comparisons(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(2, '>'))
-                ->add(new Compare(10, '<'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles($conditionGenerator, 'WHERE (((C.id > :search_0 AND C.id < :search_1)))');
-    }
-
-    /**
-     * @test
-     */
-    public function multiple_comparisons_with_groups(): void
-    {
-        // Use two subgroups here as the comparisons are AND to each other
-        // but applying them in the head group would ignore subgroups
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->group()
-                ->field('customer')
-                    ->add(new Compare(2, '>'))
-                    ->add(new Compare(10, '<'))
-                    ->addSimpleValue(20)
-                ->end()
-            ->end()
-            ->group()
-                ->field('customer')
-                    ->add(new Compare(30, '>'))
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE ((((C.id = :search_0 OR (C.id > :search_1 AND C.id < :search_2)))) OR ((C.id > :search_3)))'
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function excluding_comparisons(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(2, '<>'))
-                ->add(new Compare(5, '<>'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles($conditionGenerator, 'WHERE ((C.id <> :search_0 AND C.id <> :search_1))');
-    }
-
-    /**
-     * @test
-     */
-    public function excluding_comparisons_with_normal(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->add(new Compare(35, '<>'))
-                ->add(new Compare(45, '<>'))
-                ->add(new Compare(30, '>'))
-                ->add(new Compare(50, '<'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((C.id > :search_0 AND C.id < :search_1) AND C.id <> :search_2 AND C.id <> :search_3))'
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function pattern_matchers(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer_first_name')
-                ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-                ->add(new PatternMatch('fo\\\'o', PatternMatch::PATTERN_STARTS_WITH))
-                ->add(new PatternMatch('fo\'o', PatternMatch::PATTERN_STARTS_WITH))
-                ->add(new PatternMatch('fo\'\'o', PatternMatch::PATTERN_STARTS_WITH))
-                ->add(new PatternMatch('bar', PatternMatch::PATTERN_NOT_ENDS_WITH, true))
-                ->add(new PatternMatch('bar2', PatternMatch::PATTERN_CONTAINS))
-                ->add(new PatternMatch('rap', PatternMatch::PATTERN_NOT_CONTAINS))
-                ->add(new PatternMatch('oop', PatternMatch::PATTERN_ENDS_WITH))
-                ->add(new PatternMatch('boo', PatternMatch::PATTERN_NOT_ENDS_WITH))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        if ($this->conn->getDatabasePlatform() instanceof PostgreSQLPlatform) {
-            $this->assertDqlCompiles(
-                $conditionGenerator,
-                "WHERE (((C.firstName LIKE CONCAT(:search_0, '%') OR C.firstName LIKE CONCAT(:search_1, '%') OR C.firstName LIKE CONCAT(:search_2, '%') OR C.firstName LIKE CONCAT(:search_3, '%') OR C.firstName LIKE CONCAT('%', :search_4, '%') OR C.firstName LIKE CONCAT('%', :search_5)) AND (LOWER(C.firstName) NOT LIKE LOWER(CONCAT('%', :search_6)) AND C.firstName NOT LIKE CONCAT('%', :search_7, '%') AND C.firstName NOT LIKE CONCAT('%', :search_8))))",
-                <<<'SQL'
-                    SELECT
-                        i0_.invoice_id AS invoice_id_0,
-                        i0_.label AS label_1,
-                        i0_.pubdate AS pubdate_2,
-                        i0_.status AS status_3,
-                        i0_.price_total AS price_total_4,
-                        i0_.customer AS customer_5,
-                        i0_.parent_id AS parent_id_6
-                    FROM
-                        invoices i0_
-                            INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                    WHERE (((c1_.first_name LIKE ? || '%' OR c1_.first_name LIKE ? || '%' OR c1_.first_name LIKE ? || '%' OR
-                             c1_.first_name LIKE ? || '%' OR c1_.first_name LIKE '%' || ? || '%' OR c1_.first_name LIKE '%' || ?) AND
-                            (LOWER(c1_.first_name) NOT LIKE LOWER('%' || ?) AND c1_.first_name NOT LIKE '%' || ? || '%' AND
-                             c1_.first_name NOT LIKE '%' || ?)))
-                    SQL
-            );
-        } else {
-            $this->assertDqlCompiles(
-                $conditionGenerator,
-                <<<'DQL'
-                    WHERE (((C.firstName LIKE CONCAT(:search_0, '%') OR
-                    C.firstName LIKE CONCAT(:search_1, '%') OR
-                    C.firstName LIKE CONCAT(:search_2, '%') OR
-                    C.firstName LIKE CONCAT(:search_3, '%') OR
-                    C.firstName LIKE CONCAT('%', :search_4, '%') OR
-                    C.firstName LIKE CONCAT('%', :search_5)) AND
-                    (LOWER(C.firstName) NOT LIKE LOWER(CONCAT('%', :search_6)) AND
-                    C.firstName NOT LIKE CONCAT('%', :search_7, '%') AND
-                    C.firstName NOT LIKE CONCAT('%', :search_8))))
-                    DQL
-            );
-        }
-    }
-
-    /**
-     * @test
-     */
-    public function sub_groups(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->group()
-                ->field('customer')
-                    ->addSimpleValue(2)
-                ->end()
-            ->end()
-            ->group()
-                ->field('customer')
-                    ->addSimpleValue(3)
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles($conditionGenerator, 'WHERE (((C.id = :search_0)) OR ((C.id = :search_1)))');
-    }
-
-    /**
-     * @test
-     */
-    public function sub_group_with_root_condition(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-            ->end()
-            ->group()
-                ->field('customer_name')
-                    ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            "WHERE (((C.id = :search_0)) AND ((((C.firstName LIKE CONCAT(:search_1, '%') OR C.lastName LIKE CONCAT(:search_2, '%'))))))"
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function or_group_root(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet(), ValuesGroup::GROUP_LOGICAL_OR)
-            ->field('customer')
-                ->addSimpleValue(2)
-            ->end()
-            ->field('customer_first_name')
-                ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            "WHERE ((C.id = :search_0) OR (C.firstName LIKE CONCAT(:search_1, '%')))"
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function sub_or_group(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->group()
-                ->group(ValuesGroup::GROUP_LOGICAL_OR)
-                    ->field('customer')
-                        ->addSimpleValue(2)
-                    ->end()
-                    ->field('customer_first_name')
-                        ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-                    ->end()
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            "WHERE ((((C.id = :search_0) OR (C.firstName LIKE CONCAT(:search_1, '%')))))"
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function column_conversion(): void
-    {
-        $converter = $this->createMock(ColumnConversion::class);
-        $converter
-            ->expects(self::atLeastOnce())
-            ->method('convertColumn')
-            ->willReturnCallback(static function ($column, array $options, ConversionHints $hints) {
-                self::assertArrayHasKey('grouping', $options);
-                self::assertTrue($options['grouping']);
-                self::assertEquals('C.id', $hints->column);
-
-                return "SEARCH_CONVERSION_CAST({$column}, 'customer_type')";
-            })
-        ;
-
-        $fieldSetBuilder = $this->getFieldSet(false);
-        $fieldSetBuilder->add('customer', IntegerType::class, ['grouping' => true, 'doctrine_orm_conversion' => $converter]);
-
-        $condition = SearchConditionBuilder::create($fieldSetBuilder->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            "WHERE ((SEARCH_CONVERSION_CAST(C.id, 'customer_type') = :search_0))",
-            <<<'SQL'
-                SELECT
-                    i0_.invoice_id AS invoice_id_0, i0_.label AS label_1, i0_.pubdate AS pubdate_2, i0_.status AS status_3,
-                    i0_.price_total AS price_total_4, i0_.customer AS customer_5, i0_.parent_id AS parent_id_6
-                FROM
-                    invoices i0_
-                        INNER JOIN customers c1_ ON i0_.customer = c1_.id
-                WHERE ((CAST(c1_.id AS customer_type) = ?))
-                SQL
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function value_conversion(): void
-    {
-        $emConfig = $this->em->getConfiguration();
-        $emConfig->addCustomStringFunction('GET_CUSTOMER_TYPE', GetCustomerTypeFunction::class);
-
-        $converter = $this->createMock(ValueConversion::class);
-        $converter
-            ->expects(self::atLeastOnce())
-            ->method('convertValue')
-            ->willReturnCallback(static function ($value, array $options, ConversionHints $hints) {
-                self::assertArrayHasKey('grouping', $options);
-                self::assertTrue($options['grouping']);
-
-                $value = $hints->createParamReferenceFor($value);
-
-                return "get_customer_type({$value})";
-            })
-        ;
-
-        $fieldSetBuilder = $this->getFieldSet(false);
-        $fieldSetBuilder->add('customer', IntegerType::class, ['grouping' => true, 'doctrine_orm_conversion' => $converter]);
-
-        $condition = SearchConditionBuilder::create($fieldSetBuilder->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE ((C.id = get_customer_type(:search_0)))',
-            'SELECT i0_.invoice_id AS invoice_id_0, i0_.label AS label_1, i0_.pubdate AS pubdate_2, i0_.status AS status_3, i0_.price_total AS price_total_4, i0_.customer AS customer_5, i0_.parent_id AS parent_id_6 FROM invoices i0_ INNER JOIN customers c1_ ON i0_.customer = c1_.id WHERE ((c1_.id = get_customer_type(?)))'
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function apply_to_query_builder(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $qb = $this->em->createQueryBuilder();
-        $qb->select('C')->from(ECommerceCustomer::class, 'C');
-
-        $conditionGenerator = $this->getConditionGenerator($condition, $qb);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE ((C.id = :search_0))',
-            '',
-            ['search_0' => [2, 'integer']]
-        );
-        self::assertEquals(
-            'SELECT C FROM Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceCustomer C WHERE ((C.id = :search_0))',
-            $qb->getDQL()
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function apply_without_result(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())->getSearchCondition();
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles($conditionGenerator, '');
-        self::assertEquals(
-            'SELECT I FROM Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceInvoice I INNER JOIN I.customer C',
-            $conditionGenerator->getQueryBuilder()->getDQL()
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function query_with_prepend_and_primary_cond(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('customer')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $condition->setPrimaryCondition(
-            new SearchPrimaryCondition(
-                SearchConditionBuilder::create($this->getFieldSet())
-                    ->field('status')
-                        ->addSimpleValue(1)
-                        ->addSimpleValue(2)
-                    ->end()
-                ->getSearchCondition()
-                ->getValuesGroup()
-            )
-        );
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((I.status = :search_0 OR I.status = :search_1))) AND (((C.id = :search_2 OR C.id = :search_3)))'
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function empty_query_with_prepend_and_primary_cond(): void
-    {
-        $condition = SearchConditionBuilder::create($this->getFieldSet())
-            ->field('id2')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $condition->setPrimaryCondition(
-            new SearchPrimaryCondition(
-                SearchConditionBuilder::create($this->getFieldSet())
-                    ->field('status')
-                        ->addSimpleValue(1)
-                        ->addSimpleValue(2)
-                    ->end()
-                ->getSearchCondition()
-                ->getValuesGroup()
-            )
-        );
-
-        $conditionGenerator = $this->getConditionGenerator($condition);
-
-        $this->assertDqlCompiles(
-            $conditionGenerator,
-            'WHERE (((I.status = :search_0 OR I.status = :search_1)))'
-        );
-    }
-
-    private function assertDqlCompiles(ConditionGenerator $conditionGenerator, string $expectedDql, string $expectedSql = '', ?array $parameters = null): void
-    {
-        $qb = $conditionGenerator->getQueryBuilder();
-        $mainDql = $qb->getDQL();
-
-        $conditionGenerator->apply();
-
-        $expectedDql = $mainDql . ($expectedDql ? ' ' : '') . $expectedDql;
-        $expectedDql = preg_replace('/\s+/', ' ', mb_trim($expectedDql));
-        $actualDql = preg_replace('/\s+/', ' ', mb_trim($qb->getDQL()));
-
-        self::assertEquals($expectedDql, $actualDql);
-        self::assertQueryParametersEquals($parameters, $qb);
-
-        try {
-            $sql = $qb->getQuery()->getSQL();
-
-            if ($expectedSql !== '') {
-                $expectedSql = preg_replace('/\s+/', ' ', mb_trim($expectedSql));
-                $sql = preg_replace('/\s+/', ' ', mb_trim($sql));
-
-                self::assertEquals($expectedSql, $sql);
-            }
-        } catch (QueryException $e) {
-            self::fail('Compile error: ' . $e->getMessage() . ' with Query: ' . $qb->getDQL());
-        }
-    }
-}
diff --git a/lib/Doctrine/Orm/Tests/FieldConfigBuilderTest.php b/lib/Doctrine/Orm/Tests/FieldConfigBuilderTest.php
deleted file mode 100644
index 3f443088..00000000
--- a/lib/Doctrine/Orm/Tests/FieldConfigBuilderTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Orm;
-
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use PHPUnit\Framework\TestCase;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Prophecy\Prophecy\ObjectProphecy;
-use Rollerworks\Component\Search\Doctrine\Orm\FieldConfigBuilder;
-use Rollerworks\Component\Search\Doctrine\Orm\OrmQueryField as QueryField;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\Searches;
-use Rollerworks\Component\Search\SearchFactory;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceCustomer;
-use Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity\ECommerceInvoice;
-
-/**
- * @internal
- */
-final class FieldConfigBuilderTest extends TestCase
-{
-    use ProphecyTrait;
-
-    private SearchFactory $searchFactory;
-    private ObjectProphecy $em;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->searchFactory = Searches::createSearchFactoryBuilder()->getSearchFactory();
-        $this->em = $this->prophesize(EntityManagerInterface::class);
-    }
-
-    private function getFieldSet($build = true)
-    {
-        $fieldSet = $this->searchFactory->createFieldSetBuilder();
-
-        $fieldSet->add('id', IntegerType::class);
-        $fieldSet->add('credit_parent', IntegerType::class);
-
-        $fieldSet->add('customer', IntegerType::class);
-        $fieldSet->add('customer_name', TextType::class);
-
-        return $build ? $fieldSet->getFieldSet('invoice') : $fieldSet;
-    }
-
-    /**
-     * @param array<string, array{type: string}|array{join: array{class: string, column: string, property: string, type: string}}|array{join_multi: true}> $fields
-     */
-    private function expectClassMetadata(string $entityClass, array $fields): void
-    {
-        $classMetadata = $this->prophesize(ClassMetadata::class);
-        $classMetadata->getName()->willReturn($entityClass);
-
-        foreach ($fields as $property => $field) {
-            if (isset($field['join'])) {
-                $classMetadata->isAssociationWithSingleJoinColumn($property)->willReturn(true);
-                $classMetadata->hasAssociation($property)->willReturn(true);
-                $classMetadata->getTypeOfField($property)->willReturn(null);
-                $classMetadata->getAssociationTargetClass($property)->willReturn($field['join']['class']);
-                $classMetadata->getSingleAssociationReferencedJoinColumnName($property)->willReturn($field['join']['column']);
-
-                $joinClassMetadata = $this->prophesize(ClassMetadata::class);
-                $joinClassMetadata->getName()->willReturn($field['join']['class']);
-                $joinClassMetadata->getFieldForColumn($field['join']['column'])->willReturn($field['join']['property']);
-                $joinClassMetadata->getTypeOfField($field['join']['property'])->willReturn($field['join']['type']);
-
-                $this->em->getClassMetadata($field['join']['class'])->willReturn($joinClassMetadata->reveal());
-            } elseif (isset($field['join_multi'])) {
-                $classMetadata->isAssociationWithSingleJoinColumn($property)->willReturn(false);
-                $classMetadata->hasAssociation($property)->willReturn(true);
-                $classMetadata->getTypeOfField($property)->willReturn(null);
-            } else {
-                $classMetadata->isAssociationWithSingleJoinColumn($property)->willReturn(false);
-                $classMetadata->hasAssociation($property)->willReturn(false);
-                $classMetadata->getTypeOfField($property)->willReturn($field['type']);
-            }
-        }
-
-        $this->em->getClassMetadata($entityClass)->willReturn($classMetadata->reveal());
-    }
-
-    /**
-     * @test
-     */
-    public function resolve_with_default_entity(): void
-    {
-        $this->expectClassMetadata(ECommerceInvoice::class, [
-            'id' => ['type' => 'integer'],
-            'parent' => ['type' => 'integer'],
-        ]);
-
-        $this->expectClassMetadata(ECommerceCustomer::class, [
-            'id' => ['type' => 'integer'],
-            'first_name' => ['type' => 'string'],
-            'last_name' => ['type' => 'string'],
-        ]);
-
-        $fieldConfigBuilder = new FieldConfigBuilder($this->em->reveal(), $fieldSet = $this->getFieldSet());
-
-        $fieldConfigBuilder->setDefaultEntity(ECommerceInvoice::class, 'I');
-        $fieldConfigBuilder->setField('id', 'id', null, null, 'smallint');
-        $fieldConfigBuilder->setField('credit_parent#0', 'parent');
-
-        $fieldConfigBuilder->setDefaultEntity(ECommerceCustomer::class, 'C');
-        $fieldConfigBuilder->setField('customer', 'id');
-        $fieldConfigBuilder->setField('customer_name#first_name', 'first_name');
-        $fieldConfigBuilder->setField('customer_name#last_name', 'last_name');
-
-        $fields = $fieldConfigBuilder->getFields();
-
-        // Invoice
-        self::assertEquals(new QueryField('id', $fieldSet->get('id'), 'smallint', 'id', 'I', ECommerceInvoice::class), $fields['id']['']);
-        self::assertEquals(new QueryField('credit_parent#0', $fieldSet->get('credit_parent'), 'integer', 'parent', 'I', ECommerceInvoice::class), $fields['credit_parent']['0']);
-
-        // Customer
-        self::assertEquals(new QueryField('customer', $fieldSet->get('customer'), 'integer', 'id', 'C', ECommerceCustomer::class), $fields['customer']['']);
-        self::assertEquals(new QueryField('customer_name#first_name', $fieldSet->get('customer_name'), 'string', 'first_name', 'C', ECommerceCustomer::class), $fields['customer_name']['first_name']);
-        self::assertEquals(new QueryField('customer_name#last_name', $fieldSet->get('customer_name'), 'string', 'last_name', 'C', ECommerceCustomer::class), $fields['customer_name']['last_name']);
-    }
-
-    /**
-     * @test
-     */
-    public function resolve_with_full_field_mapping(): void
-    {
-        $this->expectClassMetadata(ECommerceInvoice::class, [
-            'id' => ['type' => 'integer'],
-            'parent' => ['type' => 'integer'],
-            'invoice_id' => ['type' => 'integer'],
-            'parent_id' => ['type' => 'integer'],
-        ]);
-
-        $this->expectClassMetadata(ECommerceCustomer::class, [
-            'id' => ['type' => 'integer'],
-            'first_name' => ['type' => 'string'],
-            'last_name' => ['type' => 'string'],
-        ]);
-
-        $fieldConfigBuilder = new FieldConfigBuilder($this->em->reveal(), $fieldSet = $this->getFieldSet());
-        $fieldConfigBuilder->setField('id', 'id', 'I', ECommerceInvoice::class, 'smallint');
-        $fieldConfigBuilder->setField('credit_parent#0', 'parent', 'I', ECommerceInvoice::class);
-
-        $fields = $fieldConfigBuilder->getFields();
-
-        // Invoice
-        self::assertEquals(new QueryField('id', $fieldSet->get('id'), 'smallint', 'id', 'I', ECommerceInvoice::class), $fields['id']['']);
-        self::assertEquals(new QueryField('credit_parent#0', $fieldSet->get('credit_parent'), 'integer', 'parent', 'I', ECommerceInvoice::class), $fields['credit_parent']['0']);
-    }
-
-    /**
-     * @test
-     */
-    public function fails_to_resolve_with_join_association(): void
-    {
-        $this->expectClassMetadata(
-            ECommerceInvoice::class,
-            [
-                'id' => ['type' => 'integer'],
-                'parent' => [
-                    'join' => [
-                        'class' => ECommerceInvoice::class,
-                        'property' => 'id',
-                        'type' => 'integer',
-                        'column' => 'invoice_id',
-                    ],
-                ],
-                'parent_id' => ['type' => 'integer'],
-            ]
-        );
-
-        $this->expectClassMetadata(ECommerceCustomer::class, [
-            'id' => ['type' => 'integer'],
-            'name' => ['type' => 'string'],
-        ]);
-
-        $fieldConfigBuilder = new FieldConfigBuilder($this->em->reveal(), $this->getFieldSet());
-
-        $fieldConfigBuilder->setDefaultEntity(ECommerceInvoice::class, 'I');
-        $fieldConfigBuilder->setField('id', 'id', null, null, 'smallint');
-
-        $this->expectException('RuntimeException');
-        $this->expectExceptionMessage('Entity field "' . ECommerceInvoice::class . '"#parent is a JOIN association');
-
-        $fieldConfigBuilder->setField('credit_parent', 'parent', 'I', null, 'parent_id');
-    }
-
-    /**
-     * @test
-     */
-    public function fails_when_no_entity_is_provided(): void
-    {
-        $fieldConfigBuilder = new FieldConfigBuilder($this->em->reveal(), $this->getFieldSet());
-
-        $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessage('No default entity is set, either provide the entity or set a default entity first.');
-
-        $fieldConfigBuilder->setField('id', 'id');
-    }
-
-    /**
-     * @test
-     */
-    public function fails_when_ordering_with_multi_mapping(): void
-    {
-        $this->getFieldSet(false)
-            ->add('@id', OrderFieldType::class)
-            ->getFieldSet('invoice');
-
-        $fieldConfigBuilder = new FieldConfigBuilder($this->em->reveal(), $this->getFieldSet());
-
-        $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessage('Ordering field "@id" cannot be registered with multiple mapping.');
-
-        $fieldConfigBuilder->setField('@id#1', 'id', 'I', 'Invoice');
-    }
-
-    /**
-     * @test
-     */
-    public function fails_to_resolve_with_multi_column_join_association(): void
-    {
-        $this->expectClassMetadata(
-            ECommerceInvoice::class,
-            [
-                'id' => ['type' => 'integer'],
-                'parent' => [
-                    'join_multi' => true,
-                ],
-            ]
-        );
-
-        $this->expectClassMetadata(ECommerceCustomer::class, [
-            'id' => ['type' => 'integer'],
-            'name' => ['type' => 'string'],
-        ]);
-
-        $fieldConfigBuilder = new FieldConfigBuilder($this->em->reveal(), $this->getFieldSet());
-        $fieldConfigBuilder->setField('id', 'id', 'I', ECommerceInvoice::class, 'smallint');
-
-        $this->expectException('RuntimeException');
-        $this->expectExceptionMessage('Entity field "' . ECommerceInvoice::class . '"#parent is a JOIN association');
-
-        $fieldConfigBuilder->setField('credit_parent#0', 'parent', 'I', ECommerceInvoice::class);
-    }
-}
diff --git a/lib/Doctrine/Orm/Tests/Fixtures/Entity/ECommerceCustomer.php b/lib/Doctrine/Orm/Tests/Fixtures/Entity/ECommerceCustomer.php
deleted file mode 100644
index 8b360ef1..00000000
--- a/lib/Doctrine/Orm/Tests/Fixtures/Entity/ECommerceCustomer.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-#[ORM\Entity]
-#[ORM\Table(name: 'customers', options: ['collation' => 'utf8_bin'])]
-class ECommerceCustomer
-{
-    #[ORM\Id]
-    #[ORM\Column(type: 'integer')]
-    #[ORM\GeneratedValue(strategy: 'AUTO')]
-    public $id;
-
-    #[ORM\Column(name: 'first_name', type: 'string')]
-    public $firstName;
-
-    #[ORM\Column(name: 'last_name', type: 'string')]
-    public $lastName;
-
-    #[ORM\Column(type: 'date_immutable')]
-    public $birthday;
-
-    #[ORM\Column(type: 'datetime_immutable')]
-    public $regdate;
-}
diff --git a/lib/Doctrine/Orm/Tests/Fixtures/Entity/ECommerceInvoice.php b/lib/Doctrine/Orm/Tests/Fixtures/Entity/ECommerceInvoice.php
deleted file mode 100644
index fceb9abc..00000000
--- a/lib/Doctrine/Orm/Tests/Fixtures/Entity/ECommerceInvoice.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-#[ORM\Entity]
-#[ORM\Table(name: 'invoices', options: ['collation' => 'utf8_bin'])]
-class ECommerceInvoice
-{
-    #[ORM\Id]
-    #[ORM\Column(name: 'invoice_id', type: 'integer')]
-    #[ORM\GeneratedValue(strategy: 'AUTO')]
-    public $id;
-
-    #[ORM\Column(type: 'string', unique: true, nullable: true)]
-    public $label;
-
-    #[ORM\Column(name: 'pubdate', type: 'datetime_immutable', nullable: true)]
-    public $date;
-
-    #[ORM\ManyToOne(targetEntity: 'ECommerceCustomer')]
-    #[ORM\JoinColumn(name: 'customer', referencedColumnName: 'id')]
-    public $customer;
-
-    #[ORM\Column(type: 'integer')]
-    public $status;
-
-    #[ORM\Column(name: 'price_total', type: 'decimal', precision: 10, scale: 2)]
-    public $total;
-
-    #[ORM\OneToMany(mappedBy: 'invoice', targetEntity: 'ECommerceInvoiceRow', cascade: ['persist'])]
-    public $rows;
-
-    #[ORM\ManyToOne(targetEntity: 'ECommerceInvoice', inversedBy: 'children')]
-    #[ORM\JoinColumn(name: 'parent_id', referencedColumnName: 'invoice_id')]
-    public $parent;
-
-    #[ORM\OneToMany(mappedBy: 'parent', targetEntity: 'ECommerceInvoice')]
-    public $children;
-}
diff --git a/lib/Doctrine/Orm/Tests/Fixtures/Entity/ECommerceInvoiceRow.php b/lib/Doctrine/Orm/Tests/Fixtures/Entity/ECommerceInvoiceRow.php
deleted file mode 100644
index aa9d3bfe..00000000
--- a/lib/Doctrine/Orm/Tests/Fixtures/Entity/ECommerceInvoiceRow.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Orm\Fixtures\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-#[ORM\Entity]
-#[ORM\Table(name: 'invoice_rows', options: ['collation' => 'utf8_bin'])]
-class ECommerceInvoiceRow
-{
-    #[ORM\Id]
-    #[ORM\Column(type: 'integer')]
-    #[ORM\GeneratedValue(strategy: 'AUTO')]
-    public $id;
-
-    #[ORM\ManyToOne(targetEntity: 'ECommerceInvoice', inversedBy: 'rows')]
-    #[ORM\JoinColumn(name: 'invoice', referencedColumnName: 'invoice_id')]
-    public $invoice;
-
-    #[ORM\Column(type: 'string')]
-    public $label;
-
-    #[ORM\Column(type: 'integer')]
-    public $quantity;
-
-    #[ORM\Column(name: 'price', type: 'decimal', precision: 10, scale: 2)]
-    public $price;
-
-    #[ORM\Column(name: 'total', type: 'decimal', precision: 10, scale: 2)]
-    public $total;
-}
diff --git a/lib/Doctrine/Orm/Tests/Fixtures/GetCustomerTypeFunction.php b/lib/Doctrine/Orm/Tests/Fixtures/GetCustomerTypeFunction.php
deleted file mode 100644
index 41d80b20..00000000
--- a/lib/Doctrine/Orm/Tests/Fixtures/GetCustomerTypeFunction.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm\Tests\Fixtures;
-
-use Doctrine\ORM\Query\AST\Functions\FunctionNode;
-use Doctrine\ORM\Query\AST\Node;
-use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\SqlWalker;
-use Doctrine\ORM\Query\TokenType;
-
-final class GetCustomerTypeFunction extends FunctionNode
-{
-    public Node $stringPrimary;
-
-    public function getSql(SqlWalker $sqlWalker): string
-    {
-        $expression = $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary);
-
-        return sprintf('get_customer_type(%s)', $expression);
-    }
-
-    public function parse(Parser $parser): void
-    {
-        $parser->match(TokenType::T_IDENTIFIER);
-        $parser->match(TokenType::T_OPEN_PARENTHESIS);
-
-        $this->stringPrimary = $parser->StringPrimary();
-
-        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
-    }
-}
diff --git a/lib/Doctrine/Orm/Tests/OrmTestCase.php b/lib/Doctrine/Orm/Tests/OrmTestCase.php
deleted file mode 100644
index ce3ddace..00000000
--- a/lib/Doctrine/Orm/Tests/OrmTestCase.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Doctrine\Orm;
-
-use Doctrine\DBAL\Types\Type;
-use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\ORMSetup;
-use Doctrine\ORM\Query\Parameter;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\Tools\SchemaTool;
-use PHPUnit\Framework\AssertionFailedError;
-use PHPUnit\Framework\Exception;
-use Psr\SimpleCache\CacheInterface;
-use Rollerworks\Component\Search\Doctrine\Dbal\Tests\DbalExtensions\Connection;
-use Rollerworks\Component\Search\Doctrine\Dbal\Tests\TestUtil;
-use Rollerworks\Component\Search\Doctrine\Orm\DoctrineOrmFactory;
-use Rollerworks\Component\Search\Doctrine\Orm\DqlConditionGenerator;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\AgeFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\CastFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\CastIntervalFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\CountChildrenFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\MoneyCastFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\FieldConfigBuilder;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\BirthdayTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\ChildCountType;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\DateTimeTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\FieldTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\MoneyTypeExtension;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\DbalTestCase;
-use Rollerworks\Component\Search\Tests\Doctrine\Dbal\SchemaRecord;
-
-abstract class OrmTestCase extends DbalTestCase
-{
-    protected ?EntityManager $em;
-    protected Connection $conn;
-    private static ?Connection $sharedConn;
-    private static ?EntityManager $sharedEm;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        if (! isset(self::$sharedConn)) {
-            $config = ORMSetup::createAttributeMetadataConfiguration([__DIR__ . '/Fixtures/Entity'], true, null, null);
-
-            if (method_exists($config, 'enableNativeLazyObjects') && \PHP_VERSION_ID >= 80400) {
-                $config->enableNativeLazyObjects(true);
-            }
-
-            self::$sharedConn = TestUtil::getConnection();
-            self::$sharedEm = new EntityManager(self::$sharedConn, $config);
-
-            $emConfig = self::$sharedEm->getConfiguration();
-
-            $emConfig->addCustomStringFunction('SEARCH_CONVERSION_CAST', CastFunction::class);
-            $emConfig->addCustomNumericFunction('SEARCH_CONVERSION_AGE', AgeFunction::class);
-            $emConfig->addCustomNumericFunction('SEARCH_COUNT_CHILDREN', CountChildrenFunction::class);
-            $emConfig->addCustomNumericFunction('SEARCH_MONEY_AS_NUMERIC', MoneyCastFunction::class);
-            $emConfig->addCustomNumericFunction('SEARCH_CAST_INTERVAL', CastIntervalFunction::class);
-
-            $schemaTool = new SchemaTool(self::$sharedEm);
-            $schemaTool->dropDatabase();
-            $schemaTool->updateSchema(self::$sharedEm->getMetadataFactory()->getAllMetadata(), false);
-
-            $recordSets = $this->getDbRecords();
-
-            foreach ($recordSets as $set) {
-                $set->executeRecords(self::$sharedConn);
-            }
-        }
-
-        $this->conn = self::$sharedConn;
-        $this->em = self::$sharedEm;
-    }
-
-    protected static function resetSharedConn(): void
-    {
-        if (self::$sharedConn) {
-            self::$sharedConn->close();
-            self::$sharedConn = null;
-            self::$sharedEm = null;
-        }
-    }
-
-    public static function tearDownAfterClass(): void
-    {
-        // There are errors recorded so don't reset the connection.
-        if (\count(self::$sharedConn->queryLog->queries ?? []) > 0) {
-            return;
-        }
-
-        // Ensure the connection is reset between class-runs
-        self::resetSharedConn();
-    }
-
-    protected function getOrmFactory()
-    {
-        return new DoctrineOrmFactory($this->createMock(CacheInterface::class));
-    }
-
-    protected function getTypeExtensions(): array
-    {
-        return [
-            new BirthdayTypeExtension(),
-            new DateTimeTypeExtension(),
-            new ChildCountType(),
-            new FieldTypeExtension(),
-            new MoneyTypeExtension(),
-        ];
-    }
-
-    /**
-     * @return SchemaRecord[]
-     */
-    protected function getDbRecords()
-    {
-        return [];
-    }
-
-    /**
-     * Returns the QueryBuilder for the ConditionGenerator.
-     */
-    abstract protected function getQuery(): QueryBuilder;
-
-    /**
-     * Configure fields of the ConditionGenerator.
-     */
-    protected function configureConditionGenerator(FieldConfigBuilder $conditionGenerator): void
-    {
-    }
-
-    /**
-     * @param (int|string)[] $ids
-     *
-     * @throws \Doctrine\DBAL\Exception
-     */
-    protected function assertRecordsAreFound(SearchCondition $condition, array $ids, string $input): void
-    {
-        $qb = $this->getQuery();
-
-        $fieldsConfig = new FieldConfigBuilder($qb->getEntityManager(), $condition->getFieldSet());
-        $this->configureConditionGenerator($fieldsConfig);
-
-        $conditionGenerator = new DqlConditionGenerator($qb->getEntityManager(), $condition, $fieldsConfig);
-        $whereClause = $conditionGenerator->getWhereClause();
-
-        $primaryCondition = $condition->getPrimaryCondition();
-
-        if ($primaryCondition !== null) {
-            DqlConditionGenerator::applySortingTo($primaryCondition->getOrder(), $qb, $fieldsConfig);
-        }
-
-        DqlConditionGenerator::applySortingTo($condition->getOrder(), $qb, $fieldsConfig);
-
-        // The return order is undefined with MySQL so make it explicit here.
-        if (\count($qb->getDQLPart('orderBy')) === 0) {
-            $qb->orderBy($qb->getRootAliases()[0] . '.id', 'ASC');
-        }
-
-        if ($whereClause !== '') {
-            $qb->andWhere($whereClause);
-
-            foreach ($conditionGenerator->getParameters() as $name => [$value, $type]) {
-                $qb->setParameter($name, $value, $type);
-            }
-        }
-
-        $paramsString = '';
-        $platform = $this->conn->getDatabasePlatform();
-
-        foreach ($conditionGenerator->getParameters() as $name => [$value, $type]) {
-            $paramsString .= \sprintf("%s = '%s'\n", $name, $type === null ? (\is_scalar($value) ? (string) $value : get_debug_type($value)) : Type::getType($type)->convertToDatabaseValue($value, $platform));
-        }
-
-        $query = $qb->getQuery();
-        $rows = $query->getArrayResult();
-        $idRows = array_map(
-            static fn ($value): mixed => $value['id'],
-            $rows
-        );
-
-        self::assertSame(
-            $ids,
-            array_merge([], array_unique($idRows)),
-            \sprintf(
-                "With condition: `%s`\nFound these records instead: \n%s\nWith WHERE-clause: %s\nSQL: %s\nAnd params: %s",
-                $input,
-                print_r($rows, true),
-                $whereClause,
-                $query->getSQL(),
-                $paramsString
-            )
-        );
-    }
-
-    /**
-     * @param array<string, mixed>|null $parameters
-     */
-    protected static function assertQueryParametersEquals(?array $parameters, QueryBuilder $qb): void
-    {
-        if ($parameters === null) {
-            return;
-        }
-
-        $actualParameters = $qb->getParameters()->toArray();
-
-        if (\is_object(reset($actualParameters))) {
-            /** @var Parameter $parameter */
-            foreach ($actualParameters as $idx => $parameter) {
-                unset($actualParameters[$idx]);
-
-                $actualParameters[$parameter->getName()] = [$parameter->getValue(), $parameter->getType()];
-            }
-        }
-
-        self::assertEquals($parameters, $actualParameters);
-    }
-
-    protected function onNotSuccessfulTest(\Throwable $t): never
-    {
-        // Ignore deprecation warnings.
-        if ($t instanceof AssertionFailedError) {
-            throw $t;
-        }
-
-        $i = \count(self::$sharedConn->queryLog->queries ?? []);
-
-        if ($i) {
-            $queries = '';
-
-            foreach (array_reverse(self::$sharedConn->queryLog->queries) as $query) {
-                $params = array_map(
-                    static function ($p) {
-                        if (\is_object($p)) {
-                            return $p::class;
-                        }
-
-                        return "'" . var_export($p, true) . "'";
-                    },
-                    $query['params'] ?: []
-                );
-
-                $queries .= ($i + 1) . ". SQL: '" . $query['sql'] . "' Params: " . implode(', ', $params) . \PHP_EOL;
-                --$i;
-            }
-
-            $trace = $t->getTrace();
-            $traceMsg = '';
-
-            foreach ($trace as $part) {
-                if (isset($part['file'])) {
-                    if (mb_strpos($part['file'], 'PHPUnit/') !== false) {
-                        // Beginning with PHPUnit files we don't print the trace anymore.
-                        break;
-                    }
-
-                    $traceMsg .= $part['file'] . ':' . $part['line'] . \PHP_EOL;
-                }
-            }
-
-            $message =
-                '[' . $t::class . '] ' .
-                $t->getMessage() .
-                \PHP_EOL . \PHP_EOL .
-                'With queries:' . \PHP_EOL .
-                $queries . \PHP_EOL .
-                'Trace:' . \PHP_EOL .
-                $traceMsg;
-
-            throw new Exception($message, (int) $t->getCode(), $t instanceof \Exception ? $t : null);
-        }
-
-        throw $t;
-    }
-}
diff --git a/lib/Doctrine/Orm/UPGRADE-2.0.md b/lib/Doctrine/Orm/UPGRADE-2.0.md
deleted file mode 100644
index 8d97c62d..00000000
--- a/lib/Doctrine/Orm/UPGRADE-2.0.md
+++ /dev/null
@@ -1,95 +0,0 @@
-UPGRADE FROM 1.x to 2.0
-=======================
-
- * Support PHP 5 is dropped you need at least PHP 7.1
-
- * The Cache implementation now depends on PSR-16 (SimpleCache) instead
-   of the Doctrine Cache library.
- 
- * The `WhereBuilder` classes had been renamed to `ConditionGenerator`,
-   DqlConditionGenerator and NativeQueryConditionGenerator respectively.
-   
- * The WhereBuilderInterface has been renamed to ConditionGenerator.
- 
- * The CachedConditionGenerator (was CacheWhereBuilder) class no longer allows
-   configuring the cache key. The Cache key is now automatically computed 
-   based on the FieldSet (name), serialized root ValuesGroup and Field mappings
-   (except field options).
- 
- * Not setting a Cache implementation for the Factory will simple disable the cache
-   and will no longer throw an exception when creating a CachedConditionGenerator.
- 
- * All ConditionGenerators now strictly implement the same interface.
-   Meaning the CachedConditionGenerator can be used for configuring the decorated
-   ConditionGenerator.
-   
-## Mapping
-
- * The Metadata system has been removed, and therefor Fields must be
-   mapped explicitly to an Entity/Table and property/column.
-   
-   Before: 
-
-   ```php
-   $conditionGenerator->setEntityMapping('Acme\Entity\ECommerceInvoice', 'I');
-   ```
-
-   After:
-
-   ```php
-   $whereBuilder->setDefaultEntity(\Acme\Entity\ECommerceInvoice::class, 'I');
-   $whereBuilder->setField('id', 'id');
-   $whereBuilder->setField('label', 'label');
-   $whereBuilder->setField('pub-date', 'date');
-   $whereBuilder->setField('status', 'status');
-   $whereBuilder->setField('total', 'total');
-   ```
-   
-   **Note:** The setDefaultEntity only applies for fields set after the method call,
-   so you can use it multiple times without affecting already mapped fields.
-   
- * The prototype signature of setField changed to 
-   `setField(string $fieldName, string $property, string $alias = null, string $entity = null, string $dbType = null)`.
-
- * The `setField` method now allows configure secondary mappings for the same
-   field. This replaces the `setCombinedField` method.
-   
-   Before:
-
-   ```php
-   $conditionGenerator->setCombinedField('customer-name', [
-       ['column' => 'first_name', 'alias' => 'c'],
-       ['column' => 'last_name', 'alias' => 'c'],
-   ]);
-   ```
-
-   After:
-
-   ```php
-   $conditionGenerator->setField('customer-name#first_name', 'first_name', 'c');
-   $conditionGenerator->setField('customer-name#last_name', 'last_name', 'c');
-   ```
-   
-   The name of a mapping begins with the field-name as registered in the FieldSet,
-   followed by `#` and the name of the mapping (used for debugging).
-   
-   **Caution:** A field can only have multiple mappings or one, omitting `#` will remove
-   any existing mappings for that field. Registering the field without `#` first and then
-   setting multiple mappings for that field will reset the single mapping. 
-
- * The `setCombinedField` method has been removed.
- 
- * The `setField` method no longer accepts DBAL types as object, use a string for the
-   type instead.
-   
- * The mapping configuration no longer allows to reference a JOIN column for the
-   DQLConditionGenerator, the owning side of the Entity field must now be referenced instead.
-   
-   For the NativeQuery it is still possible but requires you provide the DBAL type explicitly.
-  
-## Conversions
-
- * Conversions can no longer be configured on a ConditionGenerator,
-   use the FieldType to configure a Conversion for the field.
-   
-   The `getFieldConversions` and `getValueConversions` methods have been removed.
diff --git a/lib/Doctrine/Orm/UPGRADE.md b/lib/Doctrine/Orm/UPGRADE.md
deleted file mode 100644
index 5a1dce60..00000000
--- a/lib/Doctrine/Orm/UPGRADE.md
+++ /dev/null
@@ -1,93 +0,0 @@
-UPGRADE
-=======
-
-## Upgrade FROM v1.1.0 to v1.2.0
- 
-The `doctrine_orm_entity_count` (`EntityCountType`) is removed as this
-type has been broken for a long time. 
-
-Instead you can use the `doctrine_dbal_child_count` type, which require
-manual configuration of the `table_name` and `table_column` for the child
-relation.
-
-## Upgrade FROM v1.0.0-beta2 to 1.0.0-beta3
-
-This beta release is compatible with RollerworksSearch v1.0.0-beta5
-and up. **You are highly recommended to upgrade as the old versions will
-not receive any updates!**
-
-Just like the RollerworksSearch package there has been some major
-refactoring to make the Doctrine ORM search-condition processor more
-robust and easier to use.
-
- * The Minimum version of the RollerworksSearch Doctrine DBAL extension
-   package is v1.0.0-beta7. See [UPGRADE Instructions of RollerworksSearch Doctrine DBAL extension][1]
-   for more details to update your conversions.
-    
- * The WhereBuilder query handing logic has been completely rewritten.
-   If you use the `DoctrineOrmFactory` your changes should be minimum.
-
- * Depending on whether you use `Doctrine\ORM\Query` (DQL) or `Doctrine\ORM\NativeQuery`
-   (NativeQuery) the returned WhereBuilder will differ. *Both implement the
-   same interface, but don't support all query objects.*
-   
-    * A DQL query will give you `Rollerworks\Component\Search\Doctrine\Orm\WhereBuilder`
-    * A NativeQuery will give you `Rollerworks\Component\Search\Doctrine\Orm\NativeWhereBuilder`
-   
-   The same is also done for the CacheWhereBuilder.
-   
-    * A DQL query will give you `Rollerworks\Component\Search\Doctrine\Orm\CacheWhereBuilder`
-    * A NativeQuery will give you `Rollerworks\Component\Search\Doctrine\Orm\CacheNativeWhereBuilder`
-  
- * Query parameters are completely removed, there were to much problems with
-   type-binding and conversion handling. In practice this means all the values
-   are safely embedded within in the generated query. As a bonus, it's also
-   faster. The *getParameters* method is used as an internal detail and
-   should not be called manually.
-  
-   Before:
-    
-   ```php
-     $whereBuilder->updateQuery(' WHERE ', true);
-   ```
-   
-   Or getting only the where-clause.
-     
-   ```php
-     $whereBuilder->getWhereClause(true);
-   ```
-    
-   After:
-   
-   ```php
-     $whereBuilder->updateQuery(' WHERE ');
-   ```
-   
-   Or getting only the where-clause.
-     
-   ```php
-     // first parameter will be prepended to the returned where-clause,
-     // only when there is a result.
-     $whereBuilder->getWhereClause();
-   ```
-   
- * Method `updateQuery` no longer remembers if the query is updated, calling
-   it will twice will update your query twice!
-   
- * Using `setField`, the property must be owned by the entity (not reference another entity).
-   If the entity field is used in a many-to-many relation you must to reference the
-   targetEntity that is set on the ManyToMany mapping and use the entity field of that entity.
-   
-   This was already required but was never validated.
-   
- * Fields with no model-mapping or using a model-class mapping that is not
-   mapped in the WhereBuilder are now silently ignored.
-   
- * Methods `getQueryHintName()` and `getQueryHintValue()` are only available
-   on the `Rollerworks\Component\Search\Doctrine\Orm\WhereBuilder` class.
-
-[1]: https://github.com/rollerworks/rollerworks-search-doctrine-dbal/blob/master/UPGRADE.md
-
-## Upgrade FROM v1.0.0-beta1 to 1.0.0-beta2
-
-No changes required.
diff --git a/lib/Doctrine/Orm/ValueConversion.php b/lib/Doctrine/Orm/ValueConversion.php
deleted file mode 100644
index 1c278a84..00000000
--- a/lib/Doctrine/Orm/ValueConversion.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Doctrine\Orm;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\ConversionHints;
-
-/**
- * A ValueConversion allows to convert the value "model" to a valid
- * DQL statement to be used a column value.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-interface ValueConversion
-{
-    /**
-     * Returns the converted value as an DQL statement.
-     *
-     * The returned result must a be a valid DQL statement that can be used
-     * as a column's value.
-     *
-     * When using custom functions these need to be registered before usage.
-     *
-     * Used values must be registered as parameters using `$hints->createParamReferenceFor($value)`
-     * with an option DBAL Type as second argument (converted afterwards).
-     *
-     * @param mixed                $value   The "model" value format
-     * @param array<string, mixed> $options Options of the Field configuration
-     * @param ConversionHints      $hints   Special information for the conversion process
-     */
-    public function convertValue($value, array $options, ConversionHints $hints): string;
-}
diff --git a/lib/Doctrine/Orm/composer.json b/lib/Doctrine/Orm/composer.json
deleted file mode 100644
index 4cd1705b..00000000
--- a/lib/Doctrine/Orm/composer.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "name": "rollerworks/search-doctrine-orm",
-    "description": "Doctrine ORM extension for RollerworksSearch",
-    "license": "MIT",
-    "type": "library",
-    "keywords": [
-        "rollerworks",
-        "search",
-        "doctrine",
-        "orm"
-    ],
-    "authors": [
-        {
-            "name": "Sebastiaan Stok",
-            "email": "s.stok@rollercapes.net"
-        },
-        {
-            "name": "Community contributions",
-            "homepage": "https://github.com/Rollerworks/rollerworks-search-doctrine-orm/contributors"
-        }
-    ],
-    "require": {
-        "php": "^8.1",
-        "doctrine/orm": "^2.7.3 || ^3.3",
-        "rollerworks/search": "^2.0",
-        "rollerworks/search-doctrine-dbal": ">=2.0.0-BETA9 ^2.0@dev"
-    },
-    "require-dev": {
-        "moneyphp/money": "^3.2.0 || ^4.0",
-        "phpunit/phpunit": "^10.5",
-        "symfony/phpunit-bridge": "^6.4 || ^7.4 || ^8.0",
-        "symfony/var-dumper": "^6.4 || ^7.4 || ^8.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\Doctrine\\Orm\\": "",
-            "Rollerworks\\Component\\Search\\Extension\\Doctrine\\Orm\\": "Extension/"
-        },
-        "exclude-from-classmap": [
-            "Tests/"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\Tests\\Doctrine\\Dbal\\": "vendor/rollerworks/search-doctrine-dbal/tests/",
-            "Rollerworks\\Component\\Search\\Tests\\Doctrine\\Orm\\": "Tests/"
-        }
-    },
-    "config": {
-        "preferred-install": {
-            "rollerworks/search-doctrine-dbal": "source",
-            "*": "dist"
-        },
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.0-dev"
-        }
-    }
-}
diff --git a/lib/Doctrine/Orm/mysql.travis.xml b/lib/Doctrine/Orm/mysql.travis.xml
deleted file mode 100644
index eacde39e..00000000
--- a/lib/Doctrine/Orm/mysql.travis.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
->
-
-    <php>
-        <var name="db_type" value="pdo_mysql"/>
-        <var name="db_host" value="127.0.0.1"/>
-        <var name="db_username" value="root"/>
-        <var name="db_password" value="my-secret-pw"/>
-        <var name="db_name" value="search_tests"/>
-        <var name="db_port" value="6603"/>
-
-        <!-- These parameters are not really used, but they are need for the Doctrine TestUtil -->
-        <var name="tmpdb_type" value="pdo_mysql"/>
-        <var name="tmpdb_host" value="127.0.0.1"/>
-        <var name="tmpdb_username" value="root"/>
-        <var name="tmpdb_password" value="my-secret-pw"/>
-        <var name="tmpdb_port" value="6603"/>
-
-
-        <ini name="error_reporting" value="-1"/>
-        <ini name="date.timezone" value="UTC"/>
-        <ini name="intl.default_locale" value="en"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="memory_limit" value="-1"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="RollerworksSearch Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-            <exclude>
-                <directory>./vendor/</directory>
-                <directory>./tests/</directory>
-                <directory>./doc/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/lib/Doctrine/Orm/phpunit.xml.dist b/lib/Doctrine/Orm/phpunit.xml.dist
deleted file mode 100644
index 088713d7..00000000
--- a/lib/Doctrine/Orm/phpunit.xml.dist
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
->
-    <testsuites>
-        <testsuite name="RollerworksSearch Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-            <exclude>
-                <directory>./vendor/</directory>
-                <directory>./tests/</directory>
-                <directory>./doc/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <php>
-        <ini name="error_reporting" value="-1"/>
-        <ini name="date.timezone" value="UTC"/>
-        <ini name="intl.default_locale" value="en"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="memory_limit" value="-1"/>
-    </php>
-
-</phpunit>
diff --git a/lib/Elasticsearch/.gitattributes b/lib/Elasticsearch/.gitattributes
deleted file mode 100644
index fbd8056d..00000000
--- a/lib/Elasticsearch/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-/Tests/ export-ignore
-/phpunit.xml.dist export-ignore
-.git* export-ignore
diff --git a/lib/Elasticsearch/.gitignore b/lib/Elasticsearch/.gitignore
deleted file mode 100644
index 207f97e0..00000000
--- a/lib/Elasticsearch/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/vendor/
-/composer.lock
-/phpunit.xml
diff --git a/lib/Elasticsearch/CachedConditionGenerator.php b/lib/Elasticsearch/CachedConditionGenerator.php
deleted file mode 100644
index ac96bded..00000000
--- a/lib/Elasticsearch/CachedConditionGenerator.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch;
-
-use Elastica\Query;
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\SearchCondition;
-
-/**
- * @final
- */
-class CachedConditionGenerator implements ConditionGenerator
-{
-    private ?string $cacheKey = null;
-    private ?Query $query = null;
-
-    /**
-     * @param ConditionGenerator     $conditionGenerator The actual ConditionGenerator to use when no cache exists
-     * @param Cache                  $cacheDriver        PSR-16 SimpleCache instance. Use a custom pool to ease
-     *                                                   purging invalidated items
-     * @param \DateInterval|int|null $ttl                Optional. The TTL value of this item. If no value is sent and
-     *                                                   the driver supports TTL then the library may set a default value
-     *                                                   for it or let the driver take care of that.
-     */
-    public function __construct(
-        private readonly ConditionGenerator $conditionGenerator,
-        private readonly Cache $cacheDriver,
-        private \DateInterval | int | null $ttl = 0,
-    ) {
-    }
-
-    public function registerField(string $fieldName, string $mapping, array $conditions = [], array $options = [])
-    {
-        $this->conditionGenerator->registerField($fieldName, $mapping, $conditions, $options);
-
-        return $this;
-    }
-
-    public function getQuery(): Query
-    {
-        if ($this->query === null) {
-            $cacheKey = $this->getCacheKey('query');
-
-            if ($this->cacheDriver->has($cacheKey)) {
-                $this->query = $this->cacheDriver->get($cacheKey);
-            } else {
-                $this->query = $this->conditionGenerator->getQuery();
-                $this->cacheDriver->set($cacheKey, $this->query, $this->ttl);
-            }
-        }
-
-        return $this->query;
-    }
-
-    public function getMappings(): array
-    {
-        return $this->conditionGenerator->getMappings();
-    }
-
-    public function getSearchCondition(): SearchCondition
-    {
-        return $this->conditionGenerator->getSearchCondition();
-    }
-
-    /**
-     * @param string $type "query" or "mappings"
-     */
-    private function getCacheKey(string $type): string
-    {
-        if ($this->cacheKey === null) {
-            $searchCondition = $this->getSearchCondition();
-            $this->cacheKey = hash(
-                'sha256',
-                $searchCondition->getFieldSet()->getSetName() .
-                "\n" .
-                serialize($searchCondition->getValuesGroup()) .
-                "\n" .
-                serialize($this->conditionGenerator->getMappings()) .
-                "\n" .
-                $type
-            );
-        }
-
-        return $this->cacheKey;
-    }
-}
diff --git a/lib/Elasticsearch/ChildOrderConversion.php b/lib/Elasticsearch/ChildOrderConversion.php
deleted file mode 100644
index 5a038a98..00000000
--- a/lib/Elasticsearch/ChildOrderConversion.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch;
-
-/**
- * The ChildOrderConversion converts a has_child QueryScript
- * to an usable format, for example dates are not natively
- * supported for sorting, and need to be converted milliseconds.
- *
- * Caution: This must not be combined with other Elasticsearch conversions.
- */
-interface ChildOrderConversion
-{
-    /**
-     * Returns the query-script in transformed format.
-     *
-     * @param string $script either doc["field-name"].value
-     *
-     * @return string either doc["field-name"].value.millis
-     */
-    public function convert(string $property, string $script): string;
-}
diff --git a/lib/Elasticsearch/ConditionGenerator.php b/lib/Elasticsearch/ConditionGenerator.php
deleted file mode 100644
index 1a3c94d9..00000000
--- a/lib/Elasticsearch/ConditionGenerator.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch;
-
-use Elastica\Query;
-use Rollerworks\Component\Search\SearchCondition;
-
-/**
- * ConditionGenerator.
- *
- * Sample usage with Elastica:
- *
- * ```
- * <?php
- * $search = new \Elastica\Search();
- *
- * // TODO: properly create a search condition here
- * $searchCondition = \Rollerworks\Component\SearchSearchCondition();
- *
- * $generator = Rollerworks\Component\Search\Elasticsearch\QueryConditionGenerator($searchCondition);
- * $generator
- *     ->registerField('fieldset-alias', '/elasticsearch-index/elasticsearch-type#elasticsearch.property');
- *
- * $mappings = $generator->getMappings();
- * foreach ($mappings as $mapping) {
- *     $search
- *         ->addIndex($mapping->indexName)
- *         ->addType($mapping->typeName);
- * }
- *
- * $query = $generator->getQuery();
- * $results = $search->search($query);
- * ```
- */
-interface ConditionGenerator
-{
-    /**
-     * Supported Elasticsearch property mapping formats:
-     *     - <property>
-     *     - <sub.property>
-     *     - <nested[].property>
-     *     - <sub.nested[].property>
-     *     - <index>#<property>
-     *     - <index>#<nested[].property>
-     *     - <index>#<sub.nested[].property>
-     *     - <index>/<type>#<property>
-     *     - <index>/<type>#<sub.nested[].property>
-     * with object dot-notation and [] indicating nested objects.
-     *
-     * See references for objects and nested objects.
-     *
-     * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/object.html
-     * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/nested.html
-     * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-nested-query.html
-     *
-     * @param string $fieldName  Field set name
-     * @param string $mapping    Elasticsearch property mapping
-     * @param array  $conditions Additional conditions to apply if this mapping is used
-     * @param array  $options    Additional options to send directly to Elasticsearch
-     *
-     * @return static
-     */
-    public function registerField(string $fieldName, string $mapping, array $conditions = [], array $options = []);
-
-    /**
-     * Return a valid Elastica\Query search query. Query can be sent to a _search endpoint as is.
-     */
-    public function getQuery(): Query;
-
-    /**
-     * Return mappings actually used in the query. It allows to restrict the query on specific indices/types.
-     *
-     * @return FieldMapping[]
-     */
-    public function getMappings(): array;
-
-    /**
-     * Returns the assigned SearchCondition.
-     *
-     * @internal
-     */
-    public function getSearchCondition(): SearchCondition;
-}
diff --git a/lib/Elasticsearch/ElasticsearchFactory.php b/lib/Elasticsearch/ElasticsearchFactory.php
deleted file mode 100644
index 3d3675f2..00000000
--- a/lib/Elasticsearch/ElasticsearchFactory.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch;
-
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\ParameterBag;
-use Rollerworks\Component\Search\SearchCondition;
-
-class ElasticsearchFactory
-{
-    public function __construct(
-        private readonly ?Cache $cacheDriver = null,
-        private readonly ?ParameterBag $parameterBag = null,
-    ) {
-    }
-
-    /**
-     * Creates a new QueryConditionGenerator for the SearchCondition.
-     *
-     * Conversions are applied using the 'doctrine_dbal_conversion' option.
-     *
-     * @param SearchCondition $searchCondition SearchCondition
-     */
-    public function createConditionGenerator(SearchCondition $searchCondition): ConditionGenerator
-    {
-        return new QueryConditionGenerator($searchCondition, $this->parameterBag);
-    }
-
-    /**
-     * Creates a new CachedConditionGenerator instance for the given ConditionGenerator.
-     *
-     * @param \DateInterval|int|null $ttl Optional. The TTL value of this item. If no value is sent and
-     *                                    the driver supports TTL then the library may set a default value
-     *                                    for it or let the driver take care of that.
-     */
-    public function createCachedConditionGenerator(ConditionGenerator $conditionGenerator, $ttl = 0): ConditionGenerator
-    {
-        if ($this->cacheDriver === null) {
-            return $conditionGenerator;
-        }
-
-        return new CachedConditionGenerator($conditionGenerator, $this->cacheDriver, $ttl);
-    }
-}
diff --git a/lib/Elasticsearch/Extension/Conversion/CurrencyConversion.php b/lib/Elasticsearch/Extension/Conversion/CurrencyConversion.php
deleted file mode 100644
index 743f6d17..00000000
--- a/lib/Elasticsearch/Extension/Conversion/CurrencyConversion.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension\Conversion;
-
-use Rollerworks\Component\Search\Elasticsearch\ValueConversion;
-use Rollerworks\Component\Search\Extension\Core\Model\MoneyValue;
-
-class CurrencyConversion implements ValueConversion
-{
-    /**
-     * Returns the converted value as a valid Elasticsearch value.
-     *
-     * @param MoneyValue $value
-     */
-    public function convertValue($value): string
-    {
-        return $value->value->getAmount();
-    }
-}
diff --git a/lib/Elasticsearch/Extension/Conversion/DateChildOrderConversion.php b/lib/Elasticsearch/Extension/Conversion/DateChildOrderConversion.php
deleted file mode 100644
index 89182403..00000000
--- a/lib/Elasticsearch/Extension/Conversion/DateChildOrderConversion.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension\Conversion;
-
-use Rollerworks\Component\Search\Elasticsearch\ChildOrderConversion;
-
-final class DateChildOrderConversion implements ChildOrderConversion
-{
-    public function convert(string $property, string $script): string
-    {
-        return \sprintf('%s.millis', $script);
-    }
-}
diff --git a/lib/Elasticsearch/Extension/Conversion/DateConversion.php b/lib/Elasticsearch/Extension/Conversion/DateConversion.php
deleted file mode 100644
index b89c4b7b..00000000
--- a/lib/Elasticsearch/Extension/Conversion/DateConversion.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension\Conversion;
-
-use Rollerworks\Component\Search\Elasticsearch\QueryConditionGenerator as Generator;
-use Rollerworks\Component\Search\Elasticsearch\QueryConversion;
-use Rollerworks\Component\Search\Elasticsearch\QueryPreparationHints;
-use Rollerworks\Component\Search\Elasticsearch\ValueConversion;
-use Rollerworks\Component\Search\Exception\TransformationFailedException;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\BaseDateTimeTransformer;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToStringTransformer;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\Range;
-
-class DateConversion implements ValueConversion, QueryConversion
-{
-    protected BaseDateTimeTransformer $transformer;
-
-    public function __construct()
-    {
-        $this->transformer = new DateTimeToStringTransformer(null, 'UTC', 'Y-m-d');
-    }
-
-    /**
-     * @throws TransformationFailedException
-     */
-    public function convertValue($value): string
-    {
-        return $this->transformer->transform($value);
-    }
-
-    public function convertQuery(string $propertyName, $value, QueryPreparationHints $hints): ?array
-    {
-        if (! \is_array($value) && ! $value instanceof Range && ! $value instanceof Compare) {
-            return $this->generateDateRange($propertyName, new Range($value, $value));
-        }
-
-        $query = [];
-
-        switch ($hints->context) {
-            case QueryPreparationHints::CONTEXT_RANGE_VALUES:
-            case QueryPreparationHints::CONTEXT_EXCLUDED_RANGE_VALUES:
-                // already a Range
-                /** @var Range $value */
-                $query = [Generator::QUERY_RANGE => [$propertyName => Generator::generateRangeParams($value)]];
-
-                break;
-
-            case QueryPreparationHints::CONTEXT_COMPARISON:
-                /** @var Compare $value */
-                $operator = Generator::translateComparison($value->getOperator());
-                $query = [
-                    Generator::QUERY_RANGE => [$propertyName => [$operator => $value->getValue()]],
-                ];
-
-                break;
-
-            default:
-            case QueryPreparationHints::CONTEXT_SIMPLE_VALUES:
-            case QueryPreparationHints::CONTEXT_EXCLUDED_SIMPLE_VALUES:
-                // dates as single values, need to convert them to a date range
-                foreach ($value as $singleValue) {
-                    $dateRange = $this->generateDateRange($propertyName, new Range($singleValue, $singleValue));
-                    $query[Generator::QUERY_BOOL][Generator::CONDITION_OR][] = $dateRange;
-                }
-
-                break;
-        }
-
-        return $query;
-    }
-
-    private function generateDateRange(string $propertyName, Range $range): array
-    {
-        return [
-            Generator::QUERY_RANGE => [
-                $propertyName => Generator::generateRangeParams($range),
-            ],
-        ];
-    }
-}
diff --git a/lib/Elasticsearch/Extension/Conversion/DateTimeConversion.php b/lib/Elasticsearch/Extension/Conversion/DateTimeConversion.php
deleted file mode 100644
index bc242cb1..00000000
--- a/lib/Elasticsearch/Extension/Conversion/DateTimeConversion.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension\Conversion;
-
-use Carbon\CarbonInterval;
-use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToStringTransformer;
-
-class DateTimeConversion extends DateConversion
-{
-    public function __construct()
-    {
-        $this->transformer = new DateTimeToStringTransformer(null, 'UTC', 'Y-m-d\TH:i:s');
-    }
-
-    /**
-     * @param CarbonInterval|\DateTimeImmutable|null $value
-     */
-    public function convertValue($value): string
-    {
-        if ($value === null) {
-            return '';
-        }
-
-        // https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#date-math
-        if ($value instanceof CarbonInterval) {
-            $value = clone $value;
-            $value->locale('en');
-
-            if ($value->invert === 1) {
-                return 'now-' . implode('-', $this->getIntervalUnits($value));
-            }
-
-            return 'now+' . implode('+', $this->getIntervalUnits($value));
-        }
-
-        return parent::convertValue($value);
-    }
-
-    private function getIntervalUnits(CarbonInterval $value): array
-    {
-        static $formats = [
-            'years' => 'y',
-            'months' => 'M',
-            'weeks' => 'w',
-            'days' => 'd',
-            'hours' => 'h',
-            'minutes' => 'm',
-            'seconds' => 's',
-        ];
-
-        $intervalUnits = $value->toArray();
-        $units = [];
-
-        foreach ($formats as $long => $short) {
-            if ($intervalUnits[$long] > 0) {
-                $units[] = $intervalUnits[$long] . $short;
-            }
-        }
-
-        return $units;
-    }
-}
diff --git a/lib/Elasticsearch/Extension/ElasticsearchExtension.php b/lib/Elasticsearch/Extension/ElasticsearchExtension.php
deleted file mode 100644
index 7325dd8a..00000000
--- a/lib/Elasticsearch/Extension/ElasticsearchExtension.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension;
-
-use Rollerworks\Component\Search\AbstractExtension;
-
-class ElasticsearchExtension extends AbstractExtension
-{
-    protected function loadTypesExtensions(): array
-    {
-        return [
-            new Type\FieldTypeExtension(),
-            new Type\OrderTypeExtension(),
-            new Type\DateTypeExtension(new Conversion\DateConversion()),
-            new Type\DateTimeTypeExtension(new Conversion\DateTimeConversion()),
-            new Type\MoneyTypeExtension(new Conversion\CurrencyConversion()),
-        ];
-    }
-}
diff --git a/lib/Elasticsearch/Extension/Type/BirthdayTypeExtension.php b/lib/Elasticsearch/Extension/Type/BirthdayTypeExtension.php
deleted file mode 100644
index c45a4a99..00000000
--- a/lib/Elasticsearch/Extension/Type/BirthdayTypeExtension.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension\Type;
-
-use Rollerworks\Component\Search\Elasticsearch\Extension\Conversion\DateChildOrderConversion;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Conversion\DateConversion;
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class BirthdayTypeExtension extends AbstractFieldTypeExtension
-{
-    public function __construct(
-        private readonly DateConversion $conversion,
-    ) {
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'elasticsearch_conversion' => $this->conversion,
-                'elasticsearch_child_order_conversion' => new DateChildOrderConversion(),
-            ]
-        );
-    }
-
-    /**
-     * Returns the name of the type being extended.
-     */
-    public function getExtendedType(): string
-    {
-        return BirthdayType::class;
-    }
-}
diff --git a/lib/Elasticsearch/Extension/Type/DateTimeTypeExtension.php b/lib/Elasticsearch/Extension/Type/DateTimeTypeExtension.php
deleted file mode 100644
index 2b9ee368..00000000
--- a/lib/Elasticsearch/Extension/Type/DateTimeTypeExtension.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension\Type;
-
-use Rollerworks\Component\Search\Elasticsearch\Extension\Conversion\DateChildOrderConversion;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Conversion\DateTimeConversion;
-use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class DateTimeTypeExtension extends AbstractFieldTypeExtension
-{
-    public function __construct(
-        private readonly DateTimeConversion $conversion = new DateTimeConversion(
-        ),
-    ) {
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'elasticsearch_conversion' => $this->conversion,
-                'elasticsearch_child_order_conversion' => new DateChildOrderConversion(),
-            ]
-        );
-    }
-
-    public function getExtendedType(): string
-    {
-        return DateTimeType::class;
-    }
-}
diff --git a/lib/Elasticsearch/Extension/Type/DateTypeExtension.php b/lib/Elasticsearch/Extension/Type/DateTypeExtension.php
deleted file mode 100644
index 2c95da99..00000000
--- a/lib/Elasticsearch/Extension/Type/DateTypeExtension.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension\Type;
-
-use Rollerworks\Component\Search\Elasticsearch\Extension\Conversion\DateChildOrderConversion;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Conversion\DateConversion;
-use Rollerworks\Component\Search\Extension\Core\Type\DateType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class DateTypeExtension extends AbstractFieldTypeExtension
-{
-    public function __construct(
-        private readonly DateConversion $conversion = new DateConversion(),
-    ) {
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'elasticsearch_conversion' => $this->conversion,
-                'elasticsearch_child_order_conversion' => new DateChildOrderConversion(),
-            ]
-        );
-    }
-
-    public function getExtendedType(): string
-    {
-        return DateType::class;
-    }
-}
diff --git a/lib/Elasticsearch/Extension/Type/FieldTypeExtension.php b/lib/Elasticsearch/Extension/Type/FieldTypeExtension.php
deleted file mode 100644
index 278bbe49..00000000
--- a/lib/Elasticsearch/Extension/Type/FieldTypeExtension.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension\Type;
-
-use Rollerworks\Component\Search\Elasticsearch\ChildOrderConversion;
-use Rollerworks\Component\Search\Elasticsearch\QueryConversion;
-use Rollerworks\Component\Search\Elasticsearch\ValueConversion;
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class FieldTypeExtension extends AbstractFieldTypeExtension
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver
-            ->setDefaults([
-                'elasticsearch_child_order_conversion' => null,
-                'elasticsearch_conversion' => null,
-            ])
-            ->setAllowedTypes('elasticsearch_child_order_conversion', ['null', ChildOrderConversion::class])
-            ->setAllowedTypes(
-                'elasticsearch_conversion',
-                [
-                    'null',
-                    ValueConversion::class,
-                    QueryConversion::class,
-                ]
-            )
-        ;
-    }
-
-    public function getExtendedType(): string
-    {
-        return SearchFieldType::class;
-    }
-}
diff --git a/lib/Elasticsearch/Extension/Type/MoneyTypeExtension.php b/lib/Elasticsearch/Extension/Type/MoneyTypeExtension.php
deleted file mode 100644
index 8c81108c..00000000
--- a/lib/Elasticsearch/Extension/Type/MoneyTypeExtension.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension\Type;
-
-use Rollerworks\Component\Search\Elasticsearch\Extension\Conversion\CurrencyConversion;
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class MoneyTypeExtension extends AbstractFieldTypeExtension
-{
-    public function __construct(
-        private readonly CurrencyConversion $conversion = new CurrencyConversion(
-        ),
-    ) {
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'elasticsearch_conversion' => $this->conversion,
-            ]
-        );
-    }
-
-    public function getExtendedType(): string
-    {
-        return MoneyType::class;
-    }
-}
diff --git a/lib/Elasticsearch/Extension/Type/OrderTypeExtension.php b/lib/Elasticsearch/Extension/Type/OrderTypeExtension.php
deleted file mode 100644
index e1cdfc3e..00000000
--- a/lib/Elasticsearch/Extension/Type/OrderTypeExtension.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch\Extension\Type;
-
-use Rollerworks\Component\Search\Elasticsearch\ChildOrderConversion;
-use Rollerworks\Component\Search\Elasticsearch\QueryConversion;
-use Rollerworks\Component\Search\Elasticsearch\ValueConversion;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class OrderTypeExtension extends AbstractFieldTypeExtension
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver
-            ->setDefaults([
-                'elasticsearch_child_order_conversion' => static fn (Options $options) => $options['type_options']['elasticsearch_child_order_conversion'] ?? null,
-                'elasticsearch_conversion' => null,
-            ])
-            ->setAllowedTypes('elasticsearch_child_order_conversion', ['null', ChildOrderConversion::class])
-            ->setAllowedTypes(
-                'elasticsearch_conversion',
-                [
-                    'null',
-                    ValueConversion::class,
-                    QueryConversion::class,
-                ]
-            )
-        ;
-    }
-
-    public function getExtendedType(): string
-    {
-        return OrderFieldType::class;
-    }
-}
diff --git a/lib/Elasticsearch/FieldMapping.php b/lib/Elasticsearch/FieldMapping.php
deleted file mode 100644
index a0378f6d..00000000
--- a/lib/Elasticsearch/FieldMapping.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch;
-
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\OrderField;
-
-/**
- * @internal
- */
-final class FieldMapping
-{
-    public ?string $indexName;
-    public ?string $typeName;
-    public ?string $propertyName;
-    public mixed $propertyValue;
-
-    /** @var array<string, mixed> */
-    public array $propertyQuery = [];
-
-    public mixed $nested = false; // Unknown type
-    public mixed $join = false; // Unknown type
-    public float $boost; // Currently unused
-    public ?ValueConversion $valueConversion = null;
-    public ?QueryConversion $queryConversion = null;
-    public ?ChildOrderConversion $childOrderConversion = null;
-
-    /** @var self[] */
-    public array $conditions;
-
-    /**
-     * @param self[]               $conditions
-     * @param array<string, mixed> $options
-     */
-    public function __construct(
-        public string $fieldName,
-        string $property,
-        FieldConfig $fieldConfig,
-        array $conditions = [],
-        public array $options = [],
-    ) {
-        $mapping = $this->parseProperty($property);
-        $this->indexName = $mapping['indexName'];
-        $this->typeName = $mapping['typeName'];
-        $this->propertyName = $mapping['propertyName'];
-        $this->nested = $mapping['nested'];
-        $this->join = $mapping['join'];
-
-        $converter = $fieldConfig->getOption('elasticsearch_conversion');
-        $childOrderConverter = $fieldConfig->getOption('elasticsearch_child_order_conversion');
-
-        if ($converter instanceof ValueConversion) {
-            $this->valueConversion = $converter;
-        }
-
-        if ($childOrderConverter instanceof ChildOrderConversion) {
-            $this->childOrderConversion = $childOrderConverter;
-        }
-
-        if ($converter instanceof QueryConversion) {
-            $this->queryConversion = $converter;
-        }
-
-        $this->conditions = $this->expandConditions($conditions, $fieldConfig);
-    }
-
-    /**
-     * Supported formats:
-     *      - <property>
-     *      - <sub.property>
-     *      - <nested[].property>
-     *      - <sub.nested[].property>
-     *      - <index>#<property>
-     *      - <index>#<nested[].property>
-     *      - <index>#<sub.nested[].property>
-     *      - <index>/<type>#<property>
-     *      - <index>/<type>#<sub.nested[].property>
-     *      - <index>/<type>#child><sub.nested[].property>.
-     *
-     * Returns: array{indexName: ?string, typeName: ?string, propertyName: string, nested: array{path: string}|bool, join: array{type: string}|bool}
-     *
-     * @return array<string, mixed>
-     */
-    private function parseProperty(string $property): array
-    {
-        $indexName = null;
-        $typeName = null;
-        $propertyName = $property;
-        $nested = false;
-        $join = false;
-
-        if (str_contains($property, '#')) {
-            [$path, $propertyName] = explode('#', $property);
-
-            $path = mb_trim($path, '/');
-            $indexName = $path;
-
-            if (mb_strpos($path, '/') !== false) {
-                [$indexName, $typeName] = explode('/', $path);
-            }
-        }
-
-        if (str_contains($property, '>')) {
-            $tokens = explode('>', $propertyName);
-
-            // last token is the property name
-            $propertyName = mb_trim(array_pop($tokens), '.');
-
-            foreach ($tokens as $type) {
-                $type = mb_trim($type, '.');
-                $join = compact('type', 'join');
-            }
-        }
-
-        if (str_contains($propertyName, '[]')) {
-            $tokens = explode('[]', $propertyName);
-
-            // last token is the property name
-            $propertyName = mb_trim(array_pop($tokens), '.');
-            $propertyName = mb_trim(end($tokens), '.') . '.' . $propertyName;
-
-            foreach ($tokens as $path) {
-                $path = mb_trim($path, '.');
-                $nested = compact('path', 'nested');
-            }
-        }
-
-        return compact('indexName', 'typeName', 'propertyName', 'nested', 'join');
-    }
-
-    private function expandConditions(array $conditions, FieldConfig $fieldConfig): array
-    {
-        if ($this->join && OrderField::isOrder($this->fieldName)) {
-            // sorting by has_child query is special
-            // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-child-query.html#_sorting
-            $property = $this->indexName . ($this->typeName ? '/' . $this->typeName : '') . '#' . $this->join['type'] . '>';
-            $queryScript = \sprintf('doc["%s"].value', $this->propertyName);
-
-            if ($this->childOrderConversion !== null) {
-                $queryScript = $this->childOrderConversion->convert($property, $queryScript);
-            }
-
-            $queryScript = \sprintf('%1$s * %2$s', QueryConditionGenerator::SORT_SCORE, $queryScript);
-
-            $scoreQuery = new self('_', $property, $fieldConfig, [], ['score_mode' => 'max']);
-            $scoreQuery->propertyQuery = [
-                QueryConditionGenerator::QUERY_FUNCTION_SCORE => [
-                    QueryConditionGenerator::QUERY_SCRIPT_SCORE => [
-                        QueryConditionGenerator::QUERY_SCRIPT => $queryScript,
-                    ],
-                ],
-            ];
-            $conditions[] = $scoreQuery;
-        }
-
-        return $conditions;
-    }
-
-    public function __serialize()
-    {
-        return [
-            'field_name' => $this->fieldName,
-            'index_name' => $this->indexName,
-            'type_name' => $this->typeName,
-            'property_name' => $this->propertyName,
-            'nested' => $this->nested,
-        ];
-    }
-
-    public function __unserialize($serialized): void
-    {
-        // no-op
-    }
-}
diff --git a/lib/Elasticsearch/LICENSE b/lib/Elasticsearch/LICENSE
deleted file mode 100644
index 5c5b0fa1..00000000
--- a/lib/Elasticsearch/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014-present Sebastiaan Stok
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/lib/Elasticsearch/QueryConditionGenerator.php b/lib/Elasticsearch/QueryConditionGenerator.php
deleted file mode 100644
index 8ff265b0..00000000
--- a/lib/Elasticsearch/QueryConditionGenerator.php
+++ /dev/null
@@ -1,749 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch;
-
-use Elastica\Query;
-use Rollerworks\Component\Search\Exception\BadMethodCallException;
-use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\ParameterBag;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/* final */ class QueryConditionGenerator implements ConditionGenerator
-{
-    private const PROPERTY_ID = '_id';
-
-    // Elasticsearch general query elements
-    public const SORT = 'sort';
-    public const SORT_ORDER = 'order';
-    public const SORT_SCORE = '_score';
-    public const QUERY = 'query';
-    public const QUERY_BOOL = 'bool';
-    public const QUERY_IDS = 'ids';
-    public const QUERY_NESTED = 'nested';
-    public const QUERY_TYPE = 'type';
-    public const QUERY_PATH = 'path';
-    public const QUERY_HAS_CHILD = 'has_child';
-    public const QUERY_MATCH = 'match';
-    public const QUERY_PREFIX = 'prefix';
-    public const QUERY_RANGE = 'range';
-    public const QUERY_WILDCARD = 'wildcard';
-    public const QUERY_TERM = 'term';
-    public const QUERY_TERMS = 'terms';
-    public const QUERY_VALUE = 'value';
-    public const QUERY_VALUES = 'values';
-    public const QUERY_FUNCTION_SCORE = 'function_score';
-    public const QUERY_SCRIPT_SCORE = 'script_score';
-    public const QUERY_SCRIPT = 'script';
-
-    // Elasticsearch boolean operators
-    public const CONDITION_NOT = 'must_not';
-    public const CONDITION_AND = 'must';
-    public const CONDITION_OR = 'should';
-
-    // Elasticsearch comparison operators
-    public const COMPARISON_LESS = 'lt';
-    public const COMPARISON_LESS_OR_EQUAL = 'lte';
-    public const COMPARISON_GREATER = 'gt';
-    public const COMPARISON_GREATER_OR_EQUAL = 'gte';
-
-    // note: this one is NOT available for Elasticsearch, we use it as a named constant only
-    private const COMPARISON_UNEQUAL = '<>';
-    private const COMPARISON_OPERATOR_MAP = [
-        '<>' => self::COMPARISON_UNEQUAL,
-        '<' => self::COMPARISON_LESS,
-        '<=' => self::COMPARISON_LESS_OR_EQUAL,
-        '>' => self::COMPARISON_GREATER,
-        '>=' => self::COMPARISON_GREATER_OR_EQUAL,
-    ];
-
-    private FieldSet $fieldSet;
-
-    /** @var array<string, FieldMapping> $mapping */
-    private array $mappings = [];
-
-    public function __construct(
-        private readonly SearchCondition $searchCondition,
-        private readonly ?ParameterBag $parameterBag = null,
-    ) {
-        $this->fieldSet = $this->searchCondition->getFieldSet();
-    }
-
-    public function registerField(string $fieldName, string $property, array $conditions = [], array $options = [])
-    {
-        $conditionMappings = [];
-
-        foreach ($conditions as $condition => $value) {
-            $conditionMapping = new FieldMapping($fieldName, $this->injectParameters($condition), $this->fieldSet->get($fieldName), [], $options);
-            $conditionMapping->propertyValue = $this->injectParameters($value);
-
-            $conditionMappings[] = $conditionMapping;
-        }
-
-        $this->mappings[$fieldName] = new FieldMapping($fieldName, $this->injectParameters($property), $this->fieldSet->get($fieldName), $conditionMappings, $options);
-
-        return $this;
-    }
-
-    public function getQuery(): Query
-    {
-        $primaryConditionGroupCondition = [];
-        $orderCondition = [];
-        $orderClause = [];
-
-        $rootGroupCondition = $this->processGroup($this->searchCondition->getValuesGroup());
-
-        $this->processOrder($this->searchCondition->getOrder(), $orderClause, $orderCondition);
-
-        if (($primaryCondition = $this->searchCondition->getPrimaryCondition()) !== null) {
-            $primaryConditionGroupCondition = $this->processGroup($primaryCondition->getValuesGroup(), true);
-
-            $this->processOrder($primaryCondition->getOrder(), $orderClause, $orderCondition, true);
-        }
-
-        $rootGroupCondition = array_values(array_filter([
-            $primaryConditionGroupCondition,
-            $rootGroupCondition,
-            $orderCondition,
-        ]));
-
-        if (\count($rootGroupCondition) > 1) {
-            $rootGroupCondition = [self::QUERY_BOOL => [self::CONDITION_AND => $rootGroupCondition]];
-        } else {
-            $rootGroupCondition = current($rootGroupCondition);
-        }
-
-        return new Query(array_filter([self::QUERY => $rootGroupCondition, self::SORT => $orderClause]));
-    }
-
-    /**
-     * @return FieldMapping[]
-     */
-    public function getMappings(): array
-    {
-        $mappings = [];
-        $group = $this->searchCondition->getValuesGroup();
-
-        $this->getGroupMappings($group, $mappings);
-
-        $primaryCondition = $this->searchCondition->getPrimaryCondition();
-
-        if ($primaryCondition !== null) {
-            $this->getGroupMappings($primaryCondition->getValuesGroup(), $mappings);
-        }
-
-        if ($mappings === []) {
-            $searchOrder = $this->searchCondition->getOrder();
-            $primarySearchOrder = $primaryCondition?->getOrder();
-
-            if ($searchOrder !== null) {
-                $this->getGroupMappings($searchOrder->getValuesGroup(), $mappings);
-            }
-
-            if ($primarySearchOrder !== null) {
-                $this->getGroupMappings($primarySearchOrder->getValuesGroup(), $mappings);
-            }
-        }
-
-        return array_values($mappings);
-    }
-
-    public function getSearchCondition(): SearchCondition
-    {
-        return $this->searchCondition;
-    }
-
-    public static function generateRangeParams(Range $range): array
-    {
-        $lowerCondition = $range->isLowerInclusive() ? self::COMPARISON_GREATER_OR_EQUAL : self::COMPARISON_GREATER;
-        $upperCondition = $range->isUpperInclusive() ? self::COMPARISON_LESS_OR_EQUAL : self::COMPARISON_LESS;
-
-        return [
-            $lowerCondition => $range->getLower(),
-            $upperCondition => $range->getUpper(),
-        ];
-    }
-
-    /**
-     * @param string $operator SearchCondition / Compare operator
-     *
-     * @return string Equivalent Elasticsearch operator
-     */
-    public static function translateComparison(string $operator): string
-    {
-        return self::COMPARISON_OPERATOR_MAP[$operator];
-    }
-
-    /**
-     * @param-out array<string, FieldMapping> $mappings
-     */
-    private function getGroupMappings(ValuesGroup $group, array &$mappings): void
-    {
-        foreach ($group->getFields() as $fieldName => $valuesBag) {
-            if ($valuesBag->hasSimpleValues()) {
-                $mappings[$fieldName] = $this->mappings[$fieldName];
-            }
-
-            if ($valuesBag->has(Range::class)) {
-                $mappings[$fieldName] = $this->mappings[$fieldName];
-            }
-
-            if ($valuesBag->has(Compare::class)) {
-                $mappings[$fieldName] = $this->mappings[$fieldName];
-            }
-
-            if ($valuesBag->has(PatternMatch::class)) {
-                $mappings[$fieldName] = $this->mappings[$fieldName];
-            }
-        }
-
-        foreach ($group->getGroups() as $subGroup) {
-            $this->getGroupMappings($subGroup, $mappings);
-        }
-    }
-
-    private function processGroup(ValuesGroup $group, bool $injectParams = false): array
-    {
-        // Note: Excludes are `must_not`, for includes `must` (AND) or `should` (OR) is used. Subgroups use `must`.
-        $includingType = $group->getGroupLogical() === ValuesGroup::GROUP_LOGICAL_AND
-            ? self::CONDITION_AND
-            : self::CONDITION_OR;
-
-        $bool = [];
-        $hints = new QueryPreparationHints();
-
-        foreach ($group->getFields() as $fieldName => $valuesBag) {
-            if (! isset($this->mappings[$fieldName])) {
-                throw new UnknownFieldException($fieldName);
-            }
-            $mapping = $this->mappings[$fieldName];
-
-            $propertyName = $mapping->propertyName;
-            $valueConverter = $mapping->valueConversion;
-            $queryConverter = $mapping->queryConversion;
-            $nested = $mapping->nested;
-            $join = $mapping->join;
-            $options = $mapping->options;
-
-            $hints->identifier = ($propertyName === self::PROPERTY_ID);
-
-            $conditions = $this->processMappingConditions($mapping, $hints, $injectParams);
-
-            // simple values
-            if ($valuesBag->hasSimpleValues()) {
-                $hints->context = QueryPreparationHints::CONTEXT_SIMPLE_VALUES;
-                $this->mergeQuery($bool, $includingType, $this->prepareProcessedValuesQuery(
-                    $propertyName,
-                    $valuesBag->getSimpleValues(),
-                    $hints,
-                    $queryConverter,
-                    $valueConverter,
-                    $nested,
-                    $join,
-                    $injectParams,
-                    $conditions,
-                    $options
-                ));
-            }
-
-            if ($valuesBag->hasExcludedSimpleValues()) {
-                $hints->context = QueryPreparationHints::CONTEXT_EXCLUDED_SIMPLE_VALUES;
-                $this->mergeQuery($bool, self::CONDITION_NOT, $this->prepareProcessedValuesQuery(
-                    $propertyName,
-                    $valuesBag->getExcludedSimpleValues(),
-                    $hints,
-                    $queryConverter,
-                    $valueConverter,
-                    $nested,
-                    $join,
-                    $injectParams,
-                    $conditions,
-                    $options
-                ));
-            }
-
-            // ranges
-            if ($valuesBag->has(Range::class)) {
-                /** @var Range $range */
-                foreach ($valuesBag->get(Range::class) as $range) {
-                    $hints->context = QueryPreparationHints::CONTEXT_RANGE_VALUES;
-                    $range = $this->convertRangeValues($range, $valueConverter, $injectParams);
-                    $this->mergeQuery($bool, $includingType, $this->prepareQuery($propertyName, $range, $hints, $queryConverter, $nested, $join, $conditions, $options));
-                }
-            }
-
-            if ($valuesBag->has(ExcludedRange::class)) {
-                /** @var Range $range */
-                foreach ($valuesBag->get(ExcludedRange::class) as $range) {
-                    $hints->context = QueryPreparationHints::CONTEXT_EXCLUDED_RANGE_VALUES;
-                    $range = $this->convertRangeValues($range, $valueConverter, $injectParams);
-                    $this->mergeQuery($bool, self::CONDITION_NOT, $this->prepareQuery($propertyName, $range, $hints, $queryConverter, $nested, $join, $conditions, $options));
-                }
-            }
-
-            // comparison
-            if ($valuesBag->has(Compare::class)) {
-                /** @var Compare $compare */
-                foreach ($valuesBag->get(Compare::class) as $compare) {
-                    $hints->context = QueryPreparationHints::CONTEXT_COMPARISON;
-                    $compare = $this->convertCompareValue($compare, $valueConverter, $injectParams);
-                    $localIncludingType = $compare->getOperator() === self::COMPARISON_UNEQUAL ? self::CONDITION_NOT : $includingType;
-                    $this->mergeQuery($bool, $localIncludingType, $this->prepareQuery($propertyName, $compare, $hints, $queryConverter, $nested, $join, $conditions, $options));
-                }
-            }
-
-            // matchers
-            if ($valuesBag->has(PatternMatch::class)) {
-                /** @var PatternMatch $patternMatch */
-                foreach ($valuesBag->get(PatternMatch::class) as $patternMatch) {
-                    $patternMatch = $this->convertMatcherValue($patternMatch, $valueConverter, $injectParams);
-                    $hints->context = QueryPreparationHints::CONTEXT_PATTERN_MATCH;
-                    $localIncludingType = $patternMatch->isExclusive() ? self::CONDITION_NOT : $includingType;
-                    $this->mergeQuery($bool, $localIncludingType, $this->prepareQuery($propertyName, $patternMatch, $hints, $queryConverter, $nested, $join, $conditions, $options));
-                }
-            }
-        }
-
-        foreach ($group->getGroups() as $subGroup) {
-            $subGroupCondition = $this->processGroup($subGroup, $injectParams);
-
-            if ($subGroupCondition !== []) {
-                $bool[$includingType][] = $subGroupCondition;
-            }
-        }
-
-        if ($bool === []) {
-            return [];
-        }
-
-        return [self::QUERY_BOOL => $bool];
-    }
-
-    private function processOrder(?SearchOrder $order, array &$clause, array &$conditions, bool $injectParams = false): void
-    {
-        if ($order === null) {
-            return;
-        }
-
-        $hints = new QueryPreparationHints();
-        $hints->context = QueryPreparationHints::CONTEXT_ORDER;
-
-        foreach ($order->getSorting() as $fieldName => $direction) {
-            $mapping = $this->mappings[$fieldName];
-
-            // apply conditions from order fields
-            $mappingConditions = $this->processMappingConditions($mapping, $hints, $injectParams);
-
-            if ($mappingConditions) {
-                if (! isset($conditions[self::QUERY_BOOL])) {
-                    $conditions[self::QUERY_BOOL] = [];
-                }
-
-                foreach ($mappingConditions as $mappingCondition) {
-                    $this->mergeQuery($conditions[self::QUERY_BOOL], self::CONDITION_AND, $mappingCondition);
-                }
-            }
-
-            // sorting by has_child query is special
-            // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-child-query.html#_sorting
-            $propertyName = $mapping->join ? self::SORT_SCORE : $mapping->propertyName;
-
-            $clause = array_merge_recursive(
-                $clause,
-                $mapping->options,
-                [
-                    $propertyName => [
-                        self::SORT_ORDER => $direction,
-                    ],
-                ]
-            );
-        }
-    }
-
-    private function convertValue(mixed $value, ?ValueConversion $converter, bool $injectParams)
-    {
-        $value = $injectParams ? $this->injectParameters($value) : $value;
-
-        if ($converter === null) {
-            return $value;
-        }
-
-        return $converter->convertValue($value);
-    }
-
-    private function convertRangeValues(Range $range, ?ValueConversion $converter, bool $injectParams): Range
-    {
-        return new Range(
-            $this->convertValue($range->getLower(), $converter, $injectParams),
-            $this->convertValue($range->getUpper(), $converter, $injectParams),
-            $range->isLowerInclusive(),
-            $range->isUpperInclusive()
-        );
-    }
-
-    private function convertCompareValue(Compare $compare, ?ValueConversion $converter, bool $injectParams): Compare
-    {
-        return new Compare(
-            $this->convertValue($compare->getValue(), $converter, $injectParams),
-            $compare->getOperator()
-        );
-    }
-
-    private function convertMatcherValue(PatternMatch $patternMatch, ?ValueConversion $converter, bool $injectParams): PatternMatch
-    {
-        return new PatternMatch(
-            $this->convertValue($patternMatch->getValue(), $converter, $injectParams),
-            $patternMatch->getType(),
-            $patternMatch->isCaseInsensitive()
-        );
-    }
-
-    /**
-     * @param QueryConversion|null $queryConverter
-     * @param ValueConversion|null $valueConverter
-     * @param array|bool           $nested
-     * @param array|bool           $join
-     */
-    private function prepareProcessedValuesQuery(string $propertyName, array $values, QueryPreparationHints $hints, $queryConverter, $valueConverter, $nested, $join, bool $injectParams, array $conditions = [], array $options = []): array
-    {
-        $convertedValues = $values;
-
-        if ($hints->context !== QueryPreparationHints::CONTEXT_PRECONDITION_QUERY) {
-            $convertedValues = [];
-
-            foreach ($values as $value) {
-                $convertedValues[] = $this->convertValue($value, $valueConverter, $injectParams);
-            }
-        }
-
-        return $this->prepareQuery($propertyName, $convertedValues, $hints, $queryConverter, $nested, $join, $conditions, $options);
-    }
-
-    /**
-     * @param array|bool $nested
-     * @param array|bool $join
-     */
-    private function prepareQuery(string $propertyName, $value, QueryPreparationHints $hints, ?QueryConversion $converter, $nested, $join, array $conditions = [], array $options = []): array
-    {
-        if ($converter === null || ($query = $converter->convertQuery($propertyName, $value, $hints)) === null) {
-            switch ($hints->context) {
-                case QueryPreparationHints::CONTEXT_RANGE_VALUES:
-                case QueryPreparationHints::CONTEXT_EXCLUDED_RANGE_VALUES:
-                    $query = [self::QUERY_RANGE => [$propertyName => static::generateRangeParams($value)]];
-
-                    if ($hints->identifier) {
-                        // IDs cannot be queries by range in Elasticsearch, use ids query
-                        // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-query.html
-                        /** @var Range $value */
-                        $query = [
-                            self::QUERY_IDS => [
-                                self::QUERY_VALUES => range($value->getLower(), $value->getUpper()),
-                            ],
-                        ];
-                    }
-
-                    break;
-
-                case QueryPreparationHints::CONTEXT_COMPARISON:
-                    /** @var Compare $value */
-                    $operator = self::translateComparison($value->getOperator());
-                    $query = [
-                        $propertyName => [$operator => $value->getValue()],
-                    ];
-
-                    if ($value->getOperator() === self::COMPARISON_UNEQUAL) {
-                        $query = [
-                            self::QUERY_TERM => [
-                                $propertyName => [self::QUERY_VALUE => $value->getValue()],
-                            ],
-                        ];
-                    }
-
-                    break;
-
-                case QueryPreparationHints::CONTEXT_PATTERN_MATCH:
-                    /** @var PatternMatch $value */
-                    $query = $this->preparePatternMatch($propertyName, $value);
-
-                    break;
-
-                case QueryPreparationHints::CONTEXT_ORDER:
-                    $query = [
-                        self::QUERY_TERMS => [$propertyName => $value],
-                    ];
-
-                    break;
-
-                case QueryPreparationHints::CONTEXT_PRECONDITION_QUERY:
-                    $query = $value;
-
-                    break;
-
-                default:
-                case QueryPreparationHints::CONTEXT_SIMPLE_VALUES:
-                case QueryPreparationHints::CONTEXT_EXCLUDED_SIMPLE_VALUES:
-                    // simple values
-                    $query = [self::QUERY_TERMS => [$propertyName => $value]];
-
-                    if ($hints->identifier) {
-                        $query = [self::QUERY_IDS => [self::QUERY_VALUES => $value]];
-                    }
-
-                    break;
-            }
-        }
-
-        if ($nested) {
-            while ($nested !== false) {
-                $path = $nested[self::QUERY_PATH];
-                $query = [
-                    self::QUERY_NESTED => array_replace_recursive(compact('path', 'query'), $options),
-                ];
-                $nested = $nested['nested'];
-            }
-        }
-
-        if ($join) {
-            while ($join !== false) {
-                $type = $join[self::QUERY_TYPE];
-                $query = [
-                    self::QUERY_HAS_CHILD => array_replace_recursive(compact('type', 'query'), $options),
-                ];
-                $join = $join['join'];
-            }
-        }
-
-        return $this->injectConditions($query, $conditions);
-    }
-
-    private function preparePatternMatch(string $propertyName, PatternMatch $patternMatch): array
-    {
-        $query = [];
-
-        switch ($patternMatch->getType()) {
-            // Faster then Wildcard but less accurate.
-            // XXX Allow to configure `fuzzy`, `operator`, `zero_terms_query` and `cutoff_frequency` (TextType).
-            case PatternMatch::PATTERN_CONTAINS:
-            case PatternMatch::PATTERN_NOT_CONTAINS:
-                $query[self::QUERY_MATCH] = [$propertyName => [self::QUERY => $patternMatch->getValue()]];
-
-                break;
-
-            case PatternMatch::PATTERN_STARTS_WITH:
-            case PatternMatch::PATTERN_NOT_STARTS_WITH:
-                $query[self::QUERY_PREFIX] = [$propertyName => [self::QUERY_VALUE => $patternMatch->getValue()]];
-
-                break;
-
-            case PatternMatch::PATTERN_ENDS_WITH:
-            case PatternMatch::PATTERN_NOT_ENDS_WITH:
-                $query[self::QUERY_WILDCARD] = [
-                    $propertyName => [self::QUERY_VALUE => '?' . addcslashes($patternMatch->getValue(), '?*')],
-                ];
-
-                break;
-
-            case PatternMatch::PATTERN_EQUALS:
-            case PatternMatch::PATTERN_NOT_EQUALS:
-                $query[self::QUERY_TERM] = [$propertyName => [self::QUERY_VALUE => $patternMatch->getValue()]];
-
-                break;
-
-            default:
-                $message = \sprintf('Not supported PatternMatch type "%s"', $patternMatch->getType());
-
-                throw new BadMethodCallException($message);
-        }
-
-        return $query;
-    }
-
-    private function injectParameters($template)
-    {
-        if ($this->parameterBag === null) {
-            return $template;
-        }
-
-        if (\is_array($template)) {
-            return array_map($this->parameterBag->injectParameters(...), $template);
-        }
-
-        return $this->parameterBag->injectParameters($template);
-    }
-
-    private function injectConditions(array $query, array $conditions): array
-    {
-        if ($conditions === []) {
-            return $query;
-        }
-
-        $childType = null;
-        $nestedPath = null;
-
-        if (isset($query[self::QUERY_HAS_CHILD])) {
-            // wrap has_child.query into a bool.must to prepare for accepting conditions
-            $query[self::QUERY_HAS_CHILD][self::QUERY] = [
-                self::QUERY_BOOL => [
-                    self::CONDITION_AND => [
-                        $query[self::QUERY_HAS_CHILD][self::QUERY],
-                    ],
-                ],
-            ];
-
-            $childType = $query[self::QUERY_HAS_CHILD][self::QUERY_TYPE];
-            $nestedBool = &$query[self::QUERY_HAS_CHILD][self::QUERY][self::QUERY_BOOL];
-        } elseif (isset($query[self::QUERY_NESTED])) {
-            // wrap nested.query into a bool.must to prepare for accepting conditions
-            $query[self::QUERY_NESTED][self::QUERY] = [
-                self::QUERY_BOOL => [
-                    self::CONDITION_AND => [
-                        $query[self::QUERY_NESTED][self::QUERY],
-                    ],
-                ],
-            ];
-
-            $nestedPath = $query[self::QUERY_NESTED][self::QUERY_PATH];
-            $nestedBool = &$query[self::QUERY_NESTED][self::QUERY][self::QUERY_BOOL];
-        }
-
-        $query = [
-            self::QUERY_BOOL => [
-                self::CONDITION_AND => [
-                    $query,
-                ],
-            ],
-        ];
-
-        $rootBool = &$query[self::QUERY_BOOL];
-
-        foreach ($conditions as $condition) {
-            if (isset($condition[self::QUERY_HAS_CHILD])) {
-                if ($childType === $condition[self::QUERY_HAS_CHILD][self::QUERY_TYPE]) {
-                    $this->mergeQuery($nestedBool, self::CONDITION_AND, $condition[self::QUERY_HAS_CHILD][self::QUERY]);
-                } else {
-                    $this->mergeQuery($rootBool, self::CONDITION_AND, $condition);
-                }
-            } elseif (isset($condition[self::QUERY_NESTED])) {
-                if ($nestedPath === $condition[self::QUERY_NESTED][self::QUERY_PATH]) {
-                    $this->mergeQuery($nestedBool, self::CONDITION_AND, $condition[self::QUERY_NESTED][self::QUERY]);
-                } else {
-                    $this->mergeQuery($rootBool, self::CONDITION_AND, $condition);
-                }
-            } else {
-                $this->mergeQuery($rootBool, self::CONDITION_AND, $condition);
-            }
-        }
-
-        return $query;
-    }
-
-    private function processMappingConditions(FieldMapping $mapping, QueryPreparationHints $hints, bool $injectParams): array
-    {
-        $conditions = [];
-
-        foreach ($mapping->conditions as $mappingCondition) {
-            if ($mappingCondition->propertyQuery) {
-                $hints->context = QueryPreparationHints::CONTEXT_PRECONDITION_QUERY;
-                $values = $mappingCondition->propertyQuery;
-            } else {
-                $hints->context = QueryPreparationHints::CONTEXT_PRECONDITION_VALUE;
-                $values = (array) $mappingCondition->propertyValue;
-            }
-
-            $conditions[] = $this->prepareProcessedValuesQuery(
-                $mappingCondition->propertyName,
-                $values,
-                $hints,
-                $mappingCondition->queryConversion,
-                $mappingCondition->valueConversion,
-                $mappingCondition->nested,
-                $mappingCondition->join,
-                $injectParams,
-                [],
-                $mappingCondition->options
-            );
-        }
-
-        return $conditions;
-    }
-
-    private function mergeQuery(array &$bool, string $condition, array $query): void
-    {
-        if (isset($query[self::QUERY_HAS_CHILD], $bool[$condition])) {
-            foreach ($bool[$condition] as &$previousQuery) {
-                if (isset($previousQuery[self::QUERY_HAS_CHILD])
-                    && $previousQuery[self::QUERY_HAS_CHILD][self::QUERY_TYPE] === $query[self::QUERY_HAS_CHILD][self::QUERY_TYPE]) {
-                    $previousQuery[self::QUERY_HAS_CHILD] = array_replace(
-                        $previousQuery[self::QUERY_HAS_CHILD],
-                        $query[self::QUERY_HAS_CHILD],
-                        [
-                            self::QUERY => $previousQuery[self::QUERY_HAS_CHILD][self::QUERY],
-                        ]
-                    );
-
-                    if (! isset($previousQuery[self::QUERY_HAS_CHILD][self::QUERY][self::QUERY_BOOL])) {
-                        $previousQuery[self::QUERY_HAS_CHILD][self::QUERY] = [
-                            self::QUERY_BOOL => [
-                                $condition => [
-                                    $previousQuery[self::QUERY_HAS_CHILD][self::QUERY],
-                                ],
-                            ],
-                        ];
-                    }
-
-                    $previousQuery[self::QUERY_HAS_CHILD][self::QUERY][self::QUERY_BOOL][$condition][] = $query[self::QUERY_HAS_CHILD][self::QUERY];
-
-                    return;
-                }
-            }
-            unset($previousQuery);
-        } elseif (isset($query[self::QUERY_NESTED], $bool[$condition])) {
-            foreach ($bool[$condition] as &$previousQuery) {
-                if (isset($previousQuery[self::QUERY_NESTED])
-                    && $previousQuery[self::QUERY_NESTED][self::QUERY_PATH] === $query[self::QUERY_NESTED][self::QUERY_PATH]) {
-                    $previousQuery[self::QUERY_NESTED] = array_replace(
-                        $previousQuery[self::QUERY_NESTED],
-                        $query[self::QUERY_NESTED],
-                        [
-                            self::QUERY => $previousQuery[self::QUERY_NESTED][self::QUERY],
-                        ]
-                    );
-
-                    if (! isset($previousQuery[self::QUERY_NESTED][self::QUERY][self::QUERY_BOOL])) {
-                        $previousQuery[self::QUERY_NESTED][self::QUERY] = [
-                            self::QUERY_BOOL => [
-                                $condition => [
-                                    $previousQuery[self::QUERY_NESTED][self::QUERY],
-                                ],
-                            ],
-                        ];
-                    }
-
-                    $previousQuery[self::QUERY_NESTED][self::QUERY][self::QUERY_BOOL][$condition][] = $query[self::QUERY_NESTED][self::QUERY];
-
-                    return;
-                }
-            }
-            unset($previousQuery);
-        }
-
-        $bool[$condition][] = $query;
-    }
-}
diff --git a/lib/Elasticsearch/QueryConversion.php b/lib/Elasticsearch/QueryConversion.php
deleted file mode 100644
index 63f99445..00000000
--- a/lib/Elasticsearch/QueryConversion.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch;
-
-/**
- * Class QueryConversion.
- */
-interface QueryConversion
-{
-    /**
-     * Returns the query converted to a new form if required.
-     *
-     * If null is returned, no query conversion has taken place,
-     * use whatever is proper in the current context.
-     */
-    public function convertQuery(string $propertyName, $value, QueryPreparationHints $hints): ?array;
-}
diff --git a/lib/Elasticsearch/QueryPreparationHints.php b/lib/Elasticsearch/QueryPreparationHints.php
deleted file mode 100644
index 0de0753e..00000000
--- a/lib/Elasticsearch/QueryPreparationHints.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch;
-
-class QueryPreparationHints
-{
-    public const CONTEXT_PRECONDITION_VALUE = 'PRECONDITION_VALUE';
-    public const CONTEXT_PRECONDITION_QUERY = 'PRECONDITION_QUERY';
-    public const CONTEXT_SIMPLE_VALUES = 'SIMPLE_VALUES';
-    public const CONTEXT_EXCLUDED_SIMPLE_VALUES = 'EXCLUDED_SIMPLE_VALUES';
-    public const CONTEXT_RANGE_VALUES = 'RANGE_VALUES';
-    public const CONTEXT_EXCLUDED_RANGE_VALUES = 'EXCLUDED_RANGE_VALUES';
-    public const CONTEXT_COMPARISON = 'COMPARISON';
-    public const CONTEXT_PATTERN_MATCH = 'PATTERN_MATCH';
-    public const CONTEXT_ORDER = 'ORDER';
-
-    public bool $identifier = false;
-
-    /** @var QueryPreparationHints::CONTEXT_* */
-    public string $context;
-}
diff --git a/lib/Elasticsearch/README.md b/lib/Elasticsearch/README.md
deleted file mode 100644
index 4a58d24a..00000000
--- a/lib/Elasticsearch/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-RollerworksSearch Elasticsearch extension
-=========================================
-
-This package provides the Elasticsearch extension for [RollerworksSearch][1].
-
-> [!NOTE]
-> This extension is only about generating a search Query for Elasticsearch,
-> you need to set-up indexing and storage yourself.
-
-If you'd like to contribute to this project, please go the
-main [RollerworksSearch][1] repository and read the [Contributing][2] section.
-
-Installation
-------------
-
-To install this extension, add the `rollerworks/search-elasticsearch` to your composer.json
-
-```bash
-$ php composer.phar require rollerworks/search-elasticsearch
-```
-
-License
--------
-
-The source of this package is subject to the MIT license that is bundled
-with this source code in the file [LICENSE](LICENSE).
-
-[1]: https://github.com/rollerworks/search
-[2]: https://github.com/rollerworks/search#contributing
diff --git a/lib/Elasticsearch/Tests/CachedConditionGeneratorTest.php b/lib/Elasticsearch/Tests/CachedConditionGeneratorTest.php
deleted file mode 100644
index 5889a7c8..00000000
--- a/lib/Elasticsearch/Tests/CachedConditionGeneratorTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Elasticsearch;
-
-use Elastica\Query;
-use PHPUnit\Framework\MockObject\MockObject;
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\Elasticsearch\CachedConditionGenerator;
-use Rollerworks\Component\Search\Elasticsearch\ConditionGenerator;
-use Rollerworks\Component\Search\GenericFieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * Class CachedConditionGeneratorTest.
- *
- * @group cache
- *
- * @internal
- */
-final class CachedConditionGeneratorTest extends ElasticsearchTestCase
-{
-    private CachedConditionGenerator $cachedConditionGenerator;
-
-    /** @var Cache&MockObject */
-    private MockObject $cacheDriver;
-
-    /** @var ConditionGenerator&MockObject */
-    private MockObject $conditionGenerator;
-
-    /**
-     * @test
-     */
-    public function get_query_no_cache(): void
-    {
-        $cacheKey = '';
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('has')
-            ->with(
-                self::callback(static function (string $key) use (&$cacheKey) {
-                    $cacheKey = $key;
-
-                    return true;
-                })
-            )
-            ->willReturn(false)
-        ;
-
-        $query = $this->mockQuery();
-
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('get')
-        ;
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('set')
-            ->with(
-                self::callback(
-                    static function (string $key) use (&$cacheKey) {
-                        return $cacheKey === $key;
-                    }
-                ),
-                $query,
-                60
-            )
-        ;
-
-        $this->conditionGenerator
-            ->expects(self::once())
-            ->method('getQuery')
-            ->willReturn($query)
-        ;
-
-        self::assertEquals($query, $this->cachedConditionGenerator->getQuery());
-    }
-
-    /**
-     * @test
-     */
-    public function get_query_with_cache(): void
-    {
-        $cacheKey = '';
-
-        $query = $this->mockQuery();
-
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('has')
-            ->with(
-                self::callback(static function (string $key) use (&$cacheKey) {
-                    $cacheKey = $key;
-
-                    return true;
-                })
-            )
-            ->willReturn(true)
-        ;
-        $this->cacheDriver
-            ->expects(self::never())
-            ->method('set')
-        ;
-        $this->cacheDriver
-            ->expects(self::once())
-            ->method('get')
-            ->with(
-                self::callback(static function (string $key) use (&$cacheKey) {
-                    return $cacheKey === $key;
-                })
-            )
-            ->willReturn($query)
-        ;
-
-        $this->conditionGenerator
-            ->expects(self::never())
-            ->method('getQuery')
-        ;
-
-        self::assertEquals($query, $this->cachedConditionGenerator->getQuery());
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $searchCondition = new SearchCondition(new GenericFieldSet([], 'invoice'), new ValuesGroup());
-        $this->conditionGenerator = $this->createMock(ConditionGenerator::class);
-        $this->conditionGenerator
-            ->expects(self::any())
-            ->method('getSearchCondition')
-            ->willReturn($searchCondition)
-        ;
-
-        $this->cacheDriver = $this->createMock(Cache::class);
-        $this->cachedConditionGenerator = new CachedConditionGenerator(
-            $this->conditionGenerator,
-            $this->cacheDriver,
-            60
-        );
-    }
-
-    private function mockQuery(): Query
-    {
-        return $this->createMock(Query::class);
-    }
-}
diff --git a/lib/Elasticsearch/Tests/ElasticsearchFactoryTest.php b/lib/Elasticsearch/Tests/ElasticsearchFactoryTest.php
deleted file mode 100644
index c2789667..00000000
--- a/lib/Elasticsearch/Tests/ElasticsearchFactoryTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Elasticsearch;
-
-use Psr\SimpleCache\CacheInterface as Cache;
-use Rollerworks\Component\Search\Elasticsearch\CachedConditionGenerator;
-use Rollerworks\Component\Search\Elasticsearch\ElasticsearchFactory;
-use Rollerworks\Component\Search\Elasticsearch\QueryConditionGenerator;
-use Rollerworks\Component\Search\GenericFieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * Class ElasticsearchFactoryTest.
- *
- * @internal
- */
-final class ElasticsearchFactoryTest extends ElasticsearchTestCase
-{
-    protected ElasticsearchFactory $factory;
-
-    /**
-     * @test
-     */
-    public function create_condition_generator(): void
-    {
-        $searchCondition = new SearchCondition(new GenericFieldSet([], 'invoice'), new ValuesGroup());
-        $conditionGenerator = $this->factory->createConditionGenerator($searchCondition);
-
-        self::assertSame($searchCondition, $conditionGenerator->getSearchCondition());
-    }
-
-    /**
-     * @test
-     */
-    public function create_cache_condition_generator(): void
-    {
-        $searchCondition = new SearchCondition(new GenericFieldSet([], 'invoice'), new ValuesGroup());
-
-        $conditionGenerator = $this->factory->createConditionGenerator($searchCondition);
-        self::assertInstanceOf(QueryConditionGenerator::class, $conditionGenerator);
-
-        $cacheConditionGenerator = $this->factory->createCachedConditionGenerator($conditionGenerator);
-        self::assertInstanceOf(CachedConditionGenerator::class, $cacheConditionGenerator);
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        /** @var Cache $cacheDriver */
-        $cacheDriver = $this->getMockBuilder(Cache::class)->getMock();
-        $this->factory = new ElasticsearchFactory($cacheDriver);
-    }
-}
diff --git a/lib/Elasticsearch/Tests/ElasticsearchTestCase.php b/lib/Elasticsearch/Tests/ElasticsearchTestCase.php
deleted file mode 100644
index ee52f1dd..00000000
--- a/lib/Elasticsearch/Tests/ElasticsearchTestCase.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Elasticsearch;
-
-use Rollerworks\Component\Search\Elasticsearch\Extension\ElasticsearchExtension;
-use Rollerworks\Component\Search\SearchExtension;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-
-/**
- * Class ElasticsearchTestCase.
- */
-abstract class ElasticsearchTestCase extends SearchIntegrationTestCase
-{
-    /**
-     * @return SearchExtension[]
-     */
-    protected function getExtensions(): array
-    {
-        return [
-            new ElasticsearchExtension(),
-        ];
-    }
-}
diff --git a/lib/Elasticsearch/Tests/Functional/ConditionGeneratorResultsTest.php b/lib/Elasticsearch/Tests/Functional/ConditionGeneratorResultsTest.php
deleted file mode 100644
index ff816ec4..00000000
--- a/lib/Elasticsearch/Tests/Functional/ConditionGeneratorResultsTest.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Elasticsearch\Functional;
-
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-
-/**
- * @group functional
- *
- * Special cases needed to be handled here
- * - IDs do not behave like other values
- *   for example you cannot use ranged queries with them, use "ids" query
- * - dates always behave like a range, even for exact values
- *
- * @internal
- */
-final class ConditionGeneratorResultsTest extends FunctionalElasticsearchTestCase
-{
-    private StringQueryInput $inputProcessor;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->inputProcessor = new StringQueryInput();
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_id(): void
-    {
-        $this->makeTest('id: 1, 5;', [1, 5]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_ids_with_range_and_excluding_by_id(): void
-    {
-        $this->makeTest('id: 1~7[, !2;', [1, 3, 4, 5, 6, 7]); // FIXME This must not contain 7
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_date(): void
-    {
-        $this->makeTest('pub-date: "2010-05-10"', [1, 2]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_range_and_excluding_by_id(): void
-    {
-        $this->makeTest('pub-date: "2010-05-10"; id: !2;', [1]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_child_property_field(): void
-    {
-        $this->makeTest('customer: 1, 2; id: !2', [1, 3, 4, 7, 8, 9]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_birthday(): void
-    {
-        $this->makeTest('customer-birthday: "2000-05-15";', range(2, 4));
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_date_relative(): void
-    {
-        $this->makeTest('pub-date-time: >"7 days";', [8, 9]);
-        $this->makeTest('pub-date-time: >"16 days";', [9]);
-        $this->makeTest('pub-date-time: "14 days" ~ "6 months";', [8]);
-        $this->makeTest('pub-date-time: >"2015-05-10 01:12:13", <"-7 days";', [7]);
-        $this->makeTest('pub-date-time: >"2015-05-10 01:12:13", <"-8 days";', []);
-        $this->makeTest('pub-date-time: >"2015-05-10 01:12:13", >"-1 year", <"6 months";', [7, 8]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_birthdays(): void
-    {
-        $this->makeTest('customer-birthday: "2000-05-15", "1980-06-10";', [2, 3, 4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_note(): void
-    {
-        $this->makeTest('customer-comment: ~*Que', [3]);
-        $this->makeTest('customer-comment: ~*whatever', [4]);
-
-        $this->makeTest('customer-comment: ~*specific', [1, 2, 3]);
-        $this->makeTest('customer-comment-restricted: ~*specific', [2]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_date_comparison(): void
-    {
-        $this->makeTest('pub-date: >= "2015-05-10"', [4, 7, 8, 9]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_date_range_excluding_by_date(): void
-    {
-        $this->makeTest('pub-date: "2010-05-10"~"2015-05-01", !"2000-05-15";', [1, 2, 5]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_with_or_group(): void
-    {
-        $this->makeTest('* customer-birthday: "1980-11-20"; pub-date: "2015-05-01";', [1, 5, 7, 8, 9]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_pub_date_time_comparison(): void
-    {
-        $this->makeTest('pub-date-time: >= "2015-05-09 13:12:11"', [4, 7, 8, 9]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_pub_date_limited_by_price(): void
-    {
-        $this->makeTest('pub-date: "2015-05-10"; total: "100.00"', [4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status(): void
-    {
-        $this->makeTest('customer: 2; status: concept;', [3]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status_and_total(): void
-    {
-        $this->makeTest('customer: 2; status: paid; total: "90.00";', [2]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_customer_and_status_or_price(): void
-    {
-        // 2 => matches status, doesn't match price
-        // 4 => matches price, doesn't match status
-        $this->makeTest('customer: 2; *(status: paid; total: "100.00";)', [2, 4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_item_price(): void
-    {
-        $this->makeTest('row-price: 15.00;', [2, 5]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_status_and_label_or_quantity_limited_by_price(): void
-    {
-        // Note there is no row with quantity 5, which is resolved as its in an OR'ed group
-        $this->makeTest('status: published; *(row-quantity: 5; row-label: ~*"repair"; (row-price: "50.00"));', [4, 6]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_finds_by_excluding_equals_pattern(): void
-    {
-        // note: everything is case-sensitive by default, must use lowercase here
-        // TODO: this throws an exception for me from tests, but works if I run the query directly (?!)
-        // $this->makeTest('row-label: ~=armor, ~=sword;', [2]);
-        $this->makeTest('row-price: "15.00"; row-label: ~!=sword;', [5]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_sorts_by_total(): void
-    {
-        $this->makeTest('@total: ASC', [3, 6, 7, 8, 9, 2, 1, 4, 5]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_sorts_by_total_desc(): void
-    {
-        $this->makeTest('@total: DESC', [5, 1, 4, 2, 7, 8, 9, 6, 3]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_sorts_by_customer_name(): void
-    {
-        $this->makeTest('@customer-name: ASC', [5, 2, 3, 4, 1, 7, 8, 9, 6]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_applies_conditional_conditions_from_order_mappings(): void
-    {
-        $this->makeTest('@customer-pubdate: ASC', [3, 2, 1, 4]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_sorts_by_has_child_query(): void
-    {
-        $this->makeTest('@customer-note-pubdate: ASC', [4, 3, 2, 1]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_sorts_by_has_child_query_desc(): void
-    {
-        $this->makeTest('@customer-note-pubdate: DESC', [1, 2, 3, 4]);
-    }
-
-    private function makeTest(string $input, array $expectedRows): void
-    {
-        $config = new ProcessorConfig($this->getFieldSet());
-
-        try {
-            $condition = $this->inputProcessor->process($config, $input);
-            $this->assertDocumentsAreFound($condition, $expectedRows);
-        } catch (\Exception $e) {
-            self::detectSystemException($e);
-
-            if (\function_exists('dump')) {
-                dump($e);
-            } else {
-                echo 'Please install symfony/var-dumper as dev-requirement to get a readable structure.' . \PHP_EOL;
-                // Don't use var-dump or print-r as this crashes php...
-                echo $e::class . '::' . (string) $e;
-            }
-            self::fail('Condition contains errors.');
-        }
-    }
-}
diff --git a/lib/Elasticsearch/Tests/Functional/FunctionalElasticsearchTestCase.php b/lib/Elasticsearch/Tests/Functional/FunctionalElasticsearchTestCase.php
deleted file mode 100644
index 49c6c03e..00000000
--- a/lib/Elasticsearch/Tests/Functional/FunctionalElasticsearchTestCase.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Elasticsearch\Functional;
-
-use Elastica\Client;
-use Elastica\Document;
-use Elastica\Exception\ResponseException;
-use Elastica\Search;
-use Rollerworks\Component\Search\Elasticsearch\QueryConditionGenerator;
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Extension\Core\Type\ChoiceType;
-use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-use Rollerworks\Component\Search\Extension\Core\Type\DateType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchCondition;
-use Rollerworks\Component\Search\Tests\Elasticsearch\ElasticsearchTestCase;
-
-abstract class FunctionalElasticsearchTestCase extends ElasticsearchTestCase
-{
-    protected function setUp(): void
-    {
-        try {
-            $mappings = $this->getMappings();
-            $documents = $this->getDocuments();
-
-            foreach ($mappings as $name => $properties) {
-                if (\array_key_exists($name, $documents) === false) {
-                    throw new \RuntimeException(\sprintf('No documents for mapping "%1$s" defined', $name));
-                }
-                $data = $documents[$name];
-                $this->createDocuments($name, $properties, $data);
-            }
-        } catch (ResponseException $exception) {
-            self::fail(\sprintf(
-                "%s\nWith path: %s\nWith query: ---------------------\n%s\n---------------------------------\n",
-                $exception->getMessage(),
-                $exception->getRequest()->getPath(),
-                json_encode($exception->getRequest()->toArray(), \JSON_THROW_ON_ERROR | \JSON_PRETTY_PRINT)
-            ));
-        }
-
-        parent::setUp();
-    }
-
-    protected function getMappings(): array
-    {
-        return [
-            'customers' => [
-                'type' => ['type' => 'join', 'relations' => ['customer' => 'note']],
-                'first_name' => ['type' => 'text'],
-                'last_name' => ['type' => 'text'],
-                'full_name' => ['type' => 'text', 'boost' => 2, 'fields' => ['keyword' => ['type' => 'keyword']]],
-                'birthday' => ['type' => 'date'],
-                'pubdate' => ['type' => 'date'],
-                'comment' => ['type' => 'text'],
-            ],
-            'invoices' => [
-                'customer' => [
-                    'type' => 'object',
-                    'properties' => [
-                        'id' => ['type' => 'integer'],
-                        'full_name' => ['type' => 'text', 'fields' => ['keyword' => ['type' => 'keyword']]],
-                        'birthday' => ['type' => 'date'],
-                    ],
-                ],
-                'label' => ['type' => 'text'],
-                'pubdate' => ['type' => 'date'],
-                'pubdatetime' => ['type' => 'date'],
-                'status' => ['type' => 'integer'],
-                'price_total' => ['type' => 'integer'],
-                'items' => [
-                    'type' => 'nested',
-                    'properties' => [
-                        'label' => ['type' => 'text'],
-                        'quantity' => ['type' => 'integer'],
-                        'price' => ['type' => 'integer'],
-                        'total' => ['type' => 'integer'],
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    protected function getDocuments(): array
-    {
-        $date = static fn (string $input): string => (new \DateTimeImmutable($input, new \DateTimeZone('UTC')))->format('Y-m-d\TH:i:sP');
-
-        return [
-            'customers' => [
-                // customers
-                1 => ['customer', 'Peter', 'Pang', 'Peter Pang', '1980-11-20', '2005-11-20', null],
-                2 => ['customer', 'Leroy', 'Jenkins', 'Leroy Jenkins', '2000-05-15', '2005-05-20', null],
-                3 => ['customer', 'Doctor', 'Who', 'Doctor Who', '2005-12-10', '2005-02-20', null],
-                4 => ['customer', 'Spider', 'Pig', 'Spider Pig', '2005-12-10', '2012-07-20', null],
-
-                // notes about customers
-                5 => [['name' => 'note', 'parent' => 2], null, null, null, null, '2010-11-10', 'Leeroy Jenkins!'],
-                6 => [['name' => 'note', 'parent' => 3], null, null, null, null, '2010-11-10', 'Que?'],
-                7 => [['name' => 'note', 'parent' => 3], null, null, null, null, '2010-11-13', 'Who?'],
-                8 => [['name' => 'note', 'parent' => 4], null, null, null, null, '2005-01-01', 'Spider Pig, Spider Pig, Does Whatever A Spider Pig Does'],
-                9 => [['name' => 'note', 'parent' => 1], 'Larry', null, null, null, '2018-12-31', 'Specific comment'],
-                10 => [['name' => 'note', 'parent' => 2], 'Moe', null, null, null, '2015-11-10', 'Specific comment'],
-                11 => [['name' => 'note', 'parent' => 3], 'Curly', null, null, null, '2013-11-10', 'Specific comment'],
-            ],
-            'invoices' => [
-                1 => [['id' => 1, 'full_name' => 'Peter Pang', 'birthday' => '1980-11-20'], '2010-001', '2010-05-10', '2010-05-10T01:12:13+00:00', 2, 10000, [
-                    ['label' => 'Electric Guitar', 'quantity' => 1, 'price' => 10000, 'total' => 10000],
-                ]],
-                2 => [['id' => 2, 'full_name' => 'Leroy Jenkins', 'birthday' => '2000-05-15'], '2010-002', '2010-05-10', '2010-05-10T01:12:13+00:00', 2, 9000, [
-                    ['label' => 'Sword', 'quantity' => 1, 'price' => 1500, 'total' => 1500],
-                    ['label' => 'Shield', 'quantity' => 1, 'price' => 2000, 'total' => 2000],
-                    ['label' => 'Armor', 'quantity' => 1, 'price' => 5500, 'total' => 5500],
-                ]],
-                3 => [['id' => 2, 'full_name' => 'Leroy Jenkins', 'birthday' => '2000-05-15'], null, null, null, 0, 1000, [
-                    ['label' => 'Sword', 'quantity' => 1, 'price' => 1000, 'total' => 1000],
-                ]],
-                4 => [['id' => 2, 'full_name' => 'Leroy Jenkins', 'birthday' => '2000-05-15'], '2015-001', '2015-05-10', '2015-05-10T01:12:13+00:00', 1, 10000, [
-                    ['label' => 'Armor repair kit', 'quantity' => 2, 'price' => 5000, 'total' => 10000],
-                ]],
-                5 => [['id' => 3, 'full_name' => 'Doctor Who', 'birthday' => '2005-12-10'], '2015-002', '2015-05-01', '2015-05-01T01:12:13+00:00', 1, 21500, [
-                    ['label' => 'TARDIS Chameleon circuit', 'quantity' => 1, 'price' => 1500, 'total' => 1500],
-                    ['label' => 'Sonic Screwdriver', 'quantity' => 10, 'price' => 2000, 'total' => 20000],
-                ]],
-                6 => [['id' => 4, 'full_name' => 'Spider Pig', 'birthday' => '2005-12-10'], '2015-003', '2015-05-05', '2015-05-05T01:12:13+00:00', 1, 6000, [
-                    ['label' => 'Web shooter', 'quantity' => 1, 'price' => 1000, 'total' => 1000],
-                    ['label' => 'Cape', 'quantity' => 1, 'price' => 1000, 'total' => 1000],
-                    ['label' => 'Cape repair manual', 'quantity' => 1, 'price' => 1000, 'total' => 1000],
-                    ['label' => 'Hoof polish', 'quantity' => 3, 'price' => 1000, 'total' => 3000],
-                ]],
-                7 => [['id' => 1, 'full_name' => 'Peter Pang', 'birthday' => '1980-11-20'], '2019-001', '2015-05-10', $date('-7 days'), 3, 8000, [
-                    ['label' => 'Air Guitar', 'quantity' => 1, 'price' => 8, 'total' => 8],
-                ]],
-                8 => [['id' => 1, 'full_name' => 'Peter Pang', 'birthday' => '1980-11-20'], '2020-019', '2015-05-10', $date('+15 days'), 3, 8000, [
-                    ['label' => 'Air Guitar', 'quantity' => 1, 'price' => 8, 'total' => 8],
-                ]],
-                9 => [['id' => 1, 'full_name' => 'Peter Pang', 'birthday' => '1980-11-20'], '2021-005', '2015-05-10', $date('+1 year'), 3, 8000, [
-                    ['label' => 'Air Guitar', 'quantity' => 1, 'price' => 8, 'total' => 8],
-                ]],
-            ],
-        ];
-    }
-
-    protected function getClient(): Client
-    {
-        // TODO: extract settings to config file, add proper logger
-        return new Client([
-            'host' => getenv('ELASTICSEARCH_HOST') ?: 'elasticsearch',
-            'port' => getenv('ELASTICSEARCH_PORT') ?: 9200,
-        ]);
-    }
-
-    protected function createDocuments(string $name, array $properties, array $data): void
-    {
-        try {
-            // index
-            $client = $this->getClient();
-            $index = $client->getIndex($name);
-            $index->create(['mappings' => ['properties' => $properties]], ['recreate' => true]);
-            $index->refresh();
-
-            // documents
-            if (empty($data) === false) {
-                $documents = [];
-
-                foreach ($data as $id => $item) {
-                    $normalized = array_combine(array_keys($properties), $item);
-                    $document = new Document((string) $id, $normalized);
-
-                    if (isset($normalized['type']['parent'])) {
-                        $document->setRouting($normalized['type']['parent']);
-                    }
-                    $documents[] = $document;
-                }
-                $index->addDocuments($documents);
-                $index->refresh();
-            }
-        } catch (ResponseException $exception) {
-            self::fail(\sprintf(
-                "%s\nWith path: %s\nWith query: ---------------------\n%s\n---------------------------------\n",
-                $exception->getMessage(),
-                $exception->getRequest()->getPath(),
-                json_encode($exception->getRequest()->toArray(), \JSON_THROW_ON_ERROR | \JSON_PRETTY_PRINT)
-            ));
-        }
-    }
-
-    protected function getFieldSet(bool $build = true): FieldSet
-    {
-        $builder = $this->getFactory()->createFieldSetBuilder();
-
-        // Customer (by invoice relation)
-        $builder->add('customer-first-name', TextType::class);
-        $builder->add('customer-last-name', TextType::class);
-        $builder->add('customer-name', TextType::class);
-        $builder->add('@customer-name', OrderFieldType::class);
-        $builder->add('customer-birthday', BirthdayType::class, ['pattern' => 'yyyy-MM-dd']);
-        $builder->add('@customer-birthday', OrderFieldType::class, ['type' => BirthdayType::class]);
-        $builder->add('@customer-pubdate', OrderFieldType::class, ['type' => DateType::class]);
-        $builder->add('@customer-note-pubdate', OrderFieldType::class, ['type' => DateType::class]);
-        $builder->add('customer-comment', TextType::class);
-        $builder->add('customer-comment-restricted', TextType::class);
-
-        // Invoice
-        $builder->add('id', IntegerType::class);
-        $builder->add('@id', OrderFieldType::class, ['default' => 'ASC']);
-        $builder->add('customer', IntegerType::class);
-        $builder->add('label', TextType::class);
-        $builder->add('pub-date', DateType::class, ['pattern' => 'yyyy-MM-dd']);
-        $builder->add('@pub-date', OrderFieldType::class, ['type' => DateType::class]);
-        $builder->add('pub-date-time', DateTimeType::class, ['pattern' => 'yyyy-MM-dd HH:mm:ss', 'allow_relative' => true]);
-        $builder->add('status', ChoiceType::class, ['choices' => ['concept' => 0, 'published' => 1, 'paid' => 2, 'overdue' => 3]]);
-        $builder->add('total', MoneyType::class);
-        $builder->add('@total', OrderFieldType::class);
-
-        // Invoice Details
-        $builder->add('row-label', TextType::class);
-        $builder->add('row-quantity', IntegerType::class);
-        $builder->add('row-price', MoneyType::class);
-        $builder->add('row-total', MoneyType::class);
-
-        return $builder->getFieldSet('invoice');
-    }
-
-    protected function configureConditionGenerator(QueryConditionGenerator $conditionGenerator): void
-    {
-        // customer
-        $conditionGenerator->registerField('customer-comment', 'customers/customers/#note>comment');
-        $conditionGenerator->registerField(
-            'customer-comment-restricted',
-            'customers/customers/#note>comment',
-            [
-                // restrict by note author's first name
-                'customers/customers/#note>first_name' => 'moe',
-            ]
-        );
-
-        $conditionGenerator->registerField('@customer-pubdate', '/customers/customers#pubdate', [
-            '#type' => 'customer',
-        ]);
-
-        $conditionGenerator->registerField('@customer-note-pubdate', '/customers/customers#note>pubdate', [
-            '#type' => 'customer',
-        ]);
-
-        // invoice
-        $conditionGenerator->registerField('id', 'invoices/invoices#_id');
-        $conditionGenerator->registerField('@id', 'invoices/invoices#_id');
-        $conditionGenerator->registerField('pub-date', 'invoices/invoices#pubdate');
-        $conditionGenerator->registerField('@pub-date', 'invoices/invoices#pubdate');
-        $conditionGenerator->registerField('pub-date-time', 'invoices/invoices#pubdatetime');
-        $conditionGenerator->registerField('label', '/invoices/invoices#label');
-        $conditionGenerator->registerField('status', '/invoices/invoices#status');
-        $conditionGenerator->registerField('total', '/invoices/invoices#price_total');
-        $conditionGenerator->registerField('@total', '/invoices/invoices#price_total', [], ['price_total' => ['unmapped_type' => 'long']]);
-
-        // invoice.customer
-        $conditionGenerator->registerField('customer', 'invoices/invoices#customer.id');
-        $conditionGenerator->registerField('customer-name', 'invoices/invoices#customer.full_name');
-        $conditionGenerator->registerField('@customer-name', 'invoices/invoices#customer.full_name.keyword');
-        $conditionGenerator->registerField('customer-birthday', 'invoices/invoices#customer.birthday');
-        $conditionGenerator->registerField('@customer-birthday', 'invoices/invoices#customer.birthday');
-
-        // invoice.item[]
-        $conditionGenerator->registerField('row-label', 'invoices/invoices#items[].label');
-        $conditionGenerator->registerField('row-price', 'invoices/invoices#items[].price');
-        $conditionGenerator->registerField('row-quantity', 'invoices/invoices#items[].quantity');
-        $conditionGenerator->registerField('row-total', 'invoices/invoices#items[].total');
-    }
-
-    /**
-     * @param int[] $expectedIds
-     */
-    protected function assertDocumentsAreFound(SearchCondition $condition, array $expectedIds): void
-    {
-        $conditionGenerator = new QueryConditionGenerator($condition);
-        $this->configureConditionGenerator($conditionGenerator);
-
-        $mappings = $conditionGenerator->getMappings();
-        $query = $conditionGenerator->getQuery();
-
-        $search = new Search($this->getClient());
-
-        foreach ($mappings as $mapping) {
-            $search->addIndex($mapping->indexName);
-        }
-
-        try {
-            $results = $search->search($query);
-            $documents = $results->getDocuments();
-            $foundIds = array_map(
-                static fn (Document $document): string => (string) $document->getId(),
-                $documents
-            );
-        } catch (ResponseException $exception) {
-            self::fail(\sprintf(
-                "%s\nWith path: %s\nWith query: ---------------------\n%s\n---------------------------------\n",
-                $exception->getMessage(),
-                $search->getPath(),
-                json_encode($query->toArray(), \JSON_THROW_ON_ERROR | \JSON_PRETTY_PRINT)
-            ));
-        }
-
-        self::assertSame(
-            array_map(strval(...), $expectedIds),
-            $foundIds,
-            \sprintf(
-                "Found these records instead: \n%s\n"
-                . "With query: ---------------------\n%s\n---------------------------------\n",
-                var_export($documents, true),
-                json_encode($query->toArray(), \JSON_THROW_ON_ERROR | \JSON_PRETTY_PRINT)
-            )
-        );
-    }
-}
diff --git a/lib/Elasticsearch/Tests/QueryConditionGeneratorTest.php b/lib/Elasticsearch/Tests/QueryConditionGeneratorTest.php
deleted file mode 100644
index 926ae06f..00000000
--- a/lib/Elasticsearch/Tests/QueryConditionGeneratorTest.php
+++ /dev/null
@@ -1,1363 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Tests\Elasticsearch;
-
-use Rollerworks\Component\Search\Elasticsearch\FieldMapping;
-use Rollerworks\Component\Search\Elasticsearch\QueryConditionGenerator;
-use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\ParameterBag;
-use Rollerworks\Component\Search\SearchConditionBuilder;
-use Rollerworks\Component\Search\SearchOrder;
-use Rollerworks\Component\Search\SearchPrimaryCondition;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Rollerworks\Component\Search\Value\Compare;
-use Rollerworks\Component\Search\Value\ExcludedRange;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Rollerworks\Component\Search\Value\Range;
-use Rollerworks\Component\Search\Value\ValuesBag;
-use Rollerworks\Component\Search\Value\ValuesGroup;
-
-/**
- * @group unit
- *
- * @internal
- */
-final class QueryConditionGeneratorTest extends SearchIntegrationTestCase
-{
-    /**
-     * @test
-     */
-    public function it_throws_a_logic_exception_if_referencing_a_field_not_in_fieldset(): void
-    {
-        $this->expectException(UnknownFieldException::class);
-
-        $condition = $this->createCondition()
-            ->field('unknown')
-                ->addSimpleValue('nope')
-            ->end()
-        ->getSearchCondition()
-        ;
-        $generator = new QueryConditionGenerator($condition);
-
-        self::assertEquals([
-            'query' => [
-                'match_all' => new \stdClass(),
-            ],
-        ], $generator->getQuery()->toArray());
-    }
-
-    /**
-     * @test
-     */
-    public function it_generates_an_match_all_query_for_empty_condition(): void
-    {
-        $condition = $this->createCondition()->getSearchCondition();
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('id', 'id');
-        $generator->registerField('name', 'name');
-
-        self::assertEquals([
-            'query' => [
-                'match_all' => new \stdClass(),
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping([], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_generates_a_structure_of_root_level_fields(): void
-    {
-        $condition = $this->createCondition()
-            ->field('id')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->field('name')
-                ->addSimpleValue('Doctor')
-                ->addSimpleValue('Foo')
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('id', 'id');
-        $generator->registerField('name', 'name');
-
-        self::assertEquals([
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        [
-                            'terms' => [
-                                'id' => [
-                                    2,
-                                    5,
-                                ],
-                            ],
-                        ],
-                        [
-                            'terms' => [
-                                'name' => [
-                                    'Doctor',
-                                    'Foo',
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping(['id', 'name'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_generates_a_structure_with_or(): void
-    {
-        $condition = $this->createCondition()
-            ->group(ValuesGroup::GROUP_LOGICAL_OR)
-                // (id:1 AND name:Doctor) OR (id:2 AND name:Foo)
-                ->group()
-                    ->field('id')
-                        ->addSimpleValue(1)
-                    ->end()
-                    ->field('name')
-                        ->addSimpleValue('Doctor')
-                    ->end()
-                ->end()
-                ->group()
-                    ->field('id')
-                        ->addSimpleValue(2)
-                    ->end()
-                    ->field('name')
-                        ->addSimpleValue('Foo')
-                    ->end()
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('id', 'id');
-        $generator->registerField('name', 'name');
-
-        self::assertEquals([
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        [
-                            'bool' => [
-                                'should' => [
-                                    [
-                                        'bool' => [
-                                            'must' => [
-                                                [
-                                                    'terms' => [
-                                                        'id' => [1],
-                                                    ],
-                                                ],
-                                                [
-                                                    'terms' => [
-                                                        'name' => ['Doctor'],
-                                                    ],
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                    [
-                                        'bool' => [
-                                            'must' => [
-                                                [
-                                                    'terms' => [
-                                                        'id' => [2],
-                                                    ],
-                                                ],
-                                                [
-                                                    'terms' => [
-                                                        'name' => ['Foo'],
-                                                    ],
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping(['id', 'name'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_generates_a_structure_of_root_level_fields_with_excludes(): void
-    {
-        $condition = $this->createCondition()
-            ->field('id')
-                ->addSimpleValue(10)
-                ->addExcludedSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('id', 'id');
-        $generator->registerField('name', 'name');
-
-        self::assertEquals([
-            'query' => [
-                'bool' => [
-                    'must_not' => [
-                        [
-                            'terms' => [
-                                'id' => [5],
-                            ],
-                        ],
-                    ],
-                    'must' => [
-                        [
-                            'terms' => [
-                                'id' => [10],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping(['id'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_generates_a_simple_structure_of_nested_fields(): void
-    {
-        $condition = $this->createCondition()
-            ->field('id')
-                ->addSimpleValue(2)
-                ->addSimpleValue(5)
-            ->end()
-            ->group()
-                ->field('name')
-                    ->addSimpleValue('Doctor')
-                    ->addSimpleValue('Foo')
-                ->end()
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('id', 'id');
-        $generator->registerField('name', 'name');
-
-        self::assertEquals([
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        [
-                            'terms' => [
-                                'id' => [
-                                    2,
-                                    5,
-                                ],
-                            ],
-                        ],
-                        [
-                            'bool' => [
-                                'must' => [
-                                    [
-                                        'terms' => [
-                                            'name' => [
-                                                'Doctor',
-                                                'Foo',
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping(['id', 'name'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_generates_a_structure_with_excludes(): void
-    {
-        $condition = $this->createCondition()
-            ->field('id')
-                ->add(new Range(1, 100))
-                ->add(new ExcludedRange(10, 20))
-                ->addExcludedSimpleValue(5)
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('id', 'id');
-        $generator->registerField('name', 'name');
-
-        self::assertEquals([
-            'query' => [
-                'bool' => [
-                    'must_not' => [
-                        [
-                            'terms' => [
-                                'id' => [
-                                    5,
-                                ],
-                            ],
-                        ],
-                        [
-                            'range' => [
-                                'id' => [
-                                    'gte' => 10,
-                                    'lte' => 20,
-                                ],
-                            ],
-                        ],
-                    ],
-                    'must' => [
-                        [
-                            'range' => [
-                                'id' => [
-                                    'gte' => 1,
-                                    'lte' => 100,
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping(['id'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_generates_a_structure_with_comparisons(): void
-    {
-        $condition = $this->createCondition()
-            ->field('id')
-                ->add(new Compare(35, '<>'))
-                ->add(new Compare(45, '<>'))
-                ->add(new Compare(30, '>'))
-                ->add(new Compare(50, '<'))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('id', 'id');
-        $generator->registerField('name', 'name');
-
-        self::assertEquals([
-            'query' => [
-                'bool' => [
-                    'must_not' => [
-                        [
-                            'term' => [
-                                'id' => [
-                                    'value' => 35,
-                                ],
-                            ],
-                        ],
-                        [
-                            'term' => [
-                                'id' => [
-                                    'value' => 45,
-                                ],
-                            ],
-                        ],
-                    ],
-                    'must' => [
-                        [
-                            'id' => [
-                                'gt' => 30,
-                            ],
-                        ],
-
-                        [
-                            'id' => [
-                                'lt' => 50,
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping(['id'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_generates_a_structure_with__pattern_matchers(): void
-    {
-        $condition = $this->createCondition()
-            ->field('name')
-                ->add(new PatternMatch('foo', PatternMatch::PATTERN_STARTS_WITH))
-                ->add(new PatternMatch('fo\\\'o', PatternMatch::PATTERN_STARTS_WITH))
-                ->add(new PatternMatch('bar', PatternMatch::PATTERN_NOT_ENDS_WITH, true))
-                ->add(new PatternMatch('My name', PatternMatch::PATTERN_EQUALS))
-                ->add(new PatternMatch('Last', PatternMatch::PATTERN_NOT_EQUALS))
-                ->add(new PatternMatch('Spider', PatternMatch::PATTERN_EQUALS, true))
-                ->add(new PatternMatch('Piggy', PatternMatch::PATTERN_NOT_EQUALS, true))
-            ->end()
-        ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('id', 'id');
-        $generator->registerField('name', 'name');
-
-        self::assertEquals([
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        [
-                            'prefix' => [
-                                'name' => [
-                                    'value' => 'foo',
-                                ],
-                            ],
-                        ],
-                        [
-                            'prefix' => [
-                                'name' => [
-                                    'value' => 'fo\\\'o',
-                                ],
-                            ],
-                        ],
-                        [
-                            'term' => [
-                                'name' => [
-                                    'value' => 'My name',
-                                ],
-                            ],
-                        ],
-                        [
-                            'term' => [
-                                'name' => [
-                                    'value' => 'Spider',
-                                ],
-                            ],
-                        ],
-                    ],
-                    'must_not' => [
-                        [
-                            'wildcard' => [
-                                'name' => [
-                                    'value' => '?bar',
-                                ],
-                            ],
-                        ],
-                        [
-                            'term' => [
-                                'name' => [
-                                    'value' => 'Last',
-                                ],
-                            ],
-                        ],
-                        [
-                            'term' => [
-                                'name' => [
-                                    'value' => 'Piggy',
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping(['name'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_generates_a_structure_with_nested_queries(): void
-    {
-        $condition = $this->createCondition()
-            ->field('name')
-                ->addSimpleValue('Doctor')
-                ->addSimpleValue('Foo')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('name', 'item[].author[].name');
-
-        self::assertEquals(
-            [
-                'query' => [
-                    'bool' => [
-                        'must' => [
-                            [
-                                'nested' => [
-                                    'path' => 'item',
-                                    'query' => [
-                                        'nested' => [
-                                            'path' => 'author',
-                                            'query' => [
-                                                'terms' => [
-                                                    'author.name' => [
-                                                        'Doctor',
-                                                        'Foo',
-                                                    ],
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            $generator->getQuery()->toArray()
-        );
-
-        self::assertMapping(['name'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_applies_the_primary_condition_without_a_query(): void
-    {
-        $primaryCondition = new SearchPrimaryCondition(
-            $this->createCondition()
-                ->field('restrict')
-                    ->addSimpleValue('Some')
-                    ->addSimpleValue('Restriction')
-                ->end()
-                ->getSearchCondition()
-                ->getValuesGroup()
-        );
-
-        $condition = $this
-            ->createCondition()
-            ->getSearchCondition()
-        ;
-        $condition->setPrimaryCondition($primaryCondition);
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('restrict', 'restrict');
-
-        self::assertEquals(
-            [
-                'query' => [
-                    'bool' => [
-                        'must' => [
-                            [
-                                'terms' => [
-                                    'restrict' => [
-                                        'Some',
-                                        'Restriction',
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            $generator->getQuery()->toArray()
-        );
-
-        self::assertMapping(['restrict'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_applies_the_primary_condition_with_a_query(): void
-    {
-        $primaryCondition = new SearchPrimaryCondition(
-            $this->createCondition()
-                ->field('restrict')
-                    ->addSimpleValue('Some')
-                    ->addSimpleValue('Restriction')
-                ->end()
-                ->getSearchCondition()
-                ->getValuesGroup()
-        );
-
-        $condition = $this
-            ->createCondition()
-            ->field('name')
-                ->addSimpleValue('Doctor')
-                ->addSimpleValue('Foo')
-            ->end()
-            ->getSearchCondition()
-        ;
-        $condition->setPrimaryCondition($primaryCondition);
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('restrict', 'restrict');
-        $generator->registerField('name', 'name');
-
-        self::assertEquals(
-            [
-                'query' => [
-                    'bool' => [
-                        'must' => [
-                            [
-                                'bool' => [
-                                    'must' => [
-                                        [
-                                            'terms' => [
-                                                'restrict' => [
-                                                    'Some',
-                                                    'Restriction',
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                            [
-                                'bool' => [
-                                    'must' => [
-                                        [
-                                            'terms' => [
-                                                'name' => [
-                                                    'Doctor',
-                                                    'Foo',
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            $generator->getQuery()->toArray()
-        );
-
-        self::assertMapping(['restrict', 'name'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_looks_up_by_child_document(): void
-    {
-        $condition = $this
-            ->createCondition()
-                ->field('name')
-                    ->addSimpleValue('foo')
-                    ->addSimpleValue('bar')
-                ->end()
-            ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('name', 'child>subchild>sub.name');
-
-        self::assertEquals(
-            [
-                'query' => [
-                    'bool' => [
-                        'must' => [
-                            [
-                                'has_child' => [
-                                    'type' => 'child',
-                                    'query' => [
-                                        'has_child' => [
-                                            'type' => 'subchild',
-                                            'query' => [
-                                                'terms' => [
-                                                    'sub.name' => [
-                                                        'foo',
-                                                        'bar',
-                                                    ],
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            $generator->getQuery()->toArray()
-        );
-
-        self::assertMapping(['name'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_adds_contextual_params(): void
-    {
-        $condition = $this
-            ->createCondition()
-                ->field('name')
-                    ->addSimpleValue('foo')
-                    ->addSimpleValue('bar')
-                ->end()
-            ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition, new ParameterBag(['locale' => 'en', 'territory' => 'US']));
-        $generator->registerField('name', '/articles_{locale}/territory_{territory}#child>name');
-
-        self::assertEquals(
-            [
-                'query' => [
-                    'bool' => [
-                        'must' => [
-                            [
-                                'has_child' => [
-                                    'type' => 'child',
-                                    'query' => [
-                                        'terms' => [
-                                            'name' => [
-                                                'foo',
-                                                'bar',
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            $generator->getQuery()->toArray()
-        );
-
-        self::assertSearch(['/articles_en/territory_US'], $generator->getMappings());
-        self::assertMapping(['name'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_adds_contextual_params_to_primary_query(): void
-    {
-        $primaryCondition = new SearchPrimaryCondition(
-            $this->createCondition()
-                ->field('restrict')
-                    ->addSimpleValue('{locale}')
-                ->end()
-                ->getSearchCondition()
-            ->getValuesGroup()
-        );
-
-        $condition = $this
-            ->createCondition()
-            ->field('name')
-                ->addSimpleValue('Doctor')
-                ->addSimpleValue('Foo')
-            ->end()
-            ->getSearchCondition()
-        ;
-        $condition->setPrimaryCondition($primaryCondition);
-
-        $generator = new QueryConditionGenerator($condition, new ParameterBag(['locale' => 'en', 'territory' => 'US']));
-        $generator->registerField('restrict', 'restrict');
-        $generator->registerField('name', '/articles_{locale}/territory_{territory}#child>name');
-
-        self::assertEquals(
-            [
-                'query' => [
-                    'bool' => [
-                        'must' => [
-                            [
-                                'bool' => [
-                                    'must' => [
-                                        [
-                                            'terms' => [
-                                                'restrict' => [
-                                                    'en',
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                            [
-                                'bool' => [
-                                    'must' => [
-                                        [
-                                            'has_child' => [
-                                                'type' => 'child',
-                                                'query' => [
-                                                    'terms' => [
-                                                        'name' => [
-                                                            'Doctor',
-                                                            'Foo',
-                                                        ],
-                                                    ],
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            $generator->getQuery()->toArray()
-        );
-
-        self::assertSearch(['/articles_en/territory_US'], $generator->getMappings());
-        self::assertMapping(['name', 'restrict'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_adds_contextual_conditions_for_has_child_query(): void
-    {
-        $condition = $this
-            ->createCondition()
-                ->field('name')
-                    ->addSimpleValue('foo')
-                    ->addSimpleValue('bar')
-                ->end()
-            ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition, new ParameterBag(['locale' => 'en', 'user' => 123]));
-        $generator->registerField(
-            'name',
-            '/articles_{locale}#child>name',
-            [
-                // these are only applied if the original field is used
-                'child>user' => '{user}',
-                'another_child>user' => '{user}_{locale}',
-                'abc' => ['{user}', 345],
-            ]
-        );
-
-        self::assertEquals(
-            [
-                'query' => [
-                    'bool' => [
-                        'must' => [
-                            [
-                                'bool' => [
-                                    'must' => [
-                                        ['has_child' => [
-                                            'type' => 'child',
-                                            'query' => [
-                                                'bool' => [
-                                                    'must' => [
-                                                        [
-                                                            'terms' => [
-                                                                'name' => [
-                                                                    'foo',
-                                                                    'bar',
-                                                                ],
-                                                            ],
-                                                        ],
-                                                        [
-                                                            'terms' => [
-                                                                'user' => [123],
-                                                            ],
-                                                        ],
-                                                    ],
-                                                ],
-                                            ],
-                                        ]],
-                                        ['has_child' => [
-                                            'type' => 'another_child',
-                                            'query' => [
-                                                'terms' => [
-                                                    'user' => ['123_en'],
-                                                ],
-                                            ],
-                                        ]],
-                                        [
-                                            'terms' => [
-                                                'abc' => [
-                                                    '123',
-                                                    '345',
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            $generator->getQuery()->toArray()
-        );
-
-        self::assertSearch(['/articles_en'], $generator->getMappings());
-        self::assertMapping(['name'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_adds_sort(): void
-    {
-        $condition = $this
-            ->createCondition(true)
-            ->getSearchCondition()
-        ;
-
-        $condition->setOrder($this->createSearchOrder(['@date' => 'asc']));
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('name', '/articles#name');
-        $generator->registerField('@date', '/articles#date.keyword');
-
-        self::assertEquals(
-            [
-                'sort' => [
-                    'date.keyword' => ['order' => 'asc'],
-                ],
-                'query' => [
-                    'match_all' => new \stdClass(),
-                ],
-            ],
-            $generator->getQuery()->toArray()
-        );
-
-        self::assertSearch(['/articles'], $generator->getMappings());
-        self::assertMapping(['@date'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_adds_sort_from_primary_condition(): void
-    {
-        $primaryCondition = new SearchPrimaryCondition(
-            $this->createCondition(true)
-                ->getSearchCondition()
-                ->getValuesGroup()
-        );
-        $primaryCondition->setOrder($this->createSearchOrder(['@id' => 'desc']));
-
-        $condition = $this
-            ->createCondition(true)
-            ->getSearchCondition()
-        ;
-        $condition->setPrimaryCondition($primaryCondition);
-
-        $condition->setOrder($this->createSearchOrder(['@date' => 'asc']));
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('name', '/articles#name');
-        $generator->registerField('@date', '/articles#date.keyword');
-        $generator->registerField('@id', '/articles#_id');
-
-        self::assertEquals(
-            [
-                'sort' => [
-                    'date.keyword' => ['order' => 'asc'],
-                    '_id' => ['order' => 'desc'],
-                ],
-                'query' => [
-                    'match_all' => new \stdClass(),
-                ],
-            ],
-            $generator->getQuery()->toArray()
-        );
-
-        self::assertSearch(['/articles'], $generator->getMappings());
-        self::assertMapping(['@date', '@id'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_adds_sort_for_has_child_query(): void
-    {
-        $condition = $this
-            ->createCondition(true)
-            ->getSearchCondition()
-        ;
-        $condition->setOrder($this->createSearchOrder(['@date' => 'asc']));
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('@date', '/articles#child>date');
-
-        self::assertEquals([
-            'sort' => [
-                '_score' => ['order' => 'asc'],
-            ],
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        [
-                            'has_child' => [
-                                'type' => 'child',
-                                'score_mode' => 'max',
-                                'query' => [
-                                    'function_score' => [
-                                        'script_score' => [
-                                            'script' => '_score * doc["date"].value',
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertSearch(['/articles'], $generator->getMappings());
-        self::assertMapping(['@date'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_merges_has_child_queries_from_conditional_order_queries(): void
-    {
-        $condition = $this
-            ->createCondition(true)
-            ->getSearchCondition()
-        ;
-        $condition->setOrder($this->createSearchOrder(['@date' => 'asc']));
-
-        $generator = new QueryConditionGenerator($condition, new ParameterBag(['user' => 123]));
-        $generator->registerField('@date', '/articles#child>some.date', [
-            'child>user' => '{user}',
-        ]);
-
-        self::assertEquals([
-            'sort' => [
-                '_score' => ['order' => 'asc'],
-            ],
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        [
-                            'has_child' => [
-                                'type' => 'child',
-                                'score_mode' => 'max',
-                                'query' => [
-                                    'bool' => [
-                                        'must' => [
-                                            [
-                                                'terms' => [
-                                                    'user' => [
-                                                        123,
-                                                    ],
-                                                ],
-                                            ],
-                                            [
-                                                'function_score' => [
-                                                    'script_score' => [
-                                                        'script' => '_score * doc["some.date"].value',
-                                                    ],
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertSearch(['/articles'], $generator->getMappings());
-        self::assertMapping(['@date'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_adds_additional_options_for_nested_queries(): void
-    {
-        $condition = $this->createCondition()
-            ->field('name')
-                ->addSimpleValue('Doctor')
-                ->addSimpleValue('Foo')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('name', 'author[].name', [], [
-            'inner_hits' => [],
-        ]);
-
-        self::assertEquals([
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        [
-                            'nested' => [
-                                'path' => 'author',
-                                'query' => [
-                                    'terms' => [
-                                        'author.name' => [
-                                            'Doctor',
-                                            'Foo',
-                                        ],
-                                    ],
-                                ],
-                                'inner_hits' => [],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping(['name'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_merges_single_level_nested_queries(): void
-    {
-        $condition = $this->createCondition()
-            ->field('name')
-                ->addSimpleValue('Doctor')
-                ->addSimpleValue('Foo')
-            ->end()
-            ->field('restrict')
-                ->addSimpleValue('Some')
-                ->addSimpleValue('Restriction')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('name', 'author[].name');
-        $generator->registerField('restrict', 'author[].restrict');
-
-        self::assertEquals([
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        [
-                            'nested' => [
-                                'path' => 'author',
-                                'query' => [
-                                    'bool' => [
-                                        'must' => [
-                                            [
-                                                'terms' => [
-                                                    'author.name' => [
-                                                        'Doctor',
-                                                        'Foo',
-                                                    ],
-                                                ],
-                                            ],
-                                            [
-                                                'terms' => [
-                                                    'author.restrict' => [
-                                                        'Some',
-                                                        'Restriction',
-                                                    ],
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping(['name', 'restrict'], $generator->getMappings());
-    }
-
-    /**
-     * @test
-     */
-    public function it_merges_multiple_level_nested_queries(): void
-    {
-        self::markTestIncomplete(
-            'This test has not been implemented yet. Read #268.'
-        );
-
-        $condition = $this->createCondition()
-            ->field('name')
-                ->addSimpleValue('Doctor')
-                ->addSimpleValue('Foo')
-            ->end()
-            ->field('restrict')
-                ->addSimpleValue('Some')
-                ->addSimpleValue('Restriction')
-            ->end()
-            ->getSearchCondition()
-        ;
-
-        $generator = new QueryConditionGenerator($condition);
-        $generator->registerField('name', 'item[].author[].name');
-        $generator->registerField('restrict', 'item[].author[].restrict');
-
-        self::assertEquals([
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        [
-                            'nested' => [
-                                'path' => 'item',
-                                'query' => [
-                                    'nested' => [
-                                        'path' => 'author',
-                                        'query' => [
-                                            'bool' => [
-                                                'must' => [
-                                                    [
-                                                        'terms' => [
-                                                            'author.name' => [
-                                                                'Doctor',
-                                                                'Smith',
-                                                            ],
-                                                        ],
-                                                    ],
-                                                    [
-                                                        'terms' => [
-                                                            'author.restrict' => [
-                                                                'Some',
-                                                                'Restriction',
-                                                            ],
-                                                        ],
-                                                    ],
-                                                ],
-                                            ],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ], $generator->getQuery()->toArray());
-
-        self::assertMapping(['name', 'restrict'], $generator->getMappings());
-    }
-
-    protected function getFieldSet(bool $build = true, bool $order = false)
-    {
-        $fieldSet = parent::getFieldSet(false);
-
-        if ($order) {
-            $fieldSet->add('@date', OrderFieldType::class);
-            $fieldSet->add('@id', OrderFieldType::class, ['default' => 'DESC']);
-        }
-
-        return $build ? $fieldSet->getFieldSet() : $fieldSet;
-    }
-
-    private function createCondition(bool $order = false): SearchConditionBuilder
-    {
-        /** @var FieldSet $fieldSet */
-        $fieldSet = $this->getFieldSet(true, $order);
-
-        return SearchConditionBuilder::create($fieldSet);
-    }
-
-    private function createSearchOrder(array $fields): SearchOrder
-    {
-        $valuesGroup = new ValuesGroup();
-
-        foreach ($fields as $field => $direction) {
-            $valuesBag = new ValuesBag();
-            $valuesBag->addSimpleValue($direction);
-
-            $valuesGroup->addField($field, $valuesBag);
-        }
-
-        return new SearchOrder($valuesGroup);
-    }
-
-    /**
-     * @param string[]       $expected
-     * @param FieldMapping[] $mappings
-     */
-    private static function assertSearch(array $expected, array $mappings): void
-    {
-        $actual = [];
-
-        foreach ($mappings as $mapping) {
-            $search = null;
-
-            if ($mapping->indexName) {
-                $search = '/' . $mapping->indexName;
-
-                if ($mapping->typeName) {
-                    $search .= '/' . $mapping->typeName;
-                }
-            }
-
-            if ($search) {
-                $actual[] = $search;
-            }
-        }
-
-        sort($expected);
-        sort($actual);
-
-        self::assertEquals($expected, array_unique($actual));
-    }
-
-    /**
-     * @param string[]       $expected
-     * @param FieldMapping[] $mappings
-     */
-    private static function assertMapping(array $expected, array $mappings): void
-    {
-        $actual = [];
-
-        foreach ($mappings as $mapping) {
-            $actual[] = $mapping->fieldName;
-        }
-
-        sort($expected);
-        sort($actual);
-
-        self::assertEquals($expected, $actual);
-    }
-}
diff --git a/lib/Elasticsearch/ValueConversion.php b/lib/Elasticsearch/ValueConversion.php
deleted file mode 100644
index 41a5c516..00000000
--- a/lib/Elasticsearch/ValueConversion.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Elasticsearch;
-
-interface ValueConversion
-{
-    /**
-     * Returns the converted value as a valid Elasticsearch value.
-     */
-    public function convertValue($value);
-}
diff --git a/lib/Elasticsearch/composer.json b/lib/Elasticsearch/composer.json
deleted file mode 100644
index f171dd58..00000000
--- a/lib/Elasticsearch/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "rollerworks/search-elasticsearch",
-    "description": "ElasticSearch (Elastica) extension for RollerworksSearch",
-    "license": "MIT",
-    "type": "library",
-    "keywords": [
-        "rollerworks",
-        "search",
-        "doctrine",
-        "dbal"
-    ],
-    "authors": [
-        {
-            "name": "Sebastiaan Stok",
-            "email": "s.stok@rollercapes.net"
-        },
-        {
-            "name": "Community contributions",
-            "homepage": "https://github.com/Rollerworks/search-elasticsearch/contributors"
-        }
-    ],
-    "require": {
-        "php": "^8.1",
-        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
-        "rollerworks/search": "^2.0",
-        "ruflin/elastica": "^5.0 || ^6.0 || ^7.0"
-    },
-    "require-dev": {
-        "moneyphp/money": "^3.2.0 || ^4.0",
-        "symfony/phpunit-bridge": "^6.4 || ^7.4 || ^8.0",
-        "symfony/var-dumper": "^6.4 || ^7.4 || ^8.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\Elasticsearch\\": ""
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\Tests\\Elasticsearch\\": "Tests/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.0-dev"
-        }
-    }
-}
diff --git a/lib/Elasticsearch/phpunit.xml.dist b/lib/Elasticsearch/phpunit.xml.dist
deleted file mode 100644
index 3f1ffe01..00000000
--- a/lib/Elasticsearch/phpunit.xml.dist
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
->
-    <php>
-        <ini name="error_reporting" value="-1"/>
-        <ini name="date.timezone" value="UTC"/>
-        <ini name="intl.default_locale" value="en"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="memory_limit" value="-1"/>
-
-        <env name="ELASTICSEARCH_HOST" value="localhost"/>
-        <env name="ELASTICSEARCH_PORT" value="59200"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="RollerworksSearch Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-        </exclude>
-    </groups>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./vendor/</directory>
-                <directory>./Tests/</directory>
-                <directory>./bin/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/lib/Symfony/SearchBundle/.gitattributes b/lib/Symfony/SearchBundle/.gitattributes
deleted file mode 100644
index fbd8056d..00000000
--- a/lib/Symfony/SearchBundle/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-/Tests/ export-ignore
-/phpunit.xml.dist export-ignore
-.git* export-ignore
diff --git a/lib/Symfony/SearchBundle/.gitignore b/lib/Symfony/SearchBundle/.gitignore
deleted file mode 100644
index 207f97e0..00000000
--- a/lib/Symfony/SearchBundle/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/vendor/
-/composer.lock
-/phpunit.xml
diff --git a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/DoctrineOrmPass.php b/lib/Symfony/SearchBundle/DependencyInjection/Compiler/DoctrineOrmPass.php
deleted file mode 100644
index 6365d4e7..00000000
--- a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/DoctrineOrmPass.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\DependencyInjection\Compiler;
-
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\AgeFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\CastFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\CountChildrenFunction;
-use Rollerworks\Component\Search\Doctrine\Orm\Extension\Functions\MoneyCastFunction;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Compiler pass to register Doctrine ORM custom string functions.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class DoctrineOrmPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        if (! $container->hasParameter('rollerworks_search.doctrine.orm.entity_managers')
-            || ! $container->hasParameter('doctrine.default_entity_manager')
-        ) {
-            return;
-        }
-
-        $entityManagers = $container->getParameterBag()->resolveValue(
-            $container->getParameter('rollerworks_search.doctrine.orm.entity_managers')
-        );
-
-        // Assume Doctrine ORM is not enabled in the DoctrineBundle
-        if (['default'] === $entityManagers && ! $container->hasDefinition('doctrine.orm.default_configuration')) {
-            return;
-        }
-
-        foreach ($entityManagers as $entityManager) {
-            $ormConfigDef = $container->findDefinition('doctrine.orm.' . $entityManager . '_configuration');
-            $ormConfigDef->addMethodCall('addCustomStringFunction', ['SEARCH_CONVERSION_CAST', CastFunction::class]);
-            $ormConfigDef->addMethodCall('addCustomNumericFunction', ['SEARCH_CONVERSION_AGE', AgeFunction::class]);
-            $ormConfigDef->addMethodCall('addCustomNumericFunction', ['SEARCH_COUNT_CHILDREN', CountChildrenFunction::class]);
-            $ormConfigDef->addMethodCall('addCustomNumericFunction', ['SEARCH_MONEY_AS_NUMERIC', MoneyCastFunction::class]);
-        }
-    }
-}
diff --git a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/ElasticaClientPass.php b/lib/Symfony/SearchBundle/DependencyInjection/Compiler/ElasticaClientPass.php
deleted file mode 100644
index ed468997..00000000
--- a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/ElasticaClientPass.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\DependencyInjection\Compiler;
-
-use Elastica\Client as ElasticaClient;
-use JoliCode\Elastically\Client as ElasticallyClient;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-class ElasticaClientPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        if ($container->has('fos_elastica.client')) {
-            $container->setAlias('rollerworks_search.elasticsearch.client', 'fos_elastica.client');
-
-            return;
-        }
-
-        if ($container->has(ElasticaClient::class)) {
-            $container->setAlias('rollerworks_search.elasticsearch.client', ElasticaClient::class);
-
-            return;
-        }
-
-        if ($container->has(ElasticallyClient::class)) {
-            $container->setAlias('rollerworks_search.elasticsearch.client', ElasticallyClient::class);
-        }
-    }
-}
diff --git a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/ExporterPass.php b/lib/Symfony/SearchBundle/DependencyInjection/Compiler/ExporterPass.php
deleted file mode 100644
index 5b077fc0..00000000
--- a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/ExporterPass.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ServiceLocator;
-
-/**
- * Compiler pass to register tagged services for an exporter.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class ExporterPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        if (! $container->hasDefinition('rollerworks_search.exporter_loader')) {
-            return;
-        }
-
-        $exporters = [];
-        $exportersServices = [];
-
-        foreach ($container->findTaggedServiceIds('rollerworks_search.condition_exporter') as $serviceId => $tag) {
-            if (! isset($tag[0]['format'])) {
-                throw new InvalidArgumentException(\sprintf('"rollerworks_search.condition_exporter" tagged services must have the format configured using the format attribute, none was configured for the "%s" service.', $serviceId));
-            }
-
-            $exporters[$tag[0]['format']] = $serviceId;
-            $exportersServices[$serviceId] = new ServiceClosureArgument(new Reference($serviceId));
-        }
-
-        $definition = $container->getDefinition('rollerworks_search.exporter_loader');
-        $definition->replaceArgument(0, (new Definition(ServiceLocator::class, [$exportersServices]))->addTag('container.service_locator'));
-        $definition->replaceArgument(1, $exporters);
-    }
-}
diff --git a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/ExtensionPass.php b/lib/Symfony/SearchBundle/DependencyInjection/Compiler/ExtensionPass.php
deleted file mode 100644
index 978d6fa0..00000000
--- a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/ExtensionPass.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
-use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ServiceLocator;
-
-/**
- * Adds all services with the tags "rollerworks_search.type" and
- * "rollerworks_search.type_extension" as arguments of the
- * "rollerworks_search.extension" service.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class ExtensionPass implements CompilerPassInterface
-{
-    use PriorityTaggedServiceTrait;
-
-    public function __construct(
-        private string $fieldExtensionService = 'rollerworks_search.extension',
-        private string $fieldTypeTag = 'rollerworks_search.type',
-        private string $fieldTypeExtensionTag = 'rollerworks_search.type_extension',
-    ) {
-    }
-
-    public function process(ContainerBuilder $container): void
-    {
-        if (! $container->hasDefinition($this->fieldExtensionService)) {
-            return;
-        }
-
-        $definition = $container->getDefinition($this->fieldExtensionService);
-        $definition->replaceArgument(0, $this->processTypes($container));
-        $definition->replaceArgument(1, $this->processTypeExtensions($container));
-    }
-
-    private function processTypes(ContainerBuilder $container): Definition
-    {
-        // Get service locator argument
-        $servicesMap = [];
-
-        // Builds an array with fully-qualified type class names as keys and service IDs as values
-        foreach ($container->findTaggedServiceIds($this->fieldTypeTag) as $serviceId => $tag) {
-            $serviceDefinition = $container->getDefinition($serviceId);
-            // Add field type service to the service locator
-            $servicesMap[$serviceDefinition->getClass()] = new ServiceClosureArgument(new Reference($serviceId));
-        }
-
-        return (new Definition(ServiceLocator::class, [$servicesMap]))->addTag('container.service_locator');
-    }
-
-    private function processTypeExtensions(ContainerBuilder $container): array
-    {
-        $typeExtensions = [];
-
-        foreach ($this->findAndSortTaggedServices($this->fieldTypeExtensionTag, $container) as $reference) {
-            $serviceId = (string) $reference;
-            $serviceDefinition = $container->getDefinition($serviceId);
-            $tag = $serviceDefinition->getTag($this->fieldTypeExtensionTag);
-
-            if (! isset($tag[0]['extended_type'])) {
-                throw new InvalidArgumentException(\sprintf('"%s" tagged services must have the extended type configured using the extended_type/extended-type attribute, none was configured for the "%s" service.', $this->fieldTypeExtensionTag, $serviceId));
-            }
-
-            $extendedType = $tag[0]['extended_type'];
-            $typeExtensions[$extendedType][] = $serviceId;
-        }
-
-        $allExtensions = [];
-
-        foreach ($typeExtensions as $extendedType => $extensions) {
-            $allExtensions[$extendedType] = new IteratorArgument(array_map(
-                static fn ($extensionId): Reference => new Reference($extensionId),
-                $extensions
-            ));
-        }
-
-        return $allExtensions;
-    }
-}
diff --git a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/FieldSetRegistryPass.php b/lib/Symfony/SearchBundle/DependencyInjection/Compiler/FieldSetRegistryPass.php
deleted file mode 100644
index ea80d10b..00000000
--- a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/FieldSetRegistryPass.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ServiceLocator;
-
-/**
- * Compiler pass to register tagged FieldSet's for the FieldSetRegistry.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class FieldSetRegistryPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        if (! $container->hasDefinition('rollerworks_search.fieldset_registry')) {
-            return;
-        }
-
-        $fieldSetServices = [];
-        $fieldSetServiceIds = [];
-
-        foreach ($container->findTaggedServiceIds('rollerworks_search.fieldset') as $serviceId => $tag) {
-            $class = $container->findDefinition($serviceId)->getClass();
-
-            $fieldSetServices[$class] = new ServiceClosureArgument(new Reference($serviceId));
-            $fieldSetServiceIds[$class] = $serviceId;
-        }
-
-        $definition = $container->getDefinition('rollerworks_search.fieldset_registry');
-        $definition->replaceArgument(0, (new Definition(ServiceLocator::class, [$fieldSetServices]))->addTag('container.service_locator'));
-        $definition->replaceArgument(1, $fieldSetServiceIds);
-    }
-}
diff --git a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/InputProcessorPass.php b/lib/Symfony/SearchBundle/DependencyInjection/Compiler/InputProcessorPass.php
deleted file mode 100644
index 8041ed8b..00000000
--- a/lib/Symfony/SearchBundle/DependencyInjection/Compiler/InputProcessorPass.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ServiceLocator;
-
-/**
- * Compiler pass to register tagged services for an input processor.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class InputProcessorPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        if (! $container->hasDefinition('rollerworks_search.input_loader')) {
-            return;
-        }
-
-        $inputProcessors = [];
-        $inputProcessorServices = [];
-
-        foreach ($container->findTaggedServiceIds('rollerworks_search.input_processor') as $serviceId => $tag) {
-            if (! isset($tag[0]['format'])) {
-                throw new InvalidArgumentException(\sprintf('"rollerworks_search.input_processor" tagged services must have the format configured using the format attribute, none was configured for the "%s" service.', $serviceId));
-            }
-
-            $inputProcessorServices[$serviceId] = new ServiceClosureArgument(new Reference($serviceId));
-            $inputProcessors[$tag[0]['format']] = $serviceId;
-        }
-
-        $definition = $container->getDefinition('rollerworks_search.input_loader');
-        $definition->replaceArgument(0, (new Definition(ServiceLocator::class, [$inputProcessorServices]))->addTag('container.service_locator'));
-        $definition->replaceArgument(1, $inputProcessors);
-    }
-}
diff --git a/lib/Symfony/SearchBundle/DependencyInjection/Configuration.php b/lib/Symfony/SearchBundle/DependencyInjection/Configuration.php
deleted file mode 100644
index bd65e1fb..00000000
--- a/lib/Symfony/SearchBundle/DependencyInjection/Configuration.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\DependencyInjection;
-
-use Rollerworks\Component\Search\ApiPlatform\EventListener\SearchConditionListener;
-use Rollerworks\Component\Search\Doctrine\Dbal\DoctrineDbalFactory;
-use Rollerworks\Component\Search\Doctrine\Orm\DoctrineOrmFactory;
-use Rollerworks\Component\Search\Elasticsearch\ElasticsearchFactory;
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-
-final class Configuration implements ConfigurationInterface
-{
-    public function getConfigTreeBuilder(): TreeBuilder
-    {
-        $treeBuilder = new TreeBuilder('rollerworks_search');
-        $rootNode = $treeBuilder->getRootNode();
-
-        $this->addDoctrineSection($rootNode);
-        $this->addApiPlatformSection($rootNode);
-        $this->addElasticsearchSection($rootNode);
-
-        return $treeBuilder;
-    }
-
-    private function addDoctrineSection(ArrayNodeDefinition $rootNode): void
-    {
-        $rootNode
-             ->children()
-                 ->arrayNode('doctrine')
-                     ->validate()
-                         ->ifTrue(
-                             static fn (array $nodes): bool => $nodes['orm']['enabled'] && ! $nodes['dbal']['enabled']
-                         )
-                         ->thenInvalid('rollerworks_search.dbal must be enabled when rollerworks_search.orm is enabled')
-                     ->end()
-                     ->addDefaultsIfNotSet()
-                     ->children()
-                         ->arrayNode('dbal')
-                             ->{class_exists(DoctrineDbalFactory::class) ? 'canBeDisabled' : 'canBeEnabled'}()
-                         ->end()
-                         ->arrayNode('orm')
-                             ->{class_exists(DoctrineOrmFactory::class) ? 'canBeDisabled' : 'canBeEnabled'}()
-                             ->fixXmlConfig('entity_manager')
-                             ->children()
-                                 ->arrayNode('entity_managers')
-                                     ->prototype('scalar')->end()
-                                 ->end()
-                             ->end()
-                         ->end()
-                     ->end()
-                 ->end()
-             ->end()
-        ;
-    }
-
-    private function addApiPlatformSection(ArrayNodeDefinition $rootNode): void
-    {
-        $rootNode
-             ->children()
-                 ->arrayNode('api_platform')
-                    ->{class_exists(SearchConditionListener::class) ? 'canBeDisabled' : 'canBeEnabled'}()
-                     ->children()
-                         ->arrayNode('doctrine_orm')
-                             ->{class_exists(DoctrineOrmFactory::class) ? 'canBeDisabled' : 'canBeEnabled'}()
-                         ->end()
-                        ->arrayNode('elasticsearch')
-                            ->{class_exists(ElasticsearchFactory::class) ? 'canBeDisabled' : 'canBeEnabled'}()
-                        ->end()
-                     ->end()
-                 ->end()
-             ->end()
-        ;
-    }
-
-    private function addElasticsearchSection(ArrayNodeDefinition $rootNode): void
-    {
-        $rootNode
-            ->children()
-                ->arrayNode('elasticsearch')
-                    ->{class_exists(ElasticsearchFactory::class) ? 'canBeDisabled' : 'canBeEnabled'}()
-                ->end()
-            ->end()
-        ;
-    }
-}
diff --git a/lib/Symfony/SearchBundle/DependencyInjection/RollerworksSearchExtension.php b/lib/Symfony/SearchBundle/DependencyInjection/RollerworksSearchExtension.php
deleted file mode 100644
index 2fe19db7..00000000
--- a/lib/Symfony/SearchBundle/DependencyInjection/RollerworksSearchExtension.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\DependencyInjection;
-
-use ApiPlatform\Symfony\Bundle\DependencyInjection\ApiPlatformExtension;
-use Rollerworks\Component\Search\ApiPlatform\Exception\InvalidConditionException;
-use Rollerworks\Component\Search\Extension\Symfony\Validator\InputValidator;
-use Rollerworks\Component\Search\Field\FieldType;
-use Rollerworks\Component\Search\Field\FieldTypeExtension;
-use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\FieldSetConfigurator;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\LogicException;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Translation\Translator;
-
-class RollerworksSearchExtension extends Extension implements PrependExtensionInterface
-{
-    public function load(array $configs, ContainerBuilder $container): void
-    {
-        $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-        $loader->load('services.php');
-        $loader->load('input_processor.php');
-        $loader->load('condition_exporter.php');
-
-        $container->registerForAutoconfiguration(FieldType::class)
-            ->addTag('rollerworks_search.type')
-        ;
-        $container->registerForAutoconfiguration(FieldTypeExtension::class)
-            ->addTag('rollerworks_search.type_extension')
-        ;
-        $container->registerForAutoconfiguration(FieldSetConfigurator::class)
-            ->addTag('rollerworks_search.fieldset')
-        ;
-
-        $configuration = $this->getConfiguration($configs, $container);
-        $config = $this->processConfiguration($configuration, $configs);
-
-        if ($this->isConfigEnabled($container, $config['doctrine']['dbal'])) {
-            $loader->load('doctrine_dbal.php');
-
-            if ($this->isConfigEnabled($container, $config['doctrine']['orm'])) {
-                $loader->load('doctrine_orm.php');
-                $container->setParameter(
-                    'rollerworks_search.doctrine.orm.entity_managers',
-                    $config['doctrine']['orm']['entity_managers'] ?: ['default']
-                );
-            }
-        }
-
-        if ($this->isConfigEnabled($container, $config['elasticsearch'])) {
-            $loader->load('elasticsearch.php');
-        }
-
-        if (class_exists(InputValidator::class)) {
-            $loader->load('input_validator.php');
-        }
-
-        if (class_exists(Translator::class)) {
-            $loader->load('translator_alias_resolver.php');
-        }
-
-        if ($this->isConfigEnabled($container, $config['api_platform'])) {
-            $loader->load('api_platform.php');
-
-            if ($this->isConfigEnabled($container, $config['api_platform']['doctrine_orm'])) {
-                $loader->load('api_platform_doctrine_orm.php');
-            }
-
-            if ($this->isConfigEnabled($container, $config['api_platform']['elasticsearch'])) {
-                if (! $this->isConfigEnabled($container, $config['elasticsearch'])) {
-                    throw new LogicException('API Platform Elasticsearch support cannot be enabled as Elasticsearch is not enabled.');
-                }
-                $loader->load('api_platform_elasticsearch.php');
-            }
-        }
-    }
-
-    public function getConfiguration(array $config, ContainerBuilder $container): ?ConfigurationInterface
-    {
-        return new Configuration();
-    }
-
-    public function prepend(ContainerBuilder $container): void
-    {
-        $container->prependExtensionConfig('framework', [
-            'cache' => [
-                'pools' => [
-                    'rollerworks.search_processor.cache' => [
-                        'adapter' => 'cache.adapter.psr6',
-                        'provider' => 'rollerworks_search.cache.adapter.array',
-                    ],
-                ],
-            ],
-        ]);
-
-        if (class_exists(Translator::class)) {
-            $container->prependExtensionConfig('framework', [
-                'translator' => [
-                    'paths' => [
-                        \dirname((new \ReflectionClass(FieldSet::class))->getFileName()) . '/Resources/translations',
-                    ],
-                ],
-            ]);
-        }
-
-        if (class_exists(ApiPlatformExtension::class)) {
-            $container->prependExtensionConfig('api_platform', [
-                'mapping' => [
-                    'paths' => [
-                        \dirname((new \ReflectionClass(InvalidConditionException::class))->getFileName()),
-                    ],
-                ],
-            ]);
-        }
-    }
-}
diff --git a/lib/Symfony/SearchBundle/LICENSE b/lib/Symfony/SearchBundle/LICENSE
deleted file mode 100644
index 73146727..00000000
--- a/lib/Symfony/SearchBundle/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2013-present Sebastiaan Stok
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/lib/Symfony/SearchBundle/README.md b/lib/Symfony/SearchBundle/README.md
deleted file mode 100644
index 958ab863..00000000
--- a/lib/Symfony/SearchBundle/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-RollerworksSearchBundle
-=======================
-
-This package provides the Symfony integration bundle for [RollerworksSearch][1].
-
-If you'd like to contribute to this project, please go the
-main [RollerworksSearch][1] repository and read the [Contributing][2] section.
-
-License
--------
-
-The source of this package is subject to the MIT license that is bundled
-with this source code in the file [LICENSE](LICENSE).
-
-[1]: https://github.com/rollerworks/RollerworksSearch
-[2]: https://github.com/rollerworks/RollerworksSearch#contributing
-
diff --git a/lib/Symfony/SearchBundle/Resources/config/api_platform.php b/lib/Symfony/SearchBundle/Resources/config/api_platform.php
deleted file mode 100644
index fb7eeee0..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/api_platform.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Component\Search\ApiPlatform\EventListener\SearchConditionListener;
-use Rollerworks\Component\Search\ApiPlatform\Metadata\DefaultConfigurationMetadataFactory;
-use Rollerworks\Component\Search\ApiPlatform\Serializer\ConditionErrorMessageNormalizer;
-use Symfony\Component\Cache\Psr16Cache;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $parameters = $container->parameters();
-    $parameters->set('api_platform.validator.serialize_payload_fields', []);
-
-    $services->set('rollerworks_search.api_platform.event_listener.condition', SearchConditionListener::class)
-        ->args([
-            service('rollerworks_search.factory'),
-            service('rollerworks_search.input_loader'),
-            service('api_platform.metadata.resource.metadata_collection_factory'),
-            service('event_dispatcher'),
-            inline_service(Psr16Cache::class)
-                ->args([service('rollerworks.search_processor.cache')]),
-        ])
-
-        // kernel.request priority must be < 8 && > 4 to be executed after the Firewall but before ReadListener
-        ->tag('kernel.event_listener', ['event' => 'kernel.request', 'method' => 'onKernelRequest', 'priority' => 5])
-    ;
-
-    // InvalidSearchConditionException handling
-    $services->set('rollerworks_search.api_platform.hydra.normalizer.invalid_search_condition', ConditionErrorMessageNormalizer::class)
-        ->tag('serializer.normalizer', ['priority' => 64])
-    ;
-
-    // MetadataFactory, execute after everything else but before caching.
-    $services->set('rollerworks_search.api_platform.metadata.resource.default_context_factory', DefaultConfigurationMetadataFactory::class)
-        ->decorate('api_platform.metadata.resource.metadata_collection_factory', null, -9)
-        ->args([service('rollerworks_search.api_platform.metadata.resource.default_context_factory.inner')])
-    ;
-};
diff --git a/lib/Symfony/SearchBundle/Resources/config/api_platform_doctrine_orm.php b/lib/Symfony/SearchBundle/Resources/config/api_platform_doctrine_orm.php
deleted file mode 100644
index e2461c67..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/api_platform_doctrine_orm.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Component\Search\ApiPlatform\Doctrine\Orm\Extension\SearchExtension;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $services->set('rollerworks_search.api_platform.doctrine.orm.query_extension.search', SearchExtension::class)
-        ->args([
-            service('request_stack'),
-            service('rollerworks_search.doctrine_orm.factory'),
-        ])
-        ->tag('api_platform.doctrine.orm.query_extension.collection', ['priority' => 32])
-    ;
-};
diff --git a/lib/Symfony/SearchBundle/Resources/config/api_platform_elasticsearch.php b/lib/Symfony/SearchBundle/Resources/config/api_platform_elasticsearch.php
deleted file mode 100644
index 67f54e73..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/api_platform_elasticsearch.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Component\Search\ApiPlatform\Elasticsearch\Extension\SearchExtension;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $services->set('rollerworks_search.api_platform.elasticsearch.query_extension.search', SearchExtension::class)
-        ->args([
-            service('request_stack'),
-            service('doctrine'),
-            service('rollerworks_search.elasticsearch.factory'),
-            service('rollerworks_search.elasticsearch.client'),
-        ])
-        ->tag('api_platform.doctrine.orm.query_extension.collection', ['priority' => 32])
-    ;
-};
diff --git a/lib/Symfony/SearchBundle/Resources/config/condition_exporter.php b/lib/Symfony/SearchBundle/Resources/config/condition_exporter.php
deleted file mode 100644
index 238729b4..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/condition_exporter.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Component\Search\Exporter\JsonExporter;
-use Rollerworks\Component\Search\Exporter\NormStringQueryExporter;
-use Rollerworks\Component\Search\Exporter\StringQueryExporter;
-use Rollerworks\Component\Search\Loader\ConditionExporterLoader;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $services->set('rollerworks_search.exporter_loader', ConditionExporterLoader::class)
-        ->args([
-            null,
-            [], // All services with tag "rollerworks_search.condition_exporter" are inserted here by ExporterPass
-        ])
-    ;
-
-    $services->set('rollerworks_search.exporter.string_query', StringQueryExporter::class)
-        ->tag('rollerworks_search.condition_exporter', ['format' => 'string_query'])
-    ;
-
-    $services->set('rollerworks_search.exporter.norm_string_query', NormStringQueryExporter::class)
-        ->tag('rollerworks_search.condition_exporter', ['format' => 'norm_string_query'])
-    ;
-
-    $services->set('rollerworks_search.condition_exporter.json', JsonExporter::class)
-        ->tag('rollerworks_search.condition_exporter', ['format' => 'json'])
-    ;
-};
diff --git a/lib/Symfony/SearchBundle/Resources/config/doctrine_dbal.php b/lib/Symfony/SearchBundle/Resources/config/doctrine_dbal.php
deleted file mode 100644
index b1599e51..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/doctrine_dbal.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\DoctrineDbalFactory;
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion\AgeDateConversion;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion\MoneyValueConversion;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\BirthdayTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\FieldTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\MoneyTypeExtension;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $services->set('rollerworks_search.doctrine_dbal.factory', DoctrineDbalFactory::class)
-        ->public()
-        ->args([service('rollerworks_search.doctrine.cache')->nullOnInvalid()])
-    ;
-
-    $services->set(FieldTypeExtension::class)
-        ->tag('rollerworks_search.type_extension', ['extended_type' => SearchFieldType::class])
-    ;
-
-    $services->set(BirthdayTypeExtension::class)
-        ->args([inline_service(AgeDateConversion::class)])
-        ->tag('rollerworks_search.type_extension', ['extended_type' => BirthdayType::class])
-    ;
-
-    $services->set(MoneyTypeExtension::class)
-        ->args([inline_service(MoneyValueConversion::class)])
-        ->tag('rollerworks_search.type_extension', ['extended_type' => MoneyType::class])
-    ;
-};
diff --git a/lib/Symfony/SearchBundle/Resources/config/doctrine_orm.php b/lib/Symfony/SearchBundle/Resources/config/doctrine_orm.php
deleted file mode 100644
index 33215ae7..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/doctrine_orm.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Component\Search\Doctrine\Orm\DoctrineOrmFactory;
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type\ChildCountType;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\BirthdayTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\FieldTypeExtension;
-use Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\MoneyTypeExtension;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $services->set('rollerworks_search.doctrine_orm.factory', DoctrineOrmFactory::class)
-        ->public()
-        ->args([service('rollerworks_search.doctrine.cache')->nullOnInvalid()])
-    ;
-
-    $services->set(FieldTypeExtension::class)
-        ->tag('rollerworks_search.type_extension', ['extended_type' => SearchFieldType::class])
-    ;
-
-    $services->set(BirthdayTypeExtension::class)
-        ->tag('rollerworks_search.type_extension', ['extended_type' => BirthdayType::class])
-    ;
-
-    $services->set(\Rollerworks\Component\Search\Extension\Doctrine\Orm\Type\ChildCountType::class)
-        ->tag('rollerworks_search.type_extension', ['extended_type' => ChildCountType::class])
-    ;
-
-    $services->set(MoneyTypeExtension::class)
-        ->tag('rollerworks_search.type_extension', ['extended_type' => MoneyType::class])
-    ;
-};
diff --git a/lib/Symfony/SearchBundle/Resources/config/elasticsearch.php b/lib/Symfony/SearchBundle/Resources/config/elasticsearch.php
deleted file mode 100644
index 07e39025..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/elasticsearch.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Component\Search\Elasticsearch\ElasticsearchFactory;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Conversion\CurrencyConversion;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Conversion\DateConversion;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Conversion\DateTimeConversion;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Type\BirthdayTypeExtension;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Type\DateTimeTypeExtension;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Type\DateTypeExtension;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Type\FieldTypeExtension;
-use Rollerworks\Component\Search\Elasticsearch\Extension\Type\MoneyTypeExtension;
-use Rollerworks\Component\Search\Extension\Core\Type\BirthdayType;
-use Rollerworks\Component\Search\Extension\Core\Type\DateTimeType;
-use Rollerworks\Component\Search\Extension\Core\Type\DateType;
-use Rollerworks\Component\Search\Extension\Core\Type\MoneyType;
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $services->set('rollerworks_search.elasticsearch.factory', ElasticsearchFactory::class)
-        ->public()
-        ->args([
-            service('rollerworks_search.elasticsearch.cache')->nullOnInvalid(),
-            service('rollerworks_search.parameter_bag')->nullOnInvalid(),
-        ])
-    ;
-
-    $services->set('rollerworks_search.elasticsearch.client')
-        ->synthetic()
-    ;
-
-    $services->set(CurrencyConversion::class);
-    $services->set(DateConversion::class);
-    $services->set(DateTimeConversion::class);
-
-    $services->set(FieldTypeExtension::class)
-        ->tag('rollerworks_search.type_extension', ['extended_type' => SearchFieldType::class])
-    ;
-
-    $services->set(BirthdayTypeExtension::class)
-        ->args([service(DateConversion::class)])
-        ->tag('rollerworks_search.type_extension', ['extended_type' => BirthdayType::class])
-    ;
-
-    $services->set(DateTypeExtension::class)
-        ->args([service(DateConversion::class)])
-        ->tag('rollerworks_search.type_extension', ['extended_type' => DateType::class])
-    ;
-
-    $services->set(DateTimeTypeExtension::class)
-        ->args([service(DateTimeConversion::class)])
-        ->tag('rollerworks_search.type_extension', ['extended_type' => DateTimeType::class])
-    ;
-
-    $services->set(MoneyTypeExtension::class)
-        ->args([service(CurrencyConversion::class)])
-        ->tag('rollerworks_search.type_extension', ['extended_type' => MoneyType::class]);
-};
diff --git a/lib/Symfony/SearchBundle/Resources/config/input_processor.php b/lib/Symfony/SearchBundle/Resources/config/input_processor.php
deleted file mode 100644
index 43192422..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/input_processor.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Component\Search\Input\JsonInput;
-use Rollerworks\Component\Search\Input\NormStringQueryInput;
-use Rollerworks\Component\Search\Input\StringQueryInput;
-use Rollerworks\Component\Search\Loader\InputProcessorLoader;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $services->set('rollerworks_search.input_loader', InputProcessorLoader::class)
-        ->args([
-            null,
-            [], // services with tag "rollerworks_search.input_processor" are inserted here by InputProcessorPass
-        ])
-    ;
-
-    $services->alias(InputProcessorLoader::class, 'rollerworks_search.input_loader');
-
-    $services->set('rollerworks_search.input.abstract', StringQueryInput::class)
-        ->abstract()
-        ->args([service('rollerworks_search.validator')->nullOnInvalid()])
-    ;
-
-    $services->set('rollerworks_search.input.string_query', StringQueryInput::class)
-        ->parent('rollerworks_search.input.abstract')
-        ->args([service('rollerworks_search.translator_based_alias_resolver')->nullOnInvalid()])
-        ->tag('rollerworks_search.input_processor', ['format' => 'string_query'])
-    ;
-
-    $services->set('rollerworks_search.input.norm_string_query', NormStringQueryInput::class)
-        ->parent('rollerworks_search.input.abstract')
-        ->tag('rollerworks_search.input_processor', ['format' => 'norm_string_query'])
-    ;
-
-    $services->set('rollerworks_search.input.json', JsonInput::class)
-        ->parent('rollerworks_search.input.abstract')
-        ->tag('rollerworks_search.input_processor', ['format' => 'json']);
-};
diff --git a/lib/Symfony/SearchBundle/Resources/config/input_validator.php b/lib/Symfony/SearchBundle/Resources/config/input_validator.php
deleted file mode 100644
index a578ca4e..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/input_validator.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Extension\Symfony\Validator\InputValidator;
-use Rollerworks\Component\Search\Extension\Symfony\Validator\Type\FieldTypeValidatorExtension;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $services->set('rollerworks_search.validator', InputValidator::class)
-        ->args([service('validator')])
-    ;
-
-    $services->set(FieldTypeValidatorExtension::class)
-        ->tag('rollerworks_search.type_extension', ['extended_type' => SearchFieldType::class])
-    ;
-};
diff --git a/lib/Symfony/SearchBundle/Resources/config/services.php b/lib/Symfony/SearchBundle/Resources/config/services.php
deleted file mode 100644
index 0773feb0..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/services.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Component\Search\Extension\LazyExtension;
-use Rollerworks\Component\Search\Field\GenericResolvedFieldTypeFactory;
-use Rollerworks\Component\Search\Field\GenericTypeRegistry;
-use Rollerworks\Component\Search\GenericSearchFactory;
-use Rollerworks\Component\Search\LazyFieldSetRegistry;
-use Rollerworks\Component\Search\ParameterBag;
-use Rollerworks\Component\Search\SearchConditionSerializer;
-use Rollerworks\Component\Search\SearchFactory;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $services->set('rollerworks_search.resolved_type_factory', GenericResolvedFieldTypeFactory::class);
-
-    $services->set('rollerworks_search.fieldset_registry', LazyFieldSetRegistry::class)
-        ->args([
-            null,
-            [], // All services with tag "rollerworks_search.fieldset" are inserted here by FieldSetRegistryPass
-        ])
-    ;
-
-    $services->set('rollerworks_search.condition_serializer', SearchConditionSerializer::class)
-        ->args([service('rollerworks_search.factory')])
-    ;
-
-    $services->set('rollerworks_search.type_registry', GenericTypeRegistry::class)
-        ->args([
-            // We don't need to be able to add more extensions.
-            //   * more types can be registered with the rollerworks_search.type tag
-            //   * more type extensions can be registered with the rollerworks_search.type_extension tag
-            [service('rollerworks_search.extension')],
-            service('rollerworks_search.resolved_type_factory'),
-        ])
-    ;
-
-    $services->set('rollerworks_search.factory', GenericSearchFactory::class)
-        ->public()
-        ->args([
-            service('rollerworks_search.type_registry'),
-            service('rollerworks_search.fieldset_registry'),
-        ])
-    ;
-
-    $services->alias(SearchFactory::class, 'rollerworks_search.factory');
-
-    $services->set('rollerworks_search.extension', LazyExtension::class)
-        ->args([
-            null, // All services with tag "rollerworks_search.type" are inserted here by ExtensionPass
-            iterator([]), // All services with tag "rollerworks_search.type_extension" are inserted here by ExtensionPass
-        ])
-    ;
-
-    $services->set('rollerworks_search.cache.adapter.array', ArrayAdapter::class)
-        ->args([
-            0, // default lifetime
-        ])
-    ;
-
-    $services->set(ParameterBag::class);
-    $services->alias('rollerworks_search.parameter_bag', ParameterBag::class);
-};
diff --git a/lib/Symfony/SearchBundle/Resources/config/translator_alias_resolver.php b/lib/Symfony/SearchBundle/Resources/config/translator_alias_resolver.php
deleted file mode 100644
index afb8261a..00000000
--- a/lib/Symfony/SearchBundle/Resources/config/translator_alias_resolver.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Rollerworks\Bundle\SearchBundle\TranslatorBasedAliasResolver;
-use Rollerworks\Bundle\SearchBundle\Type\TranslatableFieldTypeExtension;
-use Rollerworks\Bundle\SearchBundle\Type\TranslatableOrderFieldTypeExtension;
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-
-return static function (ContainerConfigurator $container): void {
-    $services = $container->services();
-
-    $services->set('rollerworks_search.translator_based_alias_resolver', TranslatorBasedAliasResolver::class)
-        ->args([service('translator')])
-    ;
-
-    $services->set(TranslatableFieldTypeExtension::class)
-        ->tag('rollerworks_search.type_extension', ['extended_type' => SearchFieldType::class])
-    ;
-
-    $services->set(TranslatableOrderFieldTypeExtension::class)
-        ->tag('rollerworks_search.type_extension', ['extended_type' => OrderFieldType::class])
-    ;
-};
diff --git a/lib/Symfony/SearchBundle/RollerworksSearchBundle.php b/lib/Symfony/SearchBundle/RollerworksSearchBundle.php
deleted file mode 100644
index 93ad619a..00000000
--- a/lib/Symfony/SearchBundle/RollerworksSearchBundle.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle;
-
-use Rollerworks\Bundle\SearchBundle\DependencyInjection\Compiler;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class RollerworksSearchBundle extends Bundle
-{
-    public function build(ContainerBuilder $container): void
-    {
-        $container->addCompilerPass(new Compiler\ExtensionPass());
-        $container->addCompilerPass(new Compiler\InputProcessorPass());
-        $container->addCompilerPass(new Compiler\ExporterPass());
-        $container->addCompilerPass(new Compiler\FieldSetRegistryPass());
-        $container->addCompilerPass(new Compiler\DoctrineOrmPass());
-        $container->addCompilerPass(new Compiler\ElasticaClientPass());
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Fixtures/FieldSet/UserFieldSet.php b/lib/Symfony/SearchBundle/Tests/Fixtures/FieldSet/UserFieldSet.php
deleted file mode 100644
index 77fb9f6a..00000000
--- a/lib/Symfony/SearchBundle/Tests/Fixtures/FieldSet/UserFieldSet.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Fixtures\FieldSet;
-
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\FieldSetBuilder;
-use Rollerworks\Component\Search\FieldSetConfigurator;
-
-final class UserFieldSet implements FieldSetConfigurator
-{
-    public function buildFieldSet(FieldSetBuilder $builder): void
-    {
-        $builder->add('id', IntegerType::class);
-        $builder->add('name', TextType::class);
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/ApiPlatformTest.php b/lib/Symfony/SearchBundle/Tests/Functional/ApiPlatformTest.php
deleted file mode 100644
index 72896940..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/ApiPlatformTest.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional;
-
-use Doctrine\ORM\Tools\SchemaTool;
-use Rollerworks\Component\Search\ApiPlatform\Doctrine\Orm\Extension\SearchExtension;
-use Rollerworks\Component\Search\SearchCondition;
-
-/**
- * @internal
- */
-final class ApiPlatformTest extends FunctionalTestCase
-{
-    public static function setUpBeforeClass(): void
-    {
-        if (! class_exists(SearchExtension::class)) {
-            self::markTestSkipped('rollerworks/search-api-platform is not installed.');
-        }
-
-        $client = self::newClient(['config' => 'api_platform.yml']);
-        $client->getKernel()->boot();
-
-        $em = $client->getContainer()->get('doctrine')->getManager('default');
-        $metadatas = $em->getMetadataFactory()->getAllMetadata();
-
-        $schemaTool = new SchemaTool($em);
-        $schemaTool->updateSchema($metadatas, true);
-
-        self::ensureKernelShutdown();
-    }
-
-    /**
-     * @test
-     */
-    public function empty_search_code_is_valid(): void
-    {
-        $client = self::newClient(['config' => 'api_platform.yml']);
-
-        $client->request('GET', '/books.json');
-
-        self::assertEquals('[]', $client->getResponse()->getContent());
-    }
-
-    /**
-     * @test
-     */
-    public function with_valid_condition(): void
-    {
-        $client = self::newClient(['config' => 'api_platform.yml']);
-        $client->request(
-            'GET',
-            '/books.json',
-            ['search' => 'title: Symfony;']
-        );
-
-        self::assertFalse($client->getResponse()->isRedirection());
-        self::assertInstanceOf(SearchCondition::class, $client->getRequest()->attributes->get('_api_search_condition'));
-        self::assertEquals('[]', $client->getResponse()->getContent());
-    }
-
-    /**
-     * @test
-     */
-    public function with_valid_condition_json(): void
-    {
-        $client = self::newClient(['config' => 'api_platform.yml']);
-        $client->request(
-            'GET',
-            '/books.json',
-            ['search' => '{"fields":{"title":{"simple-values":["Symfony;"]}}}']
-        );
-
-        self::assertFalse($client->getResponse()->isRedirection());
-        self::assertInstanceOf(SearchCondition::class, $client->getRequest()->attributes->get('_api_search_condition'));
-        self::assertEquals('[]', $client->getResponse()->getContent());
-    }
-
-    /**
-     * @test
-     */
-    public function invalid_condition_has_errors_in_json_format(): void
-    {
-        $client = self::newClient(['config' => 'api_platform.yml']);
-        $client->request(
-            'GET',
-            '/books.json',
-            ['search' => 'id: He;']
-        );
-
-        self::assertFalse($client->getResponse()->isRedirection());
-        self::assertEquals('/books.json?search=id%3A+He%3B', $client->getRequest()->getRequestUri());
-        self::assertNull($client->getRequest()->attributes->get('_api_search_condition'));
-        self::assertJsonStringEqualsJsonString(
-            '{
-                "@context": "/contexts/SearchViolation",
-                "@id": "/search_violations",
-                "@type": "SearchViolation",
-                "description": "[id][0]: This value is not valid.",
-                "detail": "[id][0]: This value is not valid.",
-                "status": 422,
-                "title": "The search condition is invalid",
-                "type": "https://tools.ietf.org/html/rfc2616#section-10",
-                "violations": [
-                    {
-                        "message": "This value is not valid.",
-                        "propertyPath": "[id][0]"
-                    }
-                ]
-            }',
-            $client->getResponse()->getContent(),
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function invalid_condition_has_errors_in_jsonld_format(): void
-    {
-        $client = self::newClient(['config' => 'api_platform.yml']);
-        $client->request(
-            'GET',
-            '/books.jsonld',
-            ['search' => 'id: He;']
-        );
-
-        self::assertFalse($client->getResponse()->isRedirection());
-        self::assertEquals('/books.jsonld?search=id%3A+He%3B', $client->getRequest()->getRequestUri());
-        self::assertNull($client->getRequest()->attributes->get('_api_search_condition'));
-        self::assertJsonStringEqualsJsonString(
-            '{
-                "@context": "/contexts/SearchViolation",
-                "@id": "/search_violations",
-                "@type": "SearchViolation",
-                "description": "[id][0]: This value is not valid.",
-                "detail": "[id][0]: This value is not valid.",
-                "status": 422,
-                "title": "The search condition is invalid",
-                "type": "https://tools.ietf.org/html/rfc2616#section-10",
-                "violations": [
-                    {
-                        "message": "This value is not valid.",
-                        "propertyPath": "[id][0]"
-                    }
-                ]
-            }',
-            $client->getResponse()->getContent()
-        );
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Controller/SearchController.php b/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Controller/SearchController.php
deleted file mode 100644
index 8d723f00..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Controller/SearchController.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional\Application\AppBundle\Controller;
-
-use Rollerworks\Bundle\SearchBundle\Tests\Fixtures\FieldSet\UserFieldSet;
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\Exception\InvalidSearchConditionException;
-use Rollerworks\Component\Search\Input\ProcessorConfig;
-use Rollerworks\Component\Search\Loader\InputProcessorLoader;
-use Rollerworks\Component\Search\SearchFactory;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-
-final class SearchController
-{
-    public function __construct(
-        private readonly SearchFactory $searchFactory,
-        private readonly InputProcessorLoader $inputProcessorLoader,
-        private readonly UrlGeneratorInterface $urlGenerator,
-    ) {
-    }
-
-    public function __invoke(Request $request)
-    {
-        if ($request->isMethod('POST')) {
-            return new RedirectResponse($this->urlGenerator->generate('search', ['search' => $request->request->get('search', '')]));
-        }
-
-        try {
-            $inputProcessor = $this->inputProcessorLoader->get('string_query');
-            $processorConfig = new ProcessorConfig($this->searchFactory->createFieldSet(UserFieldSet::class));
-
-            $condition = $inputProcessor->process($processorConfig, $query = $request->query->get('search', ''));
-
-            if ($condition->isEmpty()) {
-                return new Response('VALID: EMPTY');
-            }
-
-            return new Response('VALID: ' . ($query ?: 'EMPTY'));
-        } catch (InvalidSearchConditionException $e) {
-            return new Response(
-                'INVALID: <ul>' . implode(
-                    "\n",
-                    array_map(
-                        static fn (ConditionErrorMessage $e): string => '<li>' . $e->message . '</li>',
-                        $e->getErrors()
-                    )
-                ) . '</ul>',
-                500
-            );
-        }
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Entity/Book.php b/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Entity/Book.php
deleted file mode 100644
index 45c6e3fe..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Entity/Book.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional\Application\AppBundle\Entity;
-
-use ApiPlatform\Metadata\ApiProperty;
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\GetCollection;
-use Doctrine\ORM\Mapping as ORM;
-use Rollerworks\Bundle\SearchBundle\Tests\Functional\Application\AppBundle\Search\FieldSet\BookFieldSet;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @see http://schema.org/Book Documentation on Schema.org
- */
-#[ApiResource(operations: [
-    new GetCollection(
-        extraProperties: [
-            'rollerworks_search' => [
-                'contexts' => [
-                    '_defaults' => [
-                        'fieldset' => BookFieldSet::class,
-                    ],
-                    '_any' => [
-                        'doctrine_orm' => [
-                            'mappings' => [
-                                'id' => 'id',
-                                'title' => 'title',
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ]
-    ),
-])]
-#[ORM\Entity] class Book
-{
-    #[ORM\Id]
-    #[ORM\Column(type: 'integer')]
-    #[ORM\GeneratedValue(strategy: 'AUTO')]
-    #[ApiProperty(identifier: true)]
-    private int $id;
-
-    /** @var string The ISBN of the book */
-    #[Assert\Type(type: 'string')]
-    #[Assert\Isbn]
-    #[ORM\Column(nullable: true)]
-    private string $isbn;
-
-    /** @var string The title of the book */
-    #[Assert\Type(type: 'string')]
-    #[Assert\NotBlank]
-    #[ORM\Column]
-    private string $title;
-
-    /** @var string A description of the item */
-    #[Assert\NotBlank]
-    #[Assert\Type(type: 'string')]
-    #[ORM\Column(type: 'text')]
-    private string $description;
-
-    /**
-     * @var string The author of this content or rating. Please note that author is special in that HTML 5 provides a special mechanism
-     *             for indicating authorship via the rel tag. That is equivalent to this and may be used interchangeably
-     */
-    #[Assert\Type(type: 'string')]
-    #[Assert\NotBlank]
-    #[ORM\Column]
-    private string $author;
-
-    /** @var \DateTimeImmutable The date on which the CreativeWork was created or the item was added to a DataFeed */
-    #[Assert\Date]
-    #[Assert\NotNull]
-    #[ORM\Column(type: 'date')]
-    private \DateTimeImmutable $publicationDate;
-
-    public function setId($id)
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function setIsbn($isbn)
-    {
-        $this->isbn = $isbn;
-
-        return $this;
-    }
-
-    public function getIsbn()
-    {
-        return $this->isbn;
-    }
-
-    public function setDescription($description)
-    {
-        $this->description = $description;
-
-        return $this;
-    }
-
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    public function setAuthor($author)
-    {
-        $this->author = $author;
-
-        return $this;
-    }
-
-    public function getAuthor()
-    {
-        return $this->author;
-    }
-
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-    public function setTitle($title): void
-    {
-        $this->title = $title;
-    }
-
-    public function getPublicationDate()
-    {
-        return $this->publicationDate;
-    }
-
-    public function setPublicationDate($publicationDate): void
-    {
-        $this->publicationDate = $publicationDate;
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Entity/Review.php b/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Entity/Review.php
deleted file mode 100644
index 12c52566..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Entity/Review.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional\Application\AppBundle\Entity;
-
-use ApiPlatform\Metadata\ApiResource;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * A review of an item - for example, of a restaurant, movie, or store.
- *
- * @see http://schema.org/Review Documentation on Schema.org
- */
-#[ORM\Entity]
-#[ApiResource]
-class Review
-{
-    #[ORM\Column(type: 'integer')]
-    #[ORM\GeneratedValue(strategy: 'AUTO')]
-    #[ORM\Id]
-    private int $id;
-
-    /** @var string The actual body of the review */
-    #[ORM\Column(nullable: true, type: 'text')]
-    #[Assert\Type(type: 'string')]
-    private $body;
-
-    #[ORM\Column(type: 'smallint')]
-    #[Assert\Range(min: 0, max: 5)]
-    #[Assert\Type(type: 'integer')]
-    private int $rating;
-
-    /** @var Book The item that is being reviewed/rated */
-    #[ORM\ManyToOne(targetEntity: Book::class)]
-    #[ORM\JoinColumn(nullable: false)]
-    #[Assert\NotNull]
-    private Book $book;
-
-    /** @var string Author the author of the review */
-    #[ORM\Column(nullable: true, type: 'text')]
-    private string $author;
-
-    /** @var \DateTimeImmutable Author the author of the review */
-    #[ORM\Column(type: 'datetime_immutable', nullable: true)]
-    private \DateTimeImmutable $publicationDate;
-
-    public function setId($id)
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function setRating($rating)
-    {
-        $this->rating = $rating;
-
-        return $this;
-    }
-
-    public function getRating()
-    {
-        return $this->rating;
-    }
-
-    public function getBody()
-    {
-        return $this->body;
-    }
-
-    public function setBody(string $body): void
-    {
-        $this->body = $body;
-    }
-
-    public function getBook()
-    {
-        return $this->book;
-    }
-
-    public function setBook(Book $book): void
-    {
-        $this->book = $book;
-    }
-
-    public function getAuthor()
-    {
-        return $this->author;
-    }
-
-    public function setAuthor(string $author): void
-    {
-        $this->author = $author;
-    }
-
-    public function getPublicationDate()
-    {
-        return $this->publicationDate;
-    }
-
-    public function setPublicationDate(\DateTimeImmutable $publicationDate): void
-    {
-        $this->publicationDate = $publicationDate;
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Search/FieldSet/BookFieldSet.php b/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Search/FieldSet/BookFieldSet.php
deleted file mode 100644
index 12fc85c8..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/AppBundle/Search/FieldSet/BookFieldSet.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional\Application\AppBundle\Search\FieldSet;
-
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\FieldSetBuilder;
-use Rollerworks\Component\Search\FieldSetConfigurator;
-
-final class BookFieldSet implements FieldSetConfigurator
-{
-    public function buildFieldSet(FieldSetBuilder $builder): void
-    {
-        $builder->add('id', IntegerType::class);
-        $builder->add('title', TextType::class);
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/AppKernel.php b/lib/Symfony/SearchBundle/Tests/Functional/Application/AppKernel.php
deleted file mode 100644
index b8f743ef..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/AppKernel.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional\Application;
-
-use ApiPlatform\Symfony\Bundle\ApiPlatformBundle;
-use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
-use Rollerworks\Bundle\SearchBundle\RollerworksSearchBundle;
-use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
-use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Bundle\TwigBundle\TwigBundle;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\HttpKernel\Kernel;
-
-class AppKernel extends Kernel
-{
-    use MicroKernelTrait;
-
-    private string $config;
-
-    public function __construct(string $config, $debug = true)
-    {
-        if (! (new Filesystem())->isAbsolutePath($config)) {
-            $config = __DIR__ . '/config/' . $config;
-        }
-
-        if (! file_exists($config)) {
-            throw new \RuntimeException(\sprintf('The config file "%s" does not exist.', $config));
-        }
-
-        $this->config = $config;
-
-        parent::__construct('test', $debug);
-    }
-
-    public function getProjectDir(): string
-    {
-        return __DIR__;
-    }
-
-    protected function getContainerClass(): string
-    {
-        $class = 'RSAppKernel' . ContainerBuilder::hash($this->config);
-        $class = str_replace('\\', '_', $class) . ucfirst($this->environment) . ($this->debug ? 'Debug' : '') . 'Container';
-
-        if (! preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $class)) {
-            throw new \InvalidArgumentException(\sprintf('The environment "%s" contains invalid characters, it can only contain characters allowed in PHP class names.', $this->environment));
-        }
-
-        return $class;
-    }
-
-    public function registerBundles(): iterable
-    {
-        $bundles = [
-            new FrameworkBundle(),
-            // new \Symfony\Bundle\TwigBundle\TwigBundle(),
-
-            new RollerworksSearchBundle(),
-        ];
-
-        if (class_exists(DoctrineBundle::class)) {
-            $bundles[] = new DoctrineBundle();
-        }
-
-        if (mb_substr($this->config, -16) === 'api_platform.yml') {
-            $bundles[] = new TwigBundle();
-            $bundles[] = new ApiPlatformBundle();
-        }
-
-        return $bundles;
-    }
-
-    public function registerContainerConfiguration(LoaderInterface $loader): void
-    {
-        $loader->load($this->config);
-    }
-
-    public function getCacheDir(): string
-    {
-        return $this->getProjectDir() . '/var/cache/' . mb_substr(sha1($this->config), 0, 6);
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/api_platform.yml b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/api_platform.yml
deleted file mode 100644
index f8c32ca3..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/api_platform.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-imports:
-    - { resource: framework.yml }
-    - { resource: elasticsearch.yml }
-    - { resource: 'doctrine_orm.php' }
-
-framework:
-    router:
-        enabled: true
-        resource: "%kernel.project_dir%/config/routing_api.yml"
-        strict_requirements: "%kernel.debug%"
-    validation:      ~
-    serializer:      ~
-    assets:
-        enabled: true
-    cache:
-        pools:
-            doctrine.result_cache_pool:
-                adapter: rollerworks.search_processor.cache
-            doctrine.system_cache_pool:
-                adapter: rollerworks.search_processor.cache
-
-twig:
-    debug:            "%kernel.debug%"
-    strict_variables: "%kernel.debug%"
-
-# Doctrine Configuration
-doctrine:
-    dbal:
-        driver:   pdo_sqlite
-        charset:  UTF8
-        path: "%kernel.cache_dir%/search.sqlite"
-
-    orm:
-        entity_managers:
-            default:
-                query_cache_driver:
-                    type: pool
-                    pool: doctrine.system_cache_pool
-                metadata_cache_driver:
-                    type: pool
-                    pool: doctrine.system_cache_pool
-                result_cache_driver:
-                    type: pool
-                    pool: doctrine.system_cache_pool
-
-                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
-                auto_mapping: false
-                mappings:
-                    App:
-                        is_bundle: false
-                        type: attribute
-                        dir: '%kernel.project_dir%/AppBundle/Entity'
-                        prefix: 'Rollerworks\Bundle\SearchBundle\Tests\Functional\Application\AppBundle\Entity'
-
-api_platform:
-    title:       API Platform's demo
-    description: |
-      This is a demo application of the [API Platform](https://api-platform.com) framework.
-      [Its source code](https://github.com/api-platform/demo) includes various examples, check it out!
-    mapping:
-        paths: ['%kernel.project_dir%/AppBundle/Entity']
-
-    formats:
-        jsonld:  ['application/ld+json']
-        jsonhal: ['application/hal+json']
-        xml:     ['application/xml', 'text/xml']
-        json:    ['application/json']
-        yaml:    ['application/x-yaml']
-        csv:     ['text/csv']
-        html:    ['text/html']
-
-rollerworks_search:
-    api_platform: true
-    elasticsearch: true
-    doctrine:
-        dbal: true
-        orm: true
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/default.yml b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/default.yml
deleted file mode 100644
index 5cbc30c4..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/default.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-imports:
-    - { resource: framework.yml }
-
-rollerworks_search:
-    api_platform: false
-    elasticsearch: false
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/doctrine_dbal.yml b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/doctrine_dbal.yml
deleted file mode 100644
index ca5fc556..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/doctrine_dbal.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-imports:
-    - { resource: 'framework.yml' }
-
-doctrine:
-    dbal:
-        driver: pdo_sqlite
-        path: '%kernel.cache_dir%/database.sqlite'
-        charset: UTF8
-
-rollerworks_search:
-    api_platform: false
-    elasticsearch: false
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/doctrine_orm.php b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/doctrine_orm.php
deleted file mode 100644
index 5d0c42f0..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/doctrine_orm.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    // TODO Convert doctrine_orm.yml to PHP
-
-    $containerConfigurator->extension('doctrine', [
-        'orm' => [
-            'enable_native_lazy_objects' => \PHP_VERSION_ID >= 80400,
-        ],
-    ]);
-};
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/doctrine_orm.yml b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/doctrine_orm.yml
deleted file mode 100644
index a208917e..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/doctrine_orm.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-imports:
-    - { resource: 'framework.yml' }
-    - { resource: 'doctrine_orm.php' }
-
-doctrine:
-    dbal:
-        driver: pdo_sqlite
-        path: '%kernel.cache_dir%/database.sqlite'
-        charset: UTF8
-
-    orm:
-        entity_managers:
-            default:
-                query_cache_driver:
-                    type: pool
-                    pool: doctrine.system_cache_pool
-                metadata_cache_driver:
-                    type: pool
-                    pool: doctrine.system_cache_pool
-                result_cache_driver:
-                    type: pool
-                    pool: doctrine.system_cache_pool
-
-                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
-                auto_mapping: false
-
-            secondary:
-                query_cache_driver:
-                    type: pool
-                    pool: doctrine.system_cache_pool
-                metadata_cache_driver:
-                    type: pool
-                    pool: doctrine.system_cache_pool
-                result_cache_driver:
-                    type: pool
-                    pool: doctrine.system_cache_pool
-
-                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
-                auto_mapping: false
-
-rollerworks_search:
-    api_platform: false
-    elasticsearch: false
-
-framework:
-    cache:
-        pools:
-            doctrine.result_cache_pool:
-                adapter: rollerworks.search_processor.cache
-            doctrine.system_cache_pool:
-                adapter: rollerworks.search_processor.cache
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/elasticsearch.yml b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/elasticsearch.yml
deleted file mode 100644
index 8ed62cbf..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/elasticsearch.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-imports:
-    - { resource: 'framework.yml' }
-
-rollerworks_search:
-    api_platform: false
-    doctrine:
-        dbal: false
-        orm: false
-    elasticsearch: true
-
-services:
-    'Elastica\Client':
-        arguments:
-            - { host: localhost, port: 9200 }
-            - null
-            - '@logger'
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/framework.yml b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/framework.yml
deleted file mode 100644
index 3dca2bf6..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/framework.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-framework:
-    translator: { fallback: en }
-    secret: test
-    router:
-        enabled: false
-        resource: "%kernel.project_dir%/config/routing.yml"
-        strict_requirements: "%kernel.debug%"
-    form: false
-    csrf_protection: false
-    validation: ~
-    default_locale: en
-    session:
-        handler_id: null
-        cookie_secure: auto
-        cookie_samesite: lax
-        storage_factory_id: "session.storage.factory.mock_file"
-    test: true
-    assets: false
-
-    cache:
-        pools:
-            rollerworks.search_processor.cache:
-                default_lifetime: 300
-
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/routing.yml b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/routing.yml
deleted file mode 100644
index 541e4472..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/routing.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-search:
-    path: /search
-    defaults: { _controller: 'Rollerworks\Bundle\SearchBundle\Tests\Functional\Application\AppBundle\Controller\SearchController' }
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/routing_api.yml b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/routing_api.yml
deleted file mode 100644
index 4255ac94..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/routing_api.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-api:
-    resource: '.'
-    type:     'api_platform'
-
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/schema.yml b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/schema.yml
deleted file mode 100644
index 482b83a6..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/schema.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-types:
-    Book:
-        parent: false
-        properties:
-            isbn: ~
-            name: { nullable: false }
-            description: { nullable: false }
-            author: { range: Text, nullable: false }
-            publicationDate: { nullable: false }
-    Review:
-        parent: false
-        properties:
-            body: ~
-            rating: { range: Integer, nullable: false } # This is a custom field that doesn't exist in the vocab
-            itemReviewed: { range: Book, nullable: false, cardinality: '(*..1)' }
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/search_processor.yml b/lib/Symfony/SearchBundle/Tests/Functional/Application/config/search_processor.yml
deleted file mode 100644
index a0ce2f77..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/Application/config/search_processor.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-imports:
-    - { resource: framework.yml }
-
-framework:
-    router:
-        enabled: true
-        resource: "%kernel.project_dir%/config/routing.yml"
-        strict_requirements: "%kernel.debug%"
-
-rollerworks_search:
-    api_platform: false
-
-# Register the Controller as service to ensure autowiring can work
-services:
-    'Rollerworks\Bundle\SearchBundle\Tests\Functional\Application\AppBundle\Controller\SearchController':
-        autowire: true
-        public: true
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/BootTest.php b/lib/Symfony/SearchBundle/Tests/Functional/BootTest.php
deleted file mode 100644
index 5973353e..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/BootTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional;
-
-use Rollerworks\Bundle\SearchBundle\Tests\Fixtures\FieldSet\UserFieldSet;
-use Rollerworks\Component\Search\SearchFactory;
-
-/**
- * @internal
- */
-final class BootTest extends FunctionalTestCase
-{
-    /**
-     * @test
-     */
-    public function it_can_boot_the_application(): void
-    {
-        $client = self::newClient();
-
-        self::assertInstanceOf(SearchFactory::class, $factory = $client->getContainer()->get('rollerworks_search.factory'));
-        $factory->createFieldSet(UserFieldSet::class);
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/DoctrineTest.php b/lib/Symfony/SearchBundle/Tests/Functional/DoctrineTest.php
deleted file mode 100644
index 2f4d4af7..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/DoctrineTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional;
-
-use Rollerworks\Component\Search\Doctrine\Dbal\DoctrineDbalFactory;
-use Rollerworks\Component\Search\Doctrine\Orm\DoctrineOrmFactory;
-
-/**
- * @internal
- */
-final class DoctrineTest extends FunctionalTestCase
-{
-    /**
-     * @test
-     */
-    public function doctrine_dbal_factory_is_accessible(): void
-    {
-        if (! class_exists(DoctrineDbalFactory::class)) {
-            self::markTestSkipped('rollerworks/search-doctrine-dbal is not installed');
-        }
-
-        $client = self::newClient(['config' => 'doctrine_dbal.yml']);
-        $client->getKernel()->boot();
-
-        $container = $client->getContainer();
-
-        self::assertInstanceOf(DoctrineDbalFactory::class, $container->get('rollerworks_search.doctrine_dbal.factory'));
-    }
-
-    /**
-     * @test
-     */
-    public function doctrine_orm_factory_is_accessible(): void
-    {
-        if (! class_exists(DoctrineOrmFactory::class)) {
-            self::markTestSkipped('rollerworks/search-doctrine-orm is not installed');
-        }
-
-        $client = self::newClient(['config' => 'doctrine_orm.yml']);
-        $client->getKernel()->boot();
-
-        $container = $client->getContainer();
-
-        self::assertInstanceOf(DoctrineDbalFactory::class, $container->get('rollerworks_search.doctrine_dbal.factory'));
-        self::assertInstanceOf(DoctrineOrmFactory::class, $container->get('rollerworks_search.doctrine_orm.factory'));
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/ElasticsearchTest.php b/lib/Symfony/SearchBundle/Tests/Functional/ElasticsearchTest.php
deleted file mode 100644
index a3916f6f..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/ElasticsearchTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional;
-
-use Rollerworks\Component\Search\Elasticsearch\ElasticsearchFactory;
-
-/**
- * @internal
- */
-final class ElasticsearchTest extends FunctionalTestCase
-{
-    /**
-     * @test
-     */
-    public function elasticsearch_factory_is_accessible(): void
-    {
-        if (! class_exists(ElasticsearchFactory::class)) {
-            self::markTestSkipped('rollerworks/search-elasticsearch is not installed');
-        }
-
-        $client = self::newClient(['config' => 'elasticsearch.yml']);
-        $client->getKernel()->boot();
-
-        $container = $client->getContainer();
-
-        self::assertInstanceOf(ElasticsearchFactory::class, $container->get('rollerworks_search.elasticsearch.factory'));
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/FunctionalTestCase.php b/lib/Symfony/SearchBundle/Tests/Functional/FunctionalTestCase.php
deleted file mode 100644
index e52f61f8..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/FunctionalTestCase.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional;
-
-use Rollerworks\Bundle\SearchBundle\Tests\Functional\Application\AppKernel;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\HttpKernel\KernelInterface;
-
-abstract class FunctionalTestCase extends WebTestCase
-{
-    protected static function createKernel(array $options = []): KernelInterface
-    {
-        return new AppKernel(
-            $options['config'] ?? 'default.yml',
-            false
-        );
-    }
-
-    protected static function getKernelClass(): string
-    {
-        return AppKernel::class;
-    }
-
-    protected static function newClient(array $options = [], array $server = []): KernelBrowser
-    {
-        // XXX Do we really need to boot the kernel multiple times?
-        static::$booted = false;
-
-        $client = static::createClient(array_merge(['config' => 'default.yml'], $options), $server);
-
-        $warmer = $client->getContainer()->get('cache_warmer');
-        $warmer->enableOptionalWarmers();
-        $warmer->warmUp($client->getContainer()->getParameter('kernel.cache_dir'));
-
-        return $client;
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/Functional/SearchProcessorTest.php b/lib/Symfony/SearchBundle/Tests/Functional/SearchProcessorTest.php
deleted file mode 100644
index 2ae25d79..00000000
--- a/lib/Symfony/SearchBundle/Tests/Functional/SearchProcessorTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests\Functional;
-
-/**
- * @internal
- */
-final class SearchProcessorTest extends FunctionalTestCase
-{
-    /**
-     * @test
-     */
-    public function empty_search_code_is_valid(): void
-    {
-        $client = self::newClient(['config' => 'search_processor.yml']);
-
-        $client->request('GET', '/search');
-
-        self::assertEquals('VALID: EMPTY', $client->getResponse()->getContent());
-    }
-
-    /**
-     * @test
-     */
-    public function post_condition(): void
-    {
-        $client = self::newClient(['config' => 'search_processor.yml']);
-
-        $client->request('POST', '/search', ['search' => 'name: user;']);
-        $crawler = $client->followRedirect();
-
-        self::assertEquals(
-            'http://localhost/search?search=name:%20user;',
-            $crawler->getUri()
-        );
-
-        self::assertEquals(
-            'VALID: name: user;',
-            $client->getResponse()->getContent()
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function invalid_condition_has_errors(): void
-    {
-        $client = self::newClient(['config' => 'search_processor.yml']);
-
-        $client->request('GET', '/search?search=first-name%3A%20user%3B');
-
-        self::assertEquals('INVALID: <ul><li>The field "first-name" is not registered in the FieldSet or available as alias.</li></ul>', $client->getResponse()->getContent());
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Tests/TranslatorBasedAliasResolverTest.php b/lib/Symfony/SearchBundle/Tests/TranslatorBasedAliasResolverTest.php
deleted file mode 100644
index 37d66177..00000000
--- a/lib/Symfony/SearchBundle/Tests/TranslatorBasedAliasResolverTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Tests;
-
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Rollerworks\Bundle\SearchBundle\TranslatorBasedAliasResolver;
-use Rollerworks\Bundle\SearchBundle\Type\TranslatableFieldTypeExtension;
-use Rollerworks\Bundle\SearchBundle\Type\TranslatableOrderFieldTypeExtension;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Symfony\Component\Translation\TranslatableMessage;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-/**
- * @internal
- */
-final class TranslatorBasedAliasResolverTest extends SearchIntegrationTestCase
-{
-    use ProphecyTrait;
-
-    /**
-     * @test
-     */
-    public function it_uses_field_name_when_label_is_empty(): void
-    {
-        $translator = $this->createMock(TranslatorInterface::class);
-        $translator->expects(self::never())->method('trans');
-
-        $resolver = new TranslatorBasedAliasResolver($translator);
-        $searchFactory = $this->getFactory();
-
-        self::assertEquals('id', $resolver($searchFactory->createField('id', TextType::class)));
-        self::assertEquals('name', $resolver($searchFactory->createField('name', TextType::class)));
-        self::assertEquals('@id', $resolver($searchFactory->createField('@id', OrderFieldType::class)));
-    }
-
-    /**
-     * @test
-     */
-    public function it_keeps_label_as_is_when_not_translatable(): void
-    {
-        $translator = $this->createMock(TranslatorInterface::class);
-        $translator->expects(self::never())->method('trans');
-
-        $resolver = new TranslatorBasedAliasResolver($translator);
-        $searchFactory = $this->getFactory();
-
-        self::assertEquals('id2', $resolver($searchFactory->createField('id', TextType::class, ['label' => 'id2'])));
-        self::assertEquals('name2', $resolver($searchFactory->createField('name', TextType::class, ['label' => 'name2'])));
-        self::assertEquals('@id2', $resolver($searchFactory->createField('@id', OrderFieldType::class, ['label' => '@id2'])));
-        self::assertEquals('@id2', $resolver($searchFactory->createField('@id', OrderFieldType::class, ['label' => 'id2'])));
-    }
-
-    /**
-     * @test
-     */
-    public function it_translates_label_when_translatable(): void
-    {
-        $translator = $this->prophesize(TranslatorInterface::class);
-        $translator->trans(Argument::cetera())->will(static fn (array $args): string => $args[0][0] === '@' ? $args[0] . 'T' : 'T' . $args[0]);
-
-        $resolver = new TranslatorBasedAliasResolver($translator->reveal());
-        $searchFactory = $this->getFactory();
-
-        self::assertEquals('Tid2', $resolver($searchFactory->createField('id', TextType::class, ['label' => new TranslatableMessage('id2')])));
-        self::assertEquals('Tname2', $resolver($searchFactory->createField('name', TextType::class, ['label' => new TranslatableMessage('name2')])));
-        self::assertEquals('@id2T', $resolver($searchFactory->createField('@id', OrderFieldType::class, ['label' => new TranslatableMessage('@id2')])));
-        self::assertEquals('@Tid2', $resolver($searchFactory->createField('@id', OrderFieldType::class, ['label' => new TranslatableMessage('id2')])));
-    }
-
-    protected function getTypeExtensions(): array
-    {
-        return [
-            new TranslatableFieldTypeExtension(),
-            new TranslatableOrderFieldTypeExtension(),
-        ];
-    }
-}
diff --git a/lib/Symfony/SearchBundle/TranslatorBasedAliasResolver.php b/lib/Symfony/SearchBundle/TranslatorBasedAliasResolver.php
deleted file mode 100644
index f905034a..00000000
--- a/lib/Symfony/SearchBundle/TranslatorBasedAliasResolver.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle;
-
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Field\OrderField;
-use Symfony\Contracts\Translation\TranslatableInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-final class TranslatorBasedAliasResolver
-{
-    public function __construct(
-        private readonly TranslatorInterface $translator,
-    ) {
-    }
-
-    public function __invoke(FieldConfig $field): string
-    {
-        $label = $field->getOption('label');
-
-        if ($label === null) {
-            return $field->getName();
-        }
-
-        if ($label instanceof TranslatableInterface) {
-            $label = $label->trans($this->translator);
-        }
-
-        if ($field instanceof OrderField && $label[0] !== '@') {
-            $label = '@' . $label;
-        }
-
-        return $label;
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Type/TranslatableFieldTypeExtension.php b/lib/Symfony/SearchBundle/Type/TranslatableFieldTypeExtension.php
deleted file mode 100644
index 98484cb9..00000000
--- a/lib/Symfony/SearchBundle/Type/TranslatableFieldTypeExtension.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Contracts\Translation\TranslatableInterface;
-
-final class TranslatableFieldTypeExtension extends AbstractFieldTypeExtension
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->addAllowedTypes('label', TranslatableInterface::class);
-    }
-
-    public function getExtendedType(): string
-    {
-        return SearchFieldType::class;
-    }
-}
diff --git a/lib/Symfony/SearchBundle/Type/TranslatableOrderFieldTypeExtension.php b/lib/Symfony/SearchBundle/Type/TranslatableOrderFieldTypeExtension.php
deleted file mode 100644
index d4d6b619..00000000
--- a/lib/Symfony/SearchBundle/Type/TranslatableOrderFieldTypeExtension.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Bundle\SearchBundle\Type;
-
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Rollerworks\Component\Search\Field\OrderFieldType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Contracts\Translation\TranslatableInterface;
-
-final class TranslatableOrderFieldTypeExtension extends AbstractFieldTypeExtension
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->addAllowedTypes('label', TranslatableInterface::class);
-    }
-
-    public function getExtendedType(): string
-    {
-        return OrderFieldType::class;
-    }
-}
diff --git a/lib/Symfony/SearchBundle/UPGRADE.md b/lib/Symfony/SearchBundle/UPGRADE.md
deleted file mode 100644
index 3f4f9b2c..00000000
--- a/lib/Symfony/SearchBundle/UPGRADE.md
+++ /dev/null
@@ -1,72 +0,0 @@
-UPGRADE
-=======
-
-## Upgrade FROM v1.0.0 to v2.0.0-alpha1
-
-* Support for Symfony 2 was dropped, at least Symfony 3.3 is required now.
-
-* The Metadata system has been removed in RollerworksSearch v2.0,
-  this bundle no longer allows registering FieldSets as service configurations.
-  
-  Instead the FieldSet configuration needs to be stored in a FieldSetConfigurator
-  which (optionally) can be registered as a service for dependency loading.
-  
-  **Tip:** Configurators service definitions can be marked private.
-  
-* The SearchProcessor has been moved to it's own component `rollerworks/search-processor`
-  and now requires PSR-7 to be installed.
-  
-  To use the processor install the following dependencies:
-  
-  * `rollerworks/search-processor:^1.0` (may require `"minimum-stability": "dev"` in Composer)
-  * `symfony/psr-http-message-bridge:^1.0.0`
-  * `zendframework/zend-diactoros:^1.3.9`
-  
-  Zend Diactoros is only used internally and does not require the SensioFrameworkExtraBundle
-  to be installed or enabled. The RollerworksSearchBundle provides a compatibility adapter
-  for the Symfony HttpFoundation component.
-  
-  **Note:** The processor is automatically enabled when the `rollerworks/search-processor`
-  package is installed, but will refuse to work unless all dependencies are met.
-  
-  To disable the processor set the `rollerworks_search.processor` option to `false`.
-  
-* `SearchExtension`s are no longer registered with the `rollerworks_search.type_registry`
-  service, it's advised to register only types and type-extensions by tagging them.
-  
-  Types and there extensions are loaded lazily, and no longer have to be marked public.
-  
-* The SearchForm type has been removed, using the SearchProcessor with the Symfony Form component
-  is no longer supported.
-  
-* Tagged Input processors and Condition exporters now require a `format` attribute to be
-  set with the tag.
-  
-## Upgrade FROM v1.0.0-beta2 to v1.0.0-beta3
-
-The Doctrine ORM configuring and related services are moved to a new package
-at https://github.com/rollerworks/rollerworks-search-doctrine-orm-bundle.
-
-If you are using Doctrine ORM then install the new package and update your
-application configuration as follow.
-
-Before:
-
-```yaml
-# app/config/config.yml
-rollerworks_search:
-    doctrine:
-        orm:
-            cache_driver: rollerworks_cache.driver.session_driver
-```
-
-After:
-
-```yaml
-# app/config/config.yml
-rollerworks_search_doctrine_orm: 
-    cache_driver: rollerworks_search.doctrine_orm.cache.array_driver
-```
-
-The original service names (except `rollerworks_cache.driver.session_driver`)
-are left unchanged.
diff --git a/lib/Symfony/SearchBundle/composer.json b/lib/Symfony/SearchBundle/composer.json
deleted file mode 100644
index 3082315f..00000000
--- a/lib/Symfony/SearchBundle/composer.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "name": "rollerworks/search-bundle",
-    "description": "RollerworksSearch Bundle",
-    "license": "MIT",
-    "type": "symfony-bundle",
-    "keywords": [
-        "filter",
-        "search",
-        "rollerworks",
-        "symfony",
-        "bundle"
-    ],
-    "authors": [
-        {
-            "name": "Sebastiaan Stok",
-            "email": "s.stok@rollercapes.net"
-        }
-    ],
-    "require": {
-        "php": "^8.1",
-        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
-        "rollerworks/search": "^2.0",
-        "symfony/framework-bundle": "^6.4 || ^7.4 || ^8.0",
-        "symfony/twig-bundle": "^6.4 || ^7.4 || ^8.0"
-    },
-    "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^4.1.1 || ^5.1 || ^6.1",
-        "phpunit/phpunit": "^10.5",
-        "rollerworks/search-symfony-validator": ">=2.0.0-BETA3 ^2.0@dev",
-        "symfony/asset": "^6.4 || ^7.4 || ^8.0",
-        "symfony/browser-kit": "^6.4 || ^7.4 || ^8.0",
-        "symfony/dom-crawler": "^6.4 || ^7.4 || ^8.0",
-        "symfony/phpunit-bridge": "^6.4 || ^7.4 || ^8.0",
-        "symfony/routing": "^6.4 || ^7.4 || ^8.0",
-        "symfony/templating": "^6.4 || ^7.4 || ^8.0"
-    },
-    "conflict": {
-        "doctrine/doctrine-bundle": "<1.1",
-        "rollerworks/search-api-platform": "<2.0.0-BETA10",
-        "rollerworks/search-doctrine-dbal": "<2.0.0-BETA3",
-        "rollerworks/search-doctrine-orm": "<2.0.0-BETA3",
-        "rollerworks/search-symfony-validator": "<2.0.0-BETA3"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "autoload": {
-        "psr-4": {
-            "Rollerworks\\Bundle\\SearchBundle\\": ""
-        },
-        "exclude-from-classmap": [
-            "test/"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Rollerworks\\Bundle\\SearchBundle\\Tests\\": "Tests/"
-        }
-    },
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.0-dev"
-        }
-    }
-}
diff --git a/lib/Symfony/SearchBundle/phpunit.xml.dist b/lib/Symfony/SearchBundle/phpunit.xml.dist
deleted file mode 100644
index 4ddfbd83..00000000
--- a/lib/Symfony/SearchBundle/phpunit.xml.dist
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
->
-    <testsuites>
-        <testsuite name="RollerworksSearchBundle Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-            <exclude>
-                <directory>./src/Resources/</directory>
-                <directory>./vendor</directory>
-                <directory>./tests/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <php>
-        <ini name="intl.default_locale" value="en"/>
-    </php>
-
-</phpunit>
diff --git a/lib/Symfony/Validator/.gitattributes b/lib/Symfony/Validator/.gitattributes
deleted file mode 100644
index fbd8056d..00000000
--- a/lib/Symfony/Validator/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-/Tests/ export-ignore
-/phpunit.xml.dist export-ignore
-.git* export-ignore
diff --git a/lib/Symfony/Validator/.gitignore b/lib/Symfony/Validator/.gitignore
deleted file mode 100644
index 1a837c83..00000000
--- a/lib/Symfony/Validator/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/phpunit.xml
-/composer.lock
-.php_cs.cache
-*.phar
-/vendor/
diff --git a/lib/Symfony/Validator/InputValidator.php b/lib/Symfony/Validator/InputValidator.php
deleted file mode 100644
index 84941c5c..00000000
--- a/lib/Symfony/Validator/InputValidator.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Symfony\Validator;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Field\FieldConfig;
-use Rollerworks\Component\Search\Input\Validator;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-
-/**
- * Validates input values using the Symfony Validator.
- *
- * The search field must have a `constraints` option set
- * or else it's ignored.
- *
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class InputValidator implements Validator
-{
-    private ErrorList $errorList;
-
-    /** @var Constraint[]|null */
-    private ?array $constraints = [];
-
-    /** @var Constraint[]|null */
-    private ?array $patternMatchConstraints = null;
-
-    public function __construct(
-        private readonly ValidatorInterface $validator,
-    ) {
-    }
-
-    public function initializeContext(FieldConfig $field, ErrorList $errorList): void
-    {
-        $this->errorList = $errorList;
-        $this->constraints = $field->getOption('constraints');
-        $this->patternMatchConstraints = $field->getOption('pattern_match_constraints');
-    }
-
-    public function validate($value, string $type, $originalValue, string $path): bool
-    {
-        $constraints = $type === PatternMatch::class ? $this->patternMatchConstraints : $this->constraints;
-
-        if ($constraints === null) {
-            return true;
-        }
-
-        $violations = $this->validator->validate($value, $constraints);
-
-        foreach ($violations as $violation) {
-            $this->errorList[] = new ConditionErrorMessage(
-                $path,
-                $violation->getMessage(),
-                $violation->getMessageTemplate(),
-                $violation->getParameters(),
-                $violation->getPlural(),
-                $violation
-            );
-        }
-
-        return ! \count($violations);
-    }
-}
diff --git a/lib/Symfony/Validator/LICENSE b/lib/Symfony/Validator/LICENSE
deleted file mode 100644
index 7d4bb1bc..00000000
--- a/lib/Symfony/Validator/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012-present Sebastiaan Stok
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/lib/Symfony/Validator/README.md b/lib/Symfony/Validator/README.md
deleted file mode 100644
index b24ff7df..00000000
--- a/lib/Symfony/Validator/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-RollerworksSearch Symfony Validator
-===================================
-
-This package provides the Symfony Validator extension for [RollerworksSearch][1].
-
-If you'd like to contribute to this project, please go the
-main [RollerworksSearch][1] repository and read the [Contributing][2] section.
-
-> [!NOTE
-> This validation is meant to be used for business rules like a minimum/maximum
-> value range, or disallowing specific patterns. The data transformers already
-> ensure the value is properly transformed.
-
-Installation
-------------
-
-To install this extension, add the `rollerworks/search-symfony-validator`
-package in your composer.json and update your dependencies.
-
-```bash
-$ composer require rollerworks/search-symfony-validator
-```
-
-Symfony Framework Integration
------------------------------
-
-The [Symfony bundle][3] for RollerworksSearch already enables  the Symfony
-validator service. You don't need to do anything but configure your 
-search field's constraints.
-
-License
--------
-
-The source of this package is subject to the MIT license that is bundled
-with this source code in the file [LICENSE](LICENSE).
-
-[1]: https://github.com/rollerworks/RollerworksSearch
-[2]: https://github.com/rollerworks/RollerworksSearch#contributing
-[3]: https://github.com/rollersearch/search-bundle
diff --git a/lib/Symfony/Validator/Tests/InputValidatorTest.php b/lib/Symfony/Validator/Tests/InputValidatorTest.php
deleted file mode 100644
index 3e7ad2b9..00000000
--- a/lib/Symfony/Validator/Tests/InputValidatorTest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Symfony\Validator\Tests;
-
-use Rollerworks\Component\Search\ConditionErrorMessage;
-use Rollerworks\Component\Search\ErrorList;
-use Rollerworks\Component\Search\Extension\Core\Type\DateType;
-use Rollerworks\Component\Search\Extension\Core\Type\IntegerType;
-use Rollerworks\Component\Search\Extension\Core\Type\TextType;
-use Rollerworks\Component\Search\Extension\Symfony\Validator\InputValidator;
-use Rollerworks\Component\Search\Extension\Symfony\Validator\ValidatorExtension;
-use Rollerworks\Component\Search\Test\SearchIntegrationTestCase;
-use Rollerworks\Component\Search\Value\PatternMatch;
-use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\ConstraintViolation;
-use Symfony\Component\Validator\Validation;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-
-/**
- * @internal
- */
-final class InputValidatorTest extends SearchIntegrationTestCase
-{
-    private ValidatorInterface $sfValidator;
-    private InputValidator $validator;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $validatorBuilder = Validation::createValidatorBuilder();
-
-        if (method_exists($validatorBuilder, 'disableAnnotationMapping')) {
-            $validatorBuilder->disableAnnotationMapping();
-        }
-
-        $this->sfValidator = $validatorBuilder->getValidator();
-        $this->validator = new InputValidator($this->sfValidator);
-    }
-
-    protected function getFieldSet(bool $build = true)
-    {
-        $fieldSet = $this->getFactory()->createFieldSetBuilder();
-        $fieldSet->add('id', IntegerType::class, ['constraints' => new Assert\Range(min: 5)]);
-        $fieldSet->add('date', DateType::class, [
-            'constraints' => [
-                new Assert\Range(min: new \DateTimeImmutable('2014-12-20 14:35:05 UTC')),
-            ],
-        ]);
-        $fieldSet->add('type', TextType::class);
-
-        return $build ? $fieldSet->getFieldSet() : $fieldSet;
-    }
-
-    protected function getExtensions(): array
-    {
-        return [new ValidatorExtension()];
-    }
-
-    /**
-     * @test
-     */
-    public function it_works_without_constraints(): void
-    {
-        $fieldSet = $this->getFactory()->createFieldSetBuilder()
-            ->add('id', IntegerType::class)
-            ->add('date', DateType::class)
-            ->add('type', TextType::class)
-            ->getFieldSet()
-        ;
-
-        $errorList = new ErrorList();
-        $this->validator->initializeContext($fieldSet->get('id'), $errorList);
-        $this->validator->validate(10, 'simple', 10, 'simpleValues[0]');
-        $this->validator->validate(3, 'simple', 3, 'simpleValues[1]');
-        $this->validator->validate(4, 'simple', 4, 'simpleValues[2]');
-
-        $errorList2 = new ErrorList();
-        $this->validator->initializeContext($fieldSet->get('date'), $errorList2);
-        $this->validator->validate(new \DateTimeImmutable('2014-12-13 14:35:05 UTC'), 'simple', '2014-12-13 14:35:05', 'simpleValues[0]');
-        $this->validator->validate(new \DateTimeImmutable('2014-12-21 14:35:05 UTC'), 'simple', '2014-12-17 14:35:05', 'simpleValues[1]');
-        $this->validator->validate(new \DateTimeImmutable('2014-12-10 14:35:05 UTC'), 'simple', '2014-12-10 14:35:05', 'simpleValues[2]');
-
-        $errorList3 = new ErrorList();
-        $this->validator->initializeContext($fieldSet->get('type'), $errorList3);
-        $this->validator->validate('something', PatternMatch::class, 'something', 'simpleValues[0]');
-
-        self::assertEmpty($errorList);
-        self::assertEmpty($errorList2);
-        self::assertEmpty($errorList3);
-    }
-
-    /**
-     * @test
-     */
-    public function it_validates_fields_with_constraints(): void
-    {
-        $fieldSet = $this->getFieldSet();
-
-        $errorList = new ErrorList();
-        $this->validator->initializeContext($fieldSet->get('id'), $errorList);
-
-        $this->validator->validate(10, 'simple', 10, 'simpleValues[0]');
-        $this->validator->validate(3, 'simple', 3, 'simpleValues[1]');
-        $this->validator->validate(4, 'simple', 4, 'simpleValues[2]');
-
-        $errorList2 = new ErrorList();
-        $this->validator->initializeContext($fieldSet->get('date'), $errorList2);
-
-        $this->validator->validate($d1 = new \DateTimeImmutable('2014-12-13 14:35:05 UTC'), 'simple', '2014-12-13 14:35:05', 'simpleValues[0]');
-        $this->validator->validate($d2 = new \DateTimeImmutable('2014-12-21 14:35:05 UTC'), 'simple', '2014-12-17 14:35:05', 'simpleValues[1]');
-        $this->validator->validate($d3 = new \DateTimeImmutable('2014-12-10 14:35:05 UTC'), 'simple', '2014-12-10 14:35:05', 'simpleValues[2]');
-
-        $errorList3 = new ErrorList();
-        $this->validator->initializeContext($fieldSet->get('type'), $errorList3);
-        $this->validator->validate('something', 'simple', 'something', 'simpleValues[0]');
-
-        $this->assertContainsErrors(
-            [
-                new ConditionErrorMessage('simpleValues[1]', 'This value should be 5 or more.', 'This value should be {{ limit }} or more.', ['{{ value }}' => '3', '{{ limit }}' => '5']),
-                new ConditionErrorMessage('simpleValues[2]', 'This value should be 5 or more.', 'This value should be {{ limit }} or more.', ['{{ value }}' => '4', '{{ limit }}' => '5']),
-            ],
-            $errorList
-        );
-
-        $minDate = self::formatDateTime(new \DateTimeImmutable('2014-12-20 14:35:05 UTC'));
-
-        $this->assertContainsErrors(
-            [
-                new ConditionErrorMessage('simpleValues[0]', 'This value should be ' . $minDate . ' or more.', 'This value should be {{ limit }} or more.', ['{{ value }}' => self::formatDateTime($d1), '{{ limit }}' => $minDate]),
-                new ConditionErrorMessage('simpleValues[2]', 'This value should be ' . $minDate . ' or more.', 'This value should be {{ limit }} or more.', ['{{ value }}' => self::formatDateTime($d3), '{{ limit }}' => $minDate]),
-            ],
-            $errorList2
-        );
-
-        self::assertEmpty($errorList3);
-    }
-
-    /**
-     * @test
-     */
-    public function it_validates_matchers(): void
-    {
-        $fieldSet = $this->getFieldSet(false);
-        $fieldSet->add('username', TextType::class, ['constraints' => new Assert\Url(), 'pattern_match_constraints' => new Assert\NotBlank()]);
-        $fieldSet = $fieldSet->getFieldSet();
-
-        $errorList = new ErrorList();
-        $this->validator->initializeContext($fieldSet->get('username'), $errorList);
-
-        $this->validator->validate('foo', PatternMatch::class, 'foo', 'patternMatch[0].value');
-        $this->validator->validate('bar', PatternMatch::class, 'foo', 'patternMatch[1].value');
-        $this->validator->validate('', PatternMatch::class, 'foo', 'patternMatch[2].value');
-
-        $this->assertContainsErrors(
-            [
-                new ConditionErrorMessage('patternMatch[2].value', 'This value should not be blank.', 'This value should not be blank.', ['{{ value }}' => '""']),
-            ],
-            $errorList
-        );
-    }
-
-    private function assertContainsErrors(array $expectedErrors, ErrorList $errors): void
-    {
-        foreach ($errors as $error) {
-            self::assertInstanceOf(ConstraintViolation::class, $error->cause);
-
-            // Remove cause to make assertion possible.
-            $error->cause = null;
-        }
-
-        self::assertEquals($expectedErrors, $errors->getArrayCopy());
-    }
-
-    /**
-     * @param \DateTimeImmutable $value
-     *
-     * @return string
-     */
-    private static function formatDateTime($value)
-    {
-        if (class_exists('IntlDateFormatter')) {
-            $locale = \Locale::getDefault();
-            $formatter = new \IntlDateFormatter($locale, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT);
-
-            // neither the native nor the stub IntlDateFormatter support
-            // DateTimeImmutable as of yet
-            if (! $value instanceof \DateTime) {
-                $value = new \DateTime(
-                    $value->format('Y-m-d H:i:s.u e'),
-                    $value->getTimezone()
-                );
-            }
-
-            return $formatter->format($value);
-        }
-
-        return $value->format('Y-m-d H:i:s');
-    }
-}
diff --git a/lib/Symfony/Validator/Type/FieldTypeValidatorExtension.php b/lib/Symfony/Validator/Type/FieldTypeValidatorExtension.php
deleted file mode 100644
index fde50b92..00000000
--- a/lib/Symfony/Validator/Type/FieldTypeValidatorExtension.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Symfony\Validator\Type;
-
-use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
-use Rollerworks\Component\Search\Field\AbstractFieldTypeExtension;
-use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class FieldTypeValidatorExtension extends AbstractFieldTypeExtension
-{
-    public function getExtendedType(): string
-    {
-        return SearchFieldType::class;
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        // Constraint should always be converted to an array
-        $constraintsNormalizer = static fn (Options $options, $constraints): array => \is_object($constraints) ? [$constraints] : (array) $constraints;
-
-        $resolver->setDefault('constraints', []);
-        $resolver->setDefault('pattern_match_constraints', []);
-        $resolver->setNormalizer('constraints', $constraintsNormalizer);
-        $resolver->setNormalizer('pattern_match_constraints', $constraintsNormalizer);
-    }
-}
diff --git a/lib/Symfony/Validator/ValidatorExtension.php b/lib/Symfony/Validator/ValidatorExtension.php
deleted file mode 100644
index fc7da116..00000000
--- a/lib/Symfony/Validator/ValidatorExtension.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the RollerworksSearch package.
- *
- * (c) Sebastiaan Stok <s.stok@rollerscapes.net>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Rollerworks\Component\Search\Extension\Symfony\Validator;
-
-use Rollerworks\Component\Search\AbstractExtension;
-
-/**
- * @author Sebastiaan Stok <s.stok@rollerscapes.net>
- */
-final class ValidatorExtension extends AbstractExtension
-{
-    protected function loadTypesExtensions(): array
-    {
-        return [
-            new Type\FieldTypeValidatorExtension(),
-        ];
-    }
-}
diff --git a/lib/Symfony/Validator/composer.json b/lib/Symfony/Validator/composer.json
deleted file mode 100644
index b0f2104e..00000000
--- a/lib/Symfony/Validator/composer.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "name": "rollerworks/search-symfony-validator",
-    "description": "Symfony validator extension for RollerworksSearch",
-    "license": "MIT",
-    "type": "library",
-    "keywords": [
-        "rollerworks",
-        "search",
-        "validation",
-        "symfony"
-    ],
-    "authors": [
-        {
-            "name": "Sebastiaan Stok",
-            "email": "s.stok@rollercapes.net"
-        },
-        {
-            "name": "Community contributions",
-            "homepage": "https://github.com/Rollerworks/search-symfony-validator/contributors"
-        }
-    ],
-    "require": {
-        "php": "^8.1",
-        "rollerworks/search": "^2.0",
-        "symfony/validator": "^6.4 || ^7.4 || ^8.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^10.5",
-        "symfony/phpunit-bridge": "^6.4 || ^7.4 || ^8.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\Extension\\Symfony\\Validator\\": ""
-        },
-        "exclude-from-classmap": [
-            "test/"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Rollerworks\\Component\\Search\\Extension\\Symfony\\Validator\\Tests\\": "Tests/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.0-dev"
-        }
-    }
-}
diff --git a/lib/Symfony/Validator/phpunit.xml.dist b/lib/Symfony/Validator/phpunit.xml.dist
deleted file mode 100644
index cf9a7311..00000000
--- a/lib/Symfony/Validator/phpunit.xml.dist
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
-         backupGlobals="false"
-         colors="true" verbose="true"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
->
-    <php>
-        <ini name="error_reporting" value="-1"/>
-        <ini name="date.timezone" value="UTC"/>
-        <ini name="intl.default_locale" value="en"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="memory_limit" value="-1"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="RollerworksSearch Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-            <exclude>
-                <directory>./vendor/</directory>
-                <directory>./tests/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-</phpunit>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
deleted file mode 100644
index 56f801f1..00000000
--- a/phpstan-baseline.neon
+++ /dev/null
@@ -1,277 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: '#^Strict comparison using \=\=\= between non\-empty\-array and null will always evaluate to false\.$#'
-			identifier: identical.alwaysFalse
-			count: 1
-			path: lib/ApiPlatform/Serializer/InvalidSearchConditionNormalizer.php
-
-		-
-			message: '#^Call to function method_exists\(\) with Symfony\\Component\\OptionsResolver\\OptionsResolver and ''setOptions'' will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: lib/Core/Extension/Core/Type/BooleanType.php
-
-		-
-			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
-			identifier: staticMethod.alreadyNarrowedType
-			count: 2
-			path: lib/Core/Test/FieldTransformationAssertion.php
-
-		-
-			message: '#^Method Rollerworks\\Component\\Search\\Tests\\Extension\\Core\\ChoiceList\\Factory\\DefaultChoiceListFactoryTest\:\:assertScalarListWithCustomValues\(\) is unused\.$#'
-			identifier: method.unused
-			count: 1
-			path: lib/Core/Tests/Extension/Core/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
-
-		-
-			message: '#^Parameter \#1 \$choices of class Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceListView constructor expects array\<Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceGroupView\|Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceView\>, array\<int, null\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: lib/Core/Tests/Extension/Core/ChoiceList/Factory/PropertyAccessDecoratorTest.php
-
-		-
-			message: '#^Parameter \#1 \$choices of class Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceListView constructor expects array\<Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceGroupView\|Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceView\>, array\<int, string\> given\.$#'
-			identifier: argument.type
-			count: 8
-			path: lib/Core/Tests/Extension/Core/ChoiceList/Factory/PropertyAccessDecoratorTest.php
-
-		-
-			message: '#^Parameter \#2 \$preferredChoices of class Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceListView constructor expects array\<Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceGroupView\|Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceView\>, array\<int, false\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: lib/Core/Tests/Extension/Core/ChoiceList/Factory/PropertyAccessDecoratorTest.php
-
-		-
-			message: '#^Parameter \#2 \$preferredChoices of class Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceListView constructor expects array\<Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceGroupView\|Rollerworks\\Component\\Search\\Extension\\Core\\ChoiceList\\View\\ChoiceView\>, array\<int, true\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: lib/Core/Tests/Extension/Core/ChoiceList/Factory/PropertyAccessDecoratorTest.php
-
-		-
-			message: '#^Parameter &\$query @param\-out type of method Rollerworks\\Component\\Search\\Doctrine\\Dbal\\Query\\QueryGenerator\:\:processCompares\(\) expects array\<string\>, array given\.$#'
-			identifier: paramOut.type
-			count: 2
-			path: lib/Doctrine/Dbal/Query/QueryGenerator.php
-
-		-
-			message: '#^Parameter &\$query @param\-out type of method Rollerworks\\Component\\Search\\Doctrine\\Dbal\\Query\\QueryGenerator\:\:processGroups\(\) expects array\<string\>, array given\.$#'
-			identifier: paramOut.type
-			count: 1
-			path: lib/Doctrine/Dbal/Query/QueryGenerator.php
-
-		-
-			message: '#^Parameter &\$query @param\-out type of method Rollerworks\\Component\\Search\\Doctrine\\Dbal\\Query\\QueryGenerator\:\:processPatternMatchers\(\) expects array\<string\>, array given\.$#'
-			identifier: paramOut.type
-			count: 2
-			path: lib/Doctrine/Dbal/Query/QueryGenerator.php
-
-		-
-			message: '#^Parameter &\$query @param\-out type of method Rollerworks\\Component\\Search\\Doctrine\\Dbal\\Query\\QueryGenerator\:\:processRanges\(\) expects array\<string\>, array given\.$#'
-			identifier: paramOut.type
-			count: 2
-			path: lib/Doctrine/Dbal/Query/QueryGenerator.php
-
-		-
-			message: '#^Parameter &\$query @param\-out type of method Rollerworks\\Component\\Search\\Doctrine\\Dbal\\Query\\QueryGenerator\:\:processSingleValues\(\) expects array\<string\>, array given\.$#'
-			identifier: paramOut.type
-			count: 2
-			path: lib/Doctrine/Dbal/Query/QueryGenerator.php
-
-		-
-			message: '#^Instanceof between Doctrine\\DBAL\\ArrayParameterType\|Doctrine\\DBAL\\ParameterType and UnitEnum will always evaluate to true\.$#'
-			identifier: instanceof.alwaysTrue
-			count: 1
-			path: lib/Doctrine/Dbal/Test/QueryBuilderAssertion.php
-
-		-
-			message: '#^Result of \|\| is always true\.$#'
-			identifier: booleanOr.alwaysTrue
-			count: 1
-			path: lib/Doctrine/Dbal/Test/QueryBuilderAssertion.php
-
-		-
-			message: '#^Call to an undefined method Doctrine\\DBAL\\Configuration\:\:setSQLLogger\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/DbalExtensions/Connection.php
-
-		-
-			message: '#^Method Doctrine\\DBAL\\Connection\:\:__construct\(\) invoked with 4 parameters, 2\-3 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/DbalExtensions/Connection.php
-
-		-
-			message: '#^Parameter \$params of method Rollerworks\\Component\\Search\\Doctrine\\Dbal\\Tests\\DbalExtensions\\Connection\:\:__construct\(\) has invalid type Doctrine\\DBAL\\Params\.$#'
-			identifier: class.notFound
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/DbalExtensions/Connection.php
-
-		-
-			message: '#^Access to an undefined property Doctrine\\DBAL\\Connection\:\:\$queryLog\.$#'
-			identifier: property.notFound
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
-
-		-
-			message: '#^Call to function is_a\(\) with arguments ''Doctrine\\\\DBAL\\\\ParameterType'', ''UnitEnum'' and true will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
-
-		-
-			message: '#^Invalid array key type Doctrine\\DBAL\\ParameterType\:\:ASCII\.$#'
-			identifier: array.invalidKey
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
-
-		-
-			message: '#^Invalid array key type Doctrine\\DBAL\\ParameterType\:\:BINARY\.$#'
-			identifier: array.invalidKey
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
-
-		-
-			message: '#^Invalid array key type Doctrine\\DBAL\\ParameterType\:\:BOOLEAN\.$#'
-			identifier: array.invalidKey
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
-
-		-
-			message: '#^Invalid array key type Doctrine\\DBAL\\ParameterType\:\:INTEGER\.$#'
-			identifier: array.invalidKey
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
-
-		-
-			message: '#^Invalid array key type Doctrine\\DBAL\\ParameterType\:\:LARGE_OBJECT\.$#'
-			identifier: array.invalidKey
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
-
-		-
-			message: '#^Invalid array key type Doctrine\\DBAL\\ParameterType\:\:NULL\.$#'
-			identifier: array.invalidKey
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
-
-		-
-			message: '#^Invalid array key type Doctrine\\DBAL\\ParameterType\:\:STRING\.$#'
-			identifier: array.invalidKey
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Functional/FunctionalDbalTestCase.php
-
-		-
-			message: '#^Method Doctrine\\DBAL\\Connection\:\:__construct\(\) invoked with 4 parameters, 2\-3 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Mocks/ConnectionMock.php
-
-		-
-			message: '#^Parameter \$params of method Rollerworks\\Component\\Search\\Tests\\Doctrine\\Dbal\\Mocks\\ConnectionMock\:\:__construct\(\) has invalid type Doctrine\\DBAL\\Params\.$#'
-			identifier: class.notFound
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Mocks/ConnectionMock.php
-
-		-
-			message: '#^Property Rollerworks\\Component\\Search\\Tests\\Doctrine\\Dbal\\Mocks\\ConnectionMock\:\:\$_platform is never read, only written\.$#'
-			identifier: property.onlyWritten
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/Mocks/ConnectionMock.php
-
-		-
-			message: '#^Call to an undefined method Doctrine\\DBAL\\Connection\:\:getEventManager\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/TestUtil.php
-
-		-
-			message: '#^Call to an undefined method Doctrine\\DBAL\\Connection\:\:getSchemaManager\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/TestUtil.php
-
-		-
-			message: '#^Call to function method_exists\(\) with ''Doctrine\\\\DBAL\\\\Connection'' and ''createSchemaManager'' will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: lib/Doctrine/Dbal/Tests/TestUtil.php
-
-		-
-			message: '#^Parameter \#1 \$className of method PHPUnit\\Framework\\TestCase\:\:getMockBuilder\(\) expects class\-string\<Doctrine\\Common\\Cache\\Cache\>, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: lib/Doctrine/Orm/Tests/CachedDqlConditionGeneratorTest.php
-
-		-
-			message: '#^Property Rollerworks\\Component\\Search\\Tests\\Doctrine\\Orm\\CachedDqlConditionGeneratorTest\:\:\$cacheDriver \(PHPUnit\\Framework\\MockObject\\MockObject&Psr\\SimpleCache\\CacheInterface\) does not accept Doctrine\\Common\\Cache\\Cache&PHPUnit\\Framework\\MockObject\\MockObject\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: lib/Doctrine/Orm/Tests/CachedDqlConditionGeneratorTest.php
-
-		-
-			message: '#^Offset ''0'' does not exist on array\<string, Rollerworks\\Component\\Search\\Doctrine\\Orm\\OrmQueryField\>\.$#'
-			identifier: offsetAccess.notFound
-			count: 2
-			path: lib/Doctrine/Orm/Tests/FieldConfigBuilderTest.php
-
-		-
-			message: '#^Call to function method_exists\(\) with Doctrine\\ORM\\Configuration and ''enableNativeLazyObj…'' will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: lib/Doctrine/Orm/Tests/OrmTestCase.php
-
-		-
-			message: '#^Method Doctrine\\ORM\\Tools\\SchemaTool\:\:updateSchema\(\) invoked with 2 parameters, 1 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: lib/Doctrine/Orm/Tests/OrmTestCase.php
-
-		-
-			message: '#^Parameter &\$mappings @param\-out type of method Rollerworks\\Component\\Search\\Elasticsearch\\QueryConditionGenerator\:\:getGroupMappings\(\) expects array\<string, Rollerworks\\Component\\Search\\Elasticsearch\\FieldMapping\>, array given\.$#'
-			identifier: paramOut.type
-			count: 5
-			path: lib/Elasticsearch/QueryConditionGenerator.php
-
-		-
-			message: '#^Variable \$nestedBool might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: lib/Elasticsearch/QueryConditionGenerator.php
-
-		-
-			message: '#^PHPDoc tag @var with type Psr\\SimpleCache\\CacheInterface is not subtype of native type PHPUnit\\Framework\\MockObject\\MockObject\.$#'
-			identifier: varTag.nativeType
-			count: 1
-			path: lib/Elasticsearch/Tests/ElasticsearchFactoryTest.php
-
-		-
-			message: '#^Parameter \#1 \$index of method Elastica\\Search\:\:addIndex\(\) expects Elastica\\Index, string\|null given\.$#'
-			identifier: argument.type
-			count: 1
-			path: lib/Elasticsearch/Tests/Functional/FunctionalElasticsearchTestCase.php
-
-		-
-			message: '#^Unreachable statement \- code above always terminates\.$#'
-			identifier: deadCode.unreachable
-			count: 1
-			path: lib/Elasticsearch/Tests/QueryConditionGeneratorTest.php
-
-		-
-			message: '#^Method Doctrine\\ORM\\Tools\\SchemaTool\:\:updateSchema\(\) invoked with 2 parameters, 1 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: lib/Symfony/SearchBundle/Tests/Functional/ApiPlatformTest.php
-
-		-
-			message: '#^Property Rollerworks\\Component\\Search\\Extension\\Symfony\\Validator\\InputValidator\:\:\$errorList is never read, only written\.$#'
-			identifier: property.onlyWritten
-			count: 1
-			path: lib/Symfony/Validator/InputValidator.php
-
-		-
-			message: '#^Parameter \$min of class Symfony\\Component\\Validator\\Constraints\\Range constructor expects float\|int\|non\-empty\-string\|null, DateTimeImmutable given\.$#'
-			identifier: argument.type
-			count: 1
-			path: lib/Symfony/Validator/Tests/InputValidatorTest.php
diff --git a/phpstan.neon b/phpstan.neon
deleted file mode 100644
index 7f1aeedf..00000000
--- a/phpstan.neon
+++ /dev/null
@@ -1,42 +0,0 @@
-includes:
-    - vendor/rollerscapes/standards/phpstan.neon
-    - phpstan-baseline.neon
-
-parameters:
-    #reportUnmatchedIgnoredErrors: false
-    #checkNullables: false
-    treatPhpDocTypesAsCertain: false
-
-    tmpDir: %currentWorkingDirectory%/var/phpstan
-    level: 5
-
-    paths:
-        - ./lib
-    excludePaths:
-        - lib/*/Tests/Fixtures/*
-        - lib/Symfony/SearchBundle/Tests/Functional/Application
-        - lib/Doctrine/Dbal/Tests/DbalExtensions/LegacySqlLogger.php
-
-    ignoreErrors:
-        -
-            path: lib/Symfony/SearchBundle/DependencyInjection/Compiler/ElasticaClientPass.php
-            message: "#^Class JoliCode\\\\Elastically\\\\Client not found\\.$#"
-
-        -
-            path: lib/Core/Tests/Extension/Core/DataTransformer/*.php
-            message: '#^Parameter \#1 \$[^\s]+ of method [^:]+\:\:(reverse)?Transform\(\) expects#i'
-
-        -  '#SearchConditionBuilder\:\:end\(\) on a separate line has no effect#'
-
-        -
-            # This is expected as part of the actual test
-            message: '#^Parameter \#1 \$searchCondition of method Rollerworks\\Component\\Search\\SearchConditionSerializer\:\:unserialize\(\) expects array\{string, string\}#'
-            identifier: argument.type
-            path: lib/Core/Tests/SearchConditionSerializerTest.php
-
-        -
-            # Forward compatible
-            message: '#^Call to function method_exists\(\) with Rollerworks\\Component\\Search\\Input\\Validator and ''initialize'' will always evaluate to true\.$#'
-            path: lib/Core/Input/*.php
-
-        - '#Call to an undefined static method Carbon\\Translator\:\:get\(\)#'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index 01af4651..00000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-    bootstrap="vendor/autoload.php"
-    beStrictAboutOutputDuringTests="true"
-    beStrictAboutTodoAnnotatedTests="true"
-
-    convertErrorsToExceptions="true"
-    convertWarningsToExceptions="true"
-    convertNoticesToExceptions="true"
-    failOnWarning="true"
-    colors="true"
->
-
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <ini name="date.timezone" value="UTC" />
-        <ini name="intl.default_locale" value="en" />
-        <ini name="intl.error_level" value="0" />
-        <ini name="memory_limit" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="RollerworksSearch Test Suite">
-            <directory>./lib/*/Tests/</directory>
-            <directory>./lib/*/*/Tests/</directory>
-            <exclude>./lib/Doctrine/Dbal/Tests/</exclude>
-            <exclude>./lib/Doctrine/Orm/Tests/</exclude>
-        </testsuite>
-    </testsuites>
-
-    <coverage>
-        <include>
-            <directory>./lib</directory>
-        </include>
-        <exclude>
-            <directory>./vendor/</directory>
-            <directory>./lib/*/Tests/</directory>
-            <directory>./lib/*/*/Tests/</directory>
-        </exclude>
-    </coverage>
-
-    <listeners>
-        <listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-</phpunit>
diff --git a/phpunit/mysql.xml b/phpunit/mysql.xml
deleted file mode 100644
index b7c7a447..00000000
--- a/phpunit/mysql.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../vendor/phpunit/phpunit/phpunit.xsd"
-    bootstrap="../vendor/autoload.php"
-    beStrictAboutOutputDuringTests="true"
-    beStrictAboutTodoAnnotatedTests="true"
-
-    convertErrorsToExceptions="true"
-    convertWarningsToExceptions="true"
-    convertNoticesToExceptions="true"
-    failOnWarning="true"
-    colors="true"
->
-
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <ini name="date.timezone" value="UTC" />
-        <ini name="intl.default_locale" value="en" />
-        <ini name="intl.error_level" value="0" />
-        <ini name="memory_limit" value="-1" />
-
-        <var name="db_driver" value="pdo_mysql" />
-        <var name="db_host" value="mariadb-server" />
-        <var name="db_user" value="root" />
-        <var name="db_password" value="nope" />
-        <var name="db_dbname" value="search_tests" />
-        <var name="db_port" value="3306" />
-    </php>
-
-    <testsuites>
-        <testsuite name="RollerworksSearch Test Suite">
-            <directory>../lib/*/Tests/</directory>
-            <directory>../lib/*/*/Tests/</directory>
-            <exclude>../lib/Doctrine/Dbal/Tests/</exclude>
-            <exclude>../lib/Doctrine/Orm/Tests/</exclude>
-        </testsuite>
-    </testsuites>
-
-    <coverage>
-        <include>
-            <directory>../lib</directory>
-        </include>
-        <exclude>
-            <directory>../vendor/</directory>
-            <directory>../lib/*/Tests/</directory>
-            <directory>../lib/*/*/Tests/</directory>
-        </exclude>
-    </coverage>
-
-    <listeners>
-        <listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-</phpunit>
diff --git a/phpunit/pgsql.xml b/phpunit/pgsql.xml
deleted file mode 100644
index 229e3b52..00000000
--- a/phpunit/pgsql.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../vendor/phpunit/phpunit/phpunit.xsd"
-    bootstrap="../vendor/autoload.php"
-    beStrictAboutOutputDuringTests="true"
-    beStrictAboutTodoAnnotatedTests="true"
-
-    convertErrorsToExceptions="true"
-    convertWarningsToExceptions="true"
-    convertNoticesToExceptions="true"
-    failOnWarning="true"
-    colors="true"
->
-
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <ini name="date.timezone" value="UTC" />
-        <ini name="intl.default_locale" value="en" />
-        <ini name="intl.error_level" value="0" />
-        <ini name="memory_limit" value="-1" />
-
-        <var name="db_driver" value="pdo_pgsql"/>
-        <var name="db_host" value="pgsql"/>
-        <var name="db_user" value="postgres"/>
-        <var name="db_password" value="postgres"/>
-        <var name="db_dbname" value="search_tests"/>
-        <var name="db_port" value="5432"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="RollerworksSearch Test Suite">
-            <directory>../lib/*/Tests/</directory>
-            <directory>../lib/*/*/Tests/</directory>
-            <exclude>../lib/Doctrine/Dbal/Tests/</exclude>
-            <exclude>../lib/Doctrine/Orm/Tests/</exclude>
-        </testsuite>
-    </testsuites>
-
-    <coverage>
-        <include>
-            <directory>../lib</directory>
-        </include>
-        <exclude>
-            <directory>../vendor/</directory>
-            <directory>../lib/*/Tests/</directory>
-            <directory>../lib/*/*/Tests/</directory>
-        </exclude>
-    </coverage>
-
-    <listeners>
-        <listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-</phpunit>