diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index 39c325b04..bda9e89bd 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -283,6 +283,7 @@
 			field="category"
 			label={m.category()}
 		/>
+		<TextArea {form} field="annotation" label={m.annotation()} />
 		<TextField {form} field="provider" label={m.provider()} />
 		<AutocompleteSelect
 			{form}
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 90fdc861e..7baf5c5a2 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -87,7 +87,8 @@ export const RiskAssessmentSchema = baseNamedObject({
 
 export const ThreatSchema = baseNamedObject({
 	folder: z.string(),
-	provider: z.string().optional().nullable()
+	provider: z.string().optional().nullable(),
+	ref_id: z.string().optional().nullable()
 });
 
 export const RiskScenarioSchema = baseNamedObject({
@@ -139,7 +140,9 @@ export const RiskAcceptanceSchema = baseNamedObject({
 export const ReferenceControlSchema = baseNamedObject({
 	provider: z.string().optional().nullable(),
 	category: z.string().optional().nullable(),
-	folder: z.string()
+	folder: z.string(),
+	ref_id: z.string().optional().nullable(),
+	annotation: z.string().optional().nullable(),
 });
 
 export const AssetSchema = baseNamedObject({
@@ -156,7 +159,8 @@ export const RequirementAssessmentSchema = z.object({
 	requirement: z.string(),
 	evidences: z.string().uuid().optional().array(),
 	compliance_assessment: z.string(),
-	applied_controls: z.string().uuid().optional().array()
+	applied_controls: z.string().uuid().optional().array(),
+	observation: z.string().optional().nullable()
 });
 
 export const UserEditSchema = z.object({