diff --git a/api/legalconsenthub.yml b/api/legalconsenthub.yml
index bbc496f..4af2eb3 100644
--- a/api/legalconsenthub.yml
+++ b/api/legalconsenthub.yml
@@ -1286,11 +1286,13 @@ components:
           type: string
           nullable: true
         createdBy:
-          $ref: "#/components/schemas/UserDto"
           nullable: true
+          allOf:
+            - $ref: "#/components/schemas/UserDto"
         lastModifiedBy:
-          $ref: "#/components/schemas/UserDto"
           nullable: true
+          allOf:
+            - $ref: "#/components/schemas/UserDto"
         createdAt:
           type: string
           format: date-time
@@ -1548,9 +1550,10 @@ components:
           format: uuid
           nullable: true
         visibilityConditions:
-          $ref: "#/components/schemas/VisibilityConditionGroup"
           nullable: true
           description: Recursive visibility condition tree (AND/OR groups with leaf conditions)
+          allOf:
+            - $ref: "#/components/schemas/VisibilityConditionGroup"
         sectionSpawnTriggers:
           type: array
           items:
@@ -1611,8 +1614,9 @@ components:
           items:
             $ref: "#/components/schemas/FormOptionDto"
         visibilityConditions:
-          $ref: "#/components/schemas/VisibilityConditionGroup"
           nullable: true
+          allOf:
+            - $ref: "#/components/schemas/VisibilityConditionGroup"
         sectionSpawnTriggers:
           type: array
           items:
@@ -1699,8 +1703,9 @@ components:
           type: string
           description: Expected value to match in the source column
         operator:
-          $ref: "#/components/schemas/VisibilityConditionOperator"
           default: EQUALS
+          allOf:
+            - $ref: "#/components/schemas/VisibilityConditionOperator"
 
     FormElementType:
       type: string