@twin.org/engine-types 0.0.2-next.2 → 0.0.2-next.20

package/dist/cjs/index.cjs

@@ -17,11 +17,14 @@ var entityStorageConnectorMongodb = require('@twin.org/entity-storage-connector-
 var entityStorageConnectorMysql = require('@twin.org/entity-storage-connector-mysql');
 var entityStorageConnectorPostgresql = require('@twin.org/entity-storage-connector-postgresql');
 var entityStorageConnectorScylladb = require('@twin.org/entity-storage-connector-scylladb');
+var entityStorageConnectorSynchronised = require('@twin.org/entity-storage-connector-synchronised');
 var entityStorageModels = require('@twin.org/entity-storage-models');
 var entityStorageRestClient = require('@twin.org/entity-storage-rest-client');
 var entityStorageService = require('@twin.org/entity-storage-service');
 var auditableItemStreamRestClient = require('@twin.org/auditable-item-stream-rest-client');
 var auditableItemStreamService = require('@twin.org/auditable-item-stream-service');
+var apiModels = require('@twin.org/api-models');
+var identityAuthentication = require('@twin.org/identity-authentication');
 var backgroundTaskConnectorEntityStorage = require('@twin.org/background-task-connector-entity-storage');
 var backgroundTaskModels = require('@twin.org/background-task-models');
 var blobStorageConnectorAwsS3 = require('@twin.org/blob-storage-connector-aws-s3');
@@ -38,6 +41,9 @@ var dataProcessingExtractors = require('@twin.org/data-processing-extractors');
 var dataProcessingModels = require('@twin.org/data-processing-models');
 var dataProcessingRestClient = require('@twin.org/data-processing-rest-client');
 var dataProcessingService = require('@twin.org/data-processing-service');
+var dataSpaceConnectorRestClient = require('@twin.org/data-space-connector-rest-client');
+var dataSpaceConnectorService = require('@twin.org/data-space-connector-service');
+var dataSpaceConnectorSocketClient = require('@twin.org/data-space-connector-socket-client');
 var documentManagementRestClient = require('@twin.org/document-management-rest-client');
 var documentManagementService = require('@twin.org/document-management-service');
 var eventBusConnectorLocal = require('@twin.org/event-bus-connector-local');
@@ -71,9 +77,18 @@ var nftConnectorIota = require('@twin.org/nft-connector-iota');
 var nftModels = require('@twin.org/nft-models');
 var nftRestClient = require('@twin.org/nft-rest-client');
 var nftService = require('@twin.org/nft-service');
+var rightsManagementDapService = require('@twin.org/rights-management-dap-service');
 var rightsManagementRestClient = require('@twin.org/rights-management-rest-client');
-var rightsManagementService = require('@twin.org/rights-management-service');
 var rightsManagementPapService = require('@twin.org/rights-management-pap-service');
+var engineCore = require('@twin.org/engine-core');
+var rightsManagementPdpService = require('@twin.org/rights-management-pdp-service');
+var rightsManagementPepService = require('@twin.org/rights-management-pep-service');
+var rightsManagementPipService = require('@twin.org/rights-management-pip-service');
+var rightsManagementPmpService = require('@twin.org/rights-management-pmp-service');
+var rightsManagementPnpService = require('@twin.org/rights-management-pnp-service');
+var rightsManagementPxpService = require('@twin.org/rights-management-pxp-service');
+var synchronisedStorageRestClient = require('@twin.org/synchronised-storage-rest-client');
+var synchronisedStorageService = require('@twin.org/synchronised-storage-service');
 var backgroundTaskScheduler = require('@twin.org/background-task-scheduler');
 var telemetryConnectorEntityStorage = require('@twin.org/telemetry-connector-entity-storage');
 var telemetryModels = require('@twin.org/telemetry-models');
@@ -125,78 +140,50 @@ const AttestationConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseAttestationConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Attestation Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseAttestationConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === AttestationConnectorType.Nft) {
-        connector = new attestationConnectorNft.NftAttestationConnector({
-            identityConnectorType: context.defaultTypes.identityConnector,
-            nftConnectorType: context.defaultTypes.nftConnector,
+    if (instanceConfig.type === AttestationConnectorType.Nft) {
+        component = new attestationConnectorNft.NftAttestationConnector({
+            identityConnectorType: engineCore.getRegisteredInstanceType("identityConnector"),
+            nftConnectorType: engineCore.getRegisteredInstanceType("nftConnector"),
             ...instanceConfig.options
         });
         instanceType = attestationConnectorNft.NftAttestationConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "attestationConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component: connector
-    });
-    attestationModels.AttestationConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: attestationModels.AttestationConnectorFactory
+    };
 }
 /**
  * Initialise the attestation component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseAttestationComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Attestation Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseAttestationComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === AttestationComponentType.Service) {
+    if (instanceConfig.type === AttestationComponentType.Service) {
         component = new attestationService.AttestationService({
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("AttestationService");
+        instanceType = "attestation-service";
     }
-    else if (type === AttestationComponentType.RestClient) {
+    else if (instanceConfig.type === AttestationComponentType.RestClient) {
         component = new attestationRestClient.AttestationClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("AttestationClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "attestationComponent"
-        });
+        instanceType = "attestation-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -258,7 +245,11 @@ const EntityStorageConnectorType = {
     /**
      * Postgre SQL.
      */
-    PostgreSql: "postgresql"
+    PostgreSql: "postgresql",
+    /**
+     * Synchronised.
+     */
+    Synchronised: "synchronised"
 };
 
 // Copyright 2024 IOTA Stiftung.
@@ -269,7 +260,8 @@ const EntityStorageConnectorType = {
  * @param context The context for the engine.
  * @param typeCustom Override the type of connector to use instead of default configuration.
  * @param schema The schema for the entity storage.
- * @throws GeneralError if the connector type is unknown.
+ * @returns The name of the instance type that was created.
+ * @throws GeneralError when the configuration is invalid.
  */
 function initialiseEntityStorageConnector(engineCore, context, typeCustom, schema) {
     const instanceName = core.StringHelper.kebabCase(schema);
@@ -389,6 +381,23 @@ function initialiseEntityStorageConnector(engineCore, context, typeCustom, schem
                 }
             });
         }
+        else if (type === EntityStorageConnectorType.Synchronised) {
+            // Create the entity storage that is wrapped by the synchronised connector
+            // by removing the custom type it will default to the standard storage
+            // mechanism for entity storage
+            const wrappedInstanceName = initialiseEntityStorageConnector(engineCore, context, undefined, schema);
+            // Use the wrapped instance name as the entity storage connector type
+            // for the synchronised connector
+            entityStorageConnector = new entityStorageConnectorSynchronised.SynchronisedEntityStorageConnector({
+                entitySchema: schema,
+                ...entityStorageConfig.options,
+                entityStorageConnectorType: wrappedInstanceName,
+                eventBusComponentType: engineCore.getRegisteredInstanceType("eventBusComponent"),
+                config: {
+                    ...entityStorageConfig.options.config
+                }
+            });
+        }
         else {
             throw new core.GeneralError("engineCore", "connectorUnknownType", {
                 type,
@@ -401,24 +410,19 @@ function initialiseEntityStorageConnector(engineCore, context, typeCustom, schem
         });
         entityStorageModels.EntityStorageConnectorFactory.register(instanceName, () => entityStorageConnector);
     }
+    return instanceName;
 }
 /**
  * Initialise the entity storage connector.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseEntityStorageComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Entity Storage Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseEntityStorageComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === EntityStorageComponentType.Service) {
+    if (instanceConfig.type === EntityStorageComponentType.Service) {
         const kebabName = core.StringHelper.kebabCase(instanceConfig.options.entityStorageType);
         // See if there is a custom entity storage for this type, otherwise just use the default one.
         const hasCustom = context.config.types.entityStorageConnector?.some(c => c.type === kebabName || c.overrideInstanceType === kebabName);
@@ -431,27 +435,19 @@ function initialiseEntityStorageComponent(engineCore, context, instanceConfig, o
         });
         instanceType = core.StringHelper.kebabCase(instanceConfig.options.entityStorageType);
     }
-    else if (type === EntityStorageComponentType.RestClient) {
+    else if (instanceConfig.type === EntityStorageComponentType.RestClient) {
         const kebabName = core.StringHelper.kebabCase(instanceConfig.options.entityStorageType);
         component = new entityStorageRestClient.EntityStorageClient({
             pathPrefix: kebabName,
             ...instanceConfig.options
         });
-        instanceType = `${core.StringHelper.kebabCase("EntityStorageClient")}-${kebabName}`;
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            serviceType: "entityStorageComponent"
-        });
+        instanceType = `${"entity-storage-client"}-${kebabName}`;
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -476,45 +472,31 @@ const AuditableItemGraphComponentType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseAuditableItemGraphComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Auditable Item Graph Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseAuditableItemGraphComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === AuditableItemGraphComponentType.Service) {
+    if (instanceConfig.type === AuditableItemGraphComponentType.Service) {
         auditableItemGraphService.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.vertexEntityStorageType, "AuditableItemGraphVertex");
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.changesetEntityStorageType, "AuditableItemGraphChangeset");
         component = new auditableItemGraphService.AuditableItemGraphService({
-            immutableProofComponentType: context.defaultTypes.immutableProofComponent,
-            eventBusComponentType: context.defaultTypes.eventBusComponent,
+            immutableProofComponentType: engineCore.getRegisteredInstanceType("immutableProofComponent"),
+            eventBusComponentType: engineCore.getRegisteredInstanceTypeOptional("eventBusComponent"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("AuditableItemGraphService");
+        instanceType = "auditable-item-graph-service";
     }
-    else if (type === AuditableItemGraphComponentType.RestClient) {
+    else if (instanceConfig.type === AuditableItemGraphComponentType.RestClient) {
         component = new auditableItemGraphRestClient.AuditableItemGraphClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("AuditableItemGraphClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "auditableItemGraphComponent"
-        });
+        instanceType = "auditable-item-graph-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -539,45 +521,71 @@ const AuditableItemStreamComponentType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseAuditableItemStreamComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Auditable Item Stream Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseAuditableItemStreamComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === AuditableItemStreamComponentType.Service) {
+    if (instanceConfig.type === AuditableItemStreamComponentType.Service) {
         auditableItemStreamService.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.streamEntityStorageType, "AuditableItemStream");
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.streamEntryEntityStorageType, "AuditableItemStreamEntry");
         component = new auditableItemStreamService.AuditableItemStreamService({
-            immutableProofComponentType: context.defaultTypes.immutableProofComponent,
-            eventBusComponentType: context.defaultTypes.eventBusComponent,
+            immutableProofComponentType: engineCore.getRegisteredInstanceType("immutableProofComponent"),
+            eventBusComponentType: engineCore.getRegisteredInstanceTypeOptional("eventBusComponent"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("AuditableItemStreamService");
+        instanceType = "auditable-item-stream-service";
     }
-    else if (type === AuditableItemStreamComponentType.RestClient) {
+    else if (instanceConfig.type === AuditableItemStreamComponentType.RestClient) {
         component = new auditableItemStreamRestClient.AuditableItemStreamClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("AuditableItemStreamClient");
+        instanceType = "auditable-item-stream-client";
     }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "auditableItemStreamComponent"
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Authentication generator component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const AuthenticationGeneratorComponentType = {
+    /**
+     * Verifiable Credential.
+     */
+    VerifiableCredential: "verifiable-credential"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the authentication generator component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseAuthenticationGeneratorComponent(engineCore, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === AuthenticationGeneratorComponentType.VerifiableCredential) {
+        component = new identityAuthentication.VerifiableCredentialAuthenticationGenerator({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
+            identityConnectorType: engineCore.getRegisteredInstanceType("identityConnector"),
+            ...instanceConfig.options
         });
+        instanceType = "verifiable-credential-authentication-generator";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: apiModels.AuthenticationGeneratorFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -600,36 +608,25 @@ const BackgroundTaskConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseBackgroundTaskConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Background Task Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseBackgroundTaskConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === BackgroundTaskConnectorType.EntityStorage) {
+    if (instanceConfig.type === BackgroundTaskConnectorType.EntityStorage) {
         backgroundTaskConnectorEntityStorage.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.backgroundTaskEntityStorageType, "BackgroundTask");
-        connector = new backgroundTaskConnectorEntityStorage.EntityStorageBackgroundTaskConnector({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+        component = new backgroundTaskConnectorEntityStorage.EntityStorageBackgroundTaskConnector({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
         instanceType = backgroundTaskConnectorEntityStorage.EntityStorageBackgroundTaskConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "backgroundTaskConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component: connector });
-    backgroundTaskModels.BackgroundTaskConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: backgroundTaskModels.BackgroundTaskConnectorFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -689,23 +686,17 @@ const BlobStorageConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseBlobStorageConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Blob Storage Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseBlobStorageConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === BlobStorageConnectorType.Ipfs) {
-        connector = new blobStorageConnectorIpfs.IpfsBlobStorageConnector(instanceConfig.options);
+    if (instanceConfig.type === BlobStorageConnectorType.Ipfs) {
+        component = new blobStorageConnectorIpfs.IpfsBlobStorageConnector(instanceConfig.options);
         instanceType = blobStorageConnectorIpfs.IpfsBlobStorageConnector.NAMESPACE;
     }
-    else if (type === BlobStorageConnectorType.File) {
-        connector = new blobStorageConnectorFile.FileBlobStorageConnector({
+    else if (instanceConfig.type === BlobStorageConnectorType.File) {
+        component = new blobStorageConnectorFile.FileBlobStorageConnector({
             ...instanceConfig.options,
             config: {
                 ...instanceConfig.options.config,
@@ -716,12 +707,12 @@ function initialiseBlobStorageConnector(engineCore, context, instanceConfig, ove
         });
         instanceType = blobStorageConnectorFile.FileBlobStorageConnector.NAMESPACE;
     }
-    else if (type === BlobStorageConnectorType.Memory) {
-        connector = new blobStorageConnectorMemory.MemoryBlobStorageConnector();
+    else if (instanceConfig.type === BlobStorageConnectorType.Memory) {
+        component = new blobStorageConnectorMemory.MemoryBlobStorageConnector();
         instanceType = blobStorageConnectorMemory.MemoryBlobStorageConnector.NAMESPACE;
     }
-    else if (type === BlobStorageConnectorType.AwsS3) {
-        connector = new blobStorageConnectorAwsS3.S3BlobStorageConnector({
+    else if (instanceConfig.type === BlobStorageConnectorType.AwsS3) {
+        component = new blobStorageConnectorAwsS3.S3BlobStorageConnector({
             ...instanceConfig.options,
             config: {
                 ...instanceConfig.options.config,
@@ -730,8 +721,8 @@ function initialiseBlobStorageConnector(engineCore, context, instanceConfig, ove
         });
         instanceType = blobStorageConnectorAwsS3.S3BlobStorageConnector.NAMESPACE;
     }
-    else if (type === BlobStorageConnectorType.GcpStorage) {
-        connector = new blobStorageConnectorGcp.GcpBlobStorageConnector({
+    else if (instanceConfig.type === BlobStorageConnectorType.GcpStorage) {
+        component = new blobStorageConnectorGcp.GcpBlobStorageConnector({
             ...instanceConfig.options,
             config: {
                 ...instanceConfig.options.config,
@@ -740,8 +731,8 @@ function initialiseBlobStorageConnector(engineCore, context, instanceConfig, ove
         });
         instanceType = blobStorageConnectorGcp.GcpBlobStorageConnector.NAMESPACE;
     }
-    else if (type === BlobStorageConnectorType.AzureStorage) {
-        connector = new blobStorageConnectorAzure.AzureBlobStorageConnector({
+    else if (instanceConfig.type === BlobStorageConnectorType.AzureStorage) {
+        component = new blobStorageConnectorAzure.AzureBlobStorageConnector({
             ...instanceConfig.options,
             config: {
                 ...instanceConfig.options.config,
@@ -750,62 +741,40 @@ function initialiseBlobStorageConnector(engineCore, context, instanceConfig, ove
         });
         instanceType = blobStorageConnectorAzure.AzureBlobStorageConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "blobStorageConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component: connector
-    });
-    blobStorageModels.BlobStorageConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: blobStorageModels.BlobStorageConnectorFactory
+    };
 }
 /**
  * Initialise the blob storage component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseBlobStorageComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Blob Storage Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseBlobStorageComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === BlobStorageComponentType.Service) {
+    if (instanceConfig.type === BlobStorageComponentType.Service) {
         blobStorageService.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.entryEntityStorageType, "BlobStorageEntry");
         component = new blobStorageService.BlobStorageService({
-            vaultConnectorType: context.defaultTypes.vaultConnector,
+            vaultConnectorType: engineCore.getRegisteredInstanceType("vaultConnector"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("BlobStorageService");
+        instanceType = "blob-storage-service";
     }
-    else if (type === BlobStorageComponentType.RestClient) {
+    else if (instanceConfig.type === BlobStorageComponentType.RestClient) {
         component = new blobStorageRestClient.BlobStorageClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("BlobStorageClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "blobStorageComponent"
-        });
+        instanceType = "blob-storage-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -862,114 +831,135 @@ const DataProcessingComponentType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseDataConverterConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Data Converter Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseDataConverterConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === DataConverterConnectorType.Json) {
-        connector = new dataProcessingConverters.JsonConverterConnector();
+    if (instanceConfig.type === DataConverterConnectorType.Json) {
+        component = new dataProcessingConverters.JsonConverterConnector();
         instanceType = dataProcessingConverters.JsonConverterConnector.NAMESPACE;
     }
-    else if (type === DataConverterConnectorType.Xml) {
-        connector = new dataProcessingConverters.XmlConverterConnector();
+    else if (instanceConfig.type === DataConverterConnectorType.Xml) {
+        component = new dataProcessingConverters.XmlConverterConnector();
         instanceType = dataProcessingConverters.XmlConverterConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "dataConverterConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component: connector
-    });
-    dataProcessingModels.DataConverterConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: dataProcessingModels.DataConverterConnectorFactory
+    };
 }
 /**
  * Initialise the data extractor connector.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseDataExtractorConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Data Extractor Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseDataExtractorConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === DataExtractorConnectorType.JsonPath) {
-        connector = new dataProcessingExtractors.JsonPathExtractorConnector();
+    if (instanceConfig.type === DataExtractorConnectorType.JsonPath) {
+        component = new dataProcessingExtractors.JsonPathExtractorConnector();
         instanceType = dataProcessingExtractors.JsonPathExtractorConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "dataExtractorConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component: connector
-    });
-    dataProcessingModels.DataExtractorConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: dataProcessingModels.DataExtractorConnectorFactory
+    };
 }
 /**
  * Initialise the data processing component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseDataProcessingComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Data Processing Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseDataProcessingComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === DataProcessingComponentType.Service) {
+    if (instanceConfig.type === DataProcessingComponentType.Service) {
         dataProcessingService.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.extractionRuleGroupStorageConnectorType, "ExtractionRuleGroup");
         component = new dataProcessingService.DataProcessingService({
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("DataProcessingService");
+        instanceType = "data-processing-service";
     }
-    else if (type === DataProcessingComponentType.RestClient) {
+    else if (instanceConfig.type === DataProcessingComponentType.RestClient) {
         component = new dataProcessingRestClient.DataProcessingClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("DataProcessingClient");
+        instanceType = "data-processing-client";
+    }
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Data space connector component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const DataSpaceConnectorComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service",
+    /**
+     * REST client.
+     */
+    RestClient: "rest-client",
+    /**
+     * Socket client.
+     */
+    SocketClient: "socket-client"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the data space connector component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseDataSpaceConnectorComponent(engineCore, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === DataSpaceConnectorComponentType.Service) {
+        dataSpaceConnectorService.initSchema();
+        initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.activityLogEntityStorageType, "ActivityLogDetails");
+        initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.activityTaskEntityStorageType, "ActivityTask");
+        component = new dataSpaceConnectorService.DataSpaceConnectorService({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
+            backgroundTaskConnectorType: engineCore.getRegisteredInstanceType("backgroundTaskConnector"),
+            taskSchedulerComponentType: engineCore.getRegisteredInstanceType("taskSchedulerComponent"),
+            ...instanceConfig.options
+        });
+        instanceType = "data-space-connector-service";
+    }
+    else if (instanceConfig.type === DataSpaceConnectorComponentType.RestClient) {
+        component = new dataSpaceConnectorRestClient.DataSpaceConnectorClient(instanceConfig.options);
+        instanceType = "data-space-connector-client";
     }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "dataProcessingComponent"
+    else if (instanceConfig.type === DataSpaceConnectorComponentType.SocketClient) {
+        component = new dataSpaceConnectorSocketClient.DataSpaceConnectorSocketClient({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
+            ...instanceConfig.options
         });
+        instanceType = "data-space-connector-socket-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -996,44 +986,30 @@ const DocumentManagementComponentType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseDocumentManagementComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Document Management Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseDocumentManagementComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === DocumentManagementComponentType.Service) {
+    if (instanceConfig.type === DocumentManagementComponentType.Service) {
         component = new documentManagementService.DocumentManagementService({
-            auditableItemGraphComponentType: context.defaultTypes.auditableItemGraphComponent,
-            blobStorageComponentType: context.defaultTypes.blobStorageComponent,
-            attestationComponentType: context.defaultTypes.attestationComponent,
-            dataProcessingComponentType: context.defaultTypes.dataProcessingComponent,
+            auditableItemGraphComponentType: engineCore.getRegisteredInstanceType("auditableItemGraphComponent"),
+            blobStorageComponentType: engineCore.getRegisteredInstanceType("blobStorageComponent"),
+            attestationComponentType: engineCore.getRegisteredInstanceType("attestationComponent"),
+            dataProcessingComponentType: engineCore.getRegisteredInstanceType("dataProcessingComponent"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("DocumentManagementService");
+        instanceType = "document-management-service";
     }
-    else if (type === DocumentManagementComponentType.RestClient) {
+    else if (instanceConfig.type === DocumentManagementComponentType.RestClient) {
         component = new documentManagementRestClient.DocumentManagementClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("DocumentManagementClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "documentManagementComponent"
-        });
+        instanceType = "document-management-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -1073,77 +1049,68 @@ const EventBusConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseEventBusConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Event Bus Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseEventBusConnector(engineCore, context, instanceConfig) {
     let connector;
     let instanceType;
-    if (type === EventBusConnectorType.Local) {
+    if (instanceConfig.type === EventBusConnectorType.Local) {
         connector = new eventBusConnectorLocal.LocalEventBusConnector({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
         instanceType = eventBusConnectorLocal.LocalEventBusConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "eventBusConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component: connector });
-    eventBusModels.EventBusConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        instanceType,
+        factory: eventBusModels.EventBusConnectorFactory,
+        component: connector
+    };
 }
 /**
  * Initialise the event bus component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseEventBusComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Event Bus Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseEventBusComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === EventBusComponentType.Service) {
+    if (instanceConfig.type === EventBusComponentType.Service) {
         component = new eventBusService.EventBusService({
-            eventBusConnectorType: context.defaultTypes.eventBusConnector,
+            eventBusConnectorType: engineCore.getRegisteredInstanceType("eventBusConnector"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("EventBusService");
+        instanceType = "event-bus-service";
     }
-    else if (type === EventBusComponentType.SocketClient) {
+    else if (instanceConfig.type === EventBusComponentType.SocketClient) {
         component = new eventBusSocketClient.EventBusSocketClient({
-            loggingComponentType: context.defaultTypes.loggingConnector,
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("EventBusSocketClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "EventBusComponent"
-        });
+        instanceType = "event-bus-socket-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        instanceType,
+        factory: core.ComponentFactory,
+        component
+    };
 }
 
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * DLT config types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const DltConfigType = {
+    /**
+     * IOTA.
+     */
+    Iota: "iota"
+};
+
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
@@ -1163,25 +1130,48 @@ const FaucetConnectorType = {
 
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
+/**
+ * Helper methods for engine config types.
+ */
+class EngineTypeHelper {
+    /**
+     * Runtime name for the class.
+     */
+    static CLASS_NAME = "EngineTypeHelper";
+    /**
+     * Get the config for the specified component and type.
+     * @param engineConfig The engine configuration.
+     * @param component The component name.
+     * @param type The type name.
+     * @returns The config for the specified component and type or undefined if it does not exist.
+     */
+    static getConfigOfType(engineConfig, component, type) {
+        if (core.Is.empty(engineConfig.types[component])) {
+            return undefined;
+        }
+        // First look for any of the specific type marked as default
+        let foundConfig = engineConfig.types[component]?.find(config => config.type === type && config.isDefault);
+        // If we found a default config then return that otherwise return the first matching type
+        if (core.Is.empty(foundConfig)) {
+            foundConfig = engineConfig.types[component]?.find(config => config.type === type);
+        }
+        return foundConfig;
+    }
+}
+
 /**
  * Initialise a faucet connector.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseFaucetConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Faucet Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseFaucetConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === FaucetConnectorType.Iota) {
-        const dltConfig = context.config.types.dltConfig?.find(dlt => dlt.type === context.defaultTypes.dltConfig);
-        connector = new walletConnectorIota.IotaFaucetConnector({
+    if (instanceConfig.type === FaucetConnectorType.Iota) {
+        const dltConfig = EngineTypeHelper.getConfigOfType(engineCore.getConfig(), "dltConfig", DltConfigType.Iota);
+        component = new walletConnectorIota.IotaFaucetConnector({
             ...instanceConfig.options,
             config: {
                 ...dltConfig?.options?.config,
@@ -1190,23 +1180,17 @@ function initialiseFaucetConnector(engineCore, context, instanceConfig, override
         });
         instanceType = walletConnectorIota.IotaFaucetConnector.NAMESPACE;
     }
-    else if (type === FaucetConnectorType.EntityStorage) {
-        connector = new walletConnectorEntityStorage.EntityStorageFaucetConnector(instanceConfig.options);
+    else if (instanceConfig.type === FaucetConnectorType.EntityStorage) {
+        walletConnectorEntityStorage.initSchema();
+        initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.walletAddressEntityStorageType, "WalletAddress");
+        component = new walletConnectorEntityStorage.EntityStorageFaucetConnector(instanceConfig.options);
         instanceType = walletConnectorEntityStorage.EntityStorageFaucetConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "faucetConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component: connector
-    });
-    walletModels.FaucetConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: walletModels.FaucetConnectorFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -1233,47 +1217,33 @@ const FederatedCatalogueComponentType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseFederatedCatalogueComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Federated Catalogue Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseFederatedCatalogueComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === FederatedCatalogueComponentType.Service) {
+    if (instanceConfig.type === FederatedCatalogueComponentType.Service) {
         federatedCatalogueService.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.dataResourceEntityStorageType, "DataResourceEntry");
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.participantEntityStorageType, "ParticipantEntry");
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.serviceOfferingEntityStorageType, "ServiceOfferingEntry");
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.dataSpaceConnectorStorageType, "DataSpaceConnectorEntry");
         component = new federatedCatalogueService.FederatedCatalogueService({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
-            identityResolverComponentType: context.defaultTypes.identityResolverComponent,
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
+            identityResolverComponentType: engineCore.getRegisteredInstanceType("identityResolverComponent"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("FederatedCatalogueService");
+        instanceType = "federated-catalogue-service";
     }
-    else if (type === FederatedCatalogueComponentType.RestClient) {
+    else if (instanceConfig.type === FederatedCatalogueComponentType.RestClient) {
         component = new federatedCatalogueRestClient.FederatedCatalogueClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("FederatedCatalogueClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "FederatedCatalogueComponent"
-        });
+        instanceType = "federated-catalogue-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -1317,21 +1287,15 @@ const IdentityConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseIdentityConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Identity Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseIdentityConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === IdentityConnectorType.Iota) {
-        const dltConfig = context.config.types.dltConfig?.find(dlt => dlt.type === context.defaultTypes.dltConfig);
-        connector = new identityConnectorIota.IotaIdentityConnector({
-            vaultConnectorType: context.defaultTypes.vaultConnector,
+    if (instanceConfig.type === IdentityConnectorType.Iota) {
+        const dltConfig = EngineTypeHelper.getConfigOfType(engineCore.getConfig(), "dltConfig", DltConfigType.Iota);
+        component = new identityConnectorIota.IotaIdentityConnector({
+            vaultConnectorType: engineCore.getRegisteredInstanceType("vaultConnector"),
             ...instanceConfig.options,
             config: {
                 ...dltConfig?.options?.config,
@@ -1340,60 +1304,44 @@ function initialiseIdentityConnector(engineCore, context, instanceConfig, overri
         });
         instanceType = identityConnectorIota.IotaIdentityConnector.NAMESPACE;
     }
-    else if (type === IdentityConnectorType.EntityStorage) {
+    else if (instanceConfig.type === IdentityConnectorType.EntityStorage) {
         identityConnectorEntityStorage.initSchema({ includeProfile: false });
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.didDocumentEntityStorageType, "IdentityDocument");
-        connector = new identityConnectorEntityStorage.EntityStorageIdentityConnector({
-            vaultConnectorType: context.defaultTypes.vaultConnector,
+        component = new identityConnectorEntityStorage.EntityStorageIdentityConnector({
+            vaultConnectorType: engineCore.getRegisteredInstanceType("vaultConnector"),
             ...instanceConfig.options
         });
         instanceType = identityConnectorEntityStorage.EntityStorageIdentityConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "identityConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component: connector });
-    identityModels.IdentityConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: identityModels.IdentityConnectorFactory
+    };
 }
 /**
  * Initialise the identity component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseIdentityComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Identity Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseIdentityComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === IdentityComponentType.Service) {
+    if (instanceConfig.type === IdentityComponentType.Service) {
         component = new identityService.IdentityService(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("IdentityService");
+        instanceType = "identity-service";
     }
-    else if (type === IdentityComponentType.RestClient) {
+    else if (instanceConfig.type === IdentityComponentType.RestClient) {
         component = new identityRestClient.IdentityClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("IdentityClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "identityComponent"
-        });
+        instanceType = "identity-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -1433,77 +1381,49 @@ const IdentityProfileConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseIdentityProfileConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Identity Profile Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseIdentityProfileConnector(engineCore, context, instanceConfig) {
     let connector;
     let instanceType;
-    if (type === IdentityProfileConnectorType.EntityStorage) {
+    if (instanceConfig.type === IdentityProfileConnectorType.EntityStorage) {
         identityConnectorEntityStorage.initSchema({ includeDocument: false });
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.profileEntityStorageType, "IdentityProfile");
         connector = new identityConnectorEntityStorage.EntityStorageIdentityProfileConnector(instanceConfig.options);
         instanceType = identityConnectorEntityStorage.EntityStorageIdentityProfileConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            serviceType: "identityProfile"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component: connector
-    });
-    identityModels.IdentityProfileConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component: connector,
+        instanceType,
+        factory: identityModels.IdentityProfileConnectorFactory
+    };
 }
 /**
  * Initialise the identity profile component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseIdentityProfileComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Identity Profile Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseIdentityProfileComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === IdentityProfileComponentType.Service) {
+    if (instanceConfig.type === IdentityProfileComponentType.Service) {
         component = new identityService.IdentityProfileService({
-            profileEntityConnectorType: context.defaultTypes.identityProfileConnector,
+            profileEntityConnectorType: engineCore.getRegisteredInstanceType("identityProfileConnector"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("IdentityProfileService");
+        instanceType = "identity-profile-service";
     }
-    else if (type === IdentityProfileComponentType.RestClient) {
+    else if (instanceConfig.type === IdentityProfileComponentType.RestClient) {
         component = new identityRestClient.IdentityProfileClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("IdentityProfileClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "identityProfileComponent"
-        });
+        instanceType = "identity-profile-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -1551,20 +1471,14 @@ const IdentityResolverConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseIdentityResolverConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Identity Resolver Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseIdentityResolverConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === IdentityResolverConnectorType.Iota) {
-        const dltConfig = context.config.types.dltConfig?.find(dlt => dlt.type === context.defaultTypes.dltConfig);
-        connector = new identityConnectorIota.IotaIdentityResolverConnector({
+    if (instanceConfig.type === IdentityResolverConnectorType.Iota) {
+        const dltConfig = EngineTypeHelper.getConfigOfType(engineCore.getConfig(), "dltConfig", DltConfigType.Iota);
+        component = new identityConnectorIota.IotaIdentityResolverConnector({
             ...instanceConfig.options,
             config: {
                 ...dltConfig?.options?.config,
@@ -1573,71 +1487,56 @@ function initialiseIdentityResolverConnector(engineCore, context, instanceConfig
         });
         instanceType = identityConnectorIota.IotaIdentityResolverConnector.NAMESPACE;
     }
-    else if (type === IdentityResolverConnectorType.EntityStorage) {
+    else if (instanceConfig.type === IdentityResolverConnectorType.EntityStorage) {
         identityConnectorEntityStorage.initSchema({ includeProfile: false });
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.didDocumentEntityStorageType, "IdentityDocument");
-        connector = new identityConnectorEntityStorage.EntityStorageIdentityResolverConnector({
-            vaultConnectorType: context.defaultTypes.vaultConnector,
+        component = new identityConnectorEntityStorage.EntityStorageIdentityResolverConnector({
+            vaultConnectorType: engineCore.getRegisteredInstanceType("vaultConnector"),
             ...instanceConfig.options
         });
         instanceType = identityConnectorEntityStorage.EntityStorageIdentityResolverConnector.NAMESPACE;
     }
-    else if (type === IdentityResolverConnectorType.Universal) {
-        connector = new identityConnectorUniversal.UniversalResolverConnector({
+    else if (instanceConfig.type === IdentityResolverConnectorType.Universal) {
+        component = new identityConnectorUniversal.UniversalResolverConnector({
             ...instanceConfig.options
         });
         instanceType = identityConnectorUniversal.UniversalResolverConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "identityResolverConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component: connector });
-    identityModels.IdentityResolverConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: identityModels.IdentityResolverConnectorFactory
+    };
 }
 /**
  * Initialise the identity resolver component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseIdentityResolverComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Identity Resolver Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseIdentityResolverComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === IdentityResolverComponentType.Service) {
+    if (instanceConfig.type === IdentityResolverComponentType.Service) {
+        const defaultIdentityResolverType = engineCore.getRegisteredInstanceType("identityResolverConnector");
         component = new identityService.IdentityResolverService({
-            fallbackResolverConnectorType: context.defaultTypes.identityResolverConnector !== IdentityResolverConnectorType.Universal
+            fallbackResolverConnectorType: defaultIdentityResolverType !== IdentityResolverConnectorType.Universal
                 ? IdentityResolverConnectorType.Universal
                 : undefined,
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("IdentityResolverService");
+        instanceType = "identity-resolver-service";
     }
-    else if (type === IdentityResolverComponentType.RestClient) {
+    else if (instanceConfig.type === IdentityResolverComponentType.RestClient) {
         component = new identityRestClient.IdentityResolverClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("IdentityResolverClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "identityResolverComponent"
-        });
+        instanceType = "identity-resolver-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -1664,46 +1563,32 @@ const ImmutableProofComponentType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseImmutableProofComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Immutable Proof Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseImmutableProofComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === ImmutableProofComponentType.Service) {
+    if (instanceConfig.type === ImmutableProofComponentType.Service) {
         immutableProofService.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.immutableProofEntityStorageType, "ImmutableProof");
         component = new immutableProofService.ImmutableProofService({
-            verifiableStorageType: context.defaultTypes.verifiableStorageConnector,
-            identityConnectorType: context.defaultTypes.identityConnector,
-            backgroundTaskConnectorType: context.defaultTypes.backgroundTaskConnector,
-            eventBusComponentType: context.defaultTypes.eventBusComponent,
+            verifiableStorageType: engineCore.getRegisteredInstanceType("verifiableStorageConnector"),
+            identityConnectorType: engineCore.getRegisteredInstanceType("identityConnector"),
+            backgroundTaskConnectorType: engineCore.getRegisteredInstanceType("backgroundTaskConnector"),
+            eventBusComponentType: engineCore.getRegisteredInstanceTypeOptional("eventBusComponent"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("ImmutableProofService");
+        instanceType = "immutable-proof-service";
     }
-    else if (type === ImmutableProofComponentType.RestClient) {
+    else if (instanceConfig.type === ImmutableProofComponentType.RestClient) {
         component = new immutableProofRestClient.ImmutableProofClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("ImmutableProofClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "immutableProofComponent"
-        });
+        instanceType = "immutable-proof-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -1751,81 +1636,72 @@ const LoggingConnectorType = {
  * @param engineCore The engine core.
  * @param context The engine core context.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseLoggingConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Logging Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseLoggingConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === LoggingConnectorType.Console) {
-        connector = new loggingConnectorConsole.ConsoleLoggingConnector(instanceConfig.options);
+    if (instanceConfig.type === LoggingConnectorType.Console) {
+        component = new loggingConnectorConsole.ConsoleLoggingConnector(instanceConfig.options);
         instanceType = loggingConnectorConsole.ConsoleLoggingConnector.NAMESPACE;
     }
-    else if (type === LoggingConnectorType.EntityStorage) {
+    else if (instanceConfig.type === LoggingConnectorType.EntityStorage) {
         loggingConnectorEntityStorage.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.logEntryStorageConnectorType, "LogEntry");
-        connector = new loggingConnectorEntityStorage.EntityStorageLoggingConnector(instanceConfig.options);
+        component = new loggingConnectorEntityStorage.EntityStorageLoggingConnector(instanceConfig.options);
         instanceType = loggingConnectorEntityStorage.EntityStorageLoggingConnector.NAMESPACE;
     }
-    else if (type === LoggingConnectorType.Multi) {
-        connector = new loggingModels.MultiLoggingConnector(instanceConfig.options);
+    else if (instanceConfig.type === LoggingConnectorType.Multi) {
+        component = new loggingModels.MultiLoggingConnector(instanceConfig.options);
         instanceType = loggingModels.MultiLoggingConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "loggingConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component: connector });
-    loggingModels.LoggingConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: loggingModels.LoggingConnectorFactory
+    };
 }
 /**
  * Initialise the logging component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseLoggingComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Logging Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseLoggingComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === LoggingComponentType.Service) {
+    if (instanceConfig.type === LoggingComponentType.Service) {
         component = new loggingService.LoggingService({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+            loggingConnectorType: engineCore.getRegisteredInstanceType("loggingConnector"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("LoggingService");
+        instanceType = "logging-service";
     }
-    else if (type === LoggingComponentType.RestClient) {
+    else if (instanceConfig.type === LoggingComponentType.RestClient) {
         component = new loggingRestClient.LoggingClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("LoggingClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "loggingComponent"
-        });
+        instanceType = "logging-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Messaging admin component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const MessagingAdminComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service"
+};
+
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
@@ -1897,168 +1773,147 @@ const MessagingSmsConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseMessagingEmailConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Messaging Email Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseMessagingEmailConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === MessagingEmailConnectorType.EntityStorage) {
+    if (instanceConfig.type === MessagingEmailConnectorType.EntityStorage) {
         messagingConnectorEntityStorage.initSchema({ email: true, sms: false, pushNotification: false });
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.messagingEmailEntryStorageConnectorType, "EmailEntry");
-        connector = new messagingConnectorEntityStorage.EntityStorageMessagingEmailConnector({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+        component = new messagingConnectorEntityStorage.EntityStorageMessagingEmailConnector({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
         instanceType = messagingConnectorEntityStorage.EntityStorageMessagingEmailConnector.NAMESPACE;
     }
-    else if (type === MessagingEmailConnectorType.Aws) {
-        connector = new messagingConnectorAws.AwsMessagingEmailConnector({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+    else if (instanceConfig.type === MessagingEmailConnectorType.Aws) {
+        component = new messagingConnectorAws.AwsMessagingEmailConnector({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
         instanceType = messagingConnectorAws.AwsMessagingEmailConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "messagingEmailConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component: connector });
-    messagingModels.MessagingEmailConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: messagingModels.MessagingEmailConnectorFactory
+    };
 }
 /**
  * Initialise a messaging sms connector.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseMessagingSmsConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Messaging SMS Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseMessagingSmsConnector(engineCore, context, instanceConfig) {
     let connector;
     let instanceType;
-    if (type === MessagingSmsConnectorType.EntityStorage) {
+    if (instanceConfig.type === MessagingSmsConnectorType.EntityStorage) {
         messagingConnectorEntityStorage.initSchema({ email: false, sms: true, pushNotification: false });
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.messagingSmsEntryStorageConnectorType, "SmsEntry");
         connector = new messagingConnectorEntityStorage.EntityStorageMessagingSmsConnector({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
         instanceType = messagingConnectorEntityStorage.EntityStorageMessagingSmsConnector.NAMESPACE;
     }
-    else if (type === MessagingSmsConnectorType.Aws) {
+    else if (instanceConfig.type === MessagingSmsConnectorType.Aws) {
         connector = new messagingConnectorAws.AwsMessagingSmsConnector({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
         instanceType = messagingConnectorAws.AwsMessagingSmsConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "messagingSmsConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component: connector });
-    messagingModels.MessagingSmsConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        instanceType,
+        factory: messagingModels.MessagingSmsConnectorFactory,
+        component: connector
+    };
 }
 /**
  * Initialise a messaging push notification connector.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseMessagingPushNotificationConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Messaging Push Notification Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseMessagingPushNotificationConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === MessagingPushNotificationConnectorType.EntityStorage) {
+    if (instanceConfig.type === MessagingPushNotificationConnectorType.EntityStorage) {
         messagingConnectorEntityStorage.initSchema({ email: false, sms: false, pushNotification: true });
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.messagingDeviceEntryStorageConnectorType, "PushNotificationDeviceEntry");
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.messagingMessageEntryStorageConnectorType, "PushNotificationMessageEntry");
-        connector = new messagingConnectorEntityStorage.EntityStorageMessagingPushNotificationConnector({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+        component = new messagingConnectorEntityStorage.EntityStorageMessagingPushNotificationConnector({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
         instanceType = messagingConnectorEntityStorage.EntityStorageMessagingPushNotificationConnector.NAMESPACE;
     }
-    else if (type === MessagingPushNotificationConnectorType.Aws) {
-        connector = new messagingConnectorAws.AwsMessagingPushNotificationConnector({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+    else if (instanceConfig.type === MessagingPushNotificationConnectorType.Aws) {
+        component = new messagingConnectorAws.AwsMessagingPushNotificationConnector({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
         instanceType = messagingConnectorAws.AwsMessagingPushNotificationConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "messagingPushNotificationConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component: connector });
-    messagingModels.MessagingPushNotificationsConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: messagingModels.MessagingPushNotificationsConnectorFactory
+    };
 }
 /**
  * Initialise the messaging component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseMessagingComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Messaging Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseMessagingComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === MessagingComponentType.Service) {
-        messagingService.initSchema();
-        initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.templateEntryStorageConnectorType, "TemplateEntry");
+    if (instanceConfig.type === MessagingComponentType.Service) {
         component = new messagingService.MessagingService({
-            messagingEmailConnectorType: context.defaultTypes.messagingEmailConnector,
-            messagingSmsConnectorType: context.defaultTypes.messagingSmsConnector,
-            messagingPushNotificationConnectorType: context.defaultTypes.messagingNotificationConnector,
+            messagingEmailConnectorType: engineCore.getRegisteredInstanceTypeOptional("messagingEmailConnector"),
+            messagingSmsConnectorType: engineCore.getRegisteredInstanceTypeOptional("messagingSmsConnector"),
+            messagingPushNotificationConnectorType: engineCore.getRegisteredInstanceTypeOptional("messagingNotificationConnector"),
+            messagingAdminComponentType: engineCore.getRegisteredInstanceTypeOptional("messagingAdminComponent"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("MessagingService");
+        instanceType = "messaging-service";
     }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "messagingComponent"
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+/**
+ * Initialise the messaging admin component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseMessagingAdminComponent(engineCore, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === MessagingAdminComponentType.Service) {
+        messagingService.initSchema();
+        initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.templateEntryStorageConnectorType, "TemplateEntry");
+        component = new messagingService.MessagingAdminService({
+            ...instanceConfig.options
         });
+        instanceType = "messaging-admin-service";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -2102,91 +1957,69 @@ const NftConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseNftConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `NFT Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseNftConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === NftConnectorType.EntityStorage) {
+    if (instanceConfig.type === NftConnectorType.EntityStorage) {
         nftConnectorEntityStorage.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.nftEntityStorageType, "Nft");
-        connector = new nftConnectorEntityStorage.EntityStorageNftConnector(instanceConfig.options);
+        component = new nftConnectorEntityStorage.EntityStorageNftConnector(instanceConfig.options);
         instanceType = nftConnectorEntityStorage.EntityStorageNftConnector.NAMESPACE;
     }
-    else if (type === NftConnectorType.Iota) {
-        connector = new nftConnectorIota.IotaNftConnector({
-            vaultConnectorType: context.defaultTypes.vaultConnector,
-            walletConnectorType: context.defaultTypes.walletConnector,
-            ...instanceConfig.options
+    else if (instanceConfig.type === NftConnectorType.Iota) {
+        const dltConfig = EngineTypeHelper.getConfigOfType(engineCore.getConfig(), "dltConfig", DltConfigType.Iota);
+        component = new nftConnectorIota.IotaNftConnector({
+            vaultConnectorType: engineCore.getRegisteredInstanceType("vaultConnector"),
+            walletConnectorType: engineCore.getRegisteredInstanceType("walletConnector"),
+            loggingComponentType: engineCore.getRegisteredInstanceTypeOptional("loggingComponent"),
+            ...instanceConfig.options,
+            config: {
+                ...dltConfig?.options?.config,
+                ...instanceConfig.options.config
+            }
         });
         instanceType = nftConnectorIota.IotaNftConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "nftConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component: connector
-    });
-    nftModels.NftConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: nftModels.NftConnectorFactory
+    };
 }
 /**
  * Initialise the NFT component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseNftComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Nft Storage Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseNftComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === NftComponentType.Service) {
+    if (instanceConfig.type === NftComponentType.Service) {
         component = new nftService.NftService(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("NftService");
+        instanceType = "nft-service";
     }
-    else if (type === NftComponentType.RestClient) {
+    else if (instanceConfig.type === NftComponentType.RestClient) {
         component = new nftRestClient.NftClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("NftClient");
+        instanceType = "nft-client";
     }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "nftComponent"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
- * Rights management component types.
+ * Rights management DAP component types.
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const RightsManagementComponentType = {
+const RightsManagementDapComponentType = {
     /**
      * Service.
      */
@@ -2200,45 +2033,80 @@ const RightsManagementComponentType = {
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
- * Initialise the rights management component.
+ * Initialise the rights management DAP component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseRightsManagementComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Rights Management Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseRightsManagementDapComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === RightsManagementComponentType.Service) {
-        component = new rightsManagementService.RightsManagementService({
-            papComponentType: context.defaultTypes.rightsManagementPapComponent,
-            ...instanceConfig.options
+    if (instanceConfig.type === RightsManagementDapComponentType.Service) {
+        component = new rightsManagementDapService.DataAccessPointService({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
+            policyEnforcementPointComponentType: engineCore.getRegisteredInstanceType("rightsManagementPepComponent"),
+            ...instanceConfig.options,
+            config: {
+                ...instanceConfig.options?.config
+            }
         });
-        instanceType = core.StringHelper.kebabCase("RightsManagementService");
+        instanceType = "data-access-point-service";
     }
-    else if (type === RightsManagementComponentType.RestClient) {
-        component = new rightsManagementRestClient.RightsManagementClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("RightsManagementClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "RightsManagementComponent"
+    else if (instanceConfig.type === RightsManagementDapComponentType.RestClient) {
+        component = new rightsManagementRestClient.DataAccessPointClient({
+            ...instanceConfig.options,
+            authenticationGeneratorType: instanceConfig.options?.authenticationGeneratorType ??
+                engineCore.getRegisteredInstanceType("authenticationGeneratorComponent", [
+                    "verifiable-credential"
+                ])
+        });
+        instanceType = "data-access-point-client";
+    }
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Rights management DARP component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const RightsManagementDarpComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the rights management DARP component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseRightsManagementDarpComponent(engineCore, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === RightsManagementDarpComponentType.Service) {
+        component = new rightsManagementDapService.DataAccessRequestPointService({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
+            ...instanceConfig.options
         });
+        instanceType = "data-access-request-point-service";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -2251,7 +2119,11 @@ const RightsManagementPapComponentType = {
     /**
      * Service.
      */
-    Service: "service"
+    Service: "service",
+    /**
+     * REST client.
+     */
+    RestClient: "rest-client"
 };
 
 // Copyright 2024 IOTA Stiftung.
@@ -2261,36 +2133,479 @@ const RightsManagementPapComponentType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseRightsManagementPapComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Rights Management PAP Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseRightsManagementPapComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === RightsManagementPapComponentType.Service) {
+    if (instanceConfig.type === RightsManagementPapComponentType.Service) {
         rightsManagementPapService.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.odrlPolicyEntityStorageType, "OdrlPolicy");
-        component = new rightsManagementPapService.PolicyAdministrationPointService(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("PolicyAdministrationPointService");
+        component = new rightsManagementPapService.PolicyAdministrationPointService({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
+            ...instanceConfig.options
+        });
+        instanceType = "policy-administration-point-service";
+    }
+    else if (instanceConfig.type === RightsManagementPapComponentType.RestClient) {
+        component = new rightsManagementRestClient.PolicyAdministrationPointClient(instanceConfig.options);
+        instanceType = "policy-administration-point-client";
     }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "RightsManagementPapComponent"
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Rights management PDP component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const RightsManagementPdpComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the rights management PDP component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseRightsManagementPdpComponent(engineCore$1, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === RightsManagementPdpComponentType.Service) {
+        const arbiterModules = [];
+        if (core.Is.arrayValue(instanceConfig.options?.arbiterModulesConfig)) {
+            for (const moduleConfig of instanceConfig.options.arbiterModulesConfig) {
+                arbiterModules.push({
+                    arbiterId: moduleConfig.id,
+                    arbiter: await engineCore.EngineModuleHelper.loadComponent(engineCore$1, moduleConfig)
+                });
+            }
+        }
+        component = new rightsManagementPdpService.PolicyDecisionPointService({
+            loggingComponentType: engineCore$1.getRegisteredInstanceType("loggingComponent"),
+            policyInformationPointComponentType: engineCore$1.getRegisteredInstanceType("rightsManagementPipComponent"),
+            policyManagementPointComponentType: engineCore$1.getRegisteredInstanceType("rightsManagementPmpComponent"),
+            policyExecutionPointComponentType: engineCore$1.getRegisteredInstanceType("rightsManagementPxpComponent"),
+            ...instanceConfig.options,
+            config: {
+                ...instanceConfig.options?.config,
+                arbiters: instanceConfig.options?.config?.arbiters ?? arbiterModules
+            }
         });
+        instanceType = "policy-decision-point-service";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Rights management PEP component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const RightsManagementPepComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service",
+    /**
+     * REST client.
+     */
+    RestClient: "rest-client"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the rights management PEP component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseRightsManagementPepComponent(engineCore$1, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === RightsManagementPepComponentType.Service) {
+        const processorModules = [];
+        if (core.Is.arrayValue(instanceConfig.options?.processorModulesConfig)) {
+            for (const moduleConfig of instanceConfig.options.processorModulesConfig) {
+                processorModules.push({
+                    processorId: moduleConfig.id,
+                    processor: await engineCore.EngineModuleHelper.loadComponent(engineCore$1, moduleConfig)
+                });
+            }
+        }
+        component = new rightsManagementPepService.PolicyEnforcementPointService({
+            loggingComponentType: engineCore$1.getRegisteredInstanceType("loggingComponent"),
+            policyDecisionPointComponentType: engineCore$1.getRegisteredInstanceType("rightsManagementPdpComponent"),
+            ...instanceConfig.options,
+            config: {
+                ...instanceConfig.options?.config,
+                processors: instanceConfig.options?.config?.processors ?? processorModules
+            }
+        });
+        instanceType = "policy-enforcement-point-service";
+    }
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Rights management PIP component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const RightsManagementPipComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the rights management PIP component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseRightsManagementPipComponent(engineCore$1, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === RightsManagementPipComponentType.Service) {
+        const informationSourceModules = [];
+        if (core.Is.arrayValue(instanceConfig.options?.informationModulesConfig)) {
+            for (const moduleConfig of instanceConfig.options.informationModulesConfig) {
+                informationSourceModules.push({
+                    sourceId: moduleConfig.id,
+                    source: await engineCore.EngineModuleHelper.loadComponent(engineCore$1, moduleConfig)
+                });
+            }
+        }
+        component = new rightsManagementPipService.PolicyInformationPointService({
+            loggingComponentType: engineCore$1.getRegisteredInstanceType("loggingComponent"),
+            ...instanceConfig.options,
+            config: {
+                ...instanceConfig.options?.config,
+                sources: instanceConfig.options?.config?.sources ?? informationSourceModules
+            }
+        });
+        instanceType = "policy-information-point-service";
+    }
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Rights management PMP component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const RightsManagementPmpComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the rights management PMP component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseRightsManagementPmpComponent(engineCore, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === RightsManagementPmpComponentType.Service) {
+        component = new rightsManagementPmpService.PolicyManagementPointService({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
+            policyAdministrationPointComponentType: engineCore.getRegisteredInstanceType("rightsManagementPapComponent"),
+            ...instanceConfig.options
+        });
+        instanceType = "policy-management-point-service";
+    }
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Rights management PNAP component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const RightsManagementPnapComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service",
+    /**
+     * REST client.
+     */
+    RestClient: "rest-client"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the rights management PNAP component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseRightsManagementPnapComponent(engineCore, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === RightsManagementPnapComponentType.Service) {
+        rightsManagementPnpService.initSchema();
+        initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.policyNegotiationEntityStorageType, "PolicyNegotiation");
+        component = new rightsManagementPnpService.PolicyNegotiationAdminPointService({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
+            taskSchedulerComponentType: engineCore.getRegisteredInstanceType("taskSchedulerComponent"),
+            policyInformationPointComponentType: engineCore.getRegisteredInstanceType("rightsManagementPipComponent"),
+            ...instanceConfig.options
+        });
+        instanceType = "policy-negotiation-admin-point-service";
+    }
+    else if (instanceConfig.type === RightsManagementPnapComponentType.RestClient) {
+        component = new rightsManagementRestClient.PolicyNegotiationAdminPointClient(instanceConfig.options);
+        instanceType = "policy-negotiation-admin-point-client";
+    }
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Rights management PNP component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const RightsManagementPnpComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service",
+    /**
+     * REST client.
+     */
+    RestClient: "rest-client"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the rights management PNP component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseRightsManagementPnpComponent(engineCore$1, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === RightsManagementPnpComponentType.Service) {
+        const negotiatorModules = [];
+        if (core.Is.arrayValue(instanceConfig.options?.negotiatorModulesConfig)) {
+            for (const moduleConfig of instanceConfig.options.negotiatorModulesConfig) {
+                negotiatorModules.push({
+                    negotiatorId: moduleConfig.id,
+                    negotiator: await engineCore.EngineModuleHelper.loadComponent(engineCore$1, moduleConfig)
+                });
+            }
+        }
+        const requesterModules = [];
+        if (core.Is.arrayValue(instanceConfig.options?.requesterModulesConfig)) {
+            for (const moduleConfig of instanceConfig.options.requesterModulesConfig) {
+                requesterModules.push({
+                    requesterId: moduleConfig.id,
+                    requester: await engineCore.EngineModuleHelper.loadComponent(engineCore$1, moduleConfig)
+                });
+            }
+        }
+        component = new rightsManagementPnpService.PolicyNegotiationPointService({
+            loggingComponentType: engineCore$1.getRegisteredInstanceType("loggingComponent"),
+            policyNegotiationAdministrationPointComponentType: engineCore$1.getRegisteredInstanceType("rightsManagementPnapComponent"),
+            policyAdministrationPointComponentType: engineCore$1.getRegisteredInstanceType("rightsManagementPapComponent"),
+            policyInformationPointComponentType: engineCore$1.getRegisteredInstanceType("rightsManagementPipComponent"),
+            ...instanceConfig.options,
+            config: {
+                ...instanceConfig.options?.config,
+                negotiators: instanceConfig.options?.config?.negotiators ?? negotiatorModules,
+                requesters: instanceConfig.options?.config?.requesters ?? requesterModules
+            }
+        });
+        instanceType = "policy-negotiation-point-service";
+    }
+    else if (instanceConfig.type === RightsManagementPnpComponentType.RestClient) {
+        component = new rightsManagementRestClient.PolicyNegotiationPointClient({
+            ...instanceConfig.options,
+            authenticationGeneratorType: instanceConfig.options?.authenticationGeneratorType ??
+                engineCore$1.getRegisteredInstanceType("authenticationGeneratorComponent", [
+                    "verifiable-credential"
+                ])
+        });
+        instanceType = "policy-negotiation-point-client";
+    }
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Rights management PXP component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const RightsManagementPxpComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the rights management PXP component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseRightsManagementPxpComponent(engineCore$1, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === RightsManagementPxpComponentType.Service) {
+        const modules = [];
+        if (core.Is.arrayValue(instanceConfig.options?.actionModulesConfig)) {
+            for (const moduleConfig of instanceConfig.options.actionModulesConfig) {
+                modules.push({
+                    actionId: moduleConfig.id,
+                    action: await engineCore.EngineModuleHelper.loadComponent(engineCore$1, moduleConfig)
+                });
+            }
+        }
+        component = new rightsManagementPxpService.PolicyExecutionPointService({
+            loggingComponentType: engineCore$1.getRegisteredInstanceType("loggingComponent"),
+            ...instanceConfig.options,
+            config: {
+                ...instanceConfig.options?.config,
+                actions: instanceConfig.options?.config?.actions ?? modules
+            }
+        });
+        instanceType = "policy-execution-point-service";
+    }
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
+}
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Synchronised storage component types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const SynchronisedStorageComponentType = {
+    /**
+     * Service.
+     */
+    Service: "service",
+    /**
+     * REST client.
+     */
+    RestClient: "rest-client"
+};
+
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Initialise the synchronised storage component.
+ * @param engineCore The engine core.
+ * @param context The context for the engine.
+ * @param instanceConfig The instance config.
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseSynchronisedStorageComponent(engineCore, context, instanceConfig) {
+    let component;
+    let instanceType;
+    if (instanceConfig.type === SynchronisedStorageComponentType.Service) {
+        synchronisedStorageService.initSchema();
+        initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.syncSnapshotStorageConnectorType, "SyncSnapshotEntry");
+        component = new synchronisedStorageService.SynchronisedStorageService({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
+            eventBusComponentType: engineCore.getRegisteredInstanceType("eventBusComponent"),
+            vaultConnectorType: engineCore.getRegisteredInstanceType("vaultConnector"),
+            verifiableStorageConnectorType: engineCore.getRegisteredInstanceType("verifiableStorageConnector"),
+            taskSchedulerComponentType: engineCore.getRegisteredInstanceType("taskSchedulerComponent"),
+            policyEnforcementPointComponentType: engineCore.getRegisteredInstanceTypeOptional("rightsManagementPepComponent"),
+            trustedSynchronisedStorageComponentType: engineCore.getRegisteredInstanceTypeOptional("synchronisedStorageComponent", ["trusted"]),
+            blobStorageConnectorType: engineCore.getRegisteredInstanceType("blobStorageConnector", [
+                "public"
+            ]),
+            ...instanceConfig.options
+        });
+        instanceType = "synchronised-storage-service";
+    }
+    else if (instanceConfig.type === SynchronisedStorageComponentType.RestClient) {
+        component = new synchronisedStorageRestClient.SynchronisedStorageClient({
+            ...instanceConfig.options,
+            authenticationGeneratorType: instanceConfig.options?.authenticationGeneratorType ??
+                engineCore.getRegisteredInstanceType("authenticationGeneratorComponent", [
+                    "verifiable-credential"
+                ])
+        });
+        instanceType = "synchronised-storage-client";
+    }
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -2311,37 +2626,23 @@ const TaskSchedulerComponentType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseTaskSchedulerComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Task Scheduler: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseTaskSchedulerComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === TaskSchedulerComponentType.Service) {
+    if (instanceConfig.type === TaskSchedulerComponentType.Service) {
         component = new backgroundTaskScheduler.TaskSchedulerService({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("TaskSchedulerService");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "taskSchedulerComponent"
-        });
+        instanceType = "task-scheduler-service";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -2381,75 +2682,53 @@ const TelemetryConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseTelemetryConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Telemetry Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseTelemetryConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === TelemetryConnectorType.EntityStorage) {
+    if (instanceConfig.type === TelemetryConnectorType.EntityStorage) {
         telemetryConnectorEntityStorage.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.telemetryMetricStorageConnectorType, "TelemetryMetric");
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.telemetryMetricValueStorageConnectorType, "TelemetryMetricValue");
-        connector = new telemetryConnectorEntityStorage.EntityStorageTelemetryConnector({
-            loggingConnectorType: context.defaultTypes.loggingConnector,
+        component = new telemetryConnectorEntityStorage.EntityStorageTelemetryConnector({
+            loggingComponentType: engineCore.getRegisteredInstanceType("loggingComponent"),
             ...instanceConfig.options
         });
         instanceType = telemetryConnectorEntityStorage.EntityStorageTelemetryConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "telemetryConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component: connector });
-    telemetryModels.TelemetryConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        instanceType,
+        factory: telemetryModels.TelemetryConnectorFactory,
+        component
+    };
 }
 /**
  * Initialise the telemetry component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseTelemetryComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Telemetry Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseTelemetryComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === TelemetryComponentType.Service) {
+    if (instanceConfig.type === TelemetryComponentType.Service) {
         component = new telemetryService.TelemetryService({
-            telemetryConnectorType: context.defaultTypes.telemetryConnector,
+            telemetryConnectorType: engineCore.getRegisteredInstanceType("telemetryConnector"),
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("TelemetryService");
+        instanceType = "telemetry-service";
     }
-    else if (type === TelemetryComponentType.RestClient) {
+    else if (instanceConfig.type === TelemetryComponentType.RestClient) {
         component = new telemetryRestClient.TelemetryClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("TelemetryClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "telemetryComponent"
-        });
+        instanceType = "telemetry-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -2469,45 +2748,32 @@ const VaultConnectorType = {
     Hashicorp: "hashicorp"
 };
 
-// Copyright 2024 IOTA Stiftung.
-// SPDX-License-Identifier: Apache-2.0.
 /**
  * Initialise the vault connector.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseVaultConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Vault Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseVaultConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === VaultConnectorType.EntityStorage) {
+    if (instanceConfig.type === VaultConnectorType.EntityStorage) {
         vaultConnectorEntityStorage.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.vaultKeyEntityStorageType, "VaultKey");
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.vaultSecretEntityStorageType, "VaultSecret");
-        connector = new vaultConnectorEntityStorage.EntityStorageVaultConnector(instanceConfig.options);
+        component = new vaultConnectorEntityStorage.EntityStorageVaultConnector(instanceConfig.options);
         instanceType = vaultConnectorEntityStorage.EntityStorageVaultConnector.NAMESPACE;
     }
-    else if (type === VaultConnectorType.Hashicorp) {
-        connector = new vaultConnectorHashicorp.HashicorpVaultConnector(instanceConfig.options);
+    else if (instanceConfig.type === VaultConnectorType.Hashicorp) {
+        component = new vaultConnectorHashicorp.HashicorpVaultConnector(instanceConfig.options);
         instanceType = vaultConnectorHashicorp.HashicorpVaultConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "vaultConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({ instanceType: finalInstanceType, component: connector });
-    vaultModels.VaultConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: vaultModels.VaultConnectorFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -2551,21 +2817,16 @@ const VerifiableStorageConnectorType = {
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseVerifiableStorageConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Verifiable Storage Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseVerifiableStorageConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === VerifiableStorageConnectorType.Iota) {
-        const dltConfig = context.config.types.dltConfig?.find(dlt => dlt.type === context.defaultTypes.dltConfig);
-        connector = new verifiableStorageConnectorIota.IotaVerifiableStorageConnector({
-            vaultConnectorType: context.defaultTypes.vaultConnector,
+    if (instanceConfig.type === VerifiableStorageConnectorType.Iota) {
+        const dltConfig = EngineTypeHelper.getConfigOfType(engineCore.getConfig(), "dltConfig", DltConfigType.Iota);
+        component = new verifiableStorageConnectorIota.IotaVerifiableStorageConnector({
+            vaultConnectorType: engineCore.getRegisteredInstanceType("vaultConnector"),
+            loggingComponentType: engineCore.getRegisteredInstanceTypeOptional("loggingComponent"),
             ...instanceConfig.options,
             config: {
                 ...dltConfig?.options?.config,
@@ -2574,65 +2835,43 @@ function initialiseVerifiableStorageConnector(engineCore, context, instanceConfi
         });
         instanceType = verifiableStorageConnectorIota.IotaVerifiableStorageConnector.NAMESPACE;
     }
-    else if (type === VerifiableStorageConnectorType.EntityStorage) {
+    else if (instanceConfig.type === VerifiableStorageConnectorType.EntityStorage) {
         verifiableStorageConnectorEntityStorage.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.verifiableStorageEntityStorageType, "VerifiableItem");
-        connector = new verifiableStorageConnectorEntityStorage.EntityStorageVerifiableStorageConnector(instanceConfig.options);
+        component = new verifiableStorageConnectorEntityStorage.EntityStorageVerifiableStorageConnector(instanceConfig.options);
         instanceType = verifiableStorageConnectorEntityStorage.EntityStorageVerifiableStorageConnector.NAMESPACE;
     }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "verifiableStorageConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component: connector
-    });
-    verifiableStorageModels.VerifiableStorageConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: verifiableStorageModels.VerifiableStorageConnectorFactory
+    };
 }
 /**
  * Initialise the verifiable storage component.
  * @param engineCore The engine core.
  * @param context The context for the engine.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the component type is unknown.
- */
-function initialiseVerifiableStorageComponent(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Verifiable Storage Component: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseVerifiableStorageComponent(engineCore, context, instanceConfig) {
     let component;
     let instanceType;
-    if (type === VerifiableStorageComponentType.Service) {
+    if (instanceConfig.type === VerifiableStorageComponentType.Service) {
         component = new verifiableStorageService.VerifiableStorageService({
             ...instanceConfig.options
         });
-        instanceType = core.StringHelper.kebabCase("VerifiableStorageService");
+        instanceType = "verifiable-storage-service";
     }
-    else if (type === VerifiableStorageComponentType.RestClient) {
+    else if (instanceConfig.type === VerifiableStorageComponentType.RestClient) {
         component = new verifiableStorageRestClient.VerifiableStorageClient(instanceConfig.options);
-        instanceType = core.StringHelper.kebabCase("VerifiableStorageClient");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "componentUnknownType", {
-            type,
-            componentType: "verifiableStorageComponent"
-        });
+        instanceType = "verifiable-storage-client";
     }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component
-    });
-    core.ComponentFactory.register(finalInstanceType, () => component);
-    return finalInstanceType;
+    return {
+        component,
+        instanceType,
+        factory: core.ComponentFactory
+    };
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -2652,29 +2891,21 @@ const WalletConnectorType = {
     Iota: "iota"
 };
 
-// Copyright 2024 IOTA Stiftung.
-// SPDX-License-Identifier: Apache-2.0.
 /**
  * Initialise a wallet connector.
  * @param engineCore The engine core.
  * @param context The context for the node.
  * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns The name of the instance created.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseWalletConnector(engineCore, context, instanceConfig, overrideInstanceType) {
-    engineCore.logInfo(core.I18n.formatMessage("engineCore.configuring", {
-        element: `Wallet Connector: ${instanceConfig.type}`
-    }));
-    const type = instanceConfig.type;
-    let connector;
+ * @returns The instance created and the factory for it.
+ */
+async function initialiseWalletConnector(engineCore, context, instanceConfig) {
+    let component;
     let instanceType;
-    if (type === WalletConnectorType.Iota) {
-        const dltConfig = context.config.types.dltConfig?.find(dlt => dlt.type === context.defaultTypes.dltConfig);
-        connector = new walletConnectorIota.IotaWalletConnector({
-            vaultConnectorType: context.defaultTypes.vaultConnector,
-            faucetConnectorType: context.defaultTypes.faucetConnector,
+    if (instanceConfig.type === WalletConnectorType.Iota) {
+        const dltConfig = EngineTypeHelper.getConfigOfType(engineCore.getConfig(), "dltConfig", DltConfigType.Iota);
+        component = new walletConnectorIota.IotaWalletConnector({
+            vaultConnectorType: engineCore.getRegisteredInstanceType("vaultConnector"),
+            faucetConnectorType: engineCore.getRegisteredInstanceType("faucetConnector"),
             ...instanceConfig.options,
             config: {
                 ...dltConfig?.options?.config,
@@ -2683,78 +2914,38 @@ function initialiseWalletConnector(engineCore, context, instanceConfig, override
         });
         instanceType = walletConnectorIota.IotaWalletConnector.NAMESPACE;
     }
-    else if (type === WalletConnectorType.EntityStorage) {
-        connector = new walletConnectorEntityStorage.EntityStorageWalletConnector({
-            vaultConnectorType: context.defaultTypes.vaultConnector,
-            faucetConnectorType: context.defaultTypes.faucetConnector,
-            ...instanceConfig.options
-        });
-        instanceType = walletConnectorEntityStorage.EntityStorageWalletConnector.NAMESPACE;
-    }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "walletConnector"
-        });
-    }
-    const finalInstanceType = overrideInstanceType ?? instanceType;
-    context.componentInstances.push({
-        instanceType: finalInstanceType,
-        component: connector
-    });
-    walletModels.WalletConnectorFactory.register(finalInstanceType, () => connector);
-    return finalInstanceType;
-}
-/**
- * Initialise the wallet storage.
- * @param engineCore The engine core.
- * @param context The context for the engine.
- * @param instanceConfig The instance config.
- * @param overrideInstanceType The instance type to override the default.
- * @returns Nothing.
- * @throws GeneralError if the connector type is unknown.
- */
-function initialiseWalletStorage(engineCore, context, instanceConfig, overrideInstanceType) {
-    const type = instanceConfig.type;
-    if (type === WalletConnectorType.Iota) ;
-    else if (type === WalletConnectorType.EntityStorage) {
+    else if (instanceConfig.type === WalletConnectorType.EntityStorage) {
         walletConnectorEntityStorage.initSchema();
         initialiseEntityStorageConnector(engineCore, context, instanceConfig.options?.walletAddressEntityStorageType, "WalletAddress");
-    }
-    else {
-        throw new core.GeneralError("engineCore", "connectorUnknownType", {
-            type,
-            connectorType: "walletConnector"
+        component = new walletConnectorEntityStorage.EntityStorageWalletConnector({
+            vaultConnectorType: engineCore.getRegisteredInstanceType("vaultConnector"),
+            faucetConnectorType: engineCore.getRegisteredInstanceType("faucetConnector"),
+            ...instanceConfig.options
         });
+        instanceType = walletConnectorEntityStorage.EntityStorageWalletConnector.NAMESPACE;
     }
-    return undefined;
+    return {
+        component,
+        instanceType,
+        factory: walletModels.WalletConnectorFactory
+    };
 }
 
-// Copyright 2024 IOTA Stiftung.
-// SPDX-License-Identifier: Apache-2.0.
-/**
- * DLT config types.
- */
-// eslint-disable-next-line @typescript-eslint/naming-convention
-const DltConfigType = {
-    /**
-     * IOTA.
-     */
-    Iota: "iota"
-};
-
 exports.AttestationComponentType = AttestationComponentType;
 exports.AttestationConnectorType = AttestationConnectorType;
 exports.AuditableItemGraphComponentType = AuditableItemGraphComponentType;
 exports.AuditableItemStreamComponentType = AuditableItemStreamComponentType;
+exports.AuthenticationGeneratorComponentType = AuthenticationGeneratorComponentType;
 exports.BackgroundTaskConnectorType = BackgroundTaskConnectorType;
 exports.BlobStorageComponentType = BlobStorageComponentType;
 exports.BlobStorageConnectorType = BlobStorageConnectorType;
 exports.DataConverterConnectorType = DataConverterConnectorType;
 exports.DataExtractorConnectorType = DataExtractorConnectorType;
 exports.DataProcessingComponentType = DataProcessingComponentType;
+exports.DataSpaceConnectorComponentType = DataSpaceConnectorComponentType;
 exports.DltConfigType = DltConfigType;
 exports.DocumentManagementComponentType = DocumentManagementComponentType;
+exports.EngineTypeHelper = EngineTypeHelper;
 exports.EntityStorageComponentType = EntityStorageComponentType;
 exports.EntityStorageConnectorType = EntityStorageConnectorType;
 exports.EventBusComponentType = EventBusComponentType;
@@ -2770,14 +2961,24 @@ exports.IdentityResolverConnectorType = IdentityResolverConnectorType;
 exports.ImmutableProofComponentType = ImmutableProofComponentType;
 exports.LoggingComponentType = LoggingComponentType;
 exports.LoggingConnectorType = LoggingConnectorType;
+exports.MessagingAdminComponentType = MessagingAdminComponentType;
 exports.MessagingComponentType = MessagingComponentType;
 exports.MessagingEmailConnectorType = MessagingEmailConnectorType;
 exports.MessagingPushNotificationConnectorType = MessagingPushNotificationConnectorType;
 exports.MessagingSmsConnectorType = MessagingSmsConnectorType;
 exports.NftComponentType = NftComponentType;
 exports.NftConnectorType = NftConnectorType;
-exports.RightsManagementComponentType = RightsManagementComponentType;
+exports.RightsManagementDapComponentType = RightsManagementDapComponentType;
+exports.RightsManagementDarpComponentType = RightsManagementDarpComponentType;
 exports.RightsManagementPapComponentType = RightsManagementPapComponentType;
+exports.RightsManagementPdpComponentType = RightsManagementPdpComponentType;
+exports.RightsManagementPepComponentType = RightsManagementPepComponentType;
+exports.RightsManagementPipComponentType = RightsManagementPipComponentType;
+exports.RightsManagementPmpComponentType = RightsManagementPmpComponentType;
+exports.RightsManagementPnapComponentType = RightsManagementPnapComponentType;
+exports.RightsManagementPnpComponentType = RightsManagementPnpComponentType;
+exports.RightsManagementPxpComponentType = RightsManagementPxpComponentType;
+exports.SynchronisedStorageComponentType = SynchronisedStorageComponentType;
 exports.TaskSchedulerComponentType = TaskSchedulerComponentType;
 exports.TelemetryComponentType = TelemetryComponentType;
 exports.TelemetryConnectorType = TelemetryConnectorType;
@@ -2789,12 +2990,14 @@ exports.initialiseAttestationComponent = initialiseAttestationComponent;
 exports.initialiseAttestationConnector = initialiseAttestationConnector;
 exports.initialiseAuditableItemGraphComponent = initialiseAuditableItemGraphComponent;
 exports.initialiseAuditableItemStreamComponent = initialiseAuditableItemStreamComponent;
+exports.initialiseAuthenticationGeneratorComponent = initialiseAuthenticationGeneratorComponent;
 exports.initialiseBackgroundTaskConnector = initialiseBackgroundTaskConnector;
 exports.initialiseBlobStorageComponent = initialiseBlobStorageComponent;
 exports.initialiseBlobStorageConnector = initialiseBlobStorageConnector;
 exports.initialiseDataConverterConnector = initialiseDataConverterConnector;
 exports.initialiseDataExtractorConnector = initialiseDataExtractorConnector;
 exports.initialiseDataProcessingComponent = initialiseDataProcessingComponent;
+exports.initialiseDataSpaceConnectorComponent = initialiseDataSpaceConnectorComponent;
 exports.initialiseDocumentManagementComponent = initialiseDocumentManagementComponent;
 exports.initialiseEntityStorageComponent = initialiseEntityStorageComponent;
 exports.initialiseEntityStorageConnector = initialiseEntityStorageConnector;
@@ -2811,14 +3014,24 @@ exports.initialiseIdentityResolverConnector = initialiseIdentityResolverConnecto
 exports.initialiseImmutableProofComponent = initialiseImmutableProofComponent;
 exports.initialiseLoggingComponent = initialiseLoggingComponent;
 exports.initialiseLoggingConnector = initialiseLoggingConnector;
+exports.initialiseMessagingAdminComponent = initialiseMessagingAdminComponent;
 exports.initialiseMessagingComponent = initialiseMessagingComponent;
 exports.initialiseMessagingEmailConnector = initialiseMessagingEmailConnector;
 exports.initialiseMessagingPushNotificationConnector = initialiseMessagingPushNotificationConnector;
 exports.initialiseMessagingSmsConnector = initialiseMessagingSmsConnector;
 exports.initialiseNftComponent = initialiseNftComponent;
 exports.initialiseNftConnector = initialiseNftConnector;
-exports.initialiseRightsManagementComponent = initialiseRightsManagementComponent;
+exports.initialiseRightsManagementDapComponent = initialiseRightsManagementDapComponent;
+exports.initialiseRightsManagementDarpComponent = initialiseRightsManagementDarpComponent;
 exports.initialiseRightsManagementPapComponent = initialiseRightsManagementPapComponent;
+exports.initialiseRightsManagementPdpComponent = initialiseRightsManagementPdpComponent;
+exports.initialiseRightsManagementPepComponent = initialiseRightsManagementPepComponent;
+exports.initialiseRightsManagementPipComponent = initialiseRightsManagementPipComponent;
+exports.initialiseRightsManagementPmpComponent = initialiseRightsManagementPmpComponent;
+exports.initialiseRightsManagementPnapComponent = initialiseRightsManagementPnapComponent;
+exports.initialiseRightsManagementPnpComponent = initialiseRightsManagementPnpComponent;
+exports.initialiseRightsManagementPxpComponent = initialiseRightsManagementPxpComponent;
+exports.initialiseSynchronisedStorageComponent = initialiseSynchronisedStorageComponent;
 exports.initialiseTaskSchedulerComponent = initialiseTaskSchedulerComponent;
 exports.initialiseTelemetryComponent = initialiseTelemetryComponent;
 exports.initialiseTelemetryConnector = initialiseTelemetryConnector;
@@ -2826,4 +3039,3 @@ exports.initialiseVaultConnector = initialiseVaultConnector;
 exports.initialiseVerifiableStorageComponent = initialiseVerifiableStorageComponent;
 exports.initialiseVerifiableStorageConnector = initialiseVerifiableStorageConnector;
 exports.initialiseWalletConnector = initialiseWalletConnector;
-exports.initialiseWalletStorage = initialiseWalletStorage;