diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8ed8d03..041b39b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,8 +5,6 @@ jobs:
         docker:
             - image: phpbenchmarks/benchmark-kit:4
         working_directory: /var/www/benchmark
-        environment:
-            NGINX_PORT: 80
         steps:
             - checkout
             - run:
@@ -14,7 +12,7 @@ jobs:
                 command: /var/entrypoint.sh --nginx-as-service
             - run:
                 name: "benchmark:validate"
-                command: "/var/benchmark-kit/bin/console benchmark:validate"
+                command: "/var/benchmark-kit/bin/console benchmark:validate:all"
 
 workflows:
     version: '2.1'
diff --git a/.phpbenchmarks/Configuration.php b/.phpbenchmarks/Configuration.php
deleted file mode 100644
index 0a3d5c9..0000000
--- a/.phpbenchmarks/Configuration.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PhpBenchmarks\BenchmarkConfiguration;
-
-class Configuration
-{
-    public static function getComponentType(): int
-    {
-        return 1;
-    }
-
-    public static function getComponentName(): string
-    {
-        return 'PHP';
-    }
-
-    public static function getComponentSlug(): string
-    {
-        return 'php';
-    }
-
-    public static function isCompatibleWithPhp(int $major, int $minor): bool
-    {
-        return $major === 7 && $minor === 4;
-    }
-
-    public static function getEntryPointFileName(): string
-    {
-        return 'public/index.php';
-    }
-
-    public static function getBenchmarkUrl(): string
-    {
-        return '/';
-    }
-
-    public static function getCoreDependencyName(): string
-    {
-        return 'php';
-    }
-
-    public static function getCoreDependencyMajorVersion(): int
-    {
-        return 7;
-    }
-
-    public static function getCoreDependencyMinorVersion(): int
-    {
-        return 4;
-    }
-
-    public static function getCoreDependencyPatchVersion(): int
-    {
-        return 0;
-    }
-
-    public static function getBenchmarkType(): int
-    {
-        return 3;
-    }
-
-    public static function getSourceCodeUrls(): array
-    {
-        return [
-            'entryPoint' => 'https://github.com/phpbenchmarks/php/blob/7.4_rest-api/public/index.php',
-            'randomizeLanguageDispatchEvent' => 'https://github.com/phpbenchmarks/php/blob/7.4_rest-api/public/index.php#L13',
-            'randomizeLanguageEventListener' => 'https://github.com/phpbenchmarks/php/blob/7.4_rest-api/src/Translation/TranslationService.php',
-            'translations' => 'https://github.com/phpbenchmarks/php/tree/7.4_rest-api/translations',
-            'translate' => 'https://github.com/phpbenchmarks/php/blob/7.4_rest-api/src/ArrayEncoder/UserArrayEncoder.php#L28',
-            'serialize' => 'https://github.com/phpbenchmarks/php/blob/7.4_rest-api/public/index.php#L18'
-        ];
-    }
-}
diff --git a/.phpbenchmarks/config.yml b/.phpbenchmarks/config.yml
new file mode 100644
index 0000000..bd03d61
--- /dev/null
+++ b/.phpbenchmarks/config.yml
@@ -0,0 +1,17 @@
+component:
+    id: 1
+benchmark:
+    type: 3
+    relativeUrl: /
+sourceCode:
+    entryPoint: public/index.php
+    urls:
+        entryPoint: 'https://github.com/phpbenchmarks/php/tree/7.4.2_rest-api_0/public/index.php'
+        randomizeLanguageDispatchEvent: 'https://github.com/phpbenchmarks/php/tree/7.4.2_rest-api_0/public/index.php#L51'
+        randomizeLanguageEventListener: 'https://github.com/phpbenchmarks/php/tree/7.4.2_rest-api_0/src/Translation/TranslationService.php#L11'
+        translations: 'https://github.com/phpbenchmarks/php/tree/7.4.2_rest-api_0/translations/phpbenchmarks.en_GB.php'
+        translate: 'https://github.com/phpbenchmarks/php/tree/7.4.2_rest-api_0/public/index.php#L21'
+        serialize: 'https://github.com/phpbenchmarks/php/tree/7.4.2_rest-api_0/public/index.php#L58'
+coreDependency:
+    name: php
+    version: 7.4.2
diff --git a/.phpbenchmarks/vhost.conf b/.phpbenchmarks/nginx/vhost.conf
similarity index 94%
rename from .phpbenchmarks/vhost.conf
rename to .phpbenchmarks/nginx/vhost.conf
index 9dc7c32..d7dba5a 100644
--- a/.phpbenchmarks/vhost.conf
+++ b/.phpbenchmarks/nginx/vhost.conf
@@ -1,5 +1,5 @@
 server {
-    listen 80;
+    listen ____PORT____;
     server_name ____HOST____;
     root ____INSTALLATION_PATH____/public;
     location / {
diff --git a/.phpbenchmarks/composer/composer.lock.php7.4 b/.phpbenchmarks/php/7.4/composer.lock
similarity index 95%
rename from .phpbenchmarks/composer/composer.lock.php7.4
rename to .phpbenchmarks/php/7.4/composer.lock
index 83101e6..a182fe4 100644
--- a/.phpbenchmarks/composer/composer.lock.php7.4
+++ b/.phpbenchmarks/php/7.4/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "67e054ed35b2af4a104762224ae4a621",
+    "content-hash": "7a6ae71c28c060a84252508251463c96",
     "packages": [
         {
             "name": "phpbenchmarks/benchmark-rest-data",
@@ -44,7 +44,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "7.4.0",
+        "php": "7.4.2",
         "ext-json": "*"
     },
     "platform-dev": []
diff --git a/.phpbenchmarks/initBenchmark.sh b/.phpbenchmarks/php/7.4/initBenchmark.sh
similarity index 100%
rename from .phpbenchmarks/initBenchmark.sh
rename to .phpbenchmarks/php/7.4/initBenchmark.sh
diff --git a/.phpbenchmarks/php/7.4/php.ini b/.phpbenchmarks/php/7.4/php.ini
new file mode 100644
index 0000000..e69de29
diff --git a/.phpbenchmarks/php/7.4/preload.php b/.phpbenchmarks/php/7.4/preload.php
new file mode 100644
index 0000000..3e9a2d1
--- /dev/null
+++ b/.phpbenchmarks/php/7.4/preload.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+$rootDir = __DIR__ . '/../../..';
+
+require($rootDir . '/translations/phpbenchmarks.en.php');
+require($rootDir . '/translations/phpbenchmarks.en_GB.php');
+require($rootDir . '/translations/phpbenchmarks.fr_FR.php');
+require($rootDir . '/public/index.php');
diff --git a/.phpbenchmarks/responseBody/responseBody.en.json b/.phpbenchmarks/php/7.4/responseBody/responseBody.en.json
similarity index 100%
rename from .phpbenchmarks/responseBody/responseBody.en.json
rename to .phpbenchmarks/php/7.4/responseBody/responseBody.en.json
diff --git a/.phpbenchmarks/responseBody/responseBody.en_GB.json b/.phpbenchmarks/php/7.4/responseBody/responseBody.en_GB.json
similarity index 100%
rename from .phpbenchmarks/responseBody/responseBody.en_GB.json
rename to .phpbenchmarks/php/7.4/responseBody/responseBody.en_GB.json
diff --git a/.phpbenchmarks/responseBody/responseBody.fr_FR.json b/.phpbenchmarks/php/7.4/responseBody/responseBody.fr_FR.json
similarity index 100%
rename from .phpbenchmarks/responseBody/responseBody.fr_FR.json
rename to .phpbenchmarks/php/7.4/responseBody/responseBody.fr_FR.json
diff --git a/README.md b/README.md
index 17b7798..c644c40 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 ## What is www.phpbenchmarks.com?
 
-You will find lot of benchmarks for PHP frameworks, template engines and JSON serializers on [phpbenchmarks.com](http://www.phpbenchmarks.com).
+You will find a lot of benchmarks for PHP and PHP libraries on [phpbenchmarks.com](http://www.phpbenchmarks.com).
 
 Benchmarks results are available from PHP 5.6 to latest version.
 
@@ -18,8 +18,6 @@ It contains PHP benchmark code.
 
 Switch branch to select version and benchmark you want to see.
 
-You can find source code links into [Configuration::getSourceCodeUrls()](.phpbenchmarks/Configuration.php).
-
 ## Benchmarks
 
 You can find PHP 7.4 benchmarks results on
@@ -33,12 +31,14 @@ Go to [community page](http://www.phpbenchmarks.com/en/community) to see the Hal
 
 ## How version works?
 
-We do not follow semantic version for this repository. Here is an explanation about our versioning system:
-
-`W` PHP major version.
+We do not follow semantic version for this repository.
 
-`X` PHP minor version.
+Here is an explanation about our versioning system:
 
-`Y` PHP patch version.
+`X.Y.Z_benchmark-slug_W`
 
-`Z` Benchmark type: `1`: Hello world, `3`: REST API, `6` JSON serialization of Hello world, `7` Small JSON serialization, `8` Big JSON serialization.
+* `X`: PHP major version.
+* `Y`: PHP minor version.
+* `Z`: PHP patch version.
+* `benchmark-slug`: slug of the benchmark, list available on [documentation page](http://www.phpbenchmarks.com/en/documentation).
+* `W`: benchmark version
diff --git a/composer.json b/composer.json
index 88a1123..2df20e8 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         }
     },
     "require": {
-        "php": "7.4.0",
+        "php": "7.4.2",
         "ext-json": "*",
         "phpbenchmarks/benchmark-rest-data": "1.1.0"
     }
diff --git a/public/index.php b/public/index.php
index 9fa4db3..1e5d464 100644
--- a/public/index.php
+++ b/public/index.php
@@ -2,22 +2,57 @@
 
 declare(strict_types=1);
 
-use App\{
-    ArrayEncoder\UserArrayEncoder,
-    Translation\TranslationService
+use App\Translation\TranslationService;
+use PhpBenchmarksRestData\{
+    Comment,
+    CommentType,
+    Service,
+    User
 };
-use PhpBenchmarksRestData\Service;
 
-require('../vendor/autoload.php');
+require(__DIR__ . '/../vendor/autoload.php');
+
+function encodeUser(User $user): array
+{
+    return [
+        'id' => $user->getId(),
+        'login' => $user->getLogin(),
+        'createdAt' => $user->getCreatedAt()->format('Y-m-d H:i:s'),
+        'translated' => TranslationService::getTranslation('translated.1000'),
+        'comments' => encodeComments($user->getComments())
+    ];
+}
+
+/** @param Comment[] $comments */
+function encodeComments(array $comments): array
+{
+    $return = [];
+    foreach ($comments as $comment) {
+        $return[] = [
+            'id' => $comment->getId(),
+            'message' => $comment->getMessage(),
+            'translated' => TranslationService::getTranslation('translated.2000'),
+            'type' => encodeType($comment->getType())
+        ];
+    }
+
+    return $return;
+}
+
+function encodeType(CommentType $type): array
+{
+    return [
+        'id' => $type->getId(),
+        'name' => $type->getName(),
+        'translated' => TranslationService::getTranslation('translated.3000')
+    ];
+}
 
 TranslationService::loadTranslations();
 
-$userEncoder = new UserArrayEncoder();
 $data = [];
 foreach (Service::getUsers() as $user) {
-    $data[] = $userEncoder->encode($user);
+    $data[] = encodeUser($user);
 }
 
 echo json_encode($data);
-
-// require phpbenchmarks stats.php here when needed
diff --git a/src/ArrayEncoder/CommentArrayEncoder.php b/src/ArrayEncoder/CommentArrayEncoder.php
deleted file mode 100644
index 6927fd3..0000000
--- a/src/ArrayEncoder/CommentArrayEncoder.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\ArrayEncoder;
-
-use App\Translation\TranslationService;
-use PhpBenchmarksRestData\Comment;
-
-class CommentArrayEncoder
-{
-    protected CommentTypeArrayEncoder $commentTypeEncoder;
-
-    public function __construct()
-    {
-        $this->commentTypeEncoder = new CommentTypeArrayEncoder();
-    }
-
-    public function encode(Comment $comment): array
-    {
-        return [
-            'id' => $comment->getId(),
-            'message' => $comment->getMessage(),
-            'translated' => TranslationService::getTranslation('translated.2000'),
-            'type' => $this->commentTypeEncoder->encode($comment->getType())
-        ];
-    }
-}
diff --git a/src/ArrayEncoder/CommentTypeArrayEncoder.php b/src/ArrayEncoder/CommentTypeArrayEncoder.php
deleted file mode 100644
index 0185257..0000000
--- a/src/ArrayEncoder/CommentTypeArrayEncoder.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\ArrayEncoder;
-
-use App\Translation\TranslationService;
-use PhpBenchmarksRestData\CommentType;
-
-class CommentTypeArrayEncoder
-{
-    public function encode(CommentType $commentType): array
-    {
-        return [
-            'id' => $commentType->getId(),
-            'name' => $commentType->getName(),
-            'translated' => TranslationService::getTranslation('translated.3000')
-        ];
-    }
-}
diff --git a/src/ArrayEncoder/UserArrayEncoder.php b/src/ArrayEncoder/UserArrayEncoder.php
deleted file mode 100644
index 49f4750..0000000
--- a/src/ArrayEncoder/UserArrayEncoder.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\ArrayEncoder;
-
-use App\Translation\TranslationService;
-use PhpBenchmarksRestData\{
-    Comment,
-    User
-};
-
-class UserArrayEncoder
-{
-    protected CommentArrayEncoder $commentEncoder;
-
-    public function __construct()
-    {
-        $this->commentEncoder = new CommentArrayEncoder();
-    }
-
-    public function encode(User $user): array
-    {
-        return [
-            'id' => $user->getId(),
-            'login' => $user->getLogin(),
-            'createdAt' => $user->getCreatedAt()->format('Y-m-d H:i:s'),
-            'translated' => TranslationService::getTranslation('translated.1000'),
-            'comments' => array_map(
-                fn(Comment $comment) => $this->commentEncoder->encode($comment),
-                $user->getComments()
-            )
-        ];
-    }
-}