From c3e40cff4546763e7029f10f3880bbadde2bb663 Mon Sep 17 00:00:00 2001
From: Christoph Kappestein <christoph.kappestein@gmail.com>
Date: Sun, 13 Oct 2024 01:15:47 +0200
Subject: [PATCH] start typeschema next migration

---
 www/composer.lock                             | 355 +++++++------
 www/resources/examples/discriminator.json     |  37 +-
 www/resources/examples/generic.json           |  17 +-
 www/resources/examples/import.json            |   9 +-
 www/resources/examples/inheritance.json       |  11 +-
 www/resources/examples/map.json               |  11 +-
 www/resources/examples/map_inline.json        |   8 +-
 www/resources/examples/reference.json         |  10 +-
 www/resources/examples/simple.json            |   5 +-
 .../template/{generator => }/changelog.php    |   4 +-
 www/resources/template/example.php            |  49 ++
 www/resources/template/generator.php          |  33 ++
 www/resources/template/generator/schema.php   |  41 --
 www/resources/template/generator_overview.php |  27 +
 .../template/{generator => }/hash.php         |   4 +-
 www/resources/template/inc/header.php         |   8 +-
 www/resources/template/index.php              |  51 +-
 www/resources/template/specification.php      | 492 +++++++++++-------
 www/resources/typeschema.json                 |   2 +-
 .../Controller/{Generator => }/Changelog.php  |  10 +-
 www/src/Controller/Example.php                | 189 +++++++
 .../{Generator/Schema.php => Generator.php}   |  68 ++-
 www/src/Controller/Generator/Client.php       |  19 -
 www/src/Controller/{Generator => }/Hash.php   |  12 +-
 www/src/Controller/Index.php                  |  96 +---
 www/src/Model/Generate.php                    |  12 +-
 www/src/Service/TypeName.php                  |  25 +
 27 files changed, 992 insertions(+), 613 deletions(-)
 rename www/resources/template/{generator => }/changelog.php (94%)
 create mode 100644 www/resources/template/example.php
 create mode 100644 www/resources/template/generator.php
 delete mode 100644 www/resources/template/generator/schema.php
 create mode 100644 www/resources/template/generator_overview.php
 rename www/resources/template/{generator => }/hash.php (92%)
 rename www/src/Controller/{Generator => }/Changelog.php (91%)
 create mode 100644 www/src/Controller/Example.php
 rename www/src/Controller/{Generator/Schema.php => Generator.php} (50%)
 delete mode 100644 www/src/Controller/Generator/Client.php
 rename www/src/Controller/{Generator => }/Hash.php (85%)
 create mode 100644 www/src/Service/TypeName.php

diff --git a/www/composer.lock b/www/composer.lock
index 4a479b5..42e2377 100644
--- a/www/composer.lock
+++ b/www/composer.lock
@@ -101,16 +101,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.9.1",
+            "version": "3.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7"
+                "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/d7dc08f98cba352b2bab5d32c5e58f7e745c11a7",
-                "reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/61446f07fcb522414d6cfd8b1c3e5f9e18c579ba",
+                "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba",
                 "shasum": ""
             },
             "require": {
@@ -126,7 +126,7 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.12.0",
+                "phpstan/phpstan": "1.12.6",
                 "phpstan/phpstan-strict-rules": "^1.6",
                 "phpunit/phpunit": "9.6.20",
                 "psalm/plugin-phpunit": "0.18.4",
@@ -194,7 +194,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.9.1"
+                "source": "https://github.com/doctrine/dbal/tree/3.9.3"
             },
             "funding": [
                 {
@@ -210,7 +210,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-01T13:49:23+00:00"
+            "time": "2024-10-10T17:56:43+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -429,16 +429,16 @@
         },
         {
             "name": "doctrine/migrations",
-            "version": "3.8.1",
+            "version": "3.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/migrations.git",
-                "reference": "7760fbd0b7cb58bfb50415505a7bab821adf0877"
+                "reference": "5007eb1168691225ac305fe16856755c20860842"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/migrations/zipball/7760fbd0b7cb58bfb50415505a7bab821adf0877",
-                "reference": "7760fbd0b7cb58bfb50415505a7bab821adf0877",
+                "url": "https://api.github.com/repos/doctrine/migrations/zipball/5007eb1168691225ac305fe16856755c20860842",
+                "reference": "5007eb1168691225ac305fe16856755c20860842",
                 "shasum": ""
             },
             "require": {
@@ -512,7 +512,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/migrations/issues",
-                "source": "https://github.com/doctrine/migrations/tree/3.8.1"
+                "source": "https://github.com/doctrine/migrations/tree/3.8.2"
             },
             "funding": [
                 {
@@ -528,7 +528,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-28T13:17:28+00:00"
+            "time": "2024-10-10T21:35:27+00:00"
         },
         {
             "name": "egulias/email-validator",
@@ -1025,16 +1025,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.19.1",
+            "version": "v4.19.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b"
+                "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b",
-                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/715f4d25e225bc47b293a8b997fe6ce99bf987d2",
+                "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2",
                 "shasum": ""
             },
             "require": {
@@ -1043,7 +1043,7 @@
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -1075,9 +1075,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.4"
             },
-            "time": "2024-03-17T08:10:35+00:00"
+            "time": "2024-09-29T15:01:53+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -1192,16 +1192,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.30.1",
+            "version": "1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "51b95ec8670af41009e2b2b56873bad96682413e"
+                "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/51b95ec8670af41009e2b2b56873bad96682413e",
-                "reference": "51b95ec8670af41009e2b2b56873bad96682413e",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4",
+                "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4",
                 "shasum": ""
             },
             "require": {
@@ -1233,9 +1233,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0"
             },
-            "time": "2024-09-07T20:13:05+00:00"
+            "time": "2024-09-26T07:23:32+00:00"
         },
         {
             "name": "psr/cache",
@@ -1599,16 +1599,16 @@
         },
         {
             "name": "psr/log",
-            "version": "3.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "79dff0b268932c640297f5208d6298f71855c03e"
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e",
-                "reference": "79dff0b268932c640297f5208d6298f71855c03e",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
                 "shasum": ""
             },
             "require": {
@@ -1643,29 +1643,29 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.1"
+                "source": "https://github.com/php-fig/log/tree/3.0.2"
             },
-            "time": "2024-08-21T13:31:24+00:00"
+            "time": "2024-09-11T13:17:53+00:00"
         },
         {
             "name": "psx/api",
-            "version": "v7.0.8",
+            "version": "v7.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/apioo/psx-api.git",
-                "reference": "8a514c72c32c3d389e5e655050e4b718af4747c0"
+                "reference": "cfd6355fa1b41c5a8bd177166a33a11c11182474"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/apioo/psx-api/zipball/8a514c72c32c3d389e5e655050e4b718af4747c0",
-                "reference": "8a514c72c32c3d389e5e655050e4b718af4747c0",
+                "url": "https://api.github.com/repos/apioo/psx-api/zipball/cfd6355fa1b41c5a8bd177166a33a11c11182474",
+                "reference": "cfd6355fa1b41c5a8bd177166a33a11c11182474",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
                 "psx/json": "^3.0",
-                "psx/openapi": "^0.1",
-                "psx/schema": "^6.0",
+                "psx/openapi": "^1.0",
+                "psx/schema": "^7.0",
                 "symfony/cache": "^5.0|^6.0|^7.0",
                 "symfony/console": "^5.0|^6.0|^7.0",
                 "symfony/property-access": "^5.0|^6.0|^7.0",
@@ -1704,7 +1704,7 @@
             ],
             "support": {
                 "issues": "https://github.com/apioo/psx-api/issues",
-                "source": "https://github.com/apioo/psx-api/tree/v7.0.8"
+                "source": "https://github.com/apioo/psx-api/tree/v7.2.3"
             },
             "funding": [
                 {
@@ -1720,20 +1720,20 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-09-07T07:25:58+00:00"
+            "time": "2024-10-11T17:00:15+00:00"
         },
         {
             "name": "psx/data",
-            "version": "v6.0.2",
+            "version": "v7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/apioo/psx-data.git",
-                "reference": "671f84e41ab50deb66b1e818ad001f43f19d4382"
+                "reference": "15b8e53099187254148ebee4ea41352177076b3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/apioo/psx-data/zipball/671f84e41ab50deb66b1e818ad001f43f19d4382",
-                "reference": "671f84e41ab50deb66b1e818ad001f43f19d4382",
+                "url": "https://api.github.com/repos/apioo/psx-data/zipball/15b8e53099187254148ebee4ea41352177076b3c",
+                "reference": "15b8e53099187254148ebee4ea41352177076b3c",
                 "shasum": ""
             },
             "require": {
@@ -1744,7 +1744,7 @@
                 "psx/json": "^3.0",
                 "psx/model": "^5.0",
                 "psx/record": "^3.0",
-                "psx/schema": "^6.0",
+                "psx/schema": "^7.0",
                 "psx/validate": "^2.0"
             },
             "require-dev": {
@@ -1779,7 +1779,7 @@
             ],
             "support": {
                 "issues": "https://github.com/apioo/psx-data/issues",
-                "source": "https://github.com/apioo/psx-data/tree/v6.0.2"
+                "source": "https://github.com/apioo/psx-data/tree/v7.0.1"
             },
             "funding": [
                 {
@@ -1795,20 +1795,20 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-04-06T09:08:36+00:00"
+            "time": "2024-10-10T11:07:43+00:00"
         },
         {
             "name": "psx/datetime",
-            "version": "v3.0.1",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/apioo/psx-datetime.git",
-                "reference": "5b763bcd09fdfda611a72d1a0dc6f34ec10f7b44"
+                "reference": "4c930aba1cce89a24de0740b6035d44de33585e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/apioo/psx-datetime/zipball/5b763bcd09fdfda611a72d1a0dc6f34ec10f7b44",
-                "reference": "5b763bcd09fdfda611a72d1a0dc6f34ec10f7b44",
+                "url": "https://api.github.com/repos/apioo/psx-datetime/zipball/4c930aba1cce89a24de0740b6035d44de33585e6",
+                "reference": "4c930aba1cce89a24de0740b6035d44de33585e6",
                 "shasum": ""
             },
             "require": {
@@ -1847,7 +1847,7 @@
             ],
             "support": {
                 "issues": "https://github.com/apioo/psx-datetime/issues",
-                "source": "https://github.com/apioo/psx-datetime/tree/v3.0.1"
+                "source": "https://github.com/apioo/psx-datetime/tree/v3.0.2"
             },
             "funding": [
                 {
@@ -1863,7 +1863,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-05-10T17:04:35+00:00"
+            "time": "2024-09-22T08:37:24+00:00"
         },
         {
             "name": "psx/engine",
@@ -1932,16 +1932,16 @@
         },
         {
             "name": "psx/framework",
-            "version": "v7.8.5",
+            "version": "v7.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/apioo/psx-framework.git",
-                "reference": "86aeaf2ec7a2c4ceee1bce3abd7c90913b0ad4a9"
+                "reference": "3c30eef184d5b9531246df5f76dca31ba957799f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/apioo/psx-framework/zipball/86aeaf2ec7a2c4ceee1bce3abd7c90913b0ad4a9",
-                "reference": "86aeaf2ec7a2c4ceee1bce3abd7c90913b0ad4a9",
+                "url": "https://api.github.com/repos/apioo/psx-framework/zipball/3c30eef184d5b9531246df5f76dca31ba957799f",
+                "reference": "3c30eef184d5b9531246df5f76dca31ba957799f",
                 "shasum": ""
             },
             "require": {
@@ -1951,13 +1951,13 @@
                 "psr/cache": "^1.0|^2.0|^3.0",
                 "psr/container": "^1.0|^2.0",
                 "psr/log": "^1.0|^2.0|^3.0",
-                "psx/api": "^6.0|^7.0",
-                "psx/data": "^6.0",
+                "psx/api": "^7.0",
+                "psx/data": "^7.0",
                 "psx/engine": "^2.0",
                 "psx/http": "^4.0",
                 "psx/json": "^3.0",
                 "psx/oauth2": "^4.0",
-                "psx/schema": "^6.0",
+                "psx/schema": "^7.0",
                 "psx/sql": "^4.0",
                 "psx/uri": "^3.0",
                 "psx/validate": "^2.0",
@@ -2005,7 +2005,7 @@
             ],
             "support": {
                 "issues": "https://github.com/apioo/psx-framework/issues",
-                "source": "https://github.com/apioo/psx-framework/tree/v7.8.5"
+                "source": "https://github.com/apioo/psx-framework/tree/v7.9.1"
             },
             "funding": [
                 {
@@ -2021,20 +2021,20 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-09-02T16:22:18+00:00"
+            "time": "2024-10-10T12:08:31+00:00"
         },
         {
             "name": "psx/http",
-            "version": "v4.0.4",
+            "version": "v4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/apioo/psx-http.git",
-                "reference": "de7fd38e5759697664e5ed3a1705a7cb4d91c99a"
+                "reference": "23da2fa4df2e09c9251369894fbe9c3cde6c5d92"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/apioo/psx-http/zipball/de7fd38e5759697664e5ed3a1705a7cb4d91c99a",
-                "reference": "de7fd38e5759697664e5ed3a1705a7cb4d91c99a",
+                "url": "https://api.github.com/repos/apioo/psx-http/zipball/23da2fa4df2e09c9251369894fbe9c3cde6c5d92",
+                "reference": "23da2fa4df2e09c9251369894fbe9c3cde6c5d92",
                 "shasum": ""
             },
             "require": {
@@ -2072,7 +2072,7 @@
             ],
             "support": {
                 "issues": "https://github.com/apioo/psx-http/issues",
-                "source": "https://github.com/apioo/psx-http/tree/v4.0.4"
+                "source": "https://github.com/apioo/psx-http/tree/v4.0.5"
             },
             "funding": [
                 {
@@ -2088,7 +2088,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-05-10T17:22:46+00:00"
+            "time": "2024-09-15T10:25:21+00:00"
         },
         {
             "name": "psx/json",
@@ -2293,16 +2293,16 @@
         },
         {
             "name": "psx/openapi",
-            "version": "v0.1.2",
+            "version": "v1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/apioo/psx-openapi.git",
-                "reference": "7f4bffb834b35f41679bb068e3990cd907d8c41e"
+                "reference": "b20b7fae9b1ae6f3c49bc0675ac2ed1ee9437c5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/apioo/psx-openapi/zipball/7f4bffb834b35f41679bb068e3990cd907d8c41e",
-                "reference": "7f4bffb834b35f41679bb068e3990cd907d8c41e",
+                "url": "https://api.github.com/repos/apioo/psx-openapi/zipball/b20b7fae9b1ae6f3c49bc0675ac2ed1ee9437c5d",
+                "reference": "b20b7fae9b1ae6f3c49bc0675ac2ed1ee9437c5d",
                 "shasum": ""
             },
             "require": {
@@ -2311,7 +2311,7 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0",
-                "psx/schema": "^6.0",
+                "psx/schema": "^7.0",
                 "symfony/yaml": "^5.0|^6.0|^7.0",
                 "vimeo/psalm": "^5.0"
             },
@@ -2341,7 +2341,7 @@
             ],
             "support": {
                 "issues": "https://github.com/apioo/psx-openapi/issues",
-                "source": "https://github.com/apioo/psx-openapi/tree/v0.1.2"
+                "source": "https://github.com/apioo/psx-openapi/tree/v1.0.0"
             },
             "funding": [
                 {
@@ -2357,7 +2357,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-05-10T17:34:39+00:00"
+            "time": "2024-10-09T18:33:41+00:00"
         },
         {
             "name": "psx/record",
@@ -2426,16 +2426,16 @@
         },
         {
             "name": "psx/schema",
-            "version": "v6.2.7",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/apioo/psx-schema.git",
-                "reference": "d87b25ac2f96cc90167b99a6dd7c0a646c3c80ac"
+                "reference": "b7f575c2d50c3fdd3c01aa062c32521ab3cd6c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/apioo/psx-schema/zipball/d87b25ac2f96cc90167b99a6dd7c0a646c3c80ac",
-                "reference": "d87b25ac2f96cc90167b99a6dd7c0a646c3c80ac",
+                "url": "https://api.github.com/repos/apioo/psx-schema/zipball/b7f575c2d50c3fdd3c01aa062c32521ab3cd6c66",
+                "reference": "b7f575c2d50c3fdd3c01aa062c32521ab3cd6c66",
                 "shasum": ""
             },
             "require": {
@@ -2455,11 +2455,8 @@
             "require-dev": {
                 "phpunit/phpunit": "^9.0",
                 "symfony/yaml": "^5.0|^6.0|^7.0",
-                "vimeo/psalm": "^4.0"
+                "vimeo/psalm": "^5.0"
             },
-            "bin": [
-                "bin/schema"
-            ],
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -2487,7 +2484,7 @@
             ],
             "support": {
                 "issues": "https://github.com/apioo/psx-schema/issues",
-                "source": "https://github.com/apioo/psx-schema/tree/v6.2.7"
+                "source": "https://github.com/apioo/psx-schema/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -2503,7 +2500,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-08-18T10:20:13+00:00"
+            "time": "2024-10-12T09:43:10+00:00"
         },
         {
             "name": "psx/sql",
@@ -2750,16 +2747,16 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "b61e464d7687bb7e8f677d5031c632bf3820df18"
+                "reference": "86e5296b10e4dec8c8441056ca606aedb8a3be0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/b61e464d7687bb7e8f677d5031c632bf3820df18",
-                "reference": "b61e464d7687bb7e8f677d5031c632bf3820df18",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/86e5296b10e4dec8c8441056ca606aedb8a3be0a",
+                "reference": "86e5296b10e4dec8c8441056ca606aedb8a3be0a",
                 "shasum": ""
             },
             "require": {
@@ -2827,7 +2824,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v7.1.4"
+                "source": "https://github.com/symfony/cache/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -2843,7 +2840,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-12T09:59:40+00:00"
+            "time": "2024-09-17T09:16:35+00:00"
         },
         {
             "name": "symfony/cache-contracts",
@@ -3072,16 +3069,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111"
+                "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/1eed7af6961d763e7832e874d7f9b21c3ea9c111",
-                "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0fa539d12b3ccf068a722bbbffa07ca7079af9ee",
+                "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee",
                 "shasum": ""
             },
             "require": {
@@ -3145,7 +3142,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.4"
+                "source": "https://github.com/symfony/console/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -3161,20 +3158,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-15T22:48:53+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "5320e0bc2c9e2d7450bb4091e497a305a68b28ed"
+                "reference": "38465f925ec4e0707b090e9147c65869837d639d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5320e0bc2c9e2d7450bb4091e497a305a68b28ed",
-                "reference": "5320e0bc2c9e2d7450bb4091e497a305a68b28ed",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/38465f925ec4e0707b090e9147c65869837d639d",
+                "reference": "38465f925ec4e0707b090e9147c65869837d639d",
                 "shasum": ""
             },
             "require": {
@@ -3225,7 +3222,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v7.1.4"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -3241,7 +3238,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-29T08:16:25+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -3312,16 +3309,16 @@
         },
         {
             "name": "symfony/doctrine-messenger",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/doctrine-messenger.git",
-                "reference": "7f2a9262d7af3f892e49382b918e991af2ae0738"
+                "reference": "29015027fb63461e035246e07d74eeab9cb03304"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/doctrine-messenger/zipball/7f2a9262d7af3f892e49382b918e991af2ae0738",
-                "reference": "7f2a9262d7af3f892e49382b918e991af2ae0738",
+                "url": "https://api.github.com/repos/symfony/doctrine-messenger/zipball/29015027fb63461e035246e07d74eeab9cb03304",
+                "reference": "29015027fb63461e035246e07d74eeab9cb03304",
                 "shasum": ""
             },
             "require": {
@@ -3364,7 +3361,7 @@
             "description": "Symfony Doctrine Messenger Bridge",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/doctrine-messenger/tree/v7.1.4"
+                "source": "https://github.com/symfony/doctrine-messenger/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -3380,20 +3377,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-30T07:19:54+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
         },
         {
             "name": "symfony/dotenv",
-            "version": "v7.1.3",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dotenv.git",
-                "reference": "a26be30fd61678dab694a18a85084cea7673bbf3"
+                "reference": "6d966200b399fa59759286f3fc7c919f0677c449"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dotenv/zipball/a26be30fd61678dab694a18a85084cea7673bbf3",
-                "reference": "a26be30fd61678dab694a18a85084cea7673bbf3",
+                "url": "https://api.github.com/repos/symfony/dotenv/zipball/6d966200b399fa59759286f3fc7c919f0677c449",
+                "reference": "6d966200b399fa59759286f3fc7c919f0677c449",
                 "shasum": ""
             },
             "require": {
@@ -3438,7 +3435,7 @@
                 "environment"
             ],
             "support": {
-                "source": "https://github.com/symfony/dotenv/tree/v7.1.3"
+                "source": "https://github.com/symfony/dotenv/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -3454,7 +3451,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-09T19:36:07+00:00"
+            "time": "2024-09-17T09:16:35+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -3614,16 +3611,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.1.2",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "92a91985250c251de9b947a14bb2c9390b1a562c"
+                "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/92a91985250c251de9b947a14bb2c9390b1a562c",
-                "reference": "92a91985250c251de9b947a14bb2c9390b1a562c",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/61fe0566189bf32e8cfee78335d8776f64a66f5a",
+                "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a",
                 "shasum": ""
             },
             "require": {
@@ -3660,7 +3657,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.1.2"
+                "source": "https://github.com/symfony/filesystem/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -3676,20 +3673,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T10:03:55+00:00"
+            "time": "2024-09-17T09:16:35+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v7.1.2",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee"
+                "reference": "bbf21460c56f29810da3df3e206e38dfbb01e80b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/8fcff0af9043c8f8a8e229437cea363e282f9aee",
-                "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/bbf21460c56f29810da3df3e206e38dfbb01e80b",
+                "reference": "bbf21460c56f29810da3df3e206e38dfbb01e80b",
                 "shasum": ""
             },
             "require": {
@@ -3740,7 +3737,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.1.2"
+                "source": "https://github.com/symfony/mailer/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -3756,20 +3753,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T08:00:31+00:00"
+            "time": "2024-09-08T12:32:26+00:00"
         },
         {
             "name": "symfony/messenger",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/messenger.git",
-                "reference": "e1dc743492ff9f1cfb23e6eea3592bf2ec9bd079"
+                "reference": "e1c0ced845e3dac12ab428c5ed42dbe7a58ca576"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/messenger/zipball/e1dc743492ff9f1cfb23e6eea3592bf2ec9bd079",
-                "reference": "e1dc743492ff9f1cfb23e6eea3592bf2ec9bd079",
+                "url": "https://api.github.com/repos/symfony/messenger/zipball/e1c0ced845e3dac12ab428c5ed42dbe7a58ca576",
+                "reference": "e1c0ced845e3dac12ab428c5ed42dbe7a58ca576",
                 "shasum": ""
             },
             "require": {
@@ -3826,7 +3823,7 @@
             "description": "Helps applications send and receive messages to/from other applications or via message queues",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/messenger/tree/v7.1.4"
+                "source": "https://github.com/symfony/messenger/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -3842,20 +3839,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-06T14:26:51+00:00"
+            "time": "2024-09-08T12:32:26+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "ccaa6c2503db867f472a587291e764d6a1e58758"
+                "reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/ccaa6c2503db867f472a587291e764d6a1e58758",
-                "reference": "ccaa6c2503db867f472a587291e764d6a1e58758",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/711d2e167e8ce65b05aea6b258c449671cdd38ff",
+                "reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff",
                 "shasum": ""
             },
             "require": {
@@ -3910,7 +3907,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.1.4"
+                "source": "https://github.com/symfony/mime/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -3926,7 +3923,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-13T14:28:19+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -4780,16 +4777,16 @@
         },
         {
             "name": "symfony/serializer",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "0158b0e91b7cf7e744a6fb9acaeb613d1ca40dbb"
+                "reference": "71d6e1f70f00752d1469d0f5e83b0a51716f288b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/0158b0e91b7cf7e744a6fb9acaeb613d1ca40dbb",
-                "reference": "0158b0e91b7cf7e744a6fb9acaeb613d1ca40dbb",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/71d6e1f70f00752d1469d0f5e83b0a51716f288b",
+                "reference": "71d6e1f70f00752d1469d0f5e83b0a51716f288b",
                 "shasum": ""
             },
             "require": {
@@ -4803,12 +4800,14 @@
                 "symfony/dependency-injection": "<6.4",
                 "symfony/property-access": "<6.4",
                 "symfony/property-info": "<6.4",
+                "symfony/type-info": "<7.1.5",
                 "symfony/uid": "<6.4",
                 "symfony/validator": "<6.4",
                 "symfony/yaml": "<6.4"
             },
             "require-dev": {
                 "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0",
+                "phpstan/phpdoc-parser": "^1.0",
                 "seld/jsonlint": "^1.10",
                 "symfony/cache": "^6.4|^7.0",
                 "symfony/config": "^6.4|^7.0",
@@ -4824,7 +4823,7 @@
                 "symfony/property-access": "^6.4|^7.0",
                 "symfony/property-info": "^6.4|^7.0",
                 "symfony/translation-contracts": "^2.5|^3",
-                "symfony/type-info": "^7.1",
+                "symfony/type-info": "^7.1.5",
                 "symfony/uid": "^6.4|^7.0",
                 "symfony/validator": "^6.4|^7.0",
                 "symfony/var-dumper": "^6.4|^7.0",
@@ -4857,7 +4856,7 @@
             "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/serializer/tree/v7.1.4"
+                "source": "https://github.com/symfony/serializer/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -4873,7 +4872,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-22T09:39:57+00:00"
+            "time": "2024-09-20T12:13:15+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -5022,16 +5021,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b"
+                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
-                "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/d66f9c343fa894ec2037cc928381df90a7ad4306",
+                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306",
                 "shasum": ""
             },
             "require": {
@@ -5089,7 +5088,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.4"
+                "source": "https://github.com/symfony/string/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -5105,20 +5104,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-12T09:59:40+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
         },
         {
             "name": "symfony/type-info",
-            "version": "v7.1.1",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/type-info.git",
-                "reference": "60b28eb733f1453287f1263ed305b96091e0d1dc"
+                "reference": "9f6094aa900d2c06bd61576a6f279d4ac441515f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/type-info/zipball/60b28eb733f1453287f1263ed305b96091e0d1dc",
-                "reference": "60b28eb733f1453287f1263ed305b96091e0d1dc",
+                "url": "https://api.github.com/repos/symfony/type-info/zipball/9f6094aa900d2c06bd61576a6f279d4ac441515f",
+                "reference": "9f6094aa900d2c06bd61576a6f279d4ac441515f",
                 "shasum": ""
             },
             "require": {
@@ -5171,7 +5170,7 @@
                 "type"
             ],
             "support": {
-                "source": "https://github.com/symfony/type-info/tree/v7.1.1"
+                "source": "https://github.com/symfony/type-info/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -5187,7 +5186,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:59:31+00:00"
+            "time": "2024-09-19T21:48:23+00:00"
         },
         {
             "name": "symfony/var-exporter",
@@ -5267,16 +5266,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "92e080b851c1c655c786a2da77f188f2dccd0f4b"
+                "reference": "4e561c316e135e053bd758bf3b3eb291d9919de4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/92e080b851c1c655c786a2da77f188f2dccd0f4b",
-                "reference": "92e080b851c1c655c786a2da77f188f2dccd0f4b",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/4e561c316e135e053bd758bf3b3eb291d9919de4",
+                "reference": "4e561c316e135e053bd758bf3b3eb291d9919de4",
                 "shasum": ""
             },
             "require": {
@@ -5318,7 +5317,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v7.1.4"
+                "source": "https://github.com/symfony/yaml/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -5334,7 +5333,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-12T09:59:40+00:00"
+            "time": "2024-09-17T12:49:58+00:00"
         },
         {
             "name": "twig/twig",
@@ -5658,24 +5657,24 @@
         },
         {
             "name": "composer/semver",
-            "version": "3.4.2",
+            "version": "3.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6"
+                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6",
-                "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6",
+                "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
+                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.4",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
             },
             "type": "library",
             "extra": {
@@ -5719,7 +5718,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.2"
+                "source": "https://github.com/composer/semver/tree/3.4.3"
             },
             "funding": [
                 {
@@ -5735,7 +5734,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-12T11:35:52+00:00"
+            "time": "2024-09-19T14:15:21+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -5887,16 +5886,16 @@
         },
         {
             "name": "felixfbecker/language-server-protocol",
-            "version": "v1.5.2",
+            "version": "v1.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
+                "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
+                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/a9e113dbc7d849e35b8776da39edaf4313b7b6c9",
+                "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9",
                 "shasum": ""
             },
             "require": {
@@ -5937,9 +5936,9 @@
             ],
             "support": {
                 "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
-                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
+                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.3"
             },
-            "time": "2022-03-02T22:36:06+00:00"
+            "time": "2024-04-30T00:40:11+00:00"
         },
         {
             "name": "fidry/cpu-core-counter",
diff --git a/www/resources/examples/discriminator.json b/www/resources/examples/discriminator.json
index d0f2922..9dd9681 100644
--- a/www/resources/examples/discriminator.json
+++ b/www/resources/examples/discriminator.json
@@ -1,7 +1,7 @@
 {
   "definitions": {
     "Human": {
-      "type": "object",
+      "type": "struct",
       "properties": {
         "firstName": {
           "type": "string"
@@ -10,29 +10,31 @@
           "type": "string"
         },
         "location": {
-          "oneOf": [{
-            "$ref": "Web"
-          }, {
-            "$ref": "World"
-          }],
-          "discriminator": {
-            "propertyName": "type"
-          }
+          "type": "reference",
+          "target": "Location"
         }
       }
     },
     "Location": {
-      "type": "object",
+      "type": "struct",
+      "base": true,
       "properties": {
         "type": {
           "type": "string"
         }
       },
-      "required": ["type"]
+      "discriminator": "type",
+      "mapping": {
+        "Web": "web",
+        "World": "world"
+      }
     },
     "Web": {
-      "$extends": "Location",
-      "type": "object",
+      "parent": {
+        "type": "reference",
+        "target": "Location"
+      },
+      "type": "struct",
       "properties": {
         "url": {
           "type": "string"
@@ -40,8 +42,11 @@
       }
     },
     "World": {
-      "$extends": "Location",
-      "type": "object",
+      "parent": {
+        "type": "reference",
+        "target": "Location"
+      },
+      "type": "struct",
       "properties": {
         "lat": {
           "type": "string"
@@ -52,5 +57,5 @@
       }
     }
   },
-  "$ref": "Human"
+  "root": "Human"
 }
\ No newline at end of file
diff --git a/www/resources/examples/generic.json b/www/resources/examples/generic.json
index cdc9344..74f7feb 100644
--- a/www/resources/examples/generic.json
+++ b/www/resources/examples/generic.json
@@ -9,9 +9,13 @@
       }
     },
     "StudentMap": {
-      "$ref": "Map",
-      "$template": {
-        "T": "Student"
+      "type": "struct",
+      "parent": {
+        "type": "reference",
+        "target": "Map",
+        "template": {
+          "T": "Student"
+        }
       }
     },
     "Map": {
@@ -22,12 +26,13 @@
         },
         "entries": {
           "type": "array",
-          "items": {
-            "$generic": "T"
+          "schema": {
+            "type": "generic",
+            "name": "T"
           }
         }
       }
     }
   },
-  "$ref": "StudentMap"
+  "root": "StudentMap"
 }
\ No newline at end of file
diff --git a/www/resources/examples/import.json b/www/resources/examples/import.json
index 713020e..a19257e 100644
--- a/www/resources/examples/import.json
+++ b/www/resources/examples/import.json
@@ -1,5 +1,5 @@
 {
-  "$import": {
+  "import": {
     "my_ns": "file:///generic.json"
   },
   "definitions": {
@@ -11,12 +11,13 @@
         },
         "students": {
           "type": "array",
-          "items": {
-            "$ref": "my_ns:StudentMap"
+          "schema": {
+            "type": "reference",
+            "target": "my_ns:StudentMap"
           }
         }
       }
     }
   },
-  "$ref": "Faculty"
+  "root": "Faculty"
 }
\ No newline at end of file
diff --git a/www/resources/examples/inheritance.json b/www/resources/examples/inheritance.json
index e54257d..1cd64cf 100644
--- a/www/resources/examples/inheritance.json
+++ b/www/resources/examples/inheritance.json
@@ -1,7 +1,7 @@
 {
   "definitions": {
     "Human": {
-      "type": "object",
+      "type": "struct",
       "properties": {
         "firstName": {
           "type": "string"
@@ -15,8 +15,11 @@
       }
     },
     "Student": {
-      "$extends": "Human",
-      "type": "object",
+      "parent": {
+        "type": "reference",
+        "target": "Human"
+      },
+      "type": "struct",
       "properties": {
         "studentId": {
           "type": "string"
@@ -24,5 +27,5 @@
       }
     }
   },
-  "$ref": "Student"
+  "root": "Student"
 }
\ No newline at end of file
diff --git a/www/resources/examples/map.json b/www/resources/examples/map.json
index 50a45ed..d5b7d64 100644
--- a/www/resources/examples/map.json
+++ b/www/resources/examples/map.json
@@ -1,7 +1,7 @@
 {
   "definitions": {
     "Student": {
-      "type": "object",
+      "type": "struct",
       "properties": {
         "firstName": {
           "type": "string"
@@ -13,16 +13,17 @@
           "type": "integer"
         },
         "properties": {
-          "$ref": "Student_Properties"
+          "type": "reference",
+          "target": "Student_Properties"
         }
       }
     },
     "Student_Properties": {
-      "type": "object",
-      "additionalProperties": {
+      "type": "struct",
+      "schema": {
         "type": "string"
       }
     }
   },
-  "$ref": "Student"
+  "root": "Student"
 }
\ No newline at end of file
diff --git a/www/resources/examples/map_inline.json b/www/resources/examples/map_inline.json
index 4cbfe8f..12fb674 100644
--- a/www/resources/examples/map_inline.json
+++ b/www/resources/examples/map_inline.json
@@ -1,7 +1,7 @@
 {
   "definitions": {
     "Student": {
-      "type": "object",
+      "type": "struct",
       "properties": {
         "firstName": {
           "type": "string"
@@ -13,13 +13,13 @@
           "type": "integer"
         },
         "properties": {
-          "type": "object",
-          "additionalProperties": {
+          "type": "map",
+          "schema": {
             "type": "string"
           }
         }
       }
     }
   },
-  "$ref": "Student"
+  "root": "Student"
 }
\ No newline at end of file
diff --git a/www/resources/examples/reference.json b/www/resources/examples/reference.json
index 00ee412..98120d9 100644
--- a/www/resources/examples/reference.json
+++ b/www/resources/examples/reference.json
@@ -1,7 +1,8 @@
 {
   "definitions": {
     "Student": {
-      "type": "object",
+      "description": "A student struct with an assigned faculty",
+      "type": "struct",
       "properties": {
         "firstName": {
           "type": "string"
@@ -13,12 +14,13 @@
           "type": "integer"
         },
         "faculty": {
-          "$ref": "Faculty"
+          "type": "reference",
+          "target": "Faculty"
         }
       }
     },
     "Faculty": {
-      "type": "object",
+      "type": "struct",
       "properties": {
         "name": {
           "type": "string"
@@ -26,5 +28,5 @@
       }
     }
   },
-  "$ref": "Student"
+  "root": "Student"
 }
\ No newline at end of file
diff --git a/www/resources/examples/simple.json b/www/resources/examples/simple.json
index a472d85..82d0c69 100644
--- a/www/resources/examples/simple.json
+++ b/www/resources/examples/simple.json
@@ -1,7 +1,8 @@
 {
   "definitions": {
     "Student": {
-      "type": "object",
+      "description": "A simple student struct",
+      "type": "struct",
       "properties": {
         "firstName": {
           "type": "string"
@@ -15,5 +16,5 @@
       }
     }
   },
-  "$ref": "Student"
+  "root": "Student"
 }
\ No newline at end of file
diff --git a/www/resources/template/generator/changelog.php b/www/resources/template/changelog.php
similarity index 94%
rename from www/resources/template/generator/changelog.php
rename to www/resources/template/changelog.php
index 8e5f68e..68a8ceb 100644
--- a/www/resources/template/generator/changelog.php
+++ b/www/resources/template/changelog.php
@@ -1,5 +1,5 @@
 
-<?php include __DIR__ . '/../inc/header.php'; ?>
+<?php include __DIR__ . '/inc/header.php'; ?>
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -49,4 +49,4 @@
   </div>
 </div>
 
-<?php include __DIR__ . '/../inc/footer.php'; ?>
+<?php include __DIR__ . '/inc/footer.php'; ?>
diff --git a/www/resources/template/example.php b/www/resources/template/example.php
new file mode 100644
index 0000000..b2618e6
--- /dev/null
+++ b/www/resources/template/example.php
@@ -0,0 +1,49 @@
+
+<?php include __DIR__ . '/inc/header.php'; ?>
+
+<nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item active" aria-current="page"><a href="<?php echo $url; ?>">TypeSchema</a> / <?php echo $type; ?></li>
+  </ol>
+</nav>
+
+<div class="container">
+  <h1 class="display-4"><?php echo $type; ?> examples</h1>
+  <?php foreach($examples as $key => $example): ?>
+  <div class="row">
+    <div class="col-md-6">
+      <div class="psx-object">
+        <h1><?php echo $example->title; ?></h1>
+        <div class="psx-object-description"><?php echo $example->description; ?></div>
+        <div class="example-box"><pre><code class="json"><?php echo $example->schema; ?></code></pre></div>
+      </div>
+    </div>
+    <div class="col-md-6">
+      <?php foreach ($example->types as $type => $code): ?>
+          <?php if ($code instanceof stdClass): ?>
+            <?php foreach ($code as $fileName => $chunk): ?>
+            <div class="psx-object">
+              <h1><?php echo $fileName; ?></h1>
+              <div class="example-box"><pre><code class="<?php echo $type; ?>"><?php echo htmlspecialchars($chunk); ?></code></pre></div>
+            </div>
+            <?php endforeach; ?>
+          <?php else: ?>
+          <div class="psx-object">
+            <h1>Output</h1>
+            <div class="example-box"><pre><code class="<?php echo $type; ?>"><?php echo htmlspecialchars($code); ?></code></pre></div>
+          </div>
+          <?php endif; ?>
+      <?php endforeach; ?>
+    </div>
+  </div>
+  <hr>
+  <?php endforeach; ?>
+
+  <div class="typeschema-edit">
+    <a href="https://github.com/apioo/typeschema/blob/master/www/resources/template/<?php echo pathinfo(__FILE__, PATHINFO_BASENAME); ?>"><i class="bi bi-pencil"></i> Edit this page</a>
+  </div>
+</div>
+
+<script>window.addEventListener('load', function() { hljs.highlightAll() });</script>
+
+<?php include __DIR__ . '/inc/footer.php'; ?>
diff --git a/www/resources/template/generator.php b/www/resources/template/generator.php
new file mode 100644
index 0000000..da0a972
--- /dev/null
+++ b/www/resources/template/generator.php
@@ -0,0 +1,33 @@
+
+<?php include __DIR__ . '/inc/header.php'; ?>
+
+<nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item active" aria-current="page"><a href="<?php echo $url; ?>">TypeSchema</a> / <a href="<?php echo $router->getAbsolutePath([\App\Controller\Generator::class, 'show']); ?>">Generator</a> / <?php echo $typeName; ?></li>
+  </ol>
+</nav>
+
+<div class="container-fluid">
+  <h1 class="display-4"><?php echo $typeName; ?> DTO Generator</h1>
+  <div class="row">
+    <div class="col-6">
+      <form method="post" action="<?php echo $router->getAbsolutePath([\App\Controller\Generator::class, 'generate'], ['type' => $type]); ?>">
+        <div class="form-group">
+          <input id="namespace" name="namespace" placeholder="Optional a namespace" value="<?php echo htmlspecialchars($namespace ?? ''); ?>" class="form-control">
+        </div>
+        <div class="form-group">
+          <textarea id="schema" name="schema" rows="24" class="form-control"><?php echo htmlspecialchars($schema); ?></textarea>
+        </div>
+        <input type="submit" value="Generate" class="btn btn-primary">
+        <input type="submit" value="Download" class="btn btn-secondary">
+      </form>
+    </div>
+    <div class="col-6">
+      <div><pre><code class="<?php echo $type ?? ''; ?>"><?php echo isset($output) ? htmlspecialchars($output) : ''; ?></code></pre></div>
+    </div>
+  </div>
+</div>
+
+<script>window.addEventListener('load', function() { hljs.highlightAll() });</script>
+
+<?php include __DIR__ . '/inc/footer.php'; ?>
diff --git a/www/resources/template/generator/schema.php b/www/resources/template/generator/schema.php
deleted file mode 100644
index 340755a..0000000
--- a/www/resources/template/generator/schema.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
-<?php include __DIR__ . '/../inc/header.php'; ?>
-
-<nav aria-label="breadcrumb">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item active" aria-current="page"><a href="<?php echo $url; ?>">TypeSchema</a> / Generator / Schema</li>
-  </ol>
-</nav>
-
-<div class="container">
-  <h1 class="display-4">Schema</h1>
-  <div class="alert alert-info" role="alert">
-    Through this form you can transform an existing TypeSchema into a specific output.
-  </div>
-  <div class="row">
-    <div class="col-6">
-      <form method="post">
-        <div class="form-group">
-          <label for="type">Type</label>
-          <select id="type" name="type" class="form-control">
-            <?php foreach($types as $type): ?>
-            <option value="<?php echo $type; ?>"><?php echo ucfirst($type); ?></option>
-            <?php endforeach; ?>
-          </select>
-        </div>
-        <div class="form-group">
-          <label for="schema">Schema</label>
-          <textarea id="schema" name="schema" rows="18" class="form-control"><?php echo htmlspecialchars($schema); ?></textarea>
-        </div>
-        <input type="submit" value="Generate" class="btn btn-primary">
-      </form>
-    </div>
-    <div class="col-6">
-      <div><pre><code class="<?php echo $type ?? ''; ?>"><?php echo isset($output) ? htmlspecialchars($output) : ''; ?></code></pre></div>
-    </div>
-  </div>
-</div>
-
-<script>window.addEventListener('load', function() { hljs.highlightAll() });</script>
-
-<?php include __DIR__ . '/../inc/footer.php'; ?>
diff --git a/www/resources/template/generator_overview.php b/www/resources/template/generator_overview.php
new file mode 100644
index 0000000..31d1851
--- /dev/null
+++ b/www/resources/template/generator_overview.php
@@ -0,0 +1,27 @@
+
+<?php include __DIR__ . '/inc/header.php'; ?>
+
+<nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item active" aria-current="page"><a href="<?php echo $url; ?>">TypeSchema</a> / Generator</li>
+  </ol>
+</nav>
+
+<div class="container">
+  <h1 class="display-4">DTO Generator</h1>
+  <p>fsdfsdf</p>
+
+  <div class="row">
+    <?php foreach ($types as $chunk): ?>
+      <div class="col-6">
+        <div class="list-group">
+          <?php foreach ($chunk as $type => $typeTitle): ?>
+            <a href="<?php echo $router->getAbsolutePath([\App\Controller\Generator::class, 'showType'], ['type' => $type]); ?>" class="list-group-item list-group-item-action"><?php echo $typeTitle; ?></a>
+          <?php endforeach; ?>
+        </div>
+      </div>
+    <?php endforeach; ?>
+  </div>
+</div>
+
+<?php include __DIR__ . '/inc/footer.php'; ?>
diff --git a/www/resources/template/generator/hash.php b/www/resources/template/hash.php
similarity index 92%
rename from www/resources/template/generator/hash.php
rename to www/resources/template/hash.php
index 41df02f..06a10be 100644
--- a/www/resources/template/generator/hash.php
+++ b/www/resources/template/hash.php
@@ -1,5 +1,5 @@
 
-<?php include __DIR__ . '/../inc/header.php'; ?>
+<?php include __DIR__ . '/inc/header.php'; ?>
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -31,4 +31,4 @@
 
 <script>window.addEventListener('load', function() { hljs.highlightAll() });</script>
 
-<?php include __DIR__ . '/../inc/footer.php'; ?>
+<?php include __DIR__ . '/inc/footer.php'; ?>
diff --git a/www/resources/template/inc/header.php b/www/resources/template/inc/header.php
index 7d899b5..109c6ec 100644
--- a/www/resources/template/inc/header.php
+++ b/www/resources/template/inc/header.php
@@ -9,7 +9,7 @@
   <link rel="preload" href="<?php echo $base; ?>/css/app.min.css" as="style" />
   <link rel="preload" href="<?php echo $base; ?>/js/app.min.js" as="script" />
   <link rel="stylesheet" href="<?php echo $base; ?>/css/app.min.css">
-  <link rel="canonical" href="<?php echo $router->getUrl($method); ?>">
+  <link rel="canonical" href="<?php echo $router->getUrl($method, isset($parameters) ? (array) $parameters : []); ?>">
   <script async src="<?php echo $base; ?>/js/app.min.js"></script>
   <script async src="https://www.googletagmanager.com/gtag/js?id=G-BB1NL30RKL"></script>
   <script>
@@ -31,7 +31,7 @@ function gtag(){dataLayer.push(arguments);}
       <a class="nav-link" href="<?php echo $router->getAbsolutePath([\App\Controller\Specification::class, 'show']); ?>">Specification</a>
     </li>
     <li class="nav-item">
-      <a class="nav-link" href="<?php echo $router->getAbsolutePath([\App\Controller\Generator\Schema::class, 'show']); ?>">Generator</a>
+      <a class="nav-link" href="<?php echo $router->getAbsolutePath([\App\Controller\Generator::class, 'show']); ?>">Generator</a>
     </li>
     <li class="nav-item">
       <a class="nav-link" href="<?php echo $router->getAbsolutePath([\App\Controller\Developer::class, 'show']); ?>">Developer</a>
@@ -48,8 +48,8 @@ function gtag(){dataLayer.push(arguments);}
         <a class="dropdown-item" href="<?php echo $router->getAbsolutePath([\App\Controller\Migration\JsonSchema::class, 'show']); ?>">JSON Schema</a>
         <a class="dropdown-item" href="<?php echo $router->getAbsolutePath([\App\Controller\Migration\OpenAPI::class, 'show']); ?>">OpenAPI</a>
         <a class="dropdown-item" href="<?php echo $router->getAbsolutePath([\App\Controller\Migration\Json::class, 'show']); ?>">JSON</a>
-        <a class="dropdown-item" href="<?php echo $router->getAbsolutePath([\App\Controller\Generator\Changelog::class, 'show']); ?>">Changelog</a>
-        <a class="dropdown-item" href="<?php echo $router->getAbsolutePath([\App\Controller\Generator\Hash::class, 'show']); ?>">Hash</a>
+        <a class="dropdown-item" href="<?php echo $router->getAbsolutePath([\App\Controller\Changelog::class, 'show']); ?>">Changelog</a>
+        <a class="dropdown-item" href="<?php echo $router->getAbsolutePath([\App\Controller\Hash::class, 'show']); ?>">Hash</a>
       </div>
     </li>
   </ul>
diff --git a/www/resources/template/index.php b/www/resources/template/index.php
index 9c1ef4a..6f31c7f 100644
--- a/www/resources/template/index.php
+++ b/www/resources/template/index.php
@@ -4,9 +4,7 @@
 <div class="jumbotron">
   <div class="container" style="text-align: center">
     <h1 class="display-4">TypeSchema</h1>
-    <p class="lead">TypeSchema is a JSON format to describe data models in a language neutral format. A TypeSchema can
-    be easily transformed into specific code for almost any programming language. This helps to reuse core data models
-    in different environments.</p>
+    <p class="lead">TypeSchema is a JSON specification to describe data models in a programming language neutral format.</p>
     <p>
       <a class="btn btn-primary" href="<?php echo $router->getAbsolutePath([\App\Controller\Specification::class, 'show']); ?>" role="button">Specification</a>
       <a class="btn btn-secondary" href="https://sandbox.typeschema.org/" role="button">Editor</a>
@@ -16,35 +14,36 @@
 </div>
 
 <div class="container">
-  <?php foreach($examples as $key => $example): ?>
   <div class="row">
-    <div class="col-md-6">
-      <div class="psx-object">
-        <h1><?php echo $example->title; ?></h1>
-        <div class="psx-object-description"><?php echo $example->description; ?></div>
-        <div class="example-box"><pre><code class="json"><?php echo $example->schema; ?></code></pre></div>
-      </div>
+    <div class="col-12">
+      <h2>Features</h2>
+      <p class="lead"></p>
+      <ul class="lead">
+        <li>An elegant specification optimized for code-generation</li>
+        <li>A portable format to share data models across different programming languages</li>
+        <li>Generate clean and simple to use <abbr title="Data-Transfer-Objects">DTOs</abbr></li>
+        <li>Handle advanced concepts like inheritance, polymorphism and generics</li>
+        <li>Use reflection to easily turn any class into a TypeSchema specification</li>
+        <li>Easily implement your own code generator</li>
+      </ul>
     </div>
-    <div class="col-md-6">
-      <nav>
-        <div class="nav nav-tabs" id="nav-tab" role="tablist">
-          <?php foreach ($example->types as $type => $code): ?>
-          <a class="nav-item nav-link <?php echo key(get_object_vars($example->types)) === $type ? 'active' : ''; ?>" id="<?php echo $type . '-' . $key; ?>-tab" data-toggle="tab" href="#<?php echo $type . '-' . $key; ?>" role="tab"><?php echo ucfirst($type); ?></a>
-          <?php endforeach; ?>
-        </div>
-      </nav>
-      <div class="tab-content" id="nav-tabContent">
-        <?php foreach ($example->types as $type => $code): ?>
-        <div class="tab-pane fade <?php echo key(get_object_vars($example->types)) === $type ? 'show active' : ''; ?>" id="<?php echo $type . '-' . $key; ?>" role="tabpanel">
-            <div class="example-box"><pre><code class="<?php echo $type; ?>"><?php echo htmlspecialchars($code); ?></code></pre></div>
-        </div>
+  </div>
+  <div class="row">
+    <div class="col-12">
+      <hr>
+      <h2>Programming Languages</h2>
+      <p class="lead">At the following list you can take a look at example output for each supported programming language.</p>
+    </div>
+    <?php foreach ($types as $chunk): ?>
+    <div class="col-6">
+      <div class="list-group">
+        <?php foreach ($chunk as $type => $typeTitle): ?>
+          <a href="<?php echo $router->getAbsolutePath([\App\Controller\Example::class, 'show'], ['type' => $type]); ?>" class="list-group-item list-group-item-action"><?php echo $typeTitle; ?></a>
         <?php endforeach; ?>
       </div>
     </div>
+    <?php endforeach; ?>
   </div>
-  <hr>
-  <?php endforeach; ?>
-
   <div class="typeschema-edit">
     <a href="https://github.com/apioo/typeschema/blob/master/www/resources/template/<?php echo pathinfo(__FILE__, PATHINFO_BASENAME); ?>"><i class="bi bi-pencil"></i> Edit this page</a>
   </div>
diff --git a/www/resources/template/specification.php b/www/resources/template/specification.php
index be688c8..2693f19 100644
--- a/www/resources/template/specification.php
+++ b/www/resources/template/specification.php
@@ -16,26 +16,28 @@
   <h2>Table of Contents</h2>
   <ul>
     <li><a href="#Introduction">Introduction</a></li>
-    <li><a href="#Root">Root</a>
+    <li><a href="#Design">Design</a></li>
+    <li><a href="#Definition-Types">Definition-Types</a>
       <ul>
-        <li><a href="#Import">Import</a></li>
+        <li><a href="#Definition-Type-Struct">Struct</a></li>
+        <li><a href="#Definition-Type-Map">Map</a></li>
+        <li><a href="#Definition-Type-Array">Array</a></li>
       </ul>
     </li>
-    <li><a href="#Types">Types</a>
+    <li><a href="#Property-Types">Property-Types</a>
       <ul>
-        <li><a href="#Struct">Struct</a></li>
-        <li><a href="#Map">Map</a></li>
-        <li><a href="#Array">Array</a></li>
-        <li><a href="#Boolean">Boolean</a></li>
-        <li><a href="#Number">Number</a></li>
-        <li><a href="#String">String</a></li>
-        <li><a href="#Intersection">Intersection</a></li>
-        <li><a href="#Union">Union</a></li>
-        <li><a href="#Reference">Reference</a></li>
-        <li><a href="#Generic">Generic</a></li>
+        <li><a href="#Property-Type-String">String</a></li>
+        <li><a href="#Property-Type-Integer">Integer</a></li>
+        <li><a href="#Property-Type-Number">Number</a></li>
+        <li><a href="#Property-Type-Boolean">Boolean</a></li>
+        <li><a href="#Property-Type-Map">Map</a></li>
+        <li><a href="#Property-Type-Array">Array</a></li>
+        <li><a href="#Property-Type-Generic">Generic</a></li>
+        <li><a href="#Property-Type-Reference">Reference</a></li>
       </ul>
     </li>
-    <li><a href="#Structure">Structure</a></li>
+    <li><a href="#Import">Import</a></li>
+    <li><a href="#Root">Root</a></li>
   </ul>
 
   <hr>
@@ -44,225 +46,365 @@
   <h2>Introduction</h2>
 
   <p>This document describes the <a href="https://app.typehub.cloud/d/typehub/typeschema">TypeSchema specification</a>.
-  TypeSchema is a JSON format to model data structures. It abstracts OOP concepts into a simple and deterministic JSON
-  format which can be turned into code for many different target languages. The main use case of TypeSchema is to
-  describe a data model, it is not designed to validate JSON structures. A data model described in TypeSchema can be
-  used as single source of truth which can be reused in many different environments.</p>
+  TypeSchema is a JSON format to model data structures. It abstracts common OOP concepts like inheritance, polymorphism and generics
+  into a simple and deterministic JSON format which can be transformed into code for many different target languages.
+  The main use case of TypeSchema is to describe a data model, it is not designed to validate JSON structures. A data model
+  described in TypeSchema can be used as single source of truth which can be reused in many different environments.</p>
 
   <hr>
 
-  <a id="Root"></a>
-  <h2>Root</h2>
+  <a id="Design"></a>
+  <h2>Design</h2>
+
+  <p>From a high level perspective TypeSchema distinguishes between two types, a <a href="#Definition-Types">Definition-Type</a>
+  and a <a href="#Property-Types">Property-Type</a>. A Definition-Type is an entry under the <code>definitions</code> keyword
+  and a Property-Type can only be used inside such a Definition-Type. Every Definition-Type results at the code generator
+  in a dedicated class. The following example illustrates how the <a href="#Definition-Types">Definition-Types</a>
+  and <a href="#Property-Types">Property-Types</a> are nested.</p>
 
-  <p>Every TypeSchema has a <a href="https://app.typehub.cloud/d/typehub/typeschema#type-TypeSchema">Root</a> definition. The Root must contain at least the
-  <code>definitions</code> keyword i.e.:</p>
   <pre class="json hljs">{
     "definitions": {
-        "TypeA": { ... },
-        "TypeB": { ... }
-    }
+        "TypeA": {
+            "type": "struct",
+            "properties": {
+                "PropertyA": { <a href="#Property-Types">Property-Type</a> }
+            }
+        },
+        "TypeB": {
+            "type": "map",
+            "schema": { <a href="#Property-Types">Property-Type</a> }
+        },
+        "TypeC": { <a href="#Definition-Types">Definition-Type</a> }
+    },
+    "root": "TypeA"
 }</pre>
 
-  <p>The <code>definitions</code> keyword contains simply a map containing <a href="https://app.typehub.cloud/d/typehub/typeschema#type-StructType">Struct</a>,
-  <a href="https://app.typehub.cloud/d/typehub/typeschema#type-MapType">Map</a> and <a href="https://app.typehub.cloud/d/typehub/typeschema#type-ReferenceType">Reference</a> types.</p>
-
-  <p>Optional it is possible to include a <code>$ref</code> keyword which points to the default type.</p>
-
-  <hr>
-
-  <a id="Import"></a>
-  <h3>Import</h3>
-
-  <p>Optional it is possible to import other documents through the <code>$import</code> keyword. It contains a map
-  where the key is the namespace and the value points to a remote document. The value is a URN and the supported
-  schemes i.e. <code>file</code>, <code>http</code>, <code>https</code> etc. are out of bound of this specification.</p>
-
-  <pre><code class="json">{
-    "$import": {
-        "MyNamespace": "file:///my_schema.json"
-    }
-}</code></pre>
-
-  <p>Inside a reference it is then possible to reuse all types under the namespace which are defined at the remote
-  document i.e.:</p>
-
-  <pre><code class="json">{
-    "$ref": "MyNamespace:MyType"
-}</code></pre>
-
-  <hr>
-
-  <a id="Types"></a>
-  <h2>Types</h2>
-
-  <p>At TypeSchema every type can be determined based on the used keywords. The following list describes every type
-  and how to use them.</p>
-
-  <hr>
-
-  <a id="Struct"></a>
-  <h3>Struct</h3>
-
-  <p>Represents a struct type. A struct type contains a fix set of defined properties. A struct type must have a
-  <code>type</code> and <code>properties</code> keyword. The type must be <code>object</code>.</p>
+  <a id="Definition-Types"></a>
+  <h2>Definition Types</h2>
+  <p></p>
 
-  <pre><code class="json">{
-    "type": "object",
+  <a id="Definition-Type-Struct"></a>
+  <h3>struct</h3>
+  <p>A struct represents a class/structure with a fix set of defined properties.</p>
+  <pre class="json hljs">{
+    "type": "struct",
+    "parent": { <a href="#Property-Type-Reference">Reference-Type</a> },
+    "base": true,
     "properties": {
-        "PropertyA": { ... },
-        "PropertyB": { ... }
+        "PropertyA": { <a href="#Property-Types">Property-Type</a> }
+    },
+    "discriminator": "type",
+    "mapping": {
+        "CatType": "cat",
+        "DogType": "dog",
     }
-}</code></pre>
-
-  <p>All allowed properties are described at <a href="https://app.typehub.cloud/d/typehub/typeschema#type-StructType">TypeHub</a>.</p>
+}</pre>
+  <table class="table table-striped">
+    <colgroup>
+      <col class="w-25">
+      <col class="w-75">
+    </colgroup>
+    <thead>
+    <tr>
+      <th>Property</th>
+      <th>Description</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>parent</td>
+      <td>Defines a parent type for this structure. Some programming languages like Go do not support the concept of an <code>extends</code>, in this case the code
+      generator simply copies all properties into this structure.</td>
+    </tr>
+    <tr>
+      <td>base</td>
+      <td>Indicates whether this is a base structure, default is <code>false</code>. If <code>true</code> the structure is used a base type, this means it is not possible
+      to create an instance from this structure.</td>
+    </tr>
+    <tr>
+      <td>properties</td>
+      <td>Contains a map where they key is the property name and the value must be a <a href="#Property-Types">Property-Type</a>.</td>
+    </tr>
+    <tr>
+      <td>discriminator</td>
+      <td>Optional the property name of a discriminator property. This should be only used in case this is also a base structure.</td>
+    </tr>
+    <tr>
+      <td>mapping</td>
+      <td>In case a discriminator is configured it is required to configure a mapping. The mapping is a map where the key is the type name and the value the actual discriminator type value.</td>
+    </tr>
+    </tbody>
+  </table>
 
   <hr>
 
-  <a id="Map"></a>
-  <h3>Map</h3>
-
-  <p>Represents a map type. A map type contains variable key value entries of a specific type. A map type must have a
-  <code>type</code> and <code>additionalProperties</code> keyword. The type must be <code>object</code>.</p>
-
-  <pre><code class="json">{
-    "type": "object",
-    "additionalProperties": { ... }
-}</code></pre>
-
-  <p>All allowed properties are described at <a href="https://app.typehub.cloud/d/typehub/typeschema#type-MapType">TypeHub</a>.</p>
+  <a id="Definition-Type-Map"></a>
+  <h3>map</h3>
+  <p>A map represents a map/dictionary with variable key/value entries of the same type.</p>
+  <pre class="json hljs">{
+    "type": "map",
+    "schema": { <a href="#Property-Types">Property-Type</a> }
+}</pre>
+  <table class="table table-striped">
+    <colgroup>
+      <col class="w-25">
+      <col class="w-75">
+    </colgroup>
+    <thead>
+    <tr>
+      <th>Property</th>
+      <th>Description</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>schema</td>
+      <td>The <a href="#Property-Types">Property-Type</a> which defines the value of the map.</td>
+    </tr>
+    </tbody>
+  </table>
 
   <hr>
 
-  <a id="Array"></a>
-  <h3>Array</h3>
-
-  <p>Represents an array type. An array type contains an ordered list of a specific type. An array type must have a
-  <code>type</code> and <code>items</code> keyword. The type must be <code>array</code>.</p>
-
-  <pre><code class="json">{
+  <a id="Definition-Type-Array"></a>
+  <h3>array</h3>
+  <p>An array represents an array/list with variable entries of the same type.</p>
+  <pre class="json hljs">{
     "type": "array",
-    "items": { ... }
-}</code></pre>
-
-  <p>All allowed properties are described at <a href="https://app.typehub.cloud/d/typehub/typeschema#type-ArrayType">TypeHub</a>.</p>
+    "schema": { <a href="#Property-Types">Property-Type</a> }
+}</pre>
+  <table class="table table-striped">
+    <colgroup>
+      <col class="w-25">
+      <col class="w-75">
+    </colgroup>
+    <thead>
+    <tr>
+      <th>Property</th>
+      <th>Description</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>schema</td>
+      <td>The <a href="#Property-Types">Property-Type</a> which defines the entry of the array.</td>
+    </tr>
+    </tbody>
+  </table>
 
   <hr>
 
-  <a id="Boolean"></a>
-  <h3>Boolean</h3>
-
-  <p>Represents a boolean type. A boolean type must have a <code>type</code> keyword and the type must be
-  <code>boolean</code>.</p>
+  <a id="Property-Types"></a>
+  <h2>Property Types</h2>
+  <p></p>
 
-  <pre><code class="json">{
-    "type": "boolean"
-}</code></pre>
-
-  <p>All allowed properties are described at <a href="https://app.typehub.cloud/d/typehub/typeschema#type-BooleanType">TypeHub</a>.</p>
+  <a id="Property-Type-String"></a>
+  <h3>string</h3>
+  <p>A string represents .</p>
+  <pre class="json hljs">{
+    "type": "string",
+    "format": "date-time"
+}</pre>
+  <table class="table table-striped">
+    <colgroup>
+      <col class="w-25">
+      <col class="w-75">
+    </colgroup>
+    <thead>
+    <tr>
+      <th>Property</th>
+      <th>Description</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>format</td>
+      <td>Optional describes the format of the string. Supported are the following types: <code>date</code>, <code>date-time</code> and <code>time</code>.
+      A code generator may use a fitting date type to represent such a format.</td>
+    </tr>
+    </tbody>
+  </table>
 
   <hr>
 
-  <a id="Number"></a>
-  <h3>Number</h3>
+  <a id="Property-Type-Integer"></a>
+  <h3>integer</h3>
+  <pre class="json hljs">{
+    "type": "integer"
+}</pre>
 
-  <p>Represents a number type (contains also integer). A number type must have a <code>type</code> keyword and the type
-  must be <code>number</code> or <code>integer</code>.</p>
+  <hr>
 
-  <pre><code class="json">{
+  <a id="Property-Type-Number"></a>
+  <h3>number</h3>
+  <pre class="json hljs">{
     "type": "number"
-}</code></pre>
-
-  <p>All allowed properties are described at <a href="https://app.typehub.cloud/d/typehub/typeschema#type-NumberType">TypeHub</a>.</p>
+}</pre>
 
   <hr>
 
-  <a id="String"></a>
-  <h3>String</h3>
-
-  <p>Represents a string type. A string type must have a <code>type</code> keyword and the type must
-  be <code>string</code>.</p>
-
-  <pre><code class="json">{
-    "type": "string"
-}</code></pre>
-
-  <p>All allowed properties are described at <a href="https://app.typehub.cloud/d/typehub/typeschema#type-StringType">TypeHub</a>.</p>
+  <a id="Property-Type-Boolean"></a>
+  <h3>boolean</h3>
+  <pre class="json hljs">{
+    "type": "boolean"
+}</pre>
 
   <hr>
 
-  <a id="Intersection"></a>
-  <h3>Intersection</h3>
-
-  <p>Represents an intersection type. An intersection type must have an <code>allOf</code> keyword.</p>
+  <a id="Property-Type-Map"></a>
+  <h3>map</h3>
+  <p>A map represents a map/dictionary with variable key/value entries of the same type.
+  The code generator uses the native map/dictionary type of the programming language.</p>
+  <pre class="json hljs">{
+    "type": "map",
+    "schema": { <a href="#Property-Types">Property-Type</a> }
+}</pre>
+  <table class="table table-striped">
+    <colgroup>
+      <col class="w-25">
+      <col class="w-75">
+    </colgroup>
+    <thead>
+    <tr>
+      <th>Property</th>
+      <th>Description</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>schema</td>
+      <td>The <a href="#Property-Types">Property-Type</a> which defines the value of the map.</td>
+    </tr>
+    </tbody>
+  </table>
 
-  <pre><code class="json">{
-    "allOf": [{ ... }, { ... }]
-}</code></pre>
+  <hr>
 
-  <p>All allowed properties are described at <a href="https://app.typehub.cloud/d/typehub/typeschema#type-IntersectionType">TypeHub</a>.</p>
+  <a id="Property-Type-Array"></a>
+  <h3>array</h3>
+  <p>An array represents an array/list with variable entries of the same type.
+  The code generator uses the native array/list type of the programming language.</p>
+  <pre class="json hljs">{
+    "type": "array",
+    "schema": { <a href="#Property-Types">Property-Type</a> }
+}</pre>
+  <table class="table table-striped">
+    <colgroup>
+      <col class="w-25">
+      <col class="w-75">
+    </colgroup>
+    <thead>
+    <tr>
+      <th>Property</th>
+      <th>Description</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>schema</td>
+      <td>The <a href="#Property-Types">Property-Type</a> which defines the entry of the array.</td>
+    </tr>
+    </tbody>
+  </table>
 
   <hr>
 
-  <a id="Union"></a>
-  <h3>Union</h3>
-
-  <p>Represents a union type. A union type must have an <code>oneOf</code> keyword.</p>
+  <a id="Property-Type-Generic"></a>
+  <h3>generic</h3>
+  <pre class="json hljs">{
+    "type": "generic",
+    "name": "T"
+}</pre>
+  <table class="table table-striped">
+    <colgroup>
+      <col class="w-25">
+      <col class="w-75">
+    </colgroup>
+    <thead>
+    <tr>
+      <th>Property</th>
+      <th>Description</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>name</td>
+      <td>The name of the generic, it is recommended to use common generic names like <code>T</code> or <code>TValue</code>. These generics
+      can then be replaced on usage with a concrete type through the <code>template</code> property at a <a href="#Definition-Type-Struct">struct</a>.</td>
+    </tr>
+    </tbody>
+  </table>
 
-  <pre><code class="json">{
-    "oneOf": [{ ... }, { ... }]
-}</code></pre>
+  <hr>
 
-  <p>All allowed properties are described at <a href="https://app.typehub.cloud/d/typehub/typeschema#type-UnionType">TypeHub</a>.</p>
+  <a id="Property-Type-Reference"></a>
+  <h3>reference</h3>
+  <pre class="json hljs">{
+    "type": "reference",
+    "target": "TypeB",
+    "template": {
+        "T": "TypeC"
+    }
+}</pre>
+  <table class="table table-striped">
+    <colgroup>
+      <col class="w-25">
+      <col class="w-75">
+    </colgroup>
+    <thead>
+    <tr>
+      <th>Property</th>
+      <th>Description</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>target</td>
+      <td>The target type, this must be a key which is available under the <code>definitions</code> keyword.</td>
+    </tr>
+    <tr>
+      <td>template</td>
+      <td>In case the target points to a type which contains generics it is possible to replace those generics
+      with a concrete type. A map where the key is the name of the generic and the value must point to
+      a key under the <code>definitions</code> keyword.</td>
+    </tr>
+    </tbody>
+  </table>
 
   <hr>
 
-  <a id="Reference"></a>
-  <h3>Reference</h3>
-
-  <p>Represents a reference type. A reference type points to a specific type at the definitions map. A reference type
-  must have a <code>$ref</code> keyword.</p>
+  <a id="Import"></a>
+  <h2>Import</h2>
+  <p>Optional it is possible to import other TypeSchema documents through the <code>import</code> keyword. It contains a map
+  where the key is the namespace and the value points to a remote document. The value is a URL and a code generator should
+  support the following schemes: <code>file</code>, <code>http</code>, <code>https</code>.</p>
 
   <pre><code class="json">{
-    "$ref": "MyType"
+    "import": {
+        "MyNamespace": "file:///my_schema.json"
+    }
 }</code></pre>
 
-  <p>All allowed properties are described at <a href="https://app.typehub.cloud/d/typehub/typeschema#type-ReferenceType">TypeHub</a>.</p>
-
-  <hr>
-
-  <a id="Generic"></a>
-  <h3>Generic</h3>
-
-  <p>Represents a generic type. A generic type represents a type which can be replaced if you reference a specific type.
-  A generic type must have a <code>$generic</code> keyword.</p>
+  <p>Inside a reference it is then possible to reuse all types under the namespace which are defined at the remote document i.e.:</p>
 
   <pre><code class="json">{
-    "$generic": "T"
+    "type": "reference",
+    "target": "MyNamespace:MyType"
 }</code></pre>
 
-  <p>All allowed properties are described at <a href="https://app.typehub.cloud/d/typehub/typeschema#type-GenericType">TypeHub</a>.</p>
-
-  <p>I.e. if we reference a specific type and this type contains a generic type then we can define which type should
-  be inserted at the generic type.</p>
+  <a id="Root"></a>
+  <h2>Root</h2>
+  <p>It is possible to define a root type. This can help a parser to identify the root type of your definitions.</p>
 
   <pre><code class="json">{
-    "$ref": "MyType",
-    "$template": {
-        "T": "AnotherType"
-    }
+    "definitions": {
+        "TypeA": { ... }
+    },
+    "root": "TypeA"
 }</code></pre>
 
   <hr>
 
-  <a id="Structure"></a>
-  <h3>Structure</h3>
-
-  <p>The following image shows how the types can be nested.</p>
-
-  <a href="<?php echo $base; ?>/img/typeschema_structure.png"><img src="<?php echo $base; ?>/img/typeschema_structure.png" class="img-fluid" alt="TypeSchema structure"></a>
-
-  <hr>
-
   <div class="typeschema-edit">
     <a href="https://github.com/apioo/typeschema/blob/master/www/resources/template/<?php echo pathinfo(__FILE__, PATHINFO_BASENAME); ?>"><i class="bi bi-pencil"></i> Edit this page</a>
   </div>
diff --git a/www/resources/typeschema.json b/www/resources/typeschema.json
index cb9bc8a..3ab0953 100644
--- a/www/resources/typeschema.json
+++ b/www/resources/typeschema.json
@@ -3,7 +3,7 @@
     "Generate": {
       "type": "object",
       "properties": {
-        "type": {
+        "namespace": {
           "type": "string"
         },
         "schema": {
diff --git a/www/src/Controller/Generator/Changelog.php b/www/src/Controller/Changelog.php
similarity index 91%
rename from www/src/Controller/Generator/Changelog.php
rename to www/src/Controller/Changelog.php
index 5cab1da..a3bcf79 100644
--- a/www/src/Controller/Generator/Changelog.php
+++ b/www/src/Controller/Changelog.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Generator;
+namespace App\Controller;
 
 use App\Model\Diff;
 use PSX\Api\Attribute\Get;
@@ -26,7 +26,7 @@ public function __construct(ReverseRouter $reverseRouter, SchemaManagerInterface
     }
 
     #[Get]
-    #[Path('/generator/changelog')]
+    #[Path('/changelog')]
     public function show(): mixed
     {
         $data = [
@@ -36,12 +36,12 @@ public function show(): mixed
             'messages' => []
         ];
 
-        $templateFile = __DIR__ . '/../../../resources/template/generator/changelog.php';
+        $templateFile = __DIR__ . '/../../resources/template/changelog.php';
         return new Template($data, $templateFile, $this->reverseRouter);
     }
 
     #[Post]
-    #[Path('/generator/changelog')]
+    #[Path('/changelog')]
     public function generate(Diff $diff): mixed
     {
         $left = $diff->getLeft() ?? throw new \RuntimeException('Provided no left');
@@ -65,7 +65,7 @@ public function generate(Diff $diff): mixed
             'messages' => $messages
         ];
 
-        $templateFile = __DIR__ . '/../../../resources/template/generator/changelog.php';
+        $templateFile = __DIR__ . '/../../resources/template/changelog.php';
         return new Template($data, $templateFile, $this->reverseRouter);
     }
 
diff --git a/www/src/Controller/Example.php b/www/src/Controller/Example.php
new file mode 100644
index 0000000..d4d2980
--- /dev/null
+++ b/www/src/Controller/Example.php
@@ -0,0 +1,189 @@
+<?php
+
+namespace App\Controller;
+
+use App\Service\TypeName;
+use Psr\Cache\CacheItemPoolInterface;
+use PSX\Api\Attribute\Get;
+use PSX\Api\Attribute\Path;
+use PSX\Framework\Controller\ControllerAbstract;
+use PSX\Framework\Http\Writer\Template;
+use PSX\Framework\Loader\ReverseRouter;
+use PSX\Http\Exception\BadRequestException;
+use PSX\Schema\Generator\Code\Chunks;
+use PSX\Schema\Generator\Config;
+use PSX\Schema\Generator\FileAwareInterface;
+use PSX\Schema\GeneratorFactory;
+use PSX\Schema\Parser\Context\FilesystemContext;
+use PSX\Schema\SchemaManagerInterface;
+
+class Example extends ControllerAbstract
+{
+    private CacheItemPoolInterface $cache;
+    private ReverseRouter $reverseRouter;
+    private SchemaManagerInterface $schemaManager;
+
+    public function __construct(CacheItemPoolInterface $cache, ReverseRouter $reverseRouter, SchemaManagerInterface $schemaManager)
+    {
+        $this->cache = $cache;
+        $this->reverseRouter = $reverseRouter;
+        $this->schemaManager = $schemaManager;
+    }
+
+    #[Get]
+    #[Path('/example/:type')]
+    public function show(string $type): mixed
+    {
+        if (!in_array($type, GeneratorFactory::getPossibleTypes())) {
+            throw new BadRequestException('Provided an invalid type');
+        }
+
+        $item = $this->cache->getItem('example-cache-' . $type);
+        if (true) {
+            $examples = $this->getExamples();
+            foreach ($examples as $key => $example) {
+                $examples[$key]['schema'] = file_get_contents($example['file']);
+                $config = $example['config'][$type] ?? [];
+                $examples[$key]['types'][$type] = $this->convert($type, $example['file'], $config['namespace'] ?? null, $config['mapping'] ?? null);
+            }
+
+            $item->expiresAfter(null);
+            $item->set($examples);
+            $this->cache->save($item);
+        } else {
+            $examples = $item->get();
+        }
+
+        $data = [
+            'method' => explode('::', __METHOD__),
+            'parameters' => ['type' => $type],
+            'type' => TypeName::getDisplayName($type),
+            'examples' => $examples,
+        ];
+
+        $templateFile = __DIR__ . '/../../resources/template/example.php';
+        return new Template($data, $templateFile, $this->reverseRouter);
+    }
+
+    private function convert(string $type, string $file, ?string $namespace, ?array $mapping): string|array
+    {
+        $config = new Config();
+        $config->put(Config::NAMESPACE, $namespace);
+        $config->put(Config::MAPPING, $mapping);
+
+        $context = new FilesystemContext(__DIR__ . '/../../resources/examples');
+        $schema = $this->schemaManager->getSchema($file, $context);
+
+        $factory = new GeneratorFactory();
+        $generator = $factory->getGenerator($type, $config);
+
+        $result = $generator->generate($schema);
+        if ($result instanceof Chunks && $generator instanceof FileAwareInterface) {
+            $chunks = [];
+            foreach ($result->getChunks() as $fileName => $code) {
+                $chunks[$generator->getFileName($fileName)] = $generator->getFileContent($code);
+            }
+            return $chunks;
+        } else {
+            return (string) $result;
+        }
+    }
+
+    private function getExamples(): array
+    {
+        $examples = [];
+        $examples[] = [
+            'title' => 'Simple model',
+            'description' => 'A simple model with some scalar properties.',
+            'file' => __DIR__ . '/../../resources/examples/simple.json',
+            'config' => [
+                'csharp' => ['namespace' => 'TypeSchema.DTO'],
+                'go' => ['namespace' => 'TypeSchema'],
+                'java' => ['namespace' => 'org.typeschema.dto'],
+                'php' => ['namespace' => 'TypeSchema\\DTO'],
+                'ruby' => ['namespace' => 'TypeSchema'],
+            ],
+        ];
+
+        $examples[] = [
+            'title' => 'Model with inheritance',
+            'description' => 'A student struct which extends from a different struct.',
+            'file' => __DIR__ . '/../../resources/examples/inheritance.json',
+            'config' => [
+                'csharp' => ['namespace' => 'TypeSchema.DTO'],
+                'go' => ['namespace' => 'TypeSchema'],
+                'java' => ['namespace' => 'org.typeschema.dto'],
+                'php' => ['namespace' => 'TypeSchema\\DTO'],
+                'ruby' => ['namespace' => 'TypeSchema'],
+            ],
+        ];
+
+        $examples[] = [
+            'title' => 'Model with reference',
+            'description' => 'A student struct which reference a faculty struct.',
+            'file' => __DIR__ . '/../../resources/examples/reference.json',
+            'config' => [
+                'csharp' => ['namespace' => 'TypeSchema.DTO'],
+                'go' => ['namespace' => 'TypeSchema'],
+                'java' => ['namespace' => 'org.typeschema.dto'],
+                'php' => ['namespace' => 'TypeSchema\\DTO'],
+                'ruby' => ['namespace' => 'TypeSchema'],
+            ],
+        ];
+
+        $examples[] = [
+            'title' => 'Map with string values',
+            'description' => 'A student struct which contains a map with arbitrary string values.',
+            'file' => __DIR__ . '/../../resources/examples/map_inline.json',
+            'config' => [
+                'csharp' => ['namespace' => 'TypeSchema.DTO'],
+                'go' => ['namespace' => 'TypeSchema'],
+                'java' => ['namespace' => 'org.typeschema.dto'],
+                'php' => ['namespace' => 'TypeSchema\\DTO'],
+                'ruby' => ['namespace' => 'TypeSchema'],
+            ],
+        ];
+
+        $examples[] = [
+            'title' => 'Model with discriminator',
+            'description' => 'A struct which uses a discriminator mapping.',
+            'file' => __DIR__ . '/../../resources/examples/discriminator.json',
+            'config' => [
+                'csharp' => ['namespace' => 'TypeSchema.DTO'],
+                'go' => ['namespace' => 'TypeSchema'],
+                'java' => ['namespace' => 'org.typeschema.dto'],
+                'php' => ['namespace' => 'TypeSchema\\DTO'],
+                'ruby' => ['namespace' => 'TypeSchema'],
+            ],
+        ];
+
+        $examples[] = [
+            'title' => 'Model with generics',
+            'description' => 'A struct which uses generics.',
+            'file' => __DIR__ . '/../../resources/examples/generic.json',
+            'config' => [
+                'csharp' => ['namespace' => 'TypeSchema.DTO'],
+                'go' => ['namespace' => 'TypeSchema'],
+                'java' => ['namespace' => 'org.typeschema.dto'],
+                'php' => ['namespace' => 'TypeSchema\\DTO'],
+                'ruby' => ['namespace' => 'TypeSchema'],
+            ],
+        ];
+
+        $examples[] = [
+            'title' => 'Import other TypeSchema specification',
+            'description' => 'A struct which references an external TypeSchema.',
+            'file' => __DIR__ . '/../../resources/examples/import.json',
+            'config' => [
+                'csharp' => ['namespace' => 'TypeSchema.DTO'],
+                'go' => ['namespace' => 'TypeSchema'],
+                'java' => ['namespace' => 'org.typeschema.dto'],
+                'php' => ['namespace' => 'TypeSchema\\DTO'],
+                'ruby' => ['namespace' => 'TypeSchema'],
+                'typescript' => ['mapping' => ['my_ns' => './']]
+            ],
+        ];
+
+        return $examples;
+    }
+}
diff --git a/www/src/Controller/Generator/Schema.php b/www/src/Controller/Generator.php
similarity index 50%
rename from www/src/Controller/Generator/Schema.php
rename to www/src/Controller/Generator.php
index c18a6b3..419406a 100644
--- a/www/src/Controller/Generator/Schema.php
+++ b/www/src/Controller/Generator.php
@@ -1,21 +1,22 @@
 <?php
 
-namespace App\Controller\Generator;
+namespace App\Controller;
 
 use App\Model\Generate;
+use App\Service\TypeName;
 use PSX\Api\Attribute\Get;
-use PSX\Api\Attribute\Incoming;
 use PSX\Api\Attribute\Path;
 use PSX\Api\Attribute\Post;
-use PSX\Api\Model\Passthru;
 use PSX\Framework\Controller\ControllerAbstract;
 use PSX\Framework\Http\Writer\Template;
 use PSX\Framework\Loader\ReverseRouter;
+use PSX\Http\Exception\BadRequestException;
+use PSX\Schema\Generator\Config;
 use PSX\Schema\GeneratorFactory;
 use PSX\Schema\Parser\TypeSchema;
 use PSX\Schema\SchemaManagerInterface;
 
-class Schema extends ControllerAbstract
+class Generator extends ControllerAbstract
 {
     private ReverseRouter $reverseRouter;
     private SchemaManagerInterface $schemaManager;
@@ -27,26 +28,59 @@ public function __construct(ReverseRouter $reverseRouter, SchemaManagerInterface
     }
 
     #[Get]
-    #[Path('/generator/schema')]
+    #[Path('/generator')]
     public function show(): mixed
     {
+        $types = [];
+        foreach (GeneratorFactory::getPossibleTypes() as $type) {
+            $types[$type] = TypeName::getDisplayName($type);
+        }
+
+        $data = [
+            'method' => explode('::', __METHOD__),
+            'schema' => $this->getSchema(),
+            'types' => array_chunk($types, 9, true),
+        ];
+
+        $templateFile = __DIR__ . '/../../resources/template/generator_overview.php';
+        return new Template($data, $templateFile, $this->reverseRouter);
+    }
+
+    #[Get]
+    #[Path('/generator/:type')]
+    public function showType(string $type): mixed
+    {
+        if (!in_array($type, GeneratorFactory::getPossibleTypes())) {
+            throw new BadRequestException('Provided an invalid type');
+        }
+
         $data = [
             'method' => explode('::', __METHOD__),
+            'parameters' => ['type' => $type],
             'schema' => $this->getSchema(),
-            'types' => GeneratorFactory::getPossibleTypes()
+            'type' => $type,
+            'typeName' => TypeName::getDisplayName($type),
         ];
 
-        $templateFile = __DIR__ . '/../../../resources/template/generator/schema.php';
+        $templateFile = __DIR__ . '/../../resources/template/generator.php';
         return new Template($data, $templateFile, $this->reverseRouter);
     }
 
     #[Post]
-    #[Path('/generator/schema')]
-    public function generate(Generate $generate): mixed
+    #[Path('/generator/:type')]
+    public function generate(string $type, Generate $generate): mixed
     {
-        $type   = $generate->getType() ?? throw new \RuntimeException('Provided no type');
+        $namespace = $generate->getNamespace();
         $schema = $generate->getSchema() ?? throw new \RuntimeException('Provided no schema');
-        $config = null;
+
+        $config = new Config();
+        if (!empty($namespace)) {
+            $config->put(Config::NAMESPACE, $namespace);
+        }
+
+        if (!in_array($type, GeneratorFactory::getPossibleTypes())) {
+            throw new BadRequestException('Provided an invalid type');
+        }
 
         try {
             $result = (new TypeSchema($this->schemaManager))->parse($schema);
@@ -59,13 +93,15 @@ public function generate(Generate $generate): mixed
 
         $data = [
             'method' => explode('::', __METHOD__),
-            'schema' => $this->getSchema(),
-            'types' => GeneratorFactory::getPossibleTypes(),
+            'parameters' => ['type' => $type],
+            'namespace' => $namespace,
+            'schema' => $schema ?? $this->getSchema(),
             'type' => $type,
+            'typeName' => TypeName::getDisplayName($type),
             'output' => $output,
         ];
 
-        $templateFile = __DIR__ . '/../../../resources/template/generator/schema.php';
+        $templateFile = __DIR__ . '/../../resources/template/generator.php';
         return new Template($data, $templateFile, $this->reverseRouter);
     }
 
@@ -75,7 +111,7 @@ private function getSchema(): string
 {
   "definitions": {
     "Student": {
-      "type": "object",
+      "type": "struct",
       "properties": {
         "firstName": {
           "type": "string"
@@ -89,7 +125,7 @@ private function getSchema(): string
       }
     }
   },
-  "$ref": "Student"
+  "root": "Student"
 }
 JSON;
     }
diff --git a/www/src/Controller/Generator/Client.php b/www/src/Controller/Generator/Client.php
deleted file mode 100644
index 96174bd..0000000
--- a/www/src/Controller/Generator/Client.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Controller\Generator;
-
-use PSX\Api\Attribute\Get;
-use PSX\Api\Attribute\Path;
-use PSX\Framework\Controller\ControllerAbstract;
-use PSX\Framework\Controller\ViewAbstract;
-use PSX\Http\Exception\MovedPermanentlyException;
-
-class Client extends ControllerAbstract
-{
-    #[Get]
-    #[Path('/generator/client')]
-    protected function redirect(): mixed
-    {
-        throw new MovedPermanentlyException('https://sdkgen.app/');
-    }
-}
diff --git a/www/src/Controller/Generator/Hash.php b/www/src/Controller/Hash.php
similarity index 85%
rename from www/src/Controller/Generator/Hash.php
rename to www/src/Controller/Hash.php
index a967f1b..7420eb1 100644
--- a/www/src/Controller/Generator/Hash.php
+++ b/www/src/Controller/Hash.php
@@ -1,13 +1,11 @@
 <?php
 
-namespace App\Controller\Generator;
+namespace App\Controller;
 
 use App\Model\Generate;
 use PSX\Api\Attribute\Get;
-use PSX\Api\Attribute\Incoming;
 use PSX\Api\Attribute\Path;
 use PSX\Api\Attribute\Post;
-use PSX\Api\Model\Passthru;
 use PSX\Framework\Controller\ControllerAbstract;
 use PSX\Framework\Http\Writer\Template;
 use PSX\Framework\Loader\ReverseRouter;
@@ -27,7 +25,7 @@ public function __construct(ReverseRouter $reverseRouter, SchemaManagerInterface
     }
 
     #[Get]
-    #[Path('/generator/hash')]
+    #[Path('/hash')]
     public function show(): mixed
     {
         $data = [
@@ -35,12 +33,12 @@ public function show(): mixed
             'schema' => $this->getSchema(),
         ];
 
-        $templateFile = __DIR__ . '/../../../resources/template/generator/hash.php';
+        $templateFile = __DIR__ . '/../../resources/template/hash.php';
         return new Template($data, $templateFile, $this->reverseRouter);
     }
 
     #[Post]
-    #[Path('/generator/hash')]
+    #[Path('/hash')]
     public function generate(Generate $generate): mixed
     {
         $schema = $generate->getSchema() ?? throw new \RuntimeException('Provided no schema');
@@ -58,7 +56,7 @@ public function generate(Generate $generate): mixed
             'output' => $output
         ];
 
-        $templateFile = __DIR__ . '/../../../resources/template/generator/hash.php';
+        $templateFile = __DIR__ . '/../../resources/template/hash.php';
         return new Template($data, $templateFile, $this->reverseRouter);
     }
 
diff --git a/www/src/Controller/Index.php b/www/src/Controller/Index.php
index 9019422..4ad2c7b 100644
--- a/www/src/Controller/Index.php
+++ b/www/src/Controller/Index.php
@@ -2,6 +2,7 @@
 
 namespace App\Controller;
 
+use App\Service\TypeName;
 use Psr\Cache\CacheItemPoolInterface;
 use PSX\Api\Attribute\Get;
 use PSX\Api\Attribute\Path;
@@ -9,115 +10,38 @@
 use PSX\Framework\Http\Writer\Template;
 use PSX\Framework\Loader\ReverseRouter;
 use PSX\Http\Client\Client;
+use PSX\Schema\Generator\Code\Chunks;
+use PSX\Schema\Generator\Config;
+use PSX\Schema\Generator\FileAwareInterface;
 use PSX\Schema\GeneratorFactory;
+use PSX\Schema\Parser\Context\FilesystemContext;
 use PSX\Schema\Parser\TypeSchema;
 use PSX\Schema\SchemaManagerInterface;
 
 class Index extends ControllerAbstract
 {
-    private CacheItemPoolInterface $cache;
     private ReverseRouter $reverseRouter;
-    private SchemaManagerInterface $schemaManager;
 
-    public function __construct(CacheItemPoolInterface $cache, ReverseRouter $reverseRouter, SchemaManagerInterface $schemaManager)
+    public function __construct(ReverseRouter $reverseRouter)
     {
-        $this->cache = $cache;
         $this->reverseRouter = $reverseRouter;
-        $this->schemaManager = $schemaManager;
     }
 
     #[Get]
     #[Path('/')]
     public function show(): mixed
     {
-        $item = $this->cache->getItem('example-cache');
-        if (!$item->isHit()) {
-            $examples = $this->getExamples();
-            foreach ($examples as $key => $example) {
-                $examples[$key]['schema'] = file_get_contents($example['file']);
-                $types = GeneratorFactory::getPossibleTypes();
-                foreach ($types as $type) {
-                    $examples[$key]['types'][$type] = $this->convert($type, $example['file']);
-                }
-            }
-
-            $item->expiresAfter(null);
-            $item->set($examples);
-            $this->cache->save($item);
-        } else {
-            $examples = $item->get();
+        $types = [];
+        foreach (GeneratorFactory::getPossibleTypes() as $type) {
+            $types[$type] = TypeName::getDisplayName($type);
         }
 
         $data = [
             'method' => explode('::', __METHOD__),
-            'examples' => $examples
+            'types' => array_chunk($types, 9, true),
         ];
 
         $templateFile = __DIR__ . '/../../resources/template/index.php';
         return new Template($data, $templateFile, $this->reverseRouter);
     }
-
-    private function convert(string $type, string $file): string
-    {
-        $schema = $this->schemaManager->getSchema($file);
-
-        $factory = new GeneratorFactory();
-        $generator = $factory->getGenerator($type);
-
-        return (string) $generator->generate($schema);
-    }
-
-    private function getExamples(): array
-    {
-        $examples = [];
-        $examples[] = [
-            'title' => 'Simple model',
-            'description' => 'A simple model with some scalar properties.',
-            'file' => __DIR__ . '/../../resources/examples/simple.json',
-        ];
-
-        $examples[] = [
-            'title' => 'Model with inheritance',
-            'description' => 'A student class which extends from the human class.',
-            'file' => __DIR__ . '/../../resources/examples/inheritance.json',
-        ];
-
-        $examples[] = [
-            'title' => 'Model with reference',
-            'description' => 'A student class which reference a faculty class.',
-            'file' => __DIR__ . '/../../resources/examples/reference.json',
-        ];
-
-        $examples[] = [
-            'title' => 'Map with string values',
-            'description' => 'A student class which contains a map with arbitrary string properties.',
-            'file' => __DIR__ . '/../../resources/examples/map.json',
-        ];
-
-        $examples[] = [
-            'title' => 'Inline map with string values',
-            'description' => 'A student class which contains an inline map with arbitrary string properties.',
-            'file' => __DIR__ . '/../../resources/examples/map_inline.json',
-        ];
-
-        $examples[] = [
-            'title' => 'Model with discriminator',
-            'description' => 'A model which contains a union type.',
-            'file' => __DIR__ . '/../../resources/examples/discriminator.json',
-        ];
-
-        $examples[] = [
-            'title' => 'Advanced model which uses generics',
-            'description' => 'A generic map which uses a specific model.',
-            'file' => __DIR__ . '/../../resources/examples/generic.json',
-        ];
-
-        $examples[] = [
-            'title' => 'Import other TypeSchema specification',
-            'description' => 'Shows how to import and use another TypeSchema.',
-            'file' => __DIR__ . '/../../resources/examples/import.json',
-        ];
-
-        return $examples;
-    }
 }
diff --git a/www/src/Model/Generate.php b/www/src/Model/Generate.php
index e664035..d31addc 100644
--- a/www/src/Model/Generate.php
+++ b/www/src/Model/Generate.php
@@ -7,15 +7,15 @@
 
 class Generate implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
-    protected ?string $type = null;
+    protected ?string $namespace = null;
     protected ?string $schema = null;
-    public function setType(?string $type) : void
+    public function setNamespace(?string $namespace) : void
     {
-        $this->type = $type;
+        $this->namespace = $namespace;
     }
-    public function getType() : ?string
+    public function getNamespace() : ?string
     {
-        return $this->type;
+        return $this->namespace;
     }
     public function setSchema(?string $schema) : void
     {
@@ -29,7 +29,7 @@ public function toRecord() : \PSX\Record\RecordInterface
     {
         /** @var \PSX\Record\Record<mixed> $record */
         $record = new \PSX\Record\Record();
-        $record->put('type', $this->type);
+        $record->put('namespace', $this->namespace);
         $record->put('schema', $this->schema);
         return $record;
     }
diff --git a/www/src/Service/TypeName.php b/www/src/Service/TypeName.php
new file mode 100644
index 0000000..ab645c7
--- /dev/null
+++ b/www/src/Service/TypeName.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace App\Service;
+
+use PSX\Schema\GeneratorFactory;
+
+class TypeName
+{
+    public static function getDisplayName(string $type): string
+    {
+        return match($type) {
+            GeneratorFactory::TYPE_CSHARP => 'C#',
+            GeneratorFactory::TYPE_GRAPHQL => 'GraphQL',
+            GeneratorFactory::TYPE_HTML => 'HTML',
+            GeneratorFactory::TYPE_JSONSCHEMA => 'JsonSchema',
+            GeneratorFactory::TYPE_PHP => 'PHP',
+            GeneratorFactory::TYPE_TYPESCHEMA => 'TypeSchema',
+            GeneratorFactory::TYPE_TYPESCRIPT => 'TypeScript',
+            GeneratorFactory::TYPE_VISUALBASIC => 'VisualBasic',
+            default => ucfirst($type),
+        };
+    }
+}