diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index b3d18a1a0..458849090 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -1,30 +1,43 @@
 <script lang="ts">
 	import { onDestroy } from 'svelte';
 
-	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
 	import SuperForm from '$lib/components/Forms/Form.svelte';
 	import TextArea from '$lib/components/Forms/TextArea.svelte';
 	import TextField from '$lib/components/Forms/TextField.svelte';
-	import NumberField from '$lib/components/Forms/NumberField.svelte';
+
+	import RiskAssessmentForm from './ModelForm/RiskAssessmentForm.svelte';
+	import ProjectForm from './ModelForm/ProjectForm.svelte';
+	import ThreatForm from './ModelForm/ThreatForm.svelte';
+	import RiskScenarioForm from './ModelForm/RiskScenarioForm.svelte';
+	import AppliedControlsPoliciesForm from './ModelForm/AppliedControlPolicyForm.svelte';
+	import RiskAcceptancesForm from './ModelForm/RiskAcceptanceForm.svelte';
+	import ReferenceControlsForm from './ModelForm/ReferenceControlForm.svelte';
+	import EvidencesForm from './ModelForm/EvidenceForm.svelte';
+	import ComplianceAssessmentsForm from './ModelForm/ComplianceAssessmentForm.svelte';
+	import AssetsForm from './ModelForm/AssetForm.svelte';
+	import RequirementAssessmentsForm from './ModelForm/RequirementAssessmentForm.svelte';
+	import EntitiesForm from './ModelForm/EntityForm.svelte';
+	import EntityAssessmentForm from './ModelForm/EntityAssessmentForm.svelte';
+	import SolutionsForm from './ModelForm/SolutionForm.svelte';
+	import RepresentativesForm from './ModelForm/RepresentativeForm.svelte';
+	import FrameworksForm from './ModelForm/FrameworkForm.svelte';
+	import UsersForm from './ModelForm/UserForm.svelte';
+	import SsoSettingsForm from './ModelForm/SsoSettingForm.svelte';
 
 	import AutocompleteSelect from './AutocompleteSelect.svelte';
-	import Select from './Select.svelte';
 
 	import { getOptions } from '$lib/utils/crud';
 	import { modelSchema } from '$lib/utils/schemas';
 	import type { ModelInfo, urlModel, CacheLock } from '$lib/utils/types';
 	import type { SuperValidated } from 'sveltekit-superforms';
 	import type { AnyZodObject } from 'zod';
-	import HiddenInput from './HiddenInput.svelte';
-	import FileInput from './FileInput.svelte';
 	import { browser } from '$app/environment';
 	import { page } from '$app/stores';
 	import * as m from '$paraglide/messages.js';
 	import { zod } from 'sveltekit-superforms/adapters';
 	import { getSecureRedirect } from '$lib/utils/helpers';
-	import { Accordion, AccordionItem } from '@skeletonlabs/skeleton';
 	import { createModalCache } from '$lib/utils/stores';
-	import Score from './Score.svelte';
+
 	export let form: SuperValidated<AnyZodObject>;
 	export let invalidateAll = true; // set to false to keep form data using muliple forms on a page
 	export let model: ModelInfo;
@@ -161,1214 +174,74 @@
 		/>
 	{/if}
 	{#if URLModel === 'projects'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<TextField
-			{form}
-			field="internal_reference"
-			label={m.internalReference()}
-			cacheLock={cacheLocks['internal_reference']}
-			bind:cachedValue={formDataCache['internal_reference']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['lc_status']}
-			field="lc_status"
-			label={m.lcStatus()}
-			cacheLock={cacheLocks['lc_status']}
-			bind:cachedValue={formDataCache['lc_status']}
-		/>
+		<ProjectForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'risk-assessments' || URLModel === 'risk-assessment-duplicate'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['project'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="project"
-			cacheLock={cacheLocks['project']}
-			bind:cachedValue={formDataCache['project']}
-			label={m.project()}
-			hidden={initialData.project}
-		/>
-		<TextField
+		<RiskAssessmentForm
 			{form}
-			field="version"
-			label={m.version()}
-			cacheLock={cacheLocks['version']}
-			bind:cachedValue={formDataCache['version']}
+			{model}
+			{riskAssessmentDuplication}
+			{cacheLocks}
+			{formDataCache}
+			{initialData}
+			{object}
+			{context}
+			{updated_fields}
 		/>
-		{#if !riskAssessmentDuplication}
-			<Select
-				{form}
-				options={model.selectOptions['status']}
-				field="status"
-				hide
-				label={m.status()}
-				cacheLock={cacheLocks['status']}
-				bind:cachedValue={formDataCache['status']}
-			/>
-			<AutocompleteSelect
-				{form}
-				disabled={object.id}
-				options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
-				field="risk_matrix"
-				cacheLock={cacheLocks['risk_matrix']}
-				bind:cachedValue={formDataCache['risk_matrix']}
-				label={m.riskMatrix()}
-				helpText={m.riskAssessmentMatrixHelpText()}
-			/>
-			<AutocompleteSelect
-				{form}
-				multiple
-				options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-				field="authors"
-				cacheLock={cacheLocks['authors']}
-				bind:cachedValue={formDataCache['authors']}
-				label={m.authors()}
-			/>
-			<AutocompleteSelect
-				{form}
-				multiple
-				options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-				field="reviewers"
-				cacheLock={cacheLocks['reviewers']}
-				bind:cachedValue={formDataCache['reviewers']}
-				label={m.reviewers()}
-			/>
-			<TextField
-				type="date"
-				{form}
-				field="eta"
-				label={m.eta()}
-				helpText={m.etaHelpText()}
-				cacheLock={cacheLocks['eta']}
-				bind:cachedValue={formDataCache['eta']}
-			/>
-			<TextField
-				type="date"
-				{form}
-				field="due_date"
-				label={m.dueDate()}
-				helpText={m.dueDateHelpText()}
-				cacheLock={cacheLocks['due_date']}
-				bind:cachedValue={formDataCache['due_date']}
-			/>
-			<TextArea
-				{form}
-				field="observation"
-				label={m.observation()}
-				cacheLock={cacheLocks['observation']}
-				bind:cachedValue={formDataCache['observation']}
-			/>
-		{/if}
 	{:else if URLModel === 'threats'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<TextArea
-			{form}
-			field="annotation"
-			label={m.annotation()}
-			cacheLock={cacheLocks['annotation']}
-			bind:cachedValue={formDataCache['annotation']}
-		/>
-		<TextField
-			{form}
-			field="provider"
-			label={m.provider()}
-			cacheLock={cacheLocks['provider']}
-			bind:cachedValue={formDataCache['provider']}
-		/>
+		<ThreatForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'risk-scenarios'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['risk_assessment'],
-				label: 'str',
-				extra_fields: [['project', 'str']]
-			})}
-			field="risk_assessment"
-			cacheLock={cacheLocks['risk_assessment']}
-			bind:cachedValue={formDataCache['risk_assessment']}
-			label={m.riskAssessment()}
-			hidden={initialData.risk_assessment}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({
-				objects: model.foreignKeys['threats'],
-				extra_fields: [['folder', 'str']],
-				label: 'auto' // convention for automatic label calculation
-			})}
-			field="threats"
-			cacheLock={cacheLocks['threats']}
-			bind:cachedValue={formDataCache['threats']}
-			label={m.threats()}
-		/>
+		<RiskScenarioForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'applied-controls' || URLModel === 'policies'}
-		{#if schema.shape.category}
-			<Select
-				{form}
-				options={model.selectOptions['category']}
-				field="category"
-				label={m.category()}
-				cacheLock={cacheLocks['category']}
-				bind:cachedValue={formDataCache['category']}
-			/>
-		{/if}
-		<Select
-			{form}
-			options={model.selectOptions['csf_function']}
-			field="csf_function"
-			label={m.csfFunction()}
-			cacheLock={cacheLocks['csf_function']}
-			bind:cachedValue={formDataCache['csf_function']}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['owner'], label: 'email' })}
-			field="owner"
-			cacheLock={cacheLocks['owner']}
-			bind:cachedValue={formDataCache['owner']}
-			label={m.owner()}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({
-				objects: model.foreignKeys['evidences'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="evidences"
-			cacheLock={cacheLocks['evidences']}
-			bind:cachedValue={formDataCache['evidences']}
-			label={m.evidences()}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="eta"
-			label={m.eta()}
-			helpText={m.etaHelpText()}
-			cacheLock={cacheLocks['eta']}
-			bind:cachedValue={formDataCache['eta']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="expiry_date"
-			label={m.expiryDate()}
-			helpText={m.expiryDateHelpText()}
-			cacheLock={cacheLocks['expiry_date']}
-			bind:cachedValue={formDataCache['expiry_date']}
-		/>
-		<TextField
-			{form}
-			field="link"
-			label={m.link()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['link']}
-			bind:cachedValue={formDataCache['link']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['effort']}
-			field="effort"
-			label={m.effort()}
-			helpText={m.effortHelpText()}
-			cacheLock={cacheLocks['effort']}
-			bind:cachedValue={formDataCache['effort']}
-		/>
-		<NumberField
-			{form}
-			field="cost"
-			label={m.cost()}
-			helpText={m.costHelpText()}
-			cacheLock={cacheLocks['cost']}
-			bind:cachedValue={formDataCache['cost']}
-		/>
-		<AutocompleteSelect
+		<AppliedControlsPoliciesForm
 			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
+			{model}
+			{cacheLocks}
+			{formDataCache}
+			{schema}
+			{initialData}
 		/>
 	{:else if URLModel === 'risk-acceptances'}
-		<TextField
-			{form}
-			type="date"
-			field="expiry_date"
-			label={m.expiryDate()}
-			helpText={m.expiryDateHelpText()}
-			cacheLock={cacheLocks['expiry_date']}
-			bind:cachedValue={formDataCache['expiry_date']}
-		/>
-		{#if object.id && $page.data.user.id === object.approver}
-			<TextArea
-				disabled={$page.data.user.id !== object.approver}
-				{form}
-				field="justification"
-				label={m.justification()}
-				helpText={m.riskAcceptanceJusitficationHelpText()}
-				cacheLock={cacheLocks['justification']}
-				bind:cachedValue={formDataCache['justification']}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<AutocompleteSelect
+		<RiskAcceptancesForm
 			{form}
-			options={getOptions({ objects: model.foreignKeys['approver'], label: 'email' })}
-			field="approver"
-			cacheLock={cacheLocks['approver']}
-			bind:cachedValue={formDataCache['approver']}
-			label={m.approver()}
-			helpText={m.approverHelpText()}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['risk_scenarios'],
-				extra_fields: [
-					['project', 'str'],
-					['risk_assessment', 'str']
-				]
-			})}
-			field="risk_scenarios"
-			cacheLock={cacheLocks['risk_scenarios']}
-			bind:cachedValue={formDataCache['risk_scenarios']}
-			label={m.riskScenarios()}
-			helpText={m.riskAcceptanceRiskScenariosHelpText()}
-			multiple
+			{model}
+			{cacheLocks}
+			{formDataCache}
+			{object}
+			{initialData}
+			{$page}
 		/>
 	{:else if URLModel === 'reference-controls'}
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['category']}
-			field="category"
-			label={m.category()}
-			cacheLock={cacheLocks['category']}
-			bind:cachedValue={formDataCache['category']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['csf_function']}
-			field="csf_function"
-			label={m.csfFunction()}
-			cacheLock={cacheLocks['csf_function']}
-			bind:cachedValue={formDataCache['csf_function']}
-		/>
-		<TextArea
-			{form}
-			field="annotation"
-			label={m.annotation()}
-			cacheLock={cacheLocks['annotation']}
-			bind:cachedValue={formDataCache['annotation']}
-		/>
-		<TextField
-			{form}
-			field="provider"
-			label={m.provider()}
-			cacheLock={cacheLocks['provider']}
-			bind:cachedValue={formDataCache['provider']}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
+		<ReferenceControlsForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'evidences'}
-		<HiddenInput {form} field="applied_controls" />
-		<HiddenInput {form} field="requirement_assessments" />
-		<FileInput
-			{form}
-			allowPaste={true}
-			helpText={object.attachment
-				? `${m.attachmentWarningText()}: ${object.attachment}`
-				: m.attachmentHelpText()}
-			field="attachment"
-			label={m.attachment()}
-		/>
-		{#if !(initialData.applied_controls || initialData.requirement_assessments)}
-			<AutocompleteSelect
-				{form}
-				options={getOptions({ objects: model.foreignKeys['folder'] })}
-				field="folder"
-				cacheLock={cacheLocks['folder']}
-				bind:cachedValue={formDataCache['folder']}
-				label={m.domain()}
-				hidden={initialData.applied_controls || initialData.requirement_assessments}
-			/>
-		{:else}
-			<HiddenInput {form} field="folder" />
-		{/if}
-		<TextField
-			{form}
-			field="link"
-			label={m.link()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['link']}
-			bind:cachedValue={formDataCache['link']}
-		/>
+		<EvidencesForm {form} {model} {cacheLocks} {formDataCache} {initialData} {object} />
 	{:else if URLModel === 'compliance-assessments'}
-		{#if context === 'fromBaseline' && initialData.baseline}
-			<AutocompleteSelect
-				{form}
-				field="baseline"
-				cacheLock={cacheLocks['baseline']}
-				bind:cachedValue={formDataCache['baseline']}
-				label={m.baseline()}
-				options={getOptions({ objects: model.foreignKeys['baseline'] })}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['project'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="project"
-			cacheLock={cacheLocks['project']}
-			bind:cachedValue={formDataCache['project']}
-			label={m.project()}
-			hidden={initialData.project}
-		/>
-		<TextField
-			{form}
-			field="version"
-			label={m.version()}
-			cacheLock={cacheLocks['version']}
-			bind:cachedValue={formDataCache['version']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<AutocompleteSelect
-			{form}
-			disabled={object.id}
-			options={getOptions({ objects: model.foreignKeys['framework'] })}
-			field="framework"
-			cacheLock={cacheLocks['framework']}
-			bind:cachedValue={formDataCache['framework']}
-			label={m.framework()}
-			on:change={async (e) => {
-				if (e.detail) {
-					await fetch(`/frameworks/${e.detail}`)
-						.then((r) => r.json())
-						.then((r) => {
-							const implementation_groups = r['implementation_groups_definition'] || [];
-							model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
-								(group) => ({ label: group.name, value: group.ref_id })
-							);
-						});
-				}
-			}}
-		/>
-		{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
-			<AutocompleteSelect
-				multiple
-				translateOptions={false}
-				{form}
-				options={model.selectOptions['selected_implementation_groups']}
-				field="selected_implementation_groups"
-				cacheLock={cacheLocks['selected_implementation_groups']}
-				bind:cachedValue={formDataCache['selected_implementation_groups']}
-				label={m.selectedImplementationGroups()}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-			field="authors"
-			cacheLock={cacheLocks['authors']}
-			bind:cachedValue={formDataCache['authors']}
-			label={m.authors()}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-			field="reviewers"
-			cacheLock={cacheLocks['reviewers']}
-			bind:cachedValue={formDataCache['reviewers']}
-			label={m.reviewers()}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="eta"
-			label={m.eta()}
-			helpText={m.etaHelpText()}
-			cacheLock={cacheLocks['eta']}
-			bind:cachedValue={formDataCache['eta']}
-		/>
-		<TextField
-			type="date"
+		<ComplianceAssessmentsForm
 			{form}
-			field="due_date"
-			label={m.dueDate()}
-			helpText={m.dueDateHelpText()}
-			cacheLock={cacheLocks['due_date']}
-			bind:cachedValue={formDataCache['due_date']}
-		/>
-		<TextArea
-			{form}
-			field="observation"
-			label={m.observation()}
-			cacheLock={cacheLocks['observation']}
-			bind:cachedValue={formDataCache['observation']}
+			{model}
+			{cacheLocks}
+			{formDataCache}
+			{initialData}
+			{object}
+			{context}
 		/>
 	{:else if URLModel === 'assets'}
-		<TextArea
-			{form}
-			field="business_value"
-			label={m.businessValue()}
-			cacheLock={cacheLocks['business_value']}
-			bind:cachedValue={formDataCache['business_value']}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['type']}
-			field="type"
-			label="Type"
-			cacheLock={cacheLocks['type']}
-			bind:cachedValue={formDataCache['type']}
-		/>
-		<AutocompleteSelect
-			disabled={data.type === 'PR'}
-			multiple
-			{form}
-			options={getOptions({ objects: model.foreignKeys['parent_assets'], self: object })}
-			field="parent_assets"
-			cacheLock={cacheLocks['parent_assets']}
-			bind:cachedValue={formDataCache['parent_assets']}
-			label={m.parentAssets()}
-		/>
+		<AssetsForm {form} {model} {cacheLocks} {formDataCache} {initialData} {object} {data} />
 	{:else if URLModel === 'requirement-assessments'}
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['result']}
-			field="result"
-			label={m.result()}
-			cacheLock={cacheLocks['result']}
-			bind:cachedValue={formDataCache['result']}
-		/>
-		<TextArea
-			{form}
-			field="observation"
-			label={m.observation()}
-			cacheLock={cacheLocks['observation']}
-			bind:cachedValue={formDataCache['observation']}
-		/>
-		<HiddenInput {form} field="folder" />
-		<HiddenInput {form} field="requirement" />
-		<HiddenInput {form} field="compliance_assessment" />
+		<RequirementAssessmentsForm {form} {model} {cacheLocks} {formDataCache} />
 	{:else if URLModel === 'entities'}
-		<TextArea
-			{form}
-			field="mission"
-			label={m.mission()}
-			cacheLock={cacheLocks['mission']}
-			bind:cachedValue={formDataCache['mission']}
-		/>
-		<TextField
-			{form}
-			field="reference_link"
-			label={m.referenceLink()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['reference_link']}
-			bind:cachedValue={formDataCache['reference_link']}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
+		<EntitiesForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'entity-assessments'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['project'] })}
-			field="project"
-			cacheLock={cacheLocks['project']}
-			bind:cachedValue={formDataCache['project']}
-			label={m.project()}
-			hidden={initialData.project}
-		/>
-		{#if !data.compliance_assessment}
-			<Checkbox
-				{form}
-				field="create_audit"
-				label={m.createAudit()}
-				helpText={m.createAuditHelpText()}
-			/>
-			<AutocompleteSelect
-				{form}
-				disabled={!data.create_audit}
-				mandatory
-				hidden={!data.create_audit}
-				options={getOptions({ objects: model.foreignKeys['framework'] })}
-				field="framework"
-				cacheLock={cacheLocks['framework']}
-				bind:cachedValue={formDataCache['framework']}
-				label={m.framework()}
-				on:change={async (e) => {
-					if (e.detail) {
-						await fetch(`/frameworks/${e.detail}`)
-							.then((r) => r.json())
-							.then((r) => {
-								const implementation_groups = r['implementation_groups_definition'] || [];
-								model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
-									(group) => ({ label: group.name, value: group.ref_id })
-								);
-							});
-					}
-				}}
-			/>
-			{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
-				<AutocompleteSelect
-					multiple
-					translateOptions={false}
-					{form}
-					options={model.selectOptions['selected_implementation_groups']}
-					field="selected_implementation_groups"
-					cacheLock={cacheLocks['selected_implementation_groups']}
-					bind:cachedValue={formDataCache['selected_implementation_groups']}
-					label={m.selectedImplementationGroups()}
-				/>
-			{/if}
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['entity'] })}
-			field="entity"
-			cacheLock={cacheLocks['entity']}
-			bind:cachedValue={formDataCache['entity']}
-			label={m.entity()}
-			hidden={initialData.entity}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['solutions'] })}
-			field="solutions"
-			cacheLock={cacheLocks['solutions']}
-			bind:cachedValue={formDataCache['solutions']}
-			label={m.solutions()}
-		/>
-		<Score
-			{form}
-			label={m.criticality()}
-			field="criticality"
-			always_enabled={true}
-			inversedColors
-			fullDonut
-			min_score={1}
-			max_score={4}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<TextField
-			{form}
-			field="version"
-			label={m.version()}
-			cacheLock={cacheLocks['version']}
-			bind:cachedValue={formDataCache['version']}
-		/>
-		<TextField
-			{form}
-			field="reference_link"
-			label={m.referenceLink()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['reference_link']}
-			bind:cachedValue={formDataCache['reference_link']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="eta"
-			label={m.eta()}
-			helpText={m.etaHelpText()}
-			cacheLock={cacheLocks['eta']}
-			bind:cachedValue={formDataCache['eta']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="due_date"
-			label={m.dueDate()}
-			helpText={m.dueDateHelpText()}
-			cacheLock={cacheLocks['due_date']}
-			bind:cachedValue={formDataCache['due_date']}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-			field="authors"
-			cacheLock={cacheLocks['authors']}
-			bind:cachedValue={formDataCache['authors']}
-			label={m.authors()}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-			field="reviewers"
-			cacheLock={cacheLocks['reviewers']}
-			bind:cachedValue={formDataCache['reviewers']}
-			label={m.reviewers()}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['compliance_assessment'] })}
-			field="compliance_assessment"
-			cacheLock={cacheLocks['compliance_assessment']}
-			bind:cachedValue={formDataCache['compliance_assessment']}
-			label={m.complianceAssessment()}
-			disabled={data.create_audit}
-			hidden={data.create_audit}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['evidence'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="evidence"
-			cacheLock={cacheLocks['evidence']}
-			bind:cachedValue={formDataCache['evidence']}
-			label={m.evidence()}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['conclusion']}
-			field="conclusion"
-			label={m.conclusion()}
-			cacheLock={cacheLocks['conclusion']}
-			bind:cachedValue={formDataCache['conclusion']}
-		/>
-		<TextArea
-			{form}
-			field="observation"
-			label={m.observation()}
-			cacheLock={cacheLocks['observation']}
-			bind:cachedValue={formDataCache['observation']}
-		/>
-		<!-- <Score {form} label={m.penetration()} field="penetration" always_enabled={true} inversedColors fullDonut max_score={5} />
-		<Score {form} label={m.dependency()} field="dependency" always_enabled={true} inversedColors fullDonut max_score={5} />
-		<Score {form} label={m.maturity()} field="maturity" always_enabled={true} inversedColors fullDonut max_score={5} />
-		<Score {form} label={m.trust()} field="trust" always_enabled={true} inversedColors fullDonut max_score={5} /> -->
+		<EntityAssessmentForm {form} {model} {cacheLocks} {formDataCache} {initialData} {data} />
 	{:else if URLModel === 'solutions'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['provider_entity'] })}
-			field="provider_entity"
-			cacheLock={cacheLocks['provider_entity']}
-			bind:cachedValue={formDataCache['provider_entity']}
-			label={m.providerEntity()}
-			hidden={initialData.provider_entity}
-		/>
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<Score
-			{form}
-			label={m.criticality()}
-			field="criticality"
-			always_enabled={true}
-			inversedColors
-			fullDonut
-			min_score={1}
-			max_score={4}
-		/>
+		<SolutionsForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'representatives'}
-		<TextField
-			{form}
-			field="email"
-			label={m.email()}
-			cacheLock={cacheLocks['email']}
-			bind:cachedValue={formDataCache['email']}
-			data-focusindex="2"
-		/>
-		{#if !data.user}
-			<Checkbox
-				{form}
-				field="create_user"
-				label={m.createUser()}
-				helpText={m.createUserHelpText()}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['entity'] })}
-			field="entity"
-			cacheLock={cacheLocks['entity']}
-			bind:cachedValue={formDataCache['entity']}
-			label={m.entity()}
-		/>
-		<TextField
-			{form}
-			field="first_name"
-			label={m.firstName()}
-			cacheLock={cacheLocks['first_name']}
-			bind:cachedValue={formDataCache['first_name']}
-		/>
-		<TextField
-			{form}
-			field="last_name"
-			label={m.lastName()}
-			cacheLock={cacheLocks['last_name']}
-			bind:cachedValue={formDataCache['last_name']}
-		/>
-		<TextField
-			{form}
-			field="phone"
-			label={m.phone()}
-			cacheLock={cacheLocks['phone']}
-			bind:cachedValue={formDataCache['phone']}
-		/>
-		<TextField
-			{form}
-			field="role"
-			label={m.role()}
-			cacheLock={cacheLocks['role']}
-			bind:cachedValue={formDataCache['role']}
-		/>
+		<RepresentativesForm {form} {model} {cacheLocks} {formDataCache} {data} />
 	{:else if URLModel === 'frameworks'}
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['category']}
-			field="category"
-			label={m.category()}
-			cacheLock={cacheLocks['category']}
-			bind:cachedValue={formDataCache['category']}
-		/>
+		<FrameworksForm {form} {model} {cacheLocks} {formDataCache} />
 	{:else if URLModel === 'users'}
-		<TextField
-			{form}
-			field="email"
-			label={m.email()}
-			cacheLock={cacheLocks['email']}
-			bind:cachedValue={formDataCache['email']}
-			data-focusindex="2"
-		/>
-		{#if shape.first_name && shape.last_name}
-			<TextField
-				{form}
-				field="first_name"
-				label={m.firstName()}
-				cacheLock={cacheLocks['first_name']}
-				bind:cachedValue={formDataCache['first_name']}
-			/>
-			<TextField
-				{form}
-				field="last_name"
-				label={m.lastName()}
-				cacheLock={cacheLocks['last_name']}
-				bind:cachedValue={formDataCache['last_name']}
-			/>
-		{/if}
-		{#if shape.user_groups}
-			<AutocompleteSelect
-				{form}
-				multiple
-				options={getOptions({ objects: model.foreignKeys['user_groups'] })}
-				field="user_groups"
-				cacheLock={cacheLocks['user_groups']}
-				bind:cachedValue={formDataCache['user_groups']}
-				label={m.userGroups()}
-			/>
-		{/if}
-		{#if shape.is_active}
-			<Checkbox {form} field="is_active" label={m.isActive()} helpText={m.isActiveHelpText()} />
-		{/if}
+		<UsersForm {form} {model} {cacheLocks} {formDataCache} {shape} />
 	{:else if URLModel === 'sso-settings'}
-		<Accordion>
-			<Checkbox {form} field="is_enabled" label={m.enableSSO()} />
-			<AutocompleteSelect
-				{form}
-				hidden={model.selectOptions['provider'].length < 2}
-				field="provider"
-				cacheLock={cacheLocks['provider']}
-				bind:cachedValue={formDataCache['provider']}
-				options={model.selectOptions['provider']}
-				label={m.provider()}
-				disabled={!data.is_enabled}
-			/>
-			{#if data.provider !== 'saml'}
-				<AccordionItem open>
-					<svelte:fragment slot="summary">{m.IdPConfiguration()}</svelte:fragment>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="provider_name"
-							label={m.name()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['provider_name']}
-							bind:cachedValue={formDataCache['provider_name']}
-						/>
-						<TextField
-							hidden
-							{form}
-							field="provider_id"
-							label={m.providerID()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['provider_id']}
-							bind:cachedValue={formDataCache['provider_id']}
-						/>
-						<TextField
-							{form}
-							field="client_id"
-							label={m.clientID()}
-							helpText={m.clientIDHelpText()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['client_id']}
-							bind:cachedValue={formDataCache['client_id']}
-						/>
-						{#if data.provider !== 'saml'}
-							<TextField
-								{form}
-								field="secret"
-								label={m.secret()}
-								helpText={m.secretHelpText()}
-								disabled={!data.is_enabled}
-								cacheLock={cacheLocks['secret']}
-								bind:cachedValue={formDataCache['secret']}
-							/>
-							<TextField
-								{form}
-								field="key"
-								label={m.key()}
-								disabled={!data.is_enabled}
-								cacheLock={cacheLocks['key']}
-								bind:cachedValue={formDataCache['key']}
-							/>
-						{/if}
-					</svelte:fragment>
-				</AccordionItem>
-			{/if}
-			{#if data.provider === 'saml'}
-				<AccordionItem open>
-					<svelte:fragment slot="summary"
-						><span class="font-semibold">{m.SAMLIdPConfiguration()}</span></svelte:fragment
-					>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="idp_entity_id"
-							label={m.IdPEntityID()}
-							required={data.provider === 'saml'}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['idp_entity_id']}
-							bind:cachedValue={formDataCache['idp_entity_id']}
-						/>
-						<p class="text-gray-600 text-sm">Option 1: Fill the metadata url</p>
-						<TextField
-							{form}
-							field="metadata_url"
-							label={m.metadataURL()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['metadata_url']}
-							bind:cachedValue={formDataCache['metadata_url']}
-						/>
-						<div class="flex items-center justify-center w-full space-x-2">
-							<hr class="w-1/2 items-center bg-gray-200 border-0" />
-							<span class="flex items-center text-gray-600 text-sm">{m.or()}</span>
-							<hr class="w-1/2 items-center bg-gray-200 border-0" />
-						</div>
-						<p class="text-gray-600 text-sm">Option 2: Fill the SSO URL, SLO URL and x509cert</p>
-						<TextField
-							{form}
-							field="sso_url"
-							label={m.SSOURL()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['sso_url']}
-							bind:cachedValue={formDataCache['sso_url']}
-						/>
-						<TextField
-							{form}
-							field="slo_url"
-							label={m.SLOURL()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['slo_url']}
-							bind:cachedValue={formDataCache['slo_url']}
-						/>
-						<TextArea
-							{form}
-							field="x509cert"
-							label={m.x509Cert()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['x509cert']}
-							bind:cachedValue={formDataCache['x509cert']}
-						/>
-					</svelte:fragment>
-				</AccordionItem>
-
-				<AccordionItem>
-					<svelte:fragment slot="summary"
-						><span class="font-semibold">{m.SPConfiguration()}</span></svelte:fragment
-					>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="sp_entity_id"
-							label={m.SPEntityID()}
-							required={data.provider === 'saml'}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['sp_entity_id']}
-							bind:cachedValue={formDataCache['sp_entity_id']}
-						/>
-					</svelte:fragment>
-				</AccordionItem>
-
-				<AccordionItem
-					><svelte:fragment slot="summary"
-						><span class="font-semibold">{m.advancedSettings()}</span></svelte:fragment
-					>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="attribute_mapping_uid"
-							label={m.attributeMappingUID()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['attribute_mapping_uid']}
-							bind:cachedValue={formDataCache['attribute_mapping_uid']}
-						/>
-						<TextField
-							{form}
-							field="attribute_mapping_email_verified"
-							label={m.attributeMappingEmailVerified()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['attribute_mapping_email_verified']}
-							bind:cachedValue={formDataCache['attribute_mapping_email_verified']}
-						/>
-						<TextField
-							{form}
-							field="attribute_mapping_email"
-							label={m.attributeMappingEmail()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['attribute_mapping_email']}
-							bind:cachedValue={formDataCache['attribute_mapping_email']}
-						/>
-
-						<Checkbox
-							{form}
-							field="allow_repeat_attribute_name"
-							label={m.allowRepeatAttributeName()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="allow_single_label_domains"
-							label={m.allowSingleLabelDomains()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="authn_request_signed"
-							hidden
-							label={m.authnRequestSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<TextField
-							{form}
-							field="digest_algorithm"
-							hidden
-							label={m.digestAlgorithm()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['digest_algorithm']}
-							bind:cachedValue={formDataCache['digest_algorithm']}
-						/>
-						<Checkbox
-							{form}
-							field="logout_request_signed"
-							hidden
-							label={m.logoutRequestSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="logout_response_signed"
-							hidden
-							label={m.logoutResponseSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="metadata_signed"
-							hidden
-							label={m.metadataSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="name_id_encrypted"
-							hidden
-							label={m.nameIDEncrypted()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							hidden
-							field="reject_deprecated_algorithm"
-							label={m.rejectDeprecatedAlgorithm()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="reject_idp_initiated_sso"
-							label={m.rejectIdPInitiatedSSO()}
-							disabled={!data.is_enabled}
-						/>
-						<TextField
-							{form}
-							field="signature_algorithm"
-							hidden
-							label={m.signatureAlgorithm()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['signature_algorithm']}
-							bind:cachedValue={formDataCache['signature_algorithm']}
-						/>
-						<Checkbox
-							{form}
-							field="want_assertion_encrypted"
-							hidden
-							label={m.wantAssertionEncrypted()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_assertion_signed"
-							hidden
-							label={m.wantAssertionSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_attribute_statement"
-							label={m.wantAttributeStatement()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_message_signed"
-							hidden
-							label={m.wantMessageSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_name_id"
-							label={m.wantNameID()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_name_id_encrypted"
-							hidden
-							label={m.wantNameIDEncrypted()}
-							disabled={!data.is_enabled}
-						/>
-					</svelte:fragment>
-				</AccordionItem>
-			{/if}
-		</Accordion>
+		<SsoSettingsForm {form} {model} {cacheLocks} {formDataCache} {data} />
 	{/if}
 	<div class="flex flex-row justify-between space-x-4">
 		{#if closeModal}
diff --git a/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
new file mode 100644
index 000000000..6d278e6d1
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
@@ -0,0 +1,117 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import Select from '../Select.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import NumberField from '$lib/components/Forms/NumberField.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let schema: any = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+{#if schema.shape.category}
+	<Select
+		{form}
+		options={model.selectOptions['category']}
+		field="category"
+		label={m.category()}
+		cacheLock={cacheLocks['category']}
+		bind:cachedValue={formDataCache['category']}
+	/>
+{/if}
+<Select
+	{form}
+	options={model.selectOptions['csf_function']}
+	field="csf_function"
+	label={m.csfFunction()}
+	cacheLock={cacheLocks['csf_function']}
+	bind:cachedValue={formDataCache['csf_function']}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['owner'], label: 'email' })}
+	field="owner"
+	cacheLock={cacheLocks['owner']}
+	bind:cachedValue={formDataCache['owner']}
+	label={m.owner()}
+/>
+<Select
+	{form}
+	options={model.selectOptions['status']}
+	field="status"
+	label={m.status()}
+	cacheLock={cacheLocks['status']}
+	bind:cachedValue={formDataCache['status']}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({
+		objects: model.foreignKeys['evidences'],
+		extra_fields: [['folder', 'str']]
+	})}
+	field="evidences"
+	cacheLock={cacheLocks['evidences']}
+	bind:cachedValue={formDataCache['evidences']}
+	label={m.evidences()}
+/>
+<TextField
+	type="date"
+	{form}
+	field="eta"
+	label={m.eta()}
+	helpText={m.etaHelpText()}
+	cacheLock={cacheLocks['eta']}
+	bind:cachedValue={formDataCache['eta']}
+/>
+<TextField
+	type="date"
+	{form}
+	field="expiry_date"
+	label={m.expiryDate()}
+	helpText={m.expiryDateHelpText()}
+	cacheLock={cacheLocks['expiry_date']}
+	bind:cachedValue={formDataCache['expiry_date']}
+/>
+<TextField
+	{form}
+	field="link"
+	label={m.link()}
+	helpText={m.linkHelpText()}
+	cacheLock={cacheLocks['link']}
+	bind:cachedValue={formDataCache['link']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['effort']}
+	field="effort"
+	label={m.effort()}
+	helpText={m.effortHelpText()}
+	cacheLock={cacheLocks['effort']}
+	bind:cachedValue={formDataCache['effort']}
+/>
+<NumberField
+	{form}
+	field="cost"
+	label={m.cost()}
+	helpText={m.costHelpText()}
+	cacheLock={cacheLocks['cost']}
+	bind:cachedValue={formDataCache['cost']}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/AssetForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AssetForm.svelte
new file mode 100644
index 000000000..18c652005
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/AssetForm.svelte
@@ -0,0 +1,52 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import Select from '../Select.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let object: any = {};
+	export let data: any = {};
+</script>
+
+<TextArea
+	{form}
+	field="business_value"
+	label={m.businessValue()}
+	cacheLock={cacheLocks['business_value']}
+	bind:cachedValue={formDataCache['business_value']}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
+<Select
+	{form}
+	options={model.selectOptions['type']}
+	field="type"
+	label="Type"
+	cacheLock={cacheLocks['type']}
+	bind:cachedValue={formDataCache['type']}
+/>
+<AutocompleteSelect
+	disabled={data.type === 'PR'}
+	multiple
+	{form}
+	options={getOptions({ objects: model.foreignKeys['parent_assets'], self: object })}
+	field="parent_assets"
+	cacheLock={cacheLocks['parent_assets']}
+	bind:cachedValue={formDataCache['parent_assets']}
+	label={m.parentAssets()}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte
new file mode 100644
index 000000000..5d3fd22ae
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte
@@ -0,0 +1,132 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import Select from '../Select.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let object: any = {};
+	export let context: string;
+</script>
+
+{#if context === 'fromBaseline' && initialData.baseline}
+	<AutocompleteSelect
+		{form}
+		field="baseline"
+		cacheLock={cacheLocks['baseline']}
+		bind:cachedValue={formDataCache['baseline']}
+		label={m.baseline()}
+		options={getOptions({ objects: model.foreignKeys['baseline'] })}
+	/>
+{/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['project'],
+		extra_fields: [['folder', 'str']]
+	})}
+	field="project"
+	cacheLock={cacheLocks['project']}
+	bind:cachedValue={formDataCache['project']}
+	label={m.project()}
+	hidden={initialData.project}
+/>
+<TextField
+	{form}
+	field="version"
+	label={m.version()}
+	cacheLock={cacheLocks['version']}
+	bind:cachedValue={formDataCache['version']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['status']}
+	field="status"
+	label={m.status()}
+	cacheLock={cacheLocks['status']}
+	bind:cachedValue={formDataCache['status']}
+/>
+<AutocompleteSelect
+	{form}
+	disabled={object.id}
+	options={getOptions({ objects: model.foreignKeys['framework'] })}
+	field="framework"
+	cacheLock={cacheLocks['framework']}
+	bind:cachedValue={formDataCache['framework']}
+	label={m.framework()}
+	on:change={async (e) => {
+		if (e.detail) {
+			await fetch(`/frameworks/${e.detail}`)
+				.then((r) => r.json())
+				.then((r) => {
+					const implementation_groups = r['implementation_groups_definition'] || [];
+					model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
+						(group) => ({ label: group.name, value: group.ref_id })
+					);
+				});
+		}
+	}}
+/>
+{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
+	<AutocompleteSelect
+		multiple
+		translateOptions={false}
+		{form}
+		options={model.selectOptions['selected_implementation_groups']}
+		field="selected_implementation_groups"
+		cacheLock={cacheLocks['selected_implementation_groups']}
+		bind:cachedValue={formDataCache['selected_implementation_groups']}
+		label={m.selectedImplementationGroups()}
+	/>
+{/if}
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
+	field="authors"
+	cacheLock={cacheLocks['authors']}
+	bind:cachedValue={formDataCache['authors']}
+	label={m.authors()}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
+	field="reviewers"
+	cacheLock={cacheLocks['reviewers']}
+	bind:cachedValue={formDataCache['reviewers']}
+	label={m.reviewers()}
+/>
+<TextField
+	type="date"
+	{form}
+	field="eta"
+	label={m.eta()}
+	helpText={m.etaHelpText()}
+	cacheLock={cacheLocks['eta']}
+	bind:cachedValue={formDataCache['eta']}
+/>
+<TextField
+	type="date"
+	{form}
+	field="due_date"
+	label={m.dueDate()}
+	helpText={m.dueDateHelpText()}
+	cacheLock={cacheLocks['due_date']}
+	bind:cachedValue={formDataCache['due_date']}
+/>
+<TextArea
+	{form}
+	field="observation"
+	label={m.observation()}
+	cacheLock={cacheLocks['observation']}
+	bind:cachedValue={formDataCache['observation']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentForm.svelte
new file mode 100644
index 000000000..e4383a846
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentForm.svelte
@@ -0,0 +1,199 @@
+<script lang="ts">
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import Select from '../Select.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import Score from '../Score.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let data: Record<string, any> = {};
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['project'] })}
+	field="project"
+	cacheLock={cacheLocks['project']}
+	bind:cachedValue={formDataCache['project']}
+	label={m.project()}
+	hidden={initialData.project}
+/>
+{#if !data.compliance_assessment}
+	<Checkbox
+		{form}
+		field="create_audit"
+		label={m.createAudit()}
+		helpText={m.createAuditHelpText()}
+	/>
+	<AutocompleteSelect
+		{form}
+		disabled={!data.create_audit}
+		mandatory
+		hidden={!data.create_audit}
+		options={getOptions({ objects: model.foreignKeys['framework'] })}
+		field="framework"
+		cacheLock={cacheLocks['framework']}
+		bind:cachedValue={formDataCache['framework']}
+		label={m.framework()}
+		on:change={async (e) => {
+			if (e.detail) {
+				await fetch(`/frameworks/${e.detail}`)
+					.then((r) => r.json())
+					.then((r) => {
+						const implementation_groups = r['implementation_groups_definition'] || [];
+						model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
+							(group) => ({ label: group.name, value: group.ref_id })
+						);
+					});
+			}
+		}}
+	/>
+	{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
+		<AutocompleteSelect
+			multiple
+			translateOptions={false}
+			{form}
+			options={model.selectOptions['selected_implementation_groups']}
+			field="selected_implementation_groups"
+			cacheLock={cacheLocks['selected_implementation_groups']}
+			bind:cachedValue={formDataCache['selected_implementation_groups']}
+			label={m.selectedImplementationGroups()}
+		/>
+	{/if}
+{/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['entity'] })}
+	field="entity"
+	cacheLock={cacheLocks['entity']}
+	bind:cachedValue={formDataCache['entity']}
+	label={m.entity()}
+	hidden={initialData.entity}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['solutions'] })}
+	field="solutions"
+	cacheLock={cacheLocks['solutions']}
+	bind:cachedValue={formDataCache['solutions']}
+	label={m.solutions()}
+/>
+<Score
+	{form}
+	label={m.criticality()}
+	field="criticality"
+	always_enabled={true}
+	inversedColors
+	fullDonut
+	min_score={1}
+	max_score={4}
+/>
+<Select
+	{form}
+	options={model.selectOptions['status']}
+	field="status"
+	label={m.status()}
+	cacheLock={cacheLocks['status']}
+	bind:cachedValue={formDataCache['status']}
+/>
+<TextField
+	{form}
+	field="version"
+	label={m.version()}
+	cacheLock={cacheLocks['version']}
+	bind:cachedValue={formDataCache['version']}
+/>
+<TextField
+	{form}
+	field="reference_link"
+	label={m.referenceLink()}
+	helpText={m.linkHelpText()}
+	cacheLock={cacheLocks['reference_link']}
+	bind:cachedValue={formDataCache['reference_link']}
+/>
+<TextField
+	type="date"
+	{form}
+	field="eta"
+	label={m.eta()}
+	helpText={m.etaHelpText()}
+	cacheLock={cacheLocks['eta']}
+	bind:cachedValue={formDataCache['eta']}
+/>
+<TextField
+	type="date"
+	{form}
+	field="due_date"
+	label={m.dueDate()}
+	helpText={m.dueDateHelpText()}
+	cacheLock={cacheLocks['due_date']}
+	bind:cachedValue={formDataCache['due_date']}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
+	field="authors"
+	cacheLock={cacheLocks['authors']}
+	bind:cachedValue={formDataCache['authors']}
+	label={m.authors()}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
+	field="reviewers"
+	cacheLock={cacheLocks['reviewers']}
+	bind:cachedValue={formDataCache['reviewers']}
+	label={m.reviewers()}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['compliance_assessment'] })}
+	field="compliance_assessment"
+	cacheLock={cacheLocks['compliance_assessment']}
+	bind:cachedValue={formDataCache['compliance_assessment']}
+	label={m.complianceAssessment()}
+	disabled={data.create_audit}
+	hidden={data.create_audit}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['evidence'],
+		extra_fields: [['folder', 'str']]
+	})}
+	field="evidence"
+	cacheLock={cacheLocks['evidence']}
+	bind:cachedValue={formDataCache['evidence']}
+	label={m.evidence()}
+/>
+<Select
+	{form}
+	options={model.selectOptions['conclusion']}
+	field="conclusion"
+	label={m.conclusion()}
+	cacheLock={cacheLocks['conclusion']}
+	bind:cachedValue={formDataCache['conclusion']}
+/>
+<TextArea
+	{form}
+	field="observation"
+	label={m.observation()}
+	cacheLock={cacheLocks['observation']}
+	bind:cachedValue={formDataCache['observation']}
+/>
+<!-- <Score {form} label={m.penetration()} field="penetration" always_enabled={true} inversedColors fullDonut max_score={5} />
+		<Score {form} label={m.dependency()} field="dependency" always_enabled={true} inversedColors fullDonut max_score={5} />
+		<Score {form} label={m.maturity()} field="maturity" always_enabled={true} inversedColors fullDonut max_score={5} />
+		<Score {form} label={m.trust()} field="trust" always_enabled={true} inversedColors fullDonut max_score={5} /> -->
diff --git a/frontend/src/lib/components/Forms/ModelForm/EntityForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EntityForm.svelte
new file mode 100644
index 000000000..5a90d9541
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/EntityForm.svelte
@@ -0,0 +1,40 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<TextArea
+	{form}
+	field="mission"
+	label={m.mission()}
+	cacheLock={cacheLocks['mission']}
+	bind:cachedValue={formDataCache['mission']}
+/>
+<TextField
+	{form}
+	field="reference_link"
+	label={m.referenceLink()}
+	helpText={m.linkHelpText()}
+	cacheLock={cacheLocks['reference_link']}
+	bind:cachedValue={formDataCache['reference_link']}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/EvidenceForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EvidenceForm.svelte
new file mode 100644
index 000000000..cf42cab3e
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/EvidenceForm.svelte
@@ -0,0 +1,50 @@
+<script lang="ts">
+	import HiddenInput from '../HiddenInput.svelte';
+	import FileInput from '../FileInput.svelte';
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let object: any = {};
+</script>
+
+<HiddenInput {form} field="applied_controls" />
+<HiddenInput {form} field="requirement_assessments" />
+<FileInput
+	{form}
+	allowPaste={true}
+	helpText={object.attachment
+		? `${m.attachmentWarningText()}: ${object.attachment}`
+		: m.attachmentHelpText()}
+	field="attachment"
+	label={m.attachment()}
+/>
+{#if !(initialData.applied_controls || initialData.requirement_assessments)}
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['folder'] })}
+		field="folder"
+		cacheLock={cacheLocks['folder']}
+		bind:cachedValue={formDataCache['folder']}
+		label={m.domain()}
+		hidden={initialData.applied_controls || initialData.requirement_assessments}
+	/>
+{:else}
+	<HiddenInput {form} field="folder" />
+{/if}
+<TextField
+	{form}
+	field="link"
+	label={m.link()}
+	helpText={m.linkHelpText()}
+	cacheLock={cacheLocks['link']}
+	bind:cachedValue={formDataCache['link']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/FrameworkForm.svelte b/frontend/src/lib/components/Forms/ModelForm/FrameworkForm.svelte
new file mode 100644
index 000000000..a327b1d57
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/FrameworkForm.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+	import Select from '../Select.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+</script>
+
+<TextField
+	{form}
+	field="ref_id"
+	label={m.ref()}
+	cacheLock={cacheLocks['ref_id']}
+	bind:cachedValue={formDataCache['ref_id']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['category']}
+	field="category"
+	label={m.category()}
+	cacheLock={cacheLocks['category']}
+	bind:cachedValue={formDataCache['category']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte
new file mode 100644
index 000000000..e4d9c86bf
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte
@@ -0,0 +1,40 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import Select from '../Select.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
+<TextField
+	{form}
+	field="internal_reference"
+	label={m.internalReference()}
+	cacheLock={cacheLocks['internal_reference']}
+	bind:cachedValue={formDataCache['internal_reference']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['lc_status']}
+	field="lc_status"
+	label={m.lcStatus()}
+	cacheLock={cacheLocks['lc_status']}
+	bind:cachedValue={formDataCache['lc_status']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/ReferenceControlForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ReferenceControlForm.svelte
new file mode 100644
index 000000000..0ec8dec7b
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/ReferenceControlForm.svelte
@@ -0,0 +1,63 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import Select from '../Select.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<TextField
+	{form}
+	field="ref_id"
+	label={m.ref()}
+	cacheLock={cacheLocks['ref_id']}
+	bind:cachedValue={formDataCache['ref_id']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['category']}
+	field="category"
+	label={m.category()}
+	cacheLock={cacheLocks['category']}
+	bind:cachedValue={formDataCache['category']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['csf_function']}
+	field="csf_function"
+	label={m.csfFunction()}
+	cacheLock={cacheLocks['csf_function']}
+	bind:cachedValue={formDataCache['csf_function']}
+/>
+<TextArea
+	{form}
+	field="annotation"
+	label={m.annotation()}
+	cacheLock={cacheLocks['annotation']}
+	bind:cachedValue={formDataCache['annotation']}
+/>
+<TextField
+	{form}
+	field="provider"
+	label={m.provider()}
+	cacheLock={cacheLocks['provider']}
+	bind:cachedValue={formDataCache['provider']}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/RepresentativeForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RepresentativeForm.svelte
new file mode 100644
index 000000000..fc2dcda95
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RepresentativeForm.svelte
@@ -0,0 +1,62 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let data: any = {};
+</script>
+
+<TextField
+	{form}
+	field="email"
+	label={m.email()}
+	cacheLock={cacheLocks['email']}
+	bind:cachedValue={formDataCache['email']}
+	data-focusindex="2"
+/>
+{#if !data.user}
+	<Checkbox {form} field="create_user" label={m.createUser()} helpText={m.createUserHelpText()} />
+{/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['entity'] })}
+	field="entity"
+	cacheLock={cacheLocks['entity']}
+	bind:cachedValue={formDataCache['entity']}
+	label={m.entity()}
+/>
+<TextField
+	{form}
+	field="first_name"
+	label={m.firstName()}
+	cacheLock={cacheLocks['first_name']}
+	bind:cachedValue={formDataCache['first_name']}
+/>
+<TextField
+	{form}
+	field="last_name"
+	label={m.lastName()}
+	cacheLock={cacheLocks['last_name']}
+	bind:cachedValue={formDataCache['last_name']}
+/>
+<TextField
+	{form}
+	field="phone"
+	label={m.phone()}
+	cacheLock={cacheLocks['phone']}
+	bind:cachedValue={formDataCache['phone']}
+/>
+<TextField
+	{form}
+	field="role"
+	label={m.role()}
+	cacheLock={cacheLocks['role']}
+	bind:cachedValue={formDataCache['role']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentForm.svelte
new file mode 100644
index 000000000..567472744
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentForm.svelte
@@ -0,0 +1,40 @@
+<script lang="ts">
+	import Select from '../Select.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import HiddenInput from '$lib/components/Forms/HiddenInput.svelte';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+</script>
+
+<Select
+	{form}
+	options={model.selectOptions['status']}
+	field="status"
+	label={m.status()}
+	cacheLock={cacheLocks['status']}
+	bind:cachedValue={formDataCache['status']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['result']}
+	field="result"
+	label={m.result()}
+	cacheLock={cacheLocks['result']}
+	bind:cachedValue={formDataCache['result']}
+/>
+<TextArea
+	{form}
+	field="observation"
+	label={m.observation()}
+	cacheLock={cacheLocks['observation']}
+	bind:cachedValue={formDataCache['observation']}
+/>
+<HiddenInput {form} field="folder" />
+<HiddenInput {form} field="requirement" />
+<HiddenInput {form} field="compliance_assessment" />
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskAcceptanceForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskAcceptanceForm.svelte
new file mode 100644
index 000000000..d2b019da6
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RiskAcceptanceForm.svelte
@@ -0,0 +1,72 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import { page } from '$app/stores';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let object: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<TextField
+	{form}
+	type="date"
+	field="expiry_date"
+	label={m.expiryDate()}
+	helpText={m.expiryDateHelpText()}
+	cacheLock={cacheLocks['expiry_date']}
+	bind:cachedValue={formDataCache['expiry_date']}
+/>
+{#if object.id && $page.data.user.id === object.approver}
+	<TextArea
+		disabled={$page.data.user.id !== object.approver}
+		{form}
+		field="justification"
+		label={m.justification()}
+		helpText={m.riskAcceptanceJusitficationHelpText()}
+		cacheLock={cacheLocks['justification']}
+		bind:cachedValue={formDataCache['justification']}
+	/>
+{/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['approver'], label: 'email' })}
+	field="approver"
+	cacheLock={cacheLocks['approver']}
+	bind:cachedValue={formDataCache['approver']}
+	label={m.approver()}
+	helpText={m.approverHelpText()}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['risk_scenarios'],
+		extra_fields: [
+			['project', 'str'],
+			['risk_assessment', 'str']
+		]
+	})}
+	field="risk_scenarios"
+	cacheLock={cacheLocks['risk_scenarios']}
+	bind:cachedValue={formDataCache['risk_scenarios']}
+	label={m.riskScenarios()}
+	helpText={m.riskAcceptanceRiskScenariosHelpText()}
+	multiple
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
new file mode 100644
index 000000000..ec016e9f6
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
@@ -0,0 +1,104 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import Select from '../Select.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let riskAssessmentDuplication: boolean = false;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let object: Record<string, any> = {};
+	export let context: string = 'default';
+	export let updated_fields: Set<string> = new Set();
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['project'],
+		extra_fields: [['folder', 'str']]
+	})}
+	field="project"
+	cacheLock={cacheLocks['project']}
+	bind:cachedValue={formDataCache['project']}
+	label={m.project()}
+	hidden={initialData.project}
+/>
+<TextField
+	{form}
+	field="version"
+	label={m.version()}
+	cacheLock={cacheLocks['version']}
+	bind:cachedValue={formDataCache['version']}
+/>
+{#if !riskAssessmentDuplication}
+	<Select
+		{form}
+		options={model.selectOptions['status']}
+		field="status"
+		hide
+		label={m.status()}
+		cacheLock={cacheLocks['status']}
+		bind:cachedValue={formDataCache['status']}
+	/>
+	<AutocompleteSelect
+		{form}
+		disabled={object.id}
+		options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
+		field="risk_matrix"
+		cacheLock={cacheLocks['risk_matrix']}
+		bind:cachedValue={formDataCache['risk_matrix']}
+		label={m.riskMatrix()}
+		helpText={m.riskAssessmentMatrixHelpText()}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
+		field="authors"
+		cacheLock={cacheLocks['authors']}
+		bind:cachedValue={formDataCache['authors']}
+		label={m.authors()}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
+		field="reviewers"
+		cacheLock={cacheLocks['reviewers']}
+		bind:cachedValue={formDataCache['reviewers']}
+		label={m.reviewers()}
+	/>
+	<TextField
+		type="date"
+		{form}
+		field="eta"
+		label={m.eta()}
+		helpText={m.etaHelpText()}
+		cacheLock={cacheLocks['eta']}
+		bind:cachedValue={formDataCache['eta']}
+	/>
+	<TextField
+		type="date"
+		{form}
+		field="due_date"
+		label={m.dueDate()}
+		helpText={m.dueDateHelpText()}
+		cacheLock={cacheLocks['due_date']}
+		bind:cachedValue={formDataCache['due_date']}
+	/>
+	<TextArea
+		{form}
+		field="observation"
+		label={m.observation()}
+		cacheLock={cacheLocks['observation']}
+		bind:cachedValue={formDataCache['observation']}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskScenarioForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskScenarioForm.svelte
new file mode 100644
index 000000000..b89866439
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RiskScenarioForm.svelte
@@ -0,0 +1,40 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['risk_assessment'],
+		label: 'str',
+		extra_fields: [['project', 'str']]
+	})}
+	field="risk_assessment"
+	cacheLock={cacheLocks['risk_assessment']}
+	bind:cachedValue={formDataCache['risk_assessment']}
+	label={m.riskAssessment()}
+	hidden={initialData.risk_assessment}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({
+		objects: model.foreignKeys['threats'],
+		extra_fields: [['folder', 'str']],
+		label: 'auto'
+	})}
+	field="threats"
+	cacheLock={cacheLocks['threats']}
+	bind:cachedValue={formDataCache['threats']}
+	label={m.threats()}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/SolutionForm.svelte b/frontend/src/lib/components/Forms/ModelForm/SolutionForm.svelte
new file mode 100644
index 000000000..d496dcca7
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/SolutionForm.svelte
@@ -0,0 +1,41 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	import Score from '../Score.svelte';
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['provider_entity'] })}
+	field="provider_entity"
+	cacheLock={cacheLocks['provider_entity']}
+	bind:cachedValue={formDataCache['provider_entity']}
+	label={m.providerEntity()}
+	hidden={initialData.provider_entity}
+/>
+<TextField
+	{form}
+	field="ref_id"
+	label={m.ref()}
+	cacheLock={cacheLocks['ref_id']}
+	bind:cachedValue={formDataCache['ref_id']}
+/>
+<Score
+	{form}
+	label={m.criticality()}
+	field="criticality"
+	always_enabled={true}
+	inversedColors
+	fullDonut
+	min_score={1}
+	max_score={4}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/SsoSettingForm.svelte b/frontend/src/lib/components/Forms/ModelForm/SsoSettingForm.svelte
new file mode 100644
index 000000000..66779c374
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/SsoSettingForm.svelte
@@ -0,0 +1,301 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
+	import { Accordion, AccordionItem } from '@skeletonlabs/skeleton';
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let data: any = {};
+</script>
+
+<Accordion>
+	<Checkbox {form} field="is_enabled" label={m.enableSSO()} />
+	<AutocompleteSelect
+		{form}
+		hidden={model.selectOptions['provider'].length < 2}
+		field="provider"
+		cacheLock={cacheLocks['provider']}
+		bind:cachedValue={formDataCache['provider']}
+		options={model.selectOptions['provider']}
+		label={m.provider()}
+		disabled={!data.is_enabled}
+	/>
+	{#if data.provider !== 'saml'}
+		<AccordionItem open>
+			<svelte:fragment slot="summary">{m.IdPConfiguration()}</svelte:fragment>
+			<svelte:fragment slot="content">
+				<TextField
+					{form}
+					field="provider_name"
+					label={m.name()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['provider_name']}
+					bind:cachedValue={formDataCache['provider_name']}
+				/>
+				<TextField
+					hidden
+					{form}
+					field="provider_id"
+					label={m.providerID()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['provider_id']}
+					bind:cachedValue={formDataCache['provider_id']}
+				/>
+				<TextField
+					{form}
+					field="client_id"
+					label={m.clientID()}
+					helpText={m.clientIDHelpText()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['client_id']}
+					bind:cachedValue={formDataCache['client_id']}
+				/>
+				{#if data.provider !== 'saml'}
+					<TextField
+						{form}
+						field="secret"
+						label={m.secret()}
+						helpText={m.secretHelpText()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['secret']}
+						bind:cachedValue={formDataCache['secret']}
+					/>
+					<TextField
+						{form}
+						field="key"
+						label={m.key()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['key']}
+						bind:cachedValue={formDataCache['key']}
+					/>
+				{/if}
+			</svelte:fragment>
+		</AccordionItem>
+	{/if}
+	{#if data.provider === 'saml'}
+		<AccordionItem open>
+			<svelte:fragment slot="summary"
+				><span class="font-semibold">{m.SAMLIdPConfiguration()}</span></svelte:fragment
+			>
+			<svelte:fragment slot="content">
+				<TextField
+					{form}
+					field="idp_entity_id"
+					label={m.IdPEntityID()}
+					required={data.provider === 'saml'}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['idp_entity_id']}
+					bind:cachedValue={formDataCache['idp_entity_id']}
+				/>
+				<p class="text-gray-600 text-sm">Option 1: Fill the metadata url</p>
+				<TextField
+					{form}
+					field="metadata_url"
+					label={m.metadataURL()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['metadata_url']}
+					bind:cachedValue={formDataCache['metadata_url']}
+				/>
+				<div class="flex items-center justify-center w-full space-x-2">
+					<hr class="w-1/2 items-center bg-gray-200 border-0" />
+					<span class="flex items-center text-gray-600 text-sm">{m.or()}</span>
+					<hr class="w-1/2 items-center bg-gray-200 border-0" />
+				</div>
+				<p class="text-gray-600 text-sm">Option 2: Fill the SSO URL, SLO URL and x509cert</p>
+				<TextField
+					{form}
+					field="sso_url"
+					label={m.SSOURL()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['sso_url']}
+					bind:cachedValue={formDataCache['sso_url']}
+				/>
+				<TextField
+					{form}
+					field="slo_url"
+					label={m.SLOURL()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['slo_url']}
+					bind:cachedValue={formDataCache['slo_url']}
+				/>
+				<TextArea
+					{form}
+					field="x509cert"
+					label={m.x509Cert()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['x509cert']}
+					bind:cachedValue={formDataCache['x509cert']}
+				/>
+			</svelte:fragment>
+		</AccordionItem>
+
+		<AccordionItem>
+			<svelte:fragment slot="summary"
+				><span class="font-semibold">{m.SPConfiguration()}</span></svelte:fragment
+			>
+			<svelte:fragment slot="content">
+				<TextField
+					{form}
+					field="sp_entity_id"
+					label={m.SPEntityID()}
+					required={data.provider === 'saml'}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['sp_entity_id']}
+					bind:cachedValue={formDataCache['sp_entity_id']}
+				/>
+			</svelte:fragment>
+		</AccordionItem>
+
+		<AccordionItem
+			><svelte:fragment slot="summary"
+				><span class="font-semibold">{m.advancedSettings()}</span></svelte:fragment
+			>
+			<svelte:fragment slot="content">
+				<TextField
+					{form}
+					field="attribute_mapping_uid"
+					label={m.attributeMappingUID()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['attribute_mapping_uid']}
+					bind:cachedValue={formDataCache['attribute_mapping_uid']}
+				/>
+				<TextField
+					{form}
+					field="attribute_mapping_email_verified"
+					label={m.attributeMappingEmailVerified()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['attribute_mapping_email_verified']}
+					bind:cachedValue={formDataCache['attribute_mapping_email_verified']}
+				/>
+				<TextField
+					{form}
+					field="attribute_mapping_email"
+					label={m.attributeMappingEmail()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['attribute_mapping_email']}
+					bind:cachedValue={formDataCache['attribute_mapping_email']}
+				/>
+
+				<Checkbox
+					{form}
+					field="allow_repeat_attribute_name"
+					label={m.allowRepeatAttributeName()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="allow_single_label_domains"
+					label={m.allowSingleLabelDomains()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="authn_request_signed"
+					hidden
+					label={m.authnRequestSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<TextField
+					{form}
+					field="digest_algorithm"
+					hidden
+					label={m.digestAlgorithm()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['digest_algorithm']}
+					bind:cachedValue={formDataCache['digest_algorithm']}
+				/>
+				<Checkbox
+					{form}
+					field="logout_request_signed"
+					hidden
+					label={m.logoutRequestSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="logout_response_signed"
+					hidden
+					label={m.logoutResponseSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="metadata_signed"
+					hidden
+					label={m.metadataSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="name_id_encrypted"
+					hidden
+					label={m.nameIDEncrypted()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					hidden
+					field="reject_deprecated_algorithm"
+					label={m.rejectDeprecatedAlgorithm()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="reject_idp_initiated_sso"
+					label={m.rejectIdPInitiatedSSO()}
+					disabled={!data.is_enabled}
+				/>
+				<TextField
+					{form}
+					field="signature_algorithm"
+					hidden
+					label={m.signatureAlgorithm()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['signature_algorithm']}
+					bind:cachedValue={formDataCache['signature_algorithm']}
+				/>
+				<Checkbox
+					{form}
+					field="want_assertion_encrypted"
+					hidden
+					label={m.wantAssertionEncrypted()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="want_assertion_signed"
+					hidden
+					label={m.wantAssertionSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="want_attribute_statement"
+					label={m.wantAttributeStatement()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="want_message_signed"
+					hidden
+					label={m.wantMessageSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox {form} field="want_name_id" label={m.wantNameID()} disabled={!data.is_enabled} />
+				<Checkbox
+					{form}
+					field="want_name_id_encrypted"
+					hidden
+					label={m.wantNameIDEncrypted()}
+					disabled={!data.is_enabled}
+				/>
+			</svelte:fragment>
+		</AccordionItem>
+	{/if}
+</Accordion>
diff --git a/frontend/src/lib/components/Forms/ModelForm/ThreatForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ThreatForm.svelte
new file mode 100644
index 000000000..8189b9646
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/ThreatForm.svelte
@@ -0,0 +1,46 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
+<TextField
+	{form}
+	field="ref_id"
+	label={m.ref()}
+	cacheLock={cacheLocks['ref_id']}
+	bind:cachedValue={formDataCache['ref_id']}
+/>
+<TextArea
+	{form}
+	field="annotation"
+	label={m.annotation()}
+	cacheLock={cacheLocks['annotation']}
+	bind:cachedValue={formDataCache['annotation']}
+/>
+<TextField
+	{form}
+	field="provider"
+	label={m.provider()}
+	cacheLock={cacheLocks['provider']}
+	bind:cachedValue={formDataCache['provider']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/UserForm.svelte b/frontend/src/lib/components/Forms/ModelForm/UserForm.svelte
new file mode 100644
index 000000000..fa9f885fb
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/UserForm.svelte
@@ -0,0 +1,53 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let shape: any = {};
+</script>
+
+<TextField
+	{form}
+	field="email"
+	label={m.email()}
+	cacheLock={cacheLocks['email']}
+	bind:cachedValue={formDataCache['email']}
+	data-focusindex="2"
+/>
+{#if shape.first_name && shape.last_name}
+	<TextField
+		{form}
+		field="first_name"
+		label={m.firstName()}
+		cacheLock={cacheLocks['first_name']}
+		bind:cachedValue={formDataCache['first_name']}
+	/>
+	<TextField
+		{form}
+		field="last_name"
+		label={m.lastName()}
+		cacheLock={cacheLocks['last_name']}
+		bind:cachedValue={formDataCache['last_name']}
+	/>
+{/if}
+{#if shape.user_groups}
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['user_groups'] })}
+		field="user_groups"
+		cacheLock={cacheLocks['user_groups']}
+		bind:cachedValue={formDataCache['user_groups']}
+		label={m.userGroups()}
+	/>
+{/if}
+{#if shape.is_active}
+	<Checkbox {form} field="is_active" label={m.isActive()} helpText={m.isActiveHelpText()} />
+{/if}