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/.gitignore b/.gitignore
index 785ddce..e0d383d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
+/.idea
+/vendor
 /composer.lock
-.idea/
-vendor/
-composer.lock
diff --git a/.phpbenchmarks/Configuration.php b/.phpbenchmarks/Configuration.php
deleted file mode 100644
index 47df862..0000000
--- a/.phpbenchmarks/Configuration.php
+++ /dev/null
@@ -1,71 +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 4;
-    }
-
-    public static function getSourceCodeUrls(): array
-    {
-        return [
-            'entryPoint' => 'https://github.com/phpbenchmarks/php/blob/7.4_templating-small-overload/public/index.php'
-        ];
-    }
-}
\ No newline at end of file
diff --git a/.phpbenchmarks/config.yml b/.phpbenchmarks/config.yml
new file mode 100644
index 0000000..98e1e21
--- /dev/null
+++ b/.phpbenchmarks/config.yml
@@ -0,0 +1,23 @@
+component:
+    id: 1
+benchmark:
+    type: 4
+    relativeUrl: /
+sourceCode:
+    entryPoint: public/index.php
+    urls:
+        template: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php'
+        templatingLayout: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L6'
+        templatingBlocks: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/templates/layout/layout_start.php#L31'
+        templatingFunctions: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L8'
+        templatingMacros: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L432'
+        templatingEscapeStringHtml: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#856'
+        templatingEscapeStringJs: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#2877'
+        templatingVariables: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L5933'
+        templatingOutputRaw: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L5933'
+        templatingOutputUnknownVariables: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L6855'
+        templatingOutputMethodCalls: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L7277'
+        templatingIncludeTemplates: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L9308'
+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 85%
rename from .phpbenchmarks/composer/composer.lock.php7.4
rename to .phpbenchmarks/php/7.4/composer.lock
index 4574b40..0826eac 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": "9583fc85040e18c281c2a3c690386e4a",
+    "content-hash": "c3d1a859327842dc46926cdef5cdde6f",
     "packages": [],
     "packages-dev": [],
     "aliases": [],
@@ -13,7 +13,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "7.4.0"
+        "php": "7.4.2"
     },
     "platform-dev": []
 }
diff --git a/.phpbenchmarks/initBenchmark.sh b/.phpbenchmarks/php/7.4/initBenchmark.sh
similarity index 52%
rename from .phpbenchmarks/initBenchmark.sh
rename to .phpbenchmarks/php/7.4/initBenchmark.sh
index 011058f..f61c58a 100755
--- a/.phpbenchmarks/initBenchmark.sh
+++ b/.phpbenchmarks/php/7.4/initBenchmark.sh
@@ -2,5 +2,4 @@
 
 set -e
 
-# add commands to initialize benchmark: clear cache and logs, warm up cache etc
 composer install --no-dev --classmap-authoritative --ansi
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..35613ef
--- /dev/null
+++ b/.phpbenchmarks/php/7.4/preload.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+require(__DIR__ . '/../../../public/index.php');
diff --git a/.phpbenchmarks/responseBody/responseBody.html b/.phpbenchmarks/php/7.4/responseBody/responseBody.html
similarity index 100%
rename from .phpbenchmarks/responseBody/responseBody.html
rename to .phpbenchmarks/php/7.4/responseBody/responseBody.html
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 abb5929..1dcb249 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,6 @@
     "license": "proprietary",
     "type": "project",
     "require": {
-        "php": "7.4.0"
+        "php": "7.4.2"
     }
-}
\ No newline at end of file
+}