@sphereon/ssi-sdk.data-store 0.34.1-feature.SSISDK.26.RP.58 → 0.34.1-feature.SSISDK.45.189

package/dist/index.cjs

@@ -54,7 +54,6 @@ __export(index_exports, {
   CredentialCorrelationType: () => CredentialCorrelationType,
   CredentialDocumentFormat: () => CredentialDocumentFormat,
   CredentialLocaleBrandingEntity: () => CredentialLocaleBrandingEntity,
-  CredentialRole: () => CredentialRole,
   CredentialStateType: () => CredentialStateType,
   DataStoreContactEntities: () => DataStoreContactEntities,
   DataStoreContactMigrations: () => DataStoreContactMigrations,
@@ -73,6 +72,7 @@ __export(index_exports, {
   DataStorePresentationDefinitionMigrations: () => DataStorePresentationDefinitionMigrations,
   DataStoreStatusListEntities: () => DataStoreStatusListEntities,
   DataStoreStatusListMigrations: () => DataStoreStatusListMigrations,
+  DcqlQueryItemEntity: () => DcqlQueryItemEntity,
   DidAuthConfigEntity: () => DidAuthConfigEntity,
   DigitalCredentialEntity: () => DigitalCredentialEntity,
   DigitalCredentialStore: () => DigitalCredentialStore,
@@ -98,7 +98,6 @@ __export(index_exports, {
   PartyOrigin: () => PartyOrigin,
   PartyTypeType: () => PartyTypeType,
   PhysicalAddressEntity: () => PhysicalAddressEntity,
-  PresentationDefinitionItemEntity: () => PresentationDefinitionItemEntity,
   RegulationType: () => RegulationType,
   StatusList2021Entity: () => StatusList2021Entity,
   StatusListEntity: () => StatusListEntity,
@@ -122,6 +121,8 @@ __export(index_exports, {
   credentialBrandingFrom: () => credentialBrandingFrom,
   credentialClaimsEntityFrom: () => credentialClaimsEntityFrom,
   credentialLocaleBrandingEntityFrom: () => credentialLocaleBrandingEntityFrom,
+  dcqlQueryEntityItemFrom: () => dcqlQueryEntityItemFrom,
+  dcqlQueryItemFrom: () => dcqlQueryItemFrom,
   didAuthConfigEntityFrom: () => didAuthConfigEntityFrom,
   didAuthConfigFrom: () => didAuthConfigFrom,
   digitalCredentialFrom: () => digitalCredentialFrom,
@@ -161,8 +162,6 @@ __export(index_exports, {
   partyTypeFrom: () => partyTypeFrom,
   physicalAddressEntityFrom: () => physicalAddressEntityFrom,
   physicalAddressFrom: () => physicalAddressFrom,
-  presentationDefinitionEntityItemFrom: () => presentationDefinitionEntityItemFrom,
-  presentationDefinitionItemFrom: () => presentationDefinitionItemFrom,
   textAttributesEntityFrom: () => textAttributesEntityFrom
 });
 module.exports = __toCommonJS(index_exports);
@@ -174,55 +173,55 @@ var import_typeorm12 = __toESM(require("typeorm"), 1);
 var import_typeorm11 = __toESM(require("typeorm"), 1);
 
 // src/types/contact/contact.ts
-var ConnectionType = /* @__PURE__ */ function(ConnectionType2) {
+var ConnectionType = /* @__PURE__ */ (function(ConnectionType2) {
   ConnectionType2["OPENID_CONNECT"] = "OIDC";
   ConnectionType2["SIOPv2"] = "SIOPv2";
   ConnectionType2["SIOPv2_OpenID4VP"] = "SIOPv2+OpenID4VP";
   return ConnectionType2;
-}({});
-var CorrelationIdentifierType = /* @__PURE__ */ function(CorrelationIdentifierType2) {
+})({});
+var CorrelationIdentifierType = /* @__PURE__ */ (function(CorrelationIdentifierType2) {
   CorrelationIdentifierType2["DID"] = "did";
   CorrelationIdentifierType2["URL"] = "url";
   return CorrelationIdentifierType2;
-}({});
-var PartyTypeType = /* @__PURE__ */ function(PartyTypeType2) {
+})({});
+var PartyTypeType = /* @__PURE__ */ (function(PartyTypeType2) {
   PartyTypeType2["NATURAL_PERSON"] = "naturalPerson";
   PartyTypeType2["ORGANIZATION"] = "organization";
   return PartyTypeType2;
-}({});
-var PartyOrigin = /* @__PURE__ */ function(PartyOrigin2) {
+})({});
+var PartyOrigin = /* @__PURE__ */ (function(PartyOrigin2) {
   PartyOrigin2["INTERNAL"] = "INTERNAL";
   PartyOrigin2["EXTERNAL"] = "EXTERNAL";
   return PartyOrigin2;
-}({});
-var IdentityOrigin = /* @__PURE__ */ function(IdentityOrigin2) {
+})({});
+var IdentityOrigin = /* @__PURE__ */ (function(IdentityOrigin2) {
   IdentityOrigin2["INTERNAL"] = "INTERNAL";
   IdentityOrigin2["EXTERNAL"] = "EXTERNAL";
   return IdentityOrigin2;
-}({});
+})({});
 
 // src/types/digitalCredential/enums.ts
-var DocumentType = /* @__PURE__ */ function(DocumentType2) {
+var DocumentType = /* @__PURE__ */ (function(DocumentType2) {
   DocumentType2["VC"] = "VC";
   DocumentType2["VP"] = "VP";
   DocumentType2["P"] = "P";
   DocumentType2["C"] = "C";
   return DocumentType2;
-}({});
-var RegulationType = /* @__PURE__ */ function(RegulationType2) {
+})({});
+var RegulationType = /* @__PURE__ */ (function(RegulationType2) {
   RegulationType2["PID"] = "PID";
   RegulationType2["QEAA"] = "QEAA";
   RegulationType2["EAA"] = "EAA";
   RegulationType2["NON_REGULATED"] = "NON_REGULATED";
   return RegulationType2;
-}({});
-var CredentialDocumentFormat = /* @__PURE__ */ function(CredentialDocumentFormat2) {
+})({});
+var CredentialDocumentFormat = /* @__PURE__ */ (function(CredentialDocumentFormat2) {
   CredentialDocumentFormat2["JSON_LD"] = "JSON_LD";
   CredentialDocumentFormat2["JWT"] = "JWT";
   CredentialDocumentFormat2["SD_JWT"] = "SD_JWT";
   CredentialDocumentFormat2["MSO_MDOC"] = "MSO_MDOC";
   return CredentialDocumentFormat2;
-}({});
+})({});
 (function(CredentialDocumentFormat2) {
   function fromSpecValue(credentialFormat) {
     const format = credentialFormat.toLowerCase();
@@ -255,26 +254,19 @@ var CredentialDocumentFormat = /* @__PURE__ */ function(CredentialDocumentFormat
   __name(toSpecValue, "toSpecValue");
   CredentialDocumentFormat2.toSpecValue = toSpecValue;
 })(CredentialDocumentFormat || (CredentialDocumentFormat = {}));
-var CredentialCorrelationType = /* @__PURE__ */ function(CredentialCorrelationType2) {
+var CredentialCorrelationType = /* @__PURE__ */ (function(CredentialCorrelationType2) {
   CredentialCorrelationType2["DID"] = "DID";
   CredentialCorrelationType2["X509_SAN"] = "X509_SAN";
   CredentialCorrelationType2["KID"] = "KID";
   CredentialCorrelationType2["URL"] = "URL";
   return CredentialCorrelationType2;
-}({});
-var CredentialRole = /* @__PURE__ */ function(CredentialRole2) {
-  CredentialRole2["ISSUER"] = "ISSUER";
-  CredentialRole2["VERIFIER"] = "VERIFIER";
-  CredentialRole2["HOLDER"] = "HOLDER";
-  CredentialRole2["FEDERATION_TRUST_ANCHOR"] = "FEDERATION_TRUST_ANCHOR";
-  return CredentialRole2;
-}({});
-var CredentialStateType = /* @__PURE__ */ function(CredentialStateType2) {
+})({});
+var CredentialStateType = /* @__PURE__ */ (function(CredentialStateType2) {
   CredentialStateType2["REVOKED"] = "REVOKED";
   CredentialStateType2["VERIFIED"] = "VERIFIED";
   CredentialStateType2["EXPIRED"] = "EXPIRED";
   return CredentialStateType2;
-}({});
+})({});
 
 // src/entities/contact/IdentityEntity.ts
 var import_typeorm10 = require("typeorm");
@@ -3935,6 +3927,7 @@ AuditEventEntity = _ts_decorate32([
 
 // src/entities/digitalCredential/DigitalCredentialEntity.ts
 var import_ssi_sdk17 = require("@sphereon/ssi-sdk.agent-config");
+var import_ssi_types3 = require("@sphereon/ssi-types");
 var import_typeorm32 = require("typeorm");
 function _ts_decorate33(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -4018,10 +4011,10 @@ _ts_decorate33([
 _ts_decorate33([
   (0, import_typeorm32.Column)("simple-enum", {
     name: "credential_role",
-    enum: CredentialRole,
+    enum: import_ssi_types3.CredentialRole,
     nullable: false
   }),
-  _ts_metadata32("design:type", typeof CredentialRole === "undefined" ? Object : CredentialRole)
+  _ts_metadata32("design:type", typeof import_ssi_types3.CredentialRole === "undefined" ? Object : import_ssi_types3.CredentialRole)
 ], DigitalCredentialEntity.prototype, "credentialRole", void 0);
 _ts_decorate33([
   (0, import_typeorm32.Column)("text", {
@@ -4194,7 +4187,7 @@ DigitalCredentialEntity = _ts_decorate33([
   (0, import_typeorm32.Entity)("DigitalCredential")
 ], DigitalCredentialEntity);
 
-// src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts
+// src/entities/presentationDefinition/DcqlQueryItemEntity.ts
 var import_typeorm33 = require("typeorm");
 var import_class_validator21 = require("class-validator");
 var import_ssi_sdk18 = require("@sphereon/ssi-sdk.agent-config");
@@ -4209,18 +4202,17 @@ function _ts_metadata33(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 __name(_ts_metadata33, "_ts_metadata");
-var PresentationDefinitionItemEntity = class extends import_typeorm33.BaseEntity {
+var DcqlQueryItemEntity = class extends import_typeorm33.BaseEntity {
   static {
-    __name(this, "PresentationDefinitionItemEntity");
+    __name(this, "DcqlQueryItemEntity");
   }
   id;
-  definitionId;
+  queryId;
   version;
   tenantId;
   purpose;
   name;
-  definitionPayload;
-  dcqlPayload;
+  query;
   createdAt;
   lastUpdatedAt;
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.
@@ -4231,20 +4223,20 @@ var PresentationDefinitionItemEntity = class extends import_typeorm33.BaseEntity
 _ts_decorate34([
   (0, import_typeorm33.PrimaryGeneratedColumn)("uuid"),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "id", void 0);
+], DcqlQueryItemEntity.prototype, "id", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
-    name: "definition_id",
+    name: "query_id",
     length: 255,
     type: "varchar",
     nullable: false,
     unique: false
   }),
   (0, import_class_validator21.IsNotEmpty)({
-    message: "A blank definition id field is not allowed"
+    message: "A blank query id field is not allowed"
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "definitionId", void 0);
+], DcqlQueryItemEntity.prototype, "queryId", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
     name: "version",
@@ -4257,7 +4249,7 @@ _ts_decorate34([
     message: "A blank version field is not allowed"
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "version", void 0);
+], DcqlQueryItemEntity.prototype, "version", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
     name: "tenant_id",
@@ -4267,7 +4259,7 @@ _ts_decorate34([
     unique: false
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "tenantId", void 0);
+], DcqlQueryItemEntity.prototype, "tenantId", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
     name: "purpose",
@@ -4277,7 +4269,7 @@ _ts_decorate34([
     unique: false
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "purpose", void 0);
+], DcqlQueryItemEntity.prototype, "purpose", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
     name: "name",
@@ -4287,31 +4279,19 @@ _ts_decorate34([
     unique: false
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "name", void 0);
+], DcqlQueryItemEntity.prototype, "name", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
-    name: "definition_payload",
+    name: "query",
     type: "text",
     nullable: false,
     unique: false
   }),
   (0, import_class_validator21.IsNotEmpty)({
-    message: "A blank PD definition payload field is not allowed"
-  }),
-  _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "definitionPayload", void 0);
-_ts_decorate34([
-  (0, import_typeorm33.Column)({
-    name: "dcql_payload",
-    type: "text",
-    nullable: true,
-    unique: false
-  }),
-  (0, import_class_validator21.IsNotEmpty)({
-    message: "A blank dcql definition payload field is not allowed"
+    message: "A blank dcql query payload field is not allowed"
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "dcqlPayload", void 0);
+], DcqlQueryItemEntity.prototype, "query", void 0);
 _ts_decorate34([
   (0, import_typeorm33.CreateDateColumn)({
     name: "created_at",
@@ -4319,7 +4299,7 @@ _ts_decorate34([
     type: (0, import_ssi_sdk18.typeOrmDateTime)()
   }),
   _ts_metadata33("design:type", typeof Date === "undefined" ? Object : Date)
-], PresentationDefinitionItemEntity.prototype, "createdAt", void 0);
+], DcqlQueryItemEntity.prototype, "createdAt", void 0);
 _ts_decorate34([
   (0, import_typeorm33.UpdateDateColumn)({
     name: "last_updated_at",
@@ -4327,22 +4307,22 @@ _ts_decorate34([
     type: (0, import_ssi_sdk18.typeOrmDateTime)()
   }),
   _ts_metadata33("design:type", typeof Date === "undefined" ? Object : Date)
-], PresentationDefinitionItemEntity.prototype, "lastUpdatedAt", void 0);
+], DcqlQueryItemEntity.prototype, "lastUpdatedAt", void 0);
 _ts_decorate34([
   (0, import_typeorm33.BeforeInsert)(),
   (0, import_typeorm33.BeforeUpdate)(),
   _ts_metadata33("design:type", Function),
   _ts_metadata33("design:paramtypes", []),
   _ts_metadata33("design:returntype", void 0)
-], PresentationDefinitionItemEntity.prototype, "updateUpdatedDate", null);
-PresentationDefinitionItemEntity = _ts_decorate34([
-  (0, import_typeorm33.Entity)("PresentationDefinitionItem"),
+], DcqlQueryItemEntity.prototype, "updateUpdatedDate", null);
+DcqlQueryItemEntity = _ts_decorate34([
+  (0, import_typeorm33.Entity)("DcqlQueryItem"),
   (0, import_typeorm33.Index)([
     "version"
   ], {
     unique: false
   })
-], PresentationDefinitionItemEntity);
+], DcqlQueryItemEntity);
 
 // src/entities/oid4vcState/Oid4vcStateEntity.ts
 var import_ssi_sdk19 = require("@sphereon/ssi-sdk.agent-config");
@@ -5512,6 +5492,7 @@ var AbstractDigitalCredentialStore = class {
 };
 
 // src/digitalCredential/DigitalCredentialStore.ts
+var import_ssi_types4 = require("@sphereon/ssi-types");
 var import_debug2 = __toESM(require("debug"), 1);
 
 // src/utils/SortingUtils.ts
@@ -5581,7 +5562,7 @@ var DigitalCredentialStore = class extends AbstractDigitalCredentialStore {
     if (!args) {
       return false;
     }
-    let query = {};
+    const query = {};
     if ("id" in args) {
       query.id = args.id;
     } else if ("hash" in args) {
@@ -5667,7 +5648,7 @@ var DigitalCredentialStore = class extends AbstractDigitalCredentialStore {
   }, "updateCredentialState");
   assertValidDigitalCredential(credentialEntity) {
     const { kmsKeyRef, identifierMethod, credentialRole, isIssuerSigned } = credentialEntity;
-    const isRoleInvalid = credentialRole === CredentialRole.ISSUER || credentialRole === CredentialRole.HOLDER && !isIssuerSigned;
+    const isRoleInvalid = credentialRole === import_ssi_types4.CredentialRole.ISSUER || credentialRole === import_ssi_types4.CredentialRole.HOLDER && !isIssuerSigned;
     if (isRoleInvalid && (!kmsKeyRef || !identifierMethod)) {
       const missingFields = [];
       if (!kmsKeyRef) missingFields.push("kmsKeyRef");
@@ -6181,41 +6162,41 @@ var IssuanceBrandingStore = class extends AbstractIssuanceBrandingStore {
 };
 
 // src/statusList/StatusListStore.ts
-var import_ssi_types4 = require("@sphereon/ssi-types");
+var import_ssi_types6 = require("@sphereon/ssi-types");
 var import_debug4 = __toESM(require("debug"), 1);
 var import_typeorm37 = require("typeorm");
 
 // src/utils/statusList/MappingUtils.ts
-var import_ssi_types3 = require("@sphereon/ssi-types");
+var import_ssi_types5 = require("@sphereon/ssi-types");
 var statusListEntityFrom = /* @__PURE__ */ __name((args) => {
   switch (args.type) {
-    case import_ssi_types3.StatusListType.StatusList2021: {
+    case import_ssi_types5.StatusListType.StatusList2021: {
       const entity = new StatusList2021Entity();
       const sl2021 = args;
       entity.indexingDirection = sl2021.indexingDirection;
       entity.statusPurpose = sl2021.statusPurpose;
       setBaseFields(entity, args);
       Object.defineProperty(entity, "type", {
-        value: import_ssi_types3.StatusListType.StatusList2021,
+        value: import_ssi_types5.StatusListType.StatusList2021,
         enumerable: true,
         configurable: true
       });
       return entity;
     }
-    case import_ssi_types3.StatusListType.OAuthStatusList: {
+    case import_ssi_types5.StatusListType.OAuthStatusList: {
       const entity = new OAuthStatusListEntity();
       const oauthSl = args;
       entity.bitsPerStatus = oauthSl.bitsPerStatus;
       entity.expiresAt = oauthSl.expiresAt;
       setBaseFields(entity, args);
       Object.defineProperty(entity, "type", {
-        value: import_ssi_types3.StatusListType.OAuthStatusList,
+        value: import_ssi_types5.StatusListType.OAuthStatusList,
         enumerable: true,
         configurable: true
       });
       return entity;
     }
-    case import_ssi_types3.StatusListType.BitstringStatusList: {
+    case import_ssi_types5.StatusListType.BitstringStatusList: {
       const entity = new BitstringStatusListEntity();
       const bitstringsl = args;
       if (!bitstringsl.bitsPerStatus) {
@@ -6228,7 +6209,7 @@ var statusListEntityFrom = /* @__PURE__ */ __name((args) => {
       entity.ttl = bitstringsl.ttl;
       setBaseFields(entity, args);
       Object.defineProperty(entity, "type", {
-        value: import_ssi_types3.StatusListType.BitstringStatusList,
+        value: import_ssi_types5.StatusListType.BitstringStatusList,
         enumerable: true,
         configurable: true
       });
@@ -6242,7 +6223,7 @@ var statusListFrom = /* @__PURE__ */ __name((entity) => {
   if (entity instanceof StatusList2021Entity) {
     const result = {
       ...getBaseFields(entity),
-      type: import_ssi_types3.StatusListType.StatusList2021,
+      type: import_ssi_types5.StatusListType.StatusList2021,
       indexingDirection: entity.indexingDirection,
       statusPurpose: entity.statusPurpose
     };
@@ -6251,7 +6232,7 @@ var statusListFrom = /* @__PURE__ */ __name((entity) => {
   if (entity instanceof OAuthStatusListEntity) {
     const result = {
       ...getBaseFields(entity),
-      type: import_ssi_types3.StatusListType.OAuthStatusList,
+      type: import_ssi_types5.StatusListType.OAuthStatusList,
       bitsPerStatus: entity.bitsPerStatus,
       expiresAt: entity.expiresAt
     };
@@ -6260,7 +6241,7 @@ var statusListFrom = /* @__PURE__ */ __name((entity) => {
   if (entity instanceof BitstringStatusListEntity) {
     const result = {
       ...getBaseFields(entity),
-      type: import_ssi_types3.StatusListType.BitstringStatusList,
+      type: import_ssi_types5.StatusListType.BitstringStatusList,
       statusPurpose: entity.statusPurpose,
       bitsPerStatus: entity.bitsPerStatus,
       validFrom: entity.validFrom,
@@ -6581,11 +6562,11 @@ var StatusListStore = class {
   async getStatusListRepo(type) {
     const dataSource = await this.getDS();
     switch (type) {
-      case import_ssi_types4.StatusListType.StatusList2021:
+      case import_ssi_types6.StatusListType.StatusList2021:
         return dataSource.getRepository(StatusList2021Entity);
-      case import_ssi_types4.StatusListType.OAuthStatusList:
+      case import_ssi_types6.StatusListType.OAuthStatusList:
         return dataSource.getRepository(OAuthStatusListEntity);
-      case import_ssi_types4.StatusListType.BitstringStatusList:
+      case import_ssi_types6.StatusListType.BitstringStatusList:
         return dataSource.getRepository(BitstringStatusListEntity);
       default:
         return dataSource.getRepository(StatusListEntity);
@@ -6594,7 +6575,7 @@ var StatusListStore = class {
   async getStatusListEntryRepo(type) {
     const dataSource = await this.getDS();
     switch (type) {
-      case import_ssi_types4.StatusListType.BitstringStatusList:
+      case import_ssi_types6.StatusListType.BitstringStatusList:
         return dataSource.getRepository(BitstringStatusListEntryEntity);
       default:
         return dataSource.getRepository(StatusListEntryEntity);
@@ -6610,15 +6591,15 @@ var AbstractEventLoggerStore = class {
 };
 
 // src/eventLogger/EventLoggerStore.ts
-var import_ssi_types6 = require("@sphereon/ssi-types");
+var import_ssi_types8 = require("@sphereon/ssi-types");
 var import_debug5 = __toESM(require("debug"), 1);
 
 // src/utils/eventLogger/MappingUtils.ts
-var import_ssi_types5 = require("@sphereon/ssi-types");
+var import_ssi_types7 = require("@sphereon/ssi-types");
 var auditEventFrom = /* @__PURE__ */ __name((event) => {
   const result = {
     id: event.id,
-    type: import_ssi_types5.LoggingEventType.AUDIT,
+    type: import_ssi_types7.LoggingEventType.AUDIT,
     description: event.description,
     timestamp: event.timestamp,
     level: event.level,
@@ -6645,7 +6626,7 @@ var auditEventFrom = /* @__PURE__ */ __name((event) => {
 }, "auditEventFrom");
 var auditEventEntityFrom = /* @__PURE__ */ __name((args) => {
   const auditEventEntity = new AuditEventEntity();
-  auditEventEntity.type = import_ssi_types5.LoggingEventType.AUDIT;
+  auditEventEntity.type = import_ssi_types7.LoggingEventType.AUDIT;
   auditEventEntity.timestamp = args.timestamp;
   auditEventEntity.level = args.level;
   auditEventEntity.correlationId = args.correlationId;
@@ -6669,7 +6650,7 @@ var auditEventEntityFrom = /* @__PURE__ */ __name((args) => {
 var activityEventFrom = /* @__PURE__ */ __name((event) => {
   const result = {
     id: event.id,
-    type: import_ssi_types5.LoggingEventType.ACTIVITY,
+    type: import_ssi_types7.LoggingEventType.ACTIVITY,
     credentialType: event.credentialType,
     originalCredential: event.originalCredential,
     credentialHash: event.credentialHash,
@@ -6701,7 +6682,7 @@ var activityEventFrom = /* @__PURE__ */ __name((event) => {
 }, "activityEventFrom");
 var activityEventEntityFrom = /* @__PURE__ */ __name((args) => {
   const activityEventEntity = new AuditEventEntity();
-  activityEventEntity.type = import_ssi_types5.LoggingEventType.ACTIVITY;
+  activityEventEntity.type = import_ssi_types7.LoggingEventType.ACTIVITY;
   activityEventEntity.timestamp = args.timestamp;
   activityEventEntity.level = args.level;
   activityEventEntity.correlationId = args.correlationId;
@@ -6743,11 +6724,11 @@ var EventLoggerStore = class extends AbstractEventLoggerStore {
     const { filter = [] } = args ?? {};
     const auditEventsFilter = filter.map((item) => ({
       ...item,
-      type: import_ssi_types6.LoggingEventType.AUDIT
+      type: import_ssi_types8.LoggingEventType.AUDIT
     }));
     if (auditEventsFilter.length === 0) {
       auditEventsFilter.push({
-        type: import_ssi_types6.LoggingEventType.AUDIT
+        type: import_ssi_types8.LoggingEventType.AUDIT
       });
     }
     const connection = await this.dbConnection;
@@ -6769,11 +6750,11 @@ var EventLoggerStore = class extends AbstractEventLoggerStore {
     const { filter = [] } = args ?? {};
     const activityEventsFilter = filter.map((item) => ({
       ...item,
-      type: import_ssi_types6.LoggingEventType.ACTIVITY
+      type: import_ssi_types8.LoggingEventType.ACTIVITY
     }));
     if (activityEventsFilter.length === 0) {
       activityEventsFilter.push({
-        type: import_ssi_types6.LoggingEventType.ACTIVITY
+        type: import_ssi_types8.LoggingEventType.ACTIVITY
       });
     }
     const connection = await this.dbConnection;
@@ -6944,44 +6925,54 @@ var import_debug7 = __toESM(require("debug"), 1);
 
 // src/utils/presentationDefinition/MappingUtils.ts
 var blakepkg = __toESM(require("blakejs"), 1);
-var presentationDefinitionItemFrom = /* @__PURE__ */ __name((entity) => {
+var import_dcql = require("dcql");
+var dcqlQueryItemFrom = /* @__PURE__ */ __name((entity) => {
   const result = {
     id: entity.id,
     tenantId: entity.tenantId,
-    definitionId: entity.definitionId,
+    queryId: entity.queryId,
     version: entity.version,
     name: entity.name,
     purpose: entity.purpose,
-    definitionPayload: JSON.parse(entity.definitionPayload),
-    dcqlPayload: JSON.parse(entity.dcqlPayload),
+    query: import_dcql.DcqlQuery.parse(JSON.parse(entity.query)),
     createdAt: entity.createdAt,
     lastUpdatedAt: entity.lastUpdatedAt
   };
+  if (result.query) {
+    import_dcql.DcqlQuery.validate(result.query);
+  }
   return replaceNullWithUndefined(result);
-}, "presentationDefinitionItemFrom");
-var presentationDefinitionEntityItemFrom = /* @__PURE__ */ __name((item) => {
-  const entity = new PresentationDefinitionItemEntity();
+}, "dcqlQueryItemFrom");
+var dcqlQueryEntityItemFrom = /* @__PURE__ */ __name((item) => {
+  const entity = new DcqlQueryItemEntity();
   entity.tenantId = item.tenantId;
-  entity.definitionId = item.definitionId;
+  entity.queryId = item.queryId;
   entity.version = item.version;
   entity.name = item.name;
   entity.purpose = item.purpose;
-  entity.definitionPayload = JSON.stringify(item.definitionPayload);
-  entity.dcqlPayload = JSON.stringify(item.dcqlPayload);
+  if (item.query) {
+    const dcqlQuery = import_dcql.DcqlQuery.parse(item.query);
+    import_dcql.DcqlQuery.validate(dcqlQuery);
+    entity.query = JSON.stringify(item.query);
+  }
   return entity;
-}, "presentationDefinitionEntityItemFrom");
+}, "dcqlQueryEntityItemFrom");
 function hashPayload(payload) {
   return blakepkg.blake2bHex(JSON.stringify(payload));
 }
 __name(hashPayload, "hashPayload");
 function isPresentationDefinitionEqual(base, compare) {
-  if (base.definitionId !== compare.definitionId || base.tenantId != compare.tenantId || base.version !== compare.version || base.name != compare.name || base.purpose != compare.purpose) {
+  if (base.queryId !== compare.queryId || base.tenantId !== compare.tenantId || base.version !== compare.version || base.name !== compare.name || base.purpose !== compare.purpose) {
     return false;
   }
-  if (base.definitionPayload && compare.definitionPayload) {
-    return hashPayload(base.definitionPayload) === hashPayload(compare.definitionPayload);
+  if (base.query && compare.query) {
+    if (hashPayload(base.query) !== hashPayload(compare.query)) {
+      return false;
+    }
+  } else if (base.query || compare.query) {
+    return false;
   }
-  return false;
+  return true;
 }
 __name(isPresentationDefinitionEqual, "isPresentationDefinitionEqual");
 
@@ -6998,7 +6989,7 @@ var PDStore = class extends AbstractPDStore {
   }
   getDefinition = /* @__PURE__ */ __name(async (args) => {
     const { itemId } = args ?? {};
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const result = await pdRepository.findOne({
       where: {
         id: itemId
@@ -7007,11 +6998,11 @@ var PDStore = class extends AbstractPDStore {
     if (!result) {
       return Promise.reject(Error(`No presentation definition item found for id: ${itemId}`));
     }
-    return presentationDefinitionItemFrom(result);
+    return dcqlQueryItemFrom(result);
   }, "getDefinition");
   hasDefinition = /* @__PURE__ */ __name(async (args) => {
     const { itemId } = args ?? {};
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const resultCount = await pdRepository.count({
       where: {
         id: itemId
@@ -7021,7 +7012,7 @@ var PDStore = class extends AbstractPDStore {
   }, "hasDefinition");
   hasDefinitions = /* @__PURE__ */ __name(async (args) => {
     const { filter } = args;
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const resultCount = await pdRepository.count({
       ...filter && {
         where: cleanFilter(filter)
@@ -7031,7 +7022,7 @@ var PDStore = class extends AbstractPDStore {
   }, "hasDefinitions");
   getDefinitions = /* @__PURE__ */ __name(async (args) => {
     const { filter } = args;
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const initialResult = await this.findIds(pdRepository, filter);
     const result = await pdRepository.find({
       where: {
@@ -7041,19 +7032,19 @@ var PDStore = class extends AbstractPDStore {
         version: "DESC"
       }
     });
-    return result.map((entity) => presentationDefinitionItemFrom(entity));
+    return result.map((entity) => dcqlQueryItemFrom(entity));
   }, "getDefinitions");
   addDefinition = /* @__PURE__ */ __name(async (item) => {
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
-    const entity = presentationDefinitionEntityItemFrom(item);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
+    const entity = dcqlQueryEntityItemFrom(item);
     debug7("Adding presentation definition entity", item);
     const result = await pdRepository.save(entity, {
       transaction: true
     });
-    return presentationDefinitionItemFrom(result);
+    return dcqlQueryItemFrom(result);
   }, "addDefinition");
   updateDefinition = /* @__PURE__ */ __name(async (item) => {
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const result = await pdRepository.findOne({
       where: {
         id: item.id
@@ -7066,20 +7057,20 @@ var PDStore = class extends AbstractPDStore {
       ...result
     };
     updatedEntity.tenantId = item.tenantId;
-    updatedEntity.definitionId = item.definitionId;
+    updatedEntity.queryId = item.queryId;
     updatedEntity.version = item.version;
     updatedEntity.name = item.name;
     updatedEntity.purpose = item.purpose;
-    updatedEntity.definitionPayload = JSON.stringify(item.definitionPayload);
+    updatedEntity.query = JSON.stringify(item.query);
     debug7("Updating presentation definition entity", updatedEntity);
     const updateResult = await pdRepository.save(updatedEntity, {
       transaction: true
     });
-    return presentationDefinitionItemFrom(updateResult);
+    return dcqlQueryItemFrom(updateResult);
   }, "updateDefinition");
   deleteDefinition = /* @__PURE__ */ __name(async (args) => {
     const { itemId } = args;
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const entity = await pdRepository.findOne({
       where: {
         id: itemId
@@ -7093,7 +7084,7 @@ var PDStore = class extends AbstractPDStore {
   }, "deleteDefinition");
   deleteDefinitions = /* @__PURE__ */ __name(async (args) => {
     const { filter } = args;
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const initialResult = await this.findIds(pdRepository, filter);
     const result = await pdRepository.find({
       where: {
@@ -7306,9 +7297,120 @@ var CreateContacts1659463079429 = class {
   }
 };
 
-// src/migrations/generic/2-CreateIssuanceBranding.ts
+// src/migrations/generic/10-CreatePresentationDefinitions.ts
 var import_debug9 = __toESM(require("debug"), 1);
 
+// src/migrations/postgres/1716475165345-CreatePresentationDefinitions.ts
+var CreatePresentationDefinitions1716475165345 = class {
+  static {
+    __name(this, "CreatePresentationDefinitions1716475165345");
+  }
+  name = "CreatePresentationDefinitions1716475165345";
+  async up(queryRunner) {
+    await queryRunner.query(`
+CREATE TABLE "PresentationDefinitionItem" (
+    "id" uuid NOT NULL DEFAULT uuid_generate_v4(), 
+    "tenant_id" TEXT, 
+    "definition_id" TEXT NOT NULL,
+    "name" TEXT,
+    "version" TEXT NOT NULL, 
+    "purpose" TEXT, 
+    "definition_payload" TEXT NOT NULL, 
+    "query" TEXT, 
+    "created_at" TIMESTAMP NOT NULL DEFAULT now(), 
+    "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), 
+    CONSTRAINT "PK_PresentationDefinitionItem_id" PRIMARY KEY ("id"))
+                                          `);
+  }
+  async down(queryRunner) {
+    await queryRunner.query(`DROP TABLE "PresentationDefinitionItem"`);
+  }
+};
+
+// src/migrations/sqlite/1716475165344-CreatePresentationDefinitions.ts
+var CreatePresentationDefinitions1716475165344 = class {
+  static {
+    __name(this, "CreatePresentationDefinitions1716475165344");
+  }
+  name = "CreatePresentationDefinitions1716475165344";
+  async up(queryRunner) {
+    await queryRunner.query(`CREATE TABLE "PresentationDefinitionItem" (
+    "id" varchar PRIMARY KEY NOT NULL, 
+    "tenant_id" varchar,
+    "definition_id" varchar NOT NULL,
+    "name" varchar,
+    "version" varchar NOT NULL,
+    "purpose" varchar,
+    "definition_payload" varchar NOT NULL,
+    "query" varchar,
+    "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+    "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
+  }
+  async down(queryRunner) {
+    await queryRunner.query(`DROP TABLE "PresentationDefinitionItem"`);
+  }
+};
+
+// src/migrations/generic/10-CreatePresentationDefinitions.ts
+var debug9 = (0, import_debug9.default)("sphereon:ssi-sdk:migrations");
+var CreatePresentationDefinitions1716533767523 = class {
+  static {
+    __name(this, "CreatePresentationDefinitions1716533767523");
+  }
+  name = "CreatePresentationDefinitionItems1716533767523";
+  async up(queryRunner) {
+    debug9("migration: creating machine state tables");
+    const dbType = queryRunner.connection.driver.options.type;
+    switch (dbType) {
+      case "postgres": {
+        debug9("using postgres migration file");
+        const mig = new CreatePresentationDefinitions1716475165345();
+        await mig.up(queryRunner);
+        debug9("Migration statements executed");
+        return;
+      }
+      case "sqlite":
+      case "expo":
+      case "react-native": {
+        debug9("using sqlite/react-native migration file");
+        const mig = new CreatePresentationDefinitions1716475165344();
+        await mig.up(queryRunner);
+        debug9("Migration statements executed");
+        return;
+      }
+      default:
+        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
+    }
+  }
+  async down(queryRunner) {
+    debug9("migration: reverting machine state tables");
+    const dbType = queryRunner.connection.driver.options.type;
+    switch (dbType) {
+      case "postgres": {
+        debug9("using postgres migration file");
+        const mig = new CreatePresentationDefinitions1716475165345();
+        await mig.down(queryRunner);
+        debug9("Migration statements executed");
+        return;
+      }
+      case "sqlite":
+      case "expo":
+      case "react-native": {
+        debug9("using sqlite/react-native migration file");
+        const mig = new CreatePresentationDefinitions1716475165344();
+        await mig.down(queryRunner);
+        debug9("Migration statements executed");
+        return;
+      }
+      default:
+        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
+    }
+  }
+};
+
+// src/migrations/generic/11-FixCredentialClaimsReferenceUuid.ts
+var import_debug10 = __toESM(require("debug"), 1);
+
 // src/migrations/postgres/1685628974232-CreateIssuanceBranding.ts
 var import_ssi_sdk21 = require("@sphereon/ssi-sdk.core");
 var CreateIssuanceBranding1685628974232 = class {
@@ -7445,31 +7547,105 @@ var CreateIssuanceBranding1685628973231 = class {
   }
 };
 
-// src/migrations/generic/2-CreateIssuanceBranding.ts
-var debug9 = (0, import_debug9.default)("sphereon:ssi-sdk:migrations");
-var CreateIssuanceBranding1659463079429 = class {
+// src/migrations/postgres/1741895822987-FixCredentialClaimsReferencesUuid.ts
+var FixCredentialClaimsReferencesUuidPG1741895822987 = class {
   static {
-    __name(this, "CreateIssuanceBranding1659463079429");
+    __name(this, "FixCredentialClaimsReferencesUuidPG1741895822987");
   }
-  name = "CreateIssuanceBranding1659463079429";
+  name = "FixCredentialClaimsReferencesUuid1741895822987";
+  async up(queryRunner) {
+    await queryRunner.query(`
+      ALTER TABLE "CredentialClaims"
+      ALTER COLUMN "credentialLocaleBrandingId" TYPE uuid USING "credentialLocaleBrandingId"::uuid;
+    `);
+  }
+  async down(queryRunner) {
+    await queryRunner.query(`
+      ALTER TABLE "CredentialClaims"
+      ALTER COLUMN "credentialLocaleBrandingId" TYPE character varying USING "credentialLocaleBrandingId"::text;
+    `);
+  }
+};
+
+// src/migrations/sqlite/1741895822987-FixCredentialClaimsReferencesUuid.ts
+var FixCredentialClaimsReferencesUuidSqlite1741895822987 = class {
+  static {
+    __name(this, "FixCredentialClaimsReferencesUuidSqlite1741895822987");
+  }
+  name = "FixCredentialClaimsReferencesUuid1741895822987";
+  async up(queryRunner) {
+    await queryRunner.query(`
+            CREATE TABLE "CredentialClaims_new"
+            (
+                "id"                         uuid                   NOT NULL DEFAULT (lower(hex(randomblob(16)))),
+                "key"                        character varying(255) NOT NULL,
+                "name"                       character varying(255) NOT NULL,
+                "credentialLocaleBrandingId" uuid,
+                CONSTRAINT "PK_CredentialClaims_id" PRIMARY KEY ("id")
+            )
+        `);
+    await queryRunner.query(`
+            INSERT INTO "CredentialClaims_new" ("id", "key", "name", "credentialLocaleBrandingId")
+            SELECT "id", "key", "name", "credentialLocaleBrandingId"
+            FROM "CredentialClaims"
+        `);
+    await queryRunner.query(`DROP TABLE "CredentialClaims"`);
+    await queryRunner.query(`ALTER TABLE "CredentialClaims_new" RENAME TO "CredentialClaims"`);
+    await queryRunner.query(`
+            CREATE UNIQUE INDEX "IDX_CredentialClaimsEntity_credentialLocaleBranding_locale"
+                ON "CredentialClaims" ("credentialLocaleBrandingId", "key")
+        `);
+  }
+  async down(queryRunner) {
+    await queryRunner.query(`
+            CREATE TABLE "CredentialClaims_old"
+            (
+                "id"                         uuid                   NOT NULL DEFAULT (lower(hex(randomblob(16)))),
+                "key"                        character varying(255) NOT NULL,
+                "name"                       character varying(255) NOT NULL,
+                "credentialLocaleBrandingId" character varying,
+                CONSTRAINT "PK_CredentialClaims_id" PRIMARY KEY ("id")
+            )
+        `);
+    await queryRunner.query(`
+            INSERT INTO "CredentialClaims_old" ("id", "key", "name", "credentialLocaleBrandingId")
+            SELECT "id", "key", "name", "credentialLocaleBrandingId"
+            FROM "CredentialClaims"
+        `);
+    await queryRunner.query(`DROP TABLE "CredentialClaims"`);
+    await queryRunner.query(`ALTER TABLE "CredentialClaims_old" RENAME TO "CredentialClaims"`);
+    await queryRunner.query(`
+            CREATE UNIQUE INDEX "IDX_CredentialClaimsEntity_credentialLocaleBranding_locale"
+                ON "CredentialClaims" ("credentialLocaleBrandingId", "key")
+        `);
+  }
+};
+
+// src/migrations/generic/11-FixCredentialClaimsReferenceUuid.ts
+var debug10 = (0, import_debug10.default)("sphereon:ssi-sdk:migrations");
+var FixCredentialClaimsReferencesUuid1741895822987 = class {
+  static {
+    __name(this, "FixCredentialClaimsReferencesUuid1741895822987");
+  }
+  name = "FixCredentialClaimsReferenceUuid1741895822987";
   async up(queryRunner) {
-    debug9("migration: creating issuance branding tables");
+    debug10("migration: creating issuance branding uuid problem");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
-        debug9("using postgres migration file");
-        const mig = new CreateIssuanceBranding1685628974232();
+        debug10("using postgres migration file");
+        const mig = new FixCredentialClaimsReferencesUuidPG1741895822987();
         await mig.up(queryRunner);
-        debug9("Migration statements executed");
+        debug10("Migration statements executed");
         return;
       }
       case "sqlite":
       case "expo":
       case "react-native": {
-        debug9("using sqlite/react-native migration file");
-        const mig = new CreateIssuanceBranding1685628973231();
+        debug10("using sqlite/react-native migration file");
+        const mig = new FixCredentialClaimsReferencesUuidSqlite1741895822987();
         await mig.up(queryRunner);
-        debug9("Migration statements executed");
+        debug10("Migration statements executed");
         return;
       }
       default:
@@ -7477,23 +7653,23 @@ var CreateIssuanceBranding1659463079429 = class {
     }
   }
   async down(queryRunner) {
-    debug9("migration: reverting issuance branding tables");
+    debug10("migration: reverting issuance branding uuid migration");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
-        debug9("using postgres migration file");
+        debug10("using postgres migration file");
         const mig = new CreateIssuanceBranding1685628974232();
         await mig.down(queryRunner);
-        debug9("Migration statements executed");
+        debug10("Migration statements executed");
         return;
       }
       case "sqlite":
       case "expo":
       case "react-native": {
-        debug9("using sqlite/react-native migration file");
+        debug10("using sqlite/react-native migration file");
         const mig = new CreateIssuanceBranding1685628973231();
         await mig.down(queryRunner);
-        debug9("Migration statements executed");
+        debug10("Migration statements executed");
         return;
       }
       default:
@@ -7502,658 +7678,331 @@ var CreateIssuanceBranding1659463079429 = class {
   }
 };
 
-// src/migrations/generic/3-CreateContacts.ts
-var import_debug10 = __toESM(require("debug"), 1);
+// src/migrations/generic/12-CreateBitstringStatusList.ts
+var import_debug11 = __toESM(require("debug"), 1);
 
-// src/migrations/sqlite/1690925872693-CreateContacts.ts
-var CreateContacts1690925872693 = class {
+// src/migrations/postgres/1741895823000-CreateBitstringStatusList.ts
+var AddBitstringStatusListEnumPG1741895823000 = class {
   static {
-    __name(this, "CreateContacts1690925872693");
+    __name(this, "AddBitstringStatusListEnumPG1741895823000");
   }
-  name = "CreateContacts1690925872693";
+  name = "AddBitstringStatusListEnum1741895823000";
   async up(queryRunner) {
-    await queryRunner.query(`CREATE TABLE "temporary_CorrelationIdentifier" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('did','url') ) NOT NULL, "correlation_id" text NOT NULL, "identityId" varchar, CONSTRAINT "REL_CorrelationIdentifier_identityId" UNIQUE ("identityId"), CONSTRAINT "UQ_CorrelationIdentifier_correlation_id" UNIQUE ("correlation_id"))`);
-    await queryRunner.query(`INSERT INTO "temporary_CorrelationIdentifier"("id", "type", "correlation_id", "identityId") SELECT "id", "type", "correlation_id", "identityId" FROM "CorrelationIdentifier"`);
-    await queryRunner.query(`DROP TABLE "CorrelationIdentifier"`);
-    await queryRunner.query(`ALTER TABLE "temporary_CorrelationIdentifier" RENAME TO "CorrelationIdentifier"`);
-    await queryRunner.query(`CREATE TABLE "temporary_Identity" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255) NOT NULL, "roles" text NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "contactId" varchar, CONSTRAINT "UQ_Identity_alias" UNIQUE ("alias"))`);
-    await queryRunner.query(`INSERT INTO "temporary_Identity"("id", "alias", "roles", "created_at", "last_updated_at", "contactId") SELECT "id", "alias", "roles", "created_at", "last_updated_at", "contactId" FROM "Identity"`);
-    await queryRunner.query(`DROP TABLE "Identity"`);
-    await queryRunner.query(`ALTER TABLE "temporary_Identity" RENAME TO "Identity"`);
-    await queryRunner.query(`CREATE TABLE "temporary_Connection" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('OIDC','SIOPv2','SIOPv2+OpenID4VP') ) NOT NULL, "identityId" varchar, CONSTRAINT "REL_Connection_identityId" UNIQUE ("identityId"))`);
-    await queryRunner.query(`INSERT INTO "temporary_Connection"("id", "type", "identityId") SELECT "id", "type", "identityId" FROM "Connection"`);
-    await queryRunner.query(`DROP TABLE "Connection"`);
-    await queryRunner.query(`ALTER TABLE "temporary_Connection" RENAME TO "Connection"`);
-    await queryRunner.query(`CREATE TABLE "temporary_CorrelationIdentifier" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('did','url') ) NOT NULL, "correlation_id" text NOT NULL, "identity_id" varchar, CONSTRAINT "REL_CorrelationIdentifier_identityId" UNIQUE ("identity_id"), CONSTRAINT "UQ_CorrelationIdentifier_correlation_id" UNIQUE ("correlation_id"))`);
-    await queryRunner.query(`INSERT INTO "temporary_CorrelationIdentifier"("id", "type", "correlation_id", "identity_id") SELECT "id", "type", "correlation_id", "identityId" FROM "CorrelationIdentifier"`);
-    await queryRunner.query(`DROP TABLE "CorrelationIdentifier"`);
-    await queryRunner.query(`ALTER TABLE "temporary_CorrelationIdentifier" RENAME TO "CorrelationIdentifier"`);
-    await queryRunner.query(`CREATE TABLE "temporary_Identity" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255) NOT NULL, "roles" text NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "partyId" varchar, CONSTRAINT "UQ_Identity_alias" UNIQUE ("alias"))`);
-    await queryRunner.query(`INSERT INTO "temporary_Identity"("id", "alias", "roles", "created_at", "last_updated_at", "partyId") SELECT "id", "alias", "roles", "created_at", "last_updated_at", "contactId" FROM "Identity"`);
-    await queryRunner.query(`DROP TABLE "Identity"`);
-    await queryRunner.query(`ALTER TABLE "temporary_Identity" RENAME TO "Identity"`);
-    await queryRunner.query(`CREATE TABLE "temporary_Connection" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('OIDC','SIOPv2','SIOPv2+OpenID4VP') ) NOT NULL, "identity_id" varchar, CONSTRAINT "REL_Connection_identityId" UNIQUE ("identity_id"))`);
-    await queryRunner.query(`INSERT INTO "temporary_Connection"("id", "type", "identity_id") SELECT "id", "type", "identityId" FROM "Connection"`);
-    await queryRunner.query(`DROP TABLE "Connection"`);
-    await queryRunner.query(`ALTER TABLE "temporary_Connection" RENAME TO "Connection"`);
-    await queryRunner.query(`CREATE TABLE "PartyType" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('naturalPerson','organization') ) NOT NULL, "origin" varchar CHECK( "origin" IN ('INTERNAL', 'EXTERNAL') ) NOT NULL, "name" varchar(255) NOT NULL, "description" varchar(255), "tenant_id" varchar(255) NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "UQ_PartyType_name" UNIQUE ("name"))`);
-    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyType_type_tenant_id" ON "PartyType" ("type", "tenant_id")`);
-    await queryRunner.query(`CREATE TABLE "BaseContact" ("id" varchar PRIMARY KEY NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "legal_name" varchar(255), "display_name" varchar(255), "first_name" varchar(255), "middle_name" varchar(255), "last_name" varchar(255), "type" varchar NOT NULL, "party_id" varchar, CONSTRAINT "UQ_BaseContact_legal_name" UNIQUE ("legal_name"), CONSTRAINT "REL_BaseContact_party_id" UNIQUE ("party_id"))`);
-    await queryRunner.query(`CREATE INDEX "IDX_BaseContact_type" ON "BaseContact" ("type")`);
-    await queryRunner.query(`CREATE TABLE "PartyRelationship" ("id" varchar PRIMARY KEY NOT NULL, "left_id" varchar NOT NULL, "right_id" varchar NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
-    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyRelationship_left_right" ON "PartyRelationship" ("left_id", "right_id")`);
-    await queryRunner.query(`CREATE TABLE "Party" ("id" varchar PRIMARY KEY NOT NULL, "uri" varchar(255) NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "party_type_id" varchar NOT NULL)`);
-    await queryRunner.query(`CREATE TABLE "BaseConfig" ("id" varchar PRIMARY KEY NOT NULL, "identifier" varchar(255), "redirect_url" varchar(255), "session_id" varchar(255), "client_id" varchar(255), "client_secret" varchar(255), "scopes" text, "issuer" varchar(255), "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "type" varchar NOT NULL, "connection_id" varchar, CONSTRAINT "REL_BaseConfig_connection_id" UNIQUE ("connection_id"))`);
-    await queryRunner.query(`CREATE INDEX "IDX_BaseConfig_type" ON "BaseConfig" ("type")`);
-    await queryRunner.query(`CREATE TABLE "temporary_CorrelationIdentifier" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('did','url') ) NOT NULL, "correlation_id" text NOT NULL, "identity_id" varchar, CONSTRAINT "REL_CorrelationIdentifier_identity_id" UNIQUE ("identity_id"), CONSTRAINT "UQ_CorrelationIdentifier_correlation_id" UNIQUE ("correlation_id"), CONSTRAINT "FK_CorrelationIdentifier_identity_id" FOREIGN KEY ("identity_id") REFERENCES "Identity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_CorrelationIdentifier"("id", "type", "correlation_id", "identity_id") SELECT "id", "type", "correlation_id", "identity_id" FROM "CorrelationIdentifier"`);
-    await queryRunner.query(`DROP TABLE "CorrelationIdentifier"`);
-    await queryRunner.query(`ALTER TABLE "temporary_CorrelationIdentifier" RENAME TO "CorrelationIdentifier"`);
-    await queryRunner.query(`DROP INDEX "IDX_BaseContact_type"`);
-    await queryRunner.query(`CREATE TABLE "temporary_BaseContact" ("id" varchar PRIMARY KEY NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "legal_name" varchar(255), "display_name" varchar(255), "first_name" varchar(255), "middle_name" varchar(255), "last_name" varchar(255), "type" varchar NOT NULL, "party_id" varchar, CONSTRAINT "UQ_BaseContact_legal_name" UNIQUE ("legal_name"), CONSTRAINT "REL_BaseContact_party_id" UNIQUE ("party_id"), CONSTRAINT "FK_BaseContact_party_id" FOREIGN KEY ("party_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_BaseContact"("id", "created_at", "last_updated_at", "legal_name", "display_name", "first_name", "middle_name", "last_name", "type", "party_id") SELECT "id", "created_at", "last_updated_at", "legal_name", "display_name", "first_name", "middle_name", "last_name", "type", "party_id" FROM "BaseContact"`);
-    await queryRunner.query(`DROP TABLE "BaseContact"`);
-    await queryRunner.query(`ALTER TABLE "temporary_BaseContact" RENAME TO "BaseContact"`);
-    await queryRunner.query(`CREATE INDEX "IDX_BaseContact_type" ON "BaseContact" ("type")`);
-    await queryRunner.query(`DROP INDEX "IDX_PartyRelationship_left_right"`);
-    await queryRunner.query(`CREATE TABLE "temporary_PartyRelationship" ("id" varchar PRIMARY KEY NOT NULL, "left_id" varchar NOT NULL, "right_id" varchar NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "FK_PartyRelationship_left_id" FOREIGN KEY ("left_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_PartyRelationship_right_id" FOREIGN KEY ("right_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_PartyRelationship"("id", "left_id", "right_id", "created_at", "last_updated_at") SELECT "id", "left_id", "right_id", "created_at", "last_updated_at" FROM "PartyRelationship"`);
-    await queryRunner.query(`DROP TABLE "PartyRelationship"`);
-    await queryRunner.query(`ALTER TABLE "temporary_PartyRelationship" RENAME TO "PartyRelationship"`);
-    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyRelationship_left_right" ON "PartyRelationship" ("left_id", "right_id")`);
-    await queryRunner.query(`CREATE TABLE "ElectronicAddress" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar(255) NOT NULL, "electronic_address" varchar(255) NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "partyId" varchar, CONSTRAINT "FK_ElectronicAddress_partyId" FOREIGN KEY ("partyId") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`CREATE TABLE "PhysicalAddress" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar(255) NOT NULL, "street_name" varchar(255) NOT NULL, "street_number" varchar(255) NOT NULL, "postal_code" varchar(255) NOT NULL, "city_name" varchar(255) NOT NULL, "province_name" varchar(255) NOT NULL, "country_code" varchar(2) NOT NULL, "building_name" varchar(255), "partyId" varchar, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "FK_PhysicalAddressEntity_partyId" FOREIGN KEY ("partyId") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`CREATE TABLE "temporary_Party" ("id" varchar PRIMARY KEY NOT NULL, "uri" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "party_type_id" varchar NOT NULL, CONSTRAINT "FK_Party_party_type_id" FOREIGN KEY ("party_type_id") REFERENCES "PartyType" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_Party"("id", "uri", "created_at", "last_updated_at", "party_type_id") SELECT "id", "uri", "created_at", "last_updated_at", "party_type_id" FROM "Party"`);
-    await queryRunner.query(`DROP TABLE "Party"`);
-    await queryRunner.query(`ALTER TABLE "temporary_Party" RENAME TO "Party"`);
-    await queryRunner.query(`CREATE TABLE "temporary_Identity" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255) NOT NULL, "roles" text NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "partyId" varchar, CONSTRAINT "UQ_Identity_alias" UNIQUE ("alias"), CONSTRAINT "FK_Identity_partyId" FOREIGN KEY ("partyId") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_Identity"("id", "alias", "roles", "created_at", "last_updated_at", "partyId") SELECT "id", "alias", "roles", "created_at", "last_updated_at", "partyId" FROM "Identity"`);
-    await queryRunner.query(`DROP TABLE "Identity"`);
-    await queryRunner.query(`ALTER TABLE "temporary_Identity" RENAME TO "Identity"`);
-    await queryRunner.query(`CREATE TABLE "temporary_Connection" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('OIDC','SIOPv2','SIOPv2+OpenID4VP') ) NOT NULL, "identity_id" varchar, CONSTRAINT "REL_Connection_identity_id" UNIQUE ("identity_id"), CONSTRAINT "FK_Connection_identity_id" FOREIGN KEY ("identity_id") REFERENCES "Identity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_Connection"("id", "type", "identity_id") SELECT "id", "type", "identity_id" FROM "Connection"`);
-    await queryRunner.query(`DROP TABLE "Connection"`);
-    await queryRunner.query(`ALTER TABLE "temporary_Connection" RENAME TO "Connection"`);
-    await queryRunner.query(`DROP INDEX "IDX_BaseConfig_type"`);
-    await queryRunner.query(`CREATE TABLE "temporary_BaseConfig" ("id" varchar PRIMARY KEY NOT NULL, "identifier" varchar(255), "redirect_url" varchar(255), "session_id" varchar(255), "client_id" varchar(255), "client_secret" varchar(255), "scopes" text, "issuer" varchar(255), "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "type" varchar NOT NULL, "connection_id" varchar, CONSTRAINT "REL_BaseConfig_connection_id" UNIQUE ("connection_id"), CONSTRAINT "FK_BaseConfig_connection_id" FOREIGN KEY ("connection_id") REFERENCES "Connection" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_BaseConfig"("id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id") SELECT "id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id" FROM "BaseConfig"`);
-    await queryRunner.query(`DROP TABLE "BaseConfig"`);
-    await queryRunner.query(`ALTER TABLE "temporary_BaseConfig" RENAME TO "BaseConfig"`);
-    await queryRunner.query(`CREATE INDEX "IDX_BaseConfig_type" ON "BaseConfig" ("type")`);
-    await queryRunner.query(`INSERT INTO "BaseConfig"("id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id") SELECT "id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connectionId" FROM "BaseConfigEntity"`);
-    await queryRunner.query(`DROP TABLE "BaseConfigEntity"`);
-    await queryRunner.query(`INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('3875c12e-fdaa-4ef6-a340-c936e054b627', 'organization', 'INTERNAL', 'Sphereon_default_organization_type', 'sphereon_default_organization', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', datetime('now'), datetime('now'))`);
-    await queryRunner.query(`INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('7d248798-41ca-4fc1-a130-9934b43d532e', 'naturalPerson', 'INTERNAL', 'Sphereon_default_natural_person_type', 'sphereon_default_natural_person', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', datetime('now'), datetime('now'))`);
-    await queryRunner.query(`INSERT INTO "Party"(id, uri, created_at, last_updated_at, party_type_id) SELECT id, uri, created_at, last_updated_at, '3875c12e-fdaa-4ef6-a340-c936e054b627' FROM "Contact"`);
-    await queryRunner.query(`INSERT INTO "BaseContact"(id, legal_name, display_name, party_id, created_at, last_updated_at, type) SELECT id, name, alias, id, created_at, last_updated_at, 'Organization' FROM "Contact"`);
-    await queryRunner.query(`DROP TABLE "Contact"`);
-  }
-  async down(queryRunner) {
-    await queryRunner.query(`CREATE TABLE "Contact" ("id" varchar PRIMARY KEY NOT NULL, "uri" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar(255), "alias" varchar(255))`);
-    await queryRunner.query(`INSERT INTO "Contact"(id, uri, created_at, last_updated_at, name, alias) SELECT id, uri, created_at, last_updated_at, (SELECT legal_name FROM "BaseContact" WHERE "BaseContact"."party_id" = "Party"."id"), (SELECT display_name FROM "BaseContact" WHERE "BaseContact"."party_id" = "Party"."id") FROM "Party" WHERE party_type_id = '3875c12e-fdaa-4ef6-a340-c936e054b627'`);
-    await queryRunner.query(`DROP TABLE "BaseContact"`);
-    await queryRunner.query(`DROP TABLE "Party"`);
-    await queryRunner.query(`CREATE TABLE "BaseConfigEntity" ("id" varchar PRIMARY KEY NOT NULL, "identifier" varchar(255), "redirect_url" varchar(255), "session_id" varchar(255), "client_id" varchar(255), "client_secret" varchar(255), "scopes" text, "issuer" varchar(255), "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "type" varchar NOT NULL, "connectionId" varchar)`);
-    await queryRunner.query(`INSERT INTO "BaseConfigEntity"("id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connectionId") SELECT "id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id" FROM "BaseConfig"`);
-    await queryRunner.query(`DROP TABLE "BaseConfig"`);
-    await queryRunner.query(`CREATE TABLE "temporary_Party" ("id" varchar PRIMARY KEY NOT NULL, "uri" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "party_type_id" varchar NOT NULL, CONSTRAINT "FK_Party_party_type_id" FOREIGN KEY ("party_type_id") REFERENCES "PartyType" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_Party"("id", "uri", "created_at", "last_updated_at", "party_type_id") SELECT "id", "uri", "created_at", "last_updated_at", "party_type_id" FROM "Party"`);
-    await queryRunner.query(`DROP TABLE "Party"`);
-    await queryRunner.query(`ALTER TABLE "temporary_Party" RENAME TO "Party"`);
-    await queryRunner.query(`DROP INDEX "IDX_PartyRelationship_left_right"`);
-    await queryRunner.query(`CREATE TABLE "temporary_PartyRelationship" ("id" varchar PRIMARY KEY NOT NULL, "left_id" varchar NOT NULL, "right_id" varchar NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "FK_PartyRelationship_left_id" FOREIGN KEY ("left_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_PartyRelationship_right_id" FOREIGN KEY ("right_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_PartyRelationship"("id", "left_id", "right_id", "created_at", "last_updated_at") SELECT "id", "left_id", "right_id", "created_at", "last_updated_at" FROM "PartyRelationship"`);
-    await queryRunner.query(`DROP TABLE "PartyRelationship"`);
-    await queryRunner.query(`ALTER TABLE "temporary_PartyRelationship" RENAME TO "PartyRelationship"`);
-    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyRelationship_left_right" ON "PartyRelationship" ("left_id", "right_id")`);
-    await queryRunner.query(`DROP INDEX "IDX_BaseContact_type"`);
-    await queryRunner.query(`CREATE TABLE "temporary_BaseContact" ("id" varchar PRIMARY KEY NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "legal_name" varchar(255), "display_name" varchar(255), "first_name" varchar(255), "middle_name" varchar(255), "last_name" varchar(255), "type" varchar NOT NULL, "party_id" varchar, CONSTRAINT "UQ_BaseContact_legal_name" UNIQUE ("legal_name"), CONSTRAINT "REL_BaseContact_party_id" UNIQUE ("party_id"), CONSTRAINT "FK_BaseContact_party_id" FOREIGN KEY ("party_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_BaseContact"("id", "created_at", "last_updated_at", "legal_name", "display_name", "first_name", "middle_name", "last_name", "type", "party_id") SELECT "id", "created_at", "last_updated_at", "legal_name", "display_name", "first_name", "middle_name", "last_name", "type", "party_id" FROM "BaseContact"`);
-    await queryRunner.query(`DROP TABLE "BaseContact"`);
-    await queryRunner.query(`ALTER TABLE "temporary_BaseContact" RENAME TO "BaseContact"`);
-    await queryRunner.query(`CREATE INDEX "IDX_BaseContact_type" ON "BaseContact" ("type")`);
-    await queryRunner.query(`DROP INDEX "IDX_BaseConfig_type"`);
-    await queryRunner.query(`CREATE TABLE "temporary_BaseConfig" ("id" varchar PRIMARY KEY NOT NULL, "identifier" varchar(255), "redirect_url" varchar(255), "session_id" varchar(255), "client_id" varchar(255), "client_secret" varchar(255), "scopes" text, "issuer" varchar(255), "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "type" varchar NOT NULL, "connection_id" varchar, CONSTRAINT "REL_BaseConfig_connection_id" UNIQUE ("connection_id"), CONSTRAINT "FK_BaseConfig_connection_id" FOREIGN KEY ("connection_id") REFERENCES "Connection" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-    await queryRunner.query(`INSERT INTO "temporary_BaseConfig"("id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id") SELECT "id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id" FROM "BaseConfig"`);
-    await queryRunner.query(`DROP TABLE "BaseConfig"`);
-    await queryRunner.query(`ALTER TABLE "temporary_BaseConfig" RENAME TO "BaseConfig"`);
-    await queryRunner.query(`CREATE INDEX "IDX_BaseConfig_type" ON "BaseConfig" ("type")`);
-    await queryRunner.query(`DROP INDEX "IDX_PartyType_type_tenant_id"`);
-    await queryRunner.query(`DROP TABLE "PartyType"`);
-    await queryRunner.query(`DROP TABLE "Connection"`);
-    await queryRunner.query(`DROP TABLE "Identity"`);
-    await queryRunner.query(`DROP TABLE "CorrelationIdentifier"`);
-    await queryRunner.query(`DROP TABLE "ElectronicAddress"`);
-    await queryRunner.query(`DROP TABLE "PhysicalAddress"`);
-  }
-};
-
-// src/migrations/postgres/1690925872592-CreateContacts.ts
-var import_ssi_sdk22 = require("@sphereon/ssi-sdk.core");
-var CreateContacts1690925872592 = class {
-  static {
-    __name(this, "CreateContacts1690925872592");
-  }
-  name = "CreateContacts1690925872592";
-  async up(queryRunner) {
-    await (0, import_ssi_sdk22.enablePostgresUuidExtension)(queryRunner);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP CONSTRAINT "FK_CorrelationIdentifier_identityId"`);
-    await queryRunner.query(`ALTER TABLE "IdentityMetadata" DROP CONSTRAINT "FK_IdentityMetadata_identityId"`);
-    await queryRunner.query(`ALTER TABLE "Identity" DROP CONSTRAINT "FK_Identity_contactId"`);
-    await queryRunner.query(`ALTER TABLE "Connection" DROP CONSTRAINT "FK_Connection_identityId"`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" RENAME COLUMN "identityId" TO "identity_id"`);
-    await queryRunner.query(`ALTER TABLE "Connection" RENAME COLUMN "identityId" TO "identity_id"`);
-    await queryRunner.query(`CREATE TYPE "public"."PartyType_type_enum" AS ENUM('naturalPerson', 'organization')`);
-    await queryRunner.query(`CREATE TYPE "public"."PartyOrigin_type_enum" AS ENUM('INTERNAL', 'EXTERNAL')`);
-    await queryRunner.query(`CREATE TABLE "PartyType" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "type" "public"."PartyType_type_enum" NOT NULL, "origin" "public"."PartyOrigin_type_enum" NOT NULL, "name" character varying(255) NOT NULL, "description" character varying(255), "tenant_id" character varying(255) NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "UQ_PartyType_name" UNIQUE ("name"), CONSTRAINT "PK_PartyType_id" PRIMARY KEY ("id"))`);
-    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyType_type_tenant_id" ON "PartyType" ("type", "tenant_id")`);
-    await queryRunner.query(`CREATE TABLE "BaseContact" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), "legal_name" character varying(255), "display_name" character varying(255), "first_name" character varying(255), "middle_name" character varying(255), "last_name" character varying(255), "type" character varying NOT NULL, "party_id" uuid, CONSTRAINT "UQ_BaseContact_legal_name" UNIQUE ("legal_name"), CONSTRAINT "REL_BaseContact_party_id" UNIQUE ("party_id"), CONSTRAINT "PK_BaseContact_id" PRIMARY KEY ("id"))`);
-    await queryRunner.query(`CREATE INDEX "IDX_BaseContact_type" ON "BaseContact" ("type")`);
-    await queryRunner.query(`CREATE TABLE "PartyRelationship" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "left_id" uuid NOT NULL, "right_id" uuid NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_PartyRelationship_id" PRIMARY KEY ("id"))`);
-    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyRelationship_left_right" ON "PartyRelationship" ("left_id", "right_id")`);
-    await queryRunner.query(`CREATE TABLE "ElectronicAddress" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "type" character varying(255) NOT NULL, "electronic_address" character varying(255) NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), "partyId" uuid, CONSTRAINT "PK_ElectronicAddress_id" PRIMARY KEY ("id"))`);
-    await queryRunner.query(`CREATE TABLE "PhysicalAddress" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "type" character varying(255) NOT NULL, "street_name" character varying(255) NOT NULL, "street_number" character varying(255) NOT NULL, "postal_code" character varying(255) NOT NULL, "city_name" character varying(255) NOT NULL, "province_name" character varying(255) NOT NULL, "country_code" character varying(2) NOT NULL, "building_name" character varying(255), "partyId" uuid, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_PhysicalAddress_id" PRIMARY KEY ("id"))`);
-    await queryRunner.query(`CREATE TABLE "Party" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "uri" character varying(255), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), "party_type_id" uuid NOT NULL, CONSTRAINT "PK_Party_id" PRIMARY KEY ("id"))`);
-    await queryRunner.query(`CREATE TABLE "BaseConfig" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "identifier" character varying(255), "redirect_url" character varying(255), "session_id" character varying(255), "client_id" character varying(255), "client_secret" character varying(255), "scopes" text, "issuer" character varying(255), "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "type" character varying NOT NULL, "connection_id" uuid, CONSTRAINT "REL_BaseConfig_connection_id" UNIQUE ("connection_id"), CONSTRAINT "PK_BaseConfig_id" PRIMARY KEY ("id"))`);
-    await queryRunner.query(`CREATE INDEX "IDX_BaseConfig_type" ON "BaseConfig" ("type")`);
-    await queryRunner.query(`ALTER TABLE "Identity" RENAME COLUMN "contactId" TO "partyId"`);
-    await queryRunner.query(`ALTER TABLE "Identity" ALTER COLUMN "roles" SET NOT NULL`);
-    await queryRunner.query(`CREATE TYPE "public"."IdentityOrigin_type_enum" AS ENUM('INTERNAL', 'EXTERNAL')`);
-    await queryRunner.query(`ALTER TABLE "Identity" ADD COLUMN "origin" "public"."IdentityOrigin_type_enum" DEFAULT 'EXTERNAL' NOT NULL`);
-    await queryRunner.query(`ALTER TABLE "Identity" ALTER COLUMN "origin" DROP DEFAULT`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD CONSTRAINT "FK_CorrelationIdentifier_identity_id" FOREIGN KEY ("identity_id") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "IdentityMetadata" ADD CONSTRAINT "FK_IdentityMetadata_identityId" FOREIGN KEY ("identityId") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "BaseContact" ADD CONSTRAINT "FK_BaseContact_party_id" FOREIGN KEY ("party_id") REFERENCES "Party"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD CONSTRAINT "FK_PartyRelationship_left_id" FOREIGN KEY ("left_id") REFERENCES "Party"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD CONSTRAINT "FK_PartyRelationship_right_id" FOREIGN KEY ("right_id") REFERENCES "Party"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "ElectronicAddress" ADD CONSTRAINT "FK_ElectronicAddress_partyId" FOREIGN KEY ("partyId") REFERENCES "Party"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "PhysicalAddress" ADD CONSTRAINT "FK_PhysicalAddress_partyId" FOREIGN KEY ("partyId") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "Party" ADD CONSTRAINT "FK_Party_party_type_id" FOREIGN KEY ("party_type_id") REFERENCES "PartyType"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "Identity" ADD CONSTRAINT "FK_Identity_partyId" FOREIGN KEY ("partyId") REFERENCES "Party"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "Connection" ADD CONSTRAINT "FK_Connection_identity_id" FOREIGN KEY ("identity_id") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "BaseConfig" ADD CONSTRAINT "FK_BaseConfig_connection_id" FOREIGN KEY ("connection_id") REFERENCES "Connection"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" RENAME CONSTRAINT "UQ_Correlation_id" TO "UQ_CorrelationIdentifier_correlation_id"`);
-    await queryRunner.query(`ALTER TABLE "Identity" RENAME CONSTRAINT "UQ_Identity_Alias" TO "UQ_Identity_alias"`);
-    await queryRunner.query(`INSERT INTO "BaseConfig"("id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id") SELECT "id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connectionId" FROM "BaseConfigEntity"`);
-    await queryRunner.query(`DROP TABLE "BaseConfigEntity"`);
-    await queryRunner.query(`INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('3875c12e-fdaa-4ef6-a340-c936e054b627', 'organization', 'INTERNAL', 'Sphereon_default_organization_type', 'sphereon_default_organization', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', now(), now())`);
-    await queryRunner.query(`INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('7d248798-41ca-4fc1-a130-9934b43d532e', 'naturalPerson', 'INTERNAL', 'Sphereon_default_natural_person_type', 'sphereon_default_natural_person', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', now(), now())`);
-    await queryRunner.query(`INSERT INTO "Party"(id, uri, created_at, last_updated_at, party_type_id) SELECT id, uri, created_at, last_updated_at, '3875c12e-fdaa-4ef6-a340-c936e054b627' FROM "Contact"`);
-    await queryRunner.query(`INSERT INTO "BaseContact"(id, legal_name, display_name, party_id, created_at, last_updated_at, type) SELECT id, name, alias, id, created_at, last_updated_at, 'Organization' FROM "Contact"`);
-    await queryRunner.query(`DROP TABLE "Contact"`);
-  }
-  async down(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "BaseConfig" DROP CONSTRAINT "FK_BaseConfig_connection_id"`);
-    await queryRunner.query(`ALTER TABLE "Connection" DROP CONSTRAINT "FK_Connection_identity_id"`);
-    await queryRunner.query(`ALTER TABLE "Identity" DROP CONSTRAINT "FK_Identity_partyId"`);
-    await queryRunner.query(`ALTER TABLE "Party" DROP CONSTRAINT "FK_Party_party_type_id"`);
-    await queryRunner.query(`ALTER TABLE "PhysicalAddress" DROP CONSTRAINT "FK_PhysicalAddress_partyId"`);
-    await queryRunner.query(`ALTER TABLE "ElectronicAddress" DROP CONSTRAINT "FK_ElectronicAddress_partyId"`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP CONSTRAINT "FK_PartyRelationship_right_id"`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP CONSTRAINT "FK_PartyRelationship_left_id"`);
-    await queryRunner.query(`ALTER TABLE "BaseContact" DROP CONSTRAINT "FK_BaseContact_party_id"`);
-    await queryRunner.query(`ALTER TABLE "IdentityMetadata" DROP CONSTRAINT "FK_IdentityMetadata_identityId"`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP CONSTRAINT "FK_CorrelationIdentifier_identity_id"`);
-    await queryRunner.query(`ALTER TABLE "Identity" ALTER COLUMN "roles" DROP NOT NULL`);
-    await queryRunner.query(`ALTER TABLE "Identity" DROP COLUMN "origin"`);
-    await queryRunner.query(`DROP TYPE "public"."IdentityOrigin_type_enum"`);
-    await queryRunner.query(`ALTER TABLE "Identity" RENAME COLUMN "partyId" TO "contactId"`);
-    await queryRunner.query(`ALTER TABLE "Connection" RENAME COLUMN "identity_id" TO "identityId"`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" RENAME COLUMN "identity_id" TO "identityId"`);
-    await queryRunner.query(`DROP INDEX "IDX_BaseConfig_type"`);
-    await queryRunner.query(`DROP TABLE "BaseConfig"`);
-    await queryRunner.query(`DROP TABLE "Party"`);
-    await queryRunner.query(`DROP INDEX "IDX_PartyRelationship_left_right"`);
-    await queryRunner.query(`DROP TABLE "PartyRelationship"`);
-    await queryRunner.query(`DROP INDEX "IDX_BaseContact_type"`);
-    await queryRunner.query(`DROP TABLE "BaseContact"`);
-    await queryRunner.query(`DROP TABLE "ElectronicAddress"`);
-    await queryRunner.query(`DROP TABLE "PhysicalAddress"`);
-    await queryRunner.query(`DROP INDEX "IDX_PartyType_type_tenant_id"`);
-    await queryRunner.query(`DROP TABLE "PartyType"`);
-    await queryRunner.query(`DROP TYPE "public"."PartyOrigin_type_enum"`);
-    await queryRunner.query(`DROP TYPE "public"."PartyType_type_enum"`);
-    await queryRunner.query(`ALTER TABLE "Connection" ADD CONSTRAINT "FK_Connection_identityId" FOREIGN KEY ("identityId") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "Identity" ADD CONSTRAINT "FK_Identity_contactId" FOREIGN KEY ("contactId") REFERENCES "Contact"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "IdentityMetadata" ADD CONSTRAINT "FK_IdentityMetadata_identityId" FOREIGN KEY ("identityId") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD CONSTRAINT "FK_CorrelationIdentifier_identityId" FOREIGN KEY ("identityId") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    await queryRunner.query(`CREATE TABLE "Contact" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "uri" character varying(255), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), "name" character varying(255), "alias" character varying(255), CONSTRAINT "PK_Contact_id" PRIMARY KEY ("id"))`);
-    await queryRunner.query(`INSERT INTO "Contact"(id, uri, created_at, last_updated_at, name, alias) SELECT id, uri, created_at, last_updated_at, (SELECT legal_name FROM "BaseContact" WHERE "BaseContact"."party_id" = "Party"."id"), (SELECT display_name FROM "BaseContact" WHERE "BaseContact"."party_id" = "Party"."id") FROM "Party" WHERE party_type_id = '3875c12e-fdaa-4ef6-a340-c936e054b627'`);
-  }
-};
-
-// src/migrations/generic/3-CreateContacts.ts
-var debug10 = (0, import_debug10.default)("sphereon:ssi-sdk:migrations");
-var CreateContacts1690925872318 = class {
-  static {
-    __name(this, "CreateContacts1690925872318");
-  }
-  name = "CreateContacts1690925872318";
-  async up(queryRunner) {
-    debug10("migration: creating contacts tables");
-    const dbType = queryRunner.connection.driver.options.type;
-    switch (dbType) {
-      case "postgres": {
-        debug10("using postgres migration file");
-        const mig = new CreateContacts1690925872592();
-        await mig.up(queryRunner);
-        debug10("Migration statements executed");
-        return;
-      }
-      case "sqlite":
-      case "expo":
-      case "react-native": {
-        debug10("using sqlite/react-native migration file");
-        const mig = new CreateContacts1690925872693();
-        await mig.up(queryRunner);
-        debug10("Migration statements executed");
-        return;
-      }
-      default:
-        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
-    }
-  }
-  async down(queryRunner) {
-    debug10("migration: reverting contacts tables");
-    const dbType = queryRunner.connection.driver.options.type;
-    switch (dbType) {
-      case "postgres": {
-        debug10("using postgres migration file");
-        const mig = new CreateContacts1690925872592();
-        await mig.down(queryRunner);
-        debug10("Migration statements executed");
-        return;
-      }
-      case "sqlite":
-      case "expo":
-      case "react-native": {
-        debug10("using sqlite/react-native migration file");
-        const mig = new CreateContacts1690925872693();
-        await mig.down(queryRunner);
-        debug10("Migration statements executed");
-        return;
-      }
-      default:
-        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
-    }
-  }
-};
-
-// src/migrations/generic/4-CreateStatusList.ts
-var import_debug11 = __toESM(require("debug"), 1);
-
-// src/migrations/postgres/1693866470001-CreateStatusList.ts
-var CreateStatusList1693866470001 = class {
-  static {
-    __name(this, "CreateStatusList1693866470001");
-  }
-  name = "CreateStatusList1693866470001";
-  async up(queryRunner) {
-    await queryRunner.query(`CREATE TYPE "StatusList_type_enum" AS ENUM('StatusList2021')`);
-    await queryRunner.query(`CREATE TYPE "StatusList_drivertype_enum" AS ENUM('agent_typeorm', 'agent_kv_store', 'github', 'agent_filesystem')`);
-    await queryRunner.query(`CREATE TYPE "StatusList_credentialidmode_enum" AS ENUM('ISSUANCE', 'PERSISTENCE', 'NEVER')`);
-    await queryRunner.query(`CREATE TABLE "StatusListEntry"
-             (
-                 "statusListId"    character varying NOT NULL,
-                 "statusListIndex" integer           NOT NULL,
-                 "credentialId"    character varying,
-                 "credentialHash"  character varying(128),
-                 "correlationId"   character varying(255),
-                 "value"           character varying(50),
-                 CONSTRAINT "PK_68704d2d13857360c6b44a3d1d0" PRIMARY KEY ("statusListId", "statusListIndex")
-             )`);
-    await queryRunner.query(`CREATE TABLE "StatusList"
-             (
-                 "id"                   character varying                  NOT NULL,
-                 "correlationId"        character varying                  NOT NULL,
-                 "length"               integer                            NOT NULL,
-                 "issuer"               text                               NOT NULL,
-                 "type"                 "StatusList_type_enum"             NOT NULL DEFAULT 'StatusList2021',
-                 "driverType"           "StatusList_drivertype_enum"       NOT NULL DEFAULT 'agent_typeorm',
-                 "credentialIdMode"     "StatusList_credentialidmode_enum" NOT NULL DEFAULT 'ISSUANCE',
-                 "proofFormat"          character varying                  NOT NULL DEFAULT 'lds',
-                 "indexingDirection"    character varying                  NOT NULL DEFAULT 'rightToLeft',
-                 "statusPurpose"        character varying                  NOT NULL DEFAULT 'revocation',
-                 "statusListCredential" text,
-                 CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId"),
-                 CONSTRAINT "PK_StatusList_Id" PRIMARY KEY ("id")
-             )`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry"
-                ADD CONSTRAINT "FK_statusListEntry_statusListId" FOREIGN KEY ("statusListId") REFERENCES "StatusList" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-  }
-  async down(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "StatusListEntry"
-            DROP CONSTRAINT "FK_statusListEntry_statusListId"`);
-    await queryRunner.query(`DROP TABLE "StatusListEntry"`);
-    await queryRunner.query(`DROP TABLE "StatusList"`);
-    await queryRunner.query(`DROP TYPE "StatusList_credentialidmode_enum"`);
-    await queryRunner.query(`DROP TYPE "StatusList_drivertype_enum"`);
-    await queryRunner.query(`DROP TYPE "StatusList_type_enum"`);
-  }
-};
-
-// src/migrations/sqlite/1693866470000-CreateStatusList.ts
-var CreateStatusList1693866470002 = class {
-  static {
-    __name(this, "CreateStatusList1693866470002");
-  }
-  name = "CreateStatusList1693866470002";
-  async up(queryRunner) {
-    await queryRunner.query(`CREATE TABLE "StatusListEntry"
-             (
-                 "statusListId"    varchar NOT NULL,
-                 "statusListIndex" integer NOT NULL,
-                 "credentialId"    varchar,
-                 "credentialHash"  varchar(128),
-                 "correlationId"   varchar(255),
-                 "value"           varchar(50),
-                 PRIMARY KEY ("statusListId", "statusListIndex")
-             )`);
-    await queryRunner.query(`CREATE TABLE "StatusList"
-             (
-                 "id"                   varchar PRIMARY KEY                                                          NOT NULL,
-                 "correlationId"        varchar                                                                      NOT NULL,
-                 "length"               integer                                                                      NOT NULL,
-                 "issuer"               text                                                                         NOT NULL,
-                 "type"                 varchar CHECK ( "type" IN ('StatusList2021') )                               NOT NULL DEFAULT ('StatusList2021'),
-                 "driverType"           varchar CHECK ( "driverType" IN ('agent_typeorm', 'agent_kv_store', 'github',
-                                                                         'agent_filesystem') )                       NOT NULL DEFAULT ('agent_typeorm'),
-                 "credentialIdMode"     varchar CHECK ( "credentialIdMode" IN ('ISSUANCE', 'PERSISTENCE', 'NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
-                 "proofFormat"          varchar CHECK ( "proofFormat" IN ('lds', 'jwt') )                            NOT NULL DEFAULT ('lds'),
-                 "indexingDirection"    varchar CHECK ( "indexingDirection" IN ('rightToLeft') )                     NOT NULL DEFAULT ('rightToLeft'),
-                 "statusPurpose"        varchar                                                                      NOT NULL DEFAULT ('revocation'),
-                 "statusListCredential" text,
-                 CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
-             )`);
-    await queryRunner.query(`CREATE TABLE "temporary_StatusListEntry"
-             (
-                 "statusListId"    varchar NOT NULL,
-                 "statusListIndex" integer NOT NULL,
-                 "credentialId"    varchar,
-                 "credentialHash"  varchar(128),
-                 "correlationId"   varchar(255),
-                 "value"           varchar(50),
-                 CONSTRAINT "FK_statusListEntry_statusListId" FOREIGN KEY ("statusListId") REFERENCES "StatusList" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION,
-                 PRIMARY KEY ("statusListId", "statusListIndex")
-             )`);
-    await queryRunner.query(`INSERT INTO "temporary_StatusListEntry"("statusListId", "statusListIndex", "credentialId",
-                                                     "credentialHash", "correlationId", "value")
-             SELECT "statusListId", "statusListIndex", "credentialId", "credentialHash", "correlationId", "value"
-             FROM "StatusListEntry"`);
-    await queryRunner.query(`DROP TABLE "StatusListEntry"`);
-    await queryRunner.query(`ALTER TABLE "temporary_StatusListEntry" RENAME TO "StatusListEntry"`);
+    await queryRunner.startTransaction();
+    await queryRunner.query(`ALTER TYPE "StatusList_type_enum" ADD VALUE 'BitstringStatusList'`);
+    await queryRunner.commitTransaction();
   }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "StatusListEntry"`);
-    await queryRunner.query(`DROP TABLE "StatusList"`);
   }
 };
-
-// src/migrations/postgres/1737110469001-UpdateStatusList.ts
-var UpdateStatusList1737110469001 = class {
+var CreateBitstringStatusListPG1741895823000 = class {
   static {
-    __name(this, "UpdateStatusList1737110469001");
+    __name(this, "CreateBitstringStatusListPG1741895823000");
   }
-  name = "UpdateStatusList1737110469001";
+  name = "CreateBitstringStatusList1741895823000";
   async up(queryRunner) {
-    await queryRunner.query(`ALTER TYPE "StatusList_type_enum" ADD VALUE 'OAuthStatusList'`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "indexingDirection" DROP NOT NULL`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "statusPurpose" DROP NOT NULL`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ADD "bitsPerStatus" integer`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ADD "expiresAt" timestamp with time zone`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "ttl" integer`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "validFrom" TIMESTAMP`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "validUntil" TIMESTAMP`);
+    await queryRunner.query(`ALTER TABLE "StatusList" DROP CONSTRAINT IF EXISTS "CHK_StatusList_type"`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ADD CONSTRAINT "CHK_StatusList_type" CHECK ("type" IN ('StatusList2021', 'OAuthStatusList', 'BitstringStatusList'))`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "type" character varying NOT NULL DEFAULT 'StatusListEntryEntity'`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusPurpose" character varying`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusMessage" text`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusReference" text`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD CONSTRAINT "CHK_StatusListEntry_type" CHECK ("type" IN ('StatusListEntryEntity', 'bitstring'))`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "expiresAt"`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP CONSTRAINT "CHK_StatusListEntry_type"`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "statusReference"`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "statusMessage"`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "bitsPerStatus"`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "statusPurpose"`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "type"`);
+    await queryRunner.query(`ALTER TABLE "StatusList" DROP CONSTRAINT "CHK_StatusList_type"`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ADD CONSTRAINT "CHK_StatusList_type" CHECK ("type" IN ('StatusList2021', 'OAuthStatusList'))`);
+    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "validUntil"`);
+    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "validFrom"`);
+    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "ttl"`);
     await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "bitsPerStatus"`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "statusPurpose" SET NOT NULL`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "indexingDirection" SET NOT NULL`);
   }
 };
 
-// src/migrations/sqlite/1737110469000-UpdateStatusList.ts
-var UpdateStatusList1737110469000 = class {
+// src/migrations/sqlite/1741895823001-CreateBitstringStatusList.ts
+var CreateBitstringStatusListSqlite1741895823001 = class {
   static {
-    __name(this, "UpdateStatusList1737110469000");
+    __name(this, "CreateBitstringStatusListSqlite1741895823001");
   }
-  name = "UpdateStatusList1737110469000";
+  name = "CreateBitstringStatusList1741895823000";
   async up(queryRunner) {
-    await queryRunner.query(`CREATE TABLE "temporary_StatusList" (
-                "id" varchar PRIMARY KEY NOT NULL,
-                "correlationId" varchar NOT NULL,
-                "length" integer NOT NULL,
-                "issuer" text NOT NULL,
-                "type" varchar CHECK( "type" IN ('StatusList2021', 'OAuthStatusList') ) NOT NULL DEFAULT ('StatusList2021'),
-                "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
-                "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
-                "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt') ) NOT NULL DEFAULT ('lds'),
-                "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ),
-                "statusPurpose" varchar,
-                "statusListCredential" text,
-                "bitsPerStatus" integer,
-                "expiresAt" datetime,
-                CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
-            )`);
-    await queryRunner.query(`INSERT INTO "temporary_StatusList"(
-                "id", "correlationId", "length", "issuer", "type", "driverType",
-                "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
-                "statusListCredential"
-            )
-            SELECT 
-                "id", "correlationId", "length", "issuer", "type", "driverType",
-                "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
-                "statusListCredential"
-            FROM "StatusList"`);
+    await queryRunner.query(`
+      CREATE TABLE "temporary_StatusList" (
+        "id" varchar PRIMARY KEY NOT NULL,
+        "correlationId" varchar NOT NULL,
+        "length" integer NOT NULL,
+        "issuer" text NOT NULL,
+        "type" varchar CHECK( "type" IN ('StatusList2021', 'OAuthStatusList', 'BitstringStatusList') ) NOT NULL DEFAULT ('StatusList2021'),
+        "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
+        "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
+        "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt', 'vc+jwt') ) NOT NULL DEFAULT ('lds'),
+        "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ),
+        "statusPurpose" varchar,
+        "statusListCredential" text,
+        "expiresAt" datetime,
+        "bitsPerStatus" integer DEFAULT (1),
+        "ttl" integer,
+        "validFrom" datetime,
+        "validUntil" datetime,
+        CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO "temporary_StatusList"(
+        "id", "correlationId", "length", "issuer", "type", "driverType",
+        "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
+        "statusListCredential", "bitsPerStatus", "expiresAt"
+      )
+      SELECT 
+        "id", "correlationId", "length", "issuer", "type", "driverType",
+        "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
+        "statusListCredential", "bitsPerStatus", "expiresAt"
+      FROM "StatusList"
+    `);
     await queryRunner.query(`DROP TABLE "StatusList"`);
     await queryRunner.query(`ALTER TABLE "temporary_StatusList" RENAME TO "StatusList"`);
+    await queryRunner.query(`
+      CREATE TABLE "temporary_StatusListEntry" (
+        "statusListId" varchar NOT NULL,
+        "statusListIndex" integer NOT NULL,
+        "credentialId" text,
+        "credentialHash" varchar(128),
+        "correlationId" varchar(255),
+        "value" varchar(50),
+        "type" varchar CHECK( "type" IN ('StatusListEntryEntity', 'bitstring') ) NOT NULL DEFAULT ('StatusListEntryEntity'),
+        "statusPurpose" varchar,
+        "bitsPerStatus" integer DEFAULT (1),
+        "statusMessage" text,
+        "statusReference" text,
+        PRIMARY KEY ("statusListId", "statusListIndex")
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO "temporary_StatusListEntry"(
+        "statusListId", "statusListIndex", "credentialId", "credentialHash", 
+        "correlationId", "value", "type"
+      )
+      SELECT 
+        "statusListId", "statusListIndex", "credentialId", "credentialHash",
+        "correlationId", "value", 'StatusListEntryEntity'
+      FROM "StatusListEntry"
+    `);
+    await queryRunner.query(`DROP TABLE "StatusListEntry"`);
+    await queryRunner.query(`ALTER TABLE "temporary_StatusListEntry" RENAME TO "StatusListEntry"`);
   }
   async down(queryRunner) {
     await queryRunner.query(`
-     ALTER TABLE "StatusListEntry"
-     RENAME COLUMN "entryCorrelationId" TO "correlationId"
-   `);
+      CREATE TABLE "temporary_StatusListEntry" (
+        "statusListId" varchar NOT NULL,
+        "statusListIndex" integer NOT NULL,
+        "credentialId" text,
+        "credentialHash" varchar(128),
+        "correlationId" varchar(255),
+        "value" varchar(50),
+        PRIMARY KEY ("statusListId", "statusListIndex")
+      )
+    `);
     await queryRunner.query(`
-     ALTER TABLE "StatusListEntry"
-     DROP COLUMN "statusListCorrelationId"
-   `);
-    await queryRunner.query(`CREATE TABLE "temporary_StatusList" (
-                "id" varchar PRIMARY KEY NOT NULL,
-                "correlationId" varchar NOT NULL,
-                "length" integer NOT NULL,
-                "issuer" text NOT NULL,
-                "type" varchar CHECK( "type" IN ('StatusList2021') ) NOT NULL DEFAULT ('StatusList2021'),
-                "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
-                "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
-                "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt') ) NOT NULL DEFAULT ('lds'),
-                "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ) NOT NULL DEFAULT ('rightToLeft'),
-                "statusPurpose" varchar NOT NULL DEFAULT ('revocation'),
-                "statusListCredential" text,
-                CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
-            )`);
-    await queryRunner.query(`INSERT INTO "temporary_StatusList"(
-                "id", "correlationId", "length", "issuer", "type", "driverType",
-                "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
-                "statusListCredential"
-            )
-            SELECT 
-                "id", "correlationId", "length", "issuer", 
-                CASE WHEN "type" = 'OAuthStatusList' THEN 'StatusList2021' ELSE "type" END,
-                "driverType", "credentialIdMode", "proofFormat", "indexingDirection",
-                COALESCE("statusPurpose", 'revocation'), "statusListCredential"
-            FROM "StatusList"`);
+      INSERT INTO "temporary_StatusListEntry"(
+        "statusListId", "statusListIndex", "credentialId", "credentialHash",
+        "correlationId", "value"
+      )
+      SELECT 
+        "statusListId", "statusListIndex", "credentialId", "credentialHash",
+        "correlationId", "value"
+      FROM "StatusListEntry"
+      WHERE "type" = 'StatusListEntryEntity'
+    `);
+    await queryRunner.query(`DROP TABLE "StatusListEntry"`);
+    await queryRunner.query(`ALTER TABLE "temporary_StatusListEntry" RENAME TO "StatusListEntry"`);
+    await queryRunner.query(`
+      CREATE TABLE "temporary_StatusList" (
+        "id" varchar PRIMARY KEY NOT NULL,
+        "correlationId" varchar NOT NULL,
+        "length" integer NOT NULL,
+        "issuer" text NOT NULL,
+        "type" varchar CHECK( "type" IN ('StatusList2021', 'OAuthStatusList') ) NOT NULL DEFAULT ('StatusList2021'),
+        "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
+        "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
+        "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt', 'vc+jwt') ) NOT NULL DEFAULT ('lds'),
+        "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ),
+        "statusPurpose" varchar,
+        "statusListCredential" text,
+        "bitsPerStatus" integer,
+        "expiresAt" datetime,
+        CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO "temporary_StatusList"(
+        "id", "correlationId", "length", "issuer", "type", "driverType",
+        "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
+        "statusListCredential", "bitsPerStatus", "expiresAt"
+      )
+      SELECT 
+        "id", "correlationId", "length", "issuer", 
+        CASE WHEN "type" = 'BitstringStatusList' THEN 'StatusList2021' ELSE "type" END,
+        "driverType", "credentialIdMode", "proofFormat", "indexingDirection",
+        "statusPurpose", "statusListCredential", "bitsPerStatus", "expiresAt"
+      FROM "StatusList"
+    `);
     await queryRunner.query(`DROP TABLE "StatusList"`);
     await queryRunner.query(`ALTER TABLE "temporary_StatusList" RENAME TO "StatusList"`);
   }
 };
 
-// src/migrations/generic/4-CreateStatusList.ts
+// src/migrations/generic/12-CreateBitstringStatusList.ts
 var debug11 = (0, import_debug11.default)("sphereon:ssi-sdk:migrations");
-var CreateStatusList1693866470000 = class {
+var AddBitstringStatusListEnum1741895823000 = class {
   static {
-    __name(this, "CreateStatusList1693866470000");
+    __name(this, "AddBitstringStatusListEnum1741895823000");
   }
-  name = "CreateStatusList1693866470000";
+  name = "AddBitstringStatusListEnum1741895823000";
   async up(queryRunner) {
-    debug11("migration: creating issuance branding tables");
+    debug11("migration: creating bitstring status list tables");
     const dbType = queryRunner.connection.driver.options.type;
-    if (dbType === "postgres") {
-      debug11("using postgres migration files");
-      const createMig = new CreateStatusList1693866470001();
-      await createMig.up(queryRunner);
-      const updateMig = new UpdateStatusList1737110469001();
-      const up = await updateMig.up(queryRunner);
-      debug11("Migration statements executed");
-      return up;
-    } else if (dbType === "sqlite" || dbType === "react-native" || dbType === "expo") {
-      debug11("using sqlite/react-native migration files");
-      const createMig = new CreateStatusList1693866470002();
-      await createMig.up(queryRunner);
-      const updateMig = new UpdateStatusList1737110469000();
-      const up = await updateMig.up(queryRunner);
-      debug11("Migration statements executed");
-      return up;
-    } else {
-      return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
+    switch (dbType) {
+      case "postgres": {
+        const mig = new AddBitstringStatusListEnumPG1741895823000();
+        await mig.up(queryRunner);
+        return;
+      }
+      case "sqlite":
+      case "expo":
+      case "react-native": {
+        return;
+      }
+      default:
+        return Promise.reject(`Migrations only supported for sqlite and postgres. Was ${dbType}`);
+    }
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async down(queryRunner) {
+  }
+};
+var CreateBitstringStatusList1741895823000 = class {
+  static {
+    __name(this, "CreateBitstringStatusList1741895823000");
+  }
+  name = "CreateBitstringStatusList1741895823000";
+  async up(queryRunner) {
+    debug11("migration: creating bitstring status list tables");
+    const dbType = queryRunner.connection.driver.options.type;
+    switch (dbType) {
+      case "postgres": {
+        const mig = new CreateBitstringStatusListPG1741895823000();
+        await mig.up(queryRunner);
+        return;
+      }
+      case "sqlite":
+      case "expo":
+      case "react-native": {
+        const mig = new CreateBitstringStatusListSqlite1741895823001();
+        await mig.up(queryRunner);
+        return;
+      }
+      default:
+        return Promise.reject(`Migrations only supported for sqlite and postgres. Was ${dbType}`);
     }
   }
   async down(queryRunner) {
-    debug11("migration: reverting issuance branding tables");
+    debug11("migration: dropping bitstring status list tables");
     const dbType = queryRunner.connection.driver.options.type;
-    if (dbType === "postgres") {
-      debug11("using postgres migration files");
-      const updateMig = new UpdateStatusList1737110469001();
-      await updateMig.down(queryRunner);
-      const createMig = new CreateStatusList1693866470001();
-      const down = await createMig.down(queryRunner);
-      debug11("Migration statements executed");
-      return down;
-    } else if (dbType === "sqlite" || dbType === "react-native" || dbType === "expo") {
-      debug11("using sqlite/react-native migration files");
-      const updateMig = new UpdateStatusList1737110469000();
-      await updateMig.down(queryRunner);
-      const createMig = new CreateStatusList1693866470002();
-      const down = await createMig.down(queryRunner);
-      debug11("Migration statements executed");
-      return down;
-    } else {
-      return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
+    switch (dbType) {
+      case "postgres": {
+        const mig = new CreateBitstringStatusListPG1741895823000();
+        await mig.down(queryRunner);
+        return;
+      }
+      case "sqlite":
+      case "expo":
+      case "react-native": {
+        const mig = new CreateBitstringStatusListSqlite1741895823001();
+        await mig.down(queryRunner);
+        return;
+      }
+      default:
+        return Promise.reject(`Migrations only supported for sqlite and postgres. Was ${dbType}`);
     }
   }
 };
 
-// src/migrations/generic/5-CreateAuditEvents.ts
+// src/migrations/generic/13-CreateDcqlQueryItem.ts
 var import_debug12 = __toESM(require("debug"), 1);
 
-// src/migrations/sqlite/1701634819487-CreateAuditEvents.ts
-var CreateAuditEvents1701634819487 = class {
+// src/migrations/postgres/1726588800000-CreateDcqlQueryItem.ts
+var CreateDcqlQueryItemPG1726588800000 = class {
   static {
-    __name(this, "CreateAuditEvents1701634819487");
+    __name(this, "CreateDcqlQueryItemPG1726588800000");
   }
-  name = "CreateAuditEvents1701634819487";
+  name = "CreateDcqlQueryItemPG1726588800000";
   async up(queryRunner) {
-    await queryRunner.query(`CREATE TABLE "AuditEvents" (
-                "id" varchar PRIMARY KEY NOT NULL,
-                "eventType" varchar CHECK( "eventType" IN ('audit','activity','general') ) NOT NULL,
-                "timestamp" datetime NOT NULL, 
-                "level" varchar CHECK( "level" IN ('0','1','2','3','4') ) NOT NULL, 
-                "correlationId" varchar NOT NULL, 
-                "system" varchar CHECK( "system" IN ('general','kms','identity','oid4vci','oid4vp','siopv2','PE','credentials','web3','profile','contact') ) NOT NULL, 
-                "subSystemType" varchar CHECK( "subSystemType" IN ('key','did_provider','did_resolver','oid4vp_op','oid4vci_client','siopv2_op','contact_manager','vc_issuer','vc_verifier','vc_persistence','transport','profile','api') ) NOT NULL, 
-                "actionType" varchar CHECK( "actionType" IN ('create','read','update','delete','execute') ) NOT NULL, 
-                "actionSubType" varchar NOT NULL, 
-                "initiatorType" varchar CHECK( "initiatorType" IN ('user','system','external') ) NOT NULL, 
-                "systemCorrelationIdType" varchar CHECK( "systemCorrelationIdType" IN ('did','url','email','hostname','phone','user') ), 
-                "systemCorrelationId" varchar, 
-                "systemAlias" varchar, 
-                "partyCorrelationType" varchar CHECK( "partyCorrelationType" IN ('did','url','email','hostname','phone') ), 
-                "partyCorrelationId" varchar, 
-                "partyAlias" varchar,
-                "credentialType" varchar CHECK( "credentialType" IN ('JSON_LD','JWT','SD_JWT','MSO_MDOC') ),
-                "credentialHash" varchar,
-                "parentCredentialHash" varchar,
-                "originalCredential" varchar,
-                "sharePurpose" varchar,
-                "description" varchar NOT NULL, 
-                "data" varchar, 
-                "diagnosticData" varchar, 
-                "created_at" datetime NOT NULL DEFAULT (datetime('now')), 
-                "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
+    await queryRunner.query(`
+      CREATE TABLE "DcqlQueryItem" (
+                                     "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+                                     "tenant_id" TEXT,
+                                     "query_id" TEXT NOT NULL,
+                                     "name" TEXT,
+                                     "version" TEXT NOT NULL,
+                                     "purpose" TEXT,
+                                     "query" TEXT NOT NULL,
+                                     "created_at" TIMESTAMP NOT NULL DEFAULT now(),
+                                     "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(),
+                                     CONSTRAINT "PK_DcqlQueryItem_id" PRIMARY KEY ("id"))
+    `);
   }
   async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "AuditEvents"`);
+    await queryRunner.query(`DROP TABLE "DcqlQueryItem"`);
   }
 };
 
-// src/migrations/postgres/1701634812183-CreateAuditEvents.ts
-var CreateAuditEvents1701634812183 = class {
+// src/migrations/sqlite/1726617600000-CreateDcqlQueryItem.ts
+var CreateDcqlQueryItemSQlite1726617600000 = class {
   static {
-    __name(this, "CreateAuditEvents1701634812183");
+    __name(this, "CreateDcqlQueryItemSQlite1726617600000");
   }
-  name = "CreateAuditEvents1701634812183";
+  name = "CreateDcqlQueryItemSQlite1726617600000";
   async up(queryRunner) {
-    await queryRunner.query(`CREATE TYPE "public"."Level_enum" AS ENUM('0', '1', '2', '3', '4')`);
-    await queryRunner.query(`CREATE TYPE "public"."System_enum" AS ENUM('general', 'kms', 'identity', 'oid4vci', 'oid4vp', 'siopv2', 'PE', 'credentials', 'web3', 'profile', 'contact')`);
-    await queryRunner.query(`CREATE TYPE "public"."Subsystem_type_enum" AS ENUM('key', 'did_provider', 'did_resolver', 'oid4vp_op', 'oid4vci_client', 'siopv2_op', 'contact_manager', 'vc_issuer', 'vc_verifier', 'vc_persistence', 'transport', 'profile', 'api')`);
-    await queryRunner.query(`CREATE TYPE "public"."Action_type_enum" AS ENUM('create', 'read', 'update', 'delete', 'execute')`);
-    await queryRunner.query(`CREATE TYPE "public"."Initiator_type_enum" AS ENUM('user', 'system', 'external')`);
-    await queryRunner.query(`CREATE TYPE "public"."System_correlation_id_type_enum" AS ENUM('did', 'url', 'email', 'hostname', 'phone', 'user')`);
-    await queryRunner.query(`CREATE TYPE "public"."Party_correlation_type_enum" AS ENUM('did', 'url', 'email', 'hostname', 'phone')`);
-    await queryRunner.query(`CREATE TYPE "public"."Event_type_enum" AS ENUM('audit', 'activity', 'general')`);
-    await queryRunner.query(`CREATE TYPE "public"."Event_credential_type_enum" AS ENUM('JSON_LD', 'JWT', 'SD_JWT', 'MSO_MDOC')`);
-    await queryRunner.query(`CREATE TABLE "AuditEvents" (
-                "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
-                "eventType" "public"."Event_type_enum" NOT NULL,
-                "timestamp" TIMESTAMP NOT NULL, 
-                "level" "public"."Level_enum" NOT NULL, 
-                "correlationId" TEXT NOT NULL, 
-                "system" "public"."System_enum" NOT NULL, 
-                "subSystemType" "public"."Subsystem_type_enum" NOT NULL,  
-                "actionType" "public"."Action_type_enum" NOT NULL, 
-                "actionSubType" TEXT NOT NULL, 
-                "initiatorType" "public"."Initiator_type_enum" NOT NULL, 
-                "systemCorrelationIdType" "public"."System_correlation_id_type_enum", 
-                "systemCorrelationId" TEXT, 
-                "systemAlias" TEXT, 
-                "partyCorrelationType" "public"."Party_correlation_type_enum", 
-                "partyCorrelationId" TEXT, 
-                "partyAlias" TEXT, 
-                "credentialType" "public"."Event_credential_type_enum",
-                "credentialHash" TEXT,
-                "originalCredential" TEXT,
-                "sharePurpose" TEXT,
-                "description" TEXT NOT NULL, 
-                "data" TEXT, 
-                "diagnosticData" TEXT, 
-                "created_at" TIMESTAMP NOT NULL DEFAULT now(), 
-                "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), 
-                CONSTRAINT "PK_AuditEvents_id" PRIMARY KEY ("id"))`);
+    await queryRunner.query(`CREATE TABLE "DcqlQueryItem" (
+                                      "id" varchar PRIMARY KEY NOT NULL,
+                                      "tenant_id" varchar,
+                                      "query_id" varchar NOT NULL,
+                                      "name" varchar,
+                                      "version" varchar NOT NULL,
+                                      "purpose" varchar,
+                                      "query" varchar NOT NULL,
+                                      "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                      "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "AuditEvents"`);
-    await queryRunner.query(`DROP TYPE "public"."Party_correlation_type_enum"`);
-    await queryRunner.query(`DROP TYPE "public"."System_correlation_id_type_enum"`);
-    await queryRunner.query(`DROP TYPE "public"."Initiator_type_enum"`);
-    await queryRunner.query(`DROP TYPE "public"."Action_type_enum"`);
-    await queryRunner.query(`DROP TYPE "public"."Subsystem_type_enum"`);
-    await queryRunner.query(`DROP TYPE "public"."System_enum"`);
-    await queryRunner.query(`DROP TYPE "public"."Level_enum"`);
+    await queryRunner.query(`DROP TABLE "DcqlQueryItem"`);
   }
 };
 
-// src/migrations/generic/5-CreateAuditEvents.ts
+// src/migrations/generic/13-CreateDcqlQueryItem.ts
 var debug12 = (0, import_debug12.default)("sphereon:ssi-sdk:migrations");
-var CreateAuditEvents1701635835330 = class {
+var CreateDcqlQueryItem1726617600000 = class {
   static {
-    __name(this, "CreateAuditEvents1701635835330");
+    __name(this, "CreateDcqlQueryItem1726617600000");
   }
-  name = "CreateAuditEvents1701635835330";
+  name = "CreateDcqlQueryItem1726617600000";
   async up(queryRunner) {
-    debug12("migration: creating audit events tables");
+    debug12("migration: updating presentation definition item nullable fields");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
         debug12("using postgres migration file");
-        const mig = new CreateAuditEvents1701634812183();
+        const mig = new CreateDcqlQueryItemPG1726588800000();
         await mig.up(queryRunner);
         debug12("Migration statements executed");
         return;
@@ -8162,7 +8011,7 @@ var CreateAuditEvents1701635835330 = class {
       case "expo":
       case "react-native": {
         debug12("using sqlite/react-native migration file");
-        const mig = new CreateAuditEvents1701634819487();
+        const mig = new CreateDcqlQueryItemSQlite1726617600000();
         await mig.up(queryRunner);
         debug12("Migration statements executed");
         return;
@@ -8172,12 +8021,12 @@ var CreateAuditEvents1701635835330 = class {
     }
   }
   async down(queryRunner) {
-    debug12("migration: reverting audit events tables");
+    debug12("migration: reverting presentation definition item nullable fields");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
         debug12("using postgres migration file");
-        const mig = new CreateAuditEvents1701634812183();
+        const mig = new CreateDcqlQueryItemPG1726588800000();
         await mig.down(queryRunner);
         debug12("Migration statements executed");
         return;
@@ -8186,7 +8035,7 @@ var CreateAuditEvents1701635835330 = class {
       case "expo":
       case "react-native": {
         debug12("using sqlite/react-native migration file");
-        const mig = new CreateAuditEvents1701634819487();
+        const mig = new CreateDcqlQueryItemSQlite1726617600000();
         await mig.down(queryRunner);
         debug12("Migration statements executed");
         return;
@@ -8197,247 +8046,299 @@ var CreateAuditEvents1701635835330 = class {
   }
 };
 
-// src/migrations/generic/6-CreateDigitalCredential.ts
+// src/migrations/generic/2-CreateIssuanceBranding.ts
 var import_debug13 = __toESM(require("debug"), 1);
-
-// src/migrations/postgres/1708525189001-CreateDigitalCredential.ts
-var CreateDigitalCredential1708525189001 = class {
-  static {
-    __name(this, "CreateDigitalCredential1708525189001");
-  }
-  name = "CreateDigitalCredential1708525189001";
-  async up(queryRunner) {
-    await queryRunner.query(`CREATE TYPE "digital_document_type" AS ENUM('VC', 'VP', 'C', 'P')`);
-    await queryRunner.query(`CREATE TYPE "digital_regulation_type" AS ENUM('PID', 'QEAA', 'EAA', 'NON_REGULATED')`);
-    await queryRunner.query(`CREATE TYPE "digital_credential_document_format" AS ENUM('JSON_LD', 'JWT', 'SD_JWT', 'MSO_MDOC')`);
-    await queryRunner.query(`CREATE TYPE "digital_credential_credential_role" AS ENUM('ISSUER', 'VERIFIER', 'HOLDER', 'FEDERATION_TRUST_ANCHOR')`);
-    await queryRunner.query(`CREATE TYPE "digital_credential_correlation_type" AS ENUM('DID', 'KID', 'URL', 'X509_SAN')`);
-    await queryRunner.query(`CREATE TYPE "digital_credential_state_type" AS ENUM('REVOKED', 'VERIFIED', 'EXPIRED')`);
-    await queryRunner.query(`
-      CREATE TABLE "DigitalCredential" (
-        "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
-        "parent_id" text,
-        "document_type" "digital_document_type" NOT NULL,
-        "regulation_type" "digital_regulation_type" NOT NULL DEFAULT 'NON_REGULATED'::"digital_regulation_type",
-        "document_format" "digital_credential_document_format" NOT NULL,
-        "credential_role" "digital_credential_credential_role" NOT NULL,
-        "raw_document" text NOT NULL,
-        "uniform_document" text NOT NULL,
-        "credential_id" text,
-        "hash" text NOT NULL,
-        "kms_key_ref" text,
-        "identifier_method" text,
-        "issuer_correlation_type" "digital_credential_correlation_type" NOT NULL,
-        "subject_correlation_type" "digital_credential_correlation_type",
-        "issuer_correlation_id" text NOT NULL,
-        "subject_correlation_id" text,
-        "verified_state" "digital_credential_state_type",
-        "issuer_signed" boolean,
-        "rp_correlation_id" text,
-        "rp_correlation_type" "digital_credential_correlation_type",
-        "tenant_id" text,
-        "created_at" TIMESTAMP NOT NULL DEFAULT now(),
-        "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(),
-        "presented_at" DATE,
-        "valid_from" DATE,
-        "valid_until" DATE,
-        "verified_at" DATE,
-        "revoked_at" DATE,
-        PRIMARY KEY ("id"),
-        UNIQUE ("hash", "credential_role")
-      )
-    `);
-  }
-  async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "DigitalCredential"`);
-    await queryRunner.query(`DROP TYPE "digital_credential_state_type"`);
-    await queryRunner.query(`DROP TYPE "digital_credential_correlation_type"`);
-    await queryRunner.query(`DROP TYPE "digital_credential_document_format"`);
-    await queryRunner.query(`DROP TYPE "digital_credential_credential_role"`);
-    await queryRunner.query(`DROP TYPE "digital_regulation_type"`);
-    await queryRunner.query(`DROP TYPE "digital_document_type"`);
-  }
-};
-
-// src/migrations/sqlite/1708525189002-CreateDigitalCredential.ts
-var CreateDigitalCredential1708525189002 = class {
-  static {
-    __name(this, "CreateDigitalCredential1708525189002");
-  }
-  name = "CreateDigitalCredential1708525189002";
-  async up(queryRunner) {
-    await queryRunner.query(`
-            CREATE TABLE "DigitalCredential" (
-                "id" varchar PRIMARY KEY NOT NULL,
-                "parent_id" text, 
-                "document_type" varchar CHECK( "document_type" IN ('VC', 'VP', 'C', 'P') ) NOT NULL,
-                "regulation_type" varchar CHECK( "regulation_type" IN ('PID', 'QEAA', 'EAA', 'NON_REGULATED') ) NOT NULL DEFAULT 'NON_REGULATED',
-                "document_format" varchar CHECK( "document_format" IN ('JSON_LD', 'JWT', 'SD_JWT', 'MSO_MDOC') ) NOT NULL,
-                "credential_role" varchar CHECK( "credential_role" IN ('ISSUER', 'VERIFIER', 'HOLDER', 'FEDERATION_TRUST_ANCHOR') ) NOT NULL,
-                "raw_document" text NOT NULL,
-                "uniform_document" text NOT NULL,
-                "credential_id" text,
-                "hash" text NOT NULL,
-                "kms_key_ref" text,
-                "identifier_method" text,
-                "issuer_correlation_type" varchar CHECK( "issuer_correlation_type" IN ('DID', 'KID', 'URL', 'X509_SAN') ) NOT NULL,
-                "subject_correlation_type" varchar CHECK( "subject_correlation_type" IN ('DID', 'KID', 'URL', 'X509_SAN') ),
-                "issuer_correlation_id" text NOT NULL,
-                "subject_correlation_id" text,
-                "issuer_signed" boolean,
-                "rp_correlation_id" text,
-                "rp_correlation_type" varchar CHECK( "issuer_correlation_type" IN ('DID', 'KID', 'URL', 'X509_SAN') ),
-                "verified_state" varchar CHECK( "verified_state" IN ('REVOKED', 'VERIFIED', 'EXPIRED') ),
-                "tenant_id" text,
-                "created_at" datetime NOT NULL DEFAULT (datetime('now')),
-                "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
-                "presented_at" datetime,
-                "valid_from" datetime,
-                "valid_until" datetime,
-                "verified_at" datetime,
-                "revoked_at" datetime,
-                UNIQUE ("hash", "credential_role")
-            )
-        `);
-  }
-  async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "DigitalCredential"`);
-  }
-};
-
-// src/migrations/generic/6-CreateDigitalCredential.ts
 var debug13 = (0, import_debug13.default)("sphereon:ssi-sdk:migrations");
-var CreateDigitalCredential1708525189000 = class {
+var CreateIssuanceBranding1659463079429 = class {
   static {
-    __name(this, "CreateDigitalCredential1708525189000");
+    __name(this, "CreateIssuanceBranding1659463079429");
   }
-  name = "CreateDigitalCredential1708525189000";
+  name = "CreateIssuanceBranding1659463079429";
   async up(queryRunner) {
-    debug13("migration: creating DigitalCredential tables");
+    debug13("migration: creating issuance branding tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
-        debug13("using postgres migration file for DigitalCredential");
-        const mig = new CreateDigitalCredential1708525189001();
+        debug13("using postgres migration file");
+        const mig = new CreateIssuanceBranding1685628974232();
         await mig.up(queryRunner);
-        debug13("Postgres Migration statements for DigitalCredential executed");
+        debug13("Migration statements executed");
         return;
       }
       case "sqlite":
       case "expo":
       case "react-native": {
-        debug13("using sqlite/react-native migration file for DigitalCredential");
-        const mig = new CreateDigitalCredential1708525189002();
+        debug13("using sqlite/react-native migration file");
+        const mig = new CreateIssuanceBranding1685628973231();
         await mig.up(queryRunner);
-        debug13("SQLite Migration statements for DigitalCredential executed");
+        debug13("Migration statements executed");
         return;
       }
       default:
-        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo, and postgres for UniformCredential. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
+        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
     }
   }
   async down(queryRunner) {
-    debug13("migration: reverting DigitalCredential tables");
+    debug13("migration: reverting issuance branding tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
-        debug13("using postgres migration file for DigitalCredential");
-        const mig = new CreateDigitalCredential1708525189001();
+        debug13("using postgres migration file");
+        const mig = new CreateIssuanceBranding1685628974232();
         await mig.down(queryRunner);
-        debug13("Postgres Migration statements for DigitalCredential reverted");
+        debug13("Migration statements executed");
         return;
       }
       case "sqlite":
       case "expo":
       case "react-native": {
-        debug13("using sqlite/react-native migration file for DigitalCredential");
-        const mig = new CreateDigitalCredential1708525189002();
+        debug13("using sqlite/react-native migration file");
+        const mig = new CreateIssuanceBranding1685628973231();
         await mig.down(queryRunner);
-        debug13("SQLite Migration statements for DigitalCredential reverted");
+        debug13("Migration statements executed");
         return;
       }
       default:
-        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo, and postgres for DigitalCredential. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
+        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
     }
   }
 };
 
-// src/migrations/generic/7-CreateMachineStateStore.ts
+// src/migrations/generic/3-CreateContacts.ts
 var import_debug14 = __toESM(require("debug"), 1);
 
-// src/migrations/postgres/1708797018115-CreateMachineStateStore.ts
-var CreateMachineStateStore1708797018115 = class {
+// src/migrations/sqlite/1690925872693-CreateContacts.ts
+var CreateContacts1690925872693 = class {
   static {
-    __name(this, "CreateMachineStateStore1708797018115");
+    __name(this, "CreateContacts1690925872693");
   }
-  name = "CreateMachineStateStore1708797018115";
+  name = "CreateContacts1690925872693";
   async up(queryRunner) {
-    await queryRunner.query(`
-            CREATE TABLE "MachineStateInfoEntity" (
-                "instance_id" text NOT NULL,
-                "session_id" text,
-                "latest_state_name" text,
-                "machine_name" text NOT NULL,
-                "latest_event_type" text NOT NULL,
-                "state" text NOT NULL,
-                "created_at" TIMESTAMP NOT NULL DEFAULT now(),
-                "updated_at" TIMESTAMP NOT NULL DEFAULT now(),
-                "updated_count" integer NOT NULL DEFAULT 0,
-                "expires_at" TIMESTAMP,
-                "completed_at" TIMESTAMP,
-                "tenant_id" text,
-                CONSTRAINT "PK_MachineStateInfoEntity_id" PRIMARY KEY ("instance_id")
-            )
-        `);
+    await queryRunner.query(`CREATE TABLE "temporary_CorrelationIdentifier" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('did','url') ) NOT NULL, "correlation_id" text NOT NULL, "identityId" varchar, CONSTRAINT "REL_CorrelationIdentifier_identityId" UNIQUE ("identityId"), CONSTRAINT "UQ_CorrelationIdentifier_correlation_id" UNIQUE ("correlation_id"))`);
+    await queryRunner.query(`INSERT INTO "temporary_CorrelationIdentifier"("id", "type", "correlation_id", "identityId") SELECT "id", "type", "correlation_id", "identityId" FROM "CorrelationIdentifier"`);
+    await queryRunner.query(`DROP TABLE "CorrelationIdentifier"`);
+    await queryRunner.query(`ALTER TABLE "temporary_CorrelationIdentifier" RENAME TO "CorrelationIdentifier"`);
+    await queryRunner.query(`CREATE TABLE "temporary_Identity" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255) NOT NULL, "roles" text NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "contactId" varchar, CONSTRAINT "UQ_Identity_alias" UNIQUE ("alias"))`);
+    await queryRunner.query(`INSERT INTO "temporary_Identity"("id", "alias", "roles", "created_at", "last_updated_at", "contactId") SELECT "id", "alias", "roles", "created_at", "last_updated_at", "contactId" FROM "Identity"`);
+    await queryRunner.query(`DROP TABLE "Identity"`);
+    await queryRunner.query(`ALTER TABLE "temporary_Identity" RENAME TO "Identity"`);
+    await queryRunner.query(`CREATE TABLE "temporary_Connection" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('OIDC','SIOPv2','SIOPv2+OpenID4VP') ) NOT NULL, "identityId" varchar, CONSTRAINT "REL_Connection_identityId" UNIQUE ("identityId"))`);
+    await queryRunner.query(`INSERT INTO "temporary_Connection"("id", "type", "identityId") SELECT "id", "type", "identityId" FROM "Connection"`);
+    await queryRunner.query(`DROP TABLE "Connection"`);
+    await queryRunner.query(`ALTER TABLE "temporary_Connection" RENAME TO "Connection"`);
+    await queryRunner.query(`CREATE TABLE "temporary_CorrelationIdentifier" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('did','url') ) NOT NULL, "correlation_id" text NOT NULL, "identity_id" varchar, CONSTRAINT "REL_CorrelationIdentifier_identityId" UNIQUE ("identity_id"), CONSTRAINT "UQ_CorrelationIdentifier_correlation_id" UNIQUE ("correlation_id"))`);
+    await queryRunner.query(`INSERT INTO "temporary_CorrelationIdentifier"("id", "type", "correlation_id", "identity_id") SELECT "id", "type", "correlation_id", "identityId" FROM "CorrelationIdentifier"`);
+    await queryRunner.query(`DROP TABLE "CorrelationIdentifier"`);
+    await queryRunner.query(`ALTER TABLE "temporary_CorrelationIdentifier" RENAME TO "CorrelationIdentifier"`);
+    await queryRunner.query(`CREATE TABLE "temporary_Identity" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255) NOT NULL, "roles" text NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "partyId" varchar, CONSTRAINT "UQ_Identity_alias" UNIQUE ("alias"))`);
+    await queryRunner.query(`INSERT INTO "temporary_Identity"("id", "alias", "roles", "created_at", "last_updated_at", "partyId") SELECT "id", "alias", "roles", "created_at", "last_updated_at", "contactId" FROM "Identity"`);
+    await queryRunner.query(`DROP TABLE "Identity"`);
+    await queryRunner.query(`ALTER TABLE "temporary_Identity" RENAME TO "Identity"`);
+    await queryRunner.query(`CREATE TABLE "temporary_Connection" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('OIDC','SIOPv2','SIOPv2+OpenID4VP') ) NOT NULL, "identity_id" varchar, CONSTRAINT "REL_Connection_identityId" UNIQUE ("identity_id"))`);
+    await queryRunner.query(`INSERT INTO "temporary_Connection"("id", "type", "identity_id") SELECT "id", "type", "identityId" FROM "Connection"`);
+    await queryRunner.query(`DROP TABLE "Connection"`);
+    await queryRunner.query(`ALTER TABLE "temporary_Connection" RENAME TO "Connection"`);
+    await queryRunner.query(`CREATE TABLE "PartyType" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('naturalPerson','organization') ) NOT NULL, "origin" varchar CHECK( "origin" IN ('INTERNAL', 'EXTERNAL') ) NOT NULL, "name" varchar(255) NOT NULL, "description" varchar(255), "tenant_id" varchar(255) NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "UQ_PartyType_name" UNIQUE ("name"))`);
+    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyType_type_tenant_id" ON "PartyType" ("type", "tenant_id")`);
+    await queryRunner.query(`CREATE TABLE "BaseContact" ("id" varchar PRIMARY KEY NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "legal_name" varchar(255), "display_name" varchar(255), "first_name" varchar(255), "middle_name" varchar(255), "last_name" varchar(255), "type" varchar NOT NULL, "party_id" varchar, CONSTRAINT "UQ_BaseContact_legal_name" UNIQUE ("legal_name"), CONSTRAINT "REL_BaseContact_party_id" UNIQUE ("party_id"))`);
+    await queryRunner.query(`CREATE INDEX "IDX_BaseContact_type" ON "BaseContact" ("type")`);
+    await queryRunner.query(`CREATE TABLE "PartyRelationship" ("id" varchar PRIMARY KEY NOT NULL, "left_id" varchar NOT NULL, "right_id" varchar NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
+    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyRelationship_left_right" ON "PartyRelationship" ("left_id", "right_id")`);
+    await queryRunner.query(`CREATE TABLE "Party" ("id" varchar PRIMARY KEY NOT NULL, "uri" varchar(255) NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "party_type_id" varchar NOT NULL)`);
+    await queryRunner.query(`CREATE TABLE "BaseConfig" ("id" varchar PRIMARY KEY NOT NULL, "identifier" varchar(255), "redirect_url" varchar(255), "session_id" varchar(255), "client_id" varchar(255), "client_secret" varchar(255), "scopes" text, "issuer" varchar(255), "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "type" varchar NOT NULL, "connection_id" varchar, CONSTRAINT "REL_BaseConfig_connection_id" UNIQUE ("connection_id"))`);
+    await queryRunner.query(`CREATE INDEX "IDX_BaseConfig_type" ON "BaseConfig" ("type")`);
+    await queryRunner.query(`CREATE TABLE "temporary_CorrelationIdentifier" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('did','url') ) NOT NULL, "correlation_id" text NOT NULL, "identity_id" varchar, CONSTRAINT "REL_CorrelationIdentifier_identity_id" UNIQUE ("identity_id"), CONSTRAINT "UQ_CorrelationIdentifier_correlation_id" UNIQUE ("correlation_id"), CONSTRAINT "FK_CorrelationIdentifier_identity_id" FOREIGN KEY ("identity_id") REFERENCES "Identity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_CorrelationIdentifier"("id", "type", "correlation_id", "identity_id") SELECT "id", "type", "correlation_id", "identity_id" FROM "CorrelationIdentifier"`);
+    await queryRunner.query(`DROP TABLE "CorrelationIdentifier"`);
+    await queryRunner.query(`ALTER TABLE "temporary_CorrelationIdentifier" RENAME TO "CorrelationIdentifier"`);
+    await queryRunner.query(`DROP INDEX "IDX_BaseContact_type"`);
+    await queryRunner.query(`CREATE TABLE "temporary_BaseContact" ("id" varchar PRIMARY KEY NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "legal_name" varchar(255), "display_name" varchar(255), "first_name" varchar(255), "middle_name" varchar(255), "last_name" varchar(255), "type" varchar NOT NULL, "party_id" varchar, CONSTRAINT "UQ_BaseContact_legal_name" UNIQUE ("legal_name"), CONSTRAINT "REL_BaseContact_party_id" UNIQUE ("party_id"), CONSTRAINT "FK_BaseContact_party_id" FOREIGN KEY ("party_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_BaseContact"("id", "created_at", "last_updated_at", "legal_name", "display_name", "first_name", "middle_name", "last_name", "type", "party_id") SELECT "id", "created_at", "last_updated_at", "legal_name", "display_name", "first_name", "middle_name", "last_name", "type", "party_id" FROM "BaseContact"`);
+    await queryRunner.query(`DROP TABLE "BaseContact"`);
+    await queryRunner.query(`ALTER TABLE "temporary_BaseContact" RENAME TO "BaseContact"`);
+    await queryRunner.query(`CREATE INDEX "IDX_BaseContact_type" ON "BaseContact" ("type")`);
+    await queryRunner.query(`DROP INDEX "IDX_PartyRelationship_left_right"`);
+    await queryRunner.query(`CREATE TABLE "temporary_PartyRelationship" ("id" varchar PRIMARY KEY NOT NULL, "left_id" varchar NOT NULL, "right_id" varchar NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "FK_PartyRelationship_left_id" FOREIGN KEY ("left_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_PartyRelationship_right_id" FOREIGN KEY ("right_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_PartyRelationship"("id", "left_id", "right_id", "created_at", "last_updated_at") SELECT "id", "left_id", "right_id", "created_at", "last_updated_at" FROM "PartyRelationship"`);
+    await queryRunner.query(`DROP TABLE "PartyRelationship"`);
+    await queryRunner.query(`ALTER TABLE "temporary_PartyRelationship" RENAME TO "PartyRelationship"`);
+    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyRelationship_left_right" ON "PartyRelationship" ("left_id", "right_id")`);
+    await queryRunner.query(`CREATE TABLE "ElectronicAddress" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar(255) NOT NULL, "electronic_address" varchar(255) NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "partyId" varchar, CONSTRAINT "FK_ElectronicAddress_partyId" FOREIGN KEY ("partyId") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`CREATE TABLE "PhysicalAddress" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar(255) NOT NULL, "street_name" varchar(255) NOT NULL, "street_number" varchar(255) NOT NULL, "postal_code" varchar(255) NOT NULL, "city_name" varchar(255) NOT NULL, "province_name" varchar(255) NOT NULL, "country_code" varchar(2) NOT NULL, "building_name" varchar(255), "partyId" varchar, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "FK_PhysicalAddressEntity_partyId" FOREIGN KEY ("partyId") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`CREATE TABLE "temporary_Party" ("id" varchar PRIMARY KEY NOT NULL, "uri" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "party_type_id" varchar NOT NULL, CONSTRAINT "FK_Party_party_type_id" FOREIGN KEY ("party_type_id") REFERENCES "PartyType" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_Party"("id", "uri", "created_at", "last_updated_at", "party_type_id") SELECT "id", "uri", "created_at", "last_updated_at", "party_type_id" FROM "Party"`);
+    await queryRunner.query(`DROP TABLE "Party"`);
+    await queryRunner.query(`ALTER TABLE "temporary_Party" RENAME TO "Party"`);
+    await queryRunner.query(`CREATE TABLE "temporary_Identity" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255) NOT NULL, "roles" text NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "partyId" varchar, CONSTRAINT "UQ_Identity_alias" UNIQUE ("alias"), CONSTRAINT "FK_Identity_partyId" FOREIGN KEY ("partyId") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_Identity"("id", "alias", "roles", "created_at", "last_updated_at", "partyId") SELECT "id", "alias", "roles", "created_at", "last_updated_at", "partyId" FROM "Identity"`);
+    await queryRunner.query(`DROP TABLE "Identity"`);
+    await queryRunner.query(`ALTER TABLE "temporary_Identity" RENAME TO "Identity"`);
+    await queryRunner.query(`CREATE TABLE "temporary_Connection" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('OIDC','SIOPv2','SIOPv2+OpenID4VP') ) NOT NULL, "identity_id" varchar, CONSTRAINT "REL_Connection_identity_id" UNIQUE ("identity_id"), CONSTRAINT "FK_Connection_identity_id" FOREIGN KEY ("identity_id") REFERENCES "Identity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_Connection"("id", "type", "identity_id") SELECT "id", "type", "identity_id" FROM "Connection"`);
+    await queryRunner.query(`DROP TABLE "Connection"`);
+    await queryRunner.query(`ALTER TABLE "temporary_Connection" RENAME TO "Connection"`);
+    await queryRunner.query(`DROP INDEX "IDX_BaseConfig_type"`);
+    await queryRunner.query(`CREATE TABLE "temporary_BaseConfig" ("id" varchar PRIMARY KEY NOT NULL, "identifier" varchar(255), "redirect_url" varchar(255), "session_id" varchar(255), "client_id" varchar(255), "client_secret" varchar(255), "scopes" text, "issuer" varchar(255), "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "type" varchar NOT NULL, "connection_id" varchar, CONSTRAINT "REL_BaseConfig_connection_id" UNIQUE ("connection_id"), CONSTRAINT "FK_BaseConfig_connection_id" FOREIGN KEY ("connection_id") REFERENCES "Connection" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_BaseConfig"("id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id") SELECT "id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id" FROM "BaseConfig"`);
+    await queryRunner.query(`DROP TABLE "BaseConfig"`);
+    await queryRunner.query(`ALTER TABLE "temporary_BaseConfig" RENAME TO "BaseConfig"`);
+    await queryRunner.query(`CREATE INDEX "IDX_BaseConfig_type" ON "BaseConfig" ("type")`);
+    await queryRunner.query(`INSERT INTO "BaseConfig"("id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id") SELECT "id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connectionId" FROM "BaseConfigEntity"`);
+    await queryRunner.query(`DROP TABLE "BaseConfigEntity"`);
+    await queryRunner.query(`INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('3875c12e-fdaa-4ef6-a340-c936e054b627', 'organization', 'INTERNAL', 'Sphereon_default_organization_type', 'sphereon_default_organization', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', datetime('now'), datetime('now'))`);
+    await queryRunner.query(`INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('7d248798-41ca-4fc1-a130-9934b43d532e', 'naturalPerson', 'INTERNAL', 'Sphereon_default_natural_person_type', 'sphereon_default_natural_person', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', datetime('now'), datetime('now'))`);
+    await queryRunner.query(`INSERT INTO "Party"(id, uri, created_at, last_updated_at, party_type_id) SELECT id, uri, created_at, last_updated_at, '3875c12e-fdaa-4ef6-a340-c936e054b627' FROM "Contact"`);
+    await queryRunner.query(`INSERT INTO "BaseContact"(id, legal_name, display_name, party_id, created_at, last_updated_at, type) SELECT id, name, alias, id, created_at, last_updated_at, 'Organization' FROM "Contact"`);
+    await queryRunner.query(`DROP TABLE "Contact"`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "MachineStateInfoEntity"`);
+    await queryRunner.query(`CREATE TABLE "Contact" ("id" varchar PRIMARY KEY NOT NULL, "uri" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar(255), "alias" varchar(255))`);
+    await queryRunner.query(`INSERT INTO "Contact"(id, uri, created_at, last_updated_at, name, alias) SELECT id, uri, created_at, last_updated_at, (SELECT legal_name FROM "BaseContact" WHERE "BaseContact"."party_id" = "Party"."id"), (SELECT display_name FROM "BaseContact" WHERE "BaseContact"."party_id" = "Party"."id") FROM "Party" WHERE party_type_id = '3875c12e-fdaa-4ef6-a340-c936e054b627'`);
+    await queryRunner.query(`DROP TABLE "BaseContact"`);
+    await queryRunner.query(`DROP TABLE "Party"`);
+    await queryRunner.query(`CREATE TABLE "BaseConfigEntity" ("id" varchar PRIMARY KEY NOT NULL, "identifier" varchar(255), "redirect_url" varchar(255), "session_id" varchar(255), "client_id" varchar(255), "client_secret" varchar(255), "scopes" text, "issuer" varchar(255), "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "type" varchar NOT NULL, "connectionId" varchar)`);
+    await queryRunner.query(`INSERT INTO "BaseConfigEntity"("id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connectionId") SELECT "id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id" FROM "BaseConfig"`);
+    await queryRunner.query(`DROP TABLE "BaseConfig"`);
+    await queryRunner.query(`CREATE TABLE "temporary_Party" ("id" varchar PRIMARY KEY NOT NULL, "uri" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "party_type_id" varchar NOT NULL, CONSTRAINT "FK_Party_party_type_id" FOREIGN KEY ("party_type_id") REFERENCES "PartyType" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_Party"("id", "uri", "created_at", "last_updated_at", "party_type_id") SELECT "id", "uri", "created_at", "last_updated_at", "party_type_id" FROM "Party"`);
+    await queryRunner.query(`DROP TABLE "Party"`);
+    await queryRunner.query(`ALTER TABLE "temporary_Party" RENAME TO "Party"`);
+    await queryRunner.query(`DROP INDEX "IDX_PartyRelationship_left_right"`);
+    await queryRunner.query(`CREATE TABLE "temporary_PartyRelationship" ("id" varchar PRIMARY KEY NOT NULL, "left_id" varchar NOT NULL, "right_id" varchar NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "FK_PartyRelationship_left_id" FOREIGN KEY ("left_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_PartyRelationship_right_id" FOREIGN KEY ("right_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_PartyRelationship"("id", "left_id", "right_id", "created_at", "last_updated_at") SELECT "id", "left_id", "right_id", "created_at", "last_updated_at" FROM "PartyRelationship"`);
+    await queryRunner.query(`DROP TABLE "PartyRelationship"`);
+    await queryRunner.query(`ALTER TABLE "temporary_PartyRelationship" RENAME TO "PartyRelationship"`);
+    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyRelationship_left_right" ON "PartyRelationship" ("left_id", "right_id")`);
+    await queryRunner.query(`DROP INDEX "IDX_BaseContact_type"`);
+    await queryRunner.query(`CREATE TABLE "temporary_BaseContact" ("id" varchar PRIMARY KEY NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "legal_name" varchar(255), "display_name" varchar(255), "first_name" varchar(255), "middle_name" varchar(255), "last_name" varchar(255), "type" varchar NOT NULL, "party_id" varchar, CONSTRAINT "UQ_BaseContact_legal_name" UNIQUE ("legal_name"), CONSTRAINT "REL_BaseContact_party_id" UNIQUE ("party_id"), CONSTRAINT "FK_BaseContact_party_id" FOREIGN KEY ("party_id") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_BaseContact"("id", "created_at", "last_updated_at", "legal_name", "display_name", "first_name", "middle_name", "last_name", "type", "party_id") SELECT "id", "created_at", "last_updated_at", "legal_name", "display_name", "first_name", "middle_name", "last_name", "type", "party_id" FROM "BaseContact"`);
+    await queryRunner.query(`DROP TABLE "BaseContact"`);
+    await queryRunner.query(`ALTER TABLE "temporary_BaseContact" RENAME TO "BaseContact"`);
+    await queryRunner.query(`CREATE INDEX "IDX_BaseContact_type" ON "BaseContact" ("type")`);
+    await queryRunner.query(`DROP INDEX "IDX_BaseConfig_type"`);
+    await queryRunner.query(`CREATE TABLE "temporary_BaseConfig" ("id" varchar PRIMARY KEY NOT NULL, "identifier" varchar(255), "redirect_url" varchar(255), "session_id" varchar(255), "client_id" varchar(255), "client_secret" varchar(255), "scopes" text, "issuer" varchar(255), "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "type" varchar NOT NULL, "connection_id" varchar, CONSTRAINT "REL_BaseConfig_connection_id" UNIQUE ("connection_id"), CONSTRAINT "FK_BaseConfig_connection_id" FOREIGN KEY ("connection_id") REFERENCES "Connection" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+    await queryRunner.query(`INSERT INTO "temporary_BaseConfig"("id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id") SELECT "id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id" FROM "BaseConfig"`);
+    await queryRunner.query(`DROP TABLE "BaseConfig"`);
+    await queryRunner.query(`ALTER TABLE "temporary_BaseConfig" RENAME TO "BaseConfig"`);
+    await queryRunner.query(`CREATE INDEX "IDX_BaseConfig_type" ON "BaseConfig" ("type")`);
+    await queryRunner.query(`DROP INDEX "IDX_PartyType_type_tenant_id"`);
+    await queryRunner.query(`DROP TABLE "PartyType"`);
+    await queryRunner.query(`DROP TABLE "Connection"`);
+    await queryRunner.query(`DROP TABLE "Identity"`);
+    await queryRunner.query(`DROP TABLE "CorrelationIdentifier"`);
+    await queryRunner.query(`DROP TABLE "ElectronicAddress"`);
+    await queryRunner.query(`DROP TABLE "PhysicalAddress"`);
   }
 };
 
-// src/migrations/sqlite/1708796002272-CreateMachineStateStore.ts
-var CreateMachineStateStore1708796002272 = class {
+// src/migrations/postgres/1690925872592-CreateContacts.ts
+var import_ssi_sdk22 = require("@sphereon/ssi-sdk.core");
+var CreateContacts1690925872592 = class {
   static {
-    __name(this, "CreateMachineStateStore1708796002272");
+    __name(this, "CreateContacts1690925872592");
   }
-  name = "CreateMachineStateStore1708796002272";
+  name = "CreateContacts1690925872592";
   async up(queryRunner) {
-    await queryRunner.query(`
-            CREATE TABLE "MachineStateInfoEntity" (
-                "instance_id" varchar PRIMARY KEY NOT NULL,
-                "session_id" varchar,
-                "machine_name" varchar NOT NULL,
-                "latest_state_name" varchar,
-                "latest_event_type" varchar NOT NULL,
-                "state" text NOT NULL,
-                "created_at" datetime NOT NULL DEFAULT (datetime('now')),
-                "updated_at" datetime NOT NULL DEFAULT (datetime('now')),
-                "updated_count" integer NOT NULL DEFAULT 0,
-                "expires_at" datetime,
-                "completed_at" datetime,
-                "tenant_id" varchar
-            )
-        `);
+    await (0, import_ssi_sdk22.enablePostgresUuidExtension)(queryRunner);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP CONSTRAINT "FK_CorrelationIdentifier_identityId"`);
+    await queryRunner.query(`ALTER TABLE "IdentityMetadata" DROP CONSTRAINT "FK_IdentityMetadata_identityId"`);
+    await queryRunner.query(`ALTER TABLE "Identity" DROP CONSTRAINT "FK_Identity_contactId"`);
+    await queryRunner.query(`ALTER TABLE "Connection" DROP CONSTRAINT "FK_Connection_identityId"`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" RENAME COLUMN "identityId" TO "identity_id"`);
+    await queryRunner.query(`ALTER TABLE "Connection" RENAME COLUMN "identityId" TO "identity_id"`);
+    await queryRunner.query(`CREATE TYPE "public"."PartyType_type_enum" AS ENUM('naturalPerson', 'organization')`);
+    await queryRunner.query(`CREATE TYPE "public"."PartyOrigin_type_enum" AS ENUM('INTERNAL', 'EXTERNAL')`);
+    await queryRunner.query(`CREATE TABLE "PartyType" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "type" "public"."PartyType_type_enum" NOT NULL, "origin" "public"."PartyOrigin_type_enum" NOT NULL, "name" character varying(255) NOT NULL, "description" character varying(255), "tenant_id" character varying(255) NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "UQ_PartyType_name" UNIQUE ("name"), CONSTRAINT "PK_PartyType_id" PRIMARY KEY ("id"))`);
+    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyType_type_tenant_id" ON "PartyType" ("type", "tenant_id")`);
+    await queryRunner.query(`CREATE TABLE "BaseContact" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), "legal_name" character varying(255), "display_name" character varying(255), "first_name" character varying(255), "middle_name" character varying(255), "last_name" character varying(255), "type" character varying NOT NULL, "party_id" uuid, CONSTRAINT "UQ_BaseContact_legal_name" UNIQUE ("legal_name"), CONSTRAINT "REL_BaseContact_party_id" UNIQUE ("party_id"), CONSTRAINT "PK_BaseContact_id" PRIMARY KEY ("id"))`);
+    await queryRunner.query(`CREATE INDEX "IDX_BaseContact_type" ON "BaseContact" ("type")`);
+    await queryRunner.query(`CREATE TABLE "PartyRelationship" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "left_id" uuid NOT NULL, "right_id" uuid NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_PartyRelationship_id" PRIMARY KEY ("id"))`);
+    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyRelationship_left_right" ON "PartyRelationship" ("left_id", "right_id")`);
+    await queryRunner.query(`CREATE TABLE "ElectronicAddress" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "type" character varying(255) NOT NULL, "electronic_address" character varying(255) NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), "partyId" uuid, CONSTRAINT "PK_ElectronicAddress_id" PRIMARY KEY ("id"))`);
+    await queryRunner.query(`CREATE TABLE "PhysicalAddress" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "type" character varying(255) NOT NULL, "street_name" character varying(255) NOT NULL, "street_number" character varying(255) NOT NULL, "postal_code" character varying(255) NOT NULL, "city_name" character varying(255) NOT NULL, "province_name" character varying(255) NOT NULL, "country_code" character varying(2) NOT NULL, "building_name" character varying(255), "partyId" uuid, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_PhysicalAddress_id" PRIMARY KEY ("id"))`);
+    await queryRunner.query(`CREATE TABLE "Party" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "uri" character varying(255), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), "party_type_id" uuid NOT NULL, CONSTRAINT "PK_Party_id" PRIMARY KEY ("id"))`);
+    await queryRunner.query(`CREATE TABLE "BaseConfig" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "identifier" character varying(255), "redirect_url" character varying(255), "session_id" character varying(255), "client_id" character varying(255), "client_secret" character varying(255), "scopes" text, "issuer" character varying(255), "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "type" character varying NOT NULL, "connection_id" uuid, CONSTRAINT "REL_BaseConfig_connection_id" UNIQUE ("connection_id"), CONSTRAINT "PK_BaseConfig_id" PRIMARY KEY ("id"))`);
+    await queryRunner.query(`CREATE INDEX "IDX_BaseConfig_type" ON "BaseConfig" ("type")`);
+    await queryRunner.query(`ALTER TABLE "Identity" RENAME COLUMN "contactId" TO "partyId"`);
+    await queryRunner.query(`ALTER TABLE "Identity" ALTER COLUMN "roles" SET NOT NULL`);
+    await queryRunner.query(`CREATE TYPE "public"."IdentityOrigin_type_enum" AS ENUM('INTERNAL', 'EXTERNAL')`);
+    await queryRunner.query(`ALTER TABLE "Identity" ADD COLUMN "origin" "public"."IdentityOrigin_type_enum" DEFAULT 'EXTERNAL' NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "Identity" ALTER COLUMN "origin" DROP DEFAULT`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD CONSTRAINT "FK_CorrelationIdentifier_identity_id" FOREIGN KEY ("identity_id") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "IdentityMetadata" ADD CONSTRAINT "FK_IdentityMetadata_identityId" FOREIGN KEY ("identityId") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "BaseContact" ADD CONSTRAINT "FK_BaseContact_party_id" FOREIGN KEY ("party_id") REFERENCES "Party"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD CONSTRAINT "FK_PartyRelationship_left_id" FOREIGN KEY ("left_id") REFERENCES "Party"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD CONSTRAINT "FK_PartyRelationship_right_id" FOREIGN KEY ("right_id") REFERENCES "Party"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "ElectronicAddress" ADD CONSTRAINT "FK_ElectronicAddress_partyId" FOREIGN KEY ("partyId") REFERENCES "Party"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "PhysicalAddress" ADD CONSTRAINT "FK_PhysicalAddress_partyId" FOREIGN KEY ("partyId") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "Party" ADD CONSTRAINT "FK_Party_party_type_id" FOREIGN KEY ("party_type_id") REFERENCES "PartyType"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "Identity" ADD CONSTRAINT "FK_Identity_partyId" FOREIGN KEY ("partyId") REFERENCES "Party"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "Connection" ADD CONSTRAINT "FK_Connection_identity_id" FOREIGN KEY ("identity_id") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "BaseConfig" ADD CONSTRAINT "FK_BaseConfig_connection_id" FOREIGN KEY ("connection_id") REFERENCES "Connection"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" RENAME CONSTRAINT "UQ_Correlation_id" TO "UQ_CorrelationIdentifier_correlation_id"`);
+    await queryRunner.query(`ALTER TABLE "Identity" RENAME CONSTRAINT "UQ_Identity_Alias" TO "UQ_Identity_alias"`);
+    await queryRunner.query(`INSERT INTO "BaseConfig"("id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connection_id") SELECT "id", "identifier", "redirect_url", "session_id", "client_id", "client_secret", "scopes", "issuer", "dangerously_allow_insecure_http_requests", "client_auth_method", "type", "connectionId" FROM "BaseConfigEntity"`);
+    await queryRunner.query(`DROP TABLE "BaseConfigEntity"`);
+    await queryRunner.query(`INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('3875c12e-fdaa-4ef6-a340-c936e054b627', 'organization', 'INTERNAL', 'Sphereon_default_organization_type', 'sphereon_default_organization', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', now(), now())`);
+    await queryRunner.query(`INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('7d248798-41ca-4fc1-a130-9934b43d532e', 'naturalPerson', 'INTERNAL', 'Sphereon_default_natural_person_type', 'sphereon_default_natural_person', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', now(), now())`);
+    await queryRunner.query(`INSERT INTO "Party"(id, uri, created_at, last_updated_at, party_type_id) SELECT id, uri, created_at, last_updated_at, '3875c12e-fdaa-4ef6-a340-c936e054b627' FROM "Contact"`);
+    await queryRunner.query(`INSERT INTO "BaseContact"(id, legal_name, display_name, party_id, created_at, last_updated_at, type) SELECT id, name, alias, id, created_at, last_updated_at, 'Organization' FROM "Contact"`);
+    await queryRunner.query(`DROP TABLE "Contact"`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "MachineStateInfoEntity"`);
+    await queryRunner.query(`ALTER TABLE "BaseConfig" DROP CONSTRAINT "FK_BaseConfig_connection_id"`);
+    await queryRunner.query(`ALTER TABLE "Connection" DROP CONSTRAINT "FK_Connection_identity_id"`);
+    await queryRunner.query(`ALTER TABLE "Identity" DROP CONSTRAINT "FK_Identity_partyId"`);
+    await queryRunner.query(`ALTER TABLE "Party" DROP CONSTRAINT "FK_Party_party_type_id"`);
+    await queryRunner.query(`ALTER TABLE "PhysicalAddress" DROP CONSTRAINT "FK_PhysicalAddress_partyId"`);
+    await queryRunner.query(`ALTER TABLE "ElectronicAddress" DROP CONSTRAINT "FK_ElectronicAddress_partyId"`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP CONSTRAINT "FK_PartyRelationship_right_id"`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP CONSTRAINT "FK_PartyRelationship_left_id"`);
+    await queryRunner.query(`ALTER TABLE "BaseContact" DROP CONSTRAINT "FK_BaseContact_party_id"`);
+    await queryRunner.query(`ALTER TABLE "IdentityMetadata" DROP CONSTRAINT "FK_IdentityMetadata_identityId"`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP CONSTRAINT "FK_CorrelationIdentifier_identity_id"`);
+    await queryRunner.query(`ALTER TABLE "Identity" ALTER COLUMN "roles" DROP NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "Identity" DROP COLUMN "origin"`);
+    await queryRunner.query(`DROP TYPE "public"."IdentityOrigin_type_enum"`);
+    await queryRunner.query(`ALTER TABLE "Identity" RENAME COLUMN "partyId" TO "contactId"`);
+    await queryRunner.query(`ALTER TABLE "Connection" RENAME COLUMN "identity_id" TO "identityId"`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" RENAME COLUMN "identity_id" TO "identityId"`);
+    await queryRunner.query(`DROP INDEX "IDX_BaseConfig_type"`);
+    await queryRunner.query(`DROP TABLE "BaseConfig"`);
+    await queryRunner.query(`DROP TABLE "Party"`);
+    await queryRunner.query(`DROP INDEX "IDX_PartyRelationship_left_right"`);
+    await queryRunner.query(`DROP TABLE "PartyRelationship"`);
+    await queryRunner.query(`DROP INDEX "IDX_BaseContact_type"`);
+    await queryRunner.query(`DROP TABLE "BaseContact"`);
+    await queryRunner.query(`DROP TABLE "ElectronicAddress"`);
+    await queryRunner.query(`DROP TABLE "PhysicalAddress"`);
+    await queryRunner.query(`DROP INDEX "IDX_PartyType_type_tenant_id"`);
+    await queryRunner.query(`DROP TABLE "PartyType"`);
+    await queryRunner.query(`DROP TYPE "public"."PartyOrigin_type_enum"`);
+    await queryRunner.query(`DROP TYPE "public"."PartyType_type_enum"`);
+    await queryRunner.query(`ALTER TABLE "Connection" ADD CONSTRAINT "FK_Connection_identityId" FOREIGN KEY ("identityId") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "Identity" ADD CONSTRAINT "FK_Identity_contactId" FOREIGN KEY ("contactId") REFERENCES "Contact"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "IdentityMetadata" ADD CONSTRAINT "FK_IdentityMetadata_identityId" FOREIGN KEY ("identityId") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD CONSTRAINT "FK_CorrelationIdentifier_identityId" FOREIGN KEY ("identityId") REFERENCES "Identity"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    await queryRunner.query(`CREATE TABLE "Contact" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "uri" character varying(255), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), "name" character varying(255), "alias" character varying(255), CONSTRAINT "PK_Contact_id" PRIMARY KEY ("id"))`);
+    await queryRunner.query(`INSERT INTO "Contact"(id, uri, created_at, last_updated_at, name, alias) SELECT id, uri, created_at, last_updated_at, (SELECT legal_name FROM "BaseContact" WHERE "BaseContact"."party_id" = "Party"."id"), (SELECT display_name FROM "BaseContact" WHERE "BaseContact"."party_id" = "Party"."id") FROM "Party" WHERE party_type_id = '3875c12e-fdaa-4ef6-a340-c936e054b627'`);
   }
 };
 
-// src/migrations/generic/7-CreateMachineStateStore.ts
+// src/migrations/generic/3-CreateContacts.ts
 var debug14 = (0, import_debug14.default)("sphereon:ssi-sdk:migrations");
-var CreateMachineStateStore1708098041262 = class {
+var CreateContacts1690925872318 = class {
   static {
-    __name(this, "CreateMachineStateStore1708098041262");
+    __name(this, "CreateContacts1690925872318");
   }
-  name = "CreateMachineStateStore1708098041262";
+  name = "CreateContacts1690925872318";
   async up(queryRunner) {
-    debug14("migration: creating machine state tables");
+    debug14("migration: creating contacts tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
         debug14("using postgres migration file");
-        const mig = new CreateMachineStateStore1708797018115();
+        const mig = new CreateContacts1690925872592();
         await mig.up(queryRunner);
         debug14("Migration statements executed");
         return;
@@ -8446,7 +8347,7 @@ var CreateMachineStateStore1708098041262 = class {
       case "expo":
       case "react-native": {
         debug14("using sqlite/react-native migration file");
-        const mig = new CreateMachineStateStore1708796002272();
+        const mig = new CreateContacts1690925872693();
         await mig.up(queryRunner);
         debug14("Migration statements executed");
         return;
@@ -8456,12 +8357,12 @@ var CreateMachineStateStore1708098041262 = class {
     }
   }
   async down(queryRunner) {
-    debug14("migration: reverting machine state tables");
+    debug14("migration: reverting contacts tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
         debug14("using postgres migration file");
-        const mig = new CreateMachineStateStore1708797018115();
+        const mig = new CreateContacts1690925872592();
         await mig.down(queryRunner);
         debug14("Migration statements executed");
         return;
@@ -8470,7 +8371,7 @@ var CreateMachineStateStore1708098041262 = class {
       case "expo":
       case "react-native": {
         debug14("using sqlite/react-native migration file");
-        const mig = new CreateMachineStateStore1708796002272();
+        const mig = new CreateContacts1690925872693();
         await mig.down(queryRunner);
         debug14("Migration statements executed");
         return;
@@ -8481,303 +8382,380 @@ var CreateMachineStateStore1708098041262 = class {
   }
 };
 
-// src/migrations/generic/8-CreateContacts.ts
+// src/migrations/generic/4-CreateStatusList.ts
 var import_debug15 = __toESM(require("debug"), 1);
 
-// src/migrations/postgres/1710438363001-CreateContacts.ts
-var CreateContacts1710438363001 = class {
+// src/migrations/postgres/1693866470001-CreateStatusList.ts
+var CreateStatusList1693866470001 = class {
   static {
-    __name(this, "CreateContacts1710438363001");
+    __name(this, "CreateStatusList1693866470001");
   }
-  name = "CreateContacts1710438363001";
+  name = "CreateStatusList1693866470001";
   async up(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "Party" ADD COLUMN "owner_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "Party" ADD COLUMN "tenant_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "Identity" ADD COLUMN "owner_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "Identity" ADD COLUMN "tenant_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD COLUMN "owner_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD COLUMN "tenant_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "Connection" ADD COLUMN "owner_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "Connection" ADD COLUMN "tenant_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "BaseConfig" ADD COLUMN "owner_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "BaseConfig" ADD COLUMN "tenant_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "BaseContact" ADD COLUMN "owner_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "BaseContact" ADD COLUMN "tenant_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD COLUMN "owner_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD COLUMN "tenant_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "ElectronicAddress" ADD COLUMN "owner_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "ElectronicAddress" ADD COLUMN "tenant_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "PhysicalAddress" ADD COLUMN "owner_id" uuid`);
-    await queryRunner.query(`ALTER TABLE "PhysicalAddress" ADD COLUMN "tenant_id" uuid`);
+    await queryRunner.query(`CREATE TYPE "StatusList_type_enum" AS ENUM('StatusList2021')`);
+    await queryRunner.query(`CREATE TYPE "StatusList_drivertype_enum" AS ENUM('agent_typeorm', 'agent_kv_store', 'github', 'agent_filesystem')`);
+    await queryRunner.query(`CREATE TYPE "StatusList_credentialidmode_enum" AS ENUM('ISSUANCE', 'PERSISTENCE', 'NEVER')`);
+    await queryRunner.query(`CREATE TABLE "StatusListEntry"
+             (
+                 "statusListId"    character varying NOT NULL,
+                 "statusListIndex" integer           NOT NULL,
+                 "credentialId"    character varying,
+                 "credentialHash"  character varying(128),
+                 "correlationId"   character varying(255),
+                 "value"           character varying(50),
+                 CONSTRAINT "PK_68704d2d13857360c6b44a3d1d0" PRIMARY KEY ("statusListId", "statusListIndex")
+             )`);
+    await queryRunner.query(`CREATE TABLE "StatusList"
+             (
+                 "id"                   character varying                  NOT NULL,
+                 "correlationId"        character varying                  NOT NULL,
+                 "length"               integer                            NOT NULL,
+                 "issuer"               text                               NOT NULL,
+                 "type"                 "StatusList_type_enum"             NOT NULL DEFAULT 'StatusList2021',
+                 "driverType"           "StatusList_drivertype_enum"       NOT NULL DEFAULT 'agent_typeorm',
+                 "credentialIdMode"     "StatusList_credentialidmode_enum" NOT NULL DEFAULT 'ISSUANCE',
+                 "proofFormat"          character varying                  NOT NULL DEFAULT 'lds',
+                 "indexingDirection"    character varying                  NOT NULL DEFAULT 'rightToLeft',
+                 "statusPurpose"        character varying                  NOT NULL DEFAULT 'revocation',
+                 "statusListCredential" text,
+                 CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId"),
+                 CONSTRAINT "PK_StatusList_Id" PRIMARY KEY ("id")
+             )`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry"
+                ADD CONSTRAINT "FK_statusListEntry_statusListId" FOREIGN KEY ("statusListId") REFERENCES "StatusList" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "PhysicalAddress" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "PhysicalAddress" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "ElectronicAddress" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "ElectronicAddress" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "BaseContact" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "BaseContact" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "BaseConfig" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "BaseConfig" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "Connection" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "Connection" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "Identity" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "Identity" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "Party" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "Party" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "StatusListEntry"
+            DROP CONSTRAINT "FK_statusListEntry_statusListId"`);
+    await queryRunner.query(`DROP TABLE "StatusListEntry"`);
+    await queryRunner.query(`DROP TABLE "StatusList"`);
+    await queryRunner.query(`DROP TYPE "StatusList_credentialidmode_enum"`);
+    await queryRunner.query(`DROP TYPE "StatusList_drivertype_enum"`);
+    await queryRunner.query(`DROP TYPE "StatusList_type_enum"`);
   }
 };
 
-// src/migrations/sqlite/1710438363002-CreateContacts.ts
-var CreateContacts1710438363002 = class {
+// src/migrations/sqlite/1693866470000-CreateStatusList.ts
+var CreateStatusList1693866470002 = class {
   static {
-    __name(this, "CreateContacts1710438363002");
+    __name(this, "CreateStatusList1693866470002");
   }
-  name = "CreateContacts1710438363002";
+  name = "CreateStatusList1693866470002";
   async up(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "Party" ADD COLUMN "owner_id" text`);
-    await queryRunner.query(`ALTER TABLE "Party" ADD COLUMN "tenant_id" text`);
-    await queryRunner.query(`CREATE TABLE "temporary_Identity" (
-                                             "id" varchar PRIMARY KEY NOT NULL,
-                                             "alias" varchar(255) NOT NULL,
-                                             "roles" text NOT NULL,
-                                             "origin" text NOT NULL,
-                                             "created_at" datetime NOT NULL DEFAULT (datetime('now')),
-                                             "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
-                                             "partyId" varchar,
-                                             "owner_id" text,
-                                             "tenant_id" text,
-                                             CONSTRAINT "UQ_Identity_alias" UNIQUE ("alias"),
-                                             CONSTRAINT "FK_Identity_partyId" FOREIGN KEY ("partyId") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION
-         )`);
-    await queryRunner.query(`INSERT INTO "temporary_Identity"("id", "alias", "roles", "created_at", "last_updated_at", "partyId", "owner_id", "tenant_id", "origin")
-         SELECT "id", "alias", "roles", 'EXTERNAL' as "origin", "created_at", "last_updated_at", "partyId", NULL as "owner_id", NULL as "tenant_id" FROM "Identity"`);
-    await queryRunner.query(`DROP TABLE "Identity"`);
-    await queryRunner.query(`ALTER TABLE "temporary_Identity" RENAME TO "Identity"`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD COLUMN "owner_id" text`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD COLUMN "tenant_id" text`);
-    await queryRunner.query(`ALTER TABLE "Connection" ADD COLUMN "owner_id" text`);
-    await queryRunner.query(`ALTER TABLE "Connection" ADD COLUMN "tenant_id" text`);
-    await queryRunner.query(`ALTER TABLE "BaseConfig" ADD COLUMN "owner_id" text`);
-    await queryRunner.query(`ALTER TABLE "BaseConfig" ADD COLUMN "tenant_id" text`);
-    await queryRunner.query(`ALTER TABLE "BaseContact" ADD COLUMN "owner_id" text`);
-    await queryRunner.query(`ALTER TABLE "BaseContact" ADD COLUMN "tenant_id" text`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD COLUMN "owner_id" text`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD COLUMN "tenant_id" text`);
-    await queryRunner.query(`ALTER TABLE "ElectronicAddress" ADD COLUMN "owner_id" text`);
-    await queryRunner.query(`ALTER TABLE "ElectronicAddress" ADD COLUMN "tenant_id" text`);
-    await queryRunner.query(`ALTER TABLE "PhysicalAddress" ADD COLUMN "owner_id" text`);
-    await queryRunner.query(`ALTER TABLE "PhysicalAddress" ADD COLUMN "tenant_id" text`);
+    await queryRunner.query(`CREATE TABLE "StatusListEntry"
+             (
+                 "statusListId"    varchar NOT NULL,
+                 "statusListIndex" integer NOT NULL,
+                 "credentialId"    varchar,
+                 "credentialHash"  varchar(128),
+                 "correlationId"   varchar(255),
+                 "value"           varchar(50),
+                 PRIMARY KEY ("statusListId", "statusListIndex")
+             )`);
+    await queryRunner.query(`CREATE TABLE "StatusList"
+             (
+                 "id"                   varchar PRIMARY KEY                                                          NOT NULL,
+                 "correlationId"        varchar                                                                      NOT NULL,
+                 "length"               integer                                                                      NOT NULL,
+                 "issuer"               text                                                                         NOT NULL,
+                 "type"                 varchar CHECK ( "type" IN ('StatusList2021') )                               NOT NULL DEFAULT ('StatusList2021'),
+                 "driverType"           varchar CHECK ( "driverType" IN ('agent_typeorm', 'agent_kv_store', 'github',
+                                                                         'agent_filesystem') )                       NOT NULL DEFAULT ('agent_typeorm'),
+                 "credentialIdMode"     varchar CHECK ( "credentialIdMode" IN ('ISSUANCE', 'PERSISTENCE', 'NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
+                 "proofFormat"          varchar CHECK ( "proofFormat" IN ('lds', 'jwt') )                            NOT NULL DEFAULT ('lds'),
+                 "indexingDirection"    varchar CHECK ( "indexingDirection" IN ('rightToLeft') )                     NOT NULL DEFAULT ('rightToLeft'),
+                 "statusPurpose"        varchar                                                                      NOT NULL DEFAULT ('revocation'),
+                 "statusListCredential" text,
+                 CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
+             )`);
+    await queryRunner.query(`CREATE TABLE "temporary_StatusListEntry"
+             (
+                 "statusListId"    varchar NOT NULL,
+                 "statusListIndex" integer NOT NULL,
+                 "credentialId"    varchar,
+                 "credentialHash"  varchar(128),
+                 "correlationId"   varchar(255),
+                 "value"           varchar(50),
+                 CONSTRAINT "FK_statusListEntry_statusListId" FOREIGN KEY ("statusListId") REFERENCES "StatusList" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION,
+                 PRIMARY KEY ("statusListId", "statusListIndex")
+             )`);
+    await queryRunner.query(`INSERT INTO "temporary_StatusListEntry"("statusListId", "statusListIndex", "credentialId",
+                                                     "credentialHash", "correlationId", "value")
+             SELECT "statusListId", "statusListIndex", "credentialId", "credentialHash", "correlationId", "value"
+             FROM "StatusListEntry"`);
+    await queryRunner.query(`DROP TABLE "StatusListEntry"`);
+    await queryRunner.query(`ALTER TABLE "temporary_StatusListEntry" RENAME TO "StatusListEntry"`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "PhysicalAddress" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "PhysicalAddress" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "ElectronicAddress" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "ElectronicAddress" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "BaseContact" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "BaseContact" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "BaseConfig" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "BaseConfig" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "Connection" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "Connection" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "Identity" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "Identity" DROP COLUMN "owner_id"`);
-    await queryRunner.query(`ALTER TABLE "Party" DROP COLUMN "tenant_id"`);
-    await queryRunner.query(`ALTER TABLE "Party" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`DROP TABLE "StatusListEntry"`);
+    await queryRunner.query(`DROP TABLE "StatusList"`);
+  }
+};
+
+// src/migrations/postgres/1737110469001-UpdateStatusList.ts
+var UpdateStatusList1737110469001 = class {
+  static {
+    __name(this, "UpdateStatusList1737110469001");
+  }
+  name = "UpdateStatusList1737110469001";
+  async up(queryRunner) {
+    await queryRunner.query(`ALTER TYPE "StatusList_type_enum" ADD VALUE 'OAuthStatusList'`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "indexingDirection" DROP NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "statusPurpose" DROP NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ADD "bitsPerStatus" integer DEFAULT 1`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ADD "expiresAt" timestamp with time zone`);
+  }
+  async down(queryRunner) {
+    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "expiresAt"`);
+    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "bitsPerStatus"`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "statusPurpose" SET NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "indexingDirection" SET NOT NULL`);
+  }
+};
+
+// src/migrations/sqlite/1737110469000-UpdateStatusList.ts
+var UpdateStatusList1737110469000 = class {
+  static {
+    __name(this, "UpdateStatusList1737110469000");
+  }
+  name = "UpdateStatusList1737110469000";
+  async up(queryRunner) {
+    await queryRunner.query(`CREATE TABLE "temporary_StatusList" (
+                "id" varchar PRIMARY KEY NOT NULL,
+                "correlationId" varchar NOT NULL,
+                "length" integer NOT NULL,
+                "issuer" text NOT NULL,
+                "type" varchar CHECK( "type" IN ('StatusList2021', 'OAuthStatusList') ) NOT NULL DEFAULT ('StatusList2021'),
+                "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
+                "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
+                "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt') ) NOT NULL DEFAULT ('lds'),
+                "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ),
+                "statusPurpose" varchar,
+                "statusListCredential" text,
+                "bitsPerStatus" integer,
+                "expiresAt" datetime,
+                CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
+            )`);
+    await queryRunner.query(`INSERT INTO "temporary_StatusList"(
+                "id", "correlationId", "length", "issuer", "type", "driverType",
+                "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
+                "statusListCredential"
+            )
+            SELECT 
+                "id", "correlationId", "length", "issuer", "type", "driverType",
+                "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
+                "statusListCredential"
+            FROM "StatusList"`);
+    await queryRunner.query(`DROP TABLE "StatusList"`);
+    await queryRunner.query(`ALTER TABLE "temporary_StatusList" RENAME TO "StatusList"`);
+  }
+  async down(queryRunner) {
+    await queryRunner.query(`
+     ALTER TABLE "StatusListEntry"
+     RENAME COLUMN "entryCorrelationId" TO "correlationId"
+   `);
+    await queryRunner.query(`
+     ALTER TABLE "StatusListEntry"
+     DROP COLUMN "statusListCorrelationId"
+   `);
+    await queryRunner.query(`CREATE TABLE "temporary_StatusList" (
+                "id" varchar PRIMARY KEY NOT NULL,
+                "correlationId" varchar NOT NULL,
+                "length" integer NOT NULL,
+                "issuer" text NOT NULL,
+                "type" varchar CHECK( "type" IN ('StatusList2021') ) NOT NULL DEFAULT ('StatusList2021'),
+                "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
+                "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
+                "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt') ) NOT NULL DEFAULT ('lds'),
+                "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ) NOT NULL DEFAULT ('rightToLeft'),
+                "statusPurpose" varchar NOT NULL DEFAULT ('revocation'),
+                "statusListCredential" text,
+                CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
+            )`);
+    await queryRunner.query(`INSERT INTO "temporary_StatusList"(
+                "id", "correlationId", "length", "issuer", "type", "driverType",
+                "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
+                "statusListCredential"
+            )
+            SELECT 
+                "id", "correlationId", "length", "issuer", 
+                CASE WHEN "type" = 'OAuthStatusList' THEN 'StatusList2021' ELSE "type" END,
+                "driverType", "credentialIdMode", "proofFormat", "indexingDirection",
+                COALESCE("statusPurpose", 'revocation'), "statusListCredential"
+            FROM "StatusList"`);
+    await queryRunner.query(`DROP TABLE "StatusList"`);
+    await queryRunner.query(`ALTER TABLE "temporary_StatusList" RENAME TO "StatusList"`);
   }
 };
 
-// src/migrations/generic/8-CreateContacts.ts
+// src/migrations/generic/4-CreateStatusList.ts
 var debug15 = (0, import_debug15.default)("sphereon:ssi-sdk:migrations");
-var CreateContacts1708525189000 = class {
+var CreateStatusList1693866470000 = class {
   static {
-    __name(this, "CreateContacts1708525189000");
+    __name(this, "CreateStatusList1693866470000");
   }
-  name = "CreateContacts1708525189000";
+  name = "CreateStatusList1693866470000";
   async up(queryRunner) {
-    debug15("migration: updating contact tables");
+    debug15("migration: creating issuance branding tables");
     const dbType = queryRunner.connection.driver.options.type;
-    switch (dbType) {
-      case "postgres": {
-        debug15("using postgres migration file");
-        const mig = new CreateContacts1710438363001();
-        await mig.up(queryRunner);
-        debug15("Migration statements executed");
-        return;
-      }
-      case "sqlite":
-      case "expo":
-      case "react-native": {
-        debug15("using sqlite/react-native migration file");
-        const mig = new CreateContacts1710438363002();
-        await mig.up(queryRunner);
-        debug15("Migration statements executed");
-        return;
-      }
-      default:
-        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
+    if (dbType === "postgres") {
+      debug15("using postgres migration files");
+      const createMig = new CreateStatusList1693866470001();
+      await createMig.up(queryRunner);
+      const updateMig = new UpdateStatusList1737110469001();
+      const up = await updateMig.up(queryRunner);
+      debug15("Migration statements executed");
+      return up;
+    } else if (dbType === "sqlite" || dbType === "react-native" || dbType === "expo") {
+      debug15("using sqlite/react-native migration files");
+      const createMig = new CreateStatusList1693866470002();
+      await createMig.up(queryRunner);
+      const updateMig = new UpdateStatusList1737110469000();
+      const up = await updateMig.up(queryRunner);
+      debug15("Migration statements executed");
+      return up;
+    } else {
+      return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
     }
   }
   async down(queryRunner) {
-    debug15("migration: reverting machine state tables");
+    debug15("migration: reverting issuance branding tables");
     const dbType = queryRunner.connection.driver.options.type;
-    switch (dbType) {
-      case "postgres": {
-        debug15("using postgres migration file");
-        const mig = new CreateContacts1710438363001();
-        await mig.down(queryRunner);
-        debug15("Migration statements executed");
-        return;
-      }
-      case "sqlite":
-      case "expo":
-      case "react-native": {
-        debug15("using sqlite/react-native migration file");
-        const mig = new CreateContacts1710438363002();
-        await mig.down(queryRunner);
-        debug15("Migration statements executed");
-        return;
-      }
-      default:
-        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
+    if (dbType === "postgres") {
+      debug15("using postgres migration files");
+      const updateMig = new UpdateStatusList1737110469001();
+      await updateMig.down(queryRunner);
+      const createMig = new CreateStatusList1693866470001();
+      const down = await createMig.down(queryRunner);
+      debug15("Migration statements executed");
+      return down;
+    } else if (dbType === "sqlite" || dbType === "react-native" || dbType === "expo") {
+      debug15("using sqlite/react-native migration files");
+      const updateMig = new UpdateStatusList1737110469000();
+      await updateMig.down(queryRunner);
+      const createMig = new CreateStatusList1693866470002();
+      const down = await createMig.down(queryRunner);
+      debug15("Migration statements executed");
+      return down;
+    } else {
+      return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
     }
   }
 };
 
-// src/migrations/generic/9-CreateContacts.ts
+// src/migrations/generic/5-CreateAuditEvents.ts
 var import_debug16 = __toESM(require("debug"), 1);
 
-// src/migrations/postgres/1715761125001-CreateContacts.ts
-var CreateContacts1715761125001 = class {
+// src/migrations/sqlite/1701634819487-CreateAuditEvents.ts
+var CreateAuditEvents1701634819487 = class {
   static {
-    __name(this, "CreateContacts1715761125001");
+    __name(this, "CreateAuditEvents1701634819487");
   }
-  name = "CreateContacts1715761125001";
+  name = "CreateAuditEvents1701634819487";
   async up(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "IdentityMetadata" RENAME TO "temporary_IdentityMetadata"`);
-    await queryRunner.query(`CREATE TABLE "IdentityMetadata"
-                             (
-                                 "id" uuid PRIMARY KEY NOT NULL DEFAULT uuid_generate_v4(),
-                                 "label" character varying(255) NOT NULL,
-                                 "valueType" character varying NOT NULL,
-                                 "stringValue" text,
-                                 "numberValue" double precision,
-                                 "dateValue" TIMESTAMP,
-                                 "boolValue" boolean,
-                                 "identityId" uuid,
-                                 CONSTRAINT "FK_Identity_IdentityMetadata" FOREIGN KEY ("identityId") REFERENCES "Identity" ("id") ON DELETE CASCADE
-                             )`);
-    await queryRunner.query(`INSERT INTO "IdentityMetadata" ("id", "label", "valueType", "stringValue", "identityId")
-                             SELECT "id", "label", 'string', "value", "identityId"
-                             FROM "temporary_IdentityMetadata"`);
-    await queryRunner.query(`DROP TABLE "temporary_IdentityMetadata"`);
-    await queryRunner.query(`CREATE TABLE "ContactMetadata"
-                             (
-                                 "id" uuid PRIMARY KEY NOT NULL DEFAULT uuid_generate_v4(),
-                                 "label" character varying(255) NOT NULL,
-                                 "valueType" character varying NOT NULL,
-                                 "stringValue" text,
-                                 "numberValue" double precision,
-                                 "dateValue" TIMESTAMP,
-                                 "boolValue" boolean,
-                                 "contactId" uuid,
-                                 CONSTRAINT "FK_BaseContact_ContactMetadata" FOREIGN KEY ("contactId") REFERENCES "BaseContact" ("id") ON DELETE CASCADE
-                             )`);
+    await queryRunner.query(`CREATE TABLE "AuditEvents" (
+                "id" varchar PRIMARY KEY NOT NULL,
+                "eventType" varchar CHECK( "eventType" IN ('audit','activity','general') ) NOT NULL,
+                "timestamp" datetime NOT NULL, 
+                "level" varchar CHECK( "level" IN ('0','1','2','3','4') ) NOT NULL, 
+                "correlationId" varchar NOT NULL, 
+                "system" varchar CHECK( "system" IN ('general','kms','identity','oid4vci','oid4vp','siopv2','PE','credentials','web3','profile','contact') ) NOT NULL, 
+                "subSystemType" varchar CHECK( "subSystemType" IN ('key','did_provider','did_resolver','oid4vp_op','oid4vci_client','siopv2_op','contact_manager','vc_issuer','vc_verifier','vc_persistence','transport','profile','api') ) NOT NULL, 
+                "actionType" varchar CHECK( "actionType" IN ('create','read','update','delete','execute') ) NOT NULL, 
+                "actionSubType" varchar NOT NULL, 
+                "initiatorType" varchar CHECK( "initiatorType" IN ('user','system','external') ) NOT NULL, 
+                "systemCorrelationIdType" varchar CHECK( "systemCorrelationIdType" IN ('did','url','email','hostname','phone','user') ), 
+                "systemCorrelationId" varchar, 
+                "systemAlias" varchar, 
+                "partyCorrelationType" varchar CHECK( "partyCorrelationType" IN ('did','url','email','hostname','phone') ), 
+                "partyCorrelationId" varchar, 
+                "partyAlias" varchar,
+                "credentialType" varchar CHECK( "credentialType" IN ('JSON_LD','JWT','SD_JWT','MSO_MDOC') ),
+                "credentialHash" varchar,
+                "parentCredentialHash" varchar,
+                "originalCredential" varchar,
+                "sharePurpose" varchar,
+                "description" varchar NOT NULL, 
+                "data" varchar, 
+                "diagnosticData" varchar, 
+                "created_at" datetime NOT NULL DEFAULT (datetime('now')), 
+                "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "ContactMetadata"`);
-    await queryRunner.query(`ALTER TABLE "IdentityMetadata" RENAME TO "temporary_IdentityMetadata"`);
-    await queryRunner.query(`CREATE TABLE "IdentityMetadata"
-                             (
-                                 "id" uuid PRIMARY KEY NOT NULL DEFAULT uuid_generate_v4(),
-                                 "label" character varying(255) NOT NULL,
-                                 "value" character varying(255) NOT NULL,
-                                 "identityId" uuid,
-                                 CONSTRAINT "FK_Identity_IdentityMetadata" FOREIGN KEY ("identityId") REFERENCES "Identity" ("id") ON DELETE CASCADE
-                             )`);
-    await queryRunner.query(`INSERT INTO "IdentityMetadata" ("id", "label", "value", "identityId")
-                             SELECT "id", "label", "stringValue", "identityId"
-                             FROM "temporary_IdentityMetadata"`);
-    await queryRunner.query(`DROP TABLE "temporary_IdentityMetadata"`);
+    await queryRunner.query(`DROP TABLE "AuditEvents"`);
   }
 };
 
-// src/migrations/sqlite/1715761125002-CreateContacts.ts
-var CreateContacts1715761125002 = class {
+// src/migrations/postgres/1701634812183-CreateAuditEvents.ts
+var CreateAuditEvents1701634812183 = class {
   static {
-    __name(this, "CreateContacts1715761125002");
+    __name(this, "CreateAuditEvents1701634812183");
   }
-  name = "CreateContacts1715761125002";
+  name = "CreateAuditEvents1701634812183";
   async up(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "IdentityMetadata" RENAME TO "temporary_IdentityMetadata"`);
-    await queryRunner.query(`CREATE TABLE "IdentityMetadata"
-                             (
-                                 "id"          varchar PRIMARY KEY NOT NULL,
-                                 "label"       varchar(255)        NOT NULL,
-                                 "valueType"   varchar             NOT NULL,
-                                 "stringValue" varchar(255),
-                                 "numberValue" double,
-                                 "dateValue"   datetime,
-                                 "boolValue"   boolean,
-                                 "identityId"  varchar,
-                                 FOREIGN KEY ("identityId") REFERENCES "Identity" ("id") ON DELETE CASCADE)`);
-    await queryRunner.query(`INSERT INTO "IdentityMetadata" ("id", "label", "valueType", "stringValue", "identityId")
-                                 SELECT "id", "label", 'string', "value", "identityId"
-                                 FROM "temporary_IdentityMetadata"
-        `);
-    await queryRunner.query(`DROP TABLE "temporary_IdentityMetadata"`);
-    await queryRunner.query(`CREATE TABLE "ContactMetadata"
-                                 (
-                                     "id"          varchar PRIMARY KEY NOT NULL,
-                                     "label"       varchar(255)        NOT NULL,
-                                     "valueType"   varchar             NOT NULL,
-                                     "stringValue" text,
-                                     "numberValue" double,
-                                     "dateValue"   datetime,
-                                     "boolValue"   boolean,
-                                     "contactId"   varchar,
-                                     FOREIGN KEY ("contactId") REFERENCES "BaseContact" ("id") ON DELETE CASCADE)`);
+    await queryRunner.query(`CREATE TYPE "public"."Level_enum" AS ENUM('0', '1', '2', '3', '4')`);
+    await queryRunner.query(`CREATE TYPE "public"."System_enum" AS ENUM('general', 'kms', 'identity', 'oid4vci', 'oid4vp', 'siopv2', 'PE', 'credentials', 'web3', 'profile', 'contact')`);
+    await queryRunner.query(`CREATE TYPE "public"."Subsystem_type_enum" AS ENUM('key', 'did_provider', 'did_resolver', 'oid4vp_op', 'oid4vci_client', 'siopv2_op', 'contact_manager', 'vc_issuer', 'vc_verifier', 'vc_persistence', 'transport', 'profile', 'api')`);
+    await queryRunner.query(`CREATE TYPE "public"."Action_type_enum" AS ENUM('create', 'read', 'update', 'delete', 'execute')`);
+    await queryRunner.query(`CREATE TYPE "public"."Initiator_type_enum" AS ENUM('user', 'system', 'external')`);
+    await queryRunner.query(`CREATE TYPE "public"."System_correlation_id_type_enum" AS ENUM('did', 'url', 'email', 'hostname', 'phone', 'user')`);
+    await queryRunner.query(`CREATE TYPE "public"."Party_correlation_type_enum" AS ENUM('did', 'url', 'email', 'hostname', 'phone')`);
+    await queryRunner.query(`CREATE TYPE "public"."Event_type_enum" AS ENUM('audit', 'activity', 'general')`);
+    await queryRunner.query(`CREATE TYPE "public"."Event_credential_type_enum" AS ENUM('JSON_LD', 'JWT', 'SD_JWT', 'MSO_MDOC')`);
+    await queryRunner.query(`CREATE TABLE "AuditEvents" (
+                "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+                "eventType" "public"."Event_type_enum" NOT NULL,
+                "timestamp" TIMESTAMP NOT NULL, 
+                "level" "public"."Level_enum" NOT NULL, 
+                "correlationId" TEXT NOT NULL, 
+                "system" "public"."System_enum" NOT NULL, 
+                "subSystemType" "public"."Subsystem_type_enum" NOT NULL,  
+                "actionType" "public"."Action_type_enum" NOT NULL, 
+                "actionSubType" TEXT NOT NULL, 
+                "initiatorType" "public"."Initiator_type_enum" NOT NULL, 
+                "systemCorrelationIdType" "public"."System_correlation_id_type_enum", 
+                "systemCorrelationId" TEXT, 
+                "systemAlias" TEXT, 
+                "partyCorrelationType" "public"."Party_correlation_type_enum", 
+                "partyCorrelationId" TEXT, 
+                "partyAlias" TEXT, 
+                "credentialType" "public"."Event_credential_type_enum",
+                "credentialHash" TEXT,
+                "originalCredential" TEXT,
+                "sharePurpose" TEXT,
+                "description" TEXT NOT NULL, 
+                "data" TEXT, 
+                "diagnosticData" TEXT, 
+                "created_at" TIMESTAMP NOT NULL DEFAULT now(), 
+                "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), 
+                CONSTRAINT "PK_AuditEvents_id" PRIMARY KEY ("id"))`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "ContactMetadata"`);
-    await queryRunner.query(`ALTER TABLE "IdentityMetadata" RENAME TO "temporary_IdentityMetadata"`);
-    await queryRunner.query(`CREATE TABLE "IdentityMetadata"
-                                 (
-                                     "id"         varchar PRIMARY KEY NOT NULL,
-                                     "label"      varchar(255)        NOT NULL,
-                                     "value"      varchar(255)        NOT NULL,
-                                     "identityId" varchar,
-                                     FOREIGN KEY ("identityId") REFERENCES "Identity" ("id") ON DELETE CASCADE
-                                 )`);
-    await queryRunner.query(`INSERT INTO "IdentityMetadata" ("id", "label", "value", "identityId")
-                                 SELECT "id", "label", "stringValue", "identityId"
-                                 FROM "temporary_IdentityMetadata"`);
-    await queryRunner.query(`DROP TABLE "temporary_IdentityMetadata"`);
+    await queryRunner.query(`DROP TABLE "AuditEvents"`);
+    await queryRunner.query(`DROP TYPE "public"."Party_correlation_type_enum"`);
+    await queryRunner.query(`DROP TYPE "public"."System_correlation_id_type_enum"`);
+    await queryRunner.query(`DROP TYPE "public"."Initiator_type_enum"`);
+    await queryRunner.query(`DROP TYPE "public"."Action_type_enum"`);
+    await queryRunner.query(`DROP TYPE "public"."Subsystem_type_enum"`);
+    await queryRunner.query(`DROP TYPE "public"."System_enum"`);
+    await queryRunner.query(`DROP TYPE "public"."Level_enum"`);
   }
 };
 
-// src/migrations/generic/9-CreateContacts.ts
+// src/migrations/generic/5-CreateAuditEvents.ts
 var debug16 = (0, import_debug16.default)("sphereon:ssi-sdk:migrations");
-var CreateContacts1715761125000 = class {
+var CreateAuditEvents1701635835330 = class {
   static {
-    __name(this, "CreateContacts1715761125000");
+    __name(this, "CreateAuditEvents1701635835330");
   }
-  name = "CreateContacts1715761125000";
+  name = "CreateAuditEvents1701635835330";
   async up(queryRunner) {
-    debug16("migration: updating contact tables");
+    debug16("migration: creating audit events tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
         debug16("using postgres migration file");
-        const mig = new CreateContacts1715761125001();
+        const mig = new CreateAuditEvents1701634812183();
         await mig.up(queryRunner);
         debug16("Migration statements executed");
         return;
@@ -8786,7 +8764,7 @@ var CreateContacts1715761125000 = class {
       case "expo":
       case "react-native": {
         debug16("using sqlite/react-native migration file");
-        const mig = new CreateContacts1715761125002();
+        const mig = new CreateAuditEvents1701634819487();
         await mig.up(queryRunner);
         debug16("Migration statements executed");
         return;
@@ -8796,12 +8774,12 @@ var CreateContacts1715761125000 = class {
     }
   }
   async down(queryRunner) {
-    debug16("migration: reverting machine state tables");
+    debug16("migration: reverting audit events tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
         debug16("using postgres migration file");
-        const mig = new CreateContacts1715761125001();
+        const mig = new CreateAuditEvents1701634812183();
         await mig.down(queryRunner);
         debug16("Migration statements executed");
         return;
@@ -8810,7 +8788,7 @@ var CreateContacts1715761125000 = class {
       case "expo":
       case "react-native": {
         debug16("using sqlite/react-native migration file");
-        const mig = new CreateContacts1715761125002();
+        const mig = new CreateAuditEvents1701634819487();
         await mig.down(queryRunner);
         debug16("Migration statements executed");
         return;
@@ -8821,85 +8799,258 @@ var CreateContacts1715761125000 = class {
   }
 };
 
-// src/migrations/generic/10-CreatePresentationDefinitions.ts
+// src/migrations/generic/6-CreateDigitalCredential.ts
 var import_debug17 = __toESM(require("debug"), 1);
 
-// src/migrations/postgres/1716475165345-CreatePresentationDefinitions.ts
-var CreatePresentationDefinitions1716475165345 = class {
+// src/migrations/postgres/1708525189001-CreateDigitalCredential.ts
+var CreateDigitalCredential1708525189001 = class {
   static {
-    __name(this, "CreatePresentationDefinitions1716475165345");
+    __name(this, "CreateDigitalCredential1708525189001");
   }
-  name = "CreatePresentationDefinitions1716475165345";
+  name = "CreateDigitalCredential1708525189001";
   async up(queryRunner) {
+    await queryRunner.query(`CREATE TYPE "digital_document_type" AS ENUM('VC', 'VP', 'C', 'P')`);
+    await queryRunner.query(`CREATE TYPE "digital_regulation_type" AS ENUM('PID', 'QEAA', 'EAA', 'NON_REGULATED')`);
+    await queryRunner.query(`CREATE TYPE "digital_credential_document_format" AS ENUM('JSON_LD', 'JWT', 'SD_JWT', 'MSO_MDOC')`);
+    await queryRunner.query(`CREATE TYPE "digital_credential_credential_role" AS ENUM('ISSUER', 'VERIFIER', 'HOLDER', 'FEDERATION_TRUST_ANCHOR')`);
+    await queryRunner.query(`CREATE TYPE "digital_credential_correlation_type" AS ENUM('DID', 'KID', 'URL', 'X509_SAN')`);
+    await queryRunner.query(`CREATE TYPE "digital_credential_state_type" AS ENUM('REVOKED', 'VERIFIED', 'EXPIRED')`);
     await queryRunner.query(`
-CREATE TABLE "PresentationDefinitionItem" (
-    "id" uuid NOT NULL DEFAULT uuid_generate_v4(), 
-    "tenant_id" TEXT, 
-    "definition_id" TEXT NOT NULL,
-    "name" TEXT,
-    "version" TEXT NOT NULL, 
-    "purpose" TEXT, 
-    "definition_payload" TEXT NOT NULL, 
-    "dcql_payload" TEXT, 
-    "created_at" TIMESTAMP NOT NULL DEFAULT now(), 
-    "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), 
-    CONSTRAINT "PK_PresentationDefinitionItem_id" PRIMARY KEY ("id"))
-                                          `);
+      CREATE TABLE "DigitalCredential" (
+        "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+        "parent_id" text,
+        "document_type" "digital_document_type" NOT NULL,
+        "regulation_type" "digital_regulation_type" NOT NULL DEFAULT 'NON_REGULATED'::"digital_regulation_type",
+        "document_format" "digital_credential_document_format" NOT NULL,
+        "credential_role" "digital_credential_credential_role" NOT NULL,
+        "raw_document" text NOT NULL,
+        "uniform_document" text NOT NULL,
+        "credential_id" text,
+        "hash" text NOT NULL,
+        "kms_key_ref" text,
+        "identifier_method" text,
+        "issuer_correlation_type" "digital_credential_correlation_type" NOT NULL,
+        "subject_correlation_type" "digital_credential_correlation_type",
+        "issuer_correlation_id" text NOT NULL,
+        "subject_correlation_id" text,
+        "verified_state" "digital_credential_state_type",
+        "issuer_signed" boolean,
+        "rp_correlation_id" text,
+        "rp_correlation_type" "digital_credential_correlation_type",
+        "tenant_id" text,
+        "created_at" TIMESTAMP NOT NULL DEFAULT now(),
+        "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(),
+        "presented_at" DATE,
+        "valid_from" DATE,
+        "valid_until" DATE,
+        "verified_at" DATE,
+        "revoked_at" DATE,
+        PRIMARY KEY ("id"),
+        UNIQUE ("hash", "credential_role")
+      )
+    `);
   }
   async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "PresentationDefinitionItem"`);
+    await queryRunner.query(`DROP TABLE "DigitalCredential"`);
+    await queryRunner.query(`DROP TYPE "digital_credential_state_type"`);
+    await queryRunner.query(`DROP TYPE "digital_credential_correlation_type"`);
+    await queryRunner.query(`DROP TYPE "digital_credential_document_format"`);
+    await queryRunner.query(`DROP TYPE "digital_credential_credential_role"`);
+    await queryRunner.query(`DROP TYPE "digital_regulation_type"`);
+    await queryRunner.query(`DROP TYPE "digital_document_type"`);
   }
 };
 
-// src/migrations/sqlite/1716475165344-CreatePresentationDefinitions.ts
-var CreatePresentationDefinitions1716475165344 = class {
+// src/migrations/sqlite/1708525189002-CreateDigitalCredential.ts
+var CreateDigitalCredential1708525189002 = class {
   static {
-    __name(this, "CreatePresentationDefinitions1716475165344");
+    __name(this, "CreateDigitalCredential1708525189002");
   }
-  name = "CreatePresentationDefinitions1716475165344";
+  name = "CreateDigitalCredential1708525189002";
   async up(queryRunner) {
-    await queryRunner.query(`CREATE TABLE "PresentationDefinitionItem" (
-    "id" varchar PRIMARY KEY NOT NULL, 
-    "tenant_id" varchar,
-    "definition_id" varchar NOT NULL,
-    "name" varchar,
-    "version" varchar NOT NULL,
-    "purpose" varchar,
-    "definition_payload" varchar NOT NULL,
-    "dcql_payload" varchar,
-    "created_at" datetime NOT NULL DEFAULT (datetime('now')),
-    "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
+    await queryRunner.query(`
+            CREATE TABLE "DigitalCredential" (
+                "id" varchar PRIMARY KEY NOT NULL,
+                "parent_id" text, 
+                "document_type" varchar CHECK( "document_type" IN ('VC', 'VP', 'C', 'P') ) NOT NULL,
+                "regulation_type" varchar CHECK( "regulation_type" IN ('PID', 'QEAA', 'EAA', 'NON_REGULATED') ) NOT NULL DEFAULT 'NON_REGULATED',
+                "document_format" varchar CHECK( "document_format" IN ('JSON_LD', 'JWT', 'SD_JWT', 'MSO_MDOC') ) NOT NULL,
+                "credential_role" varchar CHECK( "credential_role" IN ('ISSUER', 'VERIFIER', 'HOLDER', 'FEDERATION_TRUST_ANCHOR') ) NOT NULL,
+                "raw_document" text NOT NULL,
+                "uniform_document" text NOT NULL,
+                "credential_id" text,
+                "hash" text NOT NULL,
+                "kms_key_ref" text,
+                "identifier_method" text,
+                "issuer_correlation_type" varchar CHECK( "issuer_correlation_type" IN ('DID', 'KID', 'URL', 'X509_SAN') ) NOT NULL,
+                "subject_correlation_type" varchar CHECK( "subject_correlation_type" IN ('DID', 'KID', 'URL', 'X509_SAN') ),
+                "issuer_correlation_id" text NOT NULL,
+                "subject_correlation_id" text,
+                "issuer_signed" boolean,
+                "rp_correlation_id" text,
+                "rp_correlation_type" varchar CHECK( "issuer_correlation_type" IN ('DID', 'KID', 'URL', 'X509_SAN') ),
+                "verified_state" varchar CHECK( "verified_state" IN ('REVOKED', 'VERIFIED', 'EXPIRED') ),
+                "tenant_id" text,
+                "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+                "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
+                "presented_at" datetime,
+                "valid_from" datetime,
+                "valid_until" datetime,
+                "verified_at" datetime,
+                "revoked_at" datetime,
+                UNIQUE ("hash", "credential_role")
+            )
+        `);
+  }
+  async down(queryRunner) {
+    await queryRunner.query(`DROP TABLE "DigitalCredential"`);
+  }
+};
+
+// src/migrations/generic/6-CreateDigitalCredential.ts
+var debug17 = (0, import_debug17.default)("sphereon:ssi-sdk:migrations");
+var CreateDigitalCredential1708525189000 = class {
+  static {
+    __name(this, "CreateDigitalCredential1708525189000");
+  }
+  name = "CreateDigitalCredential1708525189000";
+  async up(queryRunner) {
+    debug17("migration: creating DigitalCredential tables");
+    const dbType = queryRunner.connection.driver.options.type;
+    switch (dbType) {
+      case "postgres": {
+        debug17("using postgres migration file for DigitalCredential");
+        const mig = new CreateDigitalCredential1708525189001();
+        await mig.up(queryRunner);
+        debug17("Postgres Migration statements for DigitalCredential executed");
+        return;
+      }
+      case "sqlite":
+      case "expo":
+      case "react-native": {
+        debug17("using sqlite/react-native migration file for DigitalCredential");
+        const mig = new CreateDigitalCredential1708525189002();
+        await mig.up(queryRunner);
+        debug17("SQLite Migration statements for DigitalCredential executed");
+        return;
+      }
+      default:
+        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo, and postgres for UniformCredential. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
+    }
+  }
+  async down(queryRunner) {
+    debug17("migration: reverting DigitalCredential tables");
+    const dbType = queryRunner.connection.driver.options.type;
+    switch (dbType) {
+      case "postgres": {
+        debug17("using postgres migration file for DigitalCredential");
+        const mig = new CreateDigitalCredential1708525189001();
+        await mig.down(queryRunner);
+        debug17("Postgres Migration statements for DigitalCredential reverted");
+        return;
+      }
+      case "sqlite":
+      case "expo":
+      case "react-native": {
+        debug17("using sqlite/react-native migration file for DigitalCredential");
+        const mig = new CreateDigitalCredential1708525189002();
+        await mig.down(queryRunner);
+        debug17("SQLite Migration statements for DigitalCredential reverted");
+        return;
+      }
+      default:
+        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo, and postgres for DigitalCredential. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
+    }
+  }
+};
+
+// src/migrations/generic/7-CreateMachineStateStore.ts
+var import_debug18 = __toESM(require("debug"), 1);
+
+// src/migrations/postgres/1708797018115-CreateMachineStateStore.ts
+var CreateMachineStateStore1708797018115 = class {
+  static {
+    __name(this, "CreateMachineStateStore1708797018115");
+  }
+  name = "CreateMachineStateStore1708797018115";
+  async up(queryRunner) {
+    await queryRunner.query(`
+            CREATE TABLE "MachineStateInfoEntity" (
+                "instance_id" text NOT NULL,
+                "session_id" text,
+                "latest_state_name" text,
+                "machine_name" text NOT NULL,
+                "latest_event_type" text NOT NULL,
+                "state" text NOT NULL,
+                "created_at" TIMESTAMP NOT NULL DEFAULT now(),
+                "updated_at" TIMESTAMP NOT NULL DEFAULT now(),
+                "updated_count" integer NOT NULL DEFAULT 0,
+                "expires_at" TIMESTAMP,
+                "completed_at" TIMESTAMP,
+                "tenant_id" text,
+                CONSTRAINT "PK_MachineStateInfoEntity_id" PRIMARY KEY ("instance_id")
+            )
+        `);
+  }
+  async down(queryRunner) {
+    await queryRunner.query(`DROP TABLE "MachineStateInfoEntity"`);
+  }
+};
+
+// src/migrations/sqlite/1708796002272-CreateMachineStateStore.ts
+var CreateMachineStateStore1708796002272 = class {
+  static {
+    __name(this, "CreateMachineStateStore1708796002272");
+  }
+  name = "CreateMachineStateStore1708796002272";
+  async up(queryRunner) {
+    await queryRunner.query(`
+            CREATE TABLE "MachineStateInfoEntity" (
+                "instance_id" varchar PRIMARY KEY NOT NULL,
+                "session_id" varchar,
+                "machine_name" varchar NOT NULL,
+                "latest_state_name" varchar,
+                "latest_event_type" varchar NOT NULL,
+                "state" text NOT NULL,
+                "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+                "updated_at" datetime NOT NULL DEFAULT (datetime('now')),
+                "updated_count" integer NOT NULL DEFAULT 0,
+                "expires_at" datetime,
+                "completed_at" datetime,
+                "tenant_id" varchar
+            )
+        `);
   }
   async down(queryRunner) {
-    await queryRunner.query(`DROP TABLE "PresentationDefinitionItem"`);
+    await queryRunner.query(`DROP TABLE "MachineStateInfoEntity"`);
   }
 };
 
-// src/migrations/generic/10-CreatePresentationDefinitions.ts
-var debug17 = (0, import_debug17.default)("sphereon:ssi-sdk:migrations");
-var CreatePresentationDefinitions1716533767523 = class {
+// src/migrations/generic/7-CreateMachineStateStore.ts
+var debug18 = (0, import_debug18.default)("sphereon:ssi-sdk:migrations");
+var CreateMachineStateStore1708098041262 = class {
   static {
-    __name(this, "CreatePresentationDefinitions1716533767523");
+    __name(this, "CreateMachineStateStore1708098041262");
   }
-  name = "CreatePresentationDefinitionItems1716533767523";
+  name = "CreateMachineStateStore1708098041262";
   async up(queryRunner) {
-    debug17("migration: creating machine state tables");
+    debug18("migration: creating machine state tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
-        debug17("using postgres migration file");
-        const mig = new CreatePresentationDefinitions1716475165345();
+        debug18("using postgres migration file");
+        const mig = new CreateMachineStateStore1708797018115();
         await mig.up(queryRunner);
-        debug17("Migration statements executed");
+        debug18("Migration statements executed");
         return;
       }
       case "sqlite":
       case "expo":
       case "react-native": {
-        debug17("using sqlite/react-native migration file");
-        const mig = new CreatePresentationDefinitions1716475165344();
+        debug18("using sqlite/react-native migration file");
+        const mig = new CreateMachineStateStore1708796002272();
         await mig.up(queryRunner);
-        debug17("Migration statements executed");
+        debug18("Migration statements executed");
         return;
       }
       default:
@@ -8907,23 +9058,23 @@ var CreatePresentationDefinitions1716533767523 = class {
     }
   }
   async down(queryRunner) {
-    debug17("migration: reverting machine state tables");
+    debug18("migration: reverting machine state tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
-        debug17("using postgres migration file");
-        const mig = new CreatePresentationDefinitions1716475165345();
+        debug18("using postgres migration file");
+        const mig = new CreateMachineStateStore1708797018115();
         await mig.down(queryRunner);
-        debug17("Migration statements executed");
+        debug18("Migration statements executed");
         return;
       }
       case "sqlite":
       case "expo":
       case "react-native": {
-        debug17("using sqlite/react-native migration file");
-        const mig = new CreatePresentationDefinitions1716475165344();
+        debug18("using sqlite/react-native migration file");
+        const mig = new CreateMachineStateStore1708796002272();
         await mig.down(queryRunner);
-        debug17("Migration statements executed");
+        debug18("Migration statements executed");
         return;
       }
       default:
@@ -8932,108 +9083,145 @@ var CreatePresentationDefinitions1716533767523 = class {
   }
 };
 
-// src/migrations/generic/11-FixCredentialClaimsReferenceUuid.ts
-var import_debug18 = __toESM(require("debug"), 1);
+// src/migrations/generic/8-CreateContacts.ts
+var import_debug19 = __toESM(require("debug"), 1);
 
-// src/migrations/postgres/1741895822987-FixCredentialClaimsReferencesUuid.ts
-var FixCredentialClaimsReferencesUuidPG1741895822987 = class {
+// src/migrations/postgres/1710438363001-CreateContacts.ts
+var CreateContacts1710438363001 = class {
   static {
-    __name(this, "FixCredentialClaimsReferencesUuidPG1741895822987");
+    __name(this, "CreateContacts1710438363001");
   }
-  name = "FixCredentialClaimsReferencesUuid1741895822987";
+  name = "CreateContacts1710438363001";
   async up(queryRunner) {
-    await queryRunner.query(`
-      ALTER TABLE "CredentialClaims"
-      ALTER COLUMN "credentialLocaleBrandingId" TYPE uuid USING "credentialLocaleBrandingId"::uuid;
-    `);
+    await queryRunner.query(`ALTER TABLE "Party" ADD COLUMN "owner_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "Party" ADD COLUMN "tenant_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "Identity" ADD COLUMN "owner_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "Identity" ADD COLUMN "tenant_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD COLUMN "owner_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD COLUMN "tenant_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "Connection" ADD COLUMN "owner_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "Connection" ADD COLUMN "tenant_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "BaseConfig" ADD COLUMN "owner_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "BaseConfig" ADD COLUMN "tenant_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "BaseContact" ADD COLUMN "owner_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "BaseContact" ADD COLUMN "tenant_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD COLUMN "owner_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD COLUMN "tenant_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "ElectronicAddress" ADD COLUMN "owner_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "ElectronicAddress" ADD COLUMN "tenant_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "PhysicalAddress" ADD COLUMN "owner_id" uuid`);
+    await queryRunner.query(`ALTER TABLE "PhysicalAddress" ADD COLUMN "tenant_id" uuid`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`
-      ALTER TABLE "CredentialClaims"
-      ALTER COLUMN "credentialLocaleBrandingId" TYPE character varying USING "credentialLocaleBrandingId"::text;
-    `);
+    await queryRunner.query(`ALTER TABLE "PhysicalAddress" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "PhysicalAddress" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "ElectronicAddress" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "ElectronicAddress" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "BaseContact" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "BaseContact" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "BaseConfig" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "BaseConfig" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "Connection" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "Connection" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "Identity" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "Identity" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "Party" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "Party" DROP COLUMN "owner_id"`);
   }
 };
 
-// src/migrations/sqlite/1741895822987-FixCredentialClaimsReferencesUuid.ts
-var FixCredentialClaimsReferencesUuidSqlite1741895822987 = class {
+// src/migrations/sqlite/1710438363002-CreateContacts.ts
+var CreateContacts1710438363002 = class {
   static {
-    __name(this, "FixCredentialClaimsReferencesUuidSqlite1741895822987");
+    __name(this, "CreateContacts1710438363002");
   }
-  name = "FixCredentialClaimsReferencesUuid1741895822987";
+  name = "CreateContacts1710438363002";
   async up(queryRunner) {
-    await queryRunner.query(`
-            CREATE TABLE "CredentialClaims_new"
-            (
-                "id"                         uuid                   NOT NULL DEFAULT (lower(hex(randomblob(16)))),
-                "key"                        character varying(255) NOT NULL,
-                "name"                       character varying(255) NOT NULL,
-                "credentialLocaleBrandingId" uuid,
-                CONSTRAINT "PK_CredentialClaims_id" PRIMARY KEY ("id")
-            )
-        `);
-    await queryRunner.query(`
-            INSERT INTO "CredentialClaims_new" ("id", "key", "name", "credentialLocaleBrandingId")
-            SELECT "id", "key", "name", "credentialLocaleBrandingId"
-            FROM "CredentialClaims"
-        `);
-    await queryRunner.query(`DROP TABLE "CredentialClaims"`);
-    await queryRunner.query(`ALTER TABLE "CredentialClaims_new" RENAME TO "CredentialClaims"`);
-    await queryRunner.query(`
-            CREATE UNIQUE INDEX "IDX_CredentialClaimsEntity_credentialLocaleBranding_locale"
-                ON "CredentialClaims" ("credentialLocaleBrandingId", "key")
-        `);
+    await queryRunner.query(`ALTER TABLE "Party" ADD COLUMN "owner_id" text`);
+    await queryRunner.query(`ALTER TABLE "Party" ADD COLUMN "tenant_id" text`);
+    await queryRunner.query(`CREATE TABLE "temporary_Identity" (
+                                             "id" varchar PRIMARY KEY NOT NULL,
+                                             "alias" varchar(255) NOT NULL,
+                                             "roles" text NOT NULL,
+                                             "origin" text NOT NULL,
+                                             "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                             "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                             "partyId" varchar,
+                                             "owner_id" text,
+                                             "tenant_id" text,
+                                             CONSTRAINT "UQ_Identity_alias" UNIQUE ("alias"),
+                                             CONSTRAINT "FK_Identity_partyId" FOREIGN KEY ("partyId") REFERENCES "Party" ("id") ON DELETE CASCADE ON UPDATE NO ACTION
+         )`);
+    await queryRunner.query(`INSERT INTO "temporary_Identity"("id", "alias", "roles", "created_at", "last_updated_at", "partyId", "owner_id", "tenant_id", "origin")
+         SELECT "id", "alias", "roles", 'EXTERNAL' as "origin", "created_at", "last_updated_at", "partyId", NULL as "owner_id", NULL as "tenant_id" FROM "Identity"`);
+    await queryRunner.query(`DROP TABLE "Identity"`);
+    await queryRunner.query(`ALTER TABLE "temporary_Identity" RENAME TO "Identity"`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD COLUMN "owner_id" text`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" ADD COLUMN "tenant_id" text`);
+    await queryRunner.query(`ALTER TABLE "Connection" ADD COLUMN "owner_id" text`);
+    await queryRunner.query(`ALTER TABLE "Connection" ADD COLUMN "tenant_id" text`);
+    await queryRunner.query(`ALTER TABLE "BaseConfig" ADD COLUMN "owner_id" text`);
+    await queryRunner.query(`ALTER TABLE "BaseConfig" ADD COLUMN "tenant_id" text`);
+    await queryRunner.query(`ALTER TABLE "BaseContact" ADD COLUMN "owner_id" text`);
+    await queryRunner.query(`ALTER TABLE "BaseContact" ADD COLUMN "tenant_id" text`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD COLUMN "owner_id" text`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" ADD COLUMN "tenant_id" text`);
+    await queryRunner.query(`ALTER TABLE "ElectronicAddress" ADD COLUMN "owner_id" text`);
+    await queryRunner.query(`ALTER TABLE "ElectronicAddress" ADD COLUMN "tenant_id" text`);
+    await queryRunner.query(`ALTER TABLE "PhysicalAddress" ADD COLUMN "owner_id" text`);
+    await queryRunner.query(`ALTER TABLE "PhysicalAddress" ADD COLUMN "tenant_id" text`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`
-            CREATE TABLE "CredentialClaims_old"
-            (
-                "id"                         uuid                   NOT NULL DEFAULT (lower(hex(randomblob(16)))),
-                "key"                        character varying(255) NOT NULL,
-                "name"                       character varying(255) NOT NULL,
-                "credentialLocaleBrandingId" character varying,
-                CONSTRAINT "PK_CredentialClaims_id" PRIMARY KEY ("id")
-            )
-        `);
-    await queryRunner.query(`
-            INSERT INTO "CredentialClaims_old" ("id", "key", "name", "credentialLocaleBrandingId")
-            SELECT "id", "key", "name", "credentialLocaleBrandingId"
-            FROM "CredentialClaims"
-        `);
-    await queryRunner.query(`DROP TABLE "CredentialClaims"`);
-    await queryRunner.query(`ALTER TABLE "CredentialClaims_old" RENAME TO "CredentialClaims"`);
-    await queryRunner.query(`
-            CREATE UNIQUE INDEX "IDX_CredentialClaimsEntity_credentialLocaleBranding_locale"
-                ON "CredentialClaims" ("credentialLocaleBrandingId", "key")
-        `);
+    await queryRunner.query(`ALTER TABLE "PhysicalAddress" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "PhysicalAddress" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "ElectronicAddress" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "ElectronicAddress" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "PartyRelationship" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "BaseContact" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "BaseContact" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "BaseConfig" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "BaseConfig" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "Connection" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "Connection" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "Identity" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "Identity" DROP COLUMN "owner_id"`);
+    await queryRunner.query(`ALTER TABLE "Party" DROP COLUMN "tenant_id"`);
+    await queryRunner.query(`ALTER TABLE "Party" DROP COLUMN "owner_id"`);
   }
 };
 
-// src/migrations/generic/11-FixCredentialClaimsReferenceUuid.ts
-var debug18 = (0, import_debug18.default)("sphereon:ssi-sdk:migrations");
-var FixCredentialClaimsReferencesUuid1741895822987 = class {
+// src/migrations/generic/8-CreateContacts.ts
+var debug19 = (0, import_debug19.default)("sphereon:ssi-sdk:migrations");
+var CreateContacts1708525189000 = class {
   static {
-    __name(this, "FixCredentialClaimsReferencesUuid1741895822987");
+    __name(this, "CreateContacts1708525189000");
   }
-  name = "FixCredentialClaimsReferenceUuid1741895822987";
+  name = "CreateContacts1708525189000";
   async up(queryRunner) {
-    debug18("migration: creating issuance branding uuid problem");
+    debug19("migration: updating contact tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
-        debug18("using postgres migration file");
-        const mig = new FixCredentialClaimsReferencesUuidPG1741895822987();
+        debug19("using postgres migration file");
+        const mig = new CreateContacts1710438363001();
         await mig.up(queryRunner);
-        debug18("Migration statements executed");
+        debug19("Migration statements executed");
         return;
       }
       case "sqlite":
       case "expo":
       case "react-native": {
-        debug18("using sqlite/react-native migration file");
-        const mig = new FixCredentialClaimsReferencesUuidSqlite1741895822987();
+        debug19("using sqlite/react-native migration file");
+        const mig = new CreateContacts1710438363002();
         await mig.up(queryRunner);
-        debug18("Migration statements executed");
+        debug19("Migration statements executed");
         return;
       }
       default:
@@ -9041,23 +9229,23 @@ var FixCredentialClaimsReferencesUuid1741895822987 = class {
     }
   }
   async down(queryRunner) {
-    debug18("migration: reverting issuance branding uuid migration");
+    debug19("migration: reverting machine state tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
-        debug18("using postgres migration file");
-        const mig = new CreateIssuanceBranding1685628974232();
+        debug19("using postgres migration file");
+        const mig = new CreateContacts1710438363001();
         await mig.down(queryRunner);
-        debug18("Migration statements executed");
+        debug19("Migration statements executed");
         return;
       }
       case "sqlite":
       case "expo":
       case "react-native": {
-        debug18("using sqlite/react-native migration file");
-        const mig = new CreateIssuanceBranding1685628973231();
+        debug19("using sqlite/react-native migration file");
+        const mig = new CreateContacts1710438363002();
         await mig.down(queryRunner);
-        debug18("Migration statements executed");
+        debug19("Migration statements executed");
         return;
       }
       default:
@@ -9066,222 +9254,171 @@ var FixCredentialClaimsReferencesUuid1741895822987 = class {
   }
 };
 
-// src/migrations/generic/12-CreateBitstringStatusList.ts
-var import_debug19 = __toESM(require("debug"), 1);
-
-// src/migrations/postgres/1741895823000-CreateBitstringStatusList.ts
-var CreateBitstringStatusListPG1741895823000 = class {
-  static {
-    __name(this, "CreateBitstringStatusListPG1741895823000");
-  }
-  name = "CreateBitstringStatusList1741895823000";
-  async up(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "bitsPerStatus" integer DEFAULT 1`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "ttl" integer`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "validFrom" TIMESTAMP`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "validUntil" TIMESTAMP`);
-    await queryRunner.query(`ALTER TABLE "StatusList" DROP CONSTRAINT IF EXISTS "CHK_StatusList_type"`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ADD CONSTRAINT "CHK_StatusList_type" CHECK ("type" IN ('StatusList2021', 'OAuthStatusList', 'BitstringStatusList'))`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "type" character varying NOT NULL DEFAULT 'StatusListEntryEntity'`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusPurpose" character varying`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "bitsPerStatus" integer DEFAULT 1`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusMessage" text`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusReference" text`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD CONSTRAINT "CHK_StatusListEntry_type" CHECK ("type" IN ('StatusListEntryEntity', 'bitstring'))`);
+// src/migrations/generic/9-CreateContacts.ts
+var import_debug20 = __toESM(require("debug"), 1);
+
+// src/migrations/postgres/1715761125001-CreateContacts.ts
+var CreateContacts1715761125001 = class {
+  static {
+    __name(this, "CreateContacts1715761125001");
+  }
+  name = "CreateContacts1715761125001";
+  async up(queryRunner) {
+    await queryRunner.query(`ALTER TABLE "IdentityMetadata" RENAME TO "temporary_IdentityMetadata"`);
+    await queryRunner.query(`CREATE TABLE "IdentityMetadata"
+                             (
+                                 "id" uuid PRIMARY KEY NOT NULL DEFAULT uuid_generate_v4(),
+                                 "label" character varying(255) NOT NULL,
+                                 "valueType" character varying NOT NULL,
+                                 "stringValue" text,
+                                 "numberValue" double precision,
+                                 "dateValue" TIMESTAMP,
+                                 "boolValue" boolean,
+                                 "identityId" uuid,
+                                 CONSTRAINT "FK_Identity_IdentityMetadata" FOREIGN KEY ("identityId") REFERENCES "Identity" ("id") ON DELETE CASCADE
+                             )`);
+    await queryRunner.query(`INSERT INTO "IdentityMetadata" ("id", "label", "valueType", "stringValue", "identityId")
+                             SELECT "id", "label", 'string', "value", "identityId"
+                             FROM "temporary_IdentityMetadata"`);
+    await queryRunner.query(`DROP TABLE "temporary_IdentityMetadata"`);
+    await queryRunner.query(`CREATE TABLE "ContactMetadata"
+                             (
+                                 "id" uuid PRIMARY KEY NOT NULL DEFAULT uuid_generate_v4(),
+                                 "label" character varying(255) NOT NULL,
+                                 "valueType" character varying NOT NULL,
+                                 "stringValue" text,
+                                 "numberValue" double precision,
+                                 "dateValue" TIMESTAMP,
+                                 "boolValue" boolean,
+                                 "contactId" uuid,
+                                 CONSTRAINT "FK_BaseContact_ContactMetadata" FOREIGN KEY ("contactId") REFERENCES "BaseContact" ("id") ON DELETE CASCADE
+                             )`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP CONSTRAINT "CHK_StatusListEntry_type"`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "statusReference"`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "statusMessage"`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "bitsPerStatus"`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "statusPurpose"`);
-    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "type"`);
-    await queryRunner.query(`ALTER TABLE "StatusList" DROP CONSTRAINT "CHK_StatusList_type"`);
-    await queryRunner.query(`ALTER TABLE "StatusList" ADD CONSTRAINT "CHK_StatusList_type" CHECK ("type" IN ('StatusList2021', 'OAuthStatusList'))`);
-    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "validUntil"`);
-    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "validFrom"`);
-    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "ttl"`);
-    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "bitsPerStatus"`);
+    await queryRunner.query(`DROP TABLE "ContactMetadata"`);
+    await queryRunner.query(`ALTER TABLE "IdentityMetadata" RENAME TO "temporary_IdentityMetadata"`);
+    await queryRunner.query(`CREATE TABLE "IdentityMetadata"
+                             (
+                                 "id" uuid PRIMARY KEY NOT NULL DEFAULT uuid_generate_v4(),
+                                 "label" character varying(255) NOT NULL,
+                                 "value" character varying(255) NOT NULL,
+                                 "identityId" uuid,
+                                 CONSTRAINT "FK_Identity_IdentityMetadata" FOREIGN KEY ("identityId") REFERENCES "Identity" ("id") ON DELETE CASCADE
+                             )`);
+    await queryRunner.query(`INSERT INTO "IdentityMetadata" ("id", "label", "value", "identityId")
+                             SELECT "id", "label", "stringValue", "identityId"
+                             FROM "temporary_IdentityMetadata"`);
+    await queryRunner.query(`DROP TABLE "temporary_IdentityMetadata"`);
   }
 };
 
-// src/migrations/sqlite/1741895823001-CreateBitstringStatusList.ts
-var CreateBitstringStatusListSqlite1741895823001 = class {
+// src/migrations/sqlite/1715761125002-CreateContacts.ts
+var CreateContacts1715761125002 = class {
   static {
-    __name(this, "CreateBitstringStatusListSqlite1741895823001");
+    __name(this, "CreateContacts1715761125002");
   }
-  name = "CreateBitstringStatusList1741895823000";
+  name = "CreateContacts1715761125002";
   async up(queryRunner) {
-    await queryRunner.query(`
-      CREATE TABLE "temporary_StatusList" (
-        "id" varchar PRIMARY KEY NOT NULL,
-        "correlationId" varchar NOT NULL,
-        "length" integer NOT NULL,
-        "issuer" text NOT NULL,
-        "type" varchar CHECK( "type" IN ('StatusList2021', 'OAuthStatusList', 'BitstringStatusList') ) NOT NULL DEFAULT ('StatusList2021'),
-        "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
-        "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
-        "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt', 'vc+jwt') ) NOT NULL DEFAULT ('lds'),
-        "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ),
-        "statusPurpose" varchar,
-        "statusListCredential" text,
-        "expiresAt" datetime,
-        "bitsPerStatus" integer DEFAULT (1),
-        "ttl" integer,
-        "validFrom" datetime,
-        "validUntil" datetime,
-        CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
-      )
-    `);
-    await queryRunner.query(`
-      INSERT INTO "temporary_StatusList"(
-        "id", "correlationId", "length", "issuer", "type", "driverType",
-        "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
-        "statusListCredential", "bitsPerStatus", "expiresAt"
-      )
-      SELECT 
-        "id", "correlationId", "length", "issuer", "type", "driverType",
-        "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
-        "statusListCredential", "bitsPerStatus", "expiresAt"
-      FROM "StatusList"
-    `);
-    await queryRunner.query(`DROP TABLE "StatusList"`);
-    await queryRunner.query(`ALTER TABLE "temporary_StatusList" RENAME TO "StatusList"`);
-    await queryRunner.query(`
-      CREATE TABLE "temporary_StatusListEntry" (
-        "statusListId" varchar NOT NULL,
-        "statusListIndex" integer NOT NULL,
-        "credentialId" text,
-        "credentialHash" varchar(128),
-        "correlationId" varchar(255),
-        "value" varchar(50),
-        "type" varchar CHECK( "type" IN ('StatusListEntryEntity', 'bitstring') ) NOT NULL DEFAULT ('StatusListEntryEntity'),
-        "statusPurpose" varchar,
-        "bitsPerStatus" integer DEFAULT (1),
-        "statusMessage" text,
-        "statusReference" text,
-        PRIMARY KEY ("statusListId", "statusListIndex")
-      )
-    `);
-    await queryRunner.query(`
-      INSERT INTO "temporary_StatusListEntry"(
-        "statusListId", "statusListIndex", "credentialId", "credentialHash", 
-        "correlationId", "value", "type"
-      )
-      SELECT 
-        "statusListId", "statusListIndex", "credentialId", "credentialHash",
-        "correlationId", "value", 'StatusListEntryEntity'
-      FROM "StatusListEntry"
-    `);
-    await queryRunner.query(`DROP TABLE "StatusListEntry"`);
-    await queryRunner.query(`ALTER TABLE "temporary_StatusListEntry" RENAME TO "StatusListEntry"`);
+    await queryRunner.query(`ALTER TABLE "IdentityMetadata" RENAME TO "temporary_IdentityMetadata"`);
+    await queryRunner.query(`CREATE TABLE "IdentityMetadata"
+                             (
+                                 "id"          varchar PRIMARY KEY NOT NULL,
+                                 "label"       varchar(255)        NOT NULL,
+                                 "valueType"   varchar             NOT NULL,
+                                 "stringValue" varchar(255),
+                                 "numberValue" double,
+                                 "dateValue"   datetime,
+                                 "boolValue"   boolean,
+                                 "identityId"  varchar,
+                                 FOREIGN KEY ("identityId") REFERENCES "Identity" ("id") ON DELETE CASCADE)`);
+    await queryRunner.query(`INSERT INTO "IdentityMetadata" ("id", "label", "valueType", "stringValue", "identityId")
+                                 SELECT "id", "label", 'string', "value", "identityId"
+                                 FROM "temporary_IdentityMetadata"
+        `);
+    await queryRunner.query(`DROP TABLE "temporary_IdentityMetadata"`);
+    await queryRunner.query(`CREATE TABLE "ContactMetadata"
+                                 (
+                                     "id"          varchar PRIMARY KEY NOT NULL,
+                                     "label"       varchar(255)        NOT NULL,
+                                     "valueType"   varchar             NOT NULL,
+                                     "stringValue" text,
+                                     "numberValue" double,
+                                     "dateValue"   datetime,
+                                     "boolValue"   boolean,
+                                     "contactId"   varchar,
+                                     FOREIGN KEY ("contactId") REFERENCES "BaseContact" ("id") ON DELETE CASCADE)`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`
-      CREATE TABLE "temporary_StatusListEntry" (
-        "statusListId" varchar NOT NULL,
-        "statusListIndex" integer NOT NULL,
-        "credentialId" text,
-        "credentialHash" varchar(128),
-        "correlationId" varchar(255),
-        "value" varchar(50),
-        PRIMARY KEY ("statusListId", "statusListIndex")
-      )
-    `);
-    await queryRunner.query(`
-      INSERT INTO "temporary_StatusListEntry"(
-        "statusListId", "statusListIndex", "credentialId", "credentialHash",
-        "correlationId", "value"
-      )
-      SELECT 
-        "statusListId", "statusListIndex", "credentialId", "credentialHash",
-        "correlationId", "value"
-      FROM "StatusListEntry"
-      WHERE "type" = 'StatusListEntryEntity'
-    `);
-    await queryRunner.query(`DROP TABLE "StatusListEntry"`);
-    await queryRunner.query(`ALTER TABLE "temporary_StatusListEntry" RENAME TO "StatusListEntry"`);
-    await queryRunner.query(`
-      CREATE TABLE "temporary_StatusList" (
-        "id" varchar PRIMARY KEY NOT NULL,
-        "correlationId" varchar NOT NULL,
-        "length" integer NOT NULL,
-        "issuer" text NOT NULL,
-        "type" varchar CHECK( "type" IN ('StatusList2021', 'OAuthStatusList') ) NOT NULL DEFAULT ('StatusList2021'),
-        "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
-        "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
-        "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt', 'vc+jwt') ) NOT NULL DEFAULT ('lds'),
-        "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ),
-        "statusPurpose" varchar,
-        "statusListCredential" text,
-        "bitsPerStatus" integer,
-        "expiresAt" datetime,
-        CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
-      )
-    `);
-    await queryRunner.query(`
-      INSERT INTO "temporary_StatusList"(
-        "id", "correlationId", "length", "issuer", "type", "driverType",
-        "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
-        "statusListCredential", "bitsPerStatus", "expiresAt"
-      )
-      SELECT 
-        "id", "correlationId", "length", "issuer", 
-        CASE WHEN "type" = 'BitstringStatusList' THEN 'StatusList2021' ELSE "type" END,
-        "driverType", "credentialIdMode", "proofFormat", "indexingDirection",
-        "statusPurpose", "statusListCredential", "bitsPerStatus", "expiresAt"
-      FROM "StatusList"
-    `);
-    await queryRunner.query(`DROP TABLE "StatusList"`);
-    await queryRunner.query(`ALTER TABLE "temporary_StatusList" RENAME TO "StatusList"`);
+    await queryRunner.query(`DROP TABLE "ContactMetadata"`);
+    await queryRunner.query(`ALTER TABLE "IdentityMetadata" RENAME TO "temporary_IdentityMetadata"`);
+    await queryRunner.query(`CREATE TABLE "IdentityMetadata"
+                                 (
+                                     "id"         varchar PRIMARY KEY NOT NULL,
+                                     "label"      varchar(255)        NOT NULL,
+                                     "value"      varchar(255)        NOT NULL,
+                                     "identityId" varchar,
+                                     FOREIGN KEY ("identityId") REFERENCES "Identity" ("id") ON DELETE CASCADE
+                                 )`);
+    await queryRunner.query(`INSERT INTO "IdentityMetadata" ("id", "label", "value", "identityId")
+                                 SELECT "id", "label", "stringValue", "identityId"
+                                 FROM "temporary_IdentityMetadata"`);
+    await queryRunner.query(`DROP TABLE "temporary_IdentityMetadata"`);
   }
 };
 
-// src/migrations/generic/12-CreateBitstringStatusList.ts
-var debug19 = (0, import_debug19.default)("sphereon:ssi-sdk:migrations");
-var CreateBitstringStatusList1741895823000 = class {
+// src/migrations/generic/9-CreateContacts.ts
+var debug20 = (0, import_debug20.default)("sphereon:ssi-sdk:migrations");
+var CreateContacts1715761125000 = class {
   static {
-    __name(this, "CreateBitstringStatusList1741895823000");
+    __name(this, "CreateContacts1715761125000");
   }
-  name = "CreateBitstringStatusList1741895823000";
+  name = "CreateContacts1715761125000";
   async up(queryRunner) {
-    debug19("migration: creating bitstring status list tables");
+    debug20("migration: updating contact tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
-        const mig = new CreateBitstringStatusListPG1741895823000();
+        debug20("using postgres migration file");
+        const mig = new CreateContacts1715761125001();
         await mig.up(queryRunner);
+        debug20("Migration statements executed");
         return;
       }
       case "sqlite":
       case "expo":
       case "react-native": {
-        const mig = new CreateBitstringStatusListSqlite1741895823001();
+        debug20("using sqlite/react-native migration file");
+        const mig = new CreateContacts1715761125002();
         await mig.up(queryRunner);
+        debug20("Migration statements executed");
         return;
       }
       default:
-        return Promise.reject(`Migrations only supported for sqlite and postgres. Was ${dbType}`);
+        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
     }
   }
   async down(queryRunner) {
-    debug19("migration: dropping bitstring status list tables");
+    debug20("migration: reverting machine state tables");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
-        const mig = new CreateBitstringStatusListPG1741895823000();
+        debug20("using postgres migration file");
+        const mig = new CreateContacts1715761125001();
         await mig.down(queryRunner);
+        debug20("Migration statements executed");
         return;
       }
       case "sqlite":
       case "expo":
       case "react-native": {
-        const mig = new CreateBitstringStatusListSqlite1741895823001();
+        debug20("using sqlite/react-native migration file");
+        const mig = new CreateContacts1715761125002();
         await mig.down(queryRunner);
+        debug20("Migration statements executed");
         return;
       }
       default:
-        return Promise.reject(`Migrations only supported for sqlite and postgres. Was ${dbType}`);
+        return Promise.reject(`Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`);
     }
   }
 };
@@ -9299,6 +9436,7 @@ var DataStoreIssuanceBrandingMigrations = [
 ];
 var DataStoreStatusListMigrations = [
   CreateStatusList1693866470000,
+  AddBitstringStatusListEnum1741895823000,
   CreateBitstringStatusList1741895823000
 ];
 var DataStoreEventLoggerMigrations = [
@@ -9311,7 +9449,8 @@ var DataStoreMachineStateMigrations = [
   CreateMachineStateStore1708098041262
 ];
 var DataStorePresentationDefinitionMigrations = [
-  CreatePresentationDefinitions1716533767523
+  CreatePresentationDefinitions1716533767523,
+  CreateDcqlQueryItem1726617600000
 ];
 var DataStoreMigrations = [
   ...DataStoreContactMigrations,
@@ -9324,7 +9463,7 @@ var DataStoreMigrations = [
 ];
 
 // src/utils/digitalCredential/MappingUtils.ts
-var import_ssi_types7 = require("@sphereon/ssi-types");
+var import_ssi_types9 = require("@sphereon/ssi-types");
 var import_utils = require("@veramo/utils");
 var import_ssi_sdk23 = require("@sphereon/ssi-sdk.core");
 function determineDocumentType(raw) {
@@ -9332,11 +9471,11 @@ function determineDocumentType(raw) {
   if (!rawDocument) {
     throw new Error(`Couldn't parse the credential: ${raw}`);
   }
-  const hasProof = import_ssi_types7.CredentialMapper.hasProof(rawDocument);
-  const isCredential = isHex(raw) || import_ssi_types7.ObjectUtils.isBase64(raw) || import_ssi_types7.CredentialMapper.isCredential(rawDocument);
-  const isPresentation = import_ssi_types7.CredentialMapper.isPresentation(rawDocument);
+  const hasProof = import_ssi_types9.CredentialMapper.hasProof(rawDocument);
+  const isCredential = isHex(raw) || import_ssi_types9.ObjectUtils.isBase64(raw) || import_ssi_types9.CredentialMapper.isCredential(rawDocument);
+  const isPresentation = import_ssi_types9.CredentialMapper.isPresentation(rawDocument);
   if (isCredential) {
-    return hasProof || isHex(raw) || import_ssi_types7.ObjectUtils.isBase64(raw) ? DocumentType.VC : DocumentType.C;
+    return hasProof || isHex(raw) || import_ssi_types9.ObjectUtils.isBase64(raw) ? DocumentType.VC : DocumentType.C;
   } else if (isPresentation) {
     return hasProof ? DocumentType.VP : DocumentType.P;
   }
@@ -9348,9 +9487,9 @@ function isHex(input) {
 }
 __name(isHex, "isHex");
 function parseRawDocument(raw) {
-  if (isHex(raw) || import_ssi_types7.ObjectUtils.isBase64(raw)) {
+  if (isHex(raw) || import_ssi_types9.ObjectUtils.isBase64(raw)) {
     return raw;
-  } else if (import_ssi_types7.CredentialMapper.isJwtEncoded(raw) || import_ssi_types7.CredentialMapper.isSdJwtEncoded(raw)) {
+  } else if (import_ssi_types9.CredentialMapper.isJwtEncoded(raw) || import_ssi_types9.CredentialMapper.isSdJwtEncoded(raw)) {
     return raw;
   }
   try {
@@ -9362,9 +9501,9 @@ function parseRawDocument(raw) {
 __name(parseRawDocument, "parseRawDocument");
 function ensureRawDocument(input) {
   if (typeof input === "string") {
-    if (isHex(input) || import_ssi_types7.ObjectUtils.isBase64(input)) {
+    if (isHex(input) || import_ssi_types9.ObjectUtils.isBase64(input)) {
       return input;
-    } else if (import_ssi_types7.CredentialMapper.isJwtEncoded(input) || import_ssi_types7.CredentialMapper.isSdJwtEncoded(input)) {
+    } else if (import_ssi_types9.CredentialMapper.isJwtEncoded(input) || import_ssi_types9.CredentialMapper.isSdJwtEncoded(input)) {
       return input;
     }
     throw Error("Unknown input to be mapped as rawDocument");
@@ -9378,13 +9517,13 @@ function ensureRawDocument(input) {
 __name(ensureRawDocument, "ensureRawDocument");
 function determineCredentialDocumentFormat(documentFormat) {
   switch (documentFormat) {
-    case import_ssi_types7.DocumentFormat.JSONLD:
+    case import_ssi_types9.DocumentFormat.JSONLD:
       return CredentialDocumentFormat.JSON_LD;
-    case import_ssi_types7.DocumentFormat.JWT:
+    case import_ssi_types9.DocumentFormat.JWT:
       return CredentialDocumentFormat.JWT;
-    case import_ssi_types7.DocumentFormat.SD_JWT_VC:
+    case import_ssi_types9.DocumentFormat.SD_JWT_VC:
       return CredentialDocumentFormat.SD_JWT;
-    case import_ssi_types7.DocumentFormat.MSO_MDOC:
+    case import_ssi_types9.DocumentFormat.MSO_MDOC:
       return CredentialDocumentFormat.MSO_MDOC;
     default:
       throw new Error(`Not supported document format: ${documentFormat}`);
@@ -9423,14 +9562,14 @@ var safeStringify = /* @__PURE__ */ __name((object) => {
 }, "safeStringify");
 var nonPersistedDigitalCredentialEntityFromAddArgs = /* @__PURE__ */ __name((addCredentialArgs) => {
   const documentType = determineDocumentType(addCredentialArgs.rawDocument);
-  const documentFormat = import_ssi_types7.CredentialMapper.detectDocumentType(addCredentialArgs.rawDocument);
+  const documentFormat = import_ssi_types9.CredentialMapper.detectDocumentType(addCredentialArgs.rawDocument);
   const hasher = addCredentialArgs?.opts?.hasher ?? import_ssi_sdk23.defaultHasher;
-  if (documentFormat === import_ssi_types7.DocumentFormat.SD_JWT_VC && !addCredentialArgs.opts?.hasher) {
+  if (documentFormat === import_ssi_types9.DocumentFormat.SD_JWT_VC && !addCredentialArgs.opts?.hasher) {
     throw new Error("No hasher function is provided for SD_JWT credential.");
   }
-  const uniformDocument = documentType === DocumentType.VC || documentType === DocumentType.C ? import_ssi_types7.CredentialMapper.toUniformCredential(addCredentialArgs.rawDocument, {
+  const uniformDocument = documentType === DocumentType.VC || documentType === DocumentType.C ? import_ssi_types9.CredentialMapper.toUniformCredential(addCredentialArgs.rawDocument, {
     hasher
-  }) : import_ssi_types7.CredentialMapper.toUniformPresentation(addCredentialArgs.rawDocument, {
+  }) : import_ssi_types9.CredentialMapper.toUniformPresentation(addCredentialArgs.rawDocument, {
     hasher
   });
   const validFrom = getValidFrom(uniformDocument);
@@ -9498,7 +9637,7 @@ var DataStoreIssuanceBrandingEntities = [
   CredentialClaimsEntity
 ];
 var DataStorePresentationDefinitionEntities = [
-  PresentationDefinitionItemEntity
+  DcqlQueryItemEntity
 ];
 var DataStoreStatusListEntities = [
   StatusListEntity,