diff --git a/.gitignore b/.gitignore
index eabf65e..256b1d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+.yalc
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 0f6080b..112e66c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1827,29 +1827,26 @@
       }
     },
     "@jsonforms/angular": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@jsonforms/angular/-/angular-2.5.1.tgz",
-      "integrity": "sha512-dMAMlw3ovD7WONr5+iE44WT1ajiY6UqOlOl6k4sG2pooLECimJ5XkQA47a1JtyM5420gxLXddXfc4qp2W7MX3g=="
+      "version": "3.0.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@jsonforms/angular/-/angular-3.0.0-alpha.0.tgz",
+      "integrity": "sha512-jzy/r7HP9hLvscYfZZH6g8S9H81cL9ApUGMi00SlAylMnZzi5u0ZqMMqmNuCVTrjQI8D95Q/IHhundzYrAkaWA=="
     },
     "@jsonforms/angular-material": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@jsonforms/angular-material/-/angular-material-2.5.1.tgz",
-      "integrity": "sha512-SjSH0iZukS5LhsRM/x7fWyVxgOKstJJX0TflaUhZmzLqV/L8e/+IsX/OSTCTrLsguJZ65YMBE+sJpWdkULwTjQ==",
+      "version": "3.0.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@jsonforms/angular-material/-/angular-material-3.0.0-alpha.0.tgz",
+      "integrity": "sha512-sang3delVyiDXj+LWnFlU+RWRG9UIxVyJ2zGQr3PNtZmL62YfF5bT3LE3LbuzCKkRmYFNFVNJw+c4eVGTtCF7w==",
       "requires": {
         "hammerjs": "2.0.8"
       }
     },
     "@jsonforms/core": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-2.5.1.tgz",
-      "integrity": "sha512-sDmCcqQ9SKY0ZpctwM+13cz/Nuy6ZurhkldbgXzUcjqTsvNiwoQyiWNzF01o7eaYrYDOXXNVk8fVF5wcTqGWog==",
+      "version": "3.0.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-3.0.0-alpha.0.tgz",
+      "integrity": "sha512-CIUh7uDlhH8a5/zk6YF5LXAbmu299eYBTJXLzjZSnCL1lyZtckCnEGvWzF8Y7A9cgAg18URRyjyloxfT0ARaRQ==",
       "requires": {
         "@types/json-schema": "^7.0.3",
         "ajv": "^6.10.2",
-        "json-schema-ref-parser": "7.1.3",
-        "lodash": "^4.17.15",
-        "uri-js": "^4.2.2",
-        "uuid": "^3.3.3"
+        "lodash": "^4.17.15"
       }
     },
     "@ngtools/webpack": {
@@ -2972,6 +2969,16 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -3351,11 +3358,6 @@
         "get-intrinsic": "^1.0.2"
       }
     },
-    "call-me-maybe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
-    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -5539,6 +5541,13 @@
         }
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -7255,16 +7264,6 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
       "dev": true
     },
-    "json-schema-ref-parser": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-7.1.3.tgz",
-      "integrity": "sha512-/Lmyl0PW27dOmCO03PI339+1gs4Z2PlqIyUgzIOtoRp08zkkMCB30TRbdppbPO7WWzZX0uT98HqkDiZSujkmbA==",
-      "requires": {
-        "call-me-maybe": "^1.0.1",
-        "js-yaml": "^3.13.1",
-        "ono": "^6.0.0"
-      }
-    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -8350,6 +8349,13 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "nan": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+      "dev": true,
+      "optional": true
+    },
     "nanoid": {
       "version": "3.1.22",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz",
@@ -8885,11 +8891,6 @@
         "mimic-fn": "^2.1.0"
       }
     },
-    "ono": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ono/-/ono-6.0.1.tgz",
-      "integrity": "sha512-5rdYW/106kHqLeG22GE2MHKq+FlsxMERZev9DCzQX1zwkxnFwBivSn5i17a5O/rDmOJOdf4Wyt80UZljzx9+DA=="
-    },
     "open": {
       "version": "7.4.0",
       "resolved": "https://registry.npmjs.org/open/-/open-7.4.0.tgz",
@@ -12910,7 +12911,8 @@
     "uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "dev": true
     },
     "v8flags": {
       "version": "3.2.0",
@@ -13135,7 +13137,11 @@
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
         },
         "glob-parent": {
           "version": "3.1.0",
@@ -13818,7 +13824,11 @@
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
         },
         "glob-parent": {
           "version": "3.1.0",
diff --git a/package.json b/package.json
index 4a1a89f..5830db4 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,9 @@
     "@angular/platform-browser": "^11.2.12",
     "@angular/platform-browser-dynamic": "^11.2.12",
     "@angular/router": "^11.2.12",
-    "@jsonforms/angular": "^2.5.1",
-    "@jsonforms/angular-material": "^2.5.1",
-    "@jsonforms/core": "^2.5.1",
+    "@jsonforms/angular": "^3.0.0-alpha.0",
+    "@jsonforms/angular-material": "^3.0.0-alpha.0",
+    "@jsonforms/core": "^3.0.0-alpha.0",
     "ajv": "^6.10.2",
     "core-js": "^2.4.1",
     "json-refs": "^3.0.4",