diff --git a/pom.xml b/pom.xml
index 460af88..b298731 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
               <generateApiTests>true</generateApiTests>
               <generateApiDocumentation>true</generateApiDocumentation>
               <generateModels>true</generateModels>
-              <modelsToGenerate>entityDataType,arrayType,dateType,entityTypeRelation,objectType,nestedObjectProperty,entityTypeColumn,enumType,booleanType,entityType,integerType,openUUIDType,stringType,numberType,rangedUUIDType,valueWithLabel,entityTypeDefaultSort,errors,error,parameters,parameter,resultsetPage,queryDetails,queryIdentifier,sourceColumn,valueSourceApi,columnValues,columnValueGetter,submitQuery,contentsRequest,field,entityTypeSource,entityTypeSourceJoin,stringUUIDType,entityTypeCrossTenantQueryConfig</modelsToGenerate>
+              <modelsToGenerate>entityDataType,arrayType,dateType,entityTypeRelation,objectType,nestedObjectProperty,entityTypeColumn,enumType,booleanType,entityType,integerType,openUUIDType,stringType,numberType,rangedUUIDType,valueWithLabel,entityTypeDefaultSort,errors,error,parameters,parameter,resultsetPage,queryDetails,queryIdentifier,sourceColumn,valueSourceApi,columnValues,columnValueGetter,submitQuery,contentsRequest,field,entityTypeSource,entityTypeSourceJoin,stringUUIDType</modelsToGenerate>
               <generateModelTests>false</generateModelTests>
               <generateModelDocumentation>true</generateModelDocumentation>
               <generateSupportingFiles>true</generateSupportingFiles>
diff --git a/src/main/resources/swagger.api/schemas/entityType.json b/src/main/resources/swagger.api/schemas/entityType.json
index fc687da..5fac9a8 100644
--- a/src/main/resources/swagger.api/schemas/entityType.json
+++ b/src/main/resources/swagger.api/schemas/entityType.json
@@ -43,9 +43,10 @@
         },
         "default": []
       },
-      "crossTenantQueryConfig": {
-        "description": "Cross-tenant query config for this entity type. Cross-tenant queries are not supported for entity types without this property.",
-        "$ref": "entityTypeCrossTenantQueryConfig.json"
+      "crossTenantQueriesEnabled": {
+        "description": "Indicates if this entity type supports cross-tenant queries",
+        "type": "boolean",
+        "default": false
       },
       "defaultSort": {
         "type": "array",
diff --git a/src/main/resources/swagger.api/schemas/sourceColumn.json b/src/main/resources/swagger.api/schemas/sourceColumn.json
index 8ba4e55..13747ce 100644
--- a/src/main/resources/swagger.api/schemas/sourceColumn.json
+++ b/src/main/resources/swagger.api/schemas/sourceColumn.json
@@ -5,7 +5,20 @@
   "type": "object",
   "properties": {
     "entityTypeId": {
-      "description": "A UUID identifying the source entity type",
+      "description": "A UUID identifying the source entity type.",
+      "type": "string"
+    },
+    "type": {
+      "description": "Name of the source type. Possible values: entity-type, fqm. Default: entity-type",
+      "type": "string",
+      "default": "entity-type",
+      "enum": [
+        "entity-type",
+        "fqm"
+      ]
+    },
+    "name": {
+      "description": "Name of the source within the source type (e.g., 'currency')",
       "type": "string"
     },
     "columnName": {
@@ -14,7 +27,6 @@
     }
   },
   "required": [
-    "entityTypeId",
-    "columnName"
+    "entityTypeId", "columnName"
   ]
 }