diff --git a/ember/app/cases/detail/controller.js b/ember/app/cases/detail/controller.js
index 858d542..5027337 100644
--- a/ember/app/cases/detail/controller.js
+++ b/ember/app/cases/detail/controller.js
@@ -1,7 +1,20 @@
 import Controller from "@ember/controller";
+import getCaseQuery from "caluma-portal-demo/gql/queries/get-case";
+import { queryManager } from "ember-apollo-client";
+import { dropTask, lastValue } from "ember-concurrency";
 
 export default class CasesDetailController extends Controller {
-  get case() {
-    return this.model.value[0];
+  @queryManager apollo;
+
+  @lastValue("getCase") case;
+  @dropTask
+  *getCase() {
+    return (yield this.apollo.query(
+      {
+        query: getCaseQuery,
+        variables: { filter: [{ id: this.model }] },
+      },
+      "allCases.edges"
+    )).map(({ node }) => node)[0];
   }
 }
diff --git a/ember/app/cases/detail/edit/controller.js b/ember/app/cases/detail/edit/controller.js
index 07cdd77..bba011a 100644
--- a/ember/app/cases/detail/edit/controller.js
+++ b/ember/app/cases/detail/edit/controller.js
@@ -1,7 +1,5 @@
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 
 export default class CasesDetailEditController extends Controller {
-  get case() {
-    return this.model.value[0];
-  }
+  @controller("cases.detail") parent;
 }
diff --git a/ember/app/cases/detail/edit/route.js b/ember/app/cases/detail/edit/route.js
index f0b4dca..a9e7b1e 100644
--- a/ember/app/cases/detail/edit/route.js
+++ b/ember/app/cases/detail/edit/route.js
@@ -1,7 +1,3 @@
 import CasesDetailRoute from "caluma-portal-demo/cases/detail/index/route";
 
-export default class CasesDetailEditRoute extends CasesDetailRoute {
-  model() {
-    return this.modelFor("cases.detail");
-  }
-}
+export default class CasesDetailEditRoute extends CasesDetailRoute {}
diff --git a/ember/app/cases/detail/edit/template.hbs b/ember/app/cases/detail/edit/template.hbs
index f85b8b2..56e364e 100644
--- a/ember/app/cases/detail/edit/template.hbs
+++ b/ember/app/cases/detail/edit/template.hbs
@@ -1,3 +1,3 @@
-{{#if @model}}
-  <CfContent @documentId={{this.case.document.id}} />
+{{#if this.parent.case}}
+  <CfContent @documentId={{this.parent.case.document.id}} />
 {{/if}}
diff --git a/ember/app/cases/detail/index/controller.js b/ember/app/cases/detail/index/controller.js
index baac1b9..8e521f1 100644
--- a/ember/app/cases/detail/index/controller.js
+++ b/ember/app/cases/detail/index/controller.js
@@ -1,4 +1,4 @@
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { inject as service } from "@ember/service";
 import cancelCaseMutation from "caluma-portal-demo/gql/mutations/cancel-case";
 import { queryManager } from "ember-apollo-client";
@@ -7,16 +7,13 @@ import { dropTask } from "ember-concurrency";
 export default class CasesDetailIndexController extends Controller {
   @service router;
   @queryManager apollo;
-
-  get case() {
-    return this.model.value[0];
-  }
+  @controller("cases.detail") parent;
 
   @dropTask
   *closeCase() {
     yield this.apollo.mutate({
       mutation: cancelCaseMutation,
-      variables: { case: this.case.id },
+      variables: { case: this.parent.case.id },
     });
     this.router.transitionTo("cases.index");
   }
diff --git a/ember/app/cases/detail/index/route.js b/ember/app/cases/detail/index/route.js
index c2de39b..da0e5a3 100644
--- a/ember/app/cases/detail/index/route.js
+++ b/ember/app/cases/detail/index/route.js
@@ -1,7 +1,3 @@
 import Route from "@ember/routing/route";
 
-export default class CasesDetailRoute extends Route {
-  model() {
-    return this.modelFor("cases.detail");
-  }
-}
+export default class CasesDetailRoute extends Route {}
diff --git a/ember/app/cases/detail/index/template.hbs b/ember/app/cases/detail/index/template.hbs
index ff31b51..fc75a36 100644
--- a/ember/app/cases/detail/index/template.hbs
+++ b/ember/app/cases/detail/index/template.hbs
@@ -12,13 +12,13 @@
             {{t "cases.status"}}
           </th>
           <td class="uk-width-1-3">
-            <CaseStateLabel @state={{this.case.raw.status}} @iconPosition="right" />
+            <CaseStateLabel @state={{this.parent.case.status}} @iconPosition="right" />
           </td>
           <th class="uk-text-bold uk-width-1-6">
             {{t "cases.description"}}
           </th>
           <td class="uk-width-1-3">
-            {{or this.case.form.description "-"}}
+            {{or this.parent.case.form.description "-"}}
           </td>
         </tr>
         <tr>
@@ -28,8 +28,8 @@
           <td class="uk-width-1-3">
             {{
               if
-              this.case.createdAt
-              (moment-format this.case.createdAt "DD.MM.YYYY")
+              this.parent.case.createdAt
+              (moment-format this.parent.case.createdAt "DD.MM.YYYY")
               "-"
             }}
           </td>
@@ -39,8 +39,8 @@
           <td class="uk-width-1-3">
             {{
               if
-              this.case.modifiedAt
-              (moment-format this.case.modifiedAt "DD.MM.YYYY")
+              this.parent.case.modifiedAt
+              (moment-format this.parent.case.modifiedAt "DD.MM.YYYY")
               "-"
             }}
           </td>
@@ -76,7 +76,7 @@
       {{t "cases.deleteText"}}
     </p>
     <UkButton
-      @onClick={{perform this.closeCase this.case}}
+      @onClick={{perform this.closeCase}}
       @disabled={{this.closeCase.isRunning}}
       @loading={{this.closeCase.isRunning}}
     >
diff --git a/ember/app/cases/detail/route.js b/ember/app/cases/detail/route.js
index dd47b3d..b7cdde9 100644
--- a/ember/app/cases/detail/route.js
+++ b/ember/app/cases/detail/route.js
@@ -1,13 +1,12 @@
 import Route from "@ember/routing/route";
-import { useCalumaQuery } from "@projectcaluma/ember-core/caluma-query";
-import { allCases } from "@projectcaluma/ember-core/caluma-query/queries";
+
 export default class CasesDetailRoute extends Route {
   model({ case_id }) {
-    const caseQuery = useCalumaQuery(this, allCases, () => ({
-      options: { pageSize: 1 },
-      filter: [{ id: case_id }],
-    }));
+    return case_id;
+  }
 
-    return caseQuery;
+  setupController(controller, post) {
+    super.setupController(controller, post);
+    controller.getCase.perform();
   }
 }
diff --git a/ember/app/cases/detail/template.hbs b/ember/app/cases/detail/template.hbs
index b8d30d2..8cfb48f 100644
--- a/ember/app/cases/detail/template.hbs
+++ b/ember/app/cases/detail/template.hbs
@@ -1,4 +1,4 @@
-{{#if @model.isLoading}}
+{{#if this.getCase.isRunning}}
   <div class="uk-text-center uk-padding">
     <UkSpinner @ratio={{2}} />
   </div>
diff --git a/ember/app/cases/detail/work-items/edit/controller.js b/ember/app/cases/detail/work-items/edit/controller.js
new file mode 100644
index 0000000..648edae
--- /dev/null
+++ b/ember/app/cases/detail/work-items/edit/controller.js
@@ -0,0 +1,20 @@
+import Controller from "@ember/controller";
+import getWorkItemQuery from "caluma-portal-demo/gql/queries/get-work-item";
+import { queryManager } from "ember-apollo-client";
+import { dropTask, lastValue } from "ember-concurrency";
+
+export default class CasesDetailWorkItemsEditController extends Controller {
+  @queryManager apollo;
+
+  @lastValue("getWorkItem") workItem;
+  @dropTask
+  *getWorkItem() {
+    return (yield this.apollo.query(
+      {
+        query: getWorkItemQuery,
+        variables: { filter: [{ id: this.model }] },
+      },
+      "allWorkItems.edges"
+    )).map(({ node }) => node)[0];
+  }
+}
diff --git a/ember/app/cases/detail/work-items/edit/form/controller.js b/ember/app/cases/detail/work-items/edit/form/controller.js
index 69a5625..381e4cb 100644
--- a/ember/app/cases/detail/work-items/edit/form/controller.js
+++ b/ember/app/cases/detail/work-items/edit/form/controller.js
@@ -1,17 +1,12 @@
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
-import { queryManager } from "ember-apollo-client";
 
 export default class CasesDetailWorkItemsEditFormController extends Controller {
-  @queryManager apollo;
-
   @service notification;
   @service router;
 
-  get workItem() {
-    return this.model.value[0];
-  }
+  @controller("cases.detail.work-items.edit") parent;
 
   @action
   actionButtonOnSuccess() {
diff --git a/ember/app/cases/detail/work-items/edit/form/route.js b/ember/app/cases/detail/work-items/edit/form/route.js
index bc82ff4..7ff5f6c 100644
--- a/ember/app/cases/detail/work-items/edit/form/route.js
+++ b/ember/app/cases/detail/work-items/edit/form/route.js
@@ -1,7 +1,3 @@
 import Route from "@ember/routing/route";
 
-export default class CasesDetailWorkItemsEditFormRoute extends Route {
-  model() {
-    return this.modelFor("cases.detail.work-items.edit");
-  }
-}
+export default class CasesDetailWorkItemsEditFormRoute extends Route {}
diff --git a/ember/app/cases/detail/work-items/edit/form/template.hbs b/ember/app/cases/detail/work-items/edit/form/template.hbs
index 6467f59..3d9dbdf 100644
--- a/ember/app/cases/detail/work-items/edit/form/template.hbs
+++ b/ember/app/cases/detail/work-items/edit/form/template.hbs
@@ -1,14 +1,14 @@
-<h3>{{this.workItem.name}}</h3>
+<h3>{{this.parent.workItem.name}}</h3>
 
-{{#if @model.isLoading}}
+{{#if this.parent.getWorkItem.isRunning}}
   <div class="uk-text-center uk-padding">
     <UkSpinner @ratio={{2}} />
   </div>
 {{else}}
-  <CfContent @documentId={{this.workItem.document.id}}
+  <CfContent @documentId={{this.parent.workItem.document.id}}
     @context={{hash
       actionButtonOnSuccess=this.actionButtonOnSuccess
     }}
-    @disabled={{not this.workItem.isReady}}
+    @disabled={{not (eq this.parent.workItem.status "READY")}}
   />
 {{/if}}
\ No newline at end of file
diff --git a/ember/app/cases/detail/work-items/edit/index/controller.js b/ember/app/cases/detail/work-items/edit/index/controller.js
index 7833dc9..4ea23e2 100644
--- a/ember/app/cases/detail/work-items/edit/index/controller.js
+++ b/ember/app/cases/detail/work-items/edit/index/controller.js
@@ -1,4 +1,4 @@
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 import { tracked } from "@glimmer/tracking";
@@ -14,12 +14,11 @@ export default class CasesDetailWorkItemsEditController extends Controller {
   @service intl;
   @service router;
 
-  get workItem() {
-    return this.model.value[0];
-  }
+  @controller("cases.detail.work-items.edit") parent;
 
-  @tracked description = this.workItem.description;
+  @tracked description = this.parent.workItem?.description;
 
+  @action
   finishWorkItem() {
     this.notification.success(this.intl.t("workItems.finishSuccess"));
 
@@ -34,9 +33,9 @@ export default class CasesDetailWorkItemsEditController extends Controller {
         mutation: saveWorkItem,
         variables: {
           input: {
-            workItem: this.workItem.id,
-            description: this.workItem.description,
-            deadline: this.workItem.deadline,
+            workItem: this.parent.workItem.id,
+            description: this.parent.workItem.description,
+            deadline: this.parent.workItem.deadline,
           },
         },
       });
@@ -50,7 +49,7 @@ export default class CasesDetailWorkItemsEditController extends Controller {
 
   @action
   setDeadline(value) {
-    this.workItem.deadline = moment(value);
+    this.parent.workItem.deadline = moment(value);
   }
 
   @action
diff --git a/ember/app/cases/detail/work-items/edit/index/route.js b/ember/app/cases/detail/work-items/edit/index/route.js
index 1cfcf4f..7405bd1 100644
--- a/ember/app/cases/detail/work-items/edit/index/route.js
+++ b/ember/app/cases/detail/work-items/edit/index/route.js
@@ -1,7 +1,3 @@
 import Route from "@ember/routing/route";
 
-export default class CasesDetailWorkItemsEditRoute extends Route {
-  model() {
-    return this.modelFor("cases.detail.work-items.edit");
-  }
-}
+export default class CasesDetailWorkItemsEditRoute extends Route {}
diff --git a/ember/app/cases/detail/work-items/edit/index/template.hbs b/ember/app/cases/detail/work-items/edit/index/template.hbs
index d3fe6aa..3adb0a5 100644
--- a/ember/app/cases/detail/work-items/edit/index/template.hbs
+++ b/ember/app/cases/detail/work-items/edit/index/template.hbs
@@ -3,30 +3,24 @@
 </h1>
 
 <hr>
-{{#if @model.isLoading}}
+{{#if this.parent.getWorkItem.isRunning}}
   <div class="uk-text-center uk-padding">
     <UkSpinner @ratio={{2}} />
   </div>
 {{else}}
   <h2>
-    {{this.workItem.task.name}}
+    {{this.parent.workItem.task.name}}
   </h2>
 
   <div>
-    {{#if this.workItem.isCompleted}}
-      <div>
-        <span>
-          {{t "workItems.closedBy"}}
-        </span>
-        {{this.workItem.closedByUser.fullName}}
-      </div>
+    {{#if this.parent.workItem.isCompleted}}
       <div>
         <span>
           {{t "workItems.closedAt"}}
         </span>
         {{
         format-date
-          this.workItem.closedAt
+          this.parent.workItem.closedAt
           day="2-digit"
           month="2-digit"
           year="numeric"
@@ -53,7 +47,7 @@
           type="text" 
           value={{
             format-date
-              this.workItem.raw.createdAt
+              this.parent.workItem.createdAt
               day="2-digit"
               month="2-digit"
               year="numeric"
@@ -87,7 +81,7 @@
         <PikadayInput
           id="deadline"
           class="uk-input"
-          @value={{this.workItem.raw.deadline}}
+          @value={{this.parent.workItem.deadline}}
           @useUTC={{true}}
           @onSelection={{this.setDeadline}}
         />
@@ -109,7 +103,7 @@
 
       <WorkItemButton
         @mutation="complete"
-        @workItemId={{this.workItem.id}}
+        @workItemId={{this.parent.workItem.id}}
         @onSuccess={{this.finishWorkItem}}
       >
         {{t "workItems.actions.finish"}}
diff --git a/ember/app/cases/detail/work-items/edit/route.js b/ember/app/cases/detail/work-items/edit/route.js
index 82d7e3d..7626cf0 100644
--- a/ember/app/cases/detail/work-items/edit/route.js
+++ b/ember/app/cases/detail/work-items/edit/route.js
@@ -1,14 +1,12 @@
 import Route from "@ember/routing/route";
-import { useCalumaQuery } from "@projectcaluma/ember-core/caluma-query";
-import { allWorkItems } from "@projectcaluma/ember-core/caluma-query/queries";
 
 export default class CasesDetailWorkItemsEditRoute extends Route {
   model({ work_item_id }) {
-    const workItemsQuery = useCalumaQuery(this, allWorkItems, () => ({
-      options: { pageSize: 1 },
-      filter: [{ id: work_item_id }],
-    }));
+    return work_item_id;
+  }
 
-    return workItemsQuery;
+  setupController(controller, post) {
+    super.setupController(controller, post);
+    controller.getWorkItem.perform();
   }
 }
diff --git a/ember/app/cases/detail/work-items/index/controller.js b/ember/app/cases/detail/work-items/index/controller.js
index e6e8ba5..54e0e81 100644
--- a/ember/app/cases/detail/work-items/index/controller.js
+++ b/ember/app/cases/detail/work-items/index/controller.js
@@ -22,7 +22,7 @@ export default class CasesDetailWorkItemsController extends Controller {
   }
 
   queryFilter(status) {
-    return [{ case: this.model.value[0].id }, { status }];
+    return [{ case: this.model }, { status }];
   }
 
   get readyOrder() {
diff --git a/ember/app/gql/queries/get-case.graphql b/ember/app/gql/queries/get-case.graphql
new file mode 100644
index 0000000..81ef7bf
--- /dev/null
+++ b/ember/app/gql/queries/get-case.graphql
@@ -0,0 +1,19 @@
+query getCaseQuery($filter: [CaseFilterSetType]) {
+  allCases(filter: $filter) {
+    edges {
+      node {
+        id
+        status
+        createdAt
+        modifiedAt
+        document {
+          id
+          form {
+            name
+            description
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ember/app/gql/queries/get-work-item.graphql b/ember/app/gql/queries/get-work-item.graphql
new file mode 100644
index 0000000..f5078ec
--- /dev/null
+++ b/ember/app/gql/queries/get-work-item.graphql
@@ -0,0 +1,22 @@
+query getWorkItemQuery($filter: [WorkItemFilterSetType]) {
+  allWorkItems(filter: $filter) {
+    edges {
+      node {
+        id
+        status
+        name
+        closedAt
+        closedByUser
+        deadline
+        description
+        createdAt
+        task {
+          name
+        }
+        document {
+          id
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ember/package.json b/ember/package.json
index 3b61049..f2c377d 100644
--- a/ember/package.json
+++ b/ember/package.json
@@ -24,14 +24,14 @@
     "@ember/optional-features": "2.0.0",
     "@ember/render-modifiers": "2.0.4",
     "@ember/test-helpers": "2.6.0",
-    "@faker-js/faker": "6.1.1",
+    "@faker-js/faker": "6.1.2",
     "@glimmer/component": "1.0.4",
     "@glimmer/tracking": "1.0.4",
     "@projectcaluma/ember-core": "11.0.0-beta.5",
-    "@projectcaluma/ember-form": "11.0.0-beta.14",
-    "@projectcaluma/ember-form-builder": "11.0.0-beta.10",
+    "@projectcaluma/ember-form": "11.0.0-beta.16",
+    "@projectcaluma/ember-form-builder": "11.0.0-beta.11",
     "@projectcaluma/ember-testing": "11.0.0-beta.5",
-    "@projectcaluma/ember-workflow": "11.0.0-beta.5",
+    "@projectcaluma/ember-workflow": "11.0.0-beta.6",
     "babel-eslint": "10.1.0",
     "broccoli-asset-rev": "3.0.0",
     "ember-alexandria": "1.2.0",
diff --git a/ember/translations/en.yaml b/ember/translations/en.yaml
index 65488cd..c6d5669 100644
--- a/ember/translations/en.yaml
+++ b/ember/translations/en.yaml
@@ -66,7 +66,7 @@ workItems:
   document: "Document"
   description: "Desciption"
   closedAt: "Completed on"
-  closedBy: "Completed by"
+  closedByUser: "Completed by"
   edit: "Edit task"
   responsible: "Responsible"
   deadline: "Deadline"
diff --git a/ember/yarn.lock b/ember/yarn.lock
index 1918754..b0f16de 100644
--- a/ember/yarn.lock
+++ b/ember/yarn.lock
@@ -1309,7 +1309,7 @@
     ember-cli-version-checker "^5.1.2"
     semver "^7.3.5"
 
-"@ember/test-waiters@^3.0.0", "@ember/test-waiters@~3.0.0", "@ember/test-waiters@~3.0.1":
+"@ember/test-waiters@^3.0.0", "@ember/test-waiters@~3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.1.tgz#c3416dd6dcb0e3c0434e815e1de144d848ad74b1"
   integrity sha512-LqV55mMiSuhAAWfbJdJf0bxHc22A/CiG8TKyZwpcSv4A1GJIpdlTvqHCrlcdV6T30+L0/uyj14upC3ayWmV0CQ==
@@ -1429,12 +1429,7 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@faker-js/faker@6.1.1":
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-6.1.1.tgz#adf002d986e1751daadfcf65d1cc03944dab3ced"
-  integrity sha512-8yq1LJVGn4GY06riLddIU1LbJm15yjt46hjfkpWNpH/mqdciPOBVzicKOJxzQNrGgVHVBxcdm7sgwjI/Y19MYw==
-
-"@faker-js/faker@^6.0.0":
+"@faker-js/faker@6.0.0", "@faker-js/faker@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-6.0.0.tgz#b613ebf5f5ebb2ab987afb567d8b7fe860199c13"
   integrity sha512-10zLCKhp3YEmBuko71ivcMoIZcCLXgQVck6aNswX+AWwaek/L8S3yz9i8m3tHigRkcF6F2vI+qtdtyySHK+bGA==
@@ -1857,7 +1852,7 @@
     style-value-types "^3.1.7"
     tslib "^1.10.0"
 
-"@projectcaluma/ember-core@11.0.0-beta.5", "@projectcaluma/ember-core@^11.0.0-beta.5":
+"@projectcaluma/ember-core@11.0.0-beta.5":
   version "11.0.0-beta.5"
   resolved "https://registry.yarnpkg.com/@projectcaluma/ember-core/-/ember-core-11.0.0-beta.5.tgz#204995928a146a5a5d35e7ba79e60aa81dba218d"
   integrity sha512-aV2EoyujfJayD34C3FnVfyUUK+ApcvJznj8Ist+gCbWLZwroC/+Qd1CasRDHa2kt9yWH67E0CYQQpjTjZVlKYQ==
@@ -1879,83 +1874,77 @@
     lodash.clonedeep "^4.5.0"
     slugify "^1.6.5"
 
-"@projectcaluma/ember-form-builder@11.0.0-beta.10":
-  version "11.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@projectcaluma/ember-form-builder/-/ember-form-builder-11.0.0-beta.10.tgz#7c89f5e807602d0d3b97f71231b91f7abb36d142"
-  integrity sha512-B9GbGcJ+brJEXli5D9k6oNN4pcnGsS/2JuvaKIT3eS5kCHkHzuK//khEDvs8pOIPcAsWVaYhREQ7LzqL56xqbA==
+"@projectcaluma/ember-core@^11.0.0-beta.6":
+  version "11.0.0-beta.6"
+  resolved "https://registry.yarnpkg.com/@projectcaluma/ember-core/-/ember-core-11.0.0-beta.6.tgz#31eb5b0d9d6bb453a8de6967639b77506ed6c0aa"
+  integrity sha512-Ve2hA3cNr3qG3YWa+LNxD18lqF3rD3sY+Epwnge9ID3NteUy+M625KnUsRYrOXHuwnq0MGBwe21f608GPg99kQ==
   dependencies:
-    "@ember/render-modifiers" "^2.0.4"
-    "@embroider/macros" "^1.5.0"
-    "@glimmer/component" "^1.0.4"
+    "@apollo/client" "^3.5.10"
+    "@ember/string" "^3.0.0"
     "@glimmer/tracking" "^1.0.4"
-    "@projectcaluma/ember-core" "^11.0.0-beta.5"
-    "@projectcaluma/ember-form" "^11.0.0-beta.13"
-    codejar "^3.5.0"
-    ember-apollo-client "^3.2.0"
+    ember-apollo-client "^4.0.2"
     ember-auto-import "^2.4.0"
-    ember-changeset "^4.0.0-beta.5"
-    ember-changeset-validations "^4.0.0-beta.3"
     ember-cli-babel "^7.26.11"
     ember-cli-htmlbars "^6.0.1"
-    ember-composable-helpers "^5.0.0"
     ember-concurrency "^2.2.1"
-    ember-engines-router-service "^0.3.0"
     ember-fetch "^8.1.1"
+    ember-inflector "^4.0.2"
     ember-intl "^5.7.2"
-    ember-math-helpers "^2.18.1"
-    ember-pikaday "^4.0.0"
-    ember-power-select "^5.0.4"
     ember-resources "^4.4.0"
-    ember-test-selectors "^6.0.0"
-    ember-uikit "^5.0.0"
-    ember-validated-form "^5.3.0"
     graphql "^15.8.0"
     graphql-tag "^2.12.6"
     jexl "^2.3.0"
-    prismjs "^1.27.0"
+    lodash.clonedeep "^4.5.0"
+    slugify "^1.6.5"
 
-"@projectcaluma/ember-form@11.0.0-beta.14":
-  version "11.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@projectcaluma/ember-form/-/ember-form-11.0.0-beta.14.tgz#da80d0d4fce711f411c0cddc898f879f3f1cfb5d"
-  integrity sha512-UjVpp6jij0mthonSQ658cLWRqnwOlIm1Y55Y0Bo4ANh759HTnPm6zbFzGUP+Kx/ADL/PnajjT50vHkFhpDNCwg==
+"@projectcaluma/ember-form-builder@11.0.0-beta.11":
+  version "11.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@projectcaluma/ember-form-builder/-/ember-form-builder-11.0.0-beta.11.tgz#5fb74554bbc7ef8ff1b4ae111159f27b9f85f255"
+  integrity sha512-On1ppvEYvJYRdehEQ/gklBEbb3KomKCABGZlyJUoMRtomEYI+aZT9WxCUeSLRjkL2zRBJsvPAQuG/d0KNKcObA==
   dependencies:
+    "@ember/render-modifiers" "^2.0.4"
+    "@ember/string" "^3.0.0"
     "@embroider/macros" "^1.5.0"
     "@glimmer/component" "^1.0.4"
     "@glimmer/tracking" "^1.0.4"
-    "@projectcaluma/ember-core" "^11.0.0-beta.5"
-    ember-apollo-client "^3.2.1"
+    "@projectcaluma/ember-core" "^11.0.0-beta.6"
+    "@projectcaluma/ember-form" "^11.0.0-beta.16"
+    codejar "^3.5.0"
+    ember-apollo-client "^4.0.2"
     ember-auto-import "^2.4.0"
-    ember-autoresize-modifier "^0.5.0"
+    ember-changeset "^4.0.0"
+    ember-changeset-validations "^4.0.0"
     ember-cli-babel "^7.26.11"
     ember-cli-htmlbars "^6.0.1"
-    ember-cli-showdown "^6.0.1"
     ember-composable-helpers "^5.0.0"
     ember-concurrency "^2.2.1"
+    ember-engines-router-service "^0.3.0"
     ember-fetch "^8.1.1"
-    ember-in-viewport "^4.0.0"
     ember-intl "^5.7.2"
     ember-math-helpers "^2.18.1"
     ember-pikaday "^4.0.0"
     ember-power-select "^5.0.4"
     ember-resources "^4.4.0"
-    ember-uikit "^5.1.0"
-    ember-validators "^4.1.2"
+    ember-test-selectors "^6.0.0"
+    ember-uikit "^5.1.1"
+    ember-validated-form "^5.3.0"
     graphql "^15.8.0"
+    graphql-tag "^2.12.6"
     jexl "^2.3.0"
-    lodash.isequal "^4.5.0"
-    luxon "^2.3.1"
-    tracked-toolbox "^1.2.3"
+    prismjs "^1.27.0"
 
-"@projectcaluma/ember-form@^11.0.0-beta.13":
-  version "11.0.0-beta.15"
-  resolved "https://registry.yarnpkg.com/@projectcaluma/ember-form/-/ember-form-11.0.0-beta.15.tgz#aa058c8cfd1129f1dc24781fa39a71c581b4080d"
-  integrity sha512-RJUXqKvxI5MvWkg7tIxMKgb8e72FvxsU5vHoaldGD0RsgdAITDoJyU++vXBvF+iZYkVvQkIFSTz0+s5iQtFolg==
+"@projectcaluma/ember-form@11.0.0-beta.16", "@projectcaluma/ember-form@^11.0.0-beta.16":
+  version "11.0.0-beta.16"
+  resolved "https://registry.yarnpkg.com/@projectcaluma/ember-form/-/ember-form-11.0.0-beta.16.tgz#76e3c3022c629046a27fbe1b6d9080fe6e4305a1"
+  integrity sha512-sEiy0Py4odBMGpa9fSq3QcIYR9u8N3OVWzirx2At75HhmpwApLhAL4p7Fbdri/mLI5I6c+0Zpj5HK4kN1Y8Sjg==
   dependencies:
+    "@ember/string" "^3.0.0"
     "@embroider/macros" "^1.5.0"
+    "@embroider/util" "^1.5.0"
     "@glimmer/component" "^1.0.4"
     "@glimmer/tracking" "^1.0.4"
-    "@projectcaluma/ember-core" "^11.0.0-beta.5"
-    ember-apollo-client "^3.2.1"
+    "@projectcaluma/ember-core" "^11.0.0-beta.6"
+    ember-apollo-client "^4.0.2"
     ember-auto-import "^2.4.0"
     ember-autoresize-modifier "^0.5.0"
     ember-cli-babel "^7.26.11"
@@ -1970,7 +1959,7 @@
     ember-pikaday "^4.0.0"
     ember-power-select "^5.0.4"
     ember-resources "^4.4.0"
-    ember-uikit "^5.1.0"
+    ember-uikit "^5.1.1"
     ember-validators "^4.1.2"
     graphql "^15.8.0"
     jexl "^2.3.0"
@@ -2000,14 +1989,14 @@
     luxon "^2.3.1"
     miragejs "^0.1.43"
 
-"@projectcaluma/ember-workflow@11.0.0-beta.5":
-  version "11.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@projectcaluma/ember-workflow/-/ember-workflow-11.0.0-beta.5.tgz#4e6b415e946ddc95be2b28e4cdec5f9b1adc701b"
-  integrity sha512-l4UTh5B/75+ABmjCHI+g71IWGZoYMML0gelY8n+RcR6SWhCaz4OUyvYm3AmVgx033kJCzLDRTsvIt0jmUWHn1w==
+"@projectcaluma/ember-workflow@11.0.0-beta.6":
+  version "11.0.0-beta.6"
+  resolved "https://registry.yarnpkg.com/@projectcaluma/ember-workflow/-/ember-workflow-11.0.0-beta.6.tgz#4e189bae6237e32106be49ff1a76bd2c99005e0a"
+  integrity sha512-GnlxOecvXN1DR9raaS8iSTQGVfBrI7qSiANnCI2KJilX105yor8BEY8288geTjbrKPbccMv0ypS0rzi9G+TFBg==
   dependencies:
     "@glimmer/component" "^1.0.4"
-    "@projectcaluma/ember-core" "^11.0.0-beta.5"
-    ember-apollo-client "^3.2.0"
+    "@projectcaluma/ember-core" "^11.0.0-beta.6"
+    ember-apollo-client "^4.0.2"
     ember-auto-import "^2.4.0"
     ember-cli-babel "^7.26.11"
     ember-cli-htmlbars "^6.0.1"
@@ -2017,7 +2006,7 @@
     ember-intl "^5.7.2"
     ember-resources "^4.4.0"
     ember-truth-helpers "^3.0.0"
-    ember-uikit "^5.0.0"
+    ember-uikit "^5.1.1"
     graphql "^15.8.0"
 
 "@simple-dom/interface@^1.4.0":
@@ -6498,18 +6487,6 @@ ember-apollo-client@^3.2.0:
     ember-auto-import "^1.6.0"
     ember-cli-babel "^7.22.1"
 
-ember-apollo-client@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ember-apollo-client/-/ember-apollo-client-3.2.1.tgz#725042fd448d8712c260b79c79fcdab54e5d8674"
-  integrity sha512-Le36X8fkeElLeDlRiepbxH4KRG4Yf9aTf1LYsJusAfPaQtl+4P39eZAYCrGLZqCr8jrLg/c/lu99YAObXdEJ3g==
-  dependencies:
-    "@apollo/client" "^3.2.1"
-    "@ember/test-waiters" "~3.0.0"
-    "@glimmer/tracking" "^1.0.2"
-    broccoli-graphql-filter "^1.0.0"
-    ember-auto-import "^1.6.0"
-    ember-cli-babel "^7.22.1"
-
 ember-asset-loader@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/ember-asset-loader/-/ember-asset-loader-0.6.1.tgz#2eb81221406164d19127eba5b3d10f908df89a17"
@@ -6678,6 +6655,17 @@ ember-changeset-validations@4.0.0-beta.3, ember-changeset-validations@^4.0.0-bet
     ember-validators "~4.1.2"
     validated-changeset "~1.1.3"
 
+ember-changeset-validations@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ember-changeset-validations/-/ember-changeset-validations-4.0.0.tgz#1f9a6a43261ddae9266e167a90cb202196d02229"
+  integrity sha512-yEyLZtot5rcwrdOlSIy59eZN2k8THil5FQf2XnXENocJA3uAtQUqIbBrLqyvZroIzV63/uNZf5If1ZH6+M+Ahw==
+  dependencies:
+    ember-auto-import "^2.4.0"
+    ember-cli-babel "^7.26.6"
+    ember-get-config "^0.3.0 || ^0.4.0 || ^0.5.0 || ^1.0.2"
+    ember-validators "~4.1.2"
+    validated-changeset "~1.1.3"
+
 ember-changeset@4.0.0-beta.5, ember-changeset@^4.0.0-beta.5:
   version "4.0.0-beta.5"
   resolved "https://registry.yarnpkg.com/ember-changeset/-/ember-changeset-4.0.0-beta.5.tgz#ede25b8373d70ff9b8c6da494d7ca57ad8418ab6"
@@ -6689,6 +6677,17 @@ ember-changeset@4.0.0-beta.5, ember-changeset@^4.0.0-beta.5:
     ember-cli-babel "^7.26.6"
     validated-changeset "~1.1.2"
 
+ember-changeset@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ember-changeset/-/ember-changeset-4.0.0.tgz#b0ff4dc64d9b581b3cb1d1f18f193377a7dbce13"
+  integrity sha512-TsI6DHS2Bq0jfnxzzpNQtR6jRdneB0ObHLUHhCc44BZ/riijGWdMxwO4VhGfuSWJFUxCxoPNV/qvUp6ughSS4w==
+  dependencies:
+    "@embroider/macros" "^1.0.0"
+    "@glimmer/tracking" "^1.0.4"
+    ember-auto-import "^2.3.0"
+    ember-cli-babel "^7.26.6"
+    validated-changeset "~1.1.2"
+
 ember-class-based-modifier@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/ember-class-based-modifier/-/ember-class-based-modifier-0.10.0.tgz#bb40c05440a959d84e9e2f5038e3894773686d19"
@@ -7959,7 +7958,7 @@ ember-uikit@2.2.0:
     ember-toggle "^7.0.0"
     uikit "^3.3.7"
 
-ember-uikit@5.1.0, ember-uikit@^5.0.0, ember-uikit@^5.1.0:
+ember-uikit@5.1.0, ember-uikit@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/ember-uikit/-/ember-uikit-5.1.0.tgz#b847a9cff6d21c54daed027e1fff881f9344cd7b"
   integrity sha512-K3ONx0c5eI5JQtz8OCpZf8w88itb43dn5NgzQ0WDtKbhzLnbSJzCuahUAXOW0O9MsTyzz1wSeelzyI+hRYOKsQ==
@@ -7979,6 +7978,27 @@ ember-uikit@5.1.0, ember-uikit@^5.0.0, ember-uikit@^5.1.0:
     ember-toggle "^9.0.3"
     uikit "^3.11.1"
 
+ember-uikit@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/ember-uikit/-/ember-uikit-5.1.1.tgz#0cc7bd965ad5fba3a48b6e4954ae2da38519fe76"
+  integrity sha512-cGaPtkEz637q4eUGGchVyGjZPZyxVF76zfncMzEHxMrZVHIyjaltFHGDh0RUtY3weWe2NcV+4pysFx3+Tg7UVQ==
+  dependencies:
+    "@ember/render-modifiers" "^2.0.4"
+    "@ember/string" "^3.0.0"
+    "@embroider/util" "^1.5.0"
+    "@glimmer/component" "^1.0.4"
+    "@glimmer/tracking" "^1.0.4"
+    broccoli-funnel "^3.0.8"
+    broccoli-merge-trees "^4.2.0"
+    broccoli-stew "^3.0.0"
+    ember-auto-import "^2.4.0"
+    ember-cli-babel "^7.26.11"
+    ember-cli-htmlbars "^6.0.1"
+    ember-focus-trap "^1.0.1"
+    ember-modifier "^3.1.0"
+    ember-toggle "^9.0.3"
+    uikit "^3.13.1"
+
 ember-validated-form@5.3.0, ember-validated-form@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ember-validated-form/-/ember-validated-form-5.3.0.tgz#fd697bfb4b46473dd85a592d2f23bfe564214fbb"
@@ -16410,6 +16430,11 @@ uikit@^3.11.1, uikit@^3.3.7:
   resolved "https://registry.yarnpkg.com/uikit/-/uikit-3.11.1.tgz#3f0b47f4b2e7610375c5f7cdbf550d086c81e22f"
   integrity sha512-nUUtvE/wZe+oFF+8WLGlvsdHg1KI75SHHEhf5FcSVFG1AHEJkqOKhPhgU6FQLporAiPTsapzURN/bP765gI2bA==
 
+uikit@^3.13.1:
+  version "3.13.5"
+  resolved "https://registry.yarnpkg.com/uikit/-/uikit-3.13.5.tgz#5235964e938ee13075513748669fa8a90241fd17"
+  integrity sha512-7CyCZPmt9EJprfdCMyPA9tiArgrrL3VGktM9QGQ5MzQj8dTz8mmaFkUXloce1NUFYYNWI+bshYcghD4qzS+x2A==
+
 umask@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"