diff --git a/.changeset/curvy-flowers-grin.md b/.changeset/curvy-flowers-grin.md
new file mode 100644
index 000000000..2c0ae5f9a
--- /dev/null
+++ b/.changeset/curvy-flowers-grin.md
@@ -0,0 +1,5 @@
+---
+"@svenvw/fdm-core": minor
+---
+
+Remove organization functions as better-auth can handle them now server-side as well
diff --git a/.changeset/polite-otters-follow.md b/.changeset/polite-otters-follow.md
new file mode 100644
index 000000000..5eedcca2c
--- /dev/null
+++ b/.changeset/polite-otters-follow.md
@@ -0,0 +1,5 @@
+---
+"@svenvw/fdm-core": patch
+---
+
+Fix type of FdmAuth by including plugins and other settings
diff --git a/.changeset/twelve-chicken-poke.md b/.changeset/twelve-chicken-poke.md
new file mode 100644
index 000000000..c9d0912da
--- /dev/null
+++ b/.changeset/twelve-chicken-poke.md
@@ -0,0 +1,5 @@
+---
+"@svenvw/fdm-app": patch
+---
+
+Use Better-Auth functions for organizations instead of fdm-core functions
diff --git a/fdm-app/app/lib/auth.server.ts b/fdm-app/app/lib/auth.server.ts
index d7c7bde6b..89eb06f77 100644
--- a/fdm-app/app/lib/auth.server.ts
+++ b/fdm-app/app/lib/auth.server.ts
@@ -33,11 +33,11 @@ if (serverConfig.mail) {
             create: {
                 ...auth.options.databaseHooks?.user?.create,
                 after: async (
-                    user: ExtendedUser,
+                    user: any,
                     context?: GenericEndpointContext,
                 ) => {
                     if (originalUserCreateAfter) {
-                        await originalUserCreateAfter(user, context)
+                        await originalUserCreateAfter(user)
                     }
                     try {
                         const email = await renderWelcomeEmail(user)
@@ -75,10 +75,11 @@ export async function getSession(request: Request): Promise<FdmSession> {
     }
 
     // Determine userName
-    let displayUserName = user.displayUsername
-    if (!displayUserName) {
-        displayUserName = createDisplayUsername(user.firstname, user.surname)
-    }
+    const displayUserName =
+        user.displayUsername ||
+        createDisplayUsername(user.firstname, user.surname) ||
+        user.name ||
+        user.email
 
     // Expand session
     const sessionWithUserName = {
diff --git a/fdm-app/app/routes/organization.$slug.tsx b/fdm-app/app/routes/organization.$slug.tsx
index 968d3f000..31c8d8b5b 100644
--- a/fdm-app/app/routes/organization.$slug.tsx
+++ b/fdm-app/app/routes/organization.$slug.tsx
@@ -1,12 +1,5 @@
-import {
-    cancelPendingInvitation,
-    getOrganization,
-    getPendingInvitationsForOrganization,
-    getUsersInOrganization,
-    inviteUserToOrganization,
-    removeUserFromOrganization,
-    updateRoleOfUserAtOrganization,
-} from "@svenvw/fdm-core"
+import type { User } from "better-auth"
+import type { Invitation, Member, Organization } from "better-auth/plugins"
 import { formatDistanceToNow } from "date-fns"
 import { nl } from "date-fns/locale"
 import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router"
@@ -32,10 +25,9 @@ import {
     SelectValue,
 } from "~/components/ui/select"
 import { Separator } from "~/components/ui/separator"
-import { getSession } from "~/lib/auth.server"
+import { auth, getSession } from "~/lib/auth.server"
 import { renderInvitationEmail, sendEmail } from "~/lib/email.server"
 import { handleActionError, handleLoaderError } from "~/lib/error"
-import { fdm } from "~/lib/fdm.server"
 import { extractFormValuesFromRequest } from "~/lib/form"
 
 export async function loader({ request, params }: LoaderFunctionArgs) {
@@ -44,27 +36,58 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
     }
 
     const session = await getSession(request)
-    const organization = await getOrganization(
-        fdm,
-        params.slug,
-        session.user.id,
-    )
+    const organizations = await auth.api.listOrganizations({
+        headers: request.headers,
+    })
+
+    const organization = organizations.find((org) => org.slug === params.slug)
 
     if (!organization) {
         throw handleLoaderError("not found: organization")
     }
 
     // Get members of organization
-    const members = await getUsersInOrganization(fdm, params.slug)
+    const membersListResponse = await auth.api.listMembers({
+        headers: request.headers,
+        query: {
+            organizationId: organization.id,
+        },
+    })
+    const members = membersListResponse.members
+
+    // Determine permissions
+    const currentUserMember = members.find((m) => m.userId === session.user.id)
+    const role = currentUserMember?.role || "viewer"
+    const permissions = {
+        canEdit: role === "owner" || role === "admin",
+        canDelete: role === "owner",
+        canInvite: role === "owner" || role === "admin",
+        canUpdateRoleUser: role === "owner" || role === "admin",
+        canRemoveUser: role === "owner" || role === "admin",
+    }
 
     // Get pending invitations of organization
-    const invitations = await getPendingInvitationsForOrganization(
-        fdm,
-        organization.id,
-    )
+    let invitations: Invitation[] = []
+    if (permissions.canInvite) {
+        const invitationsListResponse = await auth.api.listInvitations({
+            headers: request.headers,
+            query: {
+                organizationId: organization.id,
+            },
+        })
+        invitations = (
+            Array.isArray(invitationsListResponse)
+                ? invitationsListResponse
+                : []
+        ).filter((inv) => inv.status === "pending")
+    }
 
     return {
-        organization: organization,
+        organization: {
+            ...organization,
+            permissions,
+            description: organization.metadata?.description || "",
+        },
         invitations: invitations,
         members: members,
     }
@@ -103,10 +126,9 @@ export default function OrganizationIndex() {
                                 <div className="grid gap-6">
                                     {members.map((member) => (
                                         <MemberRow
-                                            key={member.username}
+                                            key={member.id}
                                             member={member}
                                             permissions={permissions}
-                                            slug={organization.slug}
                                         />
                                     ))}
                                 </div>
@@ -142,11 +164,8 @@ export default function OrganizationIndex() {
                                         <div className="grid gap-6">
                                             {invitations.map((invitation) => (
                                                 <InvitationRow
-                                                    key={
-                                                        invitation.invitation_id
-                                                    }
+                                                    key={invitation.id}
                                                     invitation={invitation}
-                                                    permissions={permissions}
                                                 />
                                             ))}
                                         </div>
@@ -161,18 +180,20 @@ export default function OrganizationIndex() {
     )
 }
 
+type MemberWithUser = Member & {
+    user: {
+        id: string
+        name: string
+        email: string
+        image?: string | null
+    }
+}
+
 const MemberRow = ({
     member,
     permissions,
 }: {
-    member: {
-        id: string
-        firstname: string
-        surname: string
-        username: string
-        role: string
-        image: string
-    }
+    member: MemberWithUser
     permissions: {
         canEdit: boolean
         canDelete: boolean
@@ -181,20 +202,17 @@ const MemberRow = ({
         canRemoveUser: boolean
     }
 }) => {
-    const initials = member.firstname.charAt(0) + member.surname.charAt(0)
+    const initials = (member.user.name || "?").charAt(0).toUpperCase()
     return (
-        <div
-            key={member.username}
-            className="flex items-center justify-between space-x-4"
-        >
+        <div className="flex items-center justify-between space-x-4">
             <div className="flex items-center space-x-4">
                 <Avatar>
-                    <AvatarImage src={member.image} />
+                    <AvatarImage src={member.user.image ?? undefined} />
                     <AvatarFallback>{initials}</AvatarFallback>
                 </Avatar>
                 <div>
                     <p className="text-sm font-medium leading-none">
-                        {member.firstname} {member.surname}
+                        {member.user.name}
                     </p>
                     {!permissions.canUpdateRoleUser ? (
                         <p className="text-sm text-muted-foreground">
@@ -214,13 +232,7 @@ const MemberAction = ({
     member,
     permissions,
 }: {
-    member: {
-        firstname: string
-        surname: string
-        username: string
-        role: string
-        image: string
-    }
+    member: MemberWithUser
     permissions: {
         canEdit: boolean
         canDelete: boolean
@@ -231,15 +243,15 @@ const MemberAction = ({
 }) => {
     return (
         <form method="post" className="flex items-center space-x-4">
-            <input type="hidden" name="username" value={member.username} />
+            <input type="hidden" name="memberId" value={member.id} />
             <Select defaultValue={member.role} name="role">
-                <SelectTrigger className="ml-auto w-[110px]">
+                <SelectTrigger className="ml-auto w-27.5">
                     <SelectValue placeholder="Select" />
                 </SelectTrigger>
                 <SelectContent>
-                    <SelectItem value="owner">Owner</SelectItem>
-                    <SelectItem value="admin">Admin</SelectItem>
-                    <SelectItem value="member">Member</SelectItem>
+                    <SelectItem value="owner">Eigenaar</SelectItem>
+                    <SelectItem value="admin">Beheerder</SelectItem>
+                    <SelectItem value="member">Lid</SelectItem>
                 </SelectContent>
             </Select>
             {permissions.canRemoveUser ? (
@@ -264,27 +276,13 @@ const MemberAction = ({
     )
 }
 
-const InvitationRow = ({
-    invitation,
-}: {
-    invitation: {
-        email: string
-        role: string
-        expires_at: Date
-        inviter_firstname: string
-        inviter_surname: string
-        invitation_id: string
-    }
-}) => {
+const InvitationRow = ({ invitation }: { invitation: Invitation }) => {
     return (
-        <div
-            key={invitation.invitation_id}
-            className="flex items-center justify-between space-x-4"
-        >
+        <div className="flex items-center justify-between space-x-4">
             <div className="flex items-center space-x-4">
                 <Avatar>
                     <AvatarFallback>
-                        {invitation.email.charAt(0).toUpperCase()}
+                        {(invitation.email || "?").charAt(0).toUpperCase()}
                     </AvatarFallback>
                 </Avatar>
                 <div>
@@ -299,21 +297,19 @@ const InvitationRow = ({
             <div>
                 <p className="text-sm font-medium leading-none">
                     Verloopt{" "}
-                    {formatDistanceToNow(invitation.expires_at, {
+                    {formatDistanceToNow(new Date(invitation.expiresAt), {
                         addSuffix: true,
                         locale: nl,
                     })}
                 </p>
-                <p className="text-sm text-muted-foreground">
-                    {`Uitgenodigd door: ${invitation.inviter_firstname} ${invitation.inviter_surname}`}
-                </p>
             </div>
             <form method="post">
                 <input
                     type="hidden"
                     name="invitation_id"
-                    value={invitation.invitation_id}
+                    value={invitation.id}
                 />
+                <input type="hidden" name="email" value={invitation.email} />
                 <Button
                     variant="destructive"
                     className="shrink-0"
@@ -327,7 +323,11 @@ const InvitationRow = ({
     )
 }
 
-const InvitationForm = ({ organizationId }: { organizationId: string }) => {
+const InvitationForm = ({
+    organizationId,
+}: {
+    organizationId: Organization["id"]
+}) => {
     return (
         <form method="post" className="flex space-x-2">
             <input
@@ -341,13 +341,13 @@ const InvitationForm = ({ organizationId }: { organizationId: string }) => {
                 name="email"
             />
             <Select defaultValue="member" name="role">
-                <SelectTrigger className="ml-auto w-[110px]">
+                <SelectTrigger className="ml-auto w-27.5">
                     <SelectValue placeholder="Select" />
                 </SelectTrigger>
                 <SelectContent>
-                    <SelectItem value="owner">Owner</SelectItem>
-                    <SelectItem value="admin">Admin</SelectItem>
-                    <SelectItem value="member">Member</SelectItem>
+                    <SelectItem value="owner">Eigenaar</SelectItem>
+                    <SelectItem value="admin">Beheerder</SelectItem>
+                    <SelectItem value="member">Lid</SelectItem>
                 </SelectContent>
             </Select>
             <Button
@@ -364,9 +364,8 @@ const InvitationForm = ({ organizationId }: { organizationId: string }) => {
 
 const FormSchema = z.object({
     email: z.string().email().optional(),
-    username: z.string().optional(),
     role: z.enum(["owner", "admin", "member"]).optional(),
-    user_id: z.string().optional(),
+    memberId: z.string().optional(),
     invitation_id: z.string().optional(),
     organization_id: z.string().optional(),
     intent: z.enum([
@@ -382,19 +381,24 @@ export async function action({ request, params }: ActionFunctionArgs) {
         if (!params.slug) {
             throw handleActionError("not found: organization")
         }
+
         const formValues = await extractFormValuesFromRequest(
             request,
             FormSchema,
         )
         const session = await getSession(request)
-        const organization = await getOrganization(
-            fdm,
-            params.slug,
-            session.user.id,
+
+        const organizations = await auth.api.listOrganizations({
+            headers: request.headers,
+        })
+        const organization = organizations.find(
+            (org) => org.slug === params.slug,
         )
         if (!organization) {
             throw handleActionError("not found: organization")
         }
+        const organizationId = organization.id
+        const organizationName = organization.name
 
         if (formValues.intent === "invite_user") {
             if (!formValues.email) {
@@ -406,68 +410,76 @@ export async function action({ request, params }: ActionFunctionArgs) {
             if (!formValues.role) {
                 return handleActionError("missing: role")
             }
-            const invitationId = await inviteUserToOrganization(
-                fdm,
-                session.user.id,
-                formValues.email,
-                formValues.role,
-                organization.id,
-            )
-            const invitationEmail = await renderInvitationEmail(
-                formValues.email,
-                {
-                    firstname: session.user.firstname,
-                    surname: session.user.surname,
+
+            const invitation = await auth.api.createInvitation({
+                headers: request.headers,
+                body: {
+                    email: formValues.email,
+                    role: formValues.role,
+                    organizationId: organizationId,
                 },
-                organization.name,
-                invitationId,
-            )
-            await sendEmail(invitationEmail)
+            })
+
+            // better-auth might not send email by default depending on config.
+            // We'll send it manually using our template.
+            if (invitation?.id) {
+                const invitationEmail = await renderInvitationEmail(
+                    formValues.email,
+                    session.user,
+                    organizationName,
+                    invitation.id,
+                )
+                await sendEmail(invitationEmail)
+            }
 
             return dataWithSuccess(null, {
                 message: `Gebruiker ${formValues.email} is uitgenodigd! 🎉`,
             })
         }
         if (formValues.intent === "update_role") {
-            if (!formValues.username) {
-                return handleActionError("missing: username")
+            if (!formValues.memberId) {
+                return handleActionError("missing: memberId")
             }
             if (!formValues.role) {
                 return handleActionError("missing: role")
             }
-            await updateRoleOfUserAtOrganization(
-                fdm,
-                session.user.id,
-                organization.id,
-                formValues.username,
-                formValues.role,
-            )
+
+            await auth.api.updateMemberRole({
+                headers: request.headers,
+                body: {
+                    memberId: formValues.memberId,
+                    role: formValues.role,
+                    organizationId: organizationId,
+                },
+            })
             return dataWithSuccess(null, {
                 message: "Rol is bijgewerkt! 🎉",
             })
         }
         if (formValues.intent === "remove_user") {
-            if (!formValues.username) {
-                return handleActionError("missing: username")
+            if (!formValues.memberId) {
+                return handleActionError("missing: memberId")
             }
-            await removeUserFromOrganization(
-                fdm,
-                session.user.id,
-                organization.id,
-                formValues.username,
-            )
+            await auth.api.removeMember({
+                headers: request.headers,
+                body: {
+                    memberIdOrEmail: formValues.memberId,
+                    organizationId: organizationId,
+                },
+            })
             return dataWithSuccess(null, {
-                message: `Gebruiker ${formValues.username} is verwijderd`,
+                message: "Gebruiker is verwijderd",
             })
         }
         if (formValues.intent === "cancel_invite") {
             if (!formValues.invitation_id)
                 throw new Error("invalid invitation_id")
-            await cancelPendingInvitation(
-                fdm,
-                formValues.invitation_id,
-                session.user.id,
-            )
+            await auth.api.cancelInvitation({
+                headers: request.headers,
+                body: {
+                    invitationId: formValues.invitation_id,
+                },
+            })
             return dataWithSuccess(null, {
                 message: `Uitnodiging voor ${formValues.email} is ingetrokken`,
             })
diff --git a/fdm-app/app/routes/organization._index.tsx b/fdm-app/app/routes/organization._index.tsx
index 5c3f23fea..10e004453 100644
--- a/fdm-app/app/routes/organization._index.tsx
+++ b/fdm-app/app/routes/organization._index.tsx
@@ -1,8 +1,6 @@
-import { getOrganizationsForUser } from "@svenvw/fdm-core"
 import type { LoaderFunctionArgs } from "react-router"
 import { NavLink, useLoaderData } from "react-router-dom"
 import { FarmTitle } from "~/components/blocks/farm/farm-title"
-import { Badge } from "~/components/ui/badge"
 import { Button } from "~/components/ui/button"
 import {
     Card,
@@ -12,27 +10,17 @@ import {
     CardHeader,
     CardTitle,
 } from "~/components/ui/card"
-import { getSession } from "~/lib/auth.server"
+import { auth, getSession } from "~/lib/auth.server"
 import { handleLoaderError } from "~/lib/error"
-import { fdm } from "~/lib/fdm.server"
-
-// Define the type for a single organization based on getOrganizationsForUser return type
-type OrganizationType = {
-    organization_id: string
-    name: string
-    slug: string
-    role: string
-    is_verified: boolean
-    description: string
-}
 
 export async function loader({ request }: LoaderFunctionArgs) {
     try {
-        const session = await getSession(request)
-        const organizations = await getOrganizationsForUser(
-            fdm,
-            session.user.id,
-        )
+        await getSession(request)
+
+        const organizations = await auth.api.listOrganizations({
+            headers: request.headers,
+        })
+
         return { organizations }
     } catch (error) {
         throw handleLoaderError(error)
@@ -40,9 +28,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
 }
 
 export default function OrganizationsIndex() {
-    const { organizations } = useLoaderData<{
-        organizations: OrganizationType[]
-    }>()
+    const { organizations } = useLoaderData<typeof loader>()
 
     return (
         <main className="container">
@@ -62,7 +48,7 @@ export default function OrganizationsIndex() {
                 </div>
 
                 {organizations.length === 0 ? (
-                    <div className="mx-auto flex h-full w-full items-center flex-col justify-center space-y-6 sm:w-[350px]">
+                    <div className="mx-auto flex h-full w-full items-center flex-col justify-center space-y-6 sm:w-87.5">
                         <div className="flex flex-col space-y-2 text-center">
                             <h1 className="text-2xl font-semibold tracking-tight">
                                 Je bent nog geen lid van een organisatie
@@ -80,25 +66,20 @@ export default function OrganizationsIndex() {
                     </div>
                 ) : (
                     <div className="grid gap-4 grid-cols-1">
-                        {organizations.map((org: OrganizationType) => (
-                            <Card key={org.organization_id}>
+                        {organizations.map((org) => (
+                            <Card key={org.id}>
                                 <CardHeader>
                                     <CardTitle>
                                         <div className="flex items-center justify-between">
-                                            {org.name}
-                                            <Badge
-                                                className="ml-auto"
-                                                variant="secondary"
-                                            >
-                                                {org.role}
-                                            </Badge>
+                                            {org.name}                                          
                                         </div>
                                     </CardTitle>
                                     <CardDescription />
                                 </CardHeader>
                                 <CardContent>
                                     <p className="text-sm text-muted-foreground truncate">
-                                        {org.description}
+                                        {org.metadata?.description ??
+                                            "Geen beschrijving"}
                                     </p>
                                 </CardContent>
                                 <CardFooter>
diff --git a/fdm-app/app/routes/organization.invitations.$invitation_id.respond.tsx b/fdm-app/app/routes/organization.invitations.$invitation_id.respond.tsx
index d0fbf7255..df86969a0 100644
--- a/fdm-app/app/routes/organization.invitations.$invitation_id.respond.tsx
+++ b/fdm-app/app/routes/organization.invitations.$invitation_id.respond.tsx
@@ -1,8 +1,3 @@
-import {
-    acceptInvitation,
-    getPendingInvitation,
-    rejectInvitation,
-} from "@svenvw/fdm-core"
 import { useEffect } from "react"
 import {
     type ActionFunctionArgs,
@@ -14,7 +9,7 @@ import {
     useSearchParams,
     useSubmit,
 } from "react-router"
-import { redirectWithSuccess } from "remix-toast"
+import { dataWithError, redirectWithSuccess } from "remix-toast"
 import z from "zod"
 import { Button } from "~/components/ui/button"
 import {
@@ -25,8 +20,7 @@ import {
     CardTitle,
 } from "~/components/ui/card"
 import { Separator } from "~/components/ui/separator"
-import { getSession } from "~/lib/auth.server"
-import { fdm } from "~/lib/fdm.server"
+import { auth, getSession } from "~/lib/auth.server"
 import { extractFormValuesFromRequest } from "~/lib/form"
 import type { Route } from "../+types/root"
 
@@ -34,36 +28,32 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
     await getSession(request)
 
     // Check for valid invitation id
-    if (!params.invitation_id) {
-        throw failBadRequest("Bad Request: invitation id missing")
+    const invitationId = params.invitation_id
+    if (!invitationId) {
+        throw data("Invitation not found", {
+            status: 404,
+            statusText: "Invitation not found",
+        })
     }
-
-    // Check for valid invitation
-    try {
-        const invitation = await getPendingInvitation(fdm, params.invitation_id)
-
-        return {
-            invitationId: invitation.invitation_id,
-            inviterFirstName: invitation.inviter_firstname,
-            inviterSurname: invitation.inviter_surname,
-            organizationSlug: invitation.organization_slug,
-            organizationName: invitation.organization_name,
-            role: invitation.role,
-        }
-    } catch (_e) {
-        throw data("Invitation not found", 404)
+    const invitation = await auth.api.getInvitation({
+        query: {
+            id: invitationId,
+        },
+        headers: request.headers,
+    })
+
+    if (!invitation) {
+        throw data("Uitnodiging niet gevonden", {
+            status: 404,
+            statusText: "Invitation not found",
+        })
     }
+
+    return invitation
 }
 
 export default function Respond() {
-    const {
-        invitationId,
-        inviterFirstName,
-        inviterSurname,
-        organizationSlug,
-        organizationName,
-        role,
-    } = useLoaderData()
+    const invitation = useLoaderData<typeof loader>()
 
     const [searchParams] = useSearchParams()
     const intentRaw = searchParams.get("intent")
@@ -75,22 +65,20 @@ export default function Respond() {
         if (intent && intent === "accept") {
             submit(
                 {
-                    invitation_id: invitationId,
                     intent: "accept",
-                    organization_slug: organizationSlug,
                 },
                 { method: "POST" },
             )
         }
-    }, [intent, submit, invitationId, organizationSlug])
+    }, [intent, submit])
 
-    if (intent !== "accept" && intent !== "reject") {
-        throw failBadRequest(`Invalid intent: ${intent}`)
+    if (intent !== "accept" && intent !== "reject" && intent !== "do_nothing") {
+        throw new Error(`Invalid intent: ${intent}`)
     }
 
     if (intent === "accept") {
         return (
-            <h1 className="font-semibold mt-[200px] text-3xl text-center text-primary">
+            <h1 className="font-semibold mt-50 text-3xl text-center text-primary">
                 Uitnodiging wordt geaccepteerd...
             </h1>
         )
@@ -105,12 +93,12 @@ export default function Respond() {
                 <CardContent>
                     <Separator />
                     <p className="my-1">
-                        {`${inviterFirstName} ${inviterSurname} heeft je uitgenodigd om lid te worden van de organisatie `}
-                        <span className="font-semibold">{`${organizationName}.`}</span>
+                        {`${invitation.inviterEmail} heeft je uitgenodigd om lid te worden van de organisatie `}
+                        <span className="font-semibold">{`${invitation.organizationName}.`}</span>
                     </p>
                     <p className="my-1">
                         Je bent uitgenodigd als{" "}
-                        <i className="font-semibold">{role}</i>
+                        <i className="font-semibold">{invitation.role}</i>
                     </p>
                     <p className="my-1">
                         Weet je zeker dat je deze uitnodiging wilt afwijzen?
@@ -121,7 +109,7 @@ export default function Respond() {
                         <input
                             type="hidden"
                             name="invitation_id"
-                            value={invitationId}
+                            value={invitation.id}
                         />
                         <Button
                             variant="destructive"
@@ -145,41 +133,67 @@ export default function Respond() {
 }
 
 const FormSchema = z.object({
-    invitation_id: z.string(),
     intent: z.enum(["accept", "reject", "do_nothing"]),
-    organization_slug: z.string().optional(),
 })
 
-export async function action({ request }: ActionFunctionArgs) {
+export async function action({ request, params }: ActionFunctionArgs) {
     const formValues = await extractFormValuesFromRequest(request, FormSchema)
 
-    const session = await getSession(request)
+    await getSession(request)
+
+    const invitationId = params.invitation_id
+    if (!invitationId) {
+        throw data("Invitation not found", {
+            status: 404,
+            statusText: "Invitation not found",
+        })
+    }
+    const invitation = await auth.api.getInvitation({
+        query: {
+            id: invitationId,
+        },
+        headers: request.headers,
+    })
+
+    if (!invitation) {
+        throw dataWithError("Invitation not found", {
+            message: "Uitnodiging niet gevonden",
+        })
+    }
 
     if (formValues.intent === "accept") {
         try {
-            await acceptInvitation(
-                fdm,
-                formValues.invitation_id,
-                session.user.id,
-            )
-        } catch (_) {
-            throw data("Invitation not found", 404)
+            await auth.api.acceptInvitation({
+                headers: request.headers,
+                body: { invitationId: invitationId },
+            })
+        } catch (error) {
+            console.error("Failed to accept invitation:", error)
+            throw data("Failed to accept invitation", { status: 400 })
         }
-        return redirectWithSuccess(
-            `/organization/${formValues.organization_slug}`,
-            {
-                message: "Uitnodiging geaccepteerd! 🎉",
+
+        const organization = await auth.api.getFullOrganization({
+            query: {
+                organizationId: invitation.organizationId,
             },
-        )
+            headers: request.headers,
+        })
+        if (!organization) {
+            throw data("Organization not found", 404)
+        }
+        const organizationSlug = organization.slug
+
+        return redirectWithSuccess(`/organization/${organizationSlug}`, {
+            message: "Uitnodiging geaccepteerd! 🎉",
+        })
     }
 
     if (formValues.intent === "reject") {
         try {
-            await rejectInvitation(
-                fdm,
-                formValues.invitation_id,
-                session.user.id,
-            )
+            await auth.api.rejectInvitation({
+                headers: request.headers,
+                body: { invitationId: invitationId },
+            })
         } catch (_) {
             throw data("Invitation not found", 404)
         }
@@ -238,12 +252,3 @@ export function ErrorBoundary(props: Route.ErrorBoundaryProps) {
 
     throw error
 }
-
-function failBadRequest(message: string) {
-    // Not 400 because 400 currently hits the Not Found error page
-    return fail(message, 500)
-}
-
-function fail(message: string, status: number) {
-    return data(message, { statusText: message, status: status })
-}
diff --git a/fdm-app/app/routes/organization.invitations._index.tsx b/fdm-app/app/routes/organization.invitations._index.tsx
index d5c357512..4acd81b1b 100644
--- a/fdm-app/app/routes/organization.invitations._index.tsx
+++ b/fdm-app/app/routes/organization.invitations._index.tsx
@@ -1,8 +1,3 @@
-import {
-    acceptInvitation,
-    getPendingInvitationsForUser,
-    rejectInvitation,
-} from "@svenvw/fdm-core"
 import { formatDistanceToNow } from "date-fns"
 import { nl } from "date-fns/locale"
 import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router"
@@ -28,39 +23,37 @@ import {
     DialogTitle,
     DialogTrigger,
 } from "~/components/ui/dialog"
-import { getSession } from "~/lib/auth.server"
+import { auth, getSession } from "~/lib/auth.server"
 import { handleActionError, handleLoaderError } from "~/lib/error"
-import { fdm } from "~/lib/fdm.server"
 import { extractFormValuesFromRequest } from "~/lib/form"
 
-// Define the type for a single invitation
-type InvitationType = {
-    invitation_id: string
-    organization_name: string
-    organization_slug: string
-    inviter_firstname: string
-    inviter_surname: string
-    role: string
-    expires_at: Date
-}
-
 export async function loader({ request }: LoaderFunctionArgs) {
     try {
-        const session = await getSession(request)
-        const invitations = await getPendingInvitationsForUser(
-            fdm,
-            session.user.id,
+        await getSession(request)
+
+        const invitationsList = await auth.api.listUserInvitations({
+            headers: request.headers,
+        })
+
+        const invitations = await Promise.all(
+            invitationsList.map(async (invitation) => {
+                return await auth.api.getInvitation({
+                    query: {
+                        id: invitation.id,
+                    },
+                    headers: request.headers,
+                })
+            }),
         )
-        return { invitations }
+
+        return { invitations: invitations }
     } catch (error) {
         throw handleLoaderError(error)
     }
 }
 
 export default function OrganizationsIndex() {
-    const { invitations } = useLoaderData<{
-        invitations: InvitationType[]
-    }>()
+    const { invitations } = useLoaderData<typeof loader>()
 
     return (
         <main className="container">
@@ -75,7 +68,7 @@ export default function OrganizationsIndex() {
                 </div>
 
                 {invitations.length === 0 ? (
-                    <div className="mx-auto flex h-full w-full items-center flex-col justify-center space-y-6 sm:w-[350px]">
+                    <div className="mx-auto flex h-full w-full items-center flex-col justify-center space-y-6 sm:w-87.5">
                         <div className="flex flex-col space-y-2 text-center">
                             <h1 className="text-2xl font-semibold tracking-tight">
                                 Je hebt op dit moment geen uitnodigingen open
@@ -95,15 +88,14 @@ export default function OrganizationsIndex() {
                 ) : (
                     <div className="grid gap-4 grid-cols-1">
                         {invitations.map((invitation) => (
-                            <Card key={invitation.invitation_id}>
+                            <Card key={invitation.id}>
                                 <CardHeader>
                                     <CardTitle>
-                                        {invitation.organization_name}
+                                        {invitation.organizationName}
                                     </CardTitle>
                                     <CardDescription>
                                         Uitgenodigd door{" "}
-                                        {invitation.inviter_firstname}{" "}
-                                        {invitation.inviter_surname}
+                                        {invitation.inviterEmail}
                                     </CardDescription>
                                 </CardHeader>
                                 <CardContent>
@@ -117,7 +109,7 @@ export default function OrganizationsIndex() {
                                     <p className="text-sm text-muted-foreground mt-2">
                                         Verloopt{" "}
                                         {formatDistanceToNow(
-                                            invitation.expires_at,
+                                            new Date(invitation.expiresAt),
                                             {
                                                 addSuffix: true,
                                                 locale: nl,
@@ -128,7 +120,7 @@ export default function OrganizationsIndex() {
                                 <CardFooter className="flex justify-between">
                                     <Button asChild variant="outline" size="sm">
                                         <NavLink
-                                            to={`/organization/${invitation.organization_slug}`}
+                                            to={`/organization/${invitation.organizationId}`}
                                         >
                                             Meer info
                                         </NavLink>
@@ -138,7 +130,7 @@ export default function OrganizationsIndex() {
                                             <input
                                                 type="hidden"
                                                 name="invitation_id"
-                                                value={invitation.invitation_id}
+                                                value={invitation.id}
                                             />
                                             <Button
                                                 name="intent"
@@ -166,7 +158,7 @@ export default function OrganizationsIndex() {
                                                         Weet je zeker dat je de
                                                         uitnodiging van{" "}
                                                         {
-                                                            invitation.organization_name
+                                                            invitation.organizationName
                                                         }{" "}
                                                         wilt afwijzen?
                                                     </DialogDescription>
@@ -177,7 +169,7 @@ export default function OrganizationsIndex() {
                                                             type="hidden"
                                                             name="invitation_id"
                                                             value={
-                                                                invitation.invitation_id
+                                                                invitation.id
                                                             }
                                                         />
                                                         <Button
@@ -215,24 +207,23 @@ export async function action({ request }: ActionFunctionArgs) {
             FormSchema,
         )
 
-        const session = await getSession(request)
+        // getSession call is important to validate session
+        await getSession(request)
 
         if (formValues.intent === "accept") {
-            await acceptInvitation(
-                fdm,
-                formValues.invitation_id,
-                session.user.id,
-            )
+            await auth.api.acceptInvitation({
+                headers: request.headers,
+                body: { invitationId: formValues.invitation_id },
+            })
             return redirectWithSuccess("/organization", {
                 message: "Uitnodiging geaccepteerd! 🎉",
             })
         }
         if (formValues.intent === "reject") {
-            await rejectInvitation(
-                fdm,
-                formValues.invitation_id,
-                session.user.id,
-            )
+            await auth.api.rejectInvitation({
+                headers: request.headers,
+                body: { invitationId: formValues.invitation_id },
+            })
             return redirectWithSuccess("/organization", {
                 message: "Uitnodiging afgewezen",
             })
diff --git a/fdm-app/app/routes/organization.new.tsx b/fdm-app/app/routes/organization.new.tsx
index 87356c84a..8fa5ef05b 100644
--- a/fdm-app/app/routes/organization.new.tsx
+++ b/fdm-app/app/routes/organization.new.tsx
@@ -1,13 +1,8 @@
 import { zodResolver } from "@hookform/resolvers/zod"
-import {
-    checkOrganizationSlugForAvailability,
-    createOrganization,
-} from "@svenvw/fdm-core"
 import { useEffect } from "react"
 import {
     type ActionFunctionArgs,
     Form,
-    type LoaderFunctionArgs,
     type MetaFunction,
 } from "react-router"
 import { RemixFormProvider, useRemixForm } from "remix-hook-form"
@@ -33,10 +28,9 @@ import {
 } from "~/components/ui/form"
 import { Input } from "~/components/ui/input"
 import { Textarea } from "~/components/ui/textarea"
-import { getSession } from "~/lib/auth.server"
+import { auth, getSession } from "~/lib/auth.server"
 import { clientConfig } from "~/lib/config"
 import { handleActionError, handleLoaderError } from "~/lib/error"
-import { fdm } from "~/lib/fdm.server"
 import { extractFormValuesFromRequest } from "~/lib/form"
 
 export const meta: MetaFunction = () => {
@@ -69,7 +63,7 @@ const FormSchema = z.object({
     description: z.string({}).optional(),
 })
 
-export async function loader({ request }: LoaderFunctionArgs) {
+export async function loader() {
     try {
         return {}
     } catch (error) {
@@ -102,7 +96,7 @@ export default function AddOrganizationPage() {
     useEffect(() => {
         const subscription = form.watch((value, { name }) => {
             if (name === "name") {
-                const slug = convertToSlug(value.name)
+                const slug = convertToSlug(value.name ?? "")
                 form.setValue("slug", slug, {
                     shouldDirty: true,
                     shouldValidate: true,
@@ -229,8 +223,7 @@ export default function AddOrganizationPage() {
 export async function action({ request }: ActionFunctionArgs) {
     try {
         // Get the session
-        const session = await getSession(request)
-        const user_id = session.user.id
+        await getSession(request)
 
         // Get the form values
         const formValues = await extractFormValuesFromRequest(
@@ -242,11 +235,14 @@ export async function action({ request }: ActionFunctionArgs) {
         const description = formValues.description || ""
 
         // Check if slug is available
-        const slugIsAvailable = await checkOrganizationSlugForAvailability(
-            fdm,
-            slug,
-        )
-        if (!slugIsAvailable) {
+        const { status } = await auth.api.checkOrganizationSlug({
+            headers: request.headers,
+            body: {
+                slug: slug,
+            },
+        })
+
+        if (!status) {
             return dataWithError(
                 null,
                 "Naam voor organisatie is niet meer beschikbaar. Kies een andere naam",
@@ -254,7 +250,16 @@ export async function action({ request }: ActionFunctionArgs) {
         }
 
         // Create the organization
-        await createOrganization(fdm, user_id, name, slug, description)
+        await auth.api.createOrganization({
+            headers: request.headers,
+            body: {
+                name,
+                slug,
+                metadata: {
+                    description,
+                },
+            },
+        })
 
         return redirectWithSuccess(`/organization/${formValues.slug}`, {
             message: `Organisatie ${formValues.name} is aangemaakt! 🎉`,
diff --git a/fdm-app/app/routes/organization.tsx b/fdm-app/app/routes/organization.tsx
index c251995ca..97df2917b 100644
--- a/fdm-app/app/routes/organization.tsx
+++ b/fdm-app/app/routes/organization.tsx
@@ -1,4 +1,3 @@
-import { getOrganizationsForUser } from "@svenvw/fdm-core"
 import posthog from "posthog-js"
 import { useEffect } from "react"
 import type { LoaderFunctionArgs } from "react-router"
@@ -16,10 +15,9 @@ import {
     SidebarInset,
     SidebarProvider,
 } from "~/components/ui/sidebar"
-import { checkSession, getSession } from "~/lib/auth.server"
+import { auth, checkSession, getSession } from "~/lib/auth.server"
 import { clientConfig } from "~/lib/config"
 import { handleLoaderError } from "~/lib/error"
-import { fdm } from "~/lib/fdm.server"
 
 /**
  * Retrieves the session from the HTTP request and returns user information if available.
@@ -43,10 +41,9 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
         }
         const selectedOrganizationSlug = params.slug
 
-        const organizations = await getOrganizationsForUser(
-            fdm,
-            session.user.id,
-        )
+        const organizations = await auth.api.listOrganizations({
+            headers: request.headers,
+        })
 
         // Return user information from loader
         return {
diff --git a/fdm-app/app/routes/user._index.tsx b/fdm-app/app/routes/user._index.tsx
index ea1f3d8b3..4f2461257 100644
--- a/fdm-app/app/routes/user._index.tsx
+++ b/fdm-app/app/routes/user._index.tsx
@@ -87,7 +87,10 @@ export default function User() {
                     <CardContent className="space-y-4">
                         <div className="flex items-center space-x-4">
                             <Avatar className="h-12 w-12">
-                                <AvatarImage src={user.image} alt={user.name} />
+                                <AvatarImage
+                                    src={user.image ?? undefined}
+                                    alt={user.name}
+                                />
                                 <AvatarFallback>
                                     {avatarInitials}
                                 </AvatarFallback>
diff --git a/fdm-app/app/types/extended-user.d.ts b/fdm-app/app/types/extended-user.d.ts
index e82d4fca9..70e04758b 100644
--- a/fdm-app/app/types/extended-user.d.ts
+++ b/fdm-app/app/types/extended-user.d.ts
@@ -1,9 +1,3 @@
-import type { User as BetterAuthUser } from "better-auth"
+import type { FdmAuth } from "@svenvw/fdm-core"
 
-// Extend the User type from better-auth to include additional fields
-export interface ExtendedUser extends BetterAuthUser {
-    userName: string | null
-    firstname?: string | null
-    surname?: string | null
-    displayUsername?: string | null
-}
+export type ExtendedUser = FdmAuth["$Infer"]["Session"]["user"]
\ No newline at end of file
diff --git a/fdm-core/src/authentication.d.ts b/fdm-core/src/authentication.d.ts
deleted file mode 100644
index c43a40352..000000000
--- a/fdm-core/src/authentication.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type { betterAuth } from "better-auth"
-
-export type FdmAuth = ReturnType<typeof betterAuth>
diff --git a/fdm-core/src/authentication.test.ts b/fdm-core/src/authentication.test.ts
index 858fe50df..a3a32ecf0 100644
--- a/fdm-core/src/authentication.test.ts
+++ b/fdm-core/src/authentication.test.ts
@@ -6,7 +6,7 @@ import {
     splitFullName,
     updateUserProfile,
 } from "./authentication"
-import type { FdmAuth } from "./authentication.d"
+import type { FdmAuth } from "./authentication"
 import * as authNSchema from "./db/schema-authn"
 import type { FdmType } from "./fdm"
 import { createFdmServer } from "./fdm-server"
diff --git a/fdm-core/src/authentication.ts b/fdm-core/src/authentication.ts
index 29cd152fb..2386b4a5c 100644
--- a/fdm-core/src/authentication.ts
+++ b/fdm-core/src/authentication.ts
@@ -4,7 +4,6 @@ import { magicLink, organization, username } from "better-auth/plugins"
 import { eq } from "drizzle-orm"
 import { customAlphabet } from "nanoid"
 import { generateFromEmail } from "unique-username-generator"
-import type { FdmAuth } from "./authentication.d"
 import * as authNSchema from "./db/schema-authn"
 import { handleError } from "./error"
 import type { FdmType } from "./fdm"
@@ -38,7 +37,7 @@ export function createFdmAuth(
         code: string,
     ) => Promise<void>,
     emailAndPassword?: boolean,
-): FdmAuth {
+) {
     // Setup social auth providers
     let googleAuth
     if (google) {
@@ -93,7 +92,7 @@ export function createFdmAuth(
         }
     }
 
-    const auth: FdmAuth = betterAuth({
+    const auth = betterAuth({
         database: drizzleAdapter(fdm, {
             provider: "pg",
             schema: authNSchema,
@@ -157,6 +156,7 @@ export function createFdmAuth(
                                 metadata: {
                                     isVerified: false,
                                     description: "",
+                                    ...(organization.metadata || {}),
                                 },
                             },
                         }
@@ -233,6 +233,8 @@ export function createFdmAuth(
     return auth
 }
 
+export type FdmAuth = ReturnType<typeof createFdmAuth>
+
 /**
  * Updates the profile information of a user.
  *
diff --git a/fdm-core/src/authorization.test.ts b/fdm-core/src/authorization.test.ts
index 94565950c..04e256705 100644
--- a/fdm-core/src/authorization.test.ts
+++ b/fdm-core/src/authorization.test.ts
@@ -13,16 +13,12 @@ import {
     roles,
     updateRole,
 } from "./authorization"
+import * as authNSchema from "./db/schema-authn"
 import * as authZSchema from "./db/schema-authz"
 import { addFarm } from "./farm"
 import { createFdmServer } from "./fdm-server"
 import type { FdmServerType } from "./fdm-server.d"
 import { createId } from "./id"
-import {
-    acceptInvitation,
-    createOrganization,
-    inviteUserToOrganization,
-} from "./organization"
 
 describe("Authorization Functions", () => {
     let fdm: FdmServerType
@@ -76,7 +72,7 @@ describe("Authorization Functions", () => {
             principal_id,
         )
         const organization_owner_username = `orgowner${createId(8).toLowerCase()}`
-        const organization_owner = await fdmAuth.api.signUpEmail({
+        const organization_owner: any = await fdmAuth.api.signUpEmail({
             headers: undefined,
             body: {
                 email: `${organization_owner_username}@example.com`,
@@ -88,27 +84,48 @@ describe("Authorization Functions", () => {
             } as any,
         })
         organization_owner_id = organization_owner.user.id
-        organization_id = await createOrganization(
-            fdm,
-            organization_owner_id,
-            "Test Organization",
-            `test-${createId()}`,
-            "This is an organization created for testing purposes.",
-        )
-        const organization_member_username = `orgmember${createId(8).toLowerCase()}`
-        organization_member_email = `${organization_member_username}@example.com`
-        const organization_member = await fdmAuth.api.signUpEmail({
+
+        organization_id = createId()
+        await fdm.insert(authNSchema.organization).values({
+            id: organization_id,
+            name: "Test Organization",
+            slug: `test-org-${createId(8).toLowerCase()}`,
+            createdAt: new Date(),
+            metadata: JSON.stringify({ description: "Test organization" }),
+        })
+
+        // Make the owner a member
+        await fdm.insert(authNSchema.member).values({
+            id: createId(),
+            organizationId: organization_id,
+            userId: organization_owner_id,
+            role: "owner",
+            createdAt: new Date(),
+        })
+
+        // Set up member details for tests
+        organization_member_email = `member${createId(8).toLowerCase()}@example.com`
+        const member_user: any = await fdmAuth.api.signUpEmail({
             headers: undefined,
             body: {
                 email: organization_member_email,
                 name: "Organization Member",
                 firstname: "Organization",
                 surname: "Member",
-                username: organization_member_username,
+                username: `member${createId(8).toLowerCase()}`,
                 password: "password",
             } as any,
         })
-        organization_member_id = organization_member.user.id
+        organization_member_id = member_user.user.id
+
+        // Manually add member to organization
+        await fdm.insert(authNSchema.member).values({
+            id: createId(),
+            organizationId: organization_id,
+            userId: organization_member_id,
+            role: "member",
+            createdAt: new Date(),
+        })
     })
 
     describe("checkPermission", () => {
@@ -155,14 +172,7 @@ describe("Authorization Functions", () => {
 
         it("should grant access through the organization", async () => {
             await grantRole(fdm, "farm", "owner", farm_id, organization_id)
-            const invitation_id = await inviteUserToOrganization(
-                fdm,
-                organization_owner_id,
-                organization_member_email,
-                "owner",
-                organization_id,
-            )
-            await acceptInvitation(fdm, invitation_id, organization_member_id)
+            
             await checkPermission(
                 fdm,
                 "farm",
@@ -190,14 +200,7 @@ describe("Authorization Functions", () => {
 
         it("should not grant permissions higher than the organization permissions", async () => {
             await grantRole(fdm, "farm", "researcher", farm_id, organization_id)
-            const invitation_id = await inviteUserToOrganization(
-                fdm,
-                organization_owner_id,
-                organization_member_email,
-                "owner",
-                organization_id,
-            )
-            await acceptInvitation(fdm, invitation_id, organization_member_id)
+            
             await expect(
                 checkPermission(
                     fdm,
@@ -599,15 +602,7 @@ describe("Authorization Functions", () => {
             const farm_id2 = createId()
             await grantRole(fdm, "farm", "owner", farm_id, organization_id)
             await grantRole(fdm, "farm", "advisor", farm_id2, organization_id)
-            const invitation_id = await inviteUserToOrganization(
-                fdm,
-                organization_owner_id,
-                organization_member_email,
-                "admin",
-                organization_id,
-            )
-            await acceptInvitation(fdm, invitation_id, organization_member_id)
-
+            
             const accessibleResources = await listResources(
                 fdm,
                 "farm",
@@ -628,14 +623,7 @@ describe("Authorization Functions", () => {
                 organization_member_id,
             )
             await grantRole(fdm, "farm", "advisor", farm_id, organization_id)
-            const invitation_id = await inviteUserToOrganization(
-                fdm,
-                organization_owner_id,
-                organization_member_email,
-                "admin",
-                organization_id,
-            )
-            await acceptInvitation(fdm, invitation_id, organization_member_id)
+            
             const accessibleResources = await listResources(
                 fdm,
                 "farm",
@@ -777,14 +765,7 @@ describe("Authorization Functions", () => {
 
         it("should get roles derived from an organization", async () => {
             await grantRole(fdm, "farm", "researcher", farm_id, organization_id)
-            const invitation_id = await inviteUserToOrganization(
-                fdm,
-                organization_owner_id,
-                organization_member_email,
-                "admin",
-                organization_id,
-            )
-            await acceptInvitation(fdm, invitation_id, organization_member_id)
+            
             const roles = await getRolesOfPrincipalForResource(
                 fdm,
                 "farm",
@@ -803,14 +784,7 @@ describe("Authorization Functions", () => {
                 organization_member_id,
             )
             await grantRole(fdm, "farm", "owner", farm_id, organization_id)
-            const invitation_id = await inviteUserToOrganization(
-                fdm,
-                organization_owner_id,
-                organization_member_email,
-                "admin",
-                organization_id,
-            )
-            await acceptInvitation(fdm, invitation_id, organization_member_id)
+            
             const roles = await getRolesOfPrincipalForResource(
                 fdm,
                 "farm",
diff --git a/fdm-core/src/db/migrations/0020_thick_zodiak.sql b/fdm-core/src/db/migrations/0020_thick_zodiak.sql
new file mode 100644
index 000000000..752cb0f2b
--- /dev/null
+++ b/fdm-core/src/db/migrations/0020_thick_zodiak.sql
@@ -0,0 +1,22 @@
+ALTER TABLE "fdm-authn"."account" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "fdm-authn"."invitation" ALTER COLUMN "status" SET DEFAULT 'pending';--> statement-breakpoint
+ALTER TABLE "fdm-authn"."member" ALTER COLUMN "role" SET DEFAULT 'member';--> statement-breakpoint
+ALTER TABLE "fdm-authn"."organization" ALTER COLUMN "slug" SET NOT NULL;--> statement-breakpoint
+ALTER TABLE "fdm-authn"."session" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "fdm-authn"."user" ALTER COLUMN "email_verified" SET DEFAULT false;--> statement-breakpoint
+ALTER TABLE "fdm-authn"."user" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "fdm-authn"."user" ALTER COLUMN "updated_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "fdm-authn"."user" ALTER COLUMN "lang" SET DEFAULT 'nl-NL';--> statement-breakpoint
+ALTER TABLE "fdm-authn"."verification" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "fdm-authn"."verification" ALTER COLUMN "created_at" SET NOT NULL;--> statement-breakpoint
+ALTER TABLE "fdm-authn"."verification" ALTER COLUMN "updated_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "fdm-authn"."verification" ALTER COLUMN "updated_at" SET NOT NULL;--> statement-breakpoint
+ALTER TABLE "fdm-authn"."invitation" ADD COLUMN "created_at" timestamp DEFAULT now() NOT NULL;--> statement-breakpoint
+CREATE INDEX "account_userId_idx" ON "fdm-authn"."account" USING btree ("user_id");--> statement-breakpoint
+CREATE INDEX "invitation_organizationId_idx" ON "fdm-authn"."invitation" USING btree ("organization_id");--> statement-breakpoint
+CREATE INDEX "invitation_email_idx" ON "fdm-authn"."invitation" USING btree ("email");--> statement-breakpoint
+CREATE INDEX "member_organizationId_idx" ON "fdm-authn"."member" USING btree ("organization_id");--> statement-breakpoint
+CREATE INDEX "member_userId_idx" ON "fdm-authn"."member" USING btree ("user_id");--> statement-breakpoint
+CREATE UNIQUE INDEX "organization_slug_uidx" ON "fdm-authn"."organization" USING btree ("slug");--> statement-breakpoint
+CREATE INDEX "session_userId_idx" ON "fdm-authn"."session" USING btree ("user_id");--> statement-breakpoint
+CREATE INDEX "verification_identifier_idx" ON "fdm-authn"."verification" USING btree ("identifier");
\ No newline at end of file
diff --git a/fdm-core/src/db/migrations/meta/0020_snapshot.json b/fdm-core/src/db/migrations/meta/0020_snapshot.json
new file mode 100644
index 000000000..fa4bed758
--- /dev/null
+++ b/fdm-core/src/db/migrations/meta/0020_snapshot.json
@@ -0,0 +1,3759 @@
+{
+  "id": "1eb64507-01b4-41c6-8583-c114db99b60f",
+  "prevId": "4f25ee76-da77-4f5d-9652-5c40777fe0e0",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "fdm.cultivation_catalogue_selecting": {
+      "name": "cultivation_catalogue_selecting",
+      "schema": "fdm",
+      "columns": {
+        "b_id_farm": {
+          "name": "b_id_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_lu_source": {
+          "name": "b_lu_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "cultivation_catalogue_selecting_b_id_farm_farms_b_id_farm_fk": {
+          "name": "cultivation_catalogue_selecting_b_id_farm_farms_b_id_farm_fk",
+          "tableFrom": "cultivation_catalogue_selecting",
+          "tableTo": "farms",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_farm"
+          ],
+          "columnsTo": [
+            "b_id_farm"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.cultivation_ending": {
+      "name": "cultivation_ending",
+      "schema": "fdm",
+      "columns": {
+        "b_lu": {
+          "name": "b_lu",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_lu_end": {
+          "name": "b_lu_end",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "m_cropresidue": {
+          "name": "m_cropresidue",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "cultivation_ending_b_lu_cultivations_b_lu_fk": {
+          "name": "cultivation_ending_b_lu_cultivations_b_lu_fk",
+          "tableFrom": "cultivation_ending",
+          "tableTo": "cultivations",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_lu"
+          ],
+          "columnsTo": [
+            "b_lu"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.cultivation_harvesting": {
+      "name": "cultivation_harvesting",
+      "schema": "fdm",
+      "columns": {
+        "b_id_harvesting": {
+          "name": "b_id_harvesting",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "b_id_harvestable": {
+          "name": "b_id_harvestable",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_lu": {
+          "name": "b_lu",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_lu_harvest_date": {
+          "name": "b_lu_harvest_date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "cultivation_harvesting_b_id_harvestable_harvestables_b_id_harvestable_fk": {
+          "name": "cultivation_harvesting_b_id_harvestable_harvestables_b_id_harvestable_fk",
+          "tableFrom": "cultivation_harvesting",
+          "tableTo": "harvestables",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_harvestable"
+          ],
+          "columnsTo": [
+            "b_id_harvestable"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "cultivation_harvesting_b_lu_cultivations_b_lu_fk": {
+          "name": "cultivation_harvesting_b_lu_cultivations_b_lu_fk",
+          "tableFrom": "cultivation_harvesting",
+          "tableTo": "cultivations",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_lu"
+          ],
+          "columnsTo": [
+            "b_lu"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.cultivation_starting": {
+      "name": "cultivation_starting",
+      "schema": "fdm",
+      "columns": {
+        "b_id": {
+          "name": "b_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_lu": {
+          "name": "b_lu",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_lu_start": {
+          "name": "b_lu_start",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_sowing_amount": {
+          "name": "b_sowing_amount",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_sowing_method": {
+          "name": "b_sowing_method",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "cultivation_starting_b_id_fields_b_id_fk": {
+          "name": "cultivation_starting_b_id_fields_b_id_fk",
+          "tableFrom": "cultivation_starting",
+          "tableTo": "fields",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id"
+          ],
+          "columnsTo": [
+            "b_id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "cultivation_starting_b_lu_cultivations_b_lu_fk": {
+          "name": "cultivation_starting_b_lu_cultivations_b_lu_fk",
+          "tableFrom": "cultivation_starting",
+          "tableTo": "cultivations",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_lu"
+          ],
+          "columnsTo": [
+            "b_lu"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.cultivations": {
+      "name": "cultivations",
+      "schema": "fdm",
+      "columns": {
+        "b_lu": {
+          "name": "b_lu",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "b_lu_catalogue": {
+          "name": "b_lu_catalogue",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_lu_variety": {
+          "name": "b_lu_variety",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "b_lu_idx": {
+          "name": "b_lu_idx",
+          "columns": [
+            {
+              "expression": "b_lu",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "cultivations_b_lu_catalogue_cultivations_catalogue_b_lu_catalogue_fk": {
+          "name": "cultivations_b_lu_catalogue_cultivations_catalogue_b_lu_catalogue_fk",
+          "tableFrom": "cultivations",
+          "tableTo": "cultivations_catalogue",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_lu_catalogue"
+          ],
+          "columnsTo": [
+            "b_lu_catalogue"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.cultivations_catalogue": {
+      "name": "cultivations_catalogue",
+      "schema": "fdm",
+      "columns": {
+        "b_lu_catalogue": {
+          "name": "b_lu_catalogue",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "b_lu_source": {
+          "name": "b_lu_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_lu_name": {
+          "name": "b_lu_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_lu_name_en": {
+          "name": "b_lu_name_en",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_harvestable": {
+          "name": "b_lu_harvestable",
+          "type": "b_lu_harvestable",
+          "typeSchema": "fdm",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_lu_harvestcat": {
+          "name": "b_lu_harvestcat",
+          "type": "b_lu_harvestcat",
+          "typeSchema": "fdm",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_hcat3": {
+          "name": "b_lu_hcat3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_hcat3_name": {
+          "name": "b_lu_hcat3_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_croprotation": {
+          "name": "b_lu_croprotation",
+          "type": "b_lu_croprotation",
+          "typeSchema": "fdm",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_yield": {
+          "name": "b_lu_yield",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_dm": {
+          "name": "b_lu_dm",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_hi": {
+          "name": "b_lu_hi",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_n_harvestable": {
+          "name": "b_lu_n_harvestable",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_n_residue": {
+          "name": "b_lu_n_residue",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_n_fixation": {
+          "name": "b_n_fixation",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_eom": {
+          "name": "b_lu_eom",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_eom_residues": {
+          "name": "b_lu_eom_residues",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_rest_oravib": {
+          "name": "b_lu_rest_oravib",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_variety_options": {
+          "name": "b_lu_variety_options",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_start_default": {
+          "name": "b_lu_start_default",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_date_harvest_default": {
+          "name": "b_date_harvest_default",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "b_lu_catalogue_idx": {
+          "name": "b_lu_catalogue_idx",
+          "columns": [
+            {
+              "expression": "b_lu_catalogue",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "b_lu_start_default_format": {
+          "name": "b_lu_start_default_format",
+          "value": "b_lu_start_default IS NULL OR b_lu_start_default ~ '^(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$'"
+        },
+        "b_date_harvest_default_format": {
+          "name": "b_date_harvest_default_format",
+          "value": "b_date_harvest_default IS NULL OR b_date_harvest_default ~ '^(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$'"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "fdm.derogation_applying": {
+      "name": "derogation_applying",
+      "schema": "fdm",
+      "columns": {
+        "b_id_farm": {
+          "name": "b_id_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_id_derogation": {
+          "name": "b_id_derogation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "derogation_one_per_farm_per": {
+          "name": "derogation_one_per_farm_per",
+          "columns": [
+            {
+              "expression": "b_id_derogation",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "derogation_applying_b_id_farm_farms_b_id_farm_fk": {
+          "name": "derogation_applying_b_id_farm_farms_b_id_farm_fk",
+          "tableFrom": "derogation_applying",
+          "tableTo": "farms",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_farm"
+          ],
+          "columnsTo": [
+            "b_id_farm"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "derogation_applying_b_id_derogation_derogations_b_id_derogation_fk": {
+          "name": "derogation_applying_b_id_derogation_derogations_b_id_derogation_fk",
+          "tableFrom": "derogation_applying",
+          "tableTo": "derogations",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_derogation"
+          ],
+          "columnsTo": [
+            "b_id_derogation"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.derogations": {
+      "name": "derogations",
+      "schema": "fdm",
+      "columns": {
+        "b_id_derogation": {
+          "name": "b_id_derogation",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "b_derogation_year": {
+          "name": "b_derogation_year",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.farms": {
+      "name": "farms",
+      "schema": "fdm",
+      "columns": {
+        "b_id_farm": {
+          "name": "b_id_farm",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "b_name_farm": {
+          "name": "b_name_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_businessid_farm": {
+          "name": "b_businessid_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_address_farm": {
+          "name": "b_address_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_postalcode_farm": {
+          "name": "b_postalcode_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "b_id_farm_idx": {
+          "name": "b_id_farm_idx",
+          "columns": [
+            {
+              "expression": "b_id_farm",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.fertilizer_acquiring": {
+      "name": "fertilizer_acquiring",
+      "schema": "fdm",
+      "columns": {
+        "b_id_farm": {
+          "name": "b_id_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "p_id": {
+          "name": "p_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "p_acquiring_amount": {
+          "name": "p_acquiring_amount",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_acquiring_date": {
+          "name": "p_acquiring_date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "fertilizer_acquiring_b_id_farm_farms_b_id_farm_fk": {
+          "name": "fertilizer_acquiring_b_id_farm_farms_b_id_farm_fk",
+          "tableFrom": "fertilizer_acquiring",
+          "tableTo": "farms",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_farm"
+          ],
+          "columnsTo": [
+            "b_id_farm"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "fertilizer_acquiring_p_id_fertilizers_p_id_fk": {
+          "name": "fertilizer_acquiring_p_id_fertilizers_p_id_fk",
+          "tableFrom": "fertilizer_acquiring",
+          "tableTo": "fertilizers",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "p_id"
+          ],
+          "columnsTo": [
+            "p_id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.fertilizer_applying": {
+      "name": "fertilizer_applying",
+      "schema": "fdm",
+      "columns": {
+        "p_app_id": {
+          "name": "p_app_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "b_id": {
+          "name": "b_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "p_id": {
+          "name": "p_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "p_app_amount": {
+          "name": "p_app_amount",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_app_method": {
+          "name": "p_app_method",
+          "type": "p_app_method",
+          "typeSchema": "fdm",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_app_date": {
+          "name": "p_app_date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "p_app_idx": {
+          "name": "p_app_idx",
+          "columns": [
+            {
+              "expression": "p_app_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "fertilizer_applying_b_id_fields_b_id_fk": {
+          "name": "fertilizer_applying_b_id_fields_b_id_fk",
+          "tableFrom": "fertilizer_applying",
+          "tableTo": "fields",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id"
+          ],
+          "columnsTo": [
+            "b_id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "fertilizer_applying_p_id_fertilizers_p_id_fk": {
+          "name": "fertilizer_applying_p_id_fertilizers_p_id_fk",
+          "tableFrom": "fertilizer_applying",
+          "tableTo": "fertilizers",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "p_id"
+          ],
+          "columnsTo": [
+            "p_id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.fertilizer_catalogue_enabling": {
+      "name": "fertilizer_catalogue_enabling",
+      "schema": "fdm",
+      "columns": {
+        "b_id_farm": {
+          "name": "b_id_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "p_source": {
+          "name": "p_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "fertilizer_catalogue_enabling_b_id_farm_farms_b_id_farm_fk": {
+          "name": "fertilizer_catalogue_enabling_b_id_farm_farms_b_id_farm_fk",
+          "tableFrom": "fertilizer_catalogue_enabling",
+          "tableTo": "farms",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_farm"
+          ],
+          "columnsTo": [
+            "b_id_farm"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.fertilizer_picking": {
+      "name": "fertilizer_picking",
+      "schema": "fdm",
+      "columns": {
+        "p_id": {
+          "name": "p_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "p_id_catalogue": {
+          "name": "p_id_catalogue",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "p_picking_date": {
+          "name": "p_picking_date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "fertilizer_picking_p_id_fertilizers_p_id_fk": {
+          "name": "fertilizer_picking_p_id_fertilizers_p_id_fk",
+          "tableFrom": "fertilizer_picking",
+          "tableTo": "fertilizers",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "p_id"
+          ],
+          "columnsTo": [
+            "p_id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "fertilizer_picking_p_id_catalogue_fertilizers_catalogue_p_id_catalogue_fk": {
+          "name": "fertilizer_picking_p_id_catalogue_fertilizers_catalogue_p_id_catalogue_fk",
+          "tableFrom": "fertilizer_picking",
+          "tableTo": "fertilizers_catalogue",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "p_id_catalogue"
+          ],
+          "columnsTo": [
+            "p_id_catalogue"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.fertilizers": {
+      "name": "fertilizers",
+      "schema": "fdm",
+      "columns": {
+        "p_id": {
+          "name": "p_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "p_id_idx": {
+          "name": "p_id_idx",
+          "columns": [
+            {
+              "expression": "p_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.fertilizers_catalogue": {
+      "name": "fertilizers_catalogue",
+      "schema": "fdm",
+      "columns": {
+        "p_id_catalogue": {
+          "name": "p_id_catalogue",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "p_source": {
+          "name": "p_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "p_name_nl": {
+          "name": "p_name_nl",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "p_name_en": {
+          "name": "p_name_en",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_description": {
+          "name": "p_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_app_method_options": {
+          "name": "p_app_method_options",
+          "type": "p_app_method[]",
+          "typeSchema": "fdm",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_dm": {
+          "name": "p_dm",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_density": {
+          "name": "p_density",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_om": {
+          "name": "p_om",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_a": {
+          "name": "p_a",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_hc": {
+          "name": "p_hc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_eom": {
+          "name": "p_eom",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_eoc": {
+          "name": "p_eoc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_c_rt": {
+          "name": "p_c_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_c_of": {
+          "name": "p_c_of",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_c_if": {
+          "name": "p_c_if",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_c_fr": {
+          "name": "p_c_fr",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_cn_of": {
+          "name": "p_cn_of",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_n_rt": {
+          "name": "p_n_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_n_if": {
+          "name": "p_n_if",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_n_of": {
+          "name": "p_n_of",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_n_wc": {
+          "name": "p_n_wc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_no3_rt": {
+          "name": "p_no3_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_nh4_rt": {
+          "name": "p_nh4_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_p_rt": {
+          "name": "p_p_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_k_rt": {
+          "name": "p_k_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_mg_rt": {
+          "name": "p_mg_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_ca_rt": {
+          "name": "p_ca_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_ne": {
+          "name": "p_ne",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_s_rt": {
+          "name": "p_s_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_s_wc": {
+          "name": "p_s_wc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_cu_rt": {
+          "name": "p_cu_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_zn_rt": {
+          "name": "p_zn_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_na_rt": {
+          "name": "p_na_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_si_rt": {
+          "name": "p_si_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_b_rt": {
+          "name": "p_b_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_mn_rt": {
+          "name": "p_mn_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_ni_rt": {
+          "name": "p_ni_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_fe_rt": {
+          "name": "p_fe_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_mo_rt": {
+          "name": "p_mo_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_co_rt": {
+          "name": "p_co_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_as_rt": {
+          "name": "p_as_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_cd_rt": {
+          "name": "p_cd_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_cr_rt": {
+          "name": "p_cr_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_cr_vi": {
+          "name": "p_cr_vi",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_pb_rt": {
+          "name": "p_pb_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_hg_rt": {
+          "name": "p_hg_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_cl_rt": {
+          "name": "p_cl_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_ef_nh3": {
+          "name": "p_ef_nh3",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_type_manure": {
+          "name": "p_type_manure",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_type_mineral": {
+          "name": "p_type_mineral",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_type_compost": {
+          "name": "p_type_compost",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_type_rvo": {
+          "name": "p_type_rvo",
+          "type": "p_type_rvo",
+          "typeSchema": "fdm",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "p_id_catalogue_idx": {
+          "name": "p_id_catalogue_idx",
+          "columns": [
+            {
+              "expression": "p_id_catalogue",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.field_acquiring": {
+      "name": "field_acquiring",
+      "schema": "fdm",
+      "columns": {
+        "b_id": {
+          "name": "b_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_id_farm": {
+          "name": "b_id_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_start": {
+          "name": "b_start",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_acquiring_method": {
+          "name": "b_acquiring_method",
+          "type": "b_acquiring_method",
+          "typeSchema": "fdm",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'unknown'"
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "field_acquiring_b_id_fields_b_id_fk": {
+          "name": "field_acquiring_b_id_fields_b_id_fk",
+          "tableFrom": "field_acquiring",
+          "tableTo": "fields",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id"
+          ],
+          "columnsTo": [
+            "b_id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "field_acquiring_b_id_farm_farms_b_id_farm_fk": {
+          "name": "field_acquiring_b_id_farm_farms_b_id_farm_fk",
+          "tableFrom": "field_acquiring",
+          "tableTo": "farms",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_farm"
+          ],
+          "columnsTo": [
+            "b_id_farm"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.field_discarding": {
+      "name": "field_discarding",
+      "schema": "fdm",
+      "columns": {
+        "b_id": {
+          "name": "b_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_end": {
+          "name": "b_end",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "field_discarding_b_id_fields_b_id_fk": {
+          "name": "field_discarding_b_id_fields_b_id_fk",
+          "tableFrom": "field_discarding",
+          "tableTo": "fields",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id"
+          ],
+          "columnsTo": [
+            "b_id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.fields": {
+      "name": "fields",
+      "schema": "fdm",
+      "columns": {
+        "b_id": {
+          "name": "b_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "b_name": {
+          "name": "b_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_geometry": {
+          "name": "b_geometry",
+          "type": "geometry(Polygon,4326)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_id_source": {
+          "name": "b_id_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "b_id_idx": {
+          "name": "b_id_idx",
+          "columns": [
+            {
+              "expression": "b_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "b_geom_idx": {
+          "name": "b_geom_idx",
+          "columns": [
+            {
+              "expression": "b_geometry",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gist",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.harvestable_analyses": {
+      "name": "harvestable_analyses",
+      "schema": "fdm",
+      "columns": {
+        "b_id_harvestable_analysis": {
+          "name": "b_id_harvestable_analysis",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "b_lu_yield": {
+          "name": "b_lu_yield",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_yield_fresh": {
+          "name": "b_lu_yield_fresh",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_yield_bruto": {
+          "name": "b_lu_yield_bruto",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_tarra": {
+          "name": "b_lu_tarra",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_dm": {
+          "name": "b_lu_dm",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_moist": {
+          "name": "b_lu_moist",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_uww": {
+          "name": "b_lu_uww",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_cp": {
+          "name": "b_lu_cp",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_n_harvestable": {
+          "name": "b_lu_n_harvestable",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_n_residue": {
+          "name": "b_lu_n_residue",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_p_harvestable": {
+          "name": "b_lu_p_harvestable",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_p_residue": {
+          "name": "b_lu_p_residue",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_k_harvestable": {
+          "name": "b_lu_k_harvestable",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_lu_k_residue": {
+          "name": "b_lu_k_residue",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "b_id_harvestable_analyses_idx": {
+          "name": "b_id_harvestable_analyses_idx",
+          "columns": [
+            {
+              "expression": "b_id_harvestable_analysis",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.harvestable_sampling": {
+      "name": "harvestable_sampling",
+      "schema": "fdm",
+      "columns": {
+        "b_id_harvestable": {
+          "name": "b_id_harvestable",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_id_harvestable_analysis": {
+          "name": "b_id_harvestable_analysis",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_sampling_date": {
+          "name": "b_sampling_date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "harvestable_sampling_b_id_harvestable_harvestables_b_id_harvestable_fk": {
+          "name": "harvestable_sampling_b_id_harvestable_harvestables_b_id_harvestable_fk",
+          "tableFrom": "harvestable_sampling",
+          "tableTo": "harvestables",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_harvestable"
+          ],
+          "columnsTo": [
+            "b_id_harvestable"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "harvestable_sampling_b_id_harvestable_analysis_harvestable_analyses_b_id_harvestable_analysis_fk": {
+          "name": "harvestable_sampling_b_id_harvestable_analysis_harvestable_analyses_b_id_harvestable_analysis_fk",
+          "tableFrom": "harvestable_sampling",
+          "tableTo": "harvestable_analyses",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_harvestable_analysis"
+          ],
+          "columnsTo": [
+            "b_id_harvestable_analysis"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.harvestables": {
+      "name": "harvestables",
+      "schema": "fdm",
+      "columns": {
+        "b_id_harvestable": {
+          "name": "b_id_harvestable",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "b_id_harvestable_idx": {
+          "name": "b_id_harvestable_idx",
+          "columns": [
+            {
+              "expression": "b_id_harvestable",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.intending_grazing": {
+      "name": "intending_grazing",
+      "schema": "fdm",
+      "columns": {
+        "b_id_farm": {
+          "name": "b_id_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_grazing_intention": {
+          "name": "b_grazing_intention",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_grazing_intention_year": {
+          "name": "b_grazing_intention_year",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "intending_grazing_b_id_farm_farms_b_id_farm_fk": {
+          "name": "intending_grazing_b_id_farm_farms_b_id_farm_fk",
+          "tableFrom": "intending_grazing",
+          "tableTo": "farms",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_farm"
+          ],
+          "columnsTo": [
+            "b_id_farm"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "intending_grazing_b_id_farm_b_grazing_intention_year_pk": {
+          "name": "intending_grazing_b_id_farm_b_grazing_intention_year_pk",
+          "columns": [
+            "b_id_farm",
+            "b_grazing_intention_year"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.organic_certifications": {
+      "name": "organic_certifications",
+      "schema": "fdm",
+      "columns": {
+        "b_id_organic": {
+          "name": "b_id_organic",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "b_organic_traces": {
+          "name": "b_organic_traces",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_organic_skal": {
+          "name": "b_organic_skal",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_organic_issued": {
+          "name": "b_organic_issued",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_organic_expires": {
+          "name": "b_organic_expires",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.organic_certifications_holding": {
+      "name": "organic_certifications_holding",
+      "schema": "fdm",
+      "columns": {
+        "b_id_farm": {
+          "name": "b_id_farm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "b_id_organic": {
+          "name": "b_id_organic",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "organic_one_farm_per_cert": {
+          "name": "organic_one_farm_per_cert",
+          "columns": [
+            {
+              "expression": "b_id_organic",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "organic_certifications_holding_b_id_farm_farms_b_id_farm_fk": {
+          "name": "organic_certifications_holding_b_id_farm_farms_b_id_farm_fk",
+          "tableFrom": "organic_certifications_holding",
+          "tableTo": "farms",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_farm"
+          ],
+          "columnsTo": [
+            "b_id_farm"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "organic_certifications_holding_b_id_organic_organic_certifications_b_id_organic_fk": {
+          "name": "organic_certifications_holding_b_id_organic_organic_certifications_b_id_organic_fk",
+          "tableFrom": "organic_certifications_holding",
+          "tableTo": "organic_certifications",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id_organic"
+          ],
+          "columnsTo": [
+            "b_id_organic"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.soil_analysis": {
+      "name": "soil_analysis",
+      "schema": "fdm",
+      "columns": {
+        "a_id": {
+          "name": "a_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "a_date": {
+          "name": "a_date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_source": {
+          "name": "a_source",
+          "type": "a_source",
+          "typeSchema": "fdm",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'other'"
+        },
+        "a_al_ox": {
+          "name": "a_al_ox",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_c_of": {
+          "name": "a_c_of",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_ca_co": {
+          "name": "a_ca_co",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_ca_co_po": {
+          "name": "a_ca_co_po",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_caco3_if": {
+          "name": "a_caco3_if",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_cec_co": {
+          "name": "a_cec_co",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_clay_mi": {
+          "name": "a_clay_mi",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_cn_fr": {
+          "name": "a_cn_fr",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_com_fr": {
+          "name": "a_com_fr",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_cu_cc": {
+          "name": "a_cu_cc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_density_sa": {
+          "name": "a_density_sa",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_fe_ox": {
+          "name": "a_fe_ox",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_k_cc": {
+          "name": "a_k_cc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_k_co": {
+          "name": "a_k_co",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_k_co_po": {
+          "name": "a_k_co_po",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_mg_cc": {
+          "name": "a_mg_cc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_mg_co": {
+          "name": "a_mg_co",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_mg_co_po": {
+          "name": "a_mg_co_po",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_n_pmn": {
+          "name": "a_n_pmn",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_n_rt": {
+          "name": "a_n_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_nh4_cc": {
+          "name": "a_nh4_cc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_nmin_cc": {
+          "name": "a_nmin_cc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_no3_cc": {
+          "name": "a_no3_cc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_p_al": {
+          "name": "a_p_al",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_p_cc": {
+          "name": "a_p_cc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_p_ox": {
+          "name": "a_p_ox",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_p_rt": {
+          "name": "a_p_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_p_sg": {
+          "name": "a_p_sg",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_p_wa": {
+          "name": "a_p_wa",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_ph_cc": {
+          "name": "a_ph_cc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_s_rt": {
+          "name": "a_s_rt",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_sand_mi": {
+          "name": "a_sand_mi",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_silt_mi": {
+          "name": "a_silt_mi",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_som_loi": {
+          "name": "a_som_loi",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "a_zn_cc": {
+          "name": "a_zn_cc",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_gwl_class": {
+          "name": "b_gwl_class",
+          "type": "b_gwl_class",
+          "typeSchema": "fdm",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_soiltype_agr": {
+          "name": "b_soiltype_agr",
+          "type": "b_soiltype_agr",
+          "typeSchema": "fdm",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm.soil_sampling": {
+      "name": "soil_sampling",
+      "schema": "fdm",
+      "columns": {
+        "b_id_sampling": {
+          "name": "b_id_sampling",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "b_id": {
+          "name": "b_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "a_id": {
+          "name": "a_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "a_depth_upper": {
+          "name": "a_depth_upper",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "a_depth_lower": {
+          "name": "a_depth_lower",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_sampling_date": {
+          "name": "b_sampling_date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "b_sampling_geometry": {
+          "name": "b_sampling_geometry",
+          "type": "geometry(MultiPoint,4326)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "soil_sampling_b_id_fields_b_id_fk": {
+          "name": "soil_sampling_b_id_fields_b_id_fk",
+          "tableFrom": "soil_sampling",
+          "tableTo": "fields",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "b_id"
+          ],
+          "columnsTo": [
+            "b_id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "soil_sampling_a_id_soil_analysis_a_id_fk": {
+          "name": "soil_sampling_a_id_soil_analysis_a_id_fk",
+          "tableFrom": "soil_sampling",
+          "tableTo": "soil_analysis",
+          "schemaTo": "fdm",
+          "columnsFrom": [
+            "a_id"
+          ],
+          "columnsTo": [
+            "a_id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-authn.account": {
+      "name": "account",
+      "schema": "fdm-authn",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "account_userId_idx": {
+          "name": "account_userId_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "account_user_id_user_id_fk": {
+          "name": "account_user_id_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "schemaTo": "fdm-authn",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-authn.invitation": {
+      "name": "invitation",
+      "schema": "fdm-authn",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "invitation_organizationId_idx": {
+          "name": "invitation_organizationId_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_email_idx": {
+          "name": "invitation_email_idx",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitation_organization_id_organization_id_fk": {
+          "name": "invitation_organization_id_organization_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "organization",
+          "schemaTo": "fdm-authn",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitation_inviter_id_user_id_fk": {
+          "name": "invitation_inviter_id_user_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "user",
+          "schemaTo": "fdm-authn",
+          "columnsFrom": [
+            "inviter_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-authn.member": {
+      "name": "member",
+      "schema": "fdm-authn",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "member_organizationId_idx": {
+          "name": "member_organizationId_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "member_userId_idx": {
+          "name": "member_userId_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "member_organization_id_organization_id_fk": {
+          "name": "member_organization_id_organization_id_fk",
+          "tableFrom": "member",
+          "tableTo": "organization",
+          "schemaTo": "fdm-authn",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "member_user_id_user_id_fk": {
+          "name": "member_user_id_user_id_fk",
+          "tableFrom": "member",
+          "tableTo": "user",
+          "schemaTo": "fdm-authn",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-authn.organization": {
+      "name": "organization",
+      "schema": "fdm-authn",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "logo": {
+          "name": "logo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "organization_slug_uidx": {
+          "name": "organization_slug_uidx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "organization_slug_unique": {
+          "name": "organization_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-authn.rate_limit": {
+      "name": "rate_limit",
+      "schema": "fdm-authn",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "count": {
+          "name": "count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_request": {
+          "name": "last_request",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-authn.session": {
+      "name": "session",
+      "schema": "fdm-authn",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "session_userId_idx": {
+          "name": "session_userId_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "schemaTo": "fdm-authn",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "session_token_unique": {
+          "name": "session_token_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "token"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-authn.user": {
+      "name": "user",
+      "schema": "fdm-authn",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "display_username": {
+          "name": "display_username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "firstname": {
+          "name": "firstname",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "surname": {
+          "name": "surname",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lang": {
+          "name": "lang",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'nl-NL'"
+        },
+        "farm_active": {
+          "name": "farm_active",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        },
+        "user_username_unique": {
+          "name": "user_username_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "username"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-authn.verification": {
+      "name": "verification",
+      "schema": "fdm-authn",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "verification_identifier_idx": {
+          "name": "verification_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-authz.audit": {
+      "name": "audit",
+      "schema": "fdm-authz",
+      "columns": {
+        "audit_id": {
+          "name": "audit_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "audit_timestamp": {
+          "name": "audit_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "audit_origin": {
+          "name": "audit_origin",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "principal_id": {
+          "name": "principal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_resource": {
+          "name": "target_resource",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_resource_id": {
+          "name": "target_resource_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "granting_resource": {
+          "name": "granting_resource",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "granting_resource_id": {
+          "name": "granting_resource_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "allowed": {
+          "name": "allowed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "duration": {
+          "name": "duration",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-authz.role": {
+      "name": "role",
+      "schema": "fdm-authz",
+      "columns": {
+        "role_id": {
+          "name": "role_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "resource": {
+          "name": "resource",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_id": {
+          "name": "resource_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "principal_id": {
+          "name": "principal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "deleted": {
+          "name": "deleted",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "role_idx": {
+          "name": "role_idx",
+          "columns": [
+            {
+              "expression": "resource",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "resource_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "principal_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "role",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-calculator.calculation_cache": {
+      "name": "calculation_cache",
+      "schema": "fdm-calculator",
+      "columns": {
+        "calculation_hash": {
+          "name": "calculation_hash",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "calculation_function": {
+          "name": "calculation_function",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "calculator_version": {
+          "name": "calculator_version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "input": {
+          "name": "input",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "result": {
+          "name": "result",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "fdm-calculator.calculation_errors": {
+      "name": "calculation_errors",
+      "schema": "fdm-calculator",
+      "columns": {
+        "calculation_error_id": {
+          "name": "calculation_error_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "calculation_function": {
+          "name": "calculation_function",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "calculator_version": {
+          "name": "calculator_version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "input": {
+          "name": "input",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stack_trace": {
+          "name": "stack_trace",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "fdm.b_acquiring_method": {
+      "name": "b_acquiring_method",
+      "schema": "fdm",
+      "values": [
+        "nl_01",
+        "nl_02",
+        "nl_03",
+        "nl_04",
+        "nl_07",
+        "nl_09",
+        "nl_10",
+        "nl_11",
+        "nl_12",
+        "nl_13",
+        "nl_61",
+        "nl_63",
+        "unknown"
+      ]
+    },
+    "fdm.p_app_method": {
+      "name": "p_app_method",
+      "schema": "fdm",
+      "values": [
+        "slotted coulter",
+        "incorporation",
+        "incorporation 2 tracks",
+        "injection",
+        "shallow injection",
+        "spraying",
+        "broadcasting",
+        "spoke wheel",
+        "pocket placement",
+        "narrowband"
+      ]
+    },
+    "fdm.b_gwl_class": {
+      "name": "b_gwl_class",
+      "schema": "fdm",
+      "values": [
+        "I",
+        "Ia",
+        "Ic",
+        "II",
+        "IIa",
+        "IIb",
+        "IIc",
+        "III",
+        "IIIa",
+        "IIIb",
+        "IV",
+        "IVu",
+        "IVc",
+        "V",
+        "Va",
+        "Vao",
+        "Vad",
+        "Vb",
+        "Vbo",
+        "Vbd",
+        "sV",
+        "sVb",
+        "VI",
+        "VIo",
+        "VId",
+        "VII",
+        "VIIo",
+        "VIId",
+        "VIII",
+        "VIIIo",
+        "VIIId"
+      ]
+    },
+    "fdm.b_lu_harvestcat": {
+      "name": "b_lu_harvestcat",
+      "schema": "fdm",
+      "values": [
+        "HC010",
+        "HC020",
+        "HC031",
+        "HC040",
+        "HC041",
+        "HC042",
+        "HC050"
+      ]
+    },
+    "fdm.b_lu_harvestable": {
+      "name": "b_lu_harvestable",
+      "schema": "fdm",
+      "values": [
+        "none",
+        "once",
+        "multiple"
+      ]
+    },
+    "fdm.b_lu_croprotation": {
+      "name": "b_lu_croprotation",
+      "schema": "fdm",
+      "values": [
+        "other",
+        "clover",
+        "nature",
+        "potato",
+        "grass",
+        "rapeseed",
+        "starch",
+        "maize",
+        "cereal",
+        "sugarbeet",
+        "alfalfa",
+        "catchcrop"
+      ]
+    },
+    "fdm.a_source": {
+      "name": "a_source",
+      "schema": "fdm",
+      "values": [
+        "nl-rva-l122",
+        "nl-rva-l136",
+        "nl-rva-l264",
+        "nl-rva-l320",
+        "nl-rva-l335",
+        "nl-rva-l610",
+        "nl-rva-l648",
+        "nl-rva-l697",
+        "nl-other-nmi",
+        "other"
+      ]
+    },
+    "fdm.b_soiltype_agr": {
+      "name": "b_soiltype_agr",
+      "schema": "fdm",
+      "values": [
+        "moerige_klei",
+        "rivierklei",
+        "dekzand",
+        "zeeklei",
+        "dalgrond",
+        "veen",
+        "loess",
+        "duinzand",
+        "maasklei"
+      ]
+    },
+    "fdm.p_type_rvo": {
+      "name": "p_type_rvo",
+      "schema": "fdm",
+      "values": [
+        "10",
+        "11",
+        "12",
+        "13",
+        "14",
+        "17",
+        "18",
+        "19",
+        "23",
+        "30",
+        "31",
+        "32",
+        "33",
+        "35",
+        "39",
+        "40",
+        "41",
+        "42",
+        "43",
+        "46",
+        "50",
+        "56",
+        "60",
+        "61",
+        "75",
+        "76",
+        "80",
+        "81",
+        "90",
+        "91",
+        "92",
+        "25",
+        "26",
+        "27",
+        "95",
+        "96",
+        "97",
+        "98",
+        "99",
+        "100",
+        "101",
+        "102",
+        "103",
+        "104",
+        "105",
+        "106",
+        "107",
+        "108",
+        "109",
+        "110",
+        "111",
+        "112",
+        "113",
+        "114",
+        "115",
+        "116",
+        "117",
+        "120"
+      ]
+    }
+  },
+  "schemas": {
+    "fdm": "fdm",
+    "fdm-authn": "fdm-authn",
+    "fdm-authz": "fdm-authz",
+    "fdm-calculator": "fdm-calculator"
+  },
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/fdm-core/src/db/migrations/meta/_journal.json b/fdm-core/src/db/migrations/meta/_journal.json
index 0f4dae821..26da9ff47 100644
--- a/fdm-core/src/db/migrations/meta/_journal.json
+++ b/fdm-core/src/db/migrations/meta/_journal.json
@@ -141,6 +141,13 @@
             "when": 1763647193660,
             "tag": "0019_v0-27-0-2",
             "breakpoints": true
+        },
+        {
+            "idx": 20,
+            "version": "7",
+            "when": 1767697779747,
+            "tag": "0020_thick_zodiak",
+            "breakpoints": true
         }
     ]
 }
diff --git a/fdm-core/src/db/schema-authn.ts b/fdm-core/src/db/schema-authn.ts
index 1ac2dcc19..27c4762f3 100644
--- a/fdm-core/src/db/schema-authn.ts
+++ b/fdm-core/src/db/schema-authn.ts
@@ -1,10 +1,13 @@
+import { relations } from "drizzle-orm"
 import {
+    text,
     bigint,
+    timestamp,
     boolean,
     integer,
+    index,
+    uniqueIndex,
     pgSchema,
-    text,
-    timestamp,
 } from "drizzle-orm/pg-core"
 
 export const fdmAuthNSchema = pgSchema("fdm-authn")
@@ -14,93 +17,134 @@ export const user = fdmAuthNSchema.table("user", {
     id: text("id").primaryKey(),
     name: text("name").notNull(),
     email: text("email").notNull().unique(),
-    emailVerified: boolean("email_verified").notNull(),
+    emailVerified: boolean("email_verified").default(false).notNull(),
     image: text("image"),
-    createdAt: timestamp("created_at").notNull(),
-    updatedAt: timestamp("updated_at").notNull(),
+    createdAt: timestamp("created_at").defaultNow().notNull(),
+    updatedAt: timestamp("updated_at")
+        .defaultNow()
+        .$onUpdate(() => /* @__PURE__ */ new Date())
+        .notNull(),
     username: text("username").unique(),
     displayUsername: text("display_username"),
     firstname: text("firstname"),
     surname: text("surname"),
-    lang: text("lang").notNull(),
+    lang: text("lang").default("nl-NL").notNull(),
     farm_active: text("farm_active"),
 })
 
-export const session = fdmAuthNSchema.table("session", {
-    id: text("id").primaryKey(),
-    expiresAt: timestamp("expires_at").notNull(),
-    token: text("token").notNull().unique(),
-    createdAt: timestamp("created_at").notNull(),
-    updatedAt: timestamp("updated_at").notNull(),
-    ipAddress: text("ip_address"),
-    userAgent: text("user_agent"),
-    userId: text("user_id")
-        .notNull()
-        .references(() => user.id, { onDelete: "cascade" }),
-    activeOrganizationId: text("active_organization_id"),
-})
+export const session = fdmAuthNSchema.table(
+    "session",
+    {
+        id: text("id").primaryKey(),
+        expiresAt: timestamp("expires_at").notNull(),
+        token: text("token").notNull().unique(),
+        createdAt: timestamp("created_at").defaultNow().notNull(),
+        updatedAt: timestamp("updated_at")
+            .$onUpdate(() => /* @__PURE__ */ new Date())
+            .notNull(),
+        ipAddress: text("ip_address"),
+        userAgent: text("user_agent"),
+        userId: text("user_id")
+            .notNull()
+            .references(() => user.id, { onDelete: "cascade" }),
+        activeOrganizationId: text("active_organization_id"),
+    },
+    (table) => [index("session_userId_idx").on(table.userId)],
+)
 
-export const account = fdmAuthNSchema.table("account", {
-    id: text("id").primaryKey(),
-    accountId: text("account_id").notNull(),
-    providerId: text("provider_id").notNull(),
-    userId: text("user_id")
-        .notNull()
-        .references(() => user.id, { onDelete: "cascade" }),
-    accessToken: text("access_token"),
-    refreshToken: text("refresh_token"),
-    idToken: text("id_token"),
-    accessTokenExpiresAt: timestamp("access_token_expires_at"),
-    refreshTokenExpiresAt: timestamp("refresh_token_expires_at"),
-    scope: text("scope"),
-    password: text("password"),
-    createdAt: timestamp("created_at").notNull(),
-    updatedAt: timestamp("updated_at").notNull(),
-})
+export const account = fdmAuthNSchema.table(
+    "account",
+    {
+        id: text("id").primaryKey(),
+        accountId: text("account_id").notNull(),
+        providerId: text("provider_id").notNull(),
+        userId: text("user_id")
+            .notNull()
+            .references(() => user.id, { onDelete: "cascade" }),
+        accessToken: text("access_token"),
+        refreshToken: text("refresh_token"),
+        idToken: text("id_token"),
+        accessTokenExpiresAt: timestamp("access_token_expires_at"),
+        refreshTokenExpiresAt: timestamp("refresh_token_expires_at"),
+        scope: text("scope"),
+        password: text("password"),
+        createdAt: timestamp("created_at").defaultNow().notNull(),
+        updatedAt: timestamp("updated_at")
+            .$onUpdate(() => /* @__PURE__ */ new Date())
+            .notNull(),
+    },
+    (table) => [index("account_userId_idx").on(table.userId)],
+)
 
-export const verification = fdmAuthNSchema.table("verification", {
-    id: text("id").primaryKey(),
-    identifier: text("identifier").notNull(),
-    value: text("value").notNull(),
-    expiresAt: timestamp("expires_at").notNull(),
-    createdAt: timestamp("created_at"),
-    updatedAt: timestamp("updated_at"),
-})
+export const verification = fdmAuthNSchema.table(
+    "verification",
+    {
+        id: text("id").primaryKey(),
+        identifier: text("identifier").notNull(),
+        value: text("value").notNull(),
+        expiresAt: timestamp("expires_at").notNull(),
+        createdAt: timestamp("created_at").defaultNow().notNull(),
+        updatedAt: timestamp("updated_at")
+            .defaultNow()
+            .$onUpdate(() => /* @__PURE__ */ new Date())
+            .notNull(),
+    },
+    (table) => [index("verification_identifier_idx").on(table.identifier)],
+)
 
-export const organization = fdmAuthNSchema.table("organization", {
-    id: text("id").primaryKey(),
-    name: text("name").notNull(),
-    slug: text("slug").unique(),
-    logo: text("logo"),
-    createdAt: timestamp("created_at").notNull(),
-    metadata: text("metadata"),
-})
+export const organization = fdmAuthNSchema.table(
+    "organization",
+    {
+        id: text("id").primaryKey(),
+        name: text("name").notNull(),
+        slug: text("slug").notNull().unique(),
+        logo: text("logo"),
+        createdAt: timestamp("created_at").notNull(),
+        metadata: text("metadata"),
+    },
+    (table) => [uniqueIndex("organization_slug_uidx").on(table.slug)],
+)
 
-export const member = fdmAuthNSchema.table("member", {
-    id: text("id").primaryKey(),
-    organizationId: text("organization_id")
-        .notNull()
-        .references(() => organization.id, { onDelete: "cascade" }),
-    userId: text("user_id")
-        .notNull()
-        .references(() => user.id, { onDelete: "cascade" }),
-    role: text("role").notNull(),
-    createdAt: timestamp("created_at").notNull(),
-})
+export const member = fdmAuthNSchema.table(
+    "member",
+    {
+        id: text("id").primaryKey(),
+        organizationId: text("organization_id")
+            .notNull()
+            .references(() => organization.id, { onDelete: "cascade" }),
+        userId: text("user_id")
+            .notNull()
+            .references(() => user.id, { onDelete: "cascade" }),
+        role: text("role").default("member").notNull(),
+        createdAt: timestamp("created_at").notNull(),
+    },
+    (table) => [
+        index("member_organizationId_idx").on(table.organizationId),
+        index("member_userId_idx").on(table.userId),
+    ],
+)
 
-export const invitation = fdmAuthNSchema.table("invitation", {
-    id: text("id").primaryKey(),
-    organizationId: text("organization_id")
-        .notNull()
-        .references(() => organization.id, { onDelete: "cascade" }),
-    email: text("email").notNull(),
-    role: text("role"),
-    status: text("status").notNull(),
-    expiresAt: timestamp("expires_at").notNull(),
-    inviterId: text("inviter_id")
-        .notNull()
-        .references(() => user.id, { onDelete: "cascade" }),
-})
+export const invitation = fdmAuthNSchema.table(
+    "invitation",
+    {
+        id: text("id").primaryKey(),
+        organizationId: text("organization_id")
+            .notNull()
+            .references(() => organization.id, { onDelete: "cascade" }),
+        email: text("email").notNull(),
+        role: text("role"),
+        status: text("status").default("pending").notNull(),
+        expiresAt: timestamp("expires_at").notNull(),
+        createdAt: timestamp("created_at").defaultNow().notNull(),
+        inviterId: text("inviter_id")
+            .notNull()
+            .references(() => user.id, { onDelete: "cascade" }),
+    },
+    (table) => [
+        index("invitation_organizationId_idx").on(table.organizationId),
+        index("invitation_email_idx").on(table.email),
+    ],
+)
 
 export const rateLimit = fdmAuthNSchema.table("rate_limit", {
     id: text("id").primaryKey(),
@@ -108,3 +152,51 @@ export const rateLimit = fdmAuthNSchema.table("rate_limit", {
     count: integer("count"),
     lastRequest: bigint("last_request", { mode: "number" }),
 })
+
+export const userRelations = relations(user, ({ many }) => ({
+    sessions: many(session),
+    accounts: many(account),
+    members: many(member),
+    invitations: many(invitation),
+}))
+
+export const sessionRelations = relations(session, ({ one }) => ({
+    user: one(user, {
+        fields: [session.userId],
+        references: [user.id],
+    }),
+}))
+
+export const accountRelations = relations(account, ({ one }) => ({
+    user: one(user, {
+        fields: [account.userId],
+        references: [user.id],
+    }),
+}))
+
+export const organizationRelations = relations(organization, ({ many }) => ({
+    members: many(member),
+    invitations: many(invitation),
+}))
+
+export const memberRelations = relations(member, ({ one }) => ({
+    organization: one(organization, {
+        fields: [member.organizationId],
+        references: [organization.id],
+    }),
+    user: one(user, {
+        fields: [member.userId],
+        references: [user.id],
+    }),
+}))
+
+export const invitationRelations = relations(invitation, ({ one }) => ({
+    organization: one(organization, {
+        fields: [invitation.organizationId],
+        references: [organization.id],
+    }),
+    user: one(user, {
+        fields: [invitation.inviterId],
+        references: [user.id],
+    }),
+}))
diff --git a/fdm-core/src/farm.test.ts b/fdm-core/src/farm.test.ts
index e4cf87e1d..db6de8266 100644
--- a/fdm-core/src/farm.test.ts
+++ b/fdm-core/src/farm.test.ts
@@ -1,7 +1,7 @@
 import { eq } from "drizzle-orm"
 import { beforeAll, describe, expect, inject, it } from "vitest"
 import { createFdmAuth } from "./authentication"
-import type { FdmAuth } from "./authentication.d"
+import type { FdmAuth } from "./authentication"
 import { listPrincipalsForResource } from "./authorization"
 import * as schema from "./db/schema"
 import {
diff --git a/fdm-core/src/index.ts b/fdm-core/src/index.ts
index b18c3cda3..83df20fb6 100644
--- a/fdm-core/src/index.ts
+++ b/fdm-core/src/index.ts
@@ -21,7 +21,7 @@ export {
     createFdmAuth,
     updateUserProfile,
 } from "./authentication"
-export type { FdmAuth } from "./authentication.d"
+export type { FdmAuth } from "./authentication"
 export { checkPermission } from "./authorization"
 export type { PrincipalId } from "./authorization.d"
 export {
@@ -144,24 +144,6 @@ export {
     removeOrganicCertification,
 } from "./organic"
 export type { OrganicCertification } from "./organic.d"
-export {
-    acceptInvitation,
-    cancelPendingInvitation,
-    checkOrganizationSlugForAvailability,
-    createOrganization,
-    deleteOrganization,
-    getOrganization,
-    getOrganizationsForUser,
-    getPendingInvitation,
-    getPendingInvitationsForOrganization,
-    getPendingInvitationsForUser,
-    getUsersInOrganization,
-    inviteUserToOrganization,
-    rejectInvitation,
-    removeUserFromOrganization,
-    updateOrganization,
-    updateRoleOfUserAtOrganization,
-} from "./organization"
 export { lookupPrincipal } from "./principal"
 export {
     addSoilAnalysis,
diff --git a/fdm-core/src/organization.test.ts b/fdm-core/src/organization.test.ts
deleted file mode 100644
index 0226f1779..000000000
--- a/fdm-core/src/organization.test.ts
+++ /dev/null
@@ -1,1062 +0,0 @@
-import { eq } from "drizzle-orm"
-import { beforeAll, describe, expect, inject, it } from "vitest"
-import { type BetterAuth, createFdmAuth } from "./authentication"
-import * as authNSchema from "./db/schema-authn"
-import { createFdmServer } from "./fdm-server"
-import type { FdmServerType } from "./fdm-server.d"
-import { createId } from "./id"
-import {
-    acceptInvitation,
-    cancelPendingInvitation,
-    checkOrganizationSlugForAvailability,
-    createOrganization,
-    deleteOrganization,
-    getOrganization,
-    getOrganizationsForUser,
-    getPendingInvitation,
-    getPendingInvitationsForOrganization,
-    getPendingInvitationsForUser,
-    getUsersInOrganization,
-    inviteUserToOrganization,
-    rejectInvitation,
-    removeUserFromOrganization,
-    updateOrganization,
-    updateRoleOfUserAtOrganization,
-} from "./organization"
-
-describe("Organization Data Model", () => {
-    let fdm: FdmServerType
-    let user1_id: string
-    let user2_id: string
-    let user3_id: string
-    let fdmAuth: BetterAuth
-
-    beforeAll(async () => {
-        const host = inject("host")
-        const port = inject("port")
-        const user = inject("user")
-        const password = inject("password")
-        const database = inject("database")
-        // Mock environment variables
-        const googleAuth = {
-            clientId: "mock_google_client_id",
-            clientSecret: "mock_google_client_secret",
-        }
-        const microsoftAuth = {
-            clientId: "mock_ms_client_id",
-            clientSecret: "mock_ms_client_secret",
-        }
-
-        fdm = createFdmServer(host, port, user, password, database)
-
-        fdmAuth = createFdmAuth(fdm, googleAuth, microsoftAuth, undefined, true)
-        try {
-            const user1 = await fdmAuth.api.signUpEmail({
-                headers: undefined,
-                body: {
-                    email: "user1@example.com",
-                    name: "user1",
-                    firstname: "user1",
-                    surname: "user1",
-                    username: "user1",
-                    password: "password",
-                } as any,
-            })
-            user1_id = user1.user.id
-
-            const user2 = await fdmAuth.api.signUpEmail({
-                headers: undefined,
-                body: {
-                    email: "user2@example.com",
-                    name: "user2",
-                    firstname: "user2",
-                    surname: "user2",
-                    username: "user2",
-                    password: "password",
-                } as any,
-            })
-            user2_id = user2.user.id
-
-            const user3 = await fdmAuth.api.signUpEmail({
-                headers: undefined,
-                body: {
-                    email: "user3@example.com",
-                    name: "user3",
-                    firstname: "user3",
-                    surname: "user3",
-                    username: "user3",
-                    password: "password",
-                } as any,
-            })
-            user3_id = user3.user.id
-        } catch (error) {
-            console.error("Error creating user:", error)
-            throw error // Re-throw the error after logging
-        }
-    })
-
-    describe("Organization CRUD", () => {
-        it("should create a new organization", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-37"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-            expect(organization_id).toBeDefined()
-
-            const organization = await fdm
-                .select()
-                .from(authNSchema.organization)
-                .where(eq(authNSchema.organization.id, organization_id))
-                .limit(1)
-            expect(organization).toHaveLength(1)
-            expect(organization[0].name).toBe(name)
-            expect(organization[0].slug).toBe(slug)
-        })
-
-        it("should throw an error if createOrganization fails", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-28"
-            const description = "This is a test organization"
-            // Create an unique constraint violation
-            await createOrganization(fdm, user1_id, name, slug, description)
-            await expect(
-                createOrganization(fdm, user1_id, name, slug, description),
-            ).rejects.toThrow("Exception for createOrganization")
-        })
-
-        it("should get organizations for a user", async () => {
-            const name = "Test Organization 2"
-            const slug = "test-organization-2"
-            const description = "This is a test organization"
-            await createOrganization(fdm, user1_id, name, slug, description)
-
-            const organizations = await getOrganizationsForUser(fdm, user1_id)
-            expect(organizations).toBeDefined()
-            expect(organizations.length).toBeGreaterThanOrEqual(1)
-            const foundOrganization = organizations.find(
-                (org) => org.slug === slug,
-            )
-            expect(foundOrganization).toBeDefined()
-            expect(foundOrganization?.name).toEqual(name)
-        })
-
-        it("should return empty array if user is not member of any organization", async () => {
-            // Create a error condition for the database
-            await fdm.delete(authNSchema.member).execute()
-            const organizations = await getOrganizationsForUser(fdm, user1_id)
-            expect(organizations).toBeDefined()
-            expect(organizations.length).toBe(0)
-            //add the user again
-            await fdm.insert(authNSchema.member).values({
-                id: createId(),
-                organizationId: (
-                    await fdm.select().from(authNSchema.organization).limit(1)
-                )[0].id,
-                userId: user1_id,
-                role: "owner",
-                createdAt: new Date(),
-            })
-        })
-
-        it("should get users in an organization", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-22"
-            const description = "This is a test organization"
-            await createOrganization(fdm, user1_id, name, slug, description)
-
-            const users = await getUsersInOrganization(fdm, slug)
-            expect(users).toBeDefined()
-            expect(users.length).toBe(1)
-            expect(users[0].firstname).toEqual("user1")
-        })
-
-        it("should return empty array when no users in organization", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-31"
-            const description = "This is a test organization"
-            await createOrganization(fdm, user1_id, name, slug, description)
-            // Create a error condition for the database
-            await fdm.delete(authNSchema.organization).execute()
-            const members = await getUsersInOrganization(fdm, slug)
-            expect(members).toBeDefined()
-            expect(members.length).toBe(0)
-
-            // add the organization again
-            await createOrganization(fdm, user1_id, name, slug, description)
-        })
-
-        it("should check organization slug for availability", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-42"
-            const description = "This is a test organization"
-            await createOrganization(fdm, user1_id, name, slug, description)
-
-            const isAvailable = await checkOrganizationSlugForAvailability(
-                fdm,
-                slug,
-            )
-            expect(isAvailable).toBe(false)
-
-            const isAvailable2 = await checkOrganizationSlugForAvailability(
-                fdm,
-                "test-organization-43",
-            )
-            expect(isAvailable2).toBe(true)
-
-            await expect(
-                checkOrganizationSlugForAvailability(fdm, "INVALID_SLUG"),
-            ).rejects.toThrow(
-                "Exception for checkOrganizationSlugForAvailability",
-            )
-        })
-
-        it("should invite user to organization", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-74"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-
-            const invitationId = await inviteUserToOrganization(
-                fdm,
-                user1_id,
-                "user2@example.com",
-                "member",
-                organization_id,
-            )
-            expect(invitationId).toBeDefined()
-
-            const invitations = await getPendingInvitationsForUser(
-                fdm,
-                user2_id,
-            )
-            await expect(invitations).toBeDefined()
-
-            const invitation = await getPendingInvitation(fdm, invitationId)
-            expect(invitation).toBeDefined()
-            expect(invitation.organization_id).toBe(organization_id)
-            expect(invitation.role).toBe("member")
-            expect(invitation.inviter_firstname).toBe("user1")
-            expect(invitation.inviter_surname).toBe("user1")
-            expect(invitation.inviter_image).toBeNull()
-            expect(invitation.expires_at).toBeDefined()
-            expect(invitation.expires_at).toBeInstanceOf(Date)
-        })
-
-        it("should throw an error if user is not member of organization when inviting", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-102"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-            await expect(
-                inviteUserToOrganization(
-                    fdm,
-                    user3_id,
-                    "user3@example.com",
-                    "member",
-                    organization_id,
-                ),
-            ).rejects.toThrow("Exception for inviteUserToOrganization")
-        })
-
-        it("should return empty array when no pending invitations", async () => {
-            const invitations = await getPendingInvitationsForUser(
-                fdm,
-                user3_id,
-            )
-            await expect(invitations).toBeDefined()
-            expect(invitations.length).toBe(0)
-        })
-
-        it("should throw an error if getPendingInvitationsForUser fails", async () => {
-            // Create a error condition for the database
-            await fdm.delete(authNSchema.invitation).execute()
-            const invitations = await getPendingInvitationsForUser(
-                fdm,
-                user2_id,
-            )
-            await expect(invitations).toBeDefined()
-            expect(invitations.length).toBe(0)
-
-            // add the invitation again
-            const name = "Test Organization"
-            const slug = "test-organization-83"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-
-            await inviteUserToOrganization(
-                fdm,
-                user1_id,
-                "user2@example.com",
-                "member",
-                organization_id,
-            )
-        })
-        it("should throw error when non existing invitation requested", async () => {
-            await expect(getPendingInvitation(fdm, createId())).rejects.toThrow(
-                "Exception for getPendingInvitation",
-            )
-        })
-
-        it("should reject invitation", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-99"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-
-            const invitationId = await inviteUserToOrganization(
-                fdm,
-                user1_id,
-                "user2@example.com",
-                "member",
-                organization_id,
-            )
-            expect(invitationId).toBeDefined()
-
-            await rejectInvitation(fdm, invitationId, user2_id)
-            const invitation = await fdm
-                .select()
-                .from(authNSchema.invitation)
-                .where(eq(authNSchema.invitation.id, invitationId))
-                .limit(1)
-
-            expect(invitation[0].status).toBe("rejected")
-
-            await expect(
-                rejectInvitation(fdm, invitationId, user2_id),
-            ).rejects.toThrow("Exception for rejectInvitation")
-        })
-        it("should return an empty array if there are no pending invitations", async () => {
-            const slug = "test-organization-97"
-
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                "Test Org",
-                slug,
-                "Test Description",
-            )
-            const invitations = await getPendingInvitationsForOrganization(
-                fdm,
-                organization_id,
-            )
-            expect(invitations).toEqual([])
-        })
-
-        it("should return a list of pending invitations for the organization", async () => {
-            const email2 = "test2@example.com"
-            const role = "member"
-            const slug = "test-organization-94"
-
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                "Test Org",
-                slug,
-                "Test Description",
-            )
-
-            await inviteUserToOrganization(
-                fdm,
-                user1_id,
-                email2,
-                role,
-                organization_id,
-            )
-
-            const invitations = await getPendingInvitationsForOrganization(
-                fdm,
-                organization_id,
-            )
-
-            expect(invitations.length).toBe(1)
-            expect(invitations.map((invitation) => invitation.email)).toEqual(
-                expect.arrayContaining([email2]),
-            )
-        })
-
-        it("should not return rejected invitations", async () => {
-            const email2 = "user2@example.com"
-            const role = "member"
-            const slug = "test-organization-89"
-
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                "Test Org",
-                slug,
-                "Test Description",
-            )
-
-            const invitation_id = await inviteUserToOrganization(
-                fdm,
-                user1_id,
-                email2,
-                role,
-                organization_id,
-            )
-
-            // Reject one invitation
-            await rejectInvitation(fdm, invitation_id, user2_id)
-
-            const invitations = await getPendingInvitationsForOrganization(
-                fdm,
-                organization_id,
-            )
-
-            expect(invitations.length).toBe(0)
-        })
-
-        it("should throw an error if the organization does not exist", async () => {
-            const nonExistentSlug = "non-existent-org"
-
-            const invitations = await getPendingInvitationsForOrganization(
-                fdm,
-                nonExistentSlug,
-            )
-            expect(invitations).toEqual([])
-        })
-
-        it("should remove user from organization", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-53"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-
-            const invitationId = await inviteUserToOrganization(
-                fdm,
-                user1_id,
-                "user2@example.com",
-                "member",
-                organization_id,
-            )
-            expect(invitationId).toBeDefined()
-
-            await acceptInvitation(fdm, invitationId, user2_id)
-
-            await removeUserFromOrganization(
-                fdm,
-                user1_id,
-                organization_id,
-                "user2",
-            )
-
-            const organizations = await getOrganizationsForUser(fdm, user2_id)
-            expect(organizations).toBeDefined()
-            expect(
-                organizations.find((org) => org.slug === slug),
-            ).toBeUndefined()
-
-            await expect(
-                removeUserFromOrganization(
-                    fdm,
-                    user1_id,
-                    organization_id,
-                    "user3",
-                ),
-            ).resolves.toBeUndefined()
-        })
-        it("should throw an error if removing last owner", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-remove-owner"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-
-            await expect(
-                removeUserFromOrganization(
-                    fdm,
-                    user1_id,
-                    organization_id,
-                    "user1",
-                ),
-            ).rejects.toThrow("Exception for removeUserFromOrganization")
-        })
-
-        it("should update role of user at organization", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-19"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-
-            const newUserEmail = "user2@example.com"
-            const invitationId = await inviteUserToOrganization(
-                fdm,
-                user1_id,
-                newUserEmail,
-                "member",
-                organization_id,
-            )
-            expect(invitationId).toBeDefined()
-
-            await acceptInvitation(fdm, invitationId, user2_id)
-
-            await updateRoleOfUserAtOrganization(
-                fdm,
-                user1_id,
-                organization_id,
-                "user2",
-                "admin",
-            )
-
-            const organizations = await getOrganizationsForUser(fdm, user2_id)
-            expect(organizations).toBeDefined()
-            expect(
-                organizations.find((org) => org.slug === slug)?.organization_id,
-            ).toBe(organization_id)
-            expect(organizations.find((org) => org.slug === slug)?.role).toBe(
-                "admin",
-            )
-
-            await expect(
-                updateRoleOfUserAtOrganization(
-                    fdm,
-                    user1_id,
-                    organization_id,
-                    "user3",
-                    "admin",
-                ),
-            ).resolves.toBeUndefined()
-        })
-
-        it("should throw an error if updating user role results in no owners", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-no-owner"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-
-            const newUserEmail = "user2@example.com"
-            const invitationId = await inviteUserToOrganization(
-                fdm,
-                user1_id,
-                newUserEmail,
-                "member",
-                organization_id,
-            )
-            expect(invitationId).toBeDefined()
-
-            await acceptInvitation(fdm, invitationId, user2_id)
-
-            await expect(
-                updateRoleOfUserAtOrganization(
-                    fdm,
-                    user1_id,
-                    organization_id,
-                    "user1",
-                    "admin",
-                ),
-            ).rejects.toThrow("Exception for updateRoleOfUserAtOrganization")
-        })
-
-        it("should delete an organization", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-24"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-
-            await deleteOrganization(fdm, user1_id, organization_id)
-
-            const organization = await fdm
-                .select()
-                .from(authNSchema.organization)
-                .where(eq(authNSchema.organization.id, organization_id))
-                .limit(1)
-            expect(organization).toHaveLength(0)
-
-            await expect(
-                deleteOrganization(fdm, user1_id, organization_id),
-            ).rejects.toThrow("Exception for deleteOrganization")
-        })
-
-        it("should accept invitation", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-101"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-
-            const invitationId = await inviteUserToOrganization(
-                fdm,
-                user1_id,
-                "user2@example.com",
-                "member",
-                organization_id,
-            )
-            expect(invitationId).toBeDefined()
-
-            await acceptInvitation(fdm, invitationId, user2_id)
-
-            const member = await getUsersInOrganization(fdm, slug)
-            expect(member).toBeDefined()
-            expect(member.find((x) => x.firstname === "user2")?.role).toBe(
-                "member",
-            )
-
-            await expect(
-                acceptInvitation(fdm, invitationId, user2_id),
-            ).rejects.toThrow("Exception for acceptInvitation")
-        })
-
-        it("should throw an error if user is not owner or admin when inviting", async () => {
-            const name = "Test Organization"
-            const slug = "test-organization-112"
-            const description = "This is a test organization"
-            const organization_id = await createOrganization(
-                fdm,
-                user1_id,
-                name,
-                slug,
-                description,
-            )
-
-            const invitationId = await inviteUserToOrganization(
-                fdm,
-                user1_id,
-                "user2@example.com",
-                "member",
-                organization_id,
-            )
-            await acceptInvitation(fdm, invitationId, user2_id)
-            await expect(
-                inviteUserToOrganization(
-                    fdm,
-                    user2_id,
-                    "user3@example.com",
-                    "member",
-                    organization_id,
-                ),
-            ).rejects.toThrow("Exception for inviteUserToOrganization")
-        })
-        it("should handle invalid organization slug", async () => {
-            await expect(
-                checkOrganizationSlugForAvailability(fdm, ""),
-            ).rejects.toThrow(
-                "Exception for checkOrganizationSlugForAvailability",
-            )
-            await expect(
-                checkOrganizationSlugForAvailability(fdm, "Invalid Slug"),
-            ).rejects.toThrow(
-                "Exception for checkOrganizationSlugForAvailability",
-            )
-        })
-
-        describe("cancelPendingInvitation", () => {
-            it("should cancel a pending invitation", async () => {
-                const name = "Test Organization"
-                const slug = "test-organization-cancel-1"
-                const description = "This is a test organization"
-                const organization_id = await createOrganization(
-                    fdm,
-                    user1_id,
-                    name,
-                    slug,
-                    description,
-                )
-
-                const invitationId = await inviteUserToOrganization(
-                    fdm,
-                    user1_id,
-                    "user2@example.com",
-                    "member",
-                    organization_id,
-                )
-                expect(invitationId).toBeDefined()
-
-                await cancelPendingInvitation(fdm, invitationId, user1_id)
-
-                const invitation = await fdm
-                    .select()
-                    .from(authNSchema.invitation)
-                    .where(eq(authNSchema.invitation.id, invitationId))
-                    .limit(1)
-
-                expect(invitation[0].status).toBe("cancelled")
-            })
-
-            it("should throw an error if invitation does not exist", async () => {
-                await expect(
-                    cancelPendingInvitation(fdm, createId(), user1_id),
-                ).rejects.toThrow("Exception for cancelPendingInvitation")
-            })
-
-            it("should throw an error if user is not admin or owner of organization", async () => {
-                const name = "Test Organization"
-                const slug = "test-organization-cancel-2"
-                const description = "This is a test organization"
-                const organization_id = await createOrganization(
-                    fdm,
-                    user1_id,
-                    name,
-                    slug,
-                    description,
-                )
-
-                const invitationId = await inviteUserToOrganization(
-                    fdm,
-                    user1_id,
-                    "user2@example.com",
-                    "member",
-                    organization_id,
-                )
-
-                await expect(
-                    cancelPendingInvitation(fdm, invitationId, user3_id),
-                ).rejects.toThrow("Exception for cancelPendingInvitation")
-            })
-            it("should throw an error if user is not member of organization", async () => {
-                const name = "Test Organization"
-                const slug = "test-organization-cancel-3"
-                const description = "This is a test organization"
-                const organization_id = await createOrganization(
-                    fdm,
-                    user1_id,
-                    name,
-                    slug,
-                    description,
-                )
-                const invitationId = await inviteUserToOrganization(
-                    fdm,
-                    user1_id,
-                    "user2@example.com",
-                    "member",
-                    organization_id,
-                )
-                const user_not_member = createId()
-
-                await expect(
-                    cancelPendingInvitation(fdm, invitationId, user_not_member),
-                ).rejects.toThrow("Exception for cancelPendingInvitation")
-            })
-        })
-
-        describe("updateOrganization", () => {
-            let organization_id: string
-
-            beforeAll(async () => {
-                // Create an organization before a test
-                const name = "Test Organization"
-                const slug = "test-organization-update-62"
-                const description = "This is a test organization"
-                organization_id = await createOrganization(
-                    fdm,
-                    user1_id,
-                    name,
-                    slug,
-                    description,
-                )
-            })
-
-            it("should allow partial updates", async () => {
-                const updatedName = "Partially Updated Org"
-                const updatedDescription = "Updated Description only"
-                const oldLogo = "/old-logo.png"
-                await updateOrganization(
-                    fdm,
-                    user1_id,
-                    organization_id,
-                    undefined,
-                    undefined,
-                    updatedDescription,
-                    oldLogo,
-                    undefined,
-                )
-
-                await updateOrganization(
-                    fdm,
-                    user1_id,
-                    organization_id,
-                    updatedName,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                )
-
-                const organization = await fdm
-                    .select()
-                    .from(authNSchema.organization)
-                    .where(eq(authNSchema.organization.id, organization_id))
-                    .limit(1)
-
-                expect(organization[0].name).toBe(updatedName)
-                const metadata = JSON.parse(organization[0].metadata || "{}")
-                expect(metadata.description).toBe(updatedDescription)
-                expect(organization[0].logo).toBe(oldLogo)
-            })
-
-            it("should throw an error if user is not an owner or admin", async () => {
-                const name = "Test Organization"
-                const slug = "test-organization-77"
-                const description = "This is a test organization"
-                const organization_id = await createOrganization(
-                    fdm,
-                    user1_id,
-                    name,
-                    slug,
-                    description,
-                )
-                const invitationId = await inviteUserToOrganization(
-                    fdm,
-                    user1_id,
-                    "user2@example.com",
-                    "member",
-                    organization_id,
-                )
-                await acceptInvitation(fdm, invitationId, user2_id)
-                await expect(
-                    updateOrganization(
-                        fdm,
-                        user2_id,
-                        organization_id,
-                        "New Name",
-                        "new-slug",
-                        "New description",
-                        null,
-                        false,
-                    ),
-                ).rejects.toThrow("Exception for updateOrganization")
-            })
-
-            it("should throw an error if user is not a member of the organization", async () => {
-                const new_user_id = createId()
-                await expect(
-                    updateOrganization(
-                        fdm,
-                        new_user_id,
-                        organization_id,
-                        "New Name",
-                        "new-slug",
-                        "New description",
-                        null,
-                        false,
-                    ),
-                ).rejects.toThrow("Exception for updateOrganization")
-            })
-            it("should update organization logo", async () => {
-                const updatedLogo = "/new-logo.png"
-                await updateOrganization(
-                    fdm,
-                    user1_id,
-                    organization_id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    updatedLogo,
-                    undefined,
-                )
-                const organization = await fdm
-                    .select()
-                    .from(authNSchema.organization)
-                    .where(eq(authNSchema.organization.id, organization_id))
-                    .limit(1)
-                expect(organization[0].logo).toBe(updatedLogo)
-            })
-            it("should update isVerified boolean", async () => {
-                const updatedIsVerified = true
-                await updateOrganization(
-                    fdm,
-                    user1_id,
-                    organization_id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    updatedIsVerified,
-                )
-                const organization = await fdm
-                    .select()
-                    .from(authNSchema.organization)
-                    .where(eq(authNSchema.organization.id, organization_id))
-                    .limit(1)
-                const metadata = JSON.parse(organization[0].metadata || "{}")
-                expect(metadata.isVerified).toBe(updatedIsVerified)
-            })
-
-            it("should set null as logo", async () => {
-                const updatedLogo = null
-                await updateOrganization(
-                    fdm,
-                    user1_id,
-                    organization_id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    updatedLogo,
-                    undefined,
-                )
-                const organization = await fdm
-                    .select()
-                    .from(authNSchema.organization)
-                    .where(eq(authNSchema.organization.id, organization_id))
-                    .limit(1)
-                expect(organization[0].logo).toBe(updatedLogo)
-            })
-        })
-        describe("getOrganization", () => {
-            it("should get an organization", async () => {
-                const name = "Test Organization"
-                const slug = "test-organization-get-1"
-                const description = "This is a test organization"
-                const organization_id = await createOrganization(
-                    fdm,
-                    user1_id,
-                    name,
-                    slug,
-                    description,
-                )
-                const organization = await getOrganization(fdm, slug, user1_id)
-
-                expect(organization).toBeDefined()
-                expect(organization?.id).toBe(organization_id)
-                expect(organization?.name).toBe(name)
-                expect(organization?.slug).toBe(slug)
-                expect(organization?.description).toBe(description)
-            })
-
-            it("should return null if organization does not exist", async () => {
-                const organization = await getOrganization(
-                    fdm,
-                    createId(),
-                    user1_id,
-                )
-                expect(organization).toBeNull()
-            })
-
-            it("should retrieve permissions", async () => {
-                const name = "Test Organization"
-                const slug = "test-organization-permission-get"
-                const description = "This is a test organization"
-                const organization_id = await createOrganization(
-                    fdm,
-                    user1_id,
-                    name,
-                    slug,
-                    description,
-                )
-                const organizationOwner = await getOrganization(
-                    fdm,
-                    slug,
-                    user1_id,
-                )
-                expect(organizationOwner).toBeDefined()
-                expect(organizationOwner?.permissions.canEdit).toBe(true)
-                expect(organizationOwner?.permissions.canDelete).toBe(true)
-                expect(organizationOwner?.permissions.canInvite).toBe(true)
-                expect(organizationOwner?.permissions.canUpdateRoleUser).toBe(
-                    true,
-                )
-                expect(organizationOwner?.permissions.canRemoveUser).toBe(true)
-
-                const invitationId = await inviteUserToOrganization(
-                    fdm,
-                    user1_id,
-                    "user2@example.com",
-                    "member",
-                    organization_id,
-                )
-                await acceptInvitation(fdm, invitationId, user2_id)
-
-                const organizationMember = await getOrganization(
-                    fdm,
-                    slug,
-                    user2_id,
-                )
-                expect(organizationMember).toBeDefined()
-                expect(organizationMember?.permissions.canEdit).toBe(false)
-                expect(organizationMember?.permissions.canDelete).toBe(false)
-                expect(organizationMember?.permissions.canInvite).toBe(false)
-                expect(organizationMember?.permissions.canUpdateRoleUser).toBe(
-                    false,
-                )
-                expect(organizationMember?.permissions.canRemoveUser).toBe(
-                    false,
-                )
-
-                await updateRoleOfUserAtOrganization(
-                    fdm,
-                    user1_id,
-                    organization_id,
-                    "user2",
-                    "admin",
-                )
-
-                const organizationAdmin = await getOrganization(
-                    fdm,
-                    slug,
-                    user2_id,
-                )
-                expect(organizationAdmin).toBeDefined()
-                expect(organizationAdmin?.permissions.canEdit).toBe(true)
-                expect(organizationAdmin?.permissions.canDelete).toBe(false)
-                expect(organizationAdmin?.permissions.canInvite).toBe(true)
-                expect(organizationAdmin?.permissions.canUpdateRoleUser).toBe(
-                    true,
-                )
-                expect(organizationAdmin?.permissions.canRemoveUser).toBe(true)
-            })
-        })
-    })
-})
diff --git a/fdm-core/src/organization.ts b/fdm-core/src/organization.ts
deleted file mode 100644
index 21e68fb0e..000000000
--- a/fdm-core/src/organization.ts
+++ /dev/null
@@ -1,1077 +0,0 @@
-import { and, asc, count, desc, eq, gt } from "drizzle-orm"
-import * as authNSchema from "./db/schema-authn"
-import { handleError } from "./error"
-import type { FdmType } from "./fdm"
-import { createId } from "./id"
-
-/**
- * Creates a new organization and assigns the creating user as the owner.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param owner_id - The ID of the user creating the organization.
- * @param name - The name of the organization.
- * @param slug - The unique slug for the organization.
- * @param description - A description of the organization.
- * @returns A promise that resolves with the ID of the newly created organization.
- * @throws {Error} Throws an error if any database operation fails or if the input data is invalid.
- */
-export async function createOrganization(
-    fdm: FdmType,
-    owner_id: string,
-    name: string,
-    slug: string,
-    description: string,
-): Promise<string> {
-    try {
-        return await fdm.transaction(async (tx: FdmType) => {
-            // Generate an ID for the farm
-            const organization_id = createId()
-            // Insert the organization in the db
-            const meta = {
-                isVerified: false,
-                description,
-            }
-            const organizationData = {
-                id: organization_id,
-                name: name,
-                slug: slug,
-                logo: null,
-                createdAt: new Date(),
-                metadata: JSON.stringify(meta),
-            }
-            await tx.insert(authNSchema.organization).values(organizationData)
-
-            // Make the user owner of the organization
-            const memberData = {
-                id: createId(),
-                organizationId: organization_id,
-                userId: owner_id,
-                role: "owner",
-                createdAt: new Date(),
-            }
-            await tx.insert(authNSchema.member).values(memberData)
-
-            return organization_id
-        })
-    } catch (err) {
-        throw handleError(err, "Exception for createOrganization", {
-            name,
-            slug,
-            description,
-            owner_id,
-        })
-    }
-}
-
-/**
- * Updates an existing organization.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param admin_id - The ID of the user initiating the update (must be owner or admin).
- * @param organization_id - The ID of the organization to update.
- * @param name - (Optional) The new name of the organization.
- * @param slug - (Optional) The new unique slug for the organization.
- * @param description - (Optional) The new description of the organization.
- * @param logo - (Optional) The new logo of the organization.
- * @param isVerified - (Optional) set isVerified boolean.
- * @returns A promise that resolves when the organization has been updated.
- * @throws {Error} Throws an error if any database operation fails, if the user does not have permissions, or if input data is invalid.
- */
-export async function updateOrganization(
-    fdm: FdmType,
-    admin_id: string,
-    organization_id: string,
-    name?: string,
-    slug?: string,
-    description?: string,
-    logo?: string | null,
-    isVerified?: boolean,
-): Promise<void> {
-    try {
-        return await fdm.transaction(async (tx: FdmType) => {
-            // Check if user has permission to update organization
-            const permissions = await getUserOrganizationPermissions(
-                tx,
-                admin_id,
-                organization_id,
-            )
-            if (!permissions.canEdit) {
-                throw new Error("User has no permission to update organization")
-            }
-
-            const updatedMetadata = await tx
-                .select({ metadata: authNSchema.organization.metadata })
-                .from(authNSchema.organization)
-                .where(eq(authNSchema.organization.id, organization_id))
-                .limit(1)
-            let metadata: { isVerified?: boolean; description?: string }
-            if (updatedMetadata.length > 0) {
-                metadata = JSON.parse(updatedMetadata[0].metadata)
-            } else {
-                metadata = {}
-            }
-
-            const updatedFields: Partial<
-                typeof authNSchema.organization.$inferInsert
-            > = {}
-            if (name !== undefined) {
-                updatedFields.name = name
-            }
-            if (slug !== undefined) {
-                updatedFields.slug = slug
-            }
-            if (logo !== undefined) {
-                updatedFields.logo = logo
-            }
-
-            if (description !== undefined) {
-                metadata.description = description
-            }
-            if (isVerified !== undefined) {
-                metadata.isVerified = isVerified
-            }
-
-            if (Object.keys(metadata).length > 0) {
-                updatedFields.metadata = JSON.stringify(metadata)
-            }
-
-            if (Object.keys(updatedFields).length > 0) {
-                await tx
-                    .update(authNSchema.organization)
-                    .set(updatedFields)
-                    .where(eq(authNSchema.organization.id, organization_id))
-            }
-        })
-    } catch (err) {
-        throw handleError(err, "Exception for updateOrganization", {
-            admin_id,
-            organization_id,
-            name,
-            slug,
-            description,
-            logo,
-            isVerified,
-        })
-    }
-}
-
-/**
- * Retrieves an organization by its ID.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param organization_slug - The slug of the organization to retrieve.
- * @param user_id - The ID of the user for whom to retrieve organizations.
- * @returns A promise that resolves with the organization details and permisssions of user, or null if not found.
- * @throws {Error} Throws an error if any database operation fails.
- */
-export async function getOrganization(
-    fdm: FdmType,
-    organization_slug: string,
-    user_id: string,
-): Promise<{
-    id: string
-    name: string
-    slug: string
-    logo: string | null
-    isVerified: boolean
-    description: string
-    permissions: OrganizationPermissions
-} | null> {
-    try {
-        return await fdm.transaction(async (tx: FdmType) => {
-            const organization = await tx
-                .select({
-                    id: authNSchema.organization.id,
-                    name: authNSchema.organization.name,
-                    slug: authNSchema.organization.slug,
-                    logo: authNSchema.organization.logo,
-                    metadata: authNSchema.organization.metadata,
-                })
-                .from(authNSchema.organization)
-                .where(eq(authNSchema.organization.slug, organization_slug))
-                .limit(1)
-
-            if (organization.length === 0) {
-                return null
-            }
-
-            // Get permissions for this organization
-            const permissions = await getUserOrganizationPermissions(
-                tx,
-                user_id,
-                organization[0].id,
-            )
-
-            const metadata = JSON.parse(organization[0].metadata)
-            return {
-                id: organization[0].id,
-                name: organization[0].name,
-                slug: organization[0].slug,
-                logo: organization[0].logo,
-                isVerified: metadata.isVerified ?? false,
-                description: metadata.description ?? "",
-                permissions: permissions,
-            }
-        })
-    } catch (err) {
-        throw handleError(err, "Exception for getOrganization", {
-            organization_slug,
-        })
-    }
-}
-
-/**
- * Retrieves a list of organizations that a user is a part of.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param user_id - The ID of the user for whom to retrieve organizations.
- * @returns A promise that resolves with an array of organization details.
- * @throws {Error} Throws an error if any database operation fails.
- */
-export async function getOrganizationsForUser(
-    fdm: FdmType,
-    user_id: string,
-): Promise<
-    {
-        organization_id: string
-        name: string
-        slug: string
-        role: string
-        is_verified: boolean
-        description: string
-    }[]
-> {
-    try {
-        const organizationRoles = await fdm
-            .select({
-                organization_id: authNSchema.member.organizationId,
-                role: authNSchema.member.role,
-                name: authNSchema.organization.name,
-                slug: authNSchema.organization.slug,
-                metadata: authNSchema.organization.metadata,
-            })
-            .from(authNSchema.member)
-            .leftJoin(
-                authNSchema.organization,
-                eq(
-                    authNSchema.member.organizationId,
-                    authNSchema.organization.id,
-                ),
-            )
-            .where(eq(authNSchema.member.userId, user_id))
-            .orderBy(asc(authNSchema.member.createdAt))
-
-        if (organizationRoles.length === 0) {
-            return []
-        }
-
-        return organizationRoles.map(
-            (role: {
-                metadata: string
-                organization_id: string
-                name: string
-                slug: string
-                role: "owner" | "admin" | "member"
-            }) => {
-                const metadata = JSON.parse(role.metadata)
-                return {
-                    organization_id: role.organization_id,
-                    name: role.name,
-                    slug: role.slug,
-                    role: role.role,
-                    is_verified: metadata.isVerified,
-                    description: metadata.description,
-                }
-            },
-        )
-    } catch (err) {
-        throw handleError(err, "Exception for getOrganizationsForUser", {
-            user_id,
-        })
-    }
-}
-
-/**
- * Retrieves a list of users that are members of a specific organization.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param organization_slug - The unique slug of the organization.
- * @returns A promise that resolves with an array of user details.
- * @throws {Error} Throws an error if any database operation fails.
- */
-export async function getUsersInOrganization(
-    fdm: FdmType,
-    organization_slug: string,
-): Promise<
-    {
-        username: string
-        firstname: string
-        surname: string
-        image: string
-        role: string
-    }[]
-> {
-    try {
-        const users = await fdm
-            .select({
-                username: authNSchema.user.username,
-                firstname: authNSchema.user.firstname,
-                surname: authNSchema.user.surname,
-                image: authNSchema.user.image,
-                role: authNSchema.member.role,
-            })
-            .from(authNSchema.organization)
-            .leftJoin(
-                authNSchema.member,
-                eq(
-                    authNSchema.organization.id,
-                    authNSchema.member.organizationId,
-                ),
-            )
-            .leftJoin(
-                authNSchema.user,
-                eq(authNSchema.member.userId, authNSchema.user.id),
-            )
-            .where(and(eq(authNSchema.organization.slug, organization_slug)))
-            .orderBy(asc(authNSchema.member.createdAt))
-
-        if (users.length === 0) {
-            return []
-        }
-
-        return users
-    } catch (err) {
-        throw handleError(err, "Exception for getUsersInOrganization", {
-            organization_slug,
-        })
-    }
-}
-
-/**
- * Invites a user to an organization.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param inviter_id - The ID of the user initiating the invitation (must be owner or admin).
- * @param email - The email address of the user being invited.
- * @param role - The role to assign to the invited user in the organization.
- * @param organization_id - The ID of the organization to which the user is being invited.
- * @returns A promise that resolves with the ID of the newly created invitation.
- * @throws {Error} Throws an error if any database operation fails, if the user does not have permissions, or if input data is invalid.
- */
-export async function inviteUserToOrganization(
-    fdm: FdmType,
-    inviter_id: string,
-    email: string,
-    role: "owner" | "admin" | "member",
-    organization_id: string,
-): Promise<string> {
-    try {
-        return await fdm.transaction(async (tx: FdmType) => {
-            // Check if user has permission to invite
-            const permissions = await getUserOrganizationPermissions(
-                tx,
-                inviter_id,
-                organization_id,
-            )
-            if (!permissions.canInvite) {
-                throw new Error("User has no permission to invite")
-            }
-
-            // Generate an ID for the invitation
-            const invitation_id = createId()
-            // Insert the invitation in the db
-            const invitationData = {
-                id: invitation_id,
-                organizationId: organization_id,
-                email: email,
-                role: role,
-                status: "pending",
-                expiresAt: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7), // 7 days
-                inviterId: inviter_id,
-            }
-            await tx.insert(authNSchema.invitation).values(invitationData)
-
-            return invitation_id
-        })
-    } catch (err) {
-        throw handleError(err, "Exception for inviteUserToOrganization", {
-            inviter_id,
-            email,
-            role,
-            organization_id,
-        })
-    }
-}
-
-/**
- * Retrieves a list of pending invitations for a specific organization.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param organization_id - The id of the organization.
- * @returns A promise that resolves with an array of pending invitation details, including the email, role, expiration date, and inviter's name.
- * @throws {Error} Throws an error if any database operation fails.
- */
-export async function getPendingInvitationsForOrganization(
-    fdm: FdmType,
-    organization_id: string,
-): Promise<
-    {
-        invitation_id: string
-        email: string
-        role: string
-        expires_at: Date
-        inviter_firstname: string
-        inviter_surname: string
-    }[]
-> {
-    try {
-        const invitations = await fdm
-            .select({
-                invitation_id: authNSchema.invitation.id,
-                email: authNSchema.invitation.email,
-                role: authNSchema.invitation.role,
-                expires_at: authNSchema.invitation.expiresAt,
-                inviter_firstname: authNSchema.user.firstname,
-                inviter_surname: authNSchema.user.surname,
-            })
-            .from(authNSchema.organization)
-            .leftJoin(
-                authNSchema.invitation,
-                eq(
-                    authNSchema.organization.id,
-                    authNSchema.invitation.organizationId,
-                ),
-            )
-            .leftJoin(
-                authNSchema.user,
-                eq(authNSchema.invitation.inviterId, authNSchema.user.id),
-            )
-            .where(
-                and(
-                    eq(authNSchema.organization.id, organization_id),
-                    eq(authNSchema.invitation.status, "pending"),
-                    gt(authNSchema.invitation.expiresAt, new Date()),
-                ),
-            )
-            .orderBy(asc(authNSchema.invitation.expiresAt))
-
-        if (invitations.length === 0) {
-            return []
-        }
-
-        return invitations
-    } catch (err) {
-        throw handleError(
-            err,
-            "Exception for getPendingInvitationsForOrganization",
-            {
-                organization_id,
-            },
-        )
-    }
-}
-
-/**
- * Retrieves a list of pending invitations for a specific user.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param user_id - The ID of the user for whom to retrieve pending invitations.
- * @returns A promise that resolves with an array of pending invitation details.
- * @throws {Error} Throws an error if any database operation fails.
- */
-export async function getPendingInvitationsForUser(
-    fdm: FdmType,
-    user_id: string,
-): Promise<
-    {
-        invitation_id: string
-        organization_id: string
-        organization_name: string
-        organization_slug: string
-        role: string
-        expires_at: Date
-        inviter_firstname: string
-        inviter_surname: string
-        inviter_image: string
-    }[]
-> {
-    try {
-        const invitations = await fdm
-            .select({
-                invitation_id: authNSchema.invitation.id,
-                organization_id: authNSchema.invitation.organizationId,
-                organization_name: authNSchema.organization.name,
-                organization_slug: authNSchema.organization.slug,
-                role: authNSchema.invitation.role,
-                expires_at: authNSchema.invitation.expiresAt,
-                inviter_firstname: authNSchema.user.firstname,
-                inviter_surname: authNSchema.user.surname,
-                inviter_image: authNSchema.user.image,
-            })
-            .from(authNSchema.invitation)
-            .leftJoin(
-                authNSchema.organization,
-                eq(
-                    authNSchema.invitation.organizationId,
-                    authNSchema.organization.id,
-                ),
-            )
-            .leftJoin(
-                authNSchema.user,
-                eq(authNSchema.invitation.inviterId, authNSchema.user.id),
-            )
-            .where(
-                and(
-                    eq(
-                        authNSchema.invitation.email,
-                        fdm
-                            .select({ email: authNSchema.user.email })
-                            .from(authNSchema.user)
-                            .where(eq(authNSchema.user.id, user_id)),
-                    ),
-                    eq(authNSchema.invitation.status, "pending"),
-                    gt(authNSchema.invitation.expiresAt, new Date()),
-                ),
-            )
-            .orderBy(desc(authNSchema.invitation.expiresAt))
-
-        if (invitations.length === 0) {
-            return []
-        }
-
-        return invitations
-    } catch (err) {
-        throw handleError(err, "Exception for getPendingInvitationsForUser", {
-            user_id,
-        })
-    }
-}
-
-/**
- * Retrieves the details of a specific pending invitation.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param invitation_id - The ID of the invitation to retrieve.
- * @returns A promise that resolves with the pending invitation details.
- * @throws {Error} Throws an error if any database operation fails or if the invitation is not found.
- */
-export async function getPendingInvitation(
-    fdm: FdmType,
-    invitation_id: string,
-): Promise<{
-    invitation_id: string
-    organization_id: string
-    organization_name: string
-    organization_slug: string
-    role: string
-    expires_at: Date
-    inviter_firstname: string
-    inviter_surname: string
-    inviter_image: string
-}> {
-    try {
-        const invitation = await fdm
-            .select({
-                invitation_id: authNSchema.invitation.id,
-                organization_id: authNSchema.invitation.organizationId,
-                organization_name: authNSchema.organization.name,
-                organization_slug: authNSchema.organization.slug,
-                role: authNSchema.invitation.role,
-                expires_at: authNSchema.invitation.expiresAt,
-                inviter_firstname: authNSchema.user.firstname,
-                inviter_surname: authNSchema.user.surname,
-                inviter_image: authNSchema.user.image,
-            })
-            .from(authNSchema.invitation)
-            .leftJoin(
-                authNSchema.organization,
-                eq(
-                    authNSchema.invitation.organizationId,
-                    authNSchema.organization.id,
-                ),
-            )
-            .leftJoin(
-                authNSchema.user,
-                eq(authNSchema.invitation.inviterId, authNSchema.user.id),
-            )
-            .where(eq(authNSchema.invitation.id, invitation_id))
-            .limit(1)
-
-        if (invitation.length === 0) {
-            throw new Error("Invitation not found")
-        }
-
-        return invitation[0]
-    } catch (err) {
-        throw handleError(err, "Exception for getPendingInvitation", {
-            invitation_id,
-        })
-    }
-}
-
-/**
- * Accepts an invitation to join an organization.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param invitation_id - The ID of the invitation to accept.
- * @param user_id - The ID of the user accepting the invitation.
- * @throws {Error} Throws an error if any database operation fails, if the invitation is not found, is not pending, or has expired.
- */
-export async function acceptInvitation(
-    fdm: FdmType,
-    invitation_id: string,
-    user_id: string,
-): Promise<void> {
-    try {
-        await fdm.transaction(async (tx: FdmType) => {
-            // Check if invitation exists
-            const invitation = await tx
-                .select({
-                    organization_id: authNSchema.invitation.organizationId,
-                    role: authNSchema.invitation.role,
-                    status: authNSchema.invitation.status,
-                    expiresAt: authNSchema.invitation.expiresAt,
-                })
-                .from(authNSchema.invitation)
-                .leftJoin(
-                    authNSchema.user,
-                    eq(authNSchema.invitation.email, authNSchema.user.email),
-                )
-                .where(
-                    and(
-                        eq(authNSchema.invitation.id, invitation_id),
-                        eq(authNSchema.user.id, user_id),
-                    ),
-                )
-                .limit(1)
-            if (invitation.length === 0) {
-                throw new Error("Invitation not found")
-            }
-            if (invitation[0].status !== "pending") {
-                throw new Error("Invitation is not pending")
-            }
-            if (invitation[0].expiresAt < new Date()) {
-                throw new Error("Invitation has expired")
-            }
-
-            // Add user to organization
-            const memberData = {
-                id: createId(),
-                organizationId: invitation[0].organization_id,
-                userId: user_id,
-                role: invitation[0].role,
-                createdAt: new Date(),
-            }
-            await tx.insert(authNSchema.member).values(memberData)
-
-            // Update invitation status
-            await tx
-                .update(authNSchema.invitation)
-                .set({ status: "accepted" })
-                .where(eq(authNSchema.invitation.id, invitation_id))
-        })
-    } catch (err) {
-        throw handleError(err, "Exception for acceptInvitation", {
-            invitation_id,
-            user_id,
-        })
-    }
-}
-
-/**
- * Rejects an invitation to join an organization.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param invitation_id - The ID of the invitation to reject.
- * @param user_id - The ID of the user rejecting the invitation.
- * @throws {Error} Throws an error if any database operation fails, if the invitation is not found, or if the invitation is not pending.
- */
-export async function rejectInvitation(
-    fdm: FdmType,
-    invitation_id: string,
-    user_id: string,
-): Promise<void> {
-    try {
-        await fdm.transaction(async (tx: FdmType) => {
-            // Check if invitation exists
-            const invitation = await tx
-                .select({
-                    status: authNSchema.invitation.status,
-                })
-                .from(authNSchema.invitation)
-                .leftJoin(
-                    authNSchema.user,
-                    eq(authNSchema.invitation.email, authNSchema.user.email),
-                )
-                .where(
-                    and(
-                        eq(authNSchema.invitation.id, invitation_id),
-                        eq(authNSchema.user.id, user_id),
-                    ),
-                )
-                .limit(1)
-            if (invitation.length === 0) {
-                throw new Error("Invitation not found")
-            }
-            if (invitation[0].status !== "pending") {
-                throw new Error("Invitation is not pending")
-            }
-
-            // Update invitation status
-            await tx
-                .update(authNSchema.invitation)
-                .set({ status: "rejected" })
-                .where(eq(authNSchema.invitation.id, invitation_id))
-        })
-    } catch (err) {
-        throw handleError(err, "Exception for rejectInvitation", {
-            invitation_id,
-            user_id,
-        })
-    }
-}
-
-/**
- * Removes a user from an organization.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param admin_id - The ID of the user initiating the removal (must be owner or admin).
- * @param organization_id - The ID of the organization from which the user is being removed.
- * @param username - The username of the user being removed.
- * @throws {Error} Throws an error if any database operation fails, if the user initiating the removal does not have permissions, or if the user to be removed is not found.
- */
-export async function removeUserFromOrganization(
-    fdm: FdmType,
-    admin_id: string,
-    organization_id: string,
-    username: string,
-): Promise<void> {
-    try {
-        return await fdm.transaction(async (tx: FdmType) => {
-            // Check if user has permission to remove user
-            const permissions = await getUserOrganizationPermissions(
-                tx,
-                admin_id,
-                organization_id,
-            )
-            if (!permissions.canRemoveUser) {
-                throw new Error("User has no permission to remove user")
-            }
-
-            // Remove user from organization based on username
-            const userToRemove = await tx
-                .select({ id: authNSchema.user.id })
-                .from(authNSchema.user)
-                .where(eq(authNSchema.user.username, username))
-                .limit(1)
-            if (userToRemove.length === 0) {
-                throw new Error("User to remove not found")
-            }
-            await tx
-                .delete(authNSchema.member)
-                .where(
-                    and(
-                        eq(authNSchema.member.userId, userToRemove[0].id),
-                        eq(authNSchema.member.organizationId, organization_id),
-                    ),
-                )
-
-            // Check that at least 1 user is owner of the organization
-            const ownerCount = await tx
-                .select({ count: count(authNSchema.member.id) })
-                .from(authNSchema.member)
-                .where(
-                    and(
-                        eq(authNSchema.member.organizationId, organization_id),
-                        eq(authNSchema.member.role, "owner"),
-                    ),
-                )
-            if (ownerCount.length === 0 || ownerCount[0].count === 0) {
-                throw new Error("Organization must have at least 1 owner")
-            }
-        })
-    } catch (err) {
-        throw handleError(err, "Exception for removeUserFromOrganization", {
-            admin_id,
-            organization_id,
-            username,
-        })
-    }
-}
-
-/**
- * Updates the role of a user within an organization.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param admin_id - The ID of the user initiating the update (must be owner or admin).
- * @param organization_id - The ID of the organization in which the user's role is being updated.
- * @param username - The username of the user whose role is being updated.
- * @param role - The new role to assign to the user.
- * @throws {Error} Throws an error if any database operation fails, if the user initiating the update does not have permissions, or if the user to be updated is not found.
- */
-export async function updateRoleOfUserAtOrganization(
-    fdm: FdmType,
-    admin_id: string,
-    organization_id: string,
-    username: string,
-    role: "owner" | "admin" | "member",
-): Promise<void> {
-    try {
-        return await fdm.transaction(async (tx: FdmType) => {
-            // Check if user has permission to update organization
-            const permissions = await getUserOrganizationPermissions(
-                tx,
-                admin_id,
-                organization_id,
-            )
-            if (!permissions.canUpdateRoleUser) {
-                throw new Error(
-                    "User has no permission to update role of user in the organization",
-                )
-            }
-
-            // Update user at organization based on username
-            const userToUpdate = await tx
-                .select({ id: authNSchema.user.id })
-                .from(authNSchema.user)
-                .where(eq(authNSchema.user.username, username))
-                .limit(1)
-            if (userToUpdate.length === 0) {
-                throw new Error("User to update not found")
-            }
-            await tx
-                .update(authNSchema.member)
-                .set({ role: role })
-                .where(
-                    and(
-                        eq(authNSchema.member.userId, userToUpdate[0].id),
-                        eq(authNSchema.member.organizationId, organization_id),
-                    ),
-                )
-
-            // Check that at least 1 user is owner of the organization
-            const ownerCount = await tx
-                .select({ count: count(authNSchema.member.id) })
-                .from(authNSchema.member)
-                .where(
-                    and(
-                        eq(authNSchema.member.organizationId, organization_id),
-                        eq(authNSchema.member.role, "owner"),
-                    ),
-                )
-            if (ownerCount.length === 0 || ownerCount[0].count === 0) {
-                throw new Error("Organization must have at least 1 owner")
-            }
-        })
-    } catch (err) {
-        throw handleError(err, "Exception for updateRoleOfUserAtOrganization", {
-            admin_id,
-            organization_id,
-            username,
-            role,
-        })
-    }
-}
-
-/**
- * Deletes an organization.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param owner_id - The ID of the user initiating the deletion (must be the owner).
- * @param organization_id - The ID of the organization to delete.
- * @throws {Error} Throws an error if any database operation fails, if the user initiating the deletion is not the owner, or if the organization is not found.
- */
-export async function deleteOrganization(
-    fdm: FdmType,
-    owner_id: string,
-    organization_id: string,
-): Promise<void> {
-    try {
-        return await fdm.transaction(async (tx: FdmType) => {
-            // Check if user has permission to delete organization
-            const permissions = await getUserOrganizationPermissions(
-                tx,
-                owner_id,
-                organization_id,
-            )
-            if (!permissions.canDelete) {
-                throw new Error("User has no permission to delete organization")
-            }
-
-            // Delete organization
-            await tx
-                .delete(authNSchema.organization)
-                .where(eq(authNSchema.organization.id, organization_id))
-        })
-    } catch (err) {
-        throw handleError(err, "Exception for deleteOrganization", {
-            owner_id,
-            organization_id,
-        })
-    }
-}
-
-/**
- * Checks if a given organization slug is available (not already in use).
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param organization_slug - The slug to check for availability.
- * @returns A promise that resolves with a boolean indicating whether the slug is available. True if available, false if not.
- * @throws {Error} Throws an error if any database operation fails or if the slug is invalid
- */
-export async function checkOrganizationSlugForAvailability(
-    fdm: FdmType,
-    organization_slug: string,
-): Promise<boolean> {
-    try {
-        // Validate if organization_slug is a valid slug
-        if (!/^[a-z0-9-]+$/.test(organization_slug)) {
-            throw new Error("Invalid organization slug")
-        }
-
-        // Check if slug is available
-        const existingOrganization = await fdm
-            .select({ id: authNSchema.organization.id })
-            .from(authNSchema.organization)
-            .where(eq(authNSchema.organization.slug, organization_slug))
-            .limit(1)
-
-        // Check if slug is not already an username
-        const existingUsername = await fdm
-            .select({ id: authNSchema.user.id })
-            .from(authNSchema.user)
-            .where(eq(authNSchema.user.username, organization_slug))
-            .limit(1)
-
-        return (
-            existingOrganization.length === 0 && existingUsername.length === 0
-        )
-    } catch (err) {
-        throw handleError(
-            err,
-            "Exception for checkOrganizationSlugForAvailability",
-            {
-                organization_slug,
-            },
-        )
-    }
-}
-
-/**
- * Cancels a pending invitation to join an organization.
- *
- * @param fdm - The FDM instance providing the connection to the database.
- * @param invitation_id - The ID of the invitation to cancel.
- * @param admin_id - The ID of the user initiating the cancellation (must be owner or admin).
- * @throws {Error} Throws an error if any database operation fails, if the inviter does not have permissions, or if the invitation is not found.
- */
-export async function cancelPendingInvitation(
-    fdm: FdmType,
-    invitation_id: string,
-    admin_id: string,
-): Promise<void> {
-    try {
-        await fdm.transaction(async (tx: FdmType) => {
-            // Check if invitation exists
-            const invitation = await tx
-                .select({
-                    organization_id: authNSchema.invitation.organizationId,
-                    status: authNSchema.invitation.status,
-                })
-                .from(authNSchema.invitation)
-                .where(eq(authNSchema.invitation.id, invitation_id))
-                .limit(1)
-
-            if (invitation.length === 0) {
-                throw new Error("Invitation not found")
-            }
-            if (invitation[0].status !== "pending") {
-                throw new Error("Invitation is not pending")
-            }
-
-            // Check if user has permission to invite users
-            const permissions = await getUserOrganizationPermissions(
-                tx,
-                admin_id,
-                invitation[0].organization_id,
-            )
-            if (!permissions.canInvite) {
-                throw new Error(
-                    "User has no permission to cancel invitation to organization",
-                )
-            }
-
-            // Set status of invitation to cancelled
-            await tx
-                .update(authNSchema.invitation)
-                .set({ status: "cancelled" })
-                .where(eq(authNSchema.invitation.id, invitation_id))
-        })
-    } catch (err) {
-        throw handleError(err, "Exception for cancelPendingInvitation", {
-            invitation_id,
-            admin_id,
-        })
-    }
-}
-
-/**
- * Defines the structure of the permissions object.
- */
-interface OrganizationPermissions {
-    canView: boolean
-    canEdit: boolean
-    canDelete: boolean
-    canInvite: boolean
-    canUpdateRoleUser: boolean
-    canRemoveUser: boolean
-}
-
-type OrganizationRole = "owner" | "admin" | "member" | "viewer"
-
-/**
- * Retrieves the permissions of a user within a specified organization.
- *
- * @param tx - The database transaction object.
- * @param user_id - The ID of the user.
- * @param organization_id - The ID of the organization.
- * @returns A promise that resolves to an OrganizationPermissions object.
- * @throws {Error} Throws an error if the user is not a member of the organization.
- */
-async function getUserOrganizationPermissions(
-    tx: FdmType,
-    user_id: string,
-    organization_id: string,
-): Promise<OrganizationPermissions> {
-    const member = await tx
-        .select({ role: authNSchema.member.role })
-        .from(authNSchema.member)
-        .where(
-            and(
-                eq(authNSchema.member.userId, user_id),
-                eq(authNSchema.member.organizationId, organization_id),
-            ),
-        )
-        .limit(1)
-
-    let role: OrganizationRole = "viewer"
-    if (member.length !== 0) {
-        role = member[0].role
-    }
-
-    // Define permissions based on role
-    const permissions: OrganizationPermissions = {
-        canView:
-            role === "viewer" ||
-            role === "member" ||
-            role === "admin" ||
-            role === "owner",
-        canEdit: role === "owner" || role === "admin",
-        canDelete: role === "owner",
-        canInvite: role === "owner" || role === "admin",
-        canUpdateRoleUser: role === "owner" || role === "admin",
-        canRemoveUser: role === "owner" || role === "admin",
-    }
-
-    return permissions
-}
diff --git a/fdm-core/src/principal.test.ts b/fdm-core/src/principal.test.ts
index ce6b30425..ad40df41e 100644
--- a/fdm-core/src/principal.test.ts
+++ b/fdm-core/src/principal.test.ts
@@ -5,7 +5,6 @@ import * as authNSchema from "./db/schema-authn"
 import type { FdmType } from "./fdm"
 import { createFdmServer } from "./fdm-server"
 import { createId } from "./id"
-import { createOrganization } from "./organization"
 import { getPrincipal, identifyPrincipal, lookupPrincipal } from "./principal"
 
 describe("Principals", () => {
@@ -54,13 +53,23 @@ describe("Principals", () => {
 
         organizationSlug = "test-org"
         organizationName = "Test Organization"
-        organization_id = await createOrganization(
-            fdm,
-            user_id,
-            organizationName,
-            organizationSlug,
-            "Test description",
-        )
+        organization_id = createId()
+        
+        await fdm.insert(authNSchema.organization).values({
+            id: organization_id,
+            name: organizationName,
+            slug: organizationSlug,
+            createdAt: new Date(),
+            metadata: JSON.stringify({ description: "Test organization", isVerified: false }),
+        })
+
+        await fdm.insert(authNSchema.member).values({
+            id: createId(),
+            organizationId: organization_id,
+            userId: user_id,
+            role: "owner",
+            createdAt: new Date(),
+        })
     })
 
     describe("getPrincipal", () => {
@@ -206,13 +215,15 @@ describe("Principals", () => {
             //Create an organization with the same slug as a username. This should never happen
             //in real world scenario, however, this unit test should demonstrate expected behaviour
             const conflictingSlug = userName
-            const conflictingOrganization_id = await createOrganization(
-                fdm,
-                user_id,
-                "Conflicting Organization",
-                conflictingSlug,
-                "Test description",
-            )
+            const conflictingOrganization_id = createId()
+            
+            await fdm.insert(authNSchema.organization).values({
+                id: conflictingOrganization_id,
+                name: "Conflicting Organization",
+                slug: conflictingSlug,
+                createdAt: new Date(),
+                metadata: JSON.stringify({ description: "Test description", isVerified: false }),
+            })
 
             const principalDetails = await identifyPrincipal(
                 fdm,
@@ -348,13 +359,15 @@ describe("Principals", () => {
 
         it("should prioritize email match of user over slug match of organization", async () => {
             // Create an organization with slug same as one of the user email
-            const conflicting_organization_id = await createOrganization(
-                fdm,
-                user_id,
-                "Conflicting Organization",
-                userEmail,
-                "Test description",
-            )
+            const conflicting_organization_id = createId()
+            
+            await fdm.insert(authNSchema.organization).values({
+                id: conflicting_organization_id,
+                name: "Conflicting Organization",
+                slug: userEmail,
+                createdAt: new Date(),
+                metadata: JSON.stringify({ description: "Test description", isVerified: false }),
+            })
 
             const identifier = userEmail
             const results = await lookupPrincipal(fdm, identifier)