diff --git a/src/discrete-layer/models/CswCatalogModel.base.ts b/src/discrete-layer/models/CswCatalogModel.base.ts
index 892bd566..56360b98 100644
--- a/src/discrete-layer/models/CswCatalogModel.base.ts
+++ b/src/discrete-layer/models/CswCatalogModel.base.ts
@@ -2,8 +2,8 @@
 /* eslint-disable */
 /* tslint:disable */
 
-import { types } from "mobx-state-tree"
-import { QueryBuilder } from "mst-gql"
+import { IAnyModelType, types } from "mobx-state-tree"
+import { MSTGQLRef, QueryBuilder } from "mst-gql"
 import { ModelBase } from "./ModelBase"
 import { CswQuerySummaryModel, CswQuerySummaryModelType } from "./CswQuerySummaryModel"
 import { cswQuerySummaryModelPrimitives, CswQuerySummaryModelSelector } from "./CswQuerySummaryModel.base"
@@ -24,7 +24,7 @@ export const CswCatalogModelBase = ModelBase
   .named('CswCatalog')
   .props({
     __typename: types.optional(types.literal("CSWCatalog"), "CSWCatalog"),
-    records: types.union(types.undefined, types.array(types.union(types.late(() => Layer3DRecordModel), types.late(() => LayerRasterRecordModel), types.late(() => LayerDemRecordModel), types.late(() => VectorBestRecordModel), types.late(() => QuantizedMeshBestRecordModel)))),
+    records: types.union(types.undefined, types.array(MSTGQLRef(types.union(types.late(() => Layer3DRecordModel), types.late(() => LayerRasterRecordModel), types.late(() => LayerDemRecordModel), types.late(() => VectorBestRecordModel), types.late(() => QuantizedMeshBestRecordModel)) as unknown as IAnyModelType))),
     cswQuerySummary: types.union(types.undefined, types.null, types.late((): any => CswQuerySummaryModel)),
   })
   .views(self => ({
diff --git a/src/discrete-layer/models/RootStore.base.ts b/src/discrete-layer/models/RootStore.base.ts
index faad3a28..6c1f3684 100644
--- a/src/discrete-layer/models/RootStore.base.ts
+++ b/src/discrete-layer/models/RootStore.base.ts
@@ -506,7 +506,7 @@ mutateJobAbort="mutateJobAbort"
 */
 export const RootStoreBase = withTypedRefs<Refs>()(MSTGQLStore
   .named("RootStore")
-  .extend(configureStoreMixin([], ['LayerRasterRecord', 'Layer3DRecord', 'LayerDemRecord', 'EntityDescriptor', 'VectorBestRecord', 'QuantizedMeshBestRecord', 'PolygonPartRecord'], "js"))
+  .extend(configureStoreMixin([['Capability', () => CapabilityModel], ['Style', () => StyleModel], ['TileMatrixSet', () => TileMatrixSetModel], ['ResourceURL', () => ResourceUrlModel], ['CSWCatalogs', () => CswCatalogsModel], ['CSWCatalog', () => CswCatalogModel], ['Layer3DRecord', () => Layer3DRecordModel], ['Link', () => LinkModel], ['LayerRasterRecord', () => LayerRasterRecordModel], ['LayerDemRecord', () => LayerDemRecordModel], ['VectorBestRecord', () => VectorBestRecordModel], ['VectorFeatureTypeStructure', () => VectorFeatureTypeStructureModel], ['FieldFeatureType', () => FieldFeatureTypeModel], ['QuantizedMeshBestRecord', () => QuantizedMeshBestRecordModel], ['CSWQuerySummary', () => CswQuerySummaryModel], ['StringArrayObjectType', () => StringArrayObjectTypeModel], ['EntityDescriptor', () => EntityDescriptorModel], ['CategoryConfig', () => CategoryConfigModel], ['FieldConfig', () => FieldConfigModel], ['FilterableFieldConfig', () => FilterableFieldConfigModel], ['FilterFieldValidation', () => FilterFieldValidationModel], ['BriefFieldConfig', () => BriefFieldConfigModel], ['Autocompletion', () => AutocompletionModel], ['ValidationConfig', () => ValidationConfigModel], ['EnumAspects', () => EnumAspectsModel], ['UpdateRules', () => UpdateRulesModel], ['UpdateRulesValue', () => UpdateRulesValueModel], ['UpdateRulesOperation', () => UpdateRulesOperationModel], ['LookupTableBinding', () => LookupTableBindingModel], ['DependentField', () => DependentFieldModel], ['ShapeMapping', () => ShapeMappingModel], ['MCEnums', () => McEnumsModel], ['PolygonPartRecord', () => PolygonPartRecordModel], ['EstimatedSize', () => EstimatedSizeModel], ['FreeDiskSpace', () => FreeDiskSpaceModel], ['TriggerExportTask', () => TriggerExportTaskModel], ['ExternalService', () => ExternalServiceModel], ['Job', () => JobModel], ['AvailableActions', () => AvailableActionsModel], ['LookupTableData', () => LookupTableDataModel], ['DeploymentWithServices', () => DeploymentWithServicesModel], ['K8sService', () => K8SServiceModel], ['File', () => FileModel], ['DecryptedId', () => DecryptedIdModel], ['TasksGroup', () => TasksGroupModel], ['Task', () => TaskModel], ['GetFeature', () => GetFeatureModel], ['WfsFeature', () => WfsFeatureModel], ['GetFeatureTypes', () => GetFeatureTypesModel], ['PositionsWithHeights', () => PositionsWithHeightsModel], ['PositionWithHeight', () => PositionWithHeightModel], ['UserLogin', () => UserLoginModel], ['SourceValidation', () => SourceValidationModel], ['RasterIngestion', () => RasterIngestionModel]], ['LayerRasterRecord', 'Layer3DRecord', 'LayerDemRecord', 'EntityDescriptor', 'VectorBestRecord', 'QuantizedMeshBestRecord', 'PolygonPartRecord'], "js"))
   .props({
     layerRasterRecords: types.optional(types.map(types.late((): any => LayerRasterRecordModel)), {}),
     layer3DRecords: types.optional(types.map(types.late((): any => Layer3DRecordModel)), {}),