diff --git a/bin/build.sh b/bin/build.sh
new file mode 100755
index 0000000..dcc52ec
--- /dev/null
+++ b/bin/build.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cp -r ./ ~/temp-lucent
+cd ~/temp-lucent && npm run build
+rm -rf ~/temp-lucent/node_modules
+rm -rf ~/temp-lucent/.git
+cd ~/
+zip -r lucent.zip temp-lucent/
+rm -rf ~/temp-lucent
diff --git a/bin/lucent-serve b/bin/lucent-serve
new file mode 100755
index 0000000..5643a27
--- /dev/null
+++ b/bin/lucent-serve
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+php8.2  artisan serve --port 8197
diff --git a/bin/phpstan.sh b/bin/phpstan.sh
new file mode 100755
index 0000000..265c86b
--- /dev/null
+++ b/bin/phpstan.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+php8.2 ./vendor/bin/phpstan analyse -c phpstan.neon
diff --git a/composer.json b/composer.json
index 519331e..c256fce 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,6 @@
         "files": [
             "src/Response.php",
             "src/macros.php",
-            "src/Schema/Functions.php",
             "src/File/Uploader.php"
         ]
     },
diff --git a/front/js/svelte/account/Register.svelte b/front/js/svelte/account/Register.svelte
index 453ea5f..ec9c9a1 100644
--- a/front/js/svelte/account/Register.svelte
+++ b/front/js/svelte/account/Register.svelte
@@ -1,14 +1,11 @@
 <script>
     import ErrorAlert from "../common/ErrorAlert.svelte";
     import SpinnerButton from "../common/SpinnerButton.svelte";
+    import {getContext} from "svelte";
 
-    import Nav from "./Nav.svelte";
-
+    const channel = getContext("channel");
     let name = "";
-    export let userCount = 1;
     export let email = "";
-    export let token = "";
-    let password = "";
     let errorMessage = "";
 
     function register(e) {
@@ -16,15 +13,12 @@
         errorMessage = "";
 
         axios
-            .post("/register", {
+            .post(channel.lucentUrl + "/register", {
                 name: name,
-                password: password,
                 email: email,
-                token: token,
-                isAdmin: userCount === 0,
             })
             .then(() => {
-                window.location = "/login";
+                window.location = channel.lucentUrl + "/login";
             })
             .catch((error) => {
                 errorMessage = error.response?.data.error;
@@ -33,60 +27,33 @@
     }
 </script>
 
-<Nav active="Register"/>
 <div class="wrapper-tiny">
-    {#if token || userCount === 0}
-        <ErrorAlert message={errorMessage}/>
+    <ErrorAlert message={errorMessage}/>
 
-        <form on:submit={register}>
-            <div class="mb-3">
-                <label for="name" class="form-label">Name</label>
-                <input
+    <form on:submit={register}>
+        <div class="mb-3">
+            <label for="name" class="form-label">Name</label>
+            <input
                     type="text"
                     bind:value={name}
                     class="form-control"
                     id="name"
-                />
-            </div>
-            <div class="mb-3">
-                <label for="email" class="form-label">Email address</label>
-                <input
+            />
+        </div>
+        <div class="mb-3">
+            <label for="email" class="form-label">Email address</label>
+            <input
                     type="email"
                     bind:value={email}
                     class="form-control"
                     id="email"
-                    disabled={userCount !== 0}
-                />
-            </div>
-            <div class="mb-3">
-                <label for="password" class="form-label">Password</label>
-                <input
-                    type="password"
-                    bind:value={password}
-                    class="form-control"
-                    id="password"
-                />
-            </div>
-            <div class="mb-3 form-check">
-                <input
-                    type="checkbox"
-                    class="form-check-input"
-                    id="terms"
-                    required
-                />
-                <label class="form-check-label" for="terms"
-                >I Agree to the <a
-                    href="https://www.radical-elements.com/terms-of-service"
-                    target="_blank">terms and conditions</a
-                ></label
-                >
-            </div>
+            />
+        </div>
+
+
+        <div class="text-center mt-5 d-block">
+            <SpinnerButton label="Register"/>
+        </div>
+    </form>
 
-            <div class="text-center mt-5 d-block">
-                <SpinnerButton label="Register"/>
-            </div>
-        </form>
-    {:else}
-        <p class="text-center mb-0">Registrations are currently closed</p>
-    {/if}
 </div>
diff --git a/front/js/svelte/content/ActionsOnSelected.svelte b/front/js/svelte/content/ActionsOnSelected.svelte
index 083f7a3..2107050 100644
--- a/front/js/svelte/content/ActionsOnSelected.svelte
+++ b/front/js/svelte/content/ActionsOnSelected.svelte
@@ -50,7 +50,7 @@
             class="btn btn-sm btn-outline-primary">Make Draft
         </button
         >
-        {#if filter["_sys.status_in"] === "trashed"}
+        {#if filter["status_in"] === "trashed"}
             <button
                 on:click|preventDefault={(e) => changeStatus(e, "published")}
                 type="button"
diff --git a/front/js/svelte/content/RecordRow.svelte b/front/js/svelte/content/RecordRow.svelte
index f837e18..4caef73 100644
--- a/front/js/svelte/content/RecordRow.svelte
+++ b/front/js/svelte/content/RecordRow.svelte
@@ -22,12 +22,12 @@
         <RenderField {record} {schema} {graph} {field}/>
     </td>
 {/each}
-{#if schema.visible.includes("_sys.status")}
+{#if schema.visible.includes("status")}
     <td
         class="text-center"
-        class:is-sort={"-_sys.status" == sort || "_sys.status" == sort}
+        class:is-sort={"-status" == sort || "status" == sort}
     >
-        <Status status={record._sys.status}/>
+        <Status status={record.status}/>
     </td>
 {/if}
 {#if schema.visible.includes("_sys.createdBy")}
diff --git a/front/js/svelte/content/tools/Tools.svelte b/front/js/svelte/content/tools/Tools.svelte
index 90d415e..de2adf4 100644
--- a/front/js/svelte/content/tools/Tools.svelte
+++ b/front/js/svelte/content/tools/Tools.svelte
@@ -102,7 +102,7 @@
                     <li>
                         <a
                             class="dropdown-item"
-                            href="{channel.lucentUrl}/content/{schema.name}?filter[_sys.status_in]=trashed"
+                            href="{channel.lucentUrl}/content/{schema.name}?filter[status_in]=trashed"
                         >View trashed records</a
                         >
                     </li>
diff --git a/front/js/svelte/edges/sortEdges.js b/front/js/svelte/edges/sortEdges.js
index 472fe4d..33e444b 100644
--- a/front/js/svelte/edges/sortEdges.js
+++ b/front/js/svelte/edges/sortEdges.js
@@ -1,5 +1,6 @@
 export function sortByField(from, to, edges, fieldName) {
-
+    console.log(from)
+    console.log(to)
     if (from === to) {
         return edges;
     }
diff --git a/front/js/svelte/files/Preview.svelte b/front/js/svelte/files/Preview.svelte
index d51a17a..ecaa9e1 100644
--- a/front/js/svelte/files/Preview.svelte
+++ b/front/js/svelte/files/Preview.svelte
@@ -1,7 +1,8 @@
 <script>
     import Icon from "../common/Icon.svelte";
-    import { imgurl } from "../files/imageserver";
-    import { getContext } from "svelte";
+    import {imgurl} from "../files/imageserver";
+    import {getContext} from "svelte";
+
     export let record;
     const channel = getContext("channel");
     export let size = "small";
@@ -32,37 +33,36 @@
     {#if record._file.mime.startsWith("image")}
         <!-- href={imgurl(record)} -->
         <a
-            href="{channel.lucentUrl}/records/{record.id}"
-            title={record._file.path}
-            class="d-flex  align-items-center justify-content-center "
-            style="width:{imageSide}px;height:{imageSide}px"
+                href="{channel.lucentUrl}/records/{record.id}"
+                title={record._file.path}
+                class="d-flex  align-items-center justify-content-center "
+                style="width:{imageSide}px;height:{imageSide}px"
         >
             <img
-                class="rounded w-100"
-                src={imgurl(record, imageSide, imageSide, "crop")}
-                alt={record._file.path}
+                    class="rounded w-100"
+                    src={imgurl(record, imageSide, imageSide, "crop")}
+                    alt={record._file.path}
             />
         </a>
     {:else}
-        <!-- href="{channelurl}/files/download?schema={record._sys.schema}&path={record._file.path}" -->
         <a
-            href="{channel.lucentUrl}/records/{record.id}"
-            title={record._file.path}
-            class="btn btn-outline-primary btn-sm d-flex align-items-center justify-content-center"
-            style="width:{imageSide}px;height:{imageSide}px"
+                href="{channel.lucentUrl}/records/{record.id}"
+                title={record._file.path}
+                class="btn btn-outline-primary btn-sm d-flex align-items-center justify-content-center"
+                style="width:{imageSide}px;height:{imageSide}px"
         >
-            <Icon icon="file" width={fileSide} height={fileSide} />
+            <Icon icon="file" width={fileSide} height={fileSide}/>
             <span class="ms-2" style="font-size:{fontSize}px"
-                >.{record._file.path.split(".").pop()}</span
+            >.{record._file.path.split(".").pop()}</span
             >
         </a>
     {/if}
 {/if}
 {#if showFilename}
     <a
-        href="{channel.lucentUrl}/records/{record.id}"
-        title={record._file.path}
-        class="preview-file-filename lx-small-text text-decoration-none"
-        >{record._file.path}</a
+            href="{channel.lucentUrl}/records/{record.id}"
+            title={record._file.path}
+            class="preview-file-filename lx-small-text text-decoration-none"
+    >{record._file.path}</a
     >
 {/if}
diff --git a/front/js/svelte/home/RecordRow.svelte b/front/js/svelte/home/RecordRow.svelte
index 0b644de..63bd695 100644
--- a/front/js/svelte/home/RecordRow.svelte
+++ b/front/js/svelte/home/RecordRow.svelte
@@ -11,7 +11,7 @@
     export let users;
     export let graph;
     export let record;
-    let schema = channel.schemas.find((s) => s.name === record._sys.schema);
+    let schema = channel.schemas.find((s) => s.name === record.schema);
     let frieldlyUpdatedAt = formatDistanceToNow(
         parseJSON(record._sys.updatedAt),
         {addSuffix: true}
@@ -38,7 +38,7 @@
 </td>
 
 <td class="text-center">
-    <Status status={record._sys.status}/>
+    <Status status={record.status}/>
 </td>
 <td>
     <div class="d-flex">
diff --git a/front/js/svelte/records/ContentTabs.svelte b/front/js/svelte/records/ContentTabs.svelte
index d7d5177..eca8a44 100644
--- a/front/js/svelte/records/ContentTabs.svelte
+++ b/front/js/svelte/records/ContentTabs.svelte
@@ -4,12 +4,14 @@
     export let record;
     export let schema;
     export let isCreateMode;
-    export let active = "_default";
+    export let active = "";
 
-    let tabs = schema.fields.filter((f) => f.ui === "tab");
+    let tabs = schema.groups?.map((group) => {
+        return {label: group, name: group}
+    }) ?? [];
     let mainTab = {
         label: "Main",
-        name: "_default",
+        name: "",
     };
     let graphTab = {
         label: "Graph",
@@ -41,10 +43,10 @@
         {#each tabs as tab}
             <li class="nav-item">
                 <button
-                    on:click={(e) => changeTab(e, tab.name)}
-                    class="nav-link"
-                    class:active={active === tab.name}
-                    aria-current="page"
+                        on:click={(e) => changeTab(e, tab.name)}
+                        class="nav-link"
+                        class:active={active === tab.name}
+                        aria-current="page"
                 >
                     {tab.label}
                 </button>
diff --git a/front/js/svelte/records/Edit.svelte b/front/js/svelte/records/Edit.svelte
index 5288941..be94d4e 100644
--- a/front/js/svelte/records/Edit.svelte
+++ b/front/js/svelte/records/Edit.svelte
@@ -24,7 +24,7 @@
     export let isCreateMode;
     export let users;
     let originalContent;
-    let activeContentTab = "_default";
+    let activeContentTab = "";
     let recordGraph = null;
     $: hasUnsavedData = false;
     $: validationErrors = null;
@@ -38,16 +38,6 @@
         (f) => f.name !== "id"
     );
 
-    let tabname = "_default";
-    let fieldToTabs = schema.fields.reduce((c, f) => {
-        if (f.ui === "tab") {
-            tabname = f.name;
-            return c;
-        }
-
-        c[tabname] = [...(c[tabname] ?? []), f.name];
-        return c;
-    }, []);
 
     onMount(() => {
         setOriginalContent();
@@ -56,6 +46,8 @@
     function setOriginalContent() {
         originalContent = {
             data: JSON.parse(JSON.stringify(record.data)),
+            schema: record.schema,
+            status: record.status,
             _sys: JSON.parse(JSON.stringify(record._sys)),
             _file: JSON.parse(JSON.stringify(record._file)),
             edges: JSON.parse(JSON.stringify(graph.edges)),
@@ -88,6 +80,8 @@
         }
         return !isEqual(originalContent, {
             data: record.data,
+            schema: record.schema,
+            status: record.status,
             _sys: record._sys,
             _file: record._file,
             edges: graph.edges,
@@ -165,34 +159,34 @@
 
     {#if !["_graph", "_info"].includes(activeContentTab)}
         <div
-            style="position:fixed;bottom:0;left:0px;width:100%;background:rgba(255,255,255,.7);z-index:10"
+                style="position:fixed;bottom:0;left:0px;width:100%;background:rgba(255,255,255,.7);z-index:10"
         >
             <div
-                class="d-flex mt-4 mb-3 align-items-center justify-content-center"
+                    class="d-flex mt-4 mb-3 align-items-center justify-content-center"
             >
-                <StatusSelect bind:status={record._sys.status} {schema}/>
+                <StatusSelect bind:status={record.status} {schema}/>
                 {#if isCreateMode}
                     <button
-                        class="ms-2 btn btn-primary btn-spinner"
-                        on:click={save}
+                            class="ms-2 btn btn-primary btn-spinner"
+                            on:click={save}
                     >
                             <span
-                                class="spinner-border spinner-border-sm"
-                                role="status"
-                                aria-hidden="true"
+                                    class="spinner-border spinner-border-sm"
+                                    role="status"
+                                    aria-hidden="true"
                             />
                         Create
                     </button>
                 {:else if hasUnsavedData}
                     <button
-                        type="button"
-                        class="ms-2 btn btn-primary btn-spinner"
-                        on:click={save}
+                            type="button"
+                            class="ms-2 btn btn-primary btn-spinner"
+                            on:click={save}
                     >
                             <span
-                                class="spinner-border spinner-border-sm"
-                                role="status"
-                                aria-hidden="true"
+                                    class="spinner-border spinner-border-sm"
+                                    role="status"
+                                    aria-hidden="true"
                             />
                         Save
                     </button>
@@ -205,25 +199,25 @@
 
     <div class=" mt-4" style="margin-bottom:150px">
         <ContentTabs
-            {schema}
-            {isCreateMode}
-            bind:active={activeContentTab}
-            {record}
-            bind:recordGraph
+                {schema}
+                {isCreateMode}
+                bind:active={activeContentTab}
+                {record}
+                bind:recordGraph
         />
         {#if !["_graph", "_info"].includes(activeContentTab)}
             <FilePreview {record} {schema}/>
             <!-- <fieldset disabled="disabled"> -->
             {#each activeFields as field (field.name)}
-                {#if fieldToTabs[activeContentTab].includes(field.name)}
+                {#if activeContentTab === field.group}
                     <FormField
-                        bind:data={record.data}
-                        bind:graph={graph}
-                        {field}
-                        {schema}
-                        {record}
-                        {validationErrors}
-                        {isCreateMode}
+                            bind:data={record.data}
+                            bind:graph={graph}
+                            {field}
+                            {schema}
+                            {record}
+                            {validationErrors}
+                            {isCreateMode}
                     />
                 {/if}
             {/each}
diff --git a/front/js/svelte/records/Graph.svelte b/front/js/svelte/records/Graph.svelte
index 1df9063..445a15f 100644
--- a/front/js/svelte/records/Graph.svelte
+++ b/front/js/svelte/records/Graph.svelte
@@ -42,7 +42,7 @@
             if (!carry[schemaField]) {
                 carry[schemaField] = {
                     field: channel.schemas
-                        .find((s) => s.name === record._sys.schema)
+                        .find((s) => s.name === record.schema)
                         .fields.find((f) => f.name === edge.field),
                     nodes: [],
                 };
diff --git a/front/js/svelte/records/Info.svelte b/front/js/svelte/records/Info.svelte
index e59f4e5..e330e3b 100644
--- a/front/js/svelte/records/Info.svelte
+++ b/front/js/svelte/records/Info.svelte
@@ -120,7 +120,7 @@
                         selectedRevision?._sys.version}
                 >
                     <div class="col-2">
-                        <Status status={revision._sys.status}/>
+                        <Status status={revision.status}/>
                     </div>
                     <div class="col-2">version {revision._sys.version}</div>
                     <div class="col-5">
diff --git a/front/js/svelte/records/InlineEdit.svelte b/front/js/svelte/records/InlineEdit.svelte
index 0caaacd..4e631a9 100644
--- a/front/js/svelte/records/InlineEdit.svelte
+++ b/front/js/svelte/records/InlineEdit.svelte
@@ -49,6 +49,8 @@
     function setOriginalContent() {
         originalContent = {
             data: JSON.parse(JSON.stringify(record.data)),
+            schema: record.schema,
+            status: record.status,
             _sys: JSON.parse(JSON.stringify(record._sys)),
             _file: JSON.parse(JSON.stringify(record._file)),
             edges: JSON.parse(JSON.stringify(graph.edges)),
@@ -81,6 +83,8 @@
         }
         return !isEqual(originalContent, {
             data: record.data,
+            schema: record.schema,
+            status: record.status,
             _sys: record._sys,
             _file: record._file,
             edges: graph.edges,
@@ -181,7 +185,7 @@
     <div>
         <div class="d-flex  mt-3 align-items-center justify-content-center">
             {#if schema.hasDrafts}
-                <StatusSelect bind:status={record._sys.status} {schema}/>
+                <StatusSelect bind:status={record.status} {schema}/>
             {/if}
             {#if isCreateMode}
                 <button
diff --git a/front/js/svelte/records/Preview.js b/front/js/svelte/records/Preview.js
index ca06d01..9ae5bef 100644
--- a/front/js/svelte/records/Preview.js
+++ b/front/js/svelte/records/Preview.js
@@ -2,7 +2,7 @@ import Mustache from "mustache";
 import {stripHtml} from "../../helpers";
 
 export function previewTitle(schemas, record, graph) {
-    let schema = schemas.find((aschema) => aschema.name === record?._sys.schema);
+    let schema = schemas.find((aschema) => aschema.name === record?.schema);
 
     if (!schema?.titleTemplate) {
         return noTemplate(schema, record);
diff --git a/front/js/svelte/records/PreviewCard.svelte b/front/js/svelte/records/PreviewCard.svelte
index a8cf679..ced4f73 100644
--- a/front/js/svelte/records/PreviewCard.svelte
+++ b/front/js/svelte/records/PreviewCard.svelte
@@ -12,7 +12,7 @@
     export let classes = "";
     export let hasDelete = false;
 
-    let schema = channel.schemas.find((aschema) => aschema.name === record._sys.schema);
+    let schema = channel.schemas.find((aschema) => aschema.name === record.schema);
     let cardTitle = previewTitle(channel.schemas, record, graph);
     function remove(e) {
         e.preventDefault();
@@ -44,8 +44,8 @@
                 {schema.label}
             </small>
             <small class="text-muted">
-                {#if record._sys.status === "draft"}
-                    <Status status={record._sys.status} />
+                {#if record.status === "draft"}
+                    <Status status={record.status} />
                 {/if}
             </small>
         </div>
diff --git a/front/js/svelte/records/PreviewCardInline.svelte b/front/js/svelte/records/PreviewCardInline.svelte
index 9d8e194..9f15842 100644
--- a/front/js/svelte/records/PreviewCardInline.svelte
+++ b/front/js/svelte/records/PreviewCardInline.svelte
@@ -15,7 +15,7 @@
     export let schemas;
     export let record;
     let editRecord;
-    let schema = schemas.find((aschema) => aschema.name === record._sys.schema);
+    let schema = schemas.find((aschema) => aschema.name === record.schema);
     $: editMode = false;
     $: expanded = false;
 
diff --git a/front/js/svelte/records/PreviewCardSmall.svelte b/front/js/svelte/records/PreviewCardSmall.svelte
index 23fb632..c346b3a 100644
--- a/front/js/svelte/records/PreviewCardSmall.svelte
+++ b/front/js/svelte/records/PreviewCardSmall.svelte
@@ -5,7 +5,7 @@
     const channel = getContext("channel");
     export let record;
     export let graph;
-    $: schema = channel.schemas.find((aschema) => aschema.name === record._sys.schema);
+    $: schema = channel.schemas.find((aschema) => aschema.name === record.schema);
 
     $: title = previewTitle(channel.schemas, record, graph);
 </script>
diff --git a/front/js/svelte/records/StatusSelect.svelte b/front/js/svelte/records/StatusSelect.svelte
index 3a74409..d3a1c43 100644
--- a/front/js/svelte/records/StatusSelect.svelte
+++ b/front/js/svelte/records/StatusSelect.svelte
@@ -2,7 +2,7 @@
     import Status from "./Status.svelte";
     import {getStatus, getStatusList} from "./StatusText";
 
-    export let status;
+    export let status = "draft";
     export let schema;
     let dropdown;
     $: currentStatus = getStatus(status);
diff --git a/front/js/svelte/records/block/elements/Reference.svelte b/front/js/svelte/records/block/elements/Reference.svelte
index e3692d5..ea959be 100644
--- a/front/js/svelte/records/block/elements/Reference.svelte
+++ b/front/js/svelte/records/block/elements/Reference.svelte
@@ -40,7 +40,7 @@
         const action = e.detail.action;
         let newEdges = recordsToInsert.map((r) => {
             return {
-                schema: r._sys.schema,
+                schema: r.schema,
                 target: r.data.id,
                 source: record.data.id,
                 field: field.name,
diff --git a/front/js/svelte/records/elements/File.svelte b/front/js/svelte/records/elements/File.svelte
index f2c8241..c275f99 100644
--- a/front/js/svelte/records/elements/File.svelte
+++ b/front/js/svelte/records/elements/File.svelte
@@ -36,7 +36,8 @@
     }
 
     async function reorder(e) {
-        graph.edges = await sortByField(e.detail.from, e.detail.to, graph.edges, field.name);
+        console.log(e.detail)
+        graph.edges = await sortByField(e.detail.source, e.detail.target, graph.edges, field.name);
     }
 
     function insert(e) {
@@ -48,8 +49,8 @@
             return {
                 target: r.id,
                 source: record.id,
-                sourceSchema: record._sys.schema,
-                targetSchema: r._sys.schema,
+                sourceSchema: record.schema,
+                targetSchema: r.schema,
                 field: field.name,
                 rank: ""
             };
diff --git a/front/js/svelte/records/elements/Reference.svelte b/front/js/svelte/records/elements/Reference.svelte
index 84ec64d..d869736 100644
--- a/front/js/svelte/records/elements/Reference.svelte
+++ b/front/js/svelte/records/elements/Reference.svelte
@@ -43,8 +43,8 @@
             return {
                 target: r.id,
                 source: record.id,
-                sourceSchema: record._sys.schema,
-                targetSchema: r._sys.schema,
+                sourceSchema: record.schema,
+                targetSchema: r.schema,
                 field: field.name,
                 rank: ""
             };
diff --git a/front/js/svelte/records/elements/ReferenceInline.svelte b/front/js/svelte/records/elements/ReferenceInline.svelte
index 37e6bb4..f8d9c3c 100644
--- a/front/js/svelte/records/elements/ReferenceInline.svelte
+++ b/front/js/svelte/records/elements/ReferenceInline.svelte
@@ -74,8 +74,8 @@
             return {
                 target: r.id,
                 source: record.id,
-                sourceSchema: record._sys.schema,
-                targetSchema: r._sys.schema,
+                sourceSchema: record.schema,
+                targetSchema: r.schema,
                 field: field.name,
                 rank: ""
             };
diff --git a/front/js/svelte/records/elements/ReferenceTable.svelte b/front/js/svelte/records/elements/ReferenceTable.svelte
index 095d467..a31247b 100644
--- a/front/js/svelte/records/elements/ReferenceTable.svelte
+++ b/front/js/svelte/records/elements/ReferenceTable.svelte
@@ -54,8 +54,8 @@
             return {
                 target: r.id,
                 source: record.id,
-                sourceSchema: record._sys.schema,
-                targetSchema: r._sys.schema,
+                sourceSchema: record.schema,
+                targetSchema: r.schema,
                 field: field.name,
                 rank: ""
             };
diff --git a/src/AccessKey/AccessKey.php b/src/AccessKey/AccessKey.php
deleted file mode 100644
index 53056a5..0000000
--- a/src/AccessKey/AccessKey.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Lucent\AccessKey;
-
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Validator;
-use Lucent\LucentException;
-use Lucent\Member\Role;
-
-class AccessKey
-{
-
-    public function __construct(
-        public readonly string $_id,
-        public readonly string $name,
-        public readonly Role $role,
-        public readonly string $token,
-        private readonly ?string $showOnceToken = null,
-    ) {
-        $validator = Validator::make($this->toArray(), [
-            'name' => 'min:3,max:120',
-        ]);
-
-        if ($validator->fails()) {
-            throw new LucentException($validator->errors()->first());
-        }
-    }
-
-   
-    public static function fromArray(array $data): AccessKey
-    {
-
-        return new AccessKey(
-            _id: data_get($data, "_id"),
-            name: data_get($data, "name"),
-            role: Role::from(data_get($data, "role")),
-            token: data_get($data, "token"),
-        );
-    }
-
-    public function getShowOnceToken(): ?string
-    {
-        return $this->showOnceToken;
-    }
-
-    public function isValid(string $token): bool
-    {
-        return Hash::check($token, $this->token);
-    }
-
-    public function toArray(): array
-    {
-        return \json_decode(\json_encode($this), true);
-    }
-}
diff --git a/src/AccessKey/AccessKeyRepo.php b/src/AccessKey/AccessKeyRepo.php
deleted file mode 100644
index ab14642..0000000
--- a/src/AccessKey/AccessKeyRepo.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Lucent\AccessKey;
-
-use Carbon\Carbon;
-use Lucent\Channel\ChannelContext;
-use Lucent\DB\Monger;
-
-class AccessKeyRepo
-{
-
-    public static function findByToken(string $token): ?AccessKey
-    {
-        $channel = ChannelContext::get()->channel;
-        return $channel->accessKeys->firstWhere("token",$token);
-    }
-
-    public static function add(AccessKey $accessKey): void
-    {
-        $channel = ChannelContext::get()->channel;
-        Monger::central()->updateOne("channels", ["_id" => $channel->_id], [
-            '$push' => [
-                "accessKeys" => $accessKey->toArray()
-            ],
-            '$set' => [
-                "updatedAt" => Carbon::now()->toJson(),
-            ]
-        ]);
-    }
-
-    public static function remove(string $id): void
-    {
-        $channel = ChannelContext::get()->channel;
-        Monger::central()->updateOne("channels", ["_id" => $channel->_id], [
-            '$pull' => [
-                "accessKeys" => ["_id" => $id]
-            ],
-            '$set' => [
-                "updatedAt" => Carbon::now()->toJson(),
-            ]
-        ]);
-    }
-}
diff --git a/src/AccessKey/AccessKeyService.php b/src/AccessKey/AccessKeyService.php
deleted file mode 100644
index 2ac1c8b..0000000
--- a/src/AccessKey/AccessKeyService.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Lucent\AccessKey;
-
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Str;
-use Lucent\Id\Id;
-use Lucent\LucentException;
-use Lucent\Member\Role;
-
-class AccessKeyService
-{
-
-    public static function create(string $name, string $role): AccessKey
-    {
-        $showOnceToken = Str::random(48);
-        $accessKey =  new AccessKey(
-            _id: Id::new(),
-            name: $name,
-            token: hash("sha256", $showOnceToken),
-            role: Role::from($role),
-            showOnceToken: $showOnceToken,
-        );
-
-        AccessKeyRepo::add($accessKey);
-        return $accessKey;
-    }
-
-    public static function findByToken(string $token): ?AccessKey
-    {
-        $hashedToken = hash("sha256", $token);
-        return AccessKeyRepo::findByToken($hashedToken);
-    }
-
-    public static function remove(string $id): void
-    {
-
-        AccessKeyRepo::remove($id);
-    }
-}
diff --git a/src/AccessKey/AccessKeysCollection.php b/src/AccessKey/AccessKeysCollection.php
deleted file mode 100644
index bd4d83c..0000000
--- a/src/AccessKey/AccessKeysCollection.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Lucent\AccessKey;
-
-use Illuminate\Support\Collection;
-
-/**
- * @extends \Illuminate\Support\Collection<int|string, AccessKey>
- */
-final class AccessKeysCollection extends Collection
-{
-
-    public function __construct(
-        AccessKey ...$array
-    ) {
-        parent::__construct($array);
-    }
-
-    /**
-     * @return AccessKey[]
-     **/
-    public function toArray(): array
-    {
-        return collect($this)->values()->toArray();
-    }
-
-    
-    public function toDB(): array
-    {
-        return \json_decode(\json_encode($this), true);
-    }
-
-
-    public static function fromArray(array $data): AccessKeysCollection
-    {
-        $item = array_map([AccessKey::class, 'fromArray'], $data);
-        return new AccessKeysCollection(...$item);
-    }
-
-  
-}
diff --git a/src/AccessKey/ApiMiddleware.php b/src/AccessKey/ApiMiddleware.php
deleted file mode 100644
index 5aeb37e..0000000
--- a/src/AccessKey/ApiMiddleware.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Lucent\AccessKey;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Lucent\Account\Role;
-
-class ApiMiddleware
-{
-
-    public function handle(Request $request, Closure $next, string $accessLevel): Response
-    {
-
-        $bearerToken = $request->header('Authorization');
-        $token = str_replace('Bearer ', '', $bearerToken);
-
-        $role = match ($token) {
-            config("lucent.read_key") => Role::READER,
-            config("lucent.write_key") => Role::EDITOR,
-            config("lucent.developer_key") => Role::DEVELOPER,
-            default => ""
-        };
-
-        if (empty($role)) {
-            abort(401);
-        }
-
-
-        if (!$role->hasAccess($accessLevel)) {
-            abort(401);
-        }
-
-        $request->mergeIfMissing(['userId' => "system"]);
-        $request->mergeIfMissing(['userRole' => $role->value]);
-
-        return $next($request);
-    }
-}
diff --git a/src/Account/AccountService.php b/src/Account/AccountService.php
index 0ac477a..1d98925 100644
--- a/src/Account/AccountService.php
+++ b/src/Account/AccountService.php
@@ -23,6 +23,12 @@ readonly class AccountService
     }
 
 
+    public function countUsers(): int
+    {
+        return $this->userRepo->count();
+    }
+
+
     /**
      * @return Collection<UserProfile>
      */
diff --git a/src/Account/AuthService.php b/src/Account/AuthService.php
index 475ace2..38c4d05 100644
--- a/src/Account/AuthService.php
+++ b/src/Account/AuthService.php
@@ -154,5 +154,18 @@ readonly class AuthService
         return $user;
     }
 
+    /**
+     * @throws LucentException
+     */
+    public function registerAdmin(
+        string $name,
+        string $email
+    ): User
+    {
+        $user = $this->invite($name, $email, "admin");
+        $this->sendLoginEmail($user->email);
+        return $user;
+    }
+
 
 }
diff --git a/src/Channel/ChannelService.php b/src/Channel/ChannelService.php
index 6353711..68d1d6f 100644
--- a/src/Channel/ChannelService.php
+++ b/src/Channel/ChannelService.php
@@ -21,15 +21,21 @@ final class ChannelService
 
     public static function fromConfig(): ChannelService
     {
-        $configJson = file_get_contents(storage_path("lucent.config.json"));
-        $configArray = json_decode($configJson, true);
+        if(file_exists(storage_path("lucent.config.json"))){
+            $configJson = file_get_contents(storage_path("lucent.config.json"));
+            $configArray = json_decode($configJson, true);
+        }else{
+            $configArray  = null;
+        }
+
+
         $schemaService = new SchemaService();
-        $schemasCollection = (new Collection($configArray["schemas"]))->map([$schemaService, 'fromArray']);
+        $schemasCollection = (new Collection($configArray["schemas"] ?? []))->map([$schemaService, 'fromArray']);
 
 
         $channel = new Channel(
-            name: $configArray["name"],
-            url: rtrim($configArray["url"], "/"),
+            name: $configArray["name"] ?? "",
+            url: rtrim($configArray["url"] ?? "", "/"),
             schemas: $schemasCollection,
             imageFilters: $configArray["imageFilters"] ?? [],
         );
diff --git a/src/Commands/CompileConfig.php b/src/Commands/CompileConfig.php
index e3414b9..4b813fe 100644
--- a/src/Commands/CompileConfig.php
+++ b/src/Commands/CompileConfig.php
@@ -8,7 +8,7 @@ use Illuminate\Console\Command;
 class CompileConfig extends Command
 {
 
-    protected $signature = 'lucent:compile:config {path}';
+    protected $signature = 'lucent:config';
 
     protected $description = 'Compiles Config';
 
@@ -21,18 +21,18 @@ class CompileConfig extends Command
 
     public function handle()
     {
-        $configDir = base_path($this->argument('path'));
+        $configDir = base_path(config('lucent.config_path'));
 
-        $configJson = file_get_contents($configDir . "lucent.json");
+        $configJson = file_get_contents($configDir . "/lucent.json");
         $config = json_decode($configJson, true);
-        $schemasDirIterator = new DirectoryIterator($configDir . "Schemas");
+        $schemasDirIterator = new DirectoryIterator($configDir . "/Schemas");
         $schemas = [];
         foreach ($schemasDirIterator as $file) {
             if ($file->getExtension() !== "json") {
                 continue;
             }
 
-            $schemaJson = file_get_contents($configDir . "Schemas/" . $file->getFilename());
+            $schemaJson = file_get_contents($configDir . "/Schemas/" . $file->getFilename());
             $schema = json_decode($schemaJson, true);
             if (empty($schema)) {
                 $this->error("Invalid JSON " . $file->getFilename());
diff --git a/src/Commands/RebuildThumbnails.php b/src/Commands/RebuildThumbnails.php
index beb80c1..b18d3b2 100644
--- a/src/Commands/RebuildThumbnails.php
+++ b/src/Commands/RebuildThumbnails.php
@@ -39,7 +39,11 @@ class RebuildThumbnails extends Command
         $filesDir = storage_path("app/public/" . $schema->path . "/");
         $thumbDir = storage_path("app/public/thumbs/" . $schema->path . "/");
         if (!file_exists($thumbDir)) {
-            mkdir($thumbDir);
+            make_dir_r($thumbDir);
+        }
+
+        if (!file_exists($filesDir)) {
+            make_dir_r($filesDir);
         }
 
         $filesDirIterator = new DirectoryIterator($filesDir);
diff --git a/src/Config/main.php b/src/Config/main.php
index 4141f8b..ac6c2e5 100644
--- a/src/Config/main.php
+++ b/src/Config/main.php
@@ -1,11 +1,6 @@
 <?php
 
 return [
-    "view" => [
-        "image_server" => env("LUCENT_IMAGE_SERVER")
-    ],
-    "read_key" => env("LUCENT_READ_KEY"),
-    "write_key" => env("LUCENT_WRITE_KEY"),
-    "developer_key" => env("LUCENT_DEVELOPER_KEY")
+    "config_path" => env("LUCENT_CONFIG_PATH",  "app/Lucent")
 
 ];
diff --git a/src/Database/migrations/2014_10_12_000000_create_users_table.php b/src/Database/migrations/2014_10_12_000000_create_users_table.php
new file mode 100644
index 0000000..64fa600
--- /dev/null
+++ b/src/Database/migrations/2014_10_12_000000_create_users_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('users', function (Blueprint $table) {
+            $table->uuid("id")->primary();
+            $table->string('name')->nullable();
+            $table->string('email')->unique();
+            $table->string('role');
+            $table->string('createdAt');
+            $table->string('updatedAt');
+            $table->string('loggedInAt');
+            $table->string('mailToken')->nullable();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('users');
+    }
+};
diff --git a/src/Database/migrations/2022_11_16_192907_create_sessions_table.php b/src/Database/migrations/2022_11_16_192907_create_sessions_table.php
new file mode 100644
index 0000000..06c3e45
--- /dev/null
+++ b/src/Database/migrations/2022_11_16_192907_create_sessions_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('sessions', function (Blueprint $table) {
+            $table->string('id')->primary();
+            $table->foreignId('user_id')->nullable()->index();
+            $table->string('ip_address', 45)->nullable();
+            $table->text('user_agent')->nullable();
+            $table->longText('payload');
+            $table->integer('last_activity')->index();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('sessions');
+    }
+};
diff --git a/src/Database/migrations/2023_01_20_162322_records.php b/src/Database/migrations/2023_01_20_162322_records.php
new file mode 100644
index 0000000..8c6e7b1
--- /dev/null
+++ b/src/Database/migrations/2023_01_20_162322_records.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('records', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->string('schema');
+            $table->string('status');
+            $table->json('data');
+            $table->json('_sys');
+            $table->json('_file');
+
+            $table->index(['schema', 'status']);
+        });
+
+        Schema::create('edges', function (Blueprint $table) {
+            $table->uuid('source');
+            $table->uuid('target');
+            $table->string('sourceSchema');
+            $table->string('targetSchema');
+            $table->string('field');
+            $table->string('rank');
+
+            $table->unique(['source', 'target', "field"]);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('records');
+        Schema::dropIfExists('edges');
+    }
+};
diff --git a/src/Database/migrations/2023_03_02_152122_revisions.php b/src/Database/migrations/2023_03_02_152122_revisions.php
new file mode 100644
index 0000000..f78259d
--- /dev/null
+++ b/src/Database/migrations/2023_03_02_152122_revisions.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('revisions', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->uuid('recordId');
+            $table->string('schema');
+            $table->json('data');
+            $table->json('_sys');
+            $table->json('_file');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('revisions');
+    }
+};
diff --git a/src/Field/Field.php b/src/Field/Field.php
deleted file mode 100644
index fa5d41d..0000000
--- a/src/Field/Field.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace Lucent\Field;
-
-
-
-use Lucent\LucentException;
-
-class Field
-{
-    /**
-     * @param string[] $collections
-     */
-    function __construct(
-        public FieldName $name,
-        public string $label,
-        public string $ui,
-        public string $help = "",
-        public bool $trashed = false,
-        public bool $locked = false,
-        public string $regex =  "",
-        public string $mime = "",
-        public bool $readonly = false,
-        public bool $nullable = false,
-        public bool $required = false,
-        public int $decimals = 0,
-        public array $collections = [],
-        public mixed $min = null,
-        public mixed $max  = null,
-        public mixed $default  = null,
-        public string $optionsFrom  = "",
-        public string $optionsField  = "",
-        public bool $optionsSuggest  = true,
-        public bool $unique = false, // not used
-        public string $layout = "",
-    ) {
-    }
-
-    public function toArray(): array
-    {
-        return \json_decode(\json_encode($this), true);
-    }
-
-    /**
-     * @throws LucentException
-     */
-    public static function fromArray(array $data): Field
-    {
-        return new Field(
-            name: new FieldName($data["name"]),
-            label:$data["label"],
-            ui: $data["ui"],
-            help:$data["help"] ?? "",
-            trashed:$data["trashed"] ?? false,
-            locked:$data["locked"] ?? false,
-            regex:$data["regex"] ?? "" ,
-            mime:$data["mime"] ?? "" ,
-            readonly:$data["readonly"] ?? false,
-            nullable:$data["nullable"] ?? false,
-            required:$data["required"] ??false,
-            decimals:$data["decimals"] ?? 0,
-            collections:$data["collections"] ?? [],
-            min:$data["min"] ?? null,
-            max:$data["max"] ?? null,
-            default:$data["default"] ?? null,
-            optionsFrom:$data["optionsFrom"] ?? "" ,
-            optionsField:$data["optionsField"] ?? "" ,
-            optionsSuggest:$data["optionsSuggest"] ?? true,
-            unique:$data["unique"] ?? false,
-            layout:$data["layout"] ?? "" ,
-        );
-    }
-}
diff --git a/src/Field/FieldCollection.php b/src/Field/FieldCollection.php
deleted file mode 100644
index 6f6f91a..0000000
--- a/src/Field/FieldCollection.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Lucent\Field;
-
-use Illuminate\Support\Collection;
-
-/**
- * @extends \Illuminate\Support\Collection<int|string, Field>
- */
-final class FieldCollection extends Collection
-{
-
-    public function __construct(
-        Field ...$array
-    ) {
-        parent::__construct($array);
-    }
-
-    /**
-     * @return Schema[]
-     **/
-    public function toArray(): array
-    {
-        return collect($this)->values()->toArray();
-    }
-    
-
-    public function findByName(string $name): ?Field
-    {
-        return $this->firstWhere("name", $name);
-    }
-
-    public static function fromArray(array $data): FieldCollection
-    {
-        $items = array_map([Field::class, 'fromArray'], $data);
-        return new FieldCollection(...$items);
-    }
-
-    public static function fromDB(string $data): FieldCollection
-    {
-        return  FieldCollection::fromArray(\json_decode($data,true));
-    }
-}
diff --git a/src/Field/FieldController.php b/src/Field/FieldController.php
deleted file mode 100644
index 9de2f74..0000000
--- a/src/Field/FieldController.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-namespace Lucent\Field;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Lucent\Channel\ChannelRepo;
-use Lucent\LucentException;
-use Lucent\Schema\Type as SchemaType;
-use function Lucent\Response\fail;
-use function Lucent\Response\ok;
-use function Lucent\Svelte\svelte;
-
-class FieldController extends Controller
-{
-    public function __construct(
-        private readonly FieldService $fieldService
-    )
-    {
-    }
-
-    public function new(Request $request)
-    {
-
-        $channel = ChannelRepo::current();
-        $schemaName = $request->route("schemaName");
-        $collections = collect($channel->schemas)->where("type", SchemaType::COLLECTION)->values()->toArray();
-        $filesSchemas = collect($channel->schemas)->where("type", SchemaType::FILES)->values()->toArray();
-
-        $newField = new Field(
-            name: new FieldName(""),
-            label: "",
-            ui: "text"
-        );
-
-        return svelte(
-            layout: "channel",
-            view: "fieldNew",
-            title: "New field",
-            data: [
-                "schemas" => $channel->schemas,
-                "schema" => $channel->schemas->where("name", $schemaName)->first(),
-                "collections" => $collections,
-                "filesSchemas" => $filesSchemas,
-                "field" => $newField->toArray(),
-                "uiList" => UI::values(),
-            ]
-        );
-    }
-
-    public function create(Request $request)
-    {
-        try {
-            $this->fieldService->create(
-                schemaName: $request->route("schemaName"),
-                data: $request->input("data")
-            );
-
-        } catch (LucentException $th) {
-            return fail($th);
-        }
-        return ok();
-    }
-
-    public function edit(Request $request)
-    {
-        $channel = ChannelRepo::current();
-        $schemaName = $request->route("schemaName");
-        $schema = $channel->schemas->where("name.value", $schemaName)->first();
-        $collections = collect($channel->schemas)->where("type", SchemaType::COLLECTION)->values()->toArray();
-        $filesSchemas = collect($channel->schemas)->where("type", SchemaType::FILES)->values()->toArray();
-        $field = collect($schema->fields)->where("name.value", $request->route("fid"))->first();
-        return svelte(
-            layout: "channel",
-            view: "fieldEdit",
-            title: "Edit field",
-            data: [
-                "schemas" => $channel->schemas,
-                "schema" => $schema,
-                "collections" => $collections,
-                "filesSchemas" => $filesSchemas,
-                "field" => $field,
-                "uiList" => UI::values(),
-            ]
-        );
-    }
-
-    public function replace(Request $request)
-    {
-
-        $schema = $this->fieldService->replace(
-            schemaName: $request->route("schemaName"),
-//            fields:$request->input("fields")
-            fields: json_decode($request->input("fields"), true)
-        );
-        return ok($schema->toArray());
-    }
-
-    public function update(Request $request)
-    {
-        try {
-            $this->fieldService->update(
-                schemaName: $request->route("schemaName"),
-                data: $request->input("data")
-            );
-
-        } catch (LucentException $th) {
-            return fail($th);
-        }
-        return ok();
-    }
-
-    public function move(Request $request)
-    {
-        $newSchema = $this->fieldService->move(
-            schemaName: $request->route("schemaName"),
-            source: $request->input("source"),
-            target: $request->input("target") ?? "",
-        );
-
-        return ok($newSchema->toArray());
-    }
-
-    public function trash(Request $request)
-    {
-
-        try {
-            $newSchema = $this->fieldService->trash(
-                schemaName: $request->route("schemaName"),
-                fieldName: $request->input("field"),
-            );
-
-        } catch (LucentException $th) {
-            return fail($th);
-        }
-
-        return ok($newSchema->toArray());
-    }
-
-    public function restore(Request $request)
-    {
-        try {
-            $newSchema = $this->fieldService->restore(
-                schemaName: $request->route("schemaName"),
-                fieldName: $request->input("field"),
-            );
-
-        } catch (LucentException $th) {
-            return fail($th);
-        }
-        return ok($newSchema->toArray());
-    }
-
-    public function delete(Request $request)
-    {
-        try {
-            $newSchema = $this->fieldService->delete(
-                schemaName: $request->route("schemaName"),
-                fieldName: $request->input("field"),
-            );
-
-        } catch (LucentException $th) {
-            return fail($th);
-        }
-        return ok($newSchema->toArray());
-    }
-}
diff --git a/src/Field/FieldName.php b/src/Field/FieldName.php
deleted file mode 100644
index a8b28bd..0000000
--- a/src/Field/FieldName.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Lucent\Field;
-
-use JsonSerializable;
-use Lucent\LucentException;
-use Lucent\Validator\Validator;
-
-
-class FieldName implements JsonSerializable
-{
-    public string $value;
-
-    /**
-     * @throws LucentException
-     */
-    function __construct(string $value)
-    {
-        Validator::single("Name", $value, "min:2|max:50|alpha_dash");
-        $this->value = $value;
-    }
-
-    public function value(): string
-    {
-        return $this->value;
-    }
-
-    public function equals(FieldName $name): bool
-    {
-        return $this->value === $name->value;
-    }
-
-    public function __toString(): string
-    {
-        return $this->value;
-    }
-
-    public function jsonSerialize(): string
-    {
-        return $this->value;
-    }
-}
diff --git a/src/Field/FieldService.php b/src/Field/FieldService.php
deleted file mode 100644
index 87d9eba..0000000
--- a/src/Field/FieldService.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-
-namespace Lucent\Field;
-
-use Lucent\Channel\ChannelRepo;
-use Lucent\LucentException;
-use Lucent\Primitive\Collection;
-use Lucent\Schema\Schema;
-use Lucent\Schema\SchemaRepo;
-
-readonly class FieldService
-{
-    public function __construct(
-        private SchemaRepo $schemaRepo
-    )
-    {
-    }
-
-    /**
-     * @throws LucentException
-     */
-    public function create(
-        string $schemaName,
-        array  $data
-    ): Schema
-    {
-        if (empty($data["name"]) || empty($data["label"])) {
-            throw new LucentException("Name and Label are required");
-        }
-
-        $channel = ChannelRepo::current();
-        $schema = $channel->schemas->where("name.value", $schemaName)->first();
-        $field = Field::fromArray($data);
-        $this->validateNameUnique($schema, $field->name);
-        $schema->fields->push($field);
-        $this->schemaRepo->update($schema);
-        return $schema;
-
-    }
-
-    /**
-     * @throws LucentException
-     */
-    public function update(
-        string $schemaName,
-        array  $data
-    ): Schema
-    {
-        if (empty($data["name"]) || empty($data["label"])) {
-            throw new LucentException("Name and Label are required");
-        }
-
-        $channel = ChannelRepo::current();
-        $schema = $channel->schemas->where("name", $schemaName)->first();
-        $field = Field::fromArray($data);
-        if ($field->locked) {
-            throw new LucentException("Locked fields can't get updated");
-        }
-        $schema->fields = $schema->fields->map(function (Field $aField) use ($field) {
-            if (!$aField->name->equals($field->name)) {
-                return $aField;
-            }
-            return $field;
-        });
-        $this->schemaRepo->update($schema);
-        return $schema;
-
-
-    }
-
-    public function move(
-        string $schemaName,
-        string $source,
-        string $target,
-    ): Schema
-    {
-
-        $channel = ChannelRepo::current();
-        $schema = $channel->schemas->where("name", $schemaName)->first();
-
-        if ($source === $target) {
-            return $schema;
-        }
-
-        $sourceField = $schema->fields->where("name", $source)->first();
-        $fieldsWithoutSource = $schema->fields
-            ->where("name", "!=", $source)
-            ->values()
-            ->toArray();
-
-        if (empty($target)) {
-            $schema->fields = new Collection([$sourceField, ...$fieldsWithoutSource]);
-        } else {
-            $newFields = collect($fieldsWithoutSource)->reduce(function ($carry, $afield) use ($sourceField, $target) {
-                $carry[] = $afield;
-                if ($afield->name->value === $target) {
-                    $carry[] = $sourceField;
-                }
-                return $carry;
-            }, []);
-            $schema->fields = new Collection($newFields);
-        }
-
-        $this->schemaRepo->update($schema);
-        return $schema;
-    }
-
-    /**
-     * @throws LucentException
-     */
-    public function trash(
-        string $schemaName,
-        string $fieldName,
-    ): Schema
-    {
-
-        $channel = ChannelRepo::current();
-        $schema = $channel->schemas->where("name.value", $schemaName)->first();
-        $field = $schema->fields->where("name", $fieldName)->first();
-        if ($field->trashed) {
-            throw new LucentException("Field is already in trash");
-        }
-        if ($field->locked) {
-            throw new LucentException("Locked fields can't get trashed");
-        }
-
-        $schema->fields = $schema->fields->map(function (Field $aField) use ($fieldName) {
-            if ($aField->name->value !== $fieldName) {
-                return $aField;
-            }
-            $aField->trashed = true;
-            return $aField;
-        });
-
-        $this->schemaRepo->update($schema);
-        return $schema;
-    }
-
-    /**
-     * @throws LucentException
-     */
-    public function restore(
-        string $schemaName,
-        string $fieldName,
-    ): Schema
-    {
-
-        $channel = ChannelRepo::current();
-        $schema = $channel->schemas->where("name.value", $schemaName)->first();
-        $field = $schema->fields->where("name", $fieldName)->first();
-        if (!$field->trashed) {
-            throw new LucentException("You can only restore trashed fields");
-        }
-
-        $schema->fields = $schema->fields->map(function (Field $aField) use ($fieldName) {
-            if ($aField->name->value !== $fieldName) {
-                return $aField;
-            }
-            $aField->trashed = false;
-            return $aField;
-        });
-
-        $this->schemaRepo->update($schema);
-        return $schema;
-    }
-
-    /**
-     * @throws LucentException
-     */
-    public function delete(
-        string $schemaName,
-        string $fieldName,
-    ): Schema
-    {
-
-        $channel = ChannelRepo::current();
-        $schema = $channel->schemas->where("name.value", $schemaName)->first();
-        $field = $schema->fields->where("name", $fieldName)->first();
-        if (!$field->trashed) {
-            throw new LucentException("You can only delete trashed fields");
-        }
-
-        $schema->fields = $schema->fields
-            ->filter(fn(Field $aField) => $aField->name->value !== $fieldName)
-            ->values();
-
-        $this->schemaRepo->update($schema);
-        return $schema;
-    }
-
-    public function replace(
-        string $schemaName,
-        array  $fields
-    ): Schema
-    {
-        $channel = ChannelRepo::current();
-        $schema = $channel->schemas->where("name", $schemaName)->first();
-        $schema->fields = new Collection();
-
-        $newFields = collect($fields)->map(function ($fieldData) use ($schema) {
-
-            $field = Field::fromArray($fieldData);
-            $this->validateNameUnique($schema, $field->name);
-            return $field;
-        })->toArray();
-        $schema->fields = new Collection($newFields);
-        $this->schemaRepo->update($schema);
-        return $schema;
-
-    }
-
-    /**
-     * @throws LucentException
-     */
-    private function validateNameUnique(Schema $schema, string $name): void
-    {
-        $fieldExists = collect($schema->fields)->where("name.value", $name)->first();
-        if (!empty($fieldExists)) {
-            throw new LucentException("Field with name $name exists in schema $schema->label");
-        }
-    }
-}
diff --git a/src/Field/UI.php b/src/Field/UI.php
deleted file mode 100644
index a948db6..0000000
--- a/src/Field/UI.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-namespace Lucent\Field;
-
-use Lucent\Schema\FieldType;
-
-readonly class UI
-{
-    function __construct(
-        public string    $name,
-        public string    $label,
-        public FieldType $type,
-        public bool      $regex,
-        public bool      $mime,
-        public bool      $required,
-        public bool      $nullable,
-        public bool      $decimals,
-        public bool      $collections,
-        public bool      $min,
-        public bool      $max,
-        public bool      $default,
-        public bool      $locked,
-        public bool      $readonly,
-        public bool      $options,
-        public bool      $layout,
-    )
-    {
-    }
-
-    public static function getById(string $id): array
-    {
-        return self::buildUis()[$id];
-    }
-
-    public static function values(): array
-    {
-        return array_values(self::buildUis());
-    }
-
-    public static function buildUis(): array
-    {
-        return [
-            "uuid" => new UI(
-                name: "uuid",
-                label: "UUID",
-                type: FieldType::STRING,
-                regex: false,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: false,
-                collections: false,
-                min: false,
-                max: false,
-                default: false,
-                locked: true,
-                readonly: true,
-                options: false,
-                layout: false,
-            ),
-            "text" => new UI(
-                name: "text",
-                label: "Text",
-                type: FieldType::STRING,
-                regex: true,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: false,
-                collections: false,
-                min: true,
-                max: true,
-                default: true,
-                locked: true,
-                readonly: true,
-                options: true,
-                layout: false,
-            ),
-            "textarea" => new UI(
-                name: "textarea",
-                label: "Textarea",
-                type: FieldType::STRING,
-                regex: false,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: false,
-                collections: false,
-                min: true,
-                max: true,
-                default: true,
-                locked: true,
-                readonly: true,
-                options: false,
-                layout: false,
-            ),
-            "color" => new UI(
-                name: "color",
-                label: "Color",
-                type: FieldType::STRING,
-                regex: false,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: false,
-                collections: false,
-                min: false,
-                max: false,
-                default: true,
-                locked: true,
-                readonly: true,
-                options: true,
-                layout: false,
-            ),
-            "rich" => new UI(
-                name: "rich",
-                label: "Rich editor",
-                type: FieldType::STRING,
-                regex: false,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: false,
-                collections: false,
-                min: true,
-                max: true,
-                default: true,
-                locked: true,
-                readonly: true,
-                options: false,
-                layout: false,
-            ),
-            "block" => new UI(
-                name: "block",
-                label: "Block editor",
-                type: FieldType::JSON,
-                regex: false,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: false,
-                collections: true,
-                min: true,
-                max: true,
-                default: true,
-                locked: true,
-                readonly: true,
-                options: false,
-                layout: false,
-            ),
-            "file" => new UI(
-                name: "file",
-                label: "File",
-                type: FieldType::FILE,
-                regex: false,
-                mime: true,
-                required: false,
-                nullable: false,
-                decimals: false,
-                collections: true,
-                min: true,
-                max: true,
-                default: false,
-                locked: false,
-                readonly: false, // feature for later
-                options: false,
-                layout: false,
-            ),
-            "reference" => new UI(
-                name: "reference",
-                label: "Reference",
-                type: FieldType::REFERENCE,
-                regex: false,
-                mime: false,
-                required: false,
-                nullable: false,
-                decimals: false,
-                collections: true,
-                min: true,
-                max: true,
-                default: false,
-                locked: false,
-                readonly: false, // feature for later
-                options: false,
-                layout: true,
-            ),
-            "checkbox" => new UI(
-                name: "checkbox",
-                label: "Checkbox",
-                type: FieldType::BOOLEAN,
-                regex: false,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: false,
-                collections: false,
-                min: false,
-                max: false,
-                default: true,
-                locked: true,
-                readonly: true,
-                options: false,
-                layout: false,
-            ),
-            "number" => new UI(
-                name: "number",
-                label: "Number",
-                type: FieldType::NUMBER,
-                regex: false,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: true,
-                collections: false,
-                min: true,
-                max: true,
-                default: true,
-                locked: true,
-                readonly: true,
-                options: true,
-                layout: false,
-            ),
-            "date" => new UI(
-                name: "date",
-                label: "Date",
-                type: FieldType::STRING,
-                regex: false,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: false,
-                collections: false,
-                min: true,
-                max: true,
-                default: true,
-                locked: true,
-                readonly: true,
-                options: true,
-                layout: false,
-            ),
-            "datetime" => new UI(
-                name: "datetime",
-                label: "Datetime",
-                type: FieldType::STRING,
-                regex: false,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: false,
-                collections: false,
-                min: true,
-                max: true,
-                default: true,
-                locked: true,
-                readonly: true,
-                options: true,
-                layout: false,
-            ),
-            "json" => new UI(
-                name: "json",
-                label: "JSON",
-                type: FieldType::JSON,
-                regex: false,
-                mime: false,
-                required: true,
-                nullable: true,
-                decimals: false,
-                collections: false,
-                min: false,
-                max: false,
-                default: true,
-                locked: true,
-                readonly: true,
-                options: false,
-                layout: false,
-            ),
-            "tab" => new UI(
-                name: "tab",
-                label: "Tab",
-                type: FieldType::TAB,
-                regex: false,
-                mime: false,
-                required: false,
-                nullable: false,
-                decimals: false,
-                collections: false,
-                min: false,
-                max: false,
-                default: false,
-                locked: true,
-                readonly: false,
-                options: false,
-                layout: false,
-            ),
-
-        ];
-    }
-}
diff --git a/src/File/FileService.php b/src/File/FileService.php
index 5c10b8e..601c4a0 100644
--- a/src/File/FileService.php
+++ b/src/File/FileService.php
@@ -3,18 +3,27 @@
 namespace Lucent\File;
 
 use Illuminate\Http\UploadedFile;
+use Lucent\Channel\ChannelService;
 use Lucent\LucentException;
 use Lucent\Record\File;
+use Lucent\Record\QueryRecord;
 use Lucent\Schema\Schema;
 use Lucent\Schema\Type;
 
 class FileService
 {
 
-    public function __construct()
+    public function __construct(
+        public ChannelService $channelService
+    )
     {
     }
 
+    public function getPath(QueryRecord $file): string
+    {
+        return $this->channelService->channel->url. "/storage/".$file->_file->path;
+    }
+
     /**
      * @throws LucentException
      */
diff --git a/src/File/Uploader.php b/src/File/Uploader.php
index dd16b06..e533bf5 100644
--- a/src/File/Uploader.php
+++ b/src/File/Uploader.php
@@ -102,7 +102,7 @@ function checkDuplicate(string $schemaName, string $checksum, int $filesize): st
 {
 
     $record = DB::table("records")
-        ->where("_sys->schema", $schemaName)
+        ->where("schema", $schemaName)
         ->where("_file->checksum", $checksum)
         ->where("_file->size", $filesize)
         ->first();
@@ -112,22 +112,24 @@ function checkDuplicate(string $schemaName, string $checksum, int $filesize): st
 
 function createThumbnail(Filesystem $disk, string $schemaPath, string $filename, UploadedFile $file): void
 {
+
+
+    $thumbDir = storage_path("app/public/thumbs/" . $schemaPath . "/");
+    if (!file_exists($thumbDir)) {
+        make_dir_r($thumbDir);
+    }
+
     try {
         $image = ImageManagerStatic::make($file);
     } catch (Exception $e) {
+        logger($e->getMessage());
         return;
     }
 
     $image->fit(300, 300);
     try {
-        $image->encode('webp', 75);
-
-        $disk->put(
-            "thumbs/" . $schemaPath . "/" . $filename,
-            $image,
-//        'public' // now managed by aws policy
-        );
-
+        $image->encode('webp', 75)->save($thumbDir .$filename);
     } catch (Exception $e) {
+        logger($e->getMessage());
     }
 }
diff --git a/src/Http/Controller/Api/FieldController.php b/src/Http/Controller/Api/FieldController.php
deleted file mode 100644
index 4ea0688..0000000
--- a/src/Http/Controller/Api/FieldController.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Lucent\Http\Controller\Api;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Lucent\Channel\ChannelContext;
-use Lucent\Schema\FieldRepo;
-use Lucent\Schema\SchemaRepo;
-use function Lucent\Response\fail;
-use function Lucent\Response\ok;
-
-
-class FieldController extends Controller
-{
-
-    public function create(Request $request)
-    {
-        try {
-            $schema = SchemaRepo::findByName($request->input("schema"));
-            FieldRepo::create($schema, $request->input("field"));
-        } catch (\Throwable $th) {
-            return fail($th);
-        }
-
-        return ok();
-    }
-
-    public function update(Request $request)
-    {
-        try {
-            $schema = SchemaRepo::findByName($request->input("schema"));
-            FieldRepo::update($schema, $request->input("field"));
-        } catch (\Throwable $th) {
-            return fail($th);
-        }
-        return ok();
-    }
-}
diff --git a/src/Http/Controller/AuthController.php b/src/Http/Controller/AuthController.php
index 86beaf5..f5bc5f5 100644
--- a/src/Http/Controller/AuthController.php
+++ b/src/Http/Controller/AuthController.php
@@ -3,12 +3,14 @@
 namespace Lucent\Http\Controller;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Contracts\Session\Session;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Lucent\Account\AccountService;
 use Lucent\Account\AuthService;
-use Lucent\Account\UserRepo;
+use Lucent\Channel\ChannelService;
 use Lucent\LucentException;
 use Lucent\Svelte\Svelte;
 use function Lucent\Response\fail;
@@ -18,29 +20,28 @@ use function Lucent\Response\ok;
 class AuthController extends Controller
 {
     public function __construct(
-        private readonly AuthService $authService,
-        private readonly Svelte      $svelte,
-        private readonly UserRepo    $userRepo,
+        private readonly AuthService    $authService,
+        private readonly AccountService $accountService,
+        private readonly ChannelService $channelService,
+        private readonly Session        $session,
+        private readonly Svelte         $svelte,
     )
     {
 
     }
 
-    public function register(Request $request): View
+    public function register(Request $request): View|RedirectResponse
     {
-        $userCount = $this->userRepo->count();
-        $email = $request->input("email");
-        $token = $request->input("token");
+        if ($this->accountService->countUsers() > 0) {
+            return redirect($this->channelService->channel->lucentUrl . "/login");
+        }
 
-        return svelte(
+
+        return $this->svelte->render(
             layout: "account",
             view: "register",
             title: "Create an account",
-            data: [
-                'email' => $email,
-                'token' => $token,
-                'userCount' => $userCount
-            ]
+
         );
     }
 
@@ -48,23 +49,15 @@ class AuthController extends Controller
     public function postRegister(Request $request): Response
     {
 
+        if ($this->accountService->countUsers() > 0) {
+            abort(400);
+        }
+
         try {
-            if ($request->input("isAdmin")) {
-                $this->authService->registerAdmin(
-                    name: $request->input("name"),
-                    password: $request->input("password"),
-                    email: $request->input("email"),
-                );
-            } else {
-                $this->authService->register(
-                    name: $request->input("name"),
-                    password: $request->input("password"),
-                    email: $request->input("email"),
-                    token: $request->input("token") ?? "",
-                );
-            }
-
-
+            $this->authService->registerAdmin(
+                name: $request->input("name"),
+                email: $request->input("email"),
+            );
         } catch (LucentException $th) {
             return fail($th);
         }
@@ -72,8 +65,12 @@ class AuthController extends Controller
         return ok();
     }
 
-    public function login(): View
+    public function login(): View|RedirectResponse
     {
+        if ($this->accountService->countUsers() == 0) {
+            return redirect($this->channelService->channel->lucentUrl . "/register");
+        }
+
         return $this->svelte->render(
             layout: "account",
             view: "login",
@@ -118,8 +115,8 @@ class AuthController extends Controller
 
     public function logout(): RedirectResponse
     {
-        session()->flush();
-        return redirect("/login");
+        $this->session->flush();
+        return redirect($this->channelService->channel->lucentUrl . "/login");
     }
 
 
diff --git a/src/Http/Controller/EdgeController.php b/src/Http/Controller/EdgeController.php
deleted file mode 100644
index b504a28..0000000
--- a/src/Http/Controller/EdgeController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Lucent\Http\Controller;
-
-use App\Http\Controllers\Controller;
-use Lucent\Account\Auth;
-use Lucent\Channel\ChannelContext;
-use Lucent\Query\Options;
-use Lucent\Query\Reference;
-
-class EdgeController extends Controller
-{
-
-
-}
diff --git a/src/Http/Controller/FileController.php b/src/Http/Controller/FileController.php
index 9324d40..3e6576e 100644
--- a/src/Http/Controller/FileController.php
+++ b/src/Http/Controller/FileController.php
@@ -121,9 +121,9 @@ class FileController extends Controller
             })->toArray();
 
 
-        $queryResult = $this->query
+        $graph = $this->query
             ->filter([
-                "_sys.schema" => $schema->name
+                "schema" => $schema->name
             ])
             ->limit(15)
             ->skip(0)
@@ -132,7 +132,6 @@ class FileController extends Controller
             ->parentsDepth(0)
             ->run();
 
-        $graph = $queryResult->getQueryRecords();
         return ok($graph->records->toArray());
     }
 }
diff --git a/src/Http/Controller/FolderController.php b/src/Http/Controller/FolderController.php
deleted file mode 100644
index b2aa1d3..0000000
--- a/src/Http/Controller/FolderController.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Lucent\Http\Controller;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Lucent\Schema\FolderRepo;
-use function Lucent\Response\fail;
-use function Lucent\Response\ok;
-
-class FolderController extends Controller
-{
-
-    public function create(Request $request)
-    {
-        try {
-            $folder = FolderRepo::create($request->input("name"));
-        } catch (\Lucent\LucentException $th) {
-            return fail($th);
-        }
-
-        return ok((array)$folder);
-    }
-
-    public function update(Request $request, string $cid)
-    {
-        try {
-            $folder = FolderRepo::update(
-                id: $request->input("id"),
-                name: $request->input("name"),
-            );
-        } catch (\Lucent\LucentException $th) {
-            return fail($th);
-        }
-        return ok((array)$folder);
-    }
-
-    public function delete(Request $request, string $cid, string $folderid)
-    {
-
-        try {
-            FolderRepo::delete($folderid);
-        } catch (\Lucent\LucentException $th) {
-            return fail($th);
-        }
-
-
-        return redirect()->back();
-    }
-}
diff --git a/src/Http/Controller/HomeController.php b/src/Http/Controller/HomeController.php
index 1f5028a..cb05b09 100644
--- a/src/Http/Controller/HomeController.php
+++ b/src/Http/Controller/HomeController.php
@@ -15,7 +15,6 @@ use function Lucent\Response\ok;
 class HomeController extends Controller
 {
     public function __construct(
-        private readonly ChannelService $channelService,
         private readonly Svelte         $svelte,
         private readonly UserRepo       $userRepo,
         private readonly Query          $query,
@@ -45,7 +44,7 @@ class HomeController extends Controller
 
         $limit = 30;
 
-        $queryResult = $this->query
+        $graph = $this->query
             ->filter($arguments)
             ->limit($limit)
             ->childrenDepth(1)
@@ -53,15 +52,12 @@ class HomeController extends Controller
             ->sort($sort)
             ->run();
 
-
-        $graph = $queryResult->getQueryRecords();
-
         $users = $this->userRepo->all();
 
         return ok([
             "users" => $users,
             "records" => $graph->getRootRecords()->toArray(),
-            "graph" => $graph->toArray(),
+            "graph" => toArray($graph),
             "modalUrl" => $request->fullUrl(),
         ]);
     }
diff --git a/src/Http/Controller/RecordController.php b/src/Http/Controller/RecordController.php
index cc17952..741845a 100644
--- a/src/Http/Controller/RecordController.php
+++ b/src/Http/Controller/RecordController.php
@@ -8,13 +8,13 @@ use Lucent\Account\AccountService;
 use Lucent\Account\AuthService;
 use Lucent\Account\UserRepo;
 use Lucent\Channel\ChannelService;
-use Lucent\Field\System;
 use Lucent\LucentException;
 use Lucent\Query\Operator;
 use Lucent\Query\Query;
 use Lucent\Record\Manager;
 use Lucent\Record\QueryRecord;
 use Lucent\Record\RecordService;
+use Lucent\Schema\System;
 use Lucent\Schema\Validator\ValidatorException;
 use Lucent\Svelte\Svelte;
 use function Lucent\Response\fail;
@@ -39,13 +39,13 @@ class RecordController extends Controller
     {
         $schemaName = $request->route("schemaName");
         $users = $this->accountService->all();
-        $schema = $this->channelService->channel->schemas->where("name", $schemaName)->first();
+        $schema = $this->channelService->getSchema($schemaName)->get();
         $urlParams = $request->all();
         $sort = data_get($urlParams, "sort") ?? "-_sys.updatedAt";
         $filter = data_get($urlParams, "filter") ?? [];
         $arguments = array_merge([
-            "_sys.schema" => $schema->name,
-            "_sys.status_in" => "draft,published",
+            "schema" => $schema->name,
+            "status_in" => "draft,published",
         ], $filter);
 
 
@@ -53,38 +53,32 @@ class RecordController extends Controller
         $limit = 15;
         $records = [];
         $graphArray = null;
-        $total = 0;
 
-        try {
-            $queryResult = $this->query
-                ->filter($arguments)
-                ->limit($limit)
-                ->status(explode(",", $arguments["_sys.status_in"]))
-                ->skip($skip)
-                ->sort($sort)
-                ->childrenDepth(1)
-                ->parentsDepth(0)
-                ->runWithCount();
+        $graph = $this->query
+            ->filter($arguments)
+            ->limit($limit)
+            ->status(explode(",", $arguments["status_in"]))
+            ->skip($skip)
+            ->sort($sort)
+            ->childrenDepth(1)
+            ->parentsDepth(0)
+            ->runWithCount();
+
+        $records = $graph->getRootRecords()->toArray();
+
 
-            $graph = $queryResult->getQueryRecords();
-            $graphArray = $graph->toArray();
-            $total = $queryResult->getTotal();
-            $records = $graph->getRootRecords()->toArray();
-        } catch (SubqueryNoResultException) {
-        }
-   
         $data = [
             "schemas" => $this->channelService->channel->schemas,
             "schema" => $schema,
             "users" => $users,
             "records" => $records,
-            "graph" => $graphArray,
+            "graph" => toArray($graph),
             "systemFields" => array_values(System::list()),
             "operators" => array_values(Operator::list()),
             "sort" => $sort,
             "limit" => $limit,
             "skip" => $skip,
-            "total" => $total,
+            "total" => $graph->total ?? 0,
             "filter" => $request->input("filter") ?? [],
             "inModal" => true,
         ];
@@ -192,7 +186,7 @@ class RecordController extends Controller
         $rid = $request->route("rid");
 
 
-        $queryResult = $this->query
+        $graph = $this->query
             ->filter(["id" => $rid])
             ->limit(1)
             ->skip(0)
@@ -203,9 +197,7 @@ class RecordController extends Controller
             ->run();
 
 
-        $graph = $queryResult->getQueryRecords();
-
-        if (empty($graph->records[0])) {
+        if ($graph->records->isEmpty()) {
             return $this->svelte->render(
                 layout: "channel",
                 view: "recordNotFound",
@@ -213,8 +205,8 @@ class RecordController extends Controller
             );
         }
 
-        $record = $graph->records[0];
-        $schema = $this->channelService->channel->schemas->where("name", $record->_sys->schema)->first();
+        $record = $graph->records->first();
+        $schema = $this->channelService->getSchema($record->schema)->get();
         $recordHistory = $this->recordManager->fromSession($request->session())->push($rid)->getRecords($rid);
         $users = $this->userRepo->all();
         return $this->svelte->render(
@@ -223,11 +215,10 @@ class RecordController extends Controller
             title: "Edit Record",
             data: [
                 "schema" => $schema,
-                "graph" => $graph->toArray(),
-                "record" => $record->toArray(),
+                "graph" => toArray($graph),
+                "record" => toArray($record),
                 "users" => $users,
                 "recordHistory" => $recordHistory,
-                "isCreateMode" => $record->_sys->status === "empty",
             ]
         );
     }
@@ -294,37 +285,37 @@ class RecordController extends Controller
 
             if ($request->input("isCreateMode")) {
                 $this->recordService->create(
-                    schemaName: $request->input("record._sys.schema"),
+                    schemaName: $request->input("record.schema"),
                     data: $request->input("record.data"),
                     id: $request->input("record.id"),
                     file: $request->input("record._file") ?? [],
                     edges: $request->input("edges"),
-                    status: $request->input("record._sys.status"),
+                    status: $request->input("record.status"),
                     uploadFromUrl: ""
                 );
             } else {
                 $this->recordService->update(
                     id: $request->input("record.id"),
                     data: $request->input("record.data"),
-                    status: $request->input("record._sys.status"),
+                    status: $request->input("record.status"),
                     edges: $request->input("edges"),
                     updateEdges: true,
                 );
             }
 
-            $queryResult = $this->query
+            $newGraph = $this->query
                 ->filter(["id" => $request->input("record.id")])
                 ->limit(10)
                 ->childrenDepth(2)
                 ->parentsDepth(1)
                 ->run();
-            $newGraph = $queryResult->getQueryRecords();
+
         } catch (ValidatorException $th) {
             return fail($th->getValidatorErrors());
         } catch (LucentException $th) {
             return fail($th);
         }
-        return ok($newGraph->toArray());
+        return ok(toArray($newGraph));
     }
 
 
diff --git a/src/Http/Controller/SchemaController.php b/src/Http/Controller/SchemaController.php
deleted file mode 100644
index d13c6e1..0000000
--- a/src/Http/Controller/SchemaController.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-namespace Lucent\Http\Controller;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Contracts\View\View;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Lucent\Channel\ChannelRepo;
-use Lucent\LucentException;
-use Lucent\Schema\SchemaRepo;
-use Lucent\Schema\SchemaService;
-use function Lucent\Response\fail;
-use function Lucent\Response\ok;
-use function Lucent\Svelte\svelte;
-
-class SchemaController extends Controller
-{
-    public function __construct(
-        private readonly SchemaRepo    $schemaRepo,
-        private readonly SchemaService $schemaService
-    )
-    {
-    }
-
-    /**
-     * @throws LucentException
-     */
-    public function new(): View
-    {
-        $schemas = $this->schemaRepo->all();
-
-        return svelte(
-            layout: "channel",
-            view: "schemaNew",
-            title: "Create schema",
-            data: [
-                "schemas" => $schemas,
-                "schema" => Schema::fromArray([]),
-            ]
-        );
-    }
-
-    public function create(Request $request): Response
-    {
-
-        try {
-            $this->schemaService->create(
-                name: $request->input("name"),
-                label: $request->input("label"),
-                type: $request->input("type"),
-                isEntry: $request->input("isEntry"),
-                revisionRetentionDays: $request->input("revisionRetentionDays"),
-                revisionRetentionNumber: $request->input("revisionRetentionNumber"),
-                trashedRetentionDays: $request->input("trashedRetentionDays"),
-                fields: [],
-                path: $request->input("path"),
-            );
-        } catch (LucentException $th) {
-            return fail($th);
-        }
-
-
-        return ok();
-    }
-
-    public function edit(string $name): View
-    {
-        $channel = ChannelRepo::current();
-        return svelte(
-            layout: "channel",
-            view: "schemaEdit",
-            title: "Schemas",
-            data: [
-                "schemas" => $channel->schemas,
-                "schema" => $channel->schemas->where("name.value", $name)->first(),
-            ]
-        );
-    }
-
-    public function delete(Request $request): View
-    {
-        $channel = ChannelRepo::current();
-        return svelte(
-            layout: "channel",
-            view: "schemaDelete",
-            title: "Schemas",
-            data: [
-                "channel" => $channel,
-                "schemas" => $channel->schemas,
-                "schema" => $channel->schemas->firstWhere("name", $request->route("name")),
-                "nav" => "collections",
-            ]
-        );
-    }
-
-    public function update(Request $request): Response
-    {
-        try {
-            $schema = $this->schemaService->update(
-                name: $request->input("name"),
-                label: $request->input("label"),
-                isEntry: $request->input("isEntry"),
-                color: $request->input("color") ?? "",
-                visible: $request->input("visible") ?? [],
-                titleTemplate: $request->input("titleTemplate") ?? "",
-                revisionRetentionDays: $request->input("revisionRetentionDays"),
-                revisionRetentionNumber: $request->input("revisionRetentionNumber"),
-                trashedRetentionDays: $request->input("trashedRetentionDays"),
-                path: $request->input("path"),
-            );
-        } catch (LucentException $e) {
-            return fail($e);
-        }
-
-        return ok($schema->toArray());
-    }
-
-    public function postDelete(Request $request): Response
-    {
-
-        $this->schemaService->delete($request->input("name"));
-
-        return ok();
-    }
-}
diff --git a/src/Http/Controller/ViewController.php b/src/Http/Controller/ViewController.php
deleted file mode 100644
index 9ddca1d..0000000
--- a/src/Http/Controller/ViewController.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Lucent\Http\Controller;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Lucent\Account\Auth;
-use Lucent\Channel\ChannelContext;
-use Lucent\Schema\SchemaRepo;
-use Lucent\View\ViewRepo;
-use function Lucent\Response\fail;
-use function Lucent\Response\ok;
-
-class ViewController extends Controller
-{
-
-    public function redirect(Request $request, string $cid, string $schemaName, string $viewName)
-    {
-
-        $schema = SchemaRepo::findByName($schemaName);
-        $view = $schema->views->whereName($viewName);
-        parse_str($view->params, $viewParamsArray);
-        return \redirect("/c/{$cid}/content/{$schemaName}/views/{$viewName}?{$view->params}");
-    }
-
-
-    public function create(Request $request)
-    {
-        try {
-            $schema = SchemaRepo::findByName($request->input("schemaName"));
-            ViewRepo::create($schema, $request->input("view"), Auth::currentUserId());
-        } catch (\Throwable $th) {
-            return fail($th);
-        }
-
-        return ok();
-    }
-
-
-    public function update(Request $request)
-    {
-        try {
-            $schema = SchemaRepo::findByName($request->input("schemaName"));
-            ViewRepo::update($schema, $request->input("view"));
-        } catch (\Throwable $th) {
-            return fail($th);
-        }
-
-        $schema = SchemaRepo::findByName($request->input("schemaName"));
-        $view = $schema->views->whereName($request->input("view.name"));
-
-        return ok((array)$view);
-    }
-
-    public function delete(Request $request, string $cid, string $schemaName, string $viewName)
-    {
-        try {
-            $schema = SchemaRepo::findByName($schemaName);
-            ViewRepo::delete($schema, $viewName);
-        } catch (\Throwable $th) {
-            return fail($th);
-        }
-
-        return redirect("c/{$cid}/content/{$schemaName}");
-    }
-}
diff --git a/src/Http/api.php b/src/Http/api.php
index 93f86eb..8e468bc 100644
--- a/src/Http/api.php
+++ b/src/Http/api.php
@@ -6,12 +6,6 @@ use Lucent\Http\Controller\Api\FileController;
 use Lucent\Http\Controller\Api\RecordController;
 use Lucent\Http\Controller\Api\SchemaController;
 
-Route::middleware('auth.api:developer')->group(function () {
-    Route::post('/schemas', [SchemaController::class, 'create']);
-    Route::put('/schemas/', [SchemaController::class, 'update']);
-    Route::delete('/schemas/{name}', [SchemaController::class, 'delete']);
-    Route::post('/schemas/fields', [SchemaController::class, 'fields']);
-});
 
 Route::middleware('auth.api:editor')->group(function () {
 
@@ -29,26 +23,3 @@ Route::middleware('auth.api:reader')->group(function () {
     Route::get('/records', [RecordController::class, 'records']);
 });
 
-// They need testing
-// Route::middleware('auth.api')->prefix("/fields")->controller(FieldController::class)->group(function () {
-//     Route::post('/', 'create');
-//     Route::put('/', 'update');
-//     Route::delete('/{id}', 'delete');
-// });
-
-//Route::middleware(["auth.api"])->group(function () {
-//
-////    Route::get('/{rid}', 'findOne');
-//
-////    Route::delete('/records/{id}', [RecordController::class, 'delete']);
-////    Route::post('/bulk', 'bulkCreate');
-////    Route::put('/bulk', 'bulkUpdate');
-////    Route::delete('/bulk', 'bulkDelete');
-//
-//
-//});
-//
-//
-//Route::middleware('auth.api')->prefix("/files")->controller(FileController::class)->group(function () {
-//    Route::post('/', 'upload');
-//});
diff --git a/src/Http/web.php b/src/Http/web.php
index 859fe28..8453715 100644
--- a/src/Http/web.php
+++ b/src/Http/web.php
@@ -41,16 +41,6 @@ Route::group([
     });
 
 
-    Route::middleware(["lucent.auth"])->prefix("/schemas/")->group(function () {
-        Route::get('/new/', [SchemaController::class, 'new']);
-        Route::post('/', [SchemaController::class, 'create']);
-        Route::get('/{name}/edit', [SchemaController::class, 'edit']);
-        Route::put('/', [SchemaController::class, 'update']);
-        Route::get('/{name}/delete', [SchemaController::class, 'delete']);
-        Route::post('/delete', [SchemaController::class, 'postDelete']);
-    });
-
-
     Route::middleware(["lucent.auth"])->prefix("/records")->group(function () {
 
         Route::get('/new', [RecordController::class, 'new']);
@@ -88,9 +78,6 @@ Route::group([
     });
 
 
-    Route::get('/fs/cache/{path}', [FileController::class, 'get'])->where('path', '.*');
-    Route::get('/fs/{path}', [FileController::class, 'get'])->where('path', '.*');
-
 
 });
 
diff --git a/src/LucentServiceProvider.php b/src/LucentServiceProvider.php
index d2cbbb6..e56cf9f 100644
--- a/src/LucentServiceProvider.php
+++ b/src/LucentServiceProvider.php
@@ -5,9 +5,11 @@ namespace Lucent;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
+use Intervention\Image\ImageManager;
 use Lucent\Channel\ChannelService;
 use Lucent\Commands\CompileConfig;
 use Lucent\Commands\RebuildThumbnails;
+use Lucent\File\FileService;
 use Lucent\File\ImageService;
 
 class LucentServiceProvider extends ServiceProvider
@@ -21,6 +23,11 @@ class LucentServiceProvider extends ServiceProvider
             return ChannelService::fromConfig();
         });
 
+        $this->app->bind(ImageManager::class, function () {
+            return new ImageManager(['driver' => 'imagick']);
+        });
+
+
     }
 
     /**
@@ -36,6 +43,7 @@ class LucentServiceProvider extends ServiceProvider
         $this->loadRoutesFrom(__DIR__ . '/Http/web.php');
         $this->loadRoutesFrom(__DIR__ . '/Http/api.php');
 
+        $this->loadMigrationsFrom(__DIR__ . '/Database/migrations');
 
         if ($this->app->runningInConsole()) {
             $this->commands([
@@ -45,6 +53,7 @@ class LucentServiceProvider extends ServiceProvider
         }
 
         View::share('image', app()->make(ImageService::class));
+        View::share('file', app()->make(FileService::class));
 
         $this->publishes([
             __DIR__ . '/Config/main.php' => config_path('lucent.php'),
diff --git a/src/Query/Query.php b/src/Query/Query.php
index f9f3a97..3fee1a0 100644
--- a/src/Query/Query.php
+++ b/src/Query/Query.php
@@ -58,7 +58,7 @@ final  class Query
         if (!empty($edgesIds)) {
             $edgeRecords = DB::table('records')
                 ->whereIn("id", $edgesIds)
-                ->whereIn("_sys->status", $this->options->status)
+                ->whereIn("status", $this->options->status)
                 ->get()->toArray();
         }
         $resultsRecordsUnique = collect(array_merge($resultsRecords, $edgeRecords))->unique("id")->values()->toArray();
@@ -76,7 +76,7 @@ final  class Query
         $queryRecords = collect($records)->map(function ($recordData) {
 
             $record = Record::fromDB($recordData);
-            $record->data = $this->inputFormatter->fill($record->_sys->schema, $record->data);
+            $record->data = $this->inputFormatter->fill($record->schema, $record->data);
             $queryRecord = QueryRecord::fromRecord($record);
             $queryRecord->isRoot = data_get($recordData, "isRoot") === true;
             return $queryRecord;
@@ -103,9 +103,7 @@ final  class Query
     }
 
 
-    /**
-     * @throws SubqueryNoResultException
-     */
+
     private function parseFilters(Builder $query): Builder
     {
         $filters = $this->filter->run(new Query($this->channelService, $this->inputFormatter));
@@ -148,7 +146,7 @@ final  class Query
             }
         }
 
-        $query->whereIn("_sys->status", $this->options->status);
+        $query->whereIn("status", $this->options->status);
         return $query;
     }
 
@@ -211,9 +209,7 @@ final  class Query
             ->get()->toArray();
     }
 
-    /**
-     * @throws SubqueryNoResultException
-     */
+
     public
     function runWithCount(): Graph
     {
diff --git a/src/Record/Manager.php b/src/Record/Manager.php
index 046b319..c97d935 100644
--- a/src/Record/Manager.php
+++ b/src/Record/Manager.php
@@ -3,9 +3,7 @@
 namespace Lucent\Record;
 
 use Illuminate\Contracts\Session\Session;
-use Lucent\Primitive\Collection;
 use Lucent\Query\Query;
-use Lucent\Schema\Schema;
 
 class Manager
 {
@@ -79,19 +77,16 @@ class Manager
         }, []);
     }
 
-    /**
-     * @param Collection<Schema> $schemas
-     */
+
     public function getRecords(?string $ignoreId = null): array
     {
 
-        $queryResult = $this->query
+        $graph = $this->query
             ->filter(["id_in" => $this->getIdsExcept($ignoreId)])
             ->limit(7)
             ->run();
 
 
-        $graph = $queryResult->getQueryRecords();
 
         return $this->order($graph->records->toArray());
     }
diff --git a/src/Record/QueryRecord.php b/src/Record/QueryRecord.php
index 75591e9..5c799ff 100644
--- a/src/Record/QueryRecord.php
+++ b/src/Record/QueryRecord.php
@@ -9,6 +9,8 @@ class QueryRecord
 
     function __construct(
         public string     $id,
+        public string     $schema,
+        public Status     $status,
         public System     $_sys,
         public RecordData $data,
         public bool       $isRoot,
@@ -18,33 +20,12 @@ class QueryRecord
     {
     }
 
-
-    public function toArray(): array
-    {
-        return json_decode(json_encode($this), true);
-    }
-
-
-    /**
-     * @throws LucentException
-     */
-    public static function fromArray(array $data): QueryRecord
-    {
-
-
-        return new QueryRecord(
-            id: $data["id"],
-            _sys: System::fromArray($data["_sys"]),
-            data: new RecordData($data["data"]),
-            isRoot: $data["isRoot"] ?? false,
-            _file: $data["_file"] ? new File(...$data["_file"]) : null,
-        );
-    }
-
     public static function fromRecord(Record $record): QueryRecord
     {
         return new QueryRecord(
             id: $record->id,
+            schema: $record->schema,
+            status: $record->status,
             _sys: $record->_sys,
             data: $record->data,
             isRoot: false,
diff --git a/src/Record/Record.php b/src/Record/Record.php
index 217b16d..962e781 100644
--- a/src/Record/Record.php
+++ b/src/Record/Record.php
@@ -11,6 +11,8 @@ class Record implements JsonSerializable
 
     function __construct(
         public string     $id,
+        public string     $schema,
+        public Status     $status,
         public System     $_sys,
         public RecordData $data,
         public ?File      $_file = null,
@@ -18,15 +20,13 @@ class Record implements JsonSerializable
     {
     }
 
-    public function toArray(): array
-    {
-        return \json_decode(\json_encode($this), true);
-    }
 
     public function toDB(): array
     {
         return [
             "id" => $this->id,
+            "status" => $this->status->value,
+            "schema" => $this->schema,
             "_sys" => json_encode($this->_sys),
             "_file" => json_encode($this->_file),
             "data" => json_encode($this->data),
@@ -46,6 +46,8 @@ class Record implements JsonSerializable
 
         return new Record(
             id: $data->id,
+            schema: $data->schema,
+            status: Status::from($data->status),
             _sys: System::fromArray(json_decode($data->_sys, true)),
             data: new RecordData(json_decode($data->data, true)),
             _file: $file,
@@ -58,20 +60,6 @@ class Record implements JsonSerializable
         return $this;
     }
 
-    public static function fromArray(array $data): Record
-    {
 
-        $file = null;
-        if (!empty($data["_file"])) {
-            $file = File::fromArray($data["_file"]);
-        }
-
-        return new Record(
-            id: $data["id"],
-            _sys: System::fromArray($data["_sys"]),
-            data: new RecordData($data["data"]),
-            _file: $file,
-        );
-    }
 
 }
diff --git a/src/Record/RecordGraph.php b/src/Record/RecordGraph.php
deleted file mode 100644
index 80c8ebd..0000000
--- a/src/Record/RecordGraph.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Lucent\Record;
-
-use Lucent\Edge\QueryEdge;
-
-class RecordGraph
-{
-    /**
-     * @param \Lucent\Edge\QueryEdge[] $edges
-     * @param \Lucent\Record\EdgeRecord[] $nodes
-     */
-    function __construct(
-        public readonly array $edges,
-        public readonly array $nodes,
-    ) {
-    }
-
-    public function toArray(): array
-    {
-        return \json_decode(\json_encode($this), true);
-    }
-
-    public static function fromArray(array $data): RecordGraph
-    {
-        return new RecordGraph(
-            edges: collect($data["edges"] ?? [])->map(fn ($edge) =>  new QueryEdge(...$edge))->toArray(),
-            nodes: collect($data["nodes"] ?? [])->map(fn ($node) =>  EdgeRecord::fromArray($node))->toArray(),
-        );
-    }
-}
diff --git a/src/Record/RecordRepo.php b/src/Record/RecordRepo.php
index b435aaf..c46d8b5 100644
--- a/src/Record/RecordRepo.php
+++ b/src/Record/RecordRepo.php
@@ -18,10 +18,10 @@ class RecordRepo
     /**
      * @param array<string> $ids
      */
-    public static function updateStatusBulk(RecordStatus $status, array $ids): void
+    public static function updateStatusBulk(Status $status, array $ids): void
     {
         DB::table("records")->whereIn("id", $ids)->update([
-            '_sys->status' => $status->value()
+            'status' => $status->value
         ]);
     }
 
diff --git a/src/Record/RecordService.php b/src/Record/RecordService.php
index 85805c5..096eca3 100644
--- a/src/Record/RecordService.php
+++ b/src/Record/RecordService.php
@@ -60,11 +60,9 @@ readonly class RecordService
         $uploadResult = FileService::create($schema, $uploadFromUrl, $file);
 
         $uniqueEdges = collect($edges)
-            ->map(fn($e) => (array)(new Edge(...$e)))
             ->map(function ($edge, $index) {
-                $edgeData = (array)(new Edge(...$edge));
-                $edgeData["rank"] = $index;
-                return $edgeData;
+                $edge["rank"] = $index;
+                return (array)(new Edge(...$edge));
             })
             ->unique(fn($e) => $e['field'] . $e['source'] . $e['target'] . $e['sourceSchema'])
             ->values()->toArray();
@@ -77,7 +75,9 @@ readonly class RecordService
 
         $record = new Record(
             id: $id ?? Id::new(),
-            _sys: System::newRecord($schema, $this->authService->currentUserId(), $status),
+            schema: $schema->name,
+            status: Status::from($status),
+            _sys: System::newRecord($this->authService->currentUserId()),
             data: $formattedData,
             _file: $uploadResult->recordFile,
         );
@@ -109,33 +109,34 @@ readonly class RecordService
     ): void
     {
 
-        $queryResult = $this->query->filter(["id" => $id])->run();
-        $record = $queryResult->getQueryRecords()->records[0] ?? null;
+        $record = $this->query->filter(["id" => $id])->run()->records->first();
 
         if (empty($record)) {
             throw new LucentException("Record id is missing");
         }
-        $formattedData = $this->inputFormatter->fill($record->_sys->schema, new RecordData($data));
+        $formattedData = $this->inputFormatter->fill($record->schema, new RecordData($data));
 
         if ($updateEdges) {
             $uniqueEdges = collect($edges)
                 ->map(function ($edge, $index) {
+                    $edge["rank"] = $index;
                     $edgeData = (array)(new Edge(...$edge));
-                    $edgeData["rank"] = $index;
                     return $edgeData;
                 })
                 ->unique(fn($e) => $e['field'] . $e['source'] . $e['target'] . $e['sourceSchema'])
                 ->values()->toArray();
             $uniqueEdgesCollection = EdgeCollection::fromArray($uniqueEdges);
-            $errors = $this->recordValidator->check($record->_sys->schema, $formattedData, $uniqueEdgesCollection);
+            $errors = $this->recordValidator->check($record->schema, $formattedData, $uniqueEdgesCollection);
         } else {
-            $errors = $this->recordValidator->check($record->_sys->schema, $formattedData, null);
+            $errors = $this->recordValidator->check($record->schema, $formattedData, null);
         }
 
 
         $newRecord = new Record(
             id: $record->id,
-            _sys: $record->_sys->update($this->authService->currentUserId(), $status),
+            schema: $record->schema,
+            status: Status::from($status),
+            _sys: $record->_sys->update($this->authService->currentUserId()),
             data: $record->data->merge($formattedData),
             _file: $record->_file,
         );
@@ -162,8 +163,7 @@ readonly class RecordService
         array  $recordsIds,
     ): void
     {
-        $recordsStatus = (new RecordStatus($status));
-        RecordRepo::updateStatusBulk($recordsStatus, $recordsIds);
+        RecordRepo::updateStatusBulk(Status::from($status), $recordsIds);
     }
 
     /**
@@ -175,18 +175,17 @@ readonly class RecordService
         string $recordId,
     ): string
     {
-        $queryResult = $this->query
+        $graph = $this->query
             ->filter(["id" => $recordId])
             ->limit(1)
             ->childrenDepth(1)
-            ->runWithCount();
+            ->run();
 
-
-        $graph = $queryResult->getQueryRecords();
-        $record = $graph->records[0] ?? null;
+        $record = $graph->records->first();
         if (empty($record)) {
             throw new LucentException("Record id is missing");
         }
+
         $newRecordId = (string)Str::uuid();
         $newEdgesData = $graph->edges
             ->filter(fn(Edge $edge) => $edge->source == $recordId)
@@ -199,7 +198,7 @@ readonly class RecordService
         $record->id = $newRecordId;
 
         return $this->create(
-            schemaName: $record->_sys->schema,
+            schemaName: $record->schema,
             data: $record->data->toArray(),
             id: $record->id,
             file: $record->_file?->toArray() ?? [],
@@ -223,18 +222,14 @@ readonly class RecordService
      * @throws ValidatorException
      */
     public function rollback(
-        string $userId,
         string $recordId,
         int    $version,
     ): void
     {
         $revision = $this->revisionService->getByRecordIdAndVersion($recordId, $version)->get();
         $this->update(
-            userId: $userId,
             id: $revision->recordId,
             data: $revision->data->toArray(),
-            status: $revision->_sys->status,
-            updateEdges: false
         );
     }
 
@@ -254,7 +249,9 @@ readonly class RecordService
 
         return new Record(
             id: Id::new(),
-            _sys: System::newRecord($schema, $userId),
+            schema: $schema->name,
+            status: Status::DRAFT,
+            _sys: System::newRecord($userId),
             data: $formattedData,
             _file: null,
         );
diff --git a/src/Record/RecordStatus.php b/src/Record/RecordStatus.php
deleted file mode 100644
index 638e444..0000000
--- a/src/Record/RecordStatus.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Lucent\Record;
-
-class RecordStatus
-{
-
-    private string $value;
-
-    public function __construct(
-        public readonly ?string $status = null,
-    )
-    {
-
-        if (empty($status)) {
-            $this->value = "draft";
-            return;
-        }
-        $validStatuses = ["trashed", "published", "draft"];
-        if (!in_array($status, $validStatuses)) {
-            $status = "draft";
-        }
-
-        $this->value = $status;
-    }
-
-    public function value(): string
-    {
-        return $this->value;
-    }
-}
diff --git a/src/Record/Status.php b/src/Record/Status.php
new file mode 100644
index 0000000..bad0d46
--- /dev/null
+++ b/src/Record/Status.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Lucent\Record;
+
+enum Status: string
+{
+    case DRAFT = "draft";
+    case PUBLISHED = "published";
+    case TRASHED = "trashed";
+}
diff --git a/src/Record/System.php b/src/Record/System.php
index 7f683d1..ddff392 100644
--- a/src/Record/System.php
+++ b/src/Record/System.php
@@ -5,18 +5,16 @@ namespace Lucent\Record;
 use Carbon\Carbon;
 use Lucent\Schema\Schema;
 
-class System
+readonly class System
 {
 
 
     function __construct(
-        public readonly string $schema,
-        public readonly int    $version,
-        public readonly string $status,
-        public readonly string $createdBy,
-        public readonly string $updatedBy,
-        public readonly string $createdAt,
-        public readonly string $updatedAt,
+        public int    $version,
+        public string $createdBy,
+        public string $updatedBy,
+        public string $createdAt,
+        public string $updatedAt,
     )
     {
 
@@ -26,9 +24,7 @@ class System
     public static function fromArray(array $data): System
     {
         return new System(
-            schema: data_get($data, "schema"),
             version: data_get($data, "version"),
-            status: data_get($data, "status"),
             createdBy: data_get($data, "createdBy"),
             updatedBy: data_get($data, "updatedBy"),
             createdAt: data_get($data, "createdAt"),
@@ -37,13 +33,11 @@ class System
     }
 
 
-    public static function newRecord(Schema $schema, string $userId, ?string $status = null): System
+    public static function newRecord(string $userId): System
     {
         $now = Carbon::now()->toJson();
         return new System(
-            schema: $schema->name,
             version: 1,
-            status: (new RecordStatus($status))->value(),
             createdBy: $userId,
             updatedBy: $userId,
             createdAt: $now,
@@ -52,14 +46,11 @@ class System
     }
 
 
-    public function update(string $userId, ?string $status = null): System
+    public function update(string $userId): System
     {
         $now = Carbon::now()->toJson();
-        $newStatus = $status ?? $this->status;
         return new System(
-            schema: $this->schema,
             version: $this->version + 1,
-            status: (new RecordStatus($newStatus))->value(),
             createdBy: $this->createdBy,
             updatedBy: $userId,
             createdAt: $this->createdAt,
diff --git a/src/Revision/Revision.php b/src/Revision/Revision.php
index 1091229..15864b3 100644
--- a/src/Revision/Revision.php
+++ b/src/Revision/Revision.php
@@ -15,6 +15,7 @@ readonly class Revision
     function __construct(
         public string     $id,
         public string     $recordId,
+        public string     $schema,
         public System     $_sys,
         public RecordData $data,
         public ?File      $_file = null,
@@ -22,12 +23,6 @@ readonly class Revision
     {
     }
 
-    public function toArray(): array
-    {
-        return json_decode(json_encode($this), true);
-    }
-
-
     public static function fromDB(stdClass $data): Revision
     {
 
@@ -42,6 +37,7 @@ readonly class Revision
         return new Revision(
             id: $data->id,
             recordId: $data->recordId,
+            schema: $data->schema,
             _sys: System::fromArray(json_decode($data->_sys, true)),
             data: new RecordData(json_decode($data->data, true)),
             _file: $file,
@@ -53,6 +49,7 @@ readonly class Revision
         return [
             "id" => $this->id,
             "recordId" => $this->recordId,
+            "schema" => $this->schema,
             "_sys" => json_encode($this->_sys),
             "_file" => json_encode($this->_file),
             "data" => json_encode($this->data),
@@ -65,6 +62,7 @@ readonly class Revision
         return new Revision(
             id: (string)Str::uuid(),
             recordId: $record->id,
+            schema: $record->schema,
             _sys: $record->_sys,
             data: $record->data,
             _file: $record->_file,
diff --git a/src/Schema/CollectionSchema.php b/src/Schema/CollectionSchema.php
index 3de84ea..5786689 100644
--- a/src/Schema/CollectionSchema.php
+++ b/src/Schema/CollectionSchema.php
@@ -11,11 +11,13 @@ class CollectionSchema implements Schema
     /**
      * @param Collection<FieldInterface> $fields
      * @param array<string> $visible
+     * @param array<string> $fields
      */
     function __construct(
         public string     $name,
         public string     $label,
         public array      $visible,
+        public array      $groups,
         public Collection $fields,
         public bool       $isEntry = false,
         public string     $color = "",
diff --git a/src/Schema/FilesSchema.php b/src/Schema/FilesSchema.php
index d367c32..dc6fd7c 100644
--- a/src/Schema/FilesSchema.php
+++ b/src/Schema/FilesSchema.php
@@ -11,12 +11,14 @@ class FilesSchema implements Schema
 
     /**
      * @param Collection<FieldInterface> $fields
+     * @param array<string> $groups
      */
     function __construct(
         public string     $name,
         public string     $label,
         public Collection $fields,
         public string     $path,
+        public array      $groups,
         public bool       $isEntry = false,
         public string     $color = "",
         public string     $titleTemplate = "",
diff --git a/src/Schema/Functions.php b/src/Schema/Functions.php
deleted file mode 100644
index f869105..0000000
--- a/src/Schema/Functions.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Lucent\Schema;
-
-use Lucent\Field\Field;
-use Lucent\View\View;
-
-/**
- * @return string[]
- **/
-function visibleFields(Schema $schema, ?View $view = null): array
-{
-
-    $visibleFieldNames = $schema->visible;
-    if (!empty($view)) {
-        $visibleFieldNames = $view->visible;
-    }
-
-    return $schema->fields
-        ->filter(function (Field $f) use ($visibleFieldNames) {
-
-            if ($f->trashed || $f->ui == "tab") {
-                return false;
-            }
-
-            return $visibleFieldNames->contains($f->name->value);
-        })
-        ->values()
-        ->map(fn(Field $f) => $f->name->value)
-        ->toArray();
-}
diff --git a/src/Schema/SchemaService.php b/src/Schema/SchemaService.php
index fc82891..256948c 100644
--- a/src/Schema/SchemaService.php
+++ b/src/Schema/SchemaService.php
@@ -20,19 +20,21 @@ class SchemaService
                 name: $schemaArr["name"],
                 label: $schemaArr["label"],
                 visible: $schemaArr["visible"] ?? [],
+                groups: $schemaArr["groups"] ?? [],
                 fields: (new Collection($schemaArr["fields"]))->map([$this, 'mapFields']),
-                isEntry: $schemaArr["isEntry"],
-                color: $schemaArr["color"],
-                titleTemplate: $schemaArr["titleTemplate"],
+                isEntry: $schemaArr["isEntry"] ?? false,
+                color: $schemaArr["color"] ?? "",
+                titleTemplate: $schemaArr["titleTemplate"] ?? "",
             ),
             "files" => new FilesSchema(
                 name: $schemaArr["name"],
                 label: $schemaArr["label"],
                 fields: (new Collection($schemaArr["fields"]))->map([$this, 'mapFields']),
-                path: $schemaArr["path"],
-                isEntry: $schemaArr["isEntry"],
-                color: $schemaArr["color"],
-                titleTemplate: $schemaArr["titleTemplate"]
+                path: $schemaArr["path"] ?? $schemaArr["name"],
+                groups: $schemaArr["groups"] ?? [],
+                isEntry: $schemaArr["isEntry"] ?? false,
+                color: $schemaArr["color"] ?? "",
+                titleTemplate: $schemaArr["titleTemplate"] ?? "",
             )
         };
 
diff --git a/src/Field/System.php b/src/Schema/System.php
similarity index 97%
rename from src/Field/System.php
rename to src/Schema/System.php
index 45e3d83..ba44a63 100644
--- a/src/Field/System.php
+++ b/src/Schema/System.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Lucent\Field;
+namespace Lucent\Schema;
 
 readonly class System
 {
@@ -26,7 +26,7 @@ readonly class System
     {
         return [
             "_sys.status" => new System(
-                name: "_sys.status",
+                name: "status",
                 label: "Status",
                 ui: "status",
                 files: false,
diff --git a/src/StaticGenerator/StaticGenerator.php b/src/StaticGenerator/StaticGenerator.php
index ef09b4b..627cc35 100644
--- a/src/StaticGenerator/StaticGenerator.php
+++ b/src/StaticGenerator/StaticGenerator.php
@@ -14,7 +14,7 @@ class StaticGenerator
         $filepath = public_path($path . "/index.html");
 
         if (!file_exists(pathinfo($filepath, PATHINFO_DIRNAME))) {
-            $this->make_dir(pathinfo($filepath, PATHINFO_DIRNAME));
+            make_dir_r(pathinfo($filepath, PATHINFO_DIRNAME));
         }
 
         file_put_contents($filepath, $html);
@@ -35,8 +35,5 @@ class StaticGenerator
         return 0;
     }
 
-    private function make_dir(string $path): void
-    {
-        is_dir($path) || mkdir($path, 0777, true);
-    }
+
 }
diff --git a/src/Support.php b/src/Support.php
deleted file mode 100644
index 4cd9a97..0000000
--- a/src/Support.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Lucent;
-
-
-class Support 
-{
-    public static function toArray(mixed $data):array
-    {
-        return \json_decode(\json_encode($data), true);
-    }
-
-}
diff --git a/src/Views/layouts/account.blade.php b/src/Views/layouts/account.blade.php
index 2587fce..dc9832d 100644
--- a/src/Views/layouts/account.blade.php
+++ b/src/Views/layouts/account.blade.php
@@ -6,7 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <title>@yield('title') - Lucent Data Platform</title>
-    @vite(['resources/js/app.js'])
+    @php
+        echo '<script type="module" crossorigin src="http://127.0.0.1:5173/@vite/client"></script>';
+    @endphp
+    <script type="module"  crossorigin src="http://127.0.0.1:5173/main.js"></script>
     <link rel="icon" type="image/x-icon" href="/favicon.ico">
 
 </head>
diff --git a/src/Views/layouts/channel.blade.php b/src/Views/layouts/channel.blade.php
index 8ace42d..259266c 100644
--- a/src/Views/layouts/channel.blade.php
+++ b/src/Views/layouts/channel.blade.php
@@ -6,7 +6,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <title>@yield('title') - Lucent Data Platform</title>
-    @vite(['resources/js/app.js'])
+    <!-- if development -->
+    @php
+    echo '<script type="module" crossorigin src="http://127.0.0.1:5173/@vite/client"></script>';
+    @endphp
+    <script type="module"  crossorigin src="http://127.0.0.1:5173/main.js"></script>
+    <!-- if production -->
+    {{-- <link rel="stylesheet" href="/assets/{{ manifest['main.js'].css }}" />
+    <script type="module" src="/assets/{{ manifest['main.js'].file }}"></script> --}}
     <link rel="icon" type="image/x-icon" href="/favicon.ico">
 
 </head>
diff --git a/src/macros.php b/src/macros.php
index d9ebe65..df0e305 100644
--- a/src/macros.php
+++ b/src/macros.php
@@ -31,3 +31,9 @@ if (!function_exists('toArray')) {
 }
 
 
+if (!function_exists('make_dir_r')) {
+    function make_dir_r(string $path): void
+    {
+        is_dir($path) || mkdir($path, 0777, true);
+    }
+}