diff --git a/src/administration/Administration.Service/Administration.Service.csproj b/src/administration/Administration.Service/Administration.Service.csproj
index 289740f278..fabf070f18 100644
--- a/src/administration/Administration.Service/Administration.Service.csproj
+++ b/src/administration/Administration.Service/Administration.Service.csproj
@@ -52,10 +52,8 @@
     <ProjectReference Include="..\..\externalsystems\OnboardingServiceProvider.Library\OnboardingServiceProvider.Library.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Async\Framework.Async.csproj" />
     <ProjectReference Include="..\..\framework\Framework.DateTimeProvider\Framework.DateTimeProvider.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
     <ProjectReference Include="..\..\framework\Framework.IO\Framework.IO.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Models\Framework.Models.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Token\Framework.Token.csproj" />
     <ProjectReference Include="..\..\keycloak\Keycloak.Authentication\Keycloak.Authentication.csproj" />
     <ProjectReference Include="..\..\processes\ApplicationChecklist.Config\ApplicationChecklist.Config.csproj" />
diff --git a/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj b/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj
index 28d742280e..d415c0d2de 100644
--- a/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj
+++ b/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj
@@ -28,7 +28,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\framework\Framework.Token\Framework.Token.csproj" />
         <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
         <ProjectReference Include="..\..\processes\ApplicationChecklist.Library\ApplicationChecklist.Library.csproj" />
diff --git a/src/externalsystems/BpnDidResolver.Library/BpnDidResolver.Library.csproj b/src/externalsystems/BpnDidResolver.Library/BpnDidResolver.Library.csproj
index cac4cbe241..cd3b267855 100644
--- a/src/externalsystems/BpnDidResolver.Library/BpnDidResolver.Library.csproj
+++ b/src/externalsystems/BpnDidResolver.Library/BpnDidResolver.Library.csproj
@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\framework\Framework.IO\Framework.IO.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Token\Framework.Token.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     <ProjectReference Include="..\..\processes\ApplicationChecklist.Library\ApplicationChecklist.Library.csproj" />
diff --git a/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj b/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj
index 7a61f75701..c29ec0ea95 100644
--- a/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj
+++ b/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj
@@ -28,7 +28,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
         <ProjectReference Include="..\Custodian.Library\Custodian.Library.csproj" />
         <ProjectReference Include="..\..\processes\ApplicationChecklist.Library\ApplicationChecklist.Library.csproj" />
diff --git a/src/externalsystems/Custodian.Library/Custodian.Library.csproj b/src/externalsystems/Custodian.Library/Custodian.Library.csproj
index b2a20ebee9..e5eb3aae37 100644
--- a/src/externalsystems/Custodian.Library/Custodian.Library.csproj
+++ b/src/externalsystems/Custodian.Library/Custodian.Library.csproj
@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\framework\Framework.IO\Framework.IO.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Token\Framework.Token.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     <ProjectReference Include="..\..\processes\ApplicationChecklist.Library\ApplicationChecklist.Library.csproj" />
diff --git a/src/externalsystems/Dim.Library/Dim.Library.csproj b/src/externalsystems/Dim.Library/Dim.Library.csproj
index ace175cf8d..7b9d676762 100644
--- a/src/externalsystems/Dim.Library/Dim.Library.csproj
+++ b/src/externalsystems/Dim.Library/Dim.Library.csproj
@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\framework\Framework.IO\Framework.IO.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Token\Framework.Token.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     <ProjectReference Include="..\..\processes\ApplicationChecklist.Library\ApplicationChecklist.Library.csproj" />
diff --git a/src/externalsystems/IssuerComponent.Library/IssuerComponent.Library.csproj b/src/externalsystems/IssuerComponent.Library/IssuerComponent.Library.csproj
index 5d230b62b0..48efb9bc75 100644
--- a/src/externalsystems/IssuerComponent.Library/IssuerComponent.Library.csproj
+++ b/src/externalsystems/IssuerComponent.Library/IssuerComponent.Library.csproj
@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\framework\Framework.IO\Framework.IO.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Token\Framework.Token.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     <ProjectReference Include="..\..\processes\ApplicationChecklist.Library\ApplicationChecklist.Library.csproj" />
diff --git a/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj b/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj
index f153c9104b..2348279cba 100644
--- a/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj
+++ b/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj
@@ -28,7 +28,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\framework\Framework.Token\Framework.Token.csproj" />
         <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
         <ProjectReference Include="..\..\provisioning\Provisioning.Library\Provisioning.Library.csproj" />
diff --git a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj
index 27add3e676..0873f612e1 100644
--- a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj
+++ b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj
@@ -28,7 +28,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Token\Framework.Token.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
   </ItemGroup>
diff --git a/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj b/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj
index 87ba3d329f..234265f87b 100644
--- a/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj
+++ b/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj
@@ -28,7 +28,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\framework\Framework.Token\Framework.Token.csproj" />
         <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
         <ProjectReference Include="..\..\processes\ApplicationChecklist.Library\ApplicationChecklist.Library.csproj" />
diff --git a/src/framework/Framework.DBAccess/Repositories.cs b/src/framework/Framework.DBAccess/AbstractRepositories.cs
similarity index 76%
rename from src/framework/Framework.DBAccess/Repositories.cs
rename to src/framework/Framework.DBAccess/AbstractRepositories.cs
index 79dc070c18..5aa2a247c7 100644
--- a/src/framework/Framework.DBAccess/Repositories.cs
+++ b/src/framework/Framework.DBAccess/AbstractRepositories.cs
@@ -22,9 +22,23 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
 
-public abstract class Repositories(IDbContext dbContext) : IRepositories
+public abstract class AbstractRepositories<TDbContext>(TDbContext dbContext) : IRepositories
+    where TDbContext : class, IDbContext
 {
-    public abstract T GetInstance<T>();
+    protected static KeyValuePair<Type, Func<TDbContext, object>> CreateTypeEntry<T>(Func<TDbContext, object> createFunc) => KeyValuePair.Create(typeof(T), createFunc);
+    protected abstract IReadOnlyDictionary<Type, Func<TDbContext, object>> RepositoryTypes { get; }
+
+    public RepositoryType GetInstance<RepositoryType>()
+    {
+        object? repository = default;
+
+        if (RepositoryTypes.TryGetValue(typeof(RepositoryType), out var createFunc))
+        {
+            repository = createFunc(dbContext);
+        }
+
+        return (RepositoryType)(repository ?? throw new ArgumentException($"unexpected type {typeof(RepositoryType).Name}", nameof(RepositoryType)));
+    }
 
     /// <inheritdoc />
     public TEntity Attach<TEntity>(TEntity entity, Action<TEntity>? setOptionalParameters = null) where TEntity : class
diff --git a/src/framework/Framework.Identity/IdentityTypeId.cs b/src/framework/Framework.Identity/IdentityTypeId.cs
index a3d9043e09..7a0e3c920e 100644
--- a/src/framework/Framework.Identity/IdentityTypeId.cs
+++ b/src/framework/Framework.Identity/IdentityTypeId.cs
@@ -22,5 +22,5 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Identity;
 public enum IdentityTypeId
 {
     COMPANY_USER = 1,
-    COMPANY_SERVICE_ACCOUNT = 2
+    TECHNICAL_USER = 2
 }
diff --git a/src/framework/Framework.Processes.Library.Concrete/Context/ProcessDbContext.cs b/src/framework/Framework.Processes.Library.Concrete/Context/ProcessDbContext.cs
index 5df52e955d..d7337faa7e 100644
--- a/src/framework/Framework.Processes.Library.Concrete/Context/ProcessDbContext.cs
+++ b/src/framework/Framework.Processes.Library.Concrete/Context/ProcessDbContext.cs
@@ -21,30 +21,24 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Context;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Enums;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Context;
 
-public class ProcessDbContext<TProcessTypeId, TProcessStepTypeId> :
-    DbContext,
-    IProcessDbContext<Process<TProcessTypeId, TProcessStepTypeId>, ProcessStep<TProcessTypeId, TProcessStepTypeId>, ProcessStepStatus<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>,
+public class ProcessDbContext<TProcess, TProcessTypeId, TProcessStepTypeId>(DbContextOptions options) :
+    DbContext(options),
+    IProcessDbContext<TProcess, ProcessType<TProcess, TProcessTypeId>, ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>,
     IDbContext
+    where TProcess : class, IProcess<TProcessTypeId>, IProcessNavigation<ProcessType<TProcess, TProcessTypeId>, ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>
     where TProcessTypeId : struct, IConvertible
     where TProcessStepTypeId : struct, IConvertible
 {
-    protected ProcessDbContext()
-    {
-        throw new InvalidOperationException("IdentityService should never be null");
-    }
-
-    public ProcessDbContext(DbContextOptions options)
-        : base(options)
-    {
-    }
-
-    public virtual DbSet<Process<TProcessTypeId, TProcessStepTypeId>> Processes { get; set; } = default!;
-    public virtual DbSet<ProcessStep<TProcessTypeId, TProcessStepTypeId>> ProcessSteps { get; set; } = default!;
-    public virtual DbSet<ProcessStepStatus<TProcessTypeId, TProcessStepTypeId>> ProcessStepStatuses { get; set; } = default!;
+    public virtual DbSet<TProcess> Processes { get; set; } = default!;
+    public virtual DbSet<ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>> ProcessSteps { get; set; } = default!;
+    public virtual DbSet<ProcessStepStatus<TProcess, TProcessTypeId, TProcessStepTypeId>> ProcessStepStatuses { get; set; } = default!;
+    public virtual DbSet<ProcessStepType<TProcess, TProcessTypeId, TProcessStepTypeId>> ProcessStepTypes { get; set; } = default!;
+    public virtual DbSet<ProcessType<TProcess, TProcessTypeId>> ProcessTypes { get; set; } = default!;
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
@@ -53,28 +47,50 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
-        modelBuilder.Entity<Process<TProcessTypeId, TProcessStepTypeId>>(p =>
+        modelBuilder.Entity<TProcess>(p =>
         {
+            p.HasOne(d => d.ProcessType)
+                .WithMany(p => p!.Processes)
+                .HasForeignKey(d => d.ProcessTypeId)
+                .OnDelete(DeleteBehavior.ClientSetNull);
             p.ToTable("processes");
         });
 
-        modelBuilder.Entity<ProcessStep<TProcessTypeId, TProcessStepTypeId>>(ps =>
+        modelBuilder.Entity<ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>>(ps =>
         {
-            ps
-                .HasOne(d => d.Process)
+            ps.HasOne(d => d.Process)
                 .WithMany(p => p.ProcessSteps)
                 .HasForeignKey(d => d.ProcessId)
                 .OnDelete(DeleteBehavior.ClientSetNull);
 
+            ps.HasOne(d => d.ProcessStepStatus)
+                .WithMany(p => p.ProcessSteps)
+                .HasForeignKey(d => d.ProcessStepStatusId)
+                .OnDelete(DeleteBehavior.ClientSetNull);
+
             ps.ToTable("process_steps");
         });
 
-        modelBuilder.Entity<ProcessStepStatus<TProcessTypeId, TProcessStepTypeId>>(pss =>
+        modelBuilder.Entity<ProcessType<TProcess, TProcessTypeId>>()
+            .HasData(
+                Enum.GetValues(typeof(TProcessTypeId))
+                    .Cast<TProcessTypeId>()
+                    .Select(e => new ProcessType<TProcess, TProcessTypeId>(e))
+            );
+
+        modelBuilder.Entity<ProcessStepType<TProcess, TProcessTypeId, TProcessStepTypeId>>()
+            .HasData(
+                Enum.GetValues(typeof(TProcessStepTypeId))
+                    .Cast<TProcessStepTypeId>()
+                    .Select(e => new ProcessStepType<TProcess, TProcessTypeId, TProcessStepTypeId>(e))
+            );
+
+        modelBuilder.Entity<ProcessStepStatus<TProcess, TProcessTypeId, TProcessStepTypeId>>(pss =>
         {
             pss.HasData(
                 Enum.GetValues(typeof(ProcessStepStatusId))
                     .Cast<ProcessStepStatusId>()
-                    .Select(e => new ProcessStepStatus<TProcessTypeId, TProcessStepTypeId>(e))
+                    .Select(e => new ProcessStepStatus<TProcess, TProcessTypeId, TProcessStepTypeId>(e))
             );
 
             pss.ToTable("process_step_statuses");
diff --git a/src/framework/Framework.Processes.Library.Concrete/DBAccess/ProcessRepositoryContextAccess.cs b/src/framework/Framework.Processes.Library.Concrete/DBAccess/ProcessRepositoryContextAccess.cs
deleted file mode 100644
index 37a29c8f1d..0000000000
--- a/src/framework/Framework.Processes.Library.Concrete/DBAccess/ProcessRepositoryContextAccess.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License, Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-
-using Microsoft.EntityFrameworkCore;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Context;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Enums;
-
-namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.DBAccess;
-
-public class ProcessRepositoryContextAccess<TProcessTypeId, TProcessStepTypeId, TProcessDbContext>(TProcessDbContext dbContext) :
-    IProcessRepositoryContextAccess<Process<TProcessTypeId, TProcessStepTypeId>, ProcessStep<TProcessTypeId, TProcessStepTypeId>, ProcessStepStatus<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>
-    where TProcessTypeId : struct, IConvertible
-    where TProcessStepTypeId : struct, IConvertible
-    where TProcessDbContext : class, IProcessDbContext<Process<TProcessTypeId, TProcessStepTypeId>, ProcessStep<TProcessTypeId, TProcessStepTypeId>, ProcessStepStatus<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>, IDbContext
-{
-    public DbSet<Process<TProcessTypeId, TProcessStepTypeId>> Processes => dbContext.Processes;
-    public DbSet<ProcessStep<TProcessTypeId, TProcessStepTypeId>> ProcessSteps => dbContext.ProcessSteps;
-    public DbSet<ProcessStepStatus<TProcessTypeId, TProcessStepTypeId>> ProcessStepStatuses => dbContext.ProcessStepStatuses;
-
-    public Process<TProcessTypeId, TProcessStepTypeId> CreateProcess(Guid id, TProcessTypeId processTypeId, Guid version) => new(id, processTypeId, version);
-    public ProcessStep<TProcessTypeId, TProcessStepTypeId> CreateProcessStep(Guid id, TProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid processId, DateTimeOffset now) => new(id, processStepTypeId, processStepStatusId, processId, now);
-}
diff --git a/src/framework/Framework.Processes.Library.Concrete/DBAccess/ProcessRepositories.cs b/src/framework/Framework.Processes.Library.Concrete/DBAccess/SimpleProcessRepositories.cs
similarity index 50%
rename from src/framework/Framework.Processes.Library.Concrete/DBAccess/ProcessRepositories.cs
rename to src/framework/Framework.Processes.Library.Concrete/DBAccess/SimpleProcessRepositories.cs
index 87044edf45..22bc3bc883 100644
--- a/src/framework/Framework.Processes.Library.Concrete/DBAccess/ProcessRepositories.cs
+++ b/src/framework/Framework.Processes.Library.Concrete/DBAccess/SimpleProcessRepositories.cs
@@ -25,30 +25,17 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.DBAccess;
 
-public class ProcessRepositories<TProcessTypeId, TProcessStepTypeId, TProcessDbContext>(TProcessDbContext dbContext) :
-    Repositories(dbContext)
+public class SimpleProcessRepositories<TProcessTypeId, TProcessStepTypeId, TProcessDbContext>(TProcessDbContext dbContext) :
+    AbstractRepositories<TProcessDbContext>(dbContext)
     where TProcessTypeId : struct, IConvertible
     where TProcessStepTypeId : struct, IConvertible
-    where TProcessDbContext : class, IProcessDbContext<Process<TProcessTypeId, TProcessStepTypeId>, ProcessStep<TProcessTypeId, TProcessStepTypeId>, ProcessStepStatus<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>, IDbContext
+    where TProcessDbContext : class, IProcessDbContext<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, ProcessType<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId>, ProcessStep<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>, IDbContext
 {
-    private static KeyValuePair<Type, Func<TProcessDbContext, object>> CreateTypeEntry<T>(Func<TProcessDbContext, object> createFunc) => KeyValuePair.Create(typeof(T), createFunc);
-
-    protected static readonly IReadOnlyDictionary<Type, Func<TProcessDbContext, object>> ProcessRepositoryTypes = ImmutableDictionary.CreateRange(
+    protected override IReadOnlyDictionary<Type, Func<TProcessDbContext, object>> RepositoryTypes => ProcessRepositoryTypes;
+    private static readonly IReadOnlyDictionary<Type, Func<TProcessDbContext, object>> ProcessRepositoryTypes = ImmutableDictionary.CreateRange(
     [
         CreateTypeEntry<IProcessStepRepository<TProcessTypeId, TProcessStepTypeId>>(context =>
-            new ProcessStepRepository<Process<TProcessTypeId, TProcessStepTypeId>, ProcessStep<TProcessTypeId, TProcessStepTypeId>, ProcessStepStatus<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>(
-                new ProcessRepositoryContextAccess<TProcessTypeId, TProcessStepTypeId, TProcessDbContext>(context)))
+            new ProcessStepRepository<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, ProcessType<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId>, ProcessStep<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>, ProcessStepType<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>(
+                new SimpleProcessRepositoryContextAccess<TProcessTypeId, TProcessStepTypeId, TProcessDbContext>(context)))
     ]);
-
-    public override RepositoryType GetInstance<RepositoryType>()
-    {
-        object? repository = default;
-
-        if (ProcessRepositoryTypes.TryGetValue(typeof(RepositoryType), out var createFunc))
-        {
-            repository = createFunc(dbContext);
-        }
-
-        return (RepositoryType)(repository ?? throw new ArgumentException($"unexpected type {typeof(RepositoryType).Name}", nameof(RepositoryType)));
-    }
 }
diff --git a/src/framework/Framework.Processes.Library.Concrete/DBAccess/SimpleProcessRepositoryContextAccess.cs b/src/framework/Framework.Processes.Library.Concrete/DBAccess/SimpleProcessRepositoryContextAccess.cs
new file mode 100644
index 0000000000..35dfc7c655
--- /dev/null
+++ b/src/framework/Framework.Processes.Library.Concrete/DBAccess/SimpleProcessRepositoryContextAccess.cs
@@ -0,0 +1,40 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using Microsoft.EntityFrameworkCore;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Context;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.DBAccess;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Enums;
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.DBAccess;
+
+public class SimpleProcessRepositoryContextAccess<TProcessTypeId, TProcessStepTypeId, TProcessDbContext>(TProcessDbContext dbContext) :
+    IProcessRepositoryContextAccess<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, ProcessType<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId>, ProcessStep<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>, ProcessStepType<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>
+    where TProcessTypeId : struct, IConvertible
+    where TProcessStepTypeId : struct, IConvertible
+    where TProcessDbContext : class, IProcessDbContext<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, ProcessType<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId>, ProcessStep<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>, IDbContext
+{
+    public DbSet<SimpleProcess<TProcessTypeId, TProcessStepTypeId>> Processes => dbContext.Processes;
+    public DbSet<ProcessStep<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>> ProcessSteps => dbContext.ProcessSteps;
+
+    public SimpleProcess<TProcessTypeId, TProcessStepTypeId> CreateProcess(Guid id, TProcessTypeId processTypeId, Guid version) => new(id, processTypeId, version);
+    public ProcessStep<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId> CreateProcessStep(Guid id, TProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid processId, DateTimeOffset now) => new(id, processStepTypeId, processStepStatusId, processId, now);
+}
diff --git a/src/framework/Framework.Processes.Library.Concrete/Entities/Process.cs b/src/framework/Framework.Processes.Library.Concrete/Entities/AbstractProcess.cs
similarity index 66%
rename from src/framework/Framework.Processes.Library.Concrete/Entities/Process.cs
rename to src/framework/Framework.Processes.Library.Concrete/Entities/AbstractProcess.cs
index 90d307b902..c8daef6452 100644
--- a/src/framework/Framework.Processes.Library.Concrete/Entities/Process.cs
+++ b/src/framework/Framework.Processes.Library.Concrete/Entities/AbstractProcess.cs
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -23,13 +23,14 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 
-public class Process<TProcessTypeId, TProcessStepTypeId>(
+public abstract class AbstractProcess<TProcess, TProcessTypeId, TProcessStepTypeId>(
     Guid id,
     TProcessTypeId processTypeId,
     Guid version) :
     IProcess<TProcessTypeId>,
-    IProcessNavigation<ProcessStep<TProcessTypeId, TProcessStepTypeId>, TProcessStepTypeId>,
+    IProcessNavigation<ProcessType<TProcess, TProcessTypeId>, ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>,
     IBaseEntity
+    where TProcess : class, IProcess<TProcessTypeId>, IProcessNavigation<ProcessType<TProcess, TProcessTypeId>, ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>
     where TProcessTypeId : struct, IConvertible
     where TProcessStepTypeId : struct, IConvertible
 {
@@ -41,5 +42,7 @@ public class Process<TProcessTypeId, TProcessStepTypeId>(
 
     [ConcurrencyCheck]
     public Guid Version { get; set; } = version;
-    public virtual ICollection<ProcessStep<TProcessTypeId, TProcessStepTypeId>> ProcessSteps { get; private set; } = new HashSet<ProcessStep<TProcessTypeId, TProcessStepTypeId>>();
+
+    public virtual ProcessType<TProcess, TProcessTypeId> ProcessType { get; private set; } = default!;
+    public virtual ICollection<ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>> ProcessSteps { get; private set; } = new HashSet<ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>>();
 }
diff --git a/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStep.cs b/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStep.cs
index 22eb38c944..1a6bf2986d 100644
--- a/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStep.cs
+++ b/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStep.cs
@@ -23,15 +23,16 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 
-public class ProcessStep<TProcessTypeId, TProcessStepTypeId>(
+public class ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>(
     Guid id,
     TProcessStepTypeId processStepTypeId,
     ProcessStepStatusId processStepStatusId,
     Guid processId,
     DateTimeOffset dateCreated) :
     IProcessStep<TProcessStepTypeId>,
-    IProcessStepNavigation<Process<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId>,
+    IProcessStepNavigation<TProcess, ProcessStepType<TProcess, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>,
     IBaseEntity
+    where TProcess : class, IProcess<TProcessTypeId>, IProcessNavigation<ProcessType<TProcess, TProcessTypeId>, ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>
     where TProcessTypeId : struct, IConvertible
     where TProcessStepTypeId : struct, IConvertible
 {
@@ -50,5 +51,7 @@ public class ProcessStep<TProcessTypeId, TProcessStepTypeId>(
     public string? Message { get; set; }
 
     // Navigation properties
-    public virtual Process<TProcessTypeId, TProcessStepTypeId>? Process { get; private set; }
+    public virtual TProcess? Process { get; private set; }
+    public virtual ProcessStepType<TProcess, TProcessTypeId, TProcessStepTypeId>? ProcessStepType { get; private set; }
+    public virtual ProcessStepStatus<TProcess, TProcessTypeId, TProcessStepTypeId>? ProcessStepStatus { get; private set; }
 }
diff --git a/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStepStatus.cs b/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStepStatus.cs
index 9e5b956406..60c35509a5 100644
--- a/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStepStatus.cs
+++ b/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStepStatus.cs
@@ -23,27 +23,16 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 
-public class ProcessStepStatus<TProcessTypeId, TProcessStepTypeId> : IProcessStepStatus
+public class ProcessStepStatus<TProcess, TProcessTypeId, TProcessStepTypeId>(ProcessStepStatusId id) : IProcessStepStatus
+    where TProcess : class, IProcess<TProcessTypeId>, IProcessNavigation<ProcessType<TProcess, TProcessTypeId>, ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>
     where TProcessTypeId : struct, IConvertible
     where TProcessStepTypeId : struct, IConvertible
 {
-    private ProcessStepStatus()
-    {
-        Label = null!;
-        ProcessSteps = new HashSet<ProcessStep<TProcessTypeId, TProcessStepTypeId>>();
-    }
-
-    public ProcessStepStatus(ProcessStepStatusId processStepStatusId) : this()
-    {
-        Id = processStepStatusId;
-        Label = processStepStatusId.ToString();
-    }
-
-    public ProcessStepStatusId Id { get; private set; }
+    public ProcessStepStatusId Id { get; private set; } = id;
 
     [MaxLength(255)]
-    public string Label { get; private set; }
+    public string Label { get; private set; } = id.ToString();
 
     // Navigation properties
-    public virtual ICollection<ProcessStep<TProcessTypeId, TProcessStepTypeId>> ProcessSteps { get; private set; }
+    public virtual ICollection<ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>> ProcessSteps { get; private set; } = new HashSet<ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>>();
 }
diff --git a/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStepType.cs b/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStepType.cs
new file mode 100644
index 0000000000..7fc40658a7
--- /dev/null
+++ b/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessStepType.cs
@@ -0,0 +1,39 @@
+/********************************************************************************
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
+using System.ComponentModel.DataAnnotations;
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
+
+public class ProcessStepType<TProcess, TProcessTypeId, TProcessStepTypeId>(TProcessStepTypeId processStepTypeId) :
+    IProcessStepType<TProcessStepTypeId>,
+    IProcessStepTypeNavigation<ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>, TProcessStepTypeId>
+    where TProcess : class, IProcess<TProcessTypeId>, IProcessNavigation<ProcessType<TProcess, TProcessTypeId>, ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>
+    where TProcessTypeId : struct, IConvertible
+    where TProcessStepTypeId : struct, IConvertible
+{
+    public TProcessStepTypeId Id { get; private set; } = processStepTypeId;
+
+    [MaxLength(255)]
+    public string Label { get; private set; } = processStepTypeId.ToString()!;
+
+    // Navigation properties
+    public virtual ICollection<ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>> ProcessSteps { get; private set; } = new HashSet<ProcessStep<TProcess, TProcessTypeId, TProcessStepTypeId>>();
+}
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/ProcessType.cs b/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessType.cs
similarity index 60%
rename from src/portalbackend/PortalBackend.PortalEntities/Entities/ProcessType.cs
rename to src/framework/Framework.Processes.Library.Concrete/Entities/ProcessType.cs
index 77ac47e619..c7bfad850e 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/ProcessType.cs
+++ b/src/framework/Framework.Processes.Library.Concrete/Entities/ProcessType.cs
@@ -17,31 +17,22 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
 using System.ComponentModel.DataAnnotations;
 
-namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 
-public class ProcessType
+public class ProcessType<TProcess, TProcessTypeId>(TProcessTypeId processTypeId) :
+    IProcessType<TProcessTypeId>,
+    IProcessTypeNavigation<TProcess, TProcessTypeId>
+    where TProcess : class, IProcess<TProcessTypeId>
+    where TProcessTypeId : struct, IConvertible
 {
-    private ProcessType()
-    {
-        Label = null!;
-        Processes = new HashSet<Process<ProcessTypeId, ProcessStepTypeId>>();
-    }
-
-    public ProcessType(ProcessTypeId processTypeId) : this()
-    {
-        Id = processTypeId;
-        Label = processTypeId.ToString();
-    }
-
-    public ProcessTypeId Id { get; private set; }
+    public TProcessTypeId Id { get; private set; } = processTypeId;
 
     [MaxLength(255)]
-    public string Label { get; private set; }
+    public string Label { get; private set; } = processTypeId.ToString()!;
 
     // Navigation properties
-    public virtual ICollection<Process<ProcessTypeId, ProcessStepTypeId>> Processes { get; private set; }
+    public virtual ICollection<TProcess> Processes { get; private set; } = new HashSet<TProcess>();
 }
diff --git a/src/framework/Framework.Processes.Library.Concrete/Entities/SimpleProcess.cs b/src/framework/Framework.Processes.Library.Concrete/Entities/SimpleProcess.cs
new file mode 100644
index 0000000000..759beda582
--- /dev/null
+++ b/src/framework/Framework.Processes.Library.Concrete/Entities/SimpleProcess.cs
@@ -0,0 +1,27 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
+
+public class SimpleProcess<TProcessTypeId, TProcessStepTypeId>(Guid id, TProcessTypeId processTypeId, Guid version) :
+    AbstractProcess<SimpleProcess<TProcessTypeId, TProcessStepTypeId>, TProcessTypeId, TProcessStepTypeId>(id, processTypeId, version)
+    where TProcessTypeId : struct, IConvertible
+    where TProcessStepTypeId : struct, IConvertible
+{
+}
diff --git a/src/framework/Framework.Processes.Library/Context/IProcessDbContext.cs b/src/framework/Framework.Processes.Library/Context/IProcessDbContext.cs
index 2c1bff836d..add0848ddf 100644
--- a/src/framework/Framework.Processes.Library/Context/IProcessDbContext.cs
+++ b/src/framework/Framework.Processes.Library/Context/IProcessDbContext.cs
@@ -22,14 +22,13 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Context;
 
-public interface IProcessDbContext<TProcessType, TProcessStepType, TProcessStepStatusType, TProcessTypeId, TProcessStepTypeId>
-    where TProcessType : class, IProcess<TProcessTypeId>, IProcessNavigation<TProcessStepType, TProcessStepTypeId>
-    where TProcessStepType : class, IProcessStep<TProcessStepTypeId>, IProcessStepNavigation<TProcessType, TProcessTypeId>
-    where TProcessStepStatusType : class, IProcessStepStatus
+public interface IProcessDbContext<TProcess, TProcessType, TProcessStep, in TProcessTypeId, in TProcessStepTypeId>
+    where TProcess : class, IProcess<TProcessTypeId>, IProcessNavigation<TProcessType, TProcessStep, TProcessTypeId, TProcessStepTypeId>
+    where TProcessType : class, IProcessType<TProcessTypeId>
+    where TProcessStep : class, IProcessStep<TProcessStepTypeId>
     where TProcessTypeId : struct, IConvertible
     where TProcessStepTypeId : struct, IConvertible
 {
-    DbSet<TProcessType> Processes { get; }
-    DbSet<TProcessStepType> ProcessSteps { get; }
-    DbSet<TProcessStepStatusType> ProcessStepStatuses { get; }
+    DbSet<TProcess> Processes { get; }
+    DbSet<TProcessStep> ProcessSteps { get; }
 }
diff --git a/src/framework/Framework.Processes.Library/DBAccess/IProcessCreation.cs b/src/framework/Framework.Processes.Library/DBAccess/IProcessCreation.cs
index d99915f9ac..724e191566 100644
--- a/src/framework/Framework.Processes.Library/DBAccess/IProcessCreation.cs
+++ b/src/framework/Framework.Processes.Library/DBAccess/IProcessCreation.cs
@@ -22,12 +22,14 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.DBAccess;
 
-public interface IProcessCreation<TProcessType, TProcessStepType, in TProcessTypeId, in TProcessStepTypeId>
-    where TProcessType : class, IProcess<TProcessTypeId>, IProcessNavigation<TProcessStepType, TProcessStepTypeId>
-    where TProcessStepType : class, IProcessStep<TProcessStepTypeId>, IProcessStepNavigation<TProcessType, TProcessTypeId>
+public interface IProcessCreation<TProcess, TProcessType, TProcessStep, TProcessStepType, in TProcessTypeId, in TProcessStepTypeId>
+    where TProcess : class, IProcess<TProcessTypeId>, IProcessNavigation<TProcessType, TProcessStep, TProcessTypeId, TProcessStepTypeId>
+    where TProcessType : class, IProcessType<TProcessTypeId>, IProcessTypeNavigation<TProcess, TProcessTypeId>
+    where TProcessStep : class, IProcessStep<TProcessStepTypeId>, IProcessStepNavigation<TProcess, TProcessStepType, TProcessTypeId, TProcessStepTypeId>
+    where TProcessStepType : class, IProcessStepType<TProcessStepTypeId>, IProcessStepTypeNavigation<TProcessStep, TProcessStepTypeId>
     where TProcessTypeId : struct, IConvertible
     where TProcessStepTypeId : struct, IConvertible
 {
-    TProcessType CreateProcess(Guid id, TProcessTypeId processTypeId, Guid version);
-    TProcessStepType CreateProcessStep(Guid id, TProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid processId, DateTimeOffset now);
+    TProcess CreateProcess(Guid id, TProcessTypeId processTypeId, Guid version);
+    TProcessStep CreateProcessStep(Guid id, TProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid processId, DateTimeOffset now);
 }
diff --git a/src/framework/Framework.Processes.Library/DBAccess/IProcessRepositoryContextAccess.cs b/src/framework/Framework.Processes.Library/DBAccess/IProcessRepositoryContextAccess.cs
index 3babf04783..0cef4d964f 100644
--- a/src/framework/Framework.Processes.Library/DBAccess/IProcessRepositoryContextAccess.cs
+++ b/src/framework/Framework.Processes.Library/DBAccess/IProcessRepositoryContextAccess.cs
@@ -22,11 +22,12 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.DBAccess;
 
-public interface IProcessRepositoryContextAccess<TProcessType, TProcessStepType, TProcessStepStatusType, TProcessTypeId, TProcessStepTypeId> :
-    IProcessDbContext<TProcessType, TProcessStepType, TProcessStepStatusType, TProcessTypeId, TProcessStepTypeId>,
-    IProcessCreation<TProcessType, TProcessStepType, TProcessTypeId, TProcessStepTypeId>
-    where TProcessType : class, IProcess<TProcessTypeId>, IProcessNavigation<TProcessStepType, TProcessStepTypeId>
-    where TProcessStepType : class, IProcessStep<TProcessStepTypeId>, IProcessStepNavigation<TProcessType, TProcessTypeId>
-    where TProcessStepStatusType : class, IProcessStepStatus
+public interface IProcessRepositoryContextAccess<TProcess, TProcessType, TProcessStep, TProcessStepType, in TProcessTypeId, in TProcessStepTypeId> :
+    IProcessDbContext<TProcess, TProcessType, TProcessStep, TProcessTypeId, TProcessStepTypeId>,
+    IProcessCreation<TProcess, TProcessType, TProcessStep, TProcessStepType, TProcessTypeId, TProcessStepTypeId>
+    where TProcess : class, IProcess<TProcessTypeId>, IProcessNavigation<TProcessType, TProcessStep, TProcessTypeId, TProcessStepTypeId>
+    where TProcessStep : class, IProcessStep<TProcessStepTypeId>, IProcessStepNavigation<TProcess, TProcessStepType, TProcessTypeId, TProcessStepTypeId>
+    where TProcessType : class, IProcessType<TProcessTypeId>, IProcessTypeNavigation<TProcess, TProcessTypeId>
+    where TProcessStepType : class, IProcessStepType<TProcessStepTypeId>, IProcessStepTypeNavigation<TProcessStep, TProcessStepTypeId>
     where TProcessTypeId : struct, IConvertible
     where TProcessStepTypeId : struct, IConvertible;
diff --git a/src/framework/Framework.Processes.Library/DBAccess/ProcessStepRepository.cs b/src/framework/Framework.Processes.Library/DBAccess/ProcessStepRepository.cs
index fb32d497f1..bc23d0d745 100644
--- a/src/framework/Framework.Processes.Library/DBAccess/ProcessStepRepository.cs
+++ b/src/framework/Framework.Processes.Library/DBAccess/ProcessStepRepository.cs
@@ -25,11 +25,12 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.DBAccess;
 
-public class ProcessStepRepository<TProcessType, TProcessStepType, TProcessStepStatusType, TProcessTypeId, TProcessStepTypeId>(IProcessRepositoryContextAccess<TProcessType, TProcessStepType, TProcessStepStatusType, TProcessTypeId, TProcessStepTypeId> dbContext) :
+public class ProcessStepRepository<TProcess, TProcessType, TProcessStep, TProcessStepType, TProcessTypeId, TProcessStepTypeId>(IProcessRepositoryContextAccess<TProcess, TProcessType, TProcessStep, TProcessStepType, TProcessTypeId, TProcessStepTypeId> dbContext) :
     IProcessStepRepository<TProcessTypeId, TProcessStepTypeId>
-    where TProcessType : class, IProcess<TProcessTypeId>, IProcessNavigation<TProcessStepType, TProcessStepTypeId>
-    where TProcessStepType : class, IProcessStep<TProcessStepTypeId>, IProcessStepNavigation<TProcessType, TProcessTypeId>
-    where TProcessStepStatusType : class, IProcessStepStatus
+    where TProcess : class, IProcess<TProcessTypeId>, IProcessNavigation<TProcessType, TProcessStep, TProcessTypeId, TProcessStepTypeId>
+    where TProcessType : class, IProcessType<TProcessTypeId>, IProcessTypeNavigation<TProcess, TProcessTypeId>
+    where TProcessStep : class, IProcessStep<TProcessStepTypeId>, IProcessStepNavigation<TProcess, TProcessStepType, TProcessTypeId, TProcessStepTypeId>
+    where TProcessStepType : class, IProcessStepType<TProcessStepTypeId>, IProcessStepTypeNavigation<TProcessStep, TProcessStepTypeId>
     where TProcessTypeId : struct, IConvertible
     where TProcessStepTypeId : struct, IConvertible
 {
diff --git a/src/framework/Framework.Processes.Library/Entities/IProcess.cs b/src/framework/Framework.Processes.Library/Entities/IProcess.cs
index a7d5cb6df0..22d5a3639c 100644
--- a/src/framework/Framework.Processes.Library/Entities/IProcess.cs
+++ b/src/framework/Framework.Processes.Library/Entities/IProcess.cs
@@ -22,6 +22,7 @@
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
 
 public interface IProcess<TProcessTypeId> : ILockableEntity
+    where TProcessTypeId : struct, IConvertible
 {
     Guid Id { get; }
     TProcessTypeId ProcessTypeId { get; set; }
diff --git a/src/framework/Framework.Processes.Library/Entities/IProcessNavigation.cs b/src/framework/Framework.Processes.Library/Entities/IProcessNavigation.cs
index de9d53a958..935674c06f 100644
--- a/src/framework/Framework.Processes.Library/Entities/IProcessNavigation.cs
+++ b/src/framework/Framework.Processes.Library/Entities/IProcessNavigation.cs
@@ -19,9 +19,12 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
 
-public interface IProcessNavigation<TProcessStepType, TProcessStepTypeId>
-    where TProcessStepType : class, IProcessStep<TProcessStepTypeId>
+public interface IProcessNavigation<TProcessType, TProcessStep, TProcessTypeId, TProcessStepTypeId>
+    where TProcessType : class, IProcessType<TProcessTypeId>
+    where TProcessStep : class, IProcessStep<TProcessStepTypeId>
+    where TProcessTypeId : struct, IConvertible
     where TProcessStepTypeId : struct, IConvertible
 {
-    ICollection<TProcessStepType> ProcessSteps { get; }
+    TProcessType ProcessType { get; }
+    ICollection<TProcessStep> ProcessSteps { get; }
 }
diff --git a/src/framework/Framework.Processes.Library/Entities/IProcessStepNavigation.cs b/src/framework/Framework.Processes.Library/Entities/IProcessStepNavigation.cs
index 208cbcd188..72dd05fd61 100644
--- a/src/framework/Framework.Processes.Library/Entities/IProcessStepNavigation.cs
+++ b/src/framework/Framework.Processes.Library/Entities/IProcessStepNavigation.cs
@@ -19,9 +19,12 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
 
-public interface IProcessStepNavigation<TProcessType, TProcessTypeId>
-    where TProcessType : class, IProcess<TProcessTypeId>
+public interface IProcessStepNavigation<TProcess, TProcessStepType, TProcessTypeId, TProcessStepTypeId>
+    where TProcess : class, IProcess<TProcessTypeId>
+    where TProcessStepType : class, IProcessStepType<TProcessStepTypeId>
     where TProcessTypeId : struct, IConvertible
+    where TProcessStepTypeId : struct, IConvertible
 {
-    TProcessType? Process { get; }
+    TProcess? Process { get; }
+    TProcessStepType? ProcessStepType { get; }
 }
diff --git a/src/framework/Framework.Processes.Library/Entities/IProcessStepStatusNavigation.cs b/src/framework/Framework.Processes.Library/Entities/IProcessStepStatusNavigation.cs
new file mode 100644
index 0000000000..41dc1436d4
--- /dev/null
+++ b/src/framework/Framework.Processes.Library/Entities/IProcessStepStatusNavigation.cs
@@ -0,0 +1,30 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library;
+
+public interface IProcessStepStatusNavigation<TProcessStep, TProcessStepTypeId>
+    where TProcessStep : class, IProcessStep<TProcessStepTypeId>
+    where TProcessStepTypeId : struct, IConvertible
+
+{
+    ICollection<TProcessStep> ProcessSteps { get; }
+}
diff --git a/src/framework/Framework.Processes.Library/Entities/IProcessStepType.cs b/src/framework/Framework.Processes.Library/Entities/IProcessStepType.cs
new file mode 100644
index 0000000000..e5a374d38f
--- /dev/null
+++ b/src/framework/Framework.Processes.Library/Entities/IProcessStepType.cs
@@ -0,0 +1,31 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using System.ComponentModel.DataAnnotations;
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library;
+
+public interface IProcessStepType<out TProcessStepTypeId>
+    where TProcessStepTypeId : struct, IConvertible
+{
+    TProcessStepTypeId Id { get; }
+
+    [MaxLength(255)]
+    string Label { get; }
+}
diff --git a/src/framework/Framework.Processes.Library/Entities/IProcessStepTypeNavigation.cs b/src/framework/Framework.Processes.Library/Entities/IProcessStepTypeNavigation.cs
new file mode 100644
index 0000000000..73bdfe5763
--- /dev/null
+++ b/src/framework/Framework.Processes.Library/Entities/IProcessStepTypeNavigation.cs
@@ -0,0 +1,29 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library;
+
+public interface IProcessStepTypeNavigation<TProcessStep, TProcessStepTypeId>
+    where TProcessStep : class, IProcessStep<TProcessStepTypeId>
+    where TProcessStepTypeId : struct, IConvertible
+{
+    ICollection<TProcessStep> ProcessSteps { get; }
+}
diff --git a/src/framework/Framework.Processes.Library/Entities/IProcessType.cs b/src/framework/Framework.Processes.Library/Entities/IProcessType.cs
new file mode 100644
index 0000000000..c11b34229c
--- /dev/null
+++ b/src/framework/Framework.Processes.Library/Entities/IProcessType.cs
@@ -0,0 +1,31 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using System.ComponentModel.DataAnnotations;
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library;
+
+public interface IProcessType<out TProcessTypeId>
+    where TProcessTypeId : struct, IConvertible
+{
+    TProcessTypeId Id { get; }
+
+    [MaxLength(255)]
+    string Label { get; }
+}
diff --git a/src/framework/Framework.Processes.Library/Entities/IProcessTypeNavigation.cs b/src/framework/Framework.Processes.Library/Entities/IProcessTypeNavigation.cs
new file mode 100644
index 0000000000..83379329e7
--- /dev/null
+++ b/src/framework/Framework.Processes.Library/Entities/IProcessTypeNavigation.cs
@@ -0,0 +1,29 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library;
+
+public interface IProcessTypeNavigation<TProcess, TProcessTypeId>
+    where TProcess : class, IProcess<TProcessTypeId>
+    where TProcessTypeId : struct, IConvertible
+{
+    ICollection<TProcess> Processes { get; }
+}
diff --git a/src/maintenance/Maintenance.App/Maintenance.App.csproj b/src/maintenance/Maintenance.App/Maintenance.App.csproj
index 6ef41b117e..0a2eab6d2a 100644
--- a/src/maintenance/Maintenance.App/Maintenance.App.csproj
+++ b/src/maintenance/Maintenance.App/Maintenance.App.csproj
@@ -48,8 +48,6 @@
     <ItemGroup>
       <ProjectReference Include="..\..\externalsystems\Clearinghouse.Library\Clearinghouse.Library.csproj" />
       <ProjectReference Include="..\..\framework\Framework.Logging\Framework.Logging.csproj" />
-      <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-      <ProjectReference Include="..\..\framework\Framework.Processes.ProcessIdentity\Framework.Processes.ProcessIdentity.csproj" />
       <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
       <ProjectReference Include="..\..\processes\Processes.ProcessIdentity\Processes.ProcessIdentity.csproj" />
     </ItemGroup>
diff --git a/src/marketplace/Apps.Service/Apps.Service.csproj b/src/marketplace/Apps.Service/Apps.Service.csproj
index 5d0dae803a..5287a1cf9d 100644
--- a/src/marketplace/Apps.Service/Apps.Service.csproj
+++ b/src/marketplace/Apps.Service/Apps.Service.csproj
@@ -49,8 +49,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\externalsystems\Dim.Library\Dim.Library.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\keycloak\Keycloak.Authentication\Keycloak.Authentication.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
diff --git a/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj b/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj
index 3a9fcc6903..2b59a4b30d 100644
--- a/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj
+++ b/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj
@@ -28,8 +28,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Web\Framework.Web.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
diff --git a/src/marketplace/Offers.Library/Offers.Library.csproj b/src/marketplace/Offers.Library/Offers.Library.csproj
index fb9b3af05a..ced2e276f8 100644
--- a/src/marketplace/Offers.Library/Offers.Library.csproj
+++ b/src/marketplace/Offers.Library/Offers.Library.csproj
@@ -30,9 +30,7 @@
     <ItemGroup>
       <ProjectReference Include="..\..\externalsystems\Dim.Library\Dim.Library.csproj" />
       <ProjectReference Include="..\..\framework\Framework.HttpClientExtensions\Framework.HttpClientExtensions.csproj" />
-      <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
       <ProjectReference Include="..\..\framework\Framework.IO\Framework.IO.csproj" />
-      <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
       <ProjectReference Include="..\..\notifications\Notifications.Library\Notifications.Library.csproj" />
       <ProjectReference Include="..\..\processes\Mailing.Library\Mailing.Library.csproj" />
diff --git a/src/marketplace/Services.Service/Services.Service.csproj b/src/marketplace/Services.Service/Services.Service.csproj
index 3cd6728c0d..1dea012342 100644
--- a/src/marketplace/Services.Service/Services.Service.csproj
+++ b/src/marketplace/Services.Service/Services.Service.csproj
@@ -44,8 +44,6 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\externalsystems\Dim.Library\Dim.Library.csproj" />
-      <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
-      <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\keycloak\Keycloak.Authentication\Keycloak.Authentication.csproj" />
       <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
       <ProjectReference Include="..\..\web\Web.Identity\Web.Identity.csproj" />
diff --git a/src/notifications/Notifications.Library/Notifications.Library.csproj b/src/notifications/Notifications.Library/Notifications.Library.csproj
index 58c5b215cf..52a094a605 100644
--- a/src/notifications/Notifications.Library/Notifications.Library.csproj
+++ b/src/notifications/Notifications.Library/Notifications.Library.csproj
@@ -27,7 +27,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
       <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
     </ItemGroup>
diff --git a/src/notifications/Notifications.Service/Notifications.Service.csproj b/src/notifications/Notifications.Service/Notifications.Service.csproj
index a925e069d9..191e16e72e 100644
--- a/src/notifications/Notifications.Service/Notifications.Service.csproj
+++ b/src/notifications/Notifications.Service/Notifications.Service.csproj
@@ -43,8 +43,6 @@
     </Target>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
-        <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\keycloak\Keycloak.Authentication\Keycloak.Authentication.csproj" />
         <ProjectReference Include="..\..\keycloak\Keycloak.ErrorHandling\Keycloak.ErrorHandling.csproj" />
         <ProjectReference Include="..\..\keycloak\Keycloak.Factory\Keycloak.Factory.csproj" />
diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/VerifyChecklistData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/VerifyChecklistData.cs
index 56039c25a5..f9a5573ce5 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Models/VerifyChecklistData.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Models/VerifyChecklistData.cs
@@ -19,12 +19,13 @@
  ********************************************************************************/
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 
 public record VerifyChecklistData(
     bool IsSubmitted,
-    Process<ProcessTypeId, ProcessStepTypeId>? Process,
+    Process? Process,
     IEnumerable<(ApplicationChecklistEntryTypeId TypeId, ApplicationChecklistEntryStatusId StatusId, string? Comment)>? Checklist,
-    IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? ProcessSteps);
+    IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? ProcessSteps);
diff --git a/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj b/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj
index dbc2a2d984..1e0b8f9e53 100644
--- a/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj
+++ b/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj
@@ -27,9 +27,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Models\Framework.Models.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Seeding\Framework.Seeding.csproj" />
     <ProjectReference Include="..\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
   </ItemGroup>
diff --git a/src/portalbackend/PortalBackend.DBAccess/PortalProcessDbContextAccess.cs b/src/portalbackend/PortalBackend.DBAccess/PortalProcessDbContextAccess.cs
index 1a7825a567..93a93ad82d 100644
--- a/src/portalbackend/PortalBackend.DBAccess/PortalProcessDbContextAccess.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/PortalProcessDbContextAccess.cs
@@ -22,17 +22,18 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 
 public class PortalProcessDbContextAccess(PortalDbContext dbContext) :
-    IProcessRepositoryContextAccess<Process<ProcessTypeId, ProcessStepTypeId>, ProcessStep<ProcessTypeId, ProcessStepTypeId>, ProcessStepStatus<ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>
+    IProcessRepositoryContextAccess<Process, ProcessType<Process, ProcessTypeId>, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>, ProcessStepType<Process, ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>
 {
-    public DbSet<Process<ProcessTypeId, ProcessStepTypeId>> Processes => dbContext.Processes;
-    public DbSet<ProcessStep<ProcessTypeId, ProcessStepTypeId>> ProcessSteps => dbContext.ProcessSteps;
-    public DbSet<ProcessStepStatus<ProcessTypeId, ProcessStepTypeId>> ProcessStepStatuses => dbContext.ProcessStepStatuses;
+    public DbSet<Process> Processes => dbContext.Processes;
+    public DbSet<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>> ProcessSteps => dbContext.ProcessSteps;
+    public DbSet<ProcessStepStatus<Process, ProcessTypeId, ProcessStepTypeId>> ProcessStepStatuses => dbContext.ProcessStepStatuses;
 
-    public Process<ProcessTypeId, ProcessStepTypeId> CreateProcess(Guid id, ProcessTypeId processTypeId, Guid version) => new(id, processTypeId, version);
-    public ProcessStep<ProcessTypeId, ProcessStepTypeId> CreateProcessStep(Guid id, ProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid processId, DateTimeOffset now) => new(id, processStepTypeId, processStepStatusId, processId, now);
+    public Process CreateProcess(Guid id, ProcessTypeId processTypeId, Guid version) => new(id, processTypeId, version);
+    public ProcessStep<Process, ProcessTypeId, ProcessStepTypeId> CreateProcessStep(Guid id, ProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid processId, DateTimeOffset now) => new(id, processStepTypeId, processStepStatusId, processId, now);
 }
diff --git a/src/portalbackend/PortalBackend.DBAccess/PortalRepositories.cs b/src/portalbackend/PortalBackend.DBAccess/PortalRepositories.cs
index 7966d7ee33..27779cbb93 100644
--- a/src/portalbackend/PortalBackend.DBAccess/PortalRepositories.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/PortalRepositories.cs
@@ -17,22 +17,23 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
+using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using System.Collections.Immutable;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 
 public class PortalRepositories(PortalDbContext portalDbContext) :
-    Framework.DBAccess.Repositories(portalDbContext),
+    AbstractRepositories<PortalDbContext>(portalDbContext),
     IPortalRepositories
 {
-    private static KeyValuePair<Type, Func<PortalDbContext, object>> CreateTypeEntry<T>(Func<PortalDbContext, object> createFunc) => KeyValuePair.Create(typeof(T), createFunc);
-
-    private static readonly IReadOnlyDictionary<Type, Func<PortalDbContext, object>> RepositoryTypes = ImmutableDictionary.CreateRange(
+    protected override IReadOnlyDictionary<Type, Func<PortalDbContext, object>> RepositoryTypes => PortalRepositoryTypes;
+    private static readonly IReadOnlyDictionary<Type, Func<PortalDbContext, object>> PortalRepositoryTypes = ImmutableDictionary.CreateRange(
     [
         CreateTypeEntry<IAgreementRepository>(context => new AgreementRepository(context)),
         CreateTypeEntry<IApplicationRepository>(context => new ApplicationRepository(context)),
@@ -57,8 +58,8 @@ public class PortalRepositories(PortalDbContext portalDbContext) :
         CreateTypeEntry<INetworkRepository>(context => new NetworkRepository(context)),
         CreateTypeEntry<IOfferRepository>(context => new OfferRepository(context)),
         CreateTypeEntry<IOfferSubscriptionsRepository>(context => new OfferSubscriptionsRepository(context)),
-        CreateTypeEntry<IPortalProcessStepRepository>(context => new ProcessStepRepository<Process<ProcessTypeId, ProcessStepTypeId>, ProcessStep<ProcessTypeId, ProcessStepTypeId>, ProcessStepStatus<ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>(new PortalProcessDbContextAccess(context))),
-        CreateTypeEntry<IProcessStepRepository<ProcessTypeId, ProcessStepTypeId>>(context => new ProcessStepRepository<Process<ProcessTypeId, ProcessStepTypeId>, ProcessStep<ProcessTypeId, ProcessStepTypeId>, ProcessStepStatus<ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>(new PortalProcessDbContextAccess(context))),
+        CreateTypeEntry<IPortalProcessStepRepository>(context => new ProcessStepRepository<Process, ProcessType<Process, ProcessTypeId>, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>, ProcessStepType<Process, ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>(new PortalProcessDbContextAccess(context))),
+        CreateTypeEntry<IProcessStepRepository<ProcessTypeId, ProcessStepTypeId>>(context => new ProcessStepRepository<Process, ProcessType<Process, ProcessTypeId>, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>, ProcessStepType<Process, ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>(new PortalProcessDbContextAccess(context))),
         CreateTypeEntry<ITechnicalUserRepository>(context => new TechnicalUserRepository(context)),
         CreateTypeEntry<IStaticDataRepository>(context => new StaticDataRepository(context)),
         CreateTypeEntry<ITechnicalUserProfileRepository>(context => new TechnicalUserProfileRepository(context)),
@@ -67,16 +68,4 @@ public class PortalRepositories(PortalDbContext portalDbContext) :
         CreateTypeEntry<IUserRolesRepository>(context => new UserRolesRepository(context)),
         CreateTypeEntry<ICompanyCertificateRepository>(context => new CompanyCertificateRepository(context))
     ]);
-
-    public override RepositoryType GetInstance<RepositoryType>()
-    {
-        object? repository = default;
-
-        if (RepositoryTypes.TryGetValue(typeof(RepositoryType), out var createFunc))
-        {
-            repository = createFunc(portalDbContext);
-        }
-
-        return (RepositoryType)(repository ?? throw new ArgumentException($"unexpected type {typeof(RepositoryType).Name}", nameof(RepositoryType)));
-    }
 }
diff --git a/src/portalbackend/PortalBackend.Migrations/Migrations/20250117173646_240-CreateProcessPackage.cs b/src/portalbackend/PortalBackend.Migrations/Migrations/20250117173646_240-CreateProcessPackage.cs
deleted file mode 100644
index e1c8968c97..0000000000
--- a/src/portalbackend/PortalBackend.Migrations/Migrations/20250117173646_240-CreateProcessPackage.cs
+++ /dev/null
@@ -1,474 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License, Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.Migrations.Migrations
-{
-    /// <inheritdoc />
-    public partial class _240CreateProcessPackage : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "fk_companies_processes_sd_creation_process_id",
-                schema: "portal",
-                table: "companies");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_company_applications_processes_checklist_process_id",
-                schema: "portal",
-                table: "company_applications");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_company_invitations_processes_process_id",
-                schema: "portal",
-                table: "company_invitations");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_company_user_assigned_processes_processes_process_id",
-                schema: "portal",
-                table: "company_user_assigned_processes");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_connectors_processes_sd_creation_process_id",
-                schema: "portal",
-                table: "connectors");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_external_technical_user_creation_data_processes_process_id",
-                schema: "portal",
-                table: "external_technical_user_creation_data");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_identity_provider_assigned_processes_processes_process_id",
-                schema: "portal",
-                table: "identity_provider_assigned_processes");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_mailing_informations_processes_process_id",
-                schema: "portal",
-                table: "mailing_informations");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_network_registrations_processes_process_id",
-                schema: "portal",
-                table: "network_registrations");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_offer_subscriptions_processes_process_id",
-                schema: "portal",
-                table: "offer_subscriptions");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_process_steps_process_step_statuses_process_step_status_id",
-                schema: "portal",
-                table: "process_steps");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_processes_process_types_process_type_id",
-                schema: "portal",
-                table: "processes");
-
-            migrationBuilder.DropIndex(
-                name: "ix_offer_subscriptions_process_id",
-                schema: "portal",
-                table: "offer_subscriptions");
-
-            migrationBuilder.DropIndex(
-                name: "ix_identity_provider_assigned_processes_process_id",
-                schema: "portal",
-                table: "identity_provider_assigned_processes");
-
-            migrationBuilder.DropIndex(
-                name: "ix_company_user_assigned_processes_process_id",
-                schema: "portal",
-                table: "company_user_assigned_processes");
-
-            migrationBuilder.DropIndex(
-                name: "ix_company_applications_checklist_process_id",
-                schema: "portal",
-                table: "company_applications");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_offer_subscriptions_process_id",
-                schema: "portal",
-                table: "offer_subscriptions",
-                column: "process_id");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_identity_provider_assigned_processes_process_id",
-                schema: "portal",
-                table: "identity_provider_assigned_processes",
-                column: "process_id");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_company_user_assigned_processes_process_id",
-                schema: "portal",
-                table: "company_user_assigned_processes",
-                column: "process_id");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_company_applications_checklist_process_id",
-                schema: "portal",
-                table: "company_applications",
-                column: "checklist_process_id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_companies_process_process_type_id_process_step_type_id_sd_c",
-                schema: "portal",
-                table: "companies",
-                column: "sd_creation_process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_company_applications_process_process_type_id_process_step_t",
-                schema: "portal",
-                table: "company_applications",
-                column: "checklist_process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_company_invitations_process_process_type_id_process_step_ty",
-                schema: "portal",
-                table: "company_invitations",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_company_user_assigned_processes_process_process_type_id_pro",
-                schema: "portal",
-                table: "company_user_assigned_processes",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_connectors_process_process_type_id_process_step_type_id_sd_",
-                schema: "portal",
-                table: "connectors",
-                column: "sd_creation_process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_external_technical_user_creation_data_process_process_type_",
-                schema: "portal",
-                table: "external_technical_user_creation_data",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_identity_provider_assigned_processes_process_process_type_i",
-                schema: "portal",
-                table: "identity_provider_assigned_processes",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_mailing_informations_process_process_type_id_process_step_t",
-                schema: "portal",
-                table: "mailing_informations",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_network_registrations_process_process_type_id_process_step_",
-                schema: "portal",
-                table: "network_registrations",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_offer_subscriptions_process_process_type_id_process_step_ty",
-                schema: "portal",
-                table: "offer_subscriptions",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_process_steps_process_step_status_process_type_id_process_s",
-                schema: "portal",
-                table: "process_steps",
-                column: "process_step_status_id",
-                principalSchema: "portal",
-                principalTable: "process_step_statuses",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_processes_process_types_process_type_id",
-                schema: "portal",
-                table: "processes",
-                column: "process_type_id",
-                principalSchema: "portal",
-                principalTable: "process_types",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "fk_companies_process_process_type_id_process_step_type_id_sd_c",
-                schema: "portal",
-                table: "companies");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_company_applications_process_process_type_id_process_step_t",
-                schema: "portal",
-                table: "company_applications");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_company_invitations_process_process_type_id_process_step_ty",
-                schema: "portal",
-                table: "company_invitations");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_company_user_assigned_processes_process_process_type_id_pro",
-                schema: "portal",
-                table: "company_user_assigned_processes");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_connectors_process_process_type_id_process_step_type_id_sd_",
-                schema: "portal",
-                table: "connectors");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_external_technical_user_creation_data_process_process_type_",
-                schema: "portal",
-                table: "external_technical_user_creation_data");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_identity_provider_assigned_processes_process_process_type_i",
-                schema: "portal",
-                table: "identity_provider_assigned_processes");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_mailing_informations_process_process_type_id_process_step_t",
-                schema: "portal",
-                table: "mailing_informations");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_network_registrations_process_process_type_id_process_step_",
-                schema: "portal",
-                table: "network_registrations");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_offer_subscriptions_process_process_type_id_process_step_ty",
-                schema: "portal",
-                table: "offer_subscriptions");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_process_steps_process_step_status_process_type_id_process_s",
-                schema: "portal",
-                table: "process_steps");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_processes_process_types_process_type_id",
-                schema: "portal",
-                table: "processes");
-
-            migrationBuilder.DropIndex(
-                name: "ix_offer_subscriptions_process_id",
-                schema: "portal",
-                table: "offer_subscriptions");
-
-            migrationBuilder.DropIndex(
-                name: "ix_identity_provider_assigned_processes_process_id",
-                schema: "portal",
-                table: "identity_provider_assigned_processes");
-
-            migrationBuilder.DropIndex(
-                name: "ix_company_user_assigned_processes_process_id",
-                schema: "portal",
-                table: "company_user_assigned_processes");
-
-            migrationBuilder.DropIndex(
-                name: "ix_company_applications_checklist_process_id",
-                schema: "portal",
-                table: "company_applications");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_offer_subscriptions_process_id",
-                schema: "portal",
-                table: "offer_subscriptions",
-                column: "process_id",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "ix_identity_provider_assigned_processes_process_id",
-                schema: "portal",
-                table: "identity_provider_assigned_processes",
-                column: "process_id",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "ix_company_user_assigned_processes_process_id",
-                schema: "portal",
-                table: "company_user_assigned_processes",
-                column: "process_id",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "ix_company_applications_checklist_process_id",
-                schema: "portal",
-                table: "company_applications",
-                column: "checklist_process_id",
-                unique: true);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_companies_processes_sd_creation_process_id",
-                schema: "portal",
-                table: "companies",
-                column: "sd_creation_process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_company_applications_processes_checklist_process_id",
-                schema: "portal",
-                table: "company_applications",
-                column: "checklist_process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_company_invitations_processes_process_id",
-                schema: "portal",
-                table: "company_invitations",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_company_user_assigned_processes_processes_process_id",
-                schema: "portal",
-                table: "company_user_assigned_processes",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_connectors_processes_sd_creation_process_id",
-                schema: "portal",
-                table: "connectors",
-                column: "sd_creation_process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_external_technical_user_creation_data_processes_process_id",
-                schema: "portal",
-                table: "external_technical_user_creation_data",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_identity_provider_assigned_processes_processes_process_id",
-                schema: "portal",
-                table: "identity_provider_assigned_processes",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_mailing_informations_processes_process_id",
-                schema: "portal",
-                table: "mailing_informations",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_network_registrations_processes_process_id",
-                schema: "portal",
-                table: "network_registrations",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_offer_subscriptions_processes_process_id",
-                schema: "portal",
-                table: "offer_subscriptions",
-                column: "process_id",
-                principalSchema: "portal",
-                principalTable: "processes",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_process_steps_process_step_statuses_process_step_status_id",
-                schema: "portal",
-                table: "process_steps",
-                column: "process_step_status_id",
-                principalSchema: "portal",
-                principalTable: "process_step_statuses",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_processes_process_types_process_type_id",
-                schema: "portal",
-                table: "processes",
-                column: "process_type_id",
-                principalSchema: "portal",
-                principalTable: "process_types",
-                principalColumn: "id");
-        }
-    }
-}
diff --git a/src/portalbackend/PortalBackend.Migrations/Migrations/20250117173646_240-CreateProcessPackage.Designer.cs b/src/portalbackend/PortalBackend.Migrations/Migrations/20250122160213_240-CreateProcessPackage.Designer.cs
similarity index 98%
rename from src/portalbackend/PortalBackend.Migrations/Migrations/20250117173646_240-CreateProcessPackage.Designer.cs
rename to src/portalbackend/PortalBackend.Migrations/Migrations/20250122160213_240-CreateProcessPackage.Designer.cs
index b568e4440b..6e02935091 100644
--- a/src/portalbackend/PortalBackend.Migrations/Migrations/20250117173646_240-CreateProcessPackage.Designer.cs
+++ b/src/portalbackend/PortalBackend.Migrations/Migrations/20250122160213_240-CreateProcessPackage.Designer.cs
@@ -29,7 +29,7 @@
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.Migrations.Migrations
 {
     [DbContext(typeof(PortalDbContext))]
-    [Migration("20250117173646_240-CreateProcessPackage")]
+    [Migration("20250122160213_240-CreateProcessPackage")]
     partial class _240CreateProcessPackage
     {
         /// <inheritdoc />
@@ -44,36 +44,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<DateTimeOffset?>("LockExpiryDate")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("lock_expiry_date");
-
-                    b.Property<int>("ProcessTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("process_type_id");
-
-                    b.Property<Guid>("Version")
-                        .IsConcurrencyToken()
-                        .HasColumnType("uuid")
-                        .HasColumnName("version");
-
-                    b.HasKey("Id")
-                        .HasName("pk_processes");
-
-                    b.HasIndex("ProcessTypeId")
-                        .HasDatabaseName("ix_processes_process_type_id");
-
-                    b.ToTable("processes", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStep<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStep<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -119,7 +90,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("process_steps", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -164,931 +135,651 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditAppSubscriptionDetail20221118", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<Guid?>("AppInstanceId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_instance_id");
-
-                    b.Property<string>("AppSubscriptionUrl")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("app_subscription_url");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
+                    b.Property<int>("Id")
                         .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid>("OfferSubscriptionId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_app_subscription_detail20221118");
-
-                    b.ToTable("audit_app_subscription_detail20221118", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditAppSubscriptionDetail20231115", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<Guid?>("AppInstanceId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_instance_id");
-
-                    b.Property<string>("AppSubscriptionUrl")
+                    b.Property<string>("Label")
+                        .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("app_subscription_url");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid?>("OfferSubscriptionId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_app_subscription_detail20231115");
-
-                    b.ToTable("audit_app_subscription_detail20231115", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCertificateManagement20240416", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<int?>("CompanyCertificateStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_status_id");
-
-                    b.Property<int?>("CompanyCertificateTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_type_id");
-
-                    b.Property<Guid?>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("DocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("document_id");
-
-                    b.Property<string>("ExternalCertificateNumber")
-                        .HasColumnType("text")
-                        .HasColumnName("external_certificate_number");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Issuer")
-                        .HasColumnType("text")
-                        .HasColumnName("issuer");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("TrustLevel")
-                        .HasColumnType("text")
-                        .HasColumnName("trust_level");
-
-                    b.Property<DateTimeOffset?>("ValidFrom")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("valid_from");
-
-                    b.Property<DateTimeOffset?>("ValidTill")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("valid_till");
-
-                    b.Property<string>("Validator")
-                        .HasColumnType("text")
-                        .HasColumnName("validator");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_certificate_management20240416");
-
-                    b.ToTable("audit_certificate_management20240416", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20221005", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<int>("ApplicationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_status_id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_application20221005");
-
-                    b.ToTable("audit_company_application20221005", "portal");
-                });
+                        .HasColumnName("label");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20230214", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
+                    b.HasKey("Id")
+                        .HasName("pk_process_step_types");
 
-                    b.Property<int>("ApplicationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_status_id");
+                    b.ToTable("process_step_types", "portal");
 
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("ChecklistProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("checklist_process_id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_application20230214");
-
-                    b.ToTable("audit_company_application20230214", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20230824", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<int>("ApplicationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_status_id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("ChecklistProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("checklist_process_id");
-
-                    b.Property<int>("CompanyApplicationTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_application_type_id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid?>("OnboardingServiceProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("onboarding_service_provider_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_application20230824");
-
-                    b.ToTable("audit_company_application20230824", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20231115", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<int?>("ApplicationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_status_id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("ChecklistProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("checklist_process_id");
-
-                    b.Property<int?>("CompanyApplicationTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_application_type_id");
-
-                    b.Property<Guid?>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset?>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid?>("OnboardingServiceProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("onboarding_service_provider_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_application20231115");
-
-                    b.ToTable("audit_company_application20231115", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyAssignedRole2023316", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<int>("CompanyRoleId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_role_id");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_assigned_role2023316");
-
-                    b.ToTable("audit_company_assigned_role2023316", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUser20221005", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<int>("CompanyUserStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_user_status_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<string>("Email")
-                        .HasColumnType("text")
-                        .HasColumnName("email");
-
-                    b.Property<string>("Firstname")
-                        .HasColumnType("text")
-                        .HasColumnName("firstname");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<byte[]>("Lastlogin")
-                        .HasColumnType("bytea")
-                        .HasColumnName("lastlogin");
-
-                    b.Property<string>("Lastname")
-                        .HasColumnType("text")
-                        .HasColumnName("lastname");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_user20221005");
-
-                    b.ToTable("audit_company_user20221005", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUser20230522", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<string>("Email")
-                        .HasColumnType("text")
-                        .HasColumnName("email");
-
-                    b.Property<string>("Firstname")
-                        .HasColumnType("text")
-                        .HasColumnName("firstname");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<byte[]>("Lastlogin")
-                        .HasColumnType("bytea")
-                        .HasColumnName("lastlogin");
-
-                    b.Property<string>("Lastname")
-                        .HasColumnType("text")
-                        .HasColumnName("lastname");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_user20230523");
-
-                    b.ToTable("audit_company_user20230523", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUserAssignedRole20221018", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("CompanyUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid>("UserRoleId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_role_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_user_assigned_role20221018");
-
-                    b.ToTable("audit_company_user_assigned_role20221018", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230405", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<string>("ConnectorUrl")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("connector_url");
-
-                    b.Property<bool?>("DapsRegistrationSuccessful")
-                        .HasColumnType("boolean")
-                        .HasColumnName("daps_registration_successful");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("LocationId")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character varying(2)")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
-
-                    b.Property<Guid>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
-
-                    b.Property<int>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20230405");
-
-                    b.ToTable("audit_connector20230405", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230503", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("CompanyServiceAccountId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_service_account_id");
-
-                    b.Property<string>("ConnectorUrl")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("connector_url");
-
-                    b.Property<bool?>("DapsRegistrationSuccessful")
-                        .HasColumnType("boolean")
-                        .HasColumnName("daps_registration_successful");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("LocationId")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character varying(2)")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
-
-                    b.Property<Guid>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
-
-                    b.Property<int>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20230503");
-
-                    b.ToTable("audit_connector20230503", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230803", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("CompanyServiceAccountId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_service_account_id");
-
-                    b.Property<string>("ConnectorUrl")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("connector_url");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "MANUAL_VERIFY_REGISTRATION"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_PUSH"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_PULL"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_MANUAL"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "CREATE_IDENTITY_WALLET"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "RETRIGGER_IDENTITY_WALLET"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "START_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "RETRIGGER_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "AWAIT_CLEARING_HOUSE_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "START_SELF_DESCRIPTION_LP"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "RETRIGGER_SELF_DESCRIPTION_LP"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "START_APPLICATION_ACTIVATION"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            Label = "RETRIGGER_BUSINESS_PARTNER_NUMBER_PUSH"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            Label = "RETRIGGER_BUSINESS_PARTNER_NUMBER_PULL"
+                        },
+                        new
+                        {
+                            Id = 16,
+                            Label = "MANUAL_TRIGGER_OVERRIDE_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 17,
+                            Label = "START_OVERRIDE_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 18,
+                            Label = "AWAIT_SELF_DESCRIPTION_LP_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 19,
+                            Label = "MANUAL_DECLINE_APPLICATION"
+                        },
+                        new
+                        {
+                            Id = 20,
+                            Label = "CREATE_DIM_WALLET"
+                        },
+                        new
+                        {
+                            Id = 21,
+                            Label = "AWAIT_DIM_RESPONSE_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 22,
+                            Label = "RETRIGGER_CREATE_DIM_WALLET"
+                        },
+                        new
+                        {
+                            Id = 23,
+                            Label = "VALIDATE_DID_DOCUMENT"
+                        },
+                        new
+                        {
+                            Id = 24,
+                            Label = "RETRIGGER_VALIDATE_DID_DOCUMENT"
+                        },
+                        new
+                        {
+                            Id = 25,
+                            Label = "REQUEST_BPN_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 26,
+                            Label = "AWAIT_BPN_CREDENTIAL_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 27,
+                            Label = "REQUEST_MEMBERSHIP_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 28,
+                            Label = "AWAIT_MEMBERSHIP_CREDENTIAL_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 29,
+                            Label = "TRANSMIT_BPN_DID"
+                        },
+                        new
+                        {
+                            Id = 30,
+                            Label = "RETRIGGER_TRANSMIT_DID_BPN"
+                        },
+                        new
+                        {
+                            Id = 31,
+                            Label = "RETRIGGER_REQUEST_BPN_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 32,
+                            Label = "RETRIGGER_REQUEST_MEMBERSHIP_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 33,
+                            Label = "ASSIGN_INITIAL_ROLES"
+                        },
+                        new
+                        {
+                            Id = 34,
+                            Label = "ASSIGN_BPN_TO_USERS"
+                        },
+                        new
+                        {
+                            Id = 35,
+                            Label = "REMOVE_REGISTRATION_ROLES"
+                        },
+                        new
+                        {
+                            Id = 36,
+                            Label = "SET_THEME"
+                        },
+                        new
+                        {
+                            Id = 37,
+                            Label = "SET_MEMBERSHIP"
+                        },
+                        new
+                        {
+                            Id = 38,
+                            Label = "FINISH_APPLICATION_ACTIVATION"
+                        },
+                        new
+                        {
+                            Id = 39,
+                            Label = "RETRIGGER_ASSIGN_INITIAL_ROLES"
+                        },
+                        new
+                        {
+                            Id = 40,
+                            Label = "RETRIGGER_ASSIGN_BPN_TO_USERS"
+                        },
+                        new
+                        {
+                            Id = 41,
+                            Label = "RETRIGGER_REMOVE_REGISTRATION_ROLES"
+                        },
+                        new
+                        {
+                            Id = 42,
+                            Label = "RETRIGGER_SET_THEME"
+                        },
+                        new
+                        {
+                            Id = 43,
+                            Label = "RETRIGGER_SET_MEMBERSHIP"
+                        },
+                        new
+                        {
+                            Id = 100,
+                            Label = "TRIGGER_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 101,
+                            Label = "AWAIT_START_AUTOSETUP"
+                        },
+                        new
+                        {
+                            Id = 102,
+                            Label = "OFFERSUBSCRIPTION_CLIENT_CREATION"
+                        },
+                        new
+                        {
+                            Id = 103,
+                            Label = "SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION"
+                        },
+                        new
+                        {
+                            Id = 104,
+                            Label = "OFFERSUBSCRIPTION_TECHNICALUSER_CREATION"
+                        },
+                        new
+                        {
+                            Id = 105,
+                            Label = "ACTIVATE_SUBSCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 106,
+                            Label = "TRIGGER_PROVIDER_CALLBACK"
+                        },
+                        new
+                        {
+                            Id = 107,
+                            Label = "RETRIGGER_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 108,
+                            Label = "RETRIGGER_OFFERSUBSCRIPTION_CLIENT_CREATION"
+                        },
+                        new
+                        {
+                            Id = 109,
+                            Label = "RETRIGGER_OFFERSUBSCRIPTION_TECHNICALUSER_CREATION"
+                        },
+                        new
+                        {
+                            Id = 110,
+                            Label = "RETRIGGER_PROVIDER_CALLBACK"
+                        },
+                        new
+                        {
+                            Id = 111,
+                            Label = "MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 112,
+                            Label = "OFFERSUBSCRIPTION_CREATE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 113,
+                            Label = "RETRIGGER_OFFERSUBSCRIPTION_CREATE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 200,
+                            Label = "SYNCHRONIZE_USER"
+                        },
+                        new
+                        {
+                            Id = 201,
+                            Label = "RETRIGGER_SYNCHRONIZE_USER"
+                        },
+                        new
+                        {
+                            Id = 202,
+                            Label = "TRIGGER_CALLBACK_OSP_SUBMITTED"
+                        },
+                        new
+                        {
+                            Id = 203,
+                            Label = "TRIGGER_CALLBACK_OSP_APPROVED"
+                        },
+                        new
+                        {
+                            Id = 204,
+                            Label = "TRIGGER_CALLBACK_OSP_DECLINED"
+                        },
+                        new
+                        {
+                            Id = 205,
+                            Label = "RETRIGGER_CALLBACK_OSP_SUBMITTED"
+                        },
+                        new
+                        {
+                            Id = 206,
+                            Label = "RETRIGGER_CALLBACK_OSP_APPROVED"
+                        },
+                        new
+                        {
+                            Id = 207,
+                            Label = "RETRIGGER_CALLBACK_OSP_DECLINED"
+                        },
+                        new
+                        {
+                            Id = 208,
+                            Label = "MANUAL_DECLINE_OSP"
+                        },
+                        new
+                        {
+                            Id = 209,
+                            Label = "REMOVE_KEYCLOAK_USERS"
+                        },
+                        new
+                        {
+                            Id = 210,
+                            Label = "RETRIGGER_REMOVE_KEYCLOAK_USERS"
+                        },
+                        new
+                        {
+                            Id = 301,
+                            Label = "SEND_MAIL"
+                        },
+                        new
+                        {
+                            Id = 302,
+                            Label = "RETRIGGER_SEND_MAIL"
+                        },
+                        new
+                        {
+                            Id = 400,
+                            Label = "INVITATION_CREATE_CENTRAL_IDP"
+                        },
+                        new
+                        {
+                            Id = 401,
+                            Label = "INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT"
+                        },
+                        new
+                        {
+                            Id = 402,
+                            Label = "INVITATION_ADD_REALM_ROLE"
+                        },
+                        new
+                        {
+                            Id = 403,
+                            Label = "INVITATION_CREATE_SHARED_REALM"
+                        },
+                        new
+                        {
+                            Id = 404,
+                            Label = "INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER"
+                        },
+                        new
+                        {
+                            Id = 405,
+                            Label = "INVITATION_UPDATE_CENTRAL_IDP_URLS"
+                        },
+                        new
+                        {
+                            Id = 406,
+                            Label = "INVITATION_CREATE_SHARED_CLIENT"
+                        },
+                        new
+                        {
+                            Id = 407,
+                            Label = "INVITATION_ENABLE_CENTRAL_IDP"
+                        },
+                        new
+                        {
+                            Id = 408,
+                            Label = "INVITATION_CREATE_DATABASE_IDP"
+                        },
+                        new
+                        {
+                            Id = 409,
+                            Label = "INVITATION_CREATE_USER"
+                        },
+                        new
+                        {
+                            Id = 410,
+                            Label = "RETRIGGER_INVITATION_CREATE_CENTRAL_IDP"
+                        },
+                        new
+                        {
+                            Id = 411,
+                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT"
+                        },
+                        new
+                        {
+                            Id = 412,
+                            Label = "RETRIGGER_INVITATION_ADD_REALM_ROLE"
+                        },
+                        new
+                        {
+                            Id = 413,
+                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_REALM"
+                        },
+                        new
+                        {
+                            Id = 414,
+                            Label = "RETRIGGER_INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER"
+                        },
+                        new
+                        {
+                            Id = 415,
+                            Label = "RETRIGGER_INVITATION_UPDATE_CENTRAL_IDP_URLS"
+                        },
+                        new
+                        {
+                            Id = 416,
+                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_CLIENT"
+                        },
+                        new
+                        {
+                            Id = 417,
+                            Label = "RETRIGGER_INVITATION_ENABLE_CENTRAL_IDP"
+                        },
+                        new
+                        {
+                            Id = 418,
+                            Label = "RETRIGGER_INVITATION_CREATE_USER"
+                        },
+                        new
+                        {
+                            Id = 419,
+                            Label = "RETRIGGER_INVITATION_CREATE_DATABASE_IDP"
+                        },
+                        new
+                        {
+                            Id = 500,
+                            Label = "CREATE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 501,
+                            Label = "RETRIGGER_CREATE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 502,
+                            Label = "AWAIT_CREATE_DIM_TECHNICAL_USER_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 504,
+                            Label = "DELETE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 505,
+                            Label = "AWAIT_DELETE_DIM_TECHNICAL_USER_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 506,
+                            Label = "RETRIGGER_DELETE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 600,
+                            Label = "DELETE_CENTRAL_USER"
+                        },
+                        new
+                        {
+                            Id = 601,
+                            Label = "RETRIGGER_DELETE_CENTRAL_USER"
+                        },
+                        new
+                        {
+                            Id = 602,
+                            Label = "DELETE_COMPANYUSER_ASSIGNED_PROCESS"
+                        },
+                        new
+                        {
+                            Id = 700,
+                            Label = "DELETE_IDP_SHARED_REALM"
+                        },
+                        new
+                        {
+                            Id = 701,
+                            Label = "RETRIGGER_DELETE_IDP_SHARED_REALM"
+                        },
+                        new
+                        {
+                            Id = 702,
+                            Label = "DELETE_IDP_SHARED_SERVICEACCOUNT"
+                        },
+                        new
+                        {
+                            Id = 703,
+                            Label = "RETRIGGER_DELETE_IDP_SHARED_SERVICEACCOUNT"
+                        },
+                        new
+                        {
+                            Id = 704,
+                            Label = "DELETE_CENTRAL_IDENTITY_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 705,
+                            Label = "RETRIGGER_DELETE_CENTRAL_IDENTITY_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 706,
+                            Label = "DELETE_IDENTITY_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 800,
+                            Label = "SELF_DESCRIPTION_CONNECTOR_CREATION"
+                        },
+                        new
+                        {
+                            Id = 801,
+                            Label = "SELF_DESCRIPTION_COMPANY_CREATION"
+                        },
+                        new
+                        {
+                            Id = 802,
+                            Label = "RETRIGGER_SELF_DESCRIPTION_CONNECTOR_CREATION"
+                        },
+                        new
+                        {
+                            Id = 803,
+                            Label = "RETRIGGER_SELF_DESCRIPTION_COMPANY_CREATION"
+                        });
+                });
 
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId>", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
                         .HasColumnName("id");
 
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("LocationId")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character varying(2)")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
+                    b.Property<string>("Label")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
-
-                    b.Property<Guid>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
+                        .HasColumnName("label");
 
-                    b.Property<int>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
+                    b.HasKey("Id")
+                        .HasName("pk_process_types");
 
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20230803");
+                    b.ToTable("process_types", "portal");
 
-                    b.ToTable("audit_connector20230803", "portal");
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "APPLICATION_CHECKLIST"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "OFFER_SUBSCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "PARTNER_REGISTRATION"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "MAILING"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "INVITATION"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "USER_PROVISIONING"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "IDENTITYPROVIDER_PROVISIONING"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "SELF_DESCRIPTION_CREATION"
+                        });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditAppSubscriptionDetail20221118", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("CompanyServiceAccountId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_service_account_id");
-
-                    b.Property<string>("ConnectorUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("connector_url");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("LocationId")
-                        .HasColumnType("text")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text")
-                        .HasColumnName("name");
-
-                    b.Property<Guid?>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                    b.Property<Guid?>("AppInstanceId")
                         .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int?>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
-
-                    b.Property<int?>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20231115");
-
-                    b.ToTable("audit_connector20231115", "portal");
-                });
+                        .HasColumnName("app_instance_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20240814", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
+                    b.Property<string>("AppSubscriptionUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("app_subscription_url");
 
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
@@ -1102,22 +793,6 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid?>("CompanyServiceAccountId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_service_account_id");
-
-                    b.Property<string>("ConnectorUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("connector_url");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
-
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -1126,74 +801,43 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("LocationId")
-                        .HasColumnType("text")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text")
-                        .HasColumnName("name");
-
-                    b.Property<Guid?>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SdCreationProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sd_creation_process_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                    b.Property<Guid>("OfferSubscriptionId")
                         .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int?>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
-
-                    b.Property<int?>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
+                        .HasColumnName("offer_subscription_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20240814");
+                        .HasName("pk_audit_app_subscription_detail20221118");
 
-                    b.ToTable("audit_connector20240814", "portal");
+                    b.ToTable("audit_app_subscription_detail20221118", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20241008", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditAppSubscriptionDetail20231115", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
+                    b.Property<Guid?>("AppInstanceId")
                         .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
+                        .HasColumnName("app_instance_id");
 
-                    b.Property<string>("ConnectorUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("connector_url");
+                    b.Property<string>("AppSubscriptionUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("app_subscription_url");
 
-                    b.Property<DateTimeOffset?>("DateLastChanged")
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<Guid?>("HostId")
+                    b.Property<Guid?>("AuditV1LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("host_id");
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -1203,59 +847,23 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("LocationId")
-                        .HasColumnType("text")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text")
-                        .HasColumnName("name");
-
-                    b.Property<Guid?>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SdCreationProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sd_creation_process_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int?>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
-
-                    b.Property<Guid?>("TechnicalUserId")
+                    b.Property<Guid?>("OfferSubscriptionId")
                         .HasColumnType("uuid")
-                        .HasColumnName("technical_user_id");
-
-                    b.Property<int?>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
+                        .HasColumnName("offer_subscription_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20241008");
+                        .HasName("pk_audit_app_subscription_detail20231115");
 
-                    b.ToTable("audit_connector20241008", "portal");
+                    b.ToTable("audit_app_subscription_detail20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConsent20230412", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCertificateManagement20240416", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
-                    b.Property<Guid>("AgreementId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
-
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -1268,60 +876,74 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Comment")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("comment");
+                    b.Property<int?>("CompanyCertificateStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_status_id");
 
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                    b.Property<int?>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
 
-                    b.Property<Guid>("CompanyUserId")
+                    b.Property<Guid?>("CompanyId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
-
-                    b.Property<int>("ConsentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("consent_status_id");
+                        .HasColumnName("company_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
+                    b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                        .HasColumnName("date_last_changed");
 
                     b.Property<Guid?>("DocumentId")
                         .HasColumnType("uuid")
                         .HasColumnName("document_id");
 
+                    b.Property<string>("ExternalCertificateNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("external_certificate_number");
+
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
+                    b.Property<string>("Issuer")
+                        .HasColumnType("text")
+                        .HasColumnName("issuer");
+
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("Target")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("target");
+                    b.Property<string>("TrustLevel")
+                        .HasColumnType("text")
+                        .HasColumnName("trust_level");
+
+                    b.Property<DateTimeOffset?>("ValidFrom")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_from");
+
+                    b.Property<DateTimeOffset?>("ValidTill")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_till");
+
+                    b.Property<string>("Validator")
+                        .HasColumnType("text")
+                        .HasColumnName("validator");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_consent20230412");
+                        .HasName("pk_audit_certificate_management20240416");
 
-                    b.ToTable("audit_consent20230412", "portal");
+                    b.ToTable("audit_certificate_management20240416", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConsent20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20221005", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
-                    b.Property<Guid?>("AgreementId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
 
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
@@ -1335,29 +957,17 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Comment")
-                        .HasColumnType("text")
-                        .HasColumnName("comment");
-
-                    b.Property<Guid?>("CompanyId")
+                    b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<Guid?>("CompanyUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
-
-                    b.Property<int?>("ConsentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("consent_status_id");
-
-                    b.Property<DateTimeOffset?>("DateCreated")
+                    b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<Guid?>("DocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("document_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -1367,23 +977,23 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("Target")
-                        .HasColumnType("text")
-                        .HasColumnName("target");
-
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_consent20231115");
+                        .HasName("pk_audit_company_application20221005");
 
-                    b.ToTable("audit_consent20231115", "portal");
+                    b.ToTable("audit_company_application20221005", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20231108", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20230214", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -1396,9 +1006,13 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid?>("CompanyUserId")
+                    b.Property<Guid?>("ChecklistProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("checklist_process_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
                     b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
@@ -1408,30 +1022,6 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<byte[]>("DocumentContent")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_content");
-
-                    b.Property<byte[]>("DocumentHash")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_hash");
-
-                    b.Property<string>("DocumentName")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("document_name");
-
-                    b.Property<int>("DocumentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_status_id");
-
-                    b.Property<int>("DocumentTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_type_id");
-
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -1440,23 +1030,23 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int>("MediaTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("media_type_id");
-
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_document20231108");
+                        .HasName("pk_audit_company_application20230214");
 
-                    b.ToTable("audit_document20231108", "portal");
+                    b.ToTable("audit_company_application20230214", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20230824", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -1469,11 +1059,19 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid?>("CompanyUserId")
+                    b.Property<Guid?>("ChecklistProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("checklist_process_id");
 
-                    b.Property<DateTimeOffset?>("DateCreated")
+                    b.Property<int>("CompanyApplicationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_application_type_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
@@ -1481,26 +1079,6 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<byte[]>("DocumentContent")
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_content");
-
-                    b.Property<byte[]>("DocumentHash")
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_hash");
-
-                    b.Property<string>("DocumentName")
-                        .HasColumnType("text")
-                        .HasColumnName("document_name");
-
-                    b.Property<int?>("DocumentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_status_id");
-
-                    b.Property<int?>("DocumentTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_type_id");
-
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -1509,23 +1087,27 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int?>("MediaTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("media_type_id");
+                    b.Property<Guid?>("OnboardingServiceProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("onboarding_service_provider_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_document20231115");
+                        .HasName("pk_audit_company_application20230824");
 
-                    b.ToTable("audit_document20231115", "portal");
+                    b.ToTable("audit_company_application20230824", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20241120", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20231115", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
+                    b.Property<int?>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -1536,11 +1118,19 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
                     b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("ChecklistProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("checklist_process_id");
+
+                    b.Property<int?>("CompanyApplicationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_application_type_id");
 
-                    b.Property<Guid?>("CompanyUserId")
+                    b.Property<Guid?>("CompanyId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("company_id");
 
                     b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
@@ -1550,30 +1140,6 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<byte[]>("DocumentContent")
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_content");
-
-                    b.Property<byte[]>("DocumentHash")
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_hash");
-
-                    b.Property<string>("DocumentName")
-                        .HasColumnType("text")
-                        .HasColumnName("document_name");
-
-                    b.Property<long?>("DocumentSize")
-                        .HasColumnType("bigint")
-                        .HasColumnName("document_size");
-
-                    b.Property<int?>("DocumentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_status_id");
-
-                    b.Property<int?>("DocumentTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_type_id");
-
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -1582,17 +1148,17 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int?>("MediaTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("media_type_id");
+                    b.Property<Guid?>("OnboardingServiceProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("onboarding_service_provider_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_document20241120");
+                        .HasName("pk_audit_company_application20231115");
 
-                    b.ToTable("audit_document20241120", "portal");
+                    b.ToTable("audit_company_application20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentity20230526", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyAssignedRole2023316", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1615,43 +1181,25 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<int>("CompanyRoleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_role_id");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<int>("IdentityTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("identity_type_id");
-
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("UserEntityId")
-                        .HasMaxLength(36)
-                        .HasColumnType("character varying(36)")
-                        .HasColumnName("user_entity_id");
-
-                    b.Property<int>("UserStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("user_status_id")
-                        .HasAnnotation("Relational:JsonPropertyName", "user_status_id");
-
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_identity20230526");
+                        .HasName("pk_audit_company_assigned_role2023316");
 
-                    b.ToTable("audit_identity20230526", "portal");
+                    b.ToTable("audit_company_assigned_role2023316", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentity20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUser20221005", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1670,11 +1218,15 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid?>("CompanyId")
+                    b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<DateTimeOffset?>("DateCreated")
+                    b.Property<int>("CompanyUserStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_user_status_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
@@ -1682,33 +1234,37 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
+                    b.Property<string>("Email")
+                        .HasColumnType("text")
+                        .HasColumnName("email");
+
+                    b.Property<string>("Firstname")
+                        .HasColumnType("text")
+                        .HasColumnName("firstname");
+
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<int?>("IdentityTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("identity_type_id");
-
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("UserEntityId")
-                        .HasColumnType("text")
-                        .HasColumnName("user_entity_id");
+                    b.Property<byte[]>("Lastlogin")
+                        .HasColumnType("bytea")
+                        .HasColumnName("lastlogin");
 
-                    b.Property<int?>("UserStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("user_status_id");
+                    b.Property<string>("Lastname")
+                        .HasColumnType("text")
+                        .HasColumnName("lastname");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_identity20231115");
+                        .HasName("pk_audit_company_user20221005");
 
-                    b.ToTable("audit_identity20231115", "portal");
+                    b.ToTable("audit_company_user20221005", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentityAssignedRole20230522", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUser20230522", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1727,25 +1283,41 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid>("IdentityId")
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text")
+                        .HasColumnName("email");
+
+                    b.Property<string>("Firstname")
+                        .HasColumnType("text")
+                        .HasColumnName("firstname");
+
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("identity_id");
+                        .HasColumnName("id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("UserRoleId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_role_id");
+                    b.Property<byte[]>("Lastlogin")
+                        .HasColumnType("bytea")
+                        .HasColumnName("lastlogin");
+
+                    b.Property<string>("Lastname")
+                        .HasColumnType("text")
+                        .HasColumnName("lastname");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_identity_assigned_role20230522");
+                        .HasName("pk_audit_company_user20230523");
 
-                    b.ToTable("audit_identity_assigned_role20230522", "portal");
+                    b.ToTable("audit_company_user20230523", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20230119", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUserAssignedRole20221018", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1764,70 +1336,25 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("ContactEmail")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_email");
-
-                    b.Property<string>("ContactNumber")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_number");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
-
-                    b.Property<Guid>("Id")
+                    b.Property<Guid>("CompanyUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("company_user_id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("MarketingUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("marketing_url");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text")
-                        .HasColumnName("name");
-
-                    b.Property<int>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
-
-                    b.Property<int>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
-
-                    b.Property<string>("Provider")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("provider");
-
-                    b.Property<Guid?>("ProviderCompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
-
-                    b.Property<Guid?>("SalesManagerId")
+                    b.Property<Guid>("UserRoleId")
                         .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+                        .HasColumnName("user_role_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer20230119");
+                        .HasName("pk_audit_company_user_assigned_role20221018");
 
-                    b.ToTable("audit_offer20230119", "portal");
+                    b.ToTable("audit_company_user_assigned_role20221018", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20230406", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230405", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1846,25 +1373,23 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("ContactEmail")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_email");
-
-                    b.Property<string>("ContactNumber")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_number");
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("connector_url");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<bool?>("DapsRegistrationSuccessful")
+                        .HasColumnType("boolean")
+                        .HasColumnName("daps_registration_successful");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -1874,46 +1399,45 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int>("LicenseTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("license_type_id");
-
-                    b.Property<string>("MarketingUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("marketing_url");
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("location_id");
 
                     b.Property<string>("Name")
-                        .HasColumnType("text")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("name");
 
-                    b.Property<int>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
+                    b.Property<Guid>("ProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_id");
 
-                    b.Property<int>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<string>("Provider")
-                        .IsRequired()
+                    b.Property<string>("SelfDescriptionMessage")
                         .HasColumnType("text")
-                        .HasColumnName("provider");
+                        .HasColumnName("self_description_message");
 
-                    b.Property<Guid?>("ProviderCompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
 
-                    b.Property<Guid?>("SalesManagerId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer20230406");
+                        .HasName("pk_audit_connector20230405");
 
-                    b.ToTable("audit_offer20230406", "portal");
+                    b.ToTable("audit_connector20230405", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230503", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1932,25 +1456,27 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("ContactEmail")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_email");
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
 
-                    b.Property<string>("ContactNumber")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_number");
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("connector_url");
 
-                    b.Property<DateTimeOffset?>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<bool?>("DapsRegistrationSuccessful")
+                        .HasColumnType("boolean")
+                        .HasColumnName("daps_registration_successful");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -1960,45 +1486,45 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int?>("LicenseTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("license_type_id");
-
-                    b.Property<string>("MarketingUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("marketing_url");
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("location_id");
 
                     b.Property<string>("Name")
-                        .HasColumnType("text")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("name");
 
-                    b.Property<int?>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
+                    b.Property<Guid>("ProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_id");
 
-                    b.Property<int?>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<string>("Provider")
+                    b.Property<string>("SelfDescriptionMessage")
                         .HasColumnType("text")
-                        .HasColumnName("provider");
+                        .HasColumnName("self_description_message");
 
-                    b.Property<Guid?>("ProviderCompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
 
-                    b.Property<Guid?>("SalesManagerId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer20231115");
+                        .HasName("pk_audit_connector20230503");
 
-                    b.ToTable("audit_offer20231115", "portal");
+                    b.ToTable("audit_connector20230503", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20240911", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230803", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2017,25 +1543,23 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("ContactEmail")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_email");
-
-                    b.Property<string>("ContactNumber")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_number");
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
 
-                    b.Property<DateTimeOffset?>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("connector_url");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -2045,41 +1569,45 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int?>("LicenseTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("license_type_id");
-
-                    b.Property<string>("MarketingUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("marketing_url");
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("location_id");
 
                     b.Property<string>("Name")
-                        .HasColumnType("text")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("name");
 
-                    b.Property<int?>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
-
-                    b.Property<int?>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
-
-                    b.Property<Guid?>("ProviderCompanyId")
+                    b.Property<Guid>("ProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
+                        .HasColumnName("provider_id");
 
-                    b.Property<Guid?>("SalesManagerId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+                        .HasColumnName("self_description_document_id");
+
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer20240911");
+                        .HasName("pk_audit_connector20230803");
 
-                    b.ToTable("audit_offer20240911", "portal");
+                    b.ToTable("audit_connector20230803", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20241219", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20231115", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2098,29 +1626,21 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("ContactEmail")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_email");
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
 
-                    b.Property<string>("ContactNumber")
+                    b.Property<string>("ConnectorUrl")
                         .HasColumnType("text")
-                        .HasColumnName("contact_number");
-
-                    b.Property<DateTimeOffset?>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                        .HasColumnName("connector_url");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
-
-                    b.Property<bool?>("DisplayTechnicalUser")
-                        .HasColumnType("boolean")
-                        .HasColumnName("display_technical_user");
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -2130,41 +1650,41 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int?>("LicenseTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("license_type_id");
-
-                    b.Property<string>("MarketingUrl")
+                    b.Property<string>("LocationId")
                         .HasColumnType("text")
-                        .HasColumnName("marketing_url");
+                        .HasColumnName("location_id");
 
                     b.Property<string>("Name")
                         .HasColumnType("text")
                         .HasColumnName("name");
 
-                    b.Property<int?>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
-
-                    b.Property<int?>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
-
-                    b.Property<Guid?>("ProviderCompanyId")
+                    b.Property<Guid?>("ProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
+                        .HasColumnName("provider_id");
 
-                    b.Property<Guid?>("SalesManagerId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+                        .HasColumnName("self_description_document_id");
+
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int?>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<int?>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer20241219");
+                        .HasName("pk_audit_connector20231115");
 
-                    b.ToTable("audit_offer20241219", "portal");
+                    b.ToTable("audit_connector20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20221005", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20240814", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2175,53 +1695,77 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<Guid?>("AuditV1LastEditorId")
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
+
+                    b.Property<string>("ConnectorUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("connector_url");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("HostId")
                         .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
+                        .HasColumnName("host_id");
 
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<string>("Description")
+                    b.Property<string>("LocationId")
                         .HasColumnType("text")
-                        .HasColumnName("description");
+                        .HasColumnName("location_id");
 
-                    b.Property<string>("DisplayName")
+                    b.Property<string>("Name")
                         .HasColumnType("text")
-                        .HasColumnName("display_name");
+                        .HasColumnName("name");
 
-                    b.Property<Guid>("Id")
+                    b.Property<Guid?>("ProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("provider_id");
 
-                    b.Property<Guid?>("LastEditorId")
+                    b.Property<Guid?>("SdCreationProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
+                        .HasColumnName("sd_creation_process_id");
 
-                    b.Property<Guid>("OfferId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<int>("OfferSubscriptionStatusId")
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int?>("StatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("offer_subscription_status_id");
+                        .HasColumnName("status_id");
 
-                    b.Property<Guid>("RequesterId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("requester_id");
+                    b.Property<int?>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer_subscription20221005");
+                        .HasName("pk_audit_connector20240814");
 
-                    b.ToTable("audit_offer_subscription20221005", "portal");
+                    b.ToTable("audit_connector20240814", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20230317", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20241008", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2240,17 +1784,17 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<string>("Description")
+                    b.Property<string>("ConnectorUrl")
                         .HasColumnType("text")
-                        .HasColumnName("description");
+                        .HasColumnName("connector_url");
 
-                    b.Property<string>("DisplayName")
-                        .HasColumnType("text")
-                        .HasColumnName("display_name");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -2260,35 +1804,59 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferId")
+                    b.Property<string>("LocationId")
+                        .HasColumnType("text")
+                        .HasColumnName("location_id");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<Guid?>("ProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                        .HasColumnName("provider_id");
 
-                    b.Property<int>("OfferSubscriptionStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_subscription_status_id");
+                    b.Property<Guid?>("SdCreationProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sd_creation_process_id");
 
-                    b.Property<Guid?>("ProcessId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("process_id");
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<Guid>("RequesterId")
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int?>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<Guid?>("TechnicalUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("requester_id");
+                        .HasColumnName("technical_user_id");
+
+                    b.Property<int?>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer_subscription20230317");
+                        .HasName("pk_audit_connector20241008");
 
-                    b.ToTable("audit_offer_subscription20230317", "portal");
+                    b.ToTable("audit_connector20241008", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20231013", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConsent20230412", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -2301,21 +1869,30 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
+                    b.Property<string>("Comment")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("comment");
+
                     b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<int>("ConsentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("consent_status_id");
+
                     b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<string>("Description")
-                        .HasColumnType("text")
-                        .HasColumnName("description");
-
-                    b.Property<string>("DisplayName")
-                        .HasColumnType("text")
-                        .HasColumnName("display_name");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -2325,35 +1902,28 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
-
-                    b.Property<int>("OfferSubscriptionStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_subscription_status_id");
-
-                    b.Property<Guid?>("ProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.Property<Guid>("RequesterId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("requester_id");
+                    b.Property<string>("Target")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("target");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer_subscription20231013");
+                        .HasName("pk_audit_consent20230412");
 
-                    b.ToTable("audit_offer_subscription20231013", "portal");
+                    b.ToTable("audit_consent20230412", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConsent20231115", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
+                    b.Property<Guid?>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -2366,21 +1936,29 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
+                    b.Property<string>("Comment")
+                        .HasColumnType("text")
+                        .HasColumnName("comment");
+
                     b.Property<Guid?>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
+                    b.Property<Guid?>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<int?>("ConsentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("consent_status_id");
+
                     b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<string>("Description")
-                        .HasColumnType("text")
-                        .HasColumnName("description");
-
-                    b.Property<string>("DisplayName")
-                        .HasColumnType("text")
-                        .HasColumnName("display_name");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -2390,29 +1968,17 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid?>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
-
-                    b.Property<int?>("OfferSubscriptionStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_subscription_status_id");
-
-                    b.Property<Guid?>("ProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.Property<Guid?>("RequesterId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("requester_id");
+                    b.Property<string>("Target")
+                        .HasColumnType("text")
+                        .HasColumnName("target");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer_subscription20231115");
+                        .HasName("pk_audit_consent20231115");
 
-                    b.ToTable("audit_offer_subscription20231115", "portal");
+                    b.ToTable("audit_consent20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditProviderCompanyDetail20230614", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20231108", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2431,18 +1997,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("AutoSetupCallbackUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("auto_setup_callback_url");
-
-                    b.Property<string>("AutoSetupUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("auto_setup_url");
-
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid?>("CompanyUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("company_user_id");
 
                     b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
@@ -2452,6 +2009,30 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
+                    b.Property<byte[]>("DocumentContent")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
+
+                    b.Property<byte[]>("DocumentHash")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("document_name");
+
+                    b.Property<int>("DocumentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_status_id");
+
+                    b.Property<int>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
+
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -2460,13 +2041,17 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
+                    b.Property<int>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
+
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_provider_company_detail20230614");
+                        .HasName("pk_audit_document20231108");
 
-                    b.ToTable("audit_provider_company_detail20230614", "portal");
+                    b.ToTable("audit_document20231108", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditProviderCompanyDetail20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20231115", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2485,17 +2070,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("AutoSetupCallbackUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("auto_setup_callback_url");
-
-                    b.Property<string>("AutoSetupUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("auto_setup_url");
-
-                    b.Property<Guid?>("CompanyId")
+                    b.Property<Guid?>("CompanyUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("company_user_id");
 
                     b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
@@ -2505,6 +2082,26 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
+                    b.Property<byte[]>("DocumentContent")
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
+
+                    b.Property<byte[]>("DocumentHash")
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .HasColumnType("text")
+                        .HasColumnName("document_name");
+
+                    b.Property<int?>("DocumentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_status_id");
+
+                    b.Property<int?>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
+
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -2513,13 +2110,17 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
+                    b.Property<int?>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
+
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_provider_company_detail20231115");
+                        .HasName("pk_audit_document20231115");
 
-                    b.ToTable("audit_provider_company_detail20231115", "portal");
+                    b.ToTable("audit_document20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditUserRole20221017", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20241120", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2538,6 +2139,42 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
+                    b.Property<Guid?>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<byte[]>("DocumentContent")
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
+
+                    b.Property<byte[]>("DocumentHash")
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .HasColumnType("text")
+                        .HasColumnName("document_name");
+
+                    b.Property<long?>("DocumentSize")
+                        .HasColumnType("bigint")
+                        .HasColumnName("document_size");
+
+                    b.Property<int?>("DocumentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_status_id");
+
+                    b.Property<int?>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
+
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -2546,22 +2183,17 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
-
-                    b.Property<string>("UserRoleText")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("user_role");
+                    b.Property<int?>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_user_role20221017");
+                        .HasName("pk_audit_document20241120");
 
-                    b.ToTable("audit_user_role20221017", "portal");
+                    b.ToTable("audit_document20241120", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditUserRole20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentity20230526", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2580,47 +2212,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid?>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
-
-                    b.Property<string>("UserRoleText")
-                        .HasColumnType("text")
-                        .HasColumnName("user_role");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_user_role20231115");
-
-                    b.ToTable("audit_user_role20231115", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
+                    b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("City")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("city");
-
-                    b.Property<string>("CountryAlpha2Code")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("country_alpha2code")
-                        .HasAnnotation("Relational:JsonPropertyName", "country_alpha2code");
+                        .HasColumnName("company_id");
 
                     b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
@@ -2630,424 +2224,324 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<string>("Region")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("region");
-
-                    b.Property<string>("Streetadditional")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("streetadditional");
-
-                    b.Property<string>("Streetname")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("streetname");
-
-                    b.Property<string>("Streetnumber")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("streetnumber");
-
-                    b.Property<string>("Zipcode")
-                        .HasMaxLength(12)
-                        .HasColumnType("character varying(12)")
-                        .HasColumnName("zipcode");
-
-                    b.HasKey("Id")
-                        .HasName("pk_addresses");
-
-                    b.HasIndex("CountryAlpha2Code")
-                        .HasDatabaseName("ix_addresses_country_alpha2code");
-
-                    b.ToTable("addresses", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", b =>
-                {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<int>("AgreementCategoryId")
-                        .HasColumnType("integer")
-                        .HasColumnName("agreement_category_id");
-
-                    b.Property<string>("AgreementLink")
-                        .HasColumnType("text")
-                        .HasColumnName("agreement_link");
-
-                    b.Property<int>("AgreementStatusId")
-                        .ValueGeneratedOnAdd()
+                    b.Property<int>("IdentityTypeId")
                         .HasColumnType("integer")
-                        .HasDefaultValue(1)
-                        .HasColumnName("agreement_status_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("DocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("document_id");
-
-                    b.Property<Guid>("IssuerCompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("issuer_company_id");
-
-                    b.Property<bool>("Mandatory")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true)
-                        .HasColumnName("mandatory");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
-
-                    b.Property<Guid?>("UseCaseId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("use_case_id");
-
-                    b.HasKey("Id")
-                        .HasName("pk_agreements");
-
-                    b.HasIndex("AgreementCategoryId")
-                        .HasDatabaseName("ix_agreements_agreement_category_id");
-
-                    b.HasIndex("AgreementStatusId")
-                        .HasDatabaseName("ix_agreements_agreement_status_id");
-
-                    b.HasIndex("DocumentId")
-                        .HasDatabaseName("ix_agreements_document_id");
-
-                    b.HasIndex("IssuerCompanyId")
-                        .HasDatabaseName("ix_agreements_issuer_company_id");
-
-                    b.HasIndex("UseCaseId")
-                        .HasDatabaseName("ix_agreements_use_case_id");
-
-                    b.ToTable("agreements", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedCompanyRole", b =>
-                {
-                    b.Property<Guid>("AgreementId")
+                        .HasColumnName("identity_type_id");
+
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<int>("CompanyRoleId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_role_id");
+                    b.Property<string>("UserEntityId")
+                        .HasMaxLength(36)
+                        .HasColumnType("character varying(36)")
+                        .HasColumnName("user_entity_id");
 
-                    b.HasKey("AgreementId", "CompanyRoleId")
-                        .HasName("pk_agreement_assigned_company_roles");
+                    b.Property<int>("UserStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("user_status_id")
+                        .HasAnnotation("Relational:JsonPropertyName", "user_status_id");
 
-                    b.HasIndex("CompanyRoleId")
-                        .HasDatabaseName("ix_agreement_assigned_company_roles_company_role_id");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_identity20230526");
 
-                    b.ToTable("agreement_assigned_company_roles", "portal");
+                    b.ToTable("audit_identity20230526", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOffer", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentity20231115", b =>
                 {
-                    b.Property<Guid>("AgreementId")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<Guid>("OfferId")
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.HasKey("AgreementId", "OfferId")
-                        .HasName("pk_agreement_assigned_offers");
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.HasIndex("OfferId")
-                        .HasDatabaseName("ix_agreement_assigned_offers_offer_id");
+                    b.Property<Guid?>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                    b.ToTable("agreement_assigned_offers", "portal");
-                });
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOfferType", b =>
-                {
-                    b.Property<Guid>("AgreementId")
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
+                        .HasColumnName("id");
 
-                    b.Property<int>("OfferTypeId")
+                    b.Property<int?>("IdentityTypeId")
                         .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
-
-                    b.HasKey("AgreementId", "OfferTypeId")
-                        .HasName("pk_agreement_assigned_offer_types");
+                        .HasColumnName("identity_type_id");
 
-                    b.HasIndex("OfferTypeId")
-                        .HasDatabaseName("ix_agreement_assigned_offer_types_offer_type_id");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.ToTable("agreement_assigned_offer_types", "portal");
-                });
+                    b.Property<string>("UserEntityId")
+                        .HasColumnType("text")
+                        .HasColumnName("user_entity_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementCategory", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<int?>("UserStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
-
-                    b.HasKey("Id")
-                        .HasName("pk_agreement_categories");
+                        .HasColumnName("user_status_id");
 
-                    b.ToTable("agreement_categories", "portal");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_identity20231115");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "CX_FRAME_CONTRACT"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "APP_CONTRACT"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "DATA_CONTRACT"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "SERVICE_CONTRACT"
-                        });
+                    b.ToTable("audit_identity20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentityAssignedRole20230522", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("IdentityId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_agreement_statuses");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.ToTable("agreement_statuses", "portal");
+                    b.Property<Guid>("UserRoleId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "ACTIVE"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "INACTIVE"
-                        });
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_identity_assigned_role20230522");
+
+                    b.ToTable("audit_identity_assigned_role20230522", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppAssignedUseCase", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20230119", b =>
                 {
-                    b.Property<Guid>("AppId")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("app_id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<Guid>("UseCaseId")
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("use_case_id");
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.HasKey("AppId", "UseCaseId")
-                        .HasName("pk_app_assigned_use_cases");
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.HasIndex("UseCaseId")
-                        .HasDatabaseName("ix_app_assigned_use_cases_use_case_id");
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
 
-                    b.ToTable("app_assigned_use_cases", "portal");
-                });
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstance", b =>
-                {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid>("AppId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_id");
-
-                    b.Property<Guid>("IamClientId")
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("iam_client_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_app_instances");
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
 
-                    b.HasIndex("AppId")
-                        .HasDatabaseName("ix_app_instances_app_id");
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
 
-                    b.HasIndex("IamClientId")
-                        .HasDatabaseName("ix_app_instances_iam_client_id");
+                    b.Property<int>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
 
-                    b.ToTable("app_instances", "portal");
-                });
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceAssignedTechnicalUser", b =>
-                {
-                    b.Property<Guid>("AppInstanceId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_instance_id");
+                    b.Property<string>("Provider")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("provider");
 
-                    b.Property<Guid>("TechnicalUserId")
+                    b.Property<Guid?>("ProviderCompanyId")
                         .HasColumnType("uuid")
-                        .HasColumnName("technical_user_id");
+                        .HasColumnName("provider_company_id");
 
-                    b.HasKey("AppInstanceId", "TechnicalUserId")
-                        .HasName("pk_app_instance_assigned_technical_users");
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
 
-                    b.HasIndex("TechnicalUserId")
-                        .HasDatabaseName("ix_app_instance_assigned_technical_users_technical_user_id");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20230119");
 
-                    b.ToTable("app_instance_assigned_technical_users", "portal");
+                    b.ToTable("audit_offer20230119", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceSetup", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20230406", b =>
                 {
-                    b.Property<Guid>("Id")
+                    b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid>("AppId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_id");
-
-                    b.Property<string>("InstanceUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("instance_url");
-
-                    b.Property<bool>("IsSingleInstance")
-                        .HasColumnType("boolean")
-                        .HasColumnName("is_single_instance");
+                        .HasColumnName("audit_v1id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_app_instance_setups");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.HasIndex("AppId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_app_instance_setups_app_id");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.ToTable("app_instance_setups", "portal");
-                });
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppLanguage", b =>
-                {
-                    b.Property<Guid>("AppId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_id");
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
 
-                    b.Property<string>("LanguageShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("language_short_name");
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
 
-                    b.HasKey("AppId", "LanguageShortName")
-                        .HasName("pk_app_languages");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.HasIndex("LanguageShortName")
-                        .HasDatabaseName("ix_app_languages_language_short_name");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.ToTable("app_languages", "portal");
-                });
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppSubscriptionDetail", b =>
-                {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid?>("AppInstanceId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_instance_id");
-
-                    b.Property<string>("AppSubscriptionUrl")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("app_subscription_url");
-
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferSubscriptionId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
+                    b.Property<int>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_app_subscription_details");
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
 
-                    b.HasIndex("AppInstanceId")
-                        .HasDatabaseName("ix_app_subscription_details_app_instance_id");
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_app_subscription_details_last_editor_id");
+                    b.Property<int>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
 
-                    b.HasIndex("OfferSubscriptionId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_app_subscription_details_offer_subscription_id");
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
 
-                    b.ToTable("app_subscription_details", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL");
+                    b.Property<string>("Provider")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("provider");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL");
-                        });
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_app_subscription_detail20231115\" (\"id\", \"offer_subscription_id\", \"app_instance_id\", \"app_subscription_url\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"offer_subscription_id\", \r\n  NEW.\"app_instance_id\", \r\n  NEW.\"app_subscription_url\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL AFTER INSERT\r\nON \"portal\".\"app_subscription_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_app_subscription_detail20231115\" (\"id\", \"offer_subscription_id\", \"app_instance_id\", \"app_subscription_url\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"offer_subscription_id\", \r\n  NEW.\"app_instance_id\", \r\n  NEW.\"app_subscription_url\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL AFTER UPDATE\r\nON \"portal\".\"app_subscription_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL\"();");
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20230406");
+
+                    b.ToTable("audit_offer20230406", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntry", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20231115", b =>
                 {
-                    b.Property<Guid>("ApplicationId")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("application_id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<int>("ApplicationChecklistEntryTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_checklist_entry_type_id");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<int>("ApplicationChecklistEntryStatusId")
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("application_checklist_entry_status_id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Comment")
+                    b.Property<string>("ContactEmail")
                         .HasColumnType("text")
-                        .HasColumnName("comment");
+                        .HasColumnName("contact_email");
 
-                    b.Property<DateTimeOffset>("DateCreated")
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
@@ -3055,1075 +2549,855 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.HasKey("ApplicationId", "ApplicationChecklistEntryTypeId")
-                        .HasName("pk_application_checklist");
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
 
-                    b.HasIndex("ApplicationChecklistEntryStatusId")
-                        .HasDatabaseName("ix_application_checklist_application_checklist_entry_status_id");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
-                    b.HasIndex("ApplicationChecklistEntryTypeId")
-                        .HasDatabaseName("ix_application_checklist_application_checklist_entry_type_id");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.ToTable("application_checklist", "portal");
-                });
+                    b.Property<int?>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryStatus", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("OfferStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("offer_status_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<int?>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_application_checklist_statuses");
+                    b.Property<string>("Provider")
+                        .HasColumnType("text")
+                        .HasColumnName("provider");
 
-                    b.ToTable("application_checklist_statuses", "portal");
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "TO_DO"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "IN_PROGRESS"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "DONE"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "FAILED"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "SKIPPED"
-                        });
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20231115");
+
+                    b.ToTable("audit_offer20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20240911", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
 
-                    b.HasKey("Id")
-                        .HasName("pk_application_checklist_types");
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
 
-                    b.ToTable("application_checklist_types", "portal");
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "REGISTRATION_VERIFICATION"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "BUSINESS_PARTNER_NUMBER"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "IDENTITY_WALLET"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "BPNL_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "MEMBERSHIP_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "CLEARING_HOUSE"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "SELF_DESCRIPTION_LP"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "APPLICATION_ACTIVATION"
-                        });
-                });
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AuditOperation", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_audit_operation");
+                    b.Property<int?>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
 
-                    b.ToTable("audit_operation", "portal");
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "INSERT"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "UPDATE"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "DELETE"
-                        });
-                });
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.BpdmIdentifier", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<int?>("OfferStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("offer_status_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<int?>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_bpdm_identifiers");
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
 
-                    b.ToTable("bpdm_identifiers", "portal");
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "EU_VAT_ID_DE"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "CH_UID"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "EU_VAT_ID_FR"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "FR_SIREN"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "EU_VAT_ID_AT"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "DE_BNUM"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "CZ_ICO"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "EU_VAT_ID_CZ"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "EU_VAT_ID_PL"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "EU_VAT_ID_BE"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Label = "EU_VAT_ID_CH"
-                        },
-                        new
-                        {
-                            Id = 12,
-                            Label = "EU_VAT_ID_DK"
-                        },
-                        new
-                        {
-                            Id = 13,
-                            Label = "EU_VAT_ID_ES"
-                        },
-                        new
-                        {
-                            Id = 14,
-                            Label = "EU_VAT_ID_GB"
-                        },
-                        new
-                        {
-                            Id = 15,
-                            Label = "EU_VAT_ID_NO"
-                        },
-                        new
-                        {
-                            Id = 16,
-                            Label = "BE_ENT_NO"
-                        },
-                        new
-                        {
-                            Id = 17,
-                            Label = "CVR_DK"
-                        },
-                        new
-                        {
-                            Id = 18,
-                            Label = "ID_CRN"
-                        },
-                        new
-                        {
-                            Id = 19,
-                            Label = "NO_ORGID"
-                        },
-                        new
-                        {
-                            Id = 20,
-                            Label = "LEI_ID"
-                        });
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20240911");
+
+                    b.ToTable("audit_offer20240911", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20241219", b =>
                 {
-                    b.Property<Guid>("Id")
+                    b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<Guid?>("AddressId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("address_id");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<string>("BusinessPartnerNumber")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasColumnName("business_partner_number");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.Property<int>("CompanyStatusId")
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("company_status_id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<string>("DidDocumentLocation")
-                        .HasColumnType("text")
-                        .HasColumnName("did_document_location");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
 
-                    b.Property<Guid?>("SdCreationProcessId")
+                    b.Property<bool?>("DisplayTechnicalUser")
+                        .HasColumnType("boolean")
+                        .HasColumnName("display_technical_user");
+
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("sd_creation_process_id");
+                        .HasColumnName("id");
 
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<string>("Shortname")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("shortname");
+                    b.Property<int?>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_companies");
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
 
-                    b.HasIndex("AddressId")
-                        .HasDatabaseName("ix_companies_address_id");
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
 
-                    b.HasIndex("CompanyStatusId")
-                        .HasDatabaseName("ix_companies_company_status_id");
+                    b.Property<int?>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
 
-                    b.HasIndex("SdCreationProcessId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_companies_sd_creation_process_id");
+                    b.Property<int?>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
 
-                    b.HasIndex("SelfDescriptionDocumentId")
-                        .HasDatabaseName("ix_companies_self_description_document_id");
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
 
-                    b.ToTable("companies", "portal");
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20241219");
+
+                    b.ToTable("audit_offer20241219", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20221005", b =>
                 {
-                    b.Property<Guid>("Id")
+                    b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<int>("ApplicationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_status_id");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<Guid?>("ChecklistProcessId")
+                    b.Property<Guid?>("AuditV1LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("checklist_process_id");
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.Property<int>("CompanyApplicationTypeId")
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("company_application_type_id");
+                        .HasColumnName("audit_v1operation_id");
 
                     b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
 
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid?>("OnboardingServiceProviderId")
+                    b.Property<Guid>("OfferId")
                         .HasColumnType("uuid")
-                        .HasColumnName("onboarding_service_provider_id");
-
-                    b.HasKey("Id")
-                        .HasName("pk_company_applications");
-
-                    b.HasIndex("ApplicationStatusId")
-                        .HasDatabaseName("ix_company_applications_application_status_id");
-
-                    b.HasIndex("ChecklistProcessId")
-                        .HasDatabaseName("ix_company_applications_checklist_process_id");
-
-                    b.HasIndex("CompanyApplicationTypeId")
-                        .HasDatabaseName("ix_company_applications_company_application_type_id");
-
-                    b.HasIndex("CompanyId")
-                        .HasDatabaseName("ix_company_applications_company_id");
-
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_company_applications_last_editor_id");
-
-                    b.HasIndex("OnboardingServiceProviderId")
-                        .HasDatabaseName("ix_company_applications_onboarding_service_provider_id");
-
-                    b.ToTable("company_applications", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION");
-
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION");
-                        });
-
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_application20231115\" (\"id\", \"date_created\", \"date_last_changed\", \"application_status_id\", \"company_id\", \"checklist_process_id\", \"company_application_type_id\", \"onboarding_service_provider_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"application_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"checklist_process_id\", \r\n  NEW.\"company_application_type_id\", \r\n  NEW.\"onboarding_service_provider_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION AFTER INSERT\r\nON \"portal\".\"company_applications\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_application20231115\" (\"id\", \"date_created\", \"date_last_changed\", \"application_status_id\", \"company_id\", \"checklist_process_id\", \"company_application_type_id\", \"onboarding_service_provider_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"application_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"checklist_process_id\", \r\n  NEW.\"company_application_type_id\", \r\n  NEW.\"onboarding_service_provider_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION AFTER UPDATE\r\nON \"portal\".\"company_applications\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION\"();");
-                });
+                        .HasColumnName("offer_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationStatus", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<int>("OfferSubscriptionStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                        .HasColumnName("offer_subscription_status_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_application_statuses");
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
 
-                    b.ToTable("company_application_statuses", "portal");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20221005");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "CREATED"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "ADD_COMPANY_DATA"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "INVITE_USER"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "SELECT_COMPANY_ROLE"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "UPLOAD_DOCUMENTS"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "VERIFY"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "SUBMITTED"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "CONFIRMED"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "DECLINED"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "CANCELLED_BY_CUSTOMER"
-                        });
+                    b.ToTable("audit_offer_subscription20221005", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20230317", b =>
                 {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_application_types");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.ToTable("company_application_types", "portal");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "INTERNAL"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "EXTERNAL"
-                        });
-                });
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedRole", b =>
-                {
                     b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<int>("CompanyRoleId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_role_id");
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.HasKey("CompanyId", "CompanyRoleId")
-                        .HasName("pk_company_assigned_roles");
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.HasIndex("CompanyRoleId")
-                        .HasDatabaseName("ix_company_assigned_roles_company_role_id");
+                    b.Property<int>("OfferSubscriptionStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_subscription_status_id");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_company_assigned_roles_last_editor_id");
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
 
-                    b.ToTable("company_assigned_roles", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE");
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE");
-                        });
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20230317");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_assigned_role2023316\" (\"company_id\", \"company_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"company_id\", \r\n  NEW.\"company_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE AFTER INSERT\r\nON \"portal\".\"company_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_assigned_role2023316\" (\"company_id\", \"company_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"company_id\", \r\n  NEW.\"company_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE AFTER UPDATE\r\nON \"portal\".\"company_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE\"();");
+                    b.ToTable("audit_offer_subscription20230317", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedUseCase", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20231013", b =>
                 {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
                     b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<Guid>("UseCaseId")
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("use_case_id");
+                        .HasColumnName("id");
 
-                    b.HasKey("CompanyId", "UseCaseId")
-                        .HasName("pk_company_assigned_use_cases");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.HasIndex("UseCaseId")
-                        .HasDatabaseName("ix_company_assigned_use_cases_use_case_id");
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.ToTable("company_assigned_use_cases", "portal");
+                    b.Property<int>("OfferSubscriptionStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_subscription_status_id");
+
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20231013");
+
+                    b.ToTable("audit_offer_subscription20231013", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificate", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20231115", b =>
                 {
-                    b.Property<Guid>("Id")
+                    b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<int>("CompanyCertificateStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_status_id");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<int>("CompanyCertificateTypeId")
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("company_certificate_type_id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid?>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<DateTimeOffset?>("DateLastChanged")
+                    b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid>("DocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("document_id");
+                        .HasColumnName("date_created");
 
-                    b.Property<string>("ExternalCertificateNumber")
+                    b.Property<string>("Description")
                         .HasColumnType("text")
-                        .HasColumnName("external_certificate_number");
+                        .HasColumnName("description");
 
-                    b.Property<string>("Issuer")
+                    b.Property<string>("DisplayName")
                         .HasColumnType("text")
-                        .HasColumnName("issuer");
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("TrustLevel")
-                        .HasColumnType("text")
-                        .HasColumnName("trust_level");
+                    b.Property<Guid?>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.Property<DateTimeOffset?>("ValidFrom")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("valid_from");
+                    b.Property<int?>("OfferSubscriptionStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_subscription_status_id");
 
-                    b.Property<DateTimeOffset?>("ValidTill")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("valid_till");
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
 
-                    b.Property<string>("Validator")
-                        .HasColumnType("text")
-                        .HasColumnName("validator");
+                    b.Property<Guid?>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_certificates");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20231115");
 
-                    b.HasIndex("CompanyCertificateStatusId")
-                        .HasDatabaseName("ix_company_certificates_company_certificate_status_id");
+                    b.ToTable("audit_offer_subscription20231115", "portal");
+                });
 
-                    b.HasIndex("CompanyCertificateTypeId")
-                        .HasDatabaseName("ix_company_certificates_company_certificate_type_id");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditProviderCompanyDetail20230614", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
 
-                    b.HasIndex("CompanyId")
-                        .HasDatabaseName("ix_company_certificates_company_id");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.HasIndex("DocumentId")
-                        .HasDatabaseName("ix_company_certificates_document_id");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.ToTable("company_certificates", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE");
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE");
-                        });
+                    b.Property<string>("AutoSetupCallbackUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_callback_url");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_certificate_management20240416\" (\"id\", \"valid_from\", \"valid_till\", \"company_certificate_type_id\", \"company_certificate_status_id\", \"company_id\", \"document_id\", \"external_certificate_number\", \"issuer\", \"trust_level\", \"validator\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"valid_from\", \r\n  NEW.\"valid_till\", \r\n  NEW.\"company_certificate_type_id\", \r\n  NEW.\"company_certificate_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"external_certificate_number\", \r\n  NEW.\"issuer\", \r\n  NEW.\"trust_level\", \r\n  NEW.\"validator\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE AFTER INSERT\r\nON \"portal\".\"company_certificates\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_certificate_management20240416\" (\"id\", \"valid_from\", \"valid_till\", \"company_certificate_type_id\", \"company_certificate_status_id\", \"company_id\", \"document_id\", \"external_certificate_number\", \"issuer\", \"trust_level\", \"validator\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"valid_from\", \r\n  NEW.\"valid_till\", \r\n  NEW.\"company_certificate_type_id\", \r\n  NEW.\"company_certificate_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"external_certificate_number\", \r\n  NEW.\"issuer\", \r\n  NEW.\"trust_level\", \r\n  NEW.\"validator\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE AFTER UPDATE\r\nON \"portal\".\"company_certificates\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE\"();");
-                });
+                    b.Property<string>("AutoSetupUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_url");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateAssignedSite", b =>
-                {
-                    b.Property<Guid>("CompanyCertificateId")
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_certificate_id");
+                        .HasColumnName("id");
 
-                    b.Property<string>("Site")
-                        .HasColumnType("text")
-                        .HasColumnName("site");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.HasKey("CompanyCertificateId", "Site")
-                        .HasName("pk_company_certificate_assigned_sites");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_provider_company_detail20230614");
 
-                    b.ToTable("company_certificate_assigned_sites", "portal");
+                    b.ToTable("audit_provider_company_detail20230614", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditProviderCompanyDetail20231115", b =>
                 {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
-
-                    b.HasKey("Id")
-                        .HasName("pk_company_certificate_statuses");
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
 
-                    b.ToTable("company_certificate_statuses", "portal");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "ACTIVE"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "INACTIVE"
-                        });
-                });
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateType", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<string>("AutoSetupCallbackUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_callback_url");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_certificate_types");
+                    b.Property<string>("AutoSetupUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_url");
 
-                    b.ToTable("company_certificate_types", "portal");
+                    b.Property<Guid?>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "AEO_CTPAT_Security_Declaration"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "ISO_9001"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "IATF_16949"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "ISO_14001_EMAS_or_national_certification"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "ISO_45001_OHSAS_18001_or_national_certification"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "ISO_IEC_27001"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "ISO_50001_or_national_certification"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "ISO_IEC_17025"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "ISO_15504_SPICE"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "B_BBEE_Certificate_of_South_Africa"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Label = "IATF"
-                        },
-                        new
-                        {
-                            Id = 12,
-                            Label = "TISAX"
-                        });
-                });
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeAssignedStatus", b =>
-                {
-                    b.Property<int>("CompanyCertificateTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_type_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.Property<int>("CompanyCertificateTypeStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_type_status_id");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
-                    b.HasKey("CompanyCertificateTypeId")
-                        .HasName("pk_company_certificate_type_assigned_statuses");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.HasIndex("CompanyCertificateTypeStatusId")
-                        .HasDatabaseName("ix_company_certificate_type_assigned_statuses_company_certific");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_provider_company_detail20231115");
 
-                    b.ToTable("company_certificate_type_assigned_statuses", "portal");
+                    b.ToTable("audit_provider_company_detail20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeDescription", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditUserRole20221017", b =>
                 {
-                    b.Property<int>("CompanyCertificateTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_type_id");
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<string>("LanguageShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("language_short_name");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("description");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.HasKey("CompanyCertificateTypeId", "LanguageShortName")
-                        .HasName("pk_company_certificate_type_descriptions");
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.HasIndex("LanguageShortName")
-                        .HasDatabaseName("ix_company_certificate_type_descriptions_language_short_name");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
-                    b.ToTable("company_certificate_type_descriptions", "portal");
-                });
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeStatus", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.Property<string>("Label")
+                    b.Property<string>("UserRoleText")
                         .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
-
-                    b.HasKey("Id")
-                        .HasName("pk_company_certificate_type_statuses");
+                        .HasColumnType("text")
+                        .HasColumnName("user_role");
 
-                    b.ToTable("company_certificate_type_statuses", "portal");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_user_role20221017");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "ACTIVE"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "INACTIVE"
-                        });
+                    b.ToTable("audit_user_role20221017", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentifier", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditUserRole20231115", b =>
                 {
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<int>("UniqueIdentifierId")
-                        .HasColumnType("integer")
-                        .HasColumnName("unique_identifier_id");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("value");
+                        .HasColumnName("audit_v1id");
 
-                    b.HasKey("CompanyId", "UniqueIdentifierId")
-                        .HasName("pk_company_identifiers");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.HasIndex("UniqueIdentifierId")
-                        .HasDatabaseName("ix_company_identifiers_unique_identifier_id");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.ToTable("company_identifiers", "portal");
-                });
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentityProvider", b =>
-                {
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("IdentityProviderId")
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("identity_provider_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.HasKey("CompanyId", "IdentityProviderId")
-                        .HasName("pk_company_identity_providers");
+                    b.Property<Guid?>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.HasIndex("IdentityProviderId")
-                        .HasDatabaseName("ix_company_identity_providers_identity_provider_id");
+                    b.Property<string>("UserRoleText")
+                        .HasColumnType("text")
+                        .HasColumnName("user_role");
 
-                    b.ToTable("company_identity_providers", "portal");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_user_role20231115");
+
+                    b.ToTable("audit_user_role20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyInvitation", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid>("ApplicationId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("application_id");
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("city");
 
-                    b.Property<string>("ClientId")
-                        .HasColumnType("text")
-                        .HasColumnName("client_id");
+                    b.Property<string>("CountryAlpha2Code")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("country_alpha2code")
+                        .HasAnnotation("Relational:JsonPropertyName", "country_alpha2code");
 
-                    b.Property<byte[]>("ClientSecret")
-                        .HasColumnType("bytea")
-                        .HasColumnName("client_secret");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("email");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.Property<int?>("EncryptionMode")
-                        .HasColumnType("integer")
-                        .HasColumnName("encryption_mode");
+                    b.Property<string>("Region")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("region");
 
-                    b.Property<string>("FirstName")
+                    b.Property<string>("Streetadditional")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("streetadditional");
+
+                    b.Property<string>("Streetname")
                         .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("first_name");
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("streetname");
 
-                    b.Property<string>("IdpName")
-                        .HasColumnType("text")
-                        .HasColumnName("idp_name");
+                    b.Property<string>("Streetnumber")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("streetnumber");
 
-                    b.Property<byte[]>("InitializationVector")
-                        .HasColumnType("bytea")
-                        .HasColumnName("initialization_vector");
+                    b.Property<string>("Zipcode")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("zipcode");
 
-                    b.Property<string>("LastName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("last_name");
+                    b.HasKey("Id")
+                        .HasName("pk_addresses");
 
-                    b.Property<Guid>("ProcessId")
+                    b.HasIndex("CountryAlpha2Code")
+                        .HasDatabaseName("ix_addresses_country_alpha2code");
+
+                    b.ToTable("addresses", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("process_id");
+                        .HasColumnName("id");
 
-                    b.Property<string>("ServiceAccountUserId")
-                        .HasColumnType("text")
-                        .HasColumnName("service_account_user_id");
+                    b.Property<int>("AgreementCategoryId")
+                        .HasColumnType("integer")
+                        .HasColumnName("agreement_category_id");
 
-                    b.Property<string>("UserName")
+                    b.Property<string>("AgreementLink")
                         .HasColumnType("text")
-                        .HasColumnName("user_name");
+                        .HasColumnName("agreement_link");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_invitations");
+                    b.Property<int>("AgreementStatusId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(1)
+                        .HasColumnName("agreement_status_id");
 
-                    b.HasIndex("ApplicationId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_company_invitations_application_id");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.HasIndex("ProcessId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_company_invitations_process_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.ToTable("company_invitations", "portal");
-                });
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<Guid>("IssuerCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("issuer_company_id");
 
-                    b.Property<string>("Label")
+                    b.Property<bool>("Mandatory")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(true)
+                        .HasColumnName("mandatory");
+
+                    b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                        .HasColumnName("name");
+
+                    b.Property<Guid?>("UseCaseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("use_case_id");
 
                     b.HasKey("Id")
-                        .HasName("pk_company_roles");
+                        .HasName("pk_agreements");
 
-                    b.ToTable("company_roles", "portal");
+                    b.HasIndex("AgreementCategoryId")
+                        .HasDatabaseName("ix_agreements_agreement_category_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "ACTIVE_PARTICIPANT"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "APP_PROVIDER"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "SERVICE_PROVIDER"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "OPERATOR"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "ONBOARDING_SERVICE_PROVIDER"
-                        });
+                    b.HasIndex("AgreementStatusId")
+                        .HasDatabaseName("ix_agreements_agreement_status_id");
+
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_agreements_document_id");
+
+                    b.HasIndex("IssuerCompanyId")
+                        .HasDatabaseName("ix_agreements_issuer_company_id");
+
+                    b.HasIndex("UseCaseId")
+                        .HasDatabaseName("ix_agreements_use_case_id");
+
+                    b.ToTable("agreements", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleAssignedRoleCollection", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedCompanyRole", b =>
                 {
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
                     b.Property<int>("CompanyRoleId")
                         .HasColumnType("integer")
                         .HasColumnName("company_role_id");
 
-                    b.Property<Guid>("UserRoleCollectionId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_role_collection_id");
-
-                    b.HasKey("CompanyRoleId")
-                        .HasName("pk_company_role_assigned_role_collections");
+                    b.HasKey("AgreementId", "CompanyRoleId")
+                        .HasName("pk_agreement_assigned_company_roles");
 
-                    b.HasIndex("UserRoleCollectionId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_company_role_assigned_role_collections_user_role_collection");
+                    b.HasIndex("CompanyRoleId")
+                        .HasDatabaseName("ix_agreement_assigned_company_roles_company_role_id");
 
-                    b.ToTable("company_role_assigned_role_collections", "portal");
+                    b.ToTable("agreement_assigned_company_roles", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleDescription", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOffer", b =>
                 {
-                    b.Property<int>("CompanyRoleId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_role_id");
-
-                    b.Property<string>("LanguageShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("language_short_name");
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
 
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("description");
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.HasKey("CompanyRoleId", "LanguageShortName")
-                        .HasName("pk_company_role_descriptions");
+                    b.HasKey("AgreementId", "OfferId")
+                        .HasName("pk_agreement_assigned_offers");
 
-                    b.HasIndex("LanguageShortName")
-                        .HasDatabaseName("ix_company_role_descriptions_language_short_name");
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_agreement_assigned_offers_offer_id");
 
-                    b.ToTable("company_role_descriptions", "portal");
+                    b.ToTable("agreement_assigned_offers", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleRegistrationData", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOfferType", b =>
                 {
-                    b.Property<int>("CompanyRoleId")
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<int>("OfferTypeId")
                         .HasColumnType("integer")
-                        .HasColumnName("company_role_id");
+                        .HasColumnName("offer_type_id");
 
-                    b.Property<bool>("IsRegistrationRole")
-                        .HasColumnType("boolean")
-                        .HasColumnName("is_registration_role");
+                    b.HasKey("AgreementId", "OfferTypeId")
+                        .HasName("pk_agreement_assigned_offer_types");
 
-                    b.HasKey("CompanyRoleId")
-                        .HasName("pk_company_role_registration_data");
+                    b.HasIndex("OfferTypeId")
+                        .HasDatabaseName("ix_agreement_assigned_offer_types_offer_type_id");
 
-                    b.ToTable("company_role_registration_data", "portal");
+                    b.ToTable("agreement_assigned_offer_types", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementCategory", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4136,361 +3410,370 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_company_statuses");
+                        .HasName("pk_agreement_categories");
 
-                    b.ToTable("company_statuses", "portal");
+                    b.ToTable("agreement_categories", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "PENDING"
+                            Label = "CX_FRAME_CONTRACT"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "ACTIVE"
+                            Label = "APP_CONTRACT"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "REJECTED"
+                            Label = "DATA_CONTRACT"
                         },
                         new
                         {
                             Id = 4,
-                            Label = "INACTIVE"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "DELETED"
+                            Label = "SERVICE_CONTRACT"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementStatus", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
                         .HasColumnName("id");
 
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("email");
-
-                    b.Property<string>("Firstname")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("firstname");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<byte[]>("Lastlogin")
-                        .HasColumnType("bytea")
-                        .HasColumnName("lastlogin");
-
-                    b.Property<string>("Lastname")
+                    b.Property<string>("Label")
+                        .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("lastname");
+                        .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_company_users");
+                        .HasName("pk_agreement_statuses");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_company_users_last_editor_id");
+                    b.ToTable("agreement_statuses", "portal");
 
-                    b.ToTable("company_users", "portal", t =>
+                    b.HasData(
+                        new
                         {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYUSER");
-
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYUSER");
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTIVE"
                         });
-
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYUSER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYUSER\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYUSER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_user20230523\" (\"id\", \"email\", \"firstname\", \"lastlogin\", \"lastname\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"email\", \r\n  NEW.\"firstname\", \r\n  NEW.\"lastlogin\", \r\n  NEW.\"lastname\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYUSER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYUSER AFTER INSERT\r\nON \"portal\".\"company_users\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYUSER\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYUSER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYUSER\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYUSER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_user20230523\" (\"id\", \"email\", \"firstname\", \"lastlogin\", \"lastname\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"email\", \r\n  NEW.\"firstname\", \r\n  NEW.\"lastlogin\", \r\n  NEW.\"lastname\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYUSER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYUSER AFTER UPDATE\r\nON \"portal\".\"company_users\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYUSER\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedAppFavourite", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppAssignedUseCase", b =>
                 {
-                    b.Property<Guid>("CompanyUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
-
                     b.Property<Guid>("AppId")
                         .HasColumnType("uuid")
                         .HasColumnName("app_id");
 
-                    b.HasKey("CompanyUserId", "AppId")
-                        .HasName("pk_company_user_assigned_app_favourites");
-
-                    b.HasIndex("AppId")
-                        .HasDatabaseName("ix_company_user_assigned_app_favourites_app_id");
-
-                    b.ToTable("company_user_assigned_app_favourites", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedBusinessPartner", b =>
-                {
-                    b.Property<Guid>("CompanyUserId")
+                    b.Property<Guid>("UseCaseId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("use_case_id");
 
-                    b.Property<string>("BusinessPartnerNumber")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasColumnName("business_partner_number");
+                    b.HasKey("AppId", "UseCaseId")
+                        .HasName("pk_app_assigned_use_cases");
 
-                    b.HasKey("CompanyUserId", "BusinessPartnerNumber")
-                        .HasName("pk_company_user_assigned_business_partners");
+                    b.HasIndex("UseCaseId")
+                        .HasDatabaseName("ix_app_assigned_use_cases_use_case_id");
 
-                    b.ToTable("company_user_assigned_business_partners", "portal");
+                    b.ToTable("app_assigned_use_cases", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedIdentityProvider", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstance", b =>
                 {
-                    b.Property<Guid>("CompanyUserId")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("IdentityProviderId")
+                    b.Property<Guid>("AppId")
                         .HasColumnType("uuid")
-                        .HasColumnName("identity_provider_id");
+                        .HasColumnName("app_id");
 
-                    b.Property<string>("ProviderId")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("provider_id");
+                    b.Property<Guid>("IamClientId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("iam_client_id");
 
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("user_name");
+                    b.HasKey("Id")
+                        .HasName("pk_app_instances");
 
-                    b.HasKey("CompanyUserId", "IdentityProviderId")
-                        .HasName("pk_company_user_assigned_identity_providers");
+                    b.HasIndex("AppId")
+                        .HasDatabaseName("ix_app_instances_app_id");
 
-                    b.HasIndex("IdentityProviderId")
-                        .HasDatabaseName("ix_company_user_assigned_identity_providers_identity_provider_");
+                    b.HasIndex("IamClientId")
+                        .HasDatabaseName("ix_app_instances_iam_client_id");
 
-                    b.ToTable("company_user_assigned_identity_providers", "portal");
+                    b.ToTable("app_instances", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedProcess", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceAssignedTechnicalUser", b =>
                 {
-                    b.Property<Guid>("CompanyUserId")
+                    b.Property<Guid>("AppInstanceId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("app_instance_id");
 
-                    b.Property<Guid>("ProcessId")
+                    b.Property<Guid>("TechnicalUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.HasKey("CompanyUserId", "ProcessId")
-                        .HasName("pk_company_user_assigned_processes");
+                        .HasColumnName("technical_user_id");
 
-                    b.HasIndex("CompanyUserId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_company_user_assigned_processes_company_user_id");
+                    b.HasKey("AppInstanceId", "TechnicalUserId")
+                        .HasName("pk_app_instance_assigned_technical_users");
 
-                    b.HasIndex("ProcessId")
-                        .HasDatabaseName("ix_company_user_assigned_processes_process_id");
+                    b.HasIndex("TechnicalUserId")
+                        .HasDatabaseName("ix_app_instance_assigned_technical_users_technical_user_id");
 
-                    b.ToTable("company_user_assigned_processes", "portal");
+                    b.ToTable("app_instance_assigned_technical_users", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyWalletData", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceSetup", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<string>("AuthenticationServiceUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("authentication_service_url");
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
 
-                    b.Property<string>("ClientId")
-                        .IsRequired()
+                    b.Property<string>("InstanceUrl")
                         .HasColumnType("text")
-                        .HasColumnName("client_id");
-
-                    b.Property<byte[]>("ClientSecret")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("client_secret");
+                        .HasColumnName("instance_url");
 
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                    b.Property<bool>("IsSingleInstance")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_single_instance");
 
-                    b.Property<string>("Did")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("did");
+                    b.HasKey("Id")
+                        .HasName("pk_app_instance_setups");
 
-                    b.Property<JsonDocument>("DidDocument")
-                        .IsRequired()
-                        .HasColumnType("jsonb")
-                        .HasColumnName("did_document");
+                    b.HasIndex("AppId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_app_instance_setups_app_id");
 
-                    b.Property<int>("EncryptionMode")
-                        .HasColumnType("integer")
-                        .HasColumnName("encryption_mode");
+                    b.ToTable("app_instance_setups", "portal");
+                });
 
-                    b.Property<byte[]>("InitializationVector")
-                        .HasColumnType("bytea")
-                        .HasColumnName("initialization_vector");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppLanguage", b =>
+                {
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_wallet_datas");
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
 
-                    b.HasIndex("CompanyId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_company_wallet_datas_company_id");
+                    b.HasKey("AppId", "LanguageShortName")
+                        .HasName("pk_app_languages");
 
-                    b.ToTable("company_wallet_datas", "portal");
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_app_languages_language_short_name");
+
+                    b.ToTable("app_languages", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppSubscriptionDetail", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<string>("ConnectorUrl")
-                        .IsRequired()
+                    b.Property<Guid?>("AppInstanceId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_instance_id");
+
+                    b.Property<string>("AppSubscriptionUrl")
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("connector_url");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
+                        .HasColumnName("app_subscription_url");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("LocationId")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("location_id");
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
 
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
+                    b.HasKey("Id")
+                        .HasName("pk_app_subscription_details");
 
-                    b.Property<Guid>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
+                    b.HasIndex("AppInstanceId")
+                        .HasDatabaseName("ix_app_subscription_details_app_instance_id");
 
-                    b.Property<Guid?>("SdCreationProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sd_creation_process_id");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_app_subscription_details_last_editor_id");
 
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
+                    b.HasIndex("OfferSubscriptionId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_app_subscription_details_offer_subscription_id");
 
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
+                    b.ToTable("app_subscription_details", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL");
 
-                    b.Property<int>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL");
+                        });
 
-                    b.Property<Guid?>("TechnicalUserId")
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_app_subscription_detail20231115\" (\"id\", \"offer_subscription_id\", \"app_instance_id\", \"app_subscription_url\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"offer_subscription_id\", \r\n  NEW.\"app_instance_id\", \r\n  NEW.\"app_subscription_url\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL AFTER INSERT\r\nON \"portal\".\"app_subscription_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_app_subscription_detail20231115\" (\"id\", \"offer_subscription_id\", \"app_instance_id\", \"app_subscription_url\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"offer_subscription_id\", \r\n  NEW.\"app_instance_id\", \r\n  NEW.\"app_subscription_url\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL AFTER UPDATE\r\nON \"portal\".\"app_subscription_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntry", b =>
+                {
+                    b.Property<Guid>("ApplicationId")
                         .HasColumnType("uuid")
-                        .HasColumnName("technical_user_id");
+                        .HasColumnName("application_id");
 
-                    b.Property<int>("TypeId")
+                    b.Property<int>("ApplicationChecklistEntryTypeId")
                         .HasColumnType("integer")
-                        .HasColumnName("type_id");
+                        .HasColumnName("application_checklist_entry_type_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_connectors");
+                    b.Property<int>("ApplicationChecklistEntryStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_checklist_entry_status_id");
 
-                    b.HasIndex("HostId")
-                        .HasDatabaseName("ix_connectors_host_id");
+                    b.Property<string>("Comment")
+                        .HasColumnType("text")
+                        .HasColumnName("comment");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_connectors_last_editor_id");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.HasIndex("LocationId")
-                        .HasDatabaseName("ix_connectors_location_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.HasIndex("ProviderId")
-                        .HasDatabaseName("ix_connectors_provider_id");
+                    b.HasKey("ApplicationId", "ApplicationChecklistEntryTypeId")
+                        .HasName("pk_application_checklist");
 
-                    b.HasIndex("SdCreationProcessId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_connectors_sd_creation_process_id");
+                    b.HasIndex("ApplicationChecklistEntryStatusId")
+                        .HasDatabaseName("ix_application_checklist_application_checklist_entry_status_id");
 
-                    b.HasIndex("SelfDescriptionDocumentId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_connectors_self_description_document_id");
+                    b.HasIndex("ApplicationChecklistEntryTypeId")
+                        .HasDatabaseName("ix_application_checklist_application_checklist_entry_type_id");
 
-                    b.HasIndex("StatusId")
-                        .HasDatabaseName("ix_connectors_status_id");
+                    b.ToTable("application_checklist", "portal");
+                });
 
-                    b.HasIndex("TechnicalUserId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_connectors_technical_user_id");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
 
-                    b.HasIndex("TypeId")
-                        .HasDatabaseName("ix_connectors_type_id");
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
 
-                    b.ToTable("connectors", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_CONNECTOR");
+                    b.HasKey("Id")
+                        .HasName("pk_application_checklist_statuses");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_CONNECTOR");
-                        });
+                    b.ToTable("application_checklist_statuses", "portal");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_CONNECTOR", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONNECTOR\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_CONNECTOR$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_connector20241008\" (\"id\", \"name\", \"connector_url\", \"type_id\", \"status_id\", \"provider_id\", \"host_id\", \"self_description_document_id\", \"location_id\", \"self_description_message\", \"date_last_changed\", \"technical_user_id\", \"sd_creation_process_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"connector_url\", \r\n  NEW.\"type_id\", \r\n  NEW.\"status_id\", \r\n  NEW.\"provider_id\", \r\n  NEW.\"host_id\", \r\n  NEW.\"self_description_document_id\", \r\n  NEW.\"location_id\", \r\n  NEW.\"self_description_message\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"technical_user_id\", \r\n  NEW.\"sd_creation_process_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_CONNECTOR$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_CONNECTOR AFTER INSERT\r\nON \"portal\".\"connectors\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONNECTOR\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_CONNECTOR", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONNECTOR\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_CONNECTOR$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_connector20241008\" (\"id\", \"name\", \"connector_url\", \"type_id\", \"status_id\", \"provider_id\", \"host_id\", \"self_description_document_id\", \"location_id\", \"self_description_message\", \"date_last_changed\", \"technical_user_id\", \"sd_creation_process_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"connector_url\", \r\n  NEW.\"type_id\", \r\n  NEW.\"status_id\", \r\n  NEW.\"provider_id\", \r\n  NEW.\"host_id\", \r\n  NEW.\"self_description_document_id\", \r\n  NEW.\"location_id\", \r\n  NEW.\"self_description_message\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"technical_user_id\", \r\n  NEW.\"sd_creation_process_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_CONNECTOR$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_CONNECTOR AFTER UPDATE\r\nON \"portal\".\"connectors\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONNECTOR\"();");
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "TO_DO"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "IN_PROGRESS"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "DONE"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "FAILED"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "SKIPPED"
+                        });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorAssignedOfferSubscription", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryType", b =>
                 {
-                    b.Property<Guid>("ConnectorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("connector_id");
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("OfferSubscriptionId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
 
-                    b.HasKey("ConnectorId", "OfferSubscriptionId")
-                        .HasName("pk_connector_assigned_offer_subscriptions");
+                    b.HasKey("Id")
+                        .HasName("pk_application_checklist_types");
 
-                    b.HasIndex("OfferSubscriptionId")
-                        .HasDatabaseName("ix_connector_assigned_offer_subscriptions_offer_subscription_id");
+                    b.ToTable("application_checklist_types", "portal");
 
-                    b.ToTable("connector_assigned_offer_subscriptions", "portal");
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "REGISTRATION_VERIFICATION"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "BUSINESS_PARTNER_NUMBER"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "IDENTITY_WALLET"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "BPNL_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "MEMBERSHIP_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "SELF_DESCRIPTION_LP"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "APPLICATION_ACTIVATION"
+                        });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AuditOperation", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4503,29 +3786,29 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_connector_statuses");
+                        .HasName("pk_audit_operation");
 
-                    b.ToTable("connector_statuses", "portal");
+                    b.ToTable("audit_operation", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "PENDING"
+                            Label = "INSERT"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "ACTIVE"
+                            Label = "UPDATE"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "INACTIVE"
+                            Label = "DELETE"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.BpdmIdentifier", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4538,140 +3821,253 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_connector_types");
+                        .HasName("pk_bpdm_identifiers");
 
-                    b.ToTable("connector_types", "portal");
+                    b.ToTable("bpdm_identifiers", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "COMPANY_CONNECTOR"
+                            Label = "EU_VAT_ID_DE"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "CONNECTOR_AS_A_SERVICE"
+                            Label = "CH_UID"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "EU_VAT_ID_FR"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "FR_SIREN"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "EU_VAT_ID_AT"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "DE_BNUM"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "CZ_ICO"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "EU_VAT_ID_CZ"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "EU_VAT_ID_PL"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "EU_VAT_ID_BE"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "EU_VAT_ID_CH"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "EU_VAT_ID_DK"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            Label = "EU_VAT_ID_ES"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            Label = "EU_VAT_ID_GB"
+                        },
+                        new
+                        {
+                            Id = 15,
+                            Label = "EU_VAT_ID_NO"
+                        },
+                        new
+                        {
+                            Id = 16,
+                            Label = "BE_ENT_NO"
+                        },
+                        new
+                        {
+                            Id = 17,
+                            Label = "CVR_DK"
+                        },
+                        new
+                        {
+                            Id = 18,
+                            Label = "ID_CRN"
+                        },
+                        new
+                        {
+                            Id = 19,
+                            Label = "NO_ORGID"
+                        },
+                        new
+                        {
+                            Id = 20,
+                            Label = "LEI_ID"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Consent", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid>("AgreementId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
-
-                    b.Property<string>("Comment")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("comment");
-
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid?>("AddressId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("address_id");
 
-                    b.Property<Guid>("CompanyUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                    b.Property<string>("BusinessPartnerNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("business_partner_number");
 
-                    b.Property<int>("ConsentStatusId")
+                    b.Property<int>("CompanyStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("consent_status_id");
+                        .HasColumnName("company_status_id");
 
                     b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<Guid?>("DocumentId")
+                    b.Property<string>("DidDocumentLocation")
+                        .HasColumnType("text")
+                        .HasColumnName("did_document_location");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<Guid?>("SdCreationProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("document_id");
+                        .HasColumnName("sd_creation_process_id");
 
-                    b.Property<Guid?>("LastEditorId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<string>("Target")
+                    b.Property<string>("Shortname")
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("target");
+                        .HasColumnName("shortname");
 
                     b.HasKey("Id")
-                        .HasName("pk_consents");
-
-                    b.HasIndex("AgreementId")
-                        .HasDatabaseName("ix_consents_agreement_id");
-
-                    b.HasIndex("CompanyId")
-                        .HasDatabaseName("ix_consents_company_id");
-
-                    b.HasIndex("CompanyUserId")
-                        .HasDatabaseName("ix_consents_company_user_id");
-
-                    b.HasIndex("ConsentStatusId")
-                        .HasDatabaseName("ix_consents_consent_status_id");
+                        .HasName("pk_companies");
 
-                    b.HasIndex("DocumentId")
-                        .HasDatabaseName("ix_consents_document_id");
+                    b.HasIndex("AddressId")
+                        .HasDatabaseName("ix_companies_address_id");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_consents_last_editor_id");
+                    b.HasIndex("CompanyStatusId")
+                        .HasDatabaseName("ix_companies_company_status_id");
 
-                    b.ToTable("consents", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_CONSENT");
+                    b.HasIndex("SdCreationProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_companies_sd_creation_process_id");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_CONSENT");
-                        });
+                    b.HasIndex("SelfDescriptionDocumentId")
+                        .HasDatabaseName("ix_companies_self_description_document_id");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_CONSENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONSENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_CONSENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_consent20231115\" (\"id\", \"date_created\", \"comment\", \"consent_status_id\", \"target\", \"agreement_id\", \"company_id\", \"document_id\", \"company_user_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"comment\", \r\n  NEW.\"consent_status_id\", \r\n  NEW.\"target\", \r\n  NEW.\"agreement_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_CONSENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_CONSENT AFTER INSERT\r\nON \"portal\".\"consents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONSENT\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_CONSENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONSENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_CONSENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_consent20231115\" (\"id\", \"date_created\", \"comment\", \"consent_status_id\", \"target\", \"agreement_id\", \"company_id\", \"document_id\", \"company_user_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"comment\", \r\n  NEW.\"consent_status_id\", \r\n  NEW.\"target\", \r\n  NEW.\"agreement_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_CONSENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_CONSENT AFTER UPDATE\r\nON \"portal\".\"consents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONSENT\"();");
+                    b.ToTable("companies", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOffer", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", b =>
                 {
-                    b.Property<Guid>("ConsentId")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("consent_id");
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("OfferId")
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
+                    b.Property<Guid?>("ChecklistProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                        .HasColumnName("checklist_process_id");
 
-                    b.HasKey("ConsentId", "OfferId")
-                        .HasName("pk_consent_assigned_offers");
+                    b.Property<int>("CompanyApplicationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_application_type_id");
 
-                    b.HasIndex("OfferId")
-                        .HasDatabaseName("ix_consent_assigned_offers_offer_id");
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                    b.ToTable("consent_assigned_offers", "portal");
-                });
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOfferSubscription", b =>
-                {
-                    b.Property<Guid>("ConsentId")
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("consent_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferSubscriptionId")
+                    b.Property<Guid?>("OnboardingServiceProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
+                        .HasColumnName("onboarding_service_provider_id");
 
-                    b.HasKey("ConsentId", "OfferSubscriptionId")
-                        .HasName("pk_consent_assigned_offer_subscriptions");
+                    b.HasKey("Id")
+                        .HasName("pk_company_applications");
+
+                    b.HasIndex("ApplicationStatusId")
+                        .HasDatabaseName("ix_company_applications_application_status_id");
+
+                    b.HasIndex("ChecklistProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_applications_checklist_process_id");
+
+                    b.HasIndex("CompanyApplicationTypeId")
+                        .HasDatabaseName("ix_company_applications_company_application_type_id");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_company_applications_company_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_company_applications_last_editor_id");
+
+                    b.HasIndex("OnboardingServiceProviderId")
+                        .HasDatabaseName("ix_company_applications_onboarding_service_provider_id");
+
+                    b.ToTable("company_applications", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION");
 
-                    b.HasIndex("OfferSubscriptionId")
-                        .HasDatabaseName("ix_consent_assigned_offer_subscriptions_offer_subscription_id");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION");
+                        });
 
-                    b.ToTable("consent_assigned_offer_subscriptions", "portal");
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_application20231115\" (\"id\", \"date_created\", \"date_last_changed\", \"application_status_id\", \"company_id\", \"checklist_process_id\", \"company_application_type_id\", \"onboarding_service_provider_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"application_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"checklist_process_id\", \r\n  NEW.\"company_application_type_id\", \r\n  NEW.\"onboarding_service_provider_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION AFTER INSERT\r\nON \"portal\".\"company_applications\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_application20231115\" (\"id\", \"date_created\", \"date_last_changed\", \"application_status_id\", \"company_id\", \"checklist_process_id\", \"company_application_type_id\", \"onboarding_service_provider_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"application_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"checklist_process_id\", \r\n  NEW.\"company_application_type_id\", \r\n  NEW.\"onboarding_service_provider_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION AFTER UPDATE\r\nON \"portal\".\"company_applications\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationStatus", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4684,183 +4080,246 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_consent_statuses");
+                        .HasName("pk_company_application_statuses");
 
-                    b.ToTable("consent_statuses", "portal");
+                    b.ToTable("company_application_statuses", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "ACTIVE"
+                            Label = "CREATED"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "INACTIVE"
+                            Label = "ADD_COMPANY_DATA"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "INVITE_USER"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "SELECT_COMPANY_ROLE"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "UPLOAD_DOCUMENTS"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "VERIFY"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "SUBMITTED"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "CONFIRMED"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "DECLINED"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "CANCELLED_BY_CUSTOMER"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Country", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationType", b =>
                 {
-                    b.Property<string>("Alpha2Code")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("alpha2code")
-                        .IsFixedLength()
-                        .HasAnnotation("Relational:JsonPropertyName", "alpha2code");
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
 
-                    b.Property<string>("Alpha3Code")
-                        .HasMaxLength(3)
-                        .HasColumnType("character(3)")
-                        .HasColumnName("alpha3code")
-                        .IsFixedLength()
-                        .HasAnnotation("Relational:JsonPropertyName", "alpha3code");
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
 
-                    b.HasKey("Alpha2Code")
-                        .HasName("pk_countries");
+                    b.HasKey("Id")
+                        .HasName("pk_company_application_types");
 
-                    b.ToTable("countries", "portal");
+                    b.ToTable("company_application_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "INTERNAL"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "EXTERNAL"
+                        });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryAssignedIdentifier", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedRole", b =>
                 {
-                    b.Property<string>("CountryAlpha2Code")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("country_alpha2code")
-                        .HasAnnotation("Relational:JsonPropertyName", "country_alpha2code");
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                    b.Property<int>("UniqueIdentifierId")
+                    b.Property<int>("CompanyRoleId")
                         .HasColumnType("integer")
-                        .HasColumnName("unique_identifier_id");
+                        .HasColumnName("company_role_id");
 
-                    b.Property<int?>("BpdmIdentifierId")
-                        .HasColumnType("integer")
-                        .HasColumnName("bpdm_identifier_id");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.HasKey("CountryAlpha2Code", "UniqueIdentifierId")
-                        .HasName("pk_country_assigned_identifiers");
+                    b.HasKey("CompanyId", "CompanyRoleId")
+                        .HasName("pk_company_assigned_roles");
 
-                    b.HasIndex("BpdmIdentifierId")
-                        .HasDatabaseName("ix_country_assigned_identifiers_bpdm_identifier_id");
+                    b.HasIndex("CompanyRoleId")
+                        .HasDatabaseName("ix_company_assigned_roles_company_role_id");
 
-                    b.HasIndex("UniqueIdentifierId")
-                        .HasDatabaseName("ix_country_assigned_identifiers_unique_identifier_id");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_company_assigned_roles_last_editor_id");
 
-                    b.ToTable("country_assigned_identifiers", "portal");
+                    b.ToTable("company_assigned_roles", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_assigned_role2023316\" (\"company_id\", \"company_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"company_id\", \r\n  NEW.\"company_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE AFTER INSERT\r\nON \"portal\".\"company_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_assigned_role2023316\" (\"company_id\", \"company_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"company_id\", \r\n  NEW.\"company_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE AFTER UPDATE\r\nON \"portal\".\"company_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryLongName", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedUseCase", b =>
                 {
-                    b.Property<string>("Alpha2Code")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("alpha2code")
-                        .HasAnnotation("Relational:JsonPropertyName", "alpha2code");
-
-                    b.Property<string>("ShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("short_name");
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                    b.Property<string>("LongName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("long_name");
+                    b.Property<Guid>("UseCaseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("use_case_id");
 
-                    b.HasKey("Alpha2Code", "ShortName")
-                        .HasName("pk_country_long_names");
+                    b.HasKey("CompanyId", "UseCaseId")
+                        .HasName("pk_company_assigned_use_cases");
 
-                    b.HasIndex("ShortName")
-                        .HasDatabaseName("ix_country_long_names_short_name");
+                    b.HasIndex("UseCaseId")
+                        .HasDatabaseName("ix_company_assigned_use_cases_use_case_id");
 
-                    b.ToTable("country_long_names", "portal");
+                    b.ToTable("company_assigned_use_cases", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificate", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid?>("CompanyUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                    b.Property<int>("CompanyCertificateStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_status_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<int>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<byte[]>("DocumentContent")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_content");
-
-                    b.Property<byte[]>("DocumentHash")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_hash");
-
-                    b.Property<string>("DocumentName")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("document_name");
-
-                    b.Property<long>("DocumentSize")
-                        .HasColumnType("bigint")
-                        .HasColumnName("document_size");
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
 
-                    b.Property<int>("DocumentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_status_id");
+                    b.Property<string>("ExternalCertificateNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("external_certificate_number");
 
-                    b.Property<int>("DocumentTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_type_id");
+                    b.Property<string>("Issuer")
+                        .HasColumnType("text")
+                        .HasColumnName("issuer");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int>("MediaTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("media_type_id");
+                    b.Property<string>("TrustLevel")
+                        .HasColumnType("text")
+                        .HasColumnName("trust_level");
+
+                    b.Property<DateTimeOffset?>("ValidFrom")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_from");
+
+                    b.Property<DateTimeOffset?>("ValidTill")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_till");
+
+                    b.Property<string>("Validator")
+                        .HasColumnType("text")
+                        .HasColumnName("validator");
 
                     b.HasKey("Id")
-                        .HasName("pk_documents");
+                        .HasName("pk_company_certificates");
 
-                    b.HasIndex("CompanyUserId")
-                        .HasDatabaseName("ix_documents_company_user_id");
+                    b.HasIndex("CompanyCertificateStatusId")
+                        .HasDatabaseName("ix_company_certificates_company_certificate_status_id");
 
-                    b.HasIndex("DocumentStatusId")
-                        .HasDatabaseName("ix_documents_document_status_id");
+                    b.HasIndex("CompanyCertificateTypeId")
+                        .HasDatabaseName("ix_company_certificates_company_certificate_type_id");
 
-                    b.HasIndex("DocumentTypeId")
-                        .HasDatabaseName("ix_documents_document_type_id");
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_company_certificates_company_id");
 
-                    b.HasIndex("MediaTypeId")
-                        .HasDatabaseName("ix_documents_media_type_id");
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_company_certificates_document_id");
 
-                    b.ToTable("documents", "portal", t =>
+                    b.ToTable("company_certificates", "portal", t =>
                         {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_DOCUMENT");
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_DOCUMENT");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE");
                         });
 
                     b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_DOCUMENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_DOCUMENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_DOCUMENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_document20241120\" (\"id\", \"date_created\", \"document_hash\", \"document_content\", \"document_name\", \"media_type_id\", \"document_type_id\", \"document_status_id\", \"company_user_id\", \"date_last_changed\", \"last_editor_id\", \"document_size\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"document_hash\", \r\n  NEW.\"document_content\", \r\n  NEW.\"document_name\", \r\n  NEW.\"media_type_id\", \r\n  NEW.\"document_type_id\", \r\n  NEW.\"document_status_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"document_size\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_DOCUMENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_DOCUMENT AFTER INSERT\r\nON \"portal\".\"documents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_DOCUMENT\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_DOCUMENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_DOCUMENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_DOCUMENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_document20241120\" (\"id\", \"date_created\", \"document_hash\", \"document_content\", \"document_name\", \"media_type_id\", \"document_type_id\", \"document_status_id\", \"company_user_id\", \"date_last_changed\", \"last_editor_id\", \"document_size\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"document_hash\", \r\n  NEW.\"document_content\", \r\n  NEW.\"document_name\", \r\n  NEW.\"media_type_id\", \r\n  NEW.\"document_type_id\", \r\n  NEW.\"document_status_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"document_size\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_DOCUMENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_DOCUMENT AFTER UPDATE\r\nON \"portal\".\"documents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_DOCUMENT\"();");
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_certificate_management20240416\" (\"id\", \"valid_from\", \"valid_till\", \"company_certificate_type_id\", \"company_certificate_status_id\", \"company_id\", \"document_id\", \"external_certificate_number\", \"issuer\", \"trust_level\", \"validator\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"valid_from\", \r\n  NEW.\"valid_till\", \r\n  NEW.\"company_certificate_type_id\", \r\n  NEW.\"company_certificate_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"external_certificate_number\", \r\n  NEW.\"issuer\", \r\n  NEW.\"trust_level\", \r\n  NEW.\"validator\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE AFTER INSERT\r\nON \"portal\".\"company_certificates\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_certificate_management20240416\" (\"id\", \"valid_from\", \"valid_till\", \"company_certificate_type_id\", \"company_certificate_status_id\", \"company_id\", \"document_id\", \"external_certificate_number\", \"issuer\", \"trust_level\", \"validator\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"valid_from\", \r\n  NEW.\"valid_till\", \r\n  NEW.\"company_certificate_type_id\", \r\n  NEW.\"company_certificate_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"external_certificate_number\", \r\n  NEW.\"issuer\", \r\n  NEW.\"trust_level\", \r\n  NEW.\"validator\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE AFTER UPDATE\r\nON \"portal\".\"company_certificates\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateAssignedSite", b =>
+                {
+                    b.Property<Guid>("CompanyCertificateId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_certificate_id");
+
+                    b.Property<string>("Site")
+                        .HasColumnType("text")
+                        .HasColumnName("site");
+
+                    b.HasKey("CompanyCertificateId", "Site")
+                        .HasName("pk_company_certificate_assigned_sites");
+
+                    b.ToTable("company_certificate_assigned_sites", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateStatus", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4873,29 +4332,24 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_document_status");
+                        .HasName("pk_company_certificate_statuses");
 
-                    b.ToTable("document_status", "portal");
+                    b.ToTable("company_certificate_statuses", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "PENDING"
+                            Label = "ACTIVE"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "LOCKED"
-                        },
-                        new
-                        {
-                            Id = 3,
                             Label = "INACTIVE"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateType", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4908,360 +4362,263 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_document_types");
+                        .HasName("pk_company_certificate_types");
 
-                    b.ToTable("document_types", "portal");
+                    b.ToTable("company_certificate_types", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "CX_FRAME_CONTRACT"
+                            Label = "AEO_CTPAT_Security_Declaration"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "COMMERCIAL_REGISTER_EXTRACT"
+                            Label = "ISO_9001"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "APP_CONTRACT"
+                            Label = "IATF_16949"
                         },
                         new
                         {
                             Id = 4,
-                            Label = "CONFORMITY_APPROVAL_REGISTRATION"
+                            Label = "ISO_14001_EMAS_or_national_certification"
                         },
                         new
                         {
                             Id = 5,
-                            Label = "ADDITIONAL_DETAILS"
+                            Label = "ISO_45001_OHSAS_18001_or_national_certification"
                         },
                         new
                         {
                             Id = 6,
-                            Label = "APP_LEADIMAGE"
+                            Label = "ISO_IEC_27001"
                         },
                         new
                         {
                             Id = 7,
-                            Label = "APP_IMAGE"
+                            Label = "ISO_50001_or_national_certification"
                         },
                         new
                         {
                             Id = 8,
-                            Label = "SELF_DESCRIPTION"
+                            Label = "ISO_IEC_17025"
                         },
                         new
                         {
                             Id = 9,
-                            Label = "APP_TECHNICAL_INFORMATION"
+                            Label = "ISO_15504_SPICE"
                         },
                         new
                         {
                             Id = 10,
-                            Label = "CONFORMITY_APPROVAL_CONNECTOR"
+                            Label = "B_BBEE_Certificate_of_South_Africa"
                         },
                         new
                         {
                             Id = 11,
-                            Label = "CONFORMITY_APPROVAL_BUSINESS_APPS"
+                            Label = "IATF"
                         },
                         new
                         {
                             Id = 12,
-                            Label = "CONFORMITY_APPROVAL_SERVICES"
-                        },
-                        new
-                        {
-                            Id = 13,
-                            Label = "SERVICE_LEADIMAGE"
-                        },
-                        new
-                        {
-                            Id = 14,
-                            Label = "PRESENTATION"
-                        },
-                        new
-                        {
-                            Id = 15,
-                            Label = "COMPANY_CERTIFICATE"
+                            Label = "TISAX"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUser", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeAssignedStatus", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("AuthenticationServiceUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("authentication_service_url");
-
-                    b.Property<byte[]>("ClientSecret")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("client_secret");
+                    b.Property<int>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
 
-                    b.Property<int>("EncryptionMode")
+                    b.Property<int>("CompanyCertificateTypeStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("encryption_mode");
+                        .HasColumnName("company_certificate_type_status_id");
 
-                    b.Property<byte[]>("InitializationVector")
-                        .HasColumnType("bytea")
-                        .HasColumnName("initialization_vector");
+                    b.HasKey("CompanyCertificateTypeId")
+                        .HasName("pk_company_certificate_type_assigned_statuses");
 
-                    b.HasKey("Id")
-                        .HasName("pk_external_technical_users");
+                    b.HasIndex("CompanyCertificateTypeStatusId")
+                        .HasDatabaseName("ix_company_certificate_type_assigned_statuses_company_certific");
 
-                    b.ToTable("external_technical_users", "portal");
+                    b.ToTable("company_certificate_type_assigned_statuses", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUserCreationData", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeDescription", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid>("ProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.Property<Guid>("TechnicalUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("technical_user_id");
-
-                    b.HasKey("Id")
-                        .HasName("pk_external_technical_user_creation_data");
-
-                    b.HasIndex("ProcessId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_external_technical_user_creation_data_process_id");
-
-                    b.HasIndex("TechnicalUserId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_external_technical_user_creation_data_technical_user_id");
-
-                    b.ToTable("external_technical_user_creation_data", "portal");
-                });
+                    b.Property<int>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamClient", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
 
-                    b.Property<string>("ClientClientId")
+                    b.Property<string>("Description")
                         .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("client_client_id");
-
-                    b.HasKey("Id")
-                        .HasName("pk_iam_clients");
-
-                    b.HasIndex("ClientClientId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_iam_clients_client_client_id");
-
-                    b.ToTable("iam_clients", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamIdentityProvider", b =>
-                {
-                    b.Property<string>("IamIdpAlias")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("iam_idp_alias");
-
-                    b.Property<Guid>("IdentityProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("identity_provider_id");
-
-                    b.Property<string>("MetadataUrl")
                         .HasColumnType("text")
-                        .HasColumnName("metadata_url");
+                        .HasColumnName("description");
 
-                    b.HasKey("IamIdpAlias")
-                        .HasName("pk_iam_identity_providers");
+                    b.HasKey("CompanyCertificateTypeId", "LanguageShortName")
+                        .HasName("pk_company_certificate_type_descriptions");
 
-                    b.HasIndex("IdentityProviderId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_iam_identity_providers_identity_provider_id");
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_company_certificate_type_descriptions_language_short_name");
 
-                    b.ToTable("iam_identity_providers", "portal");
+                    b.ToTable("company_certificate_type_descriptions", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeStatus", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<int>("IdentityTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("identity_type_id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("UserEntityId")
-                        .HasMaxLength(36)
-                        .HasColumnType("character varying(36)")
-                        .HasColumnName("user_entity_id");
-
-                    b.Property<int>("UserStatusId")
+                    b.Property<int>("Id")
                         .HasColumnType("integer")
-                        .HasColumnName("user_status_id")
-                        .HasAnnotation("Relational:JsonPropertyName", "user_status_id");
-
-                    b.HasKey("Id")
-                        .HasName("pk_identities");
-
-                    b.HasIndex("CompanyId")
-                        .HasDatabaseName("ix_identities_company_id");
-
-                    b.HasIndex("IdentityTypeId")
-                        .HasDatabaseName("ix_identities_identity_type_id");
+                        .HasColumnName("id");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_identities_last_editor_id");
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
 
-                    b.HasIndex("UserEntityId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_identities_user_entity_id");
+                    b.HasKey("Id")
+                        .HasName("pk_company_certificate_type_statuses");
 
-                    b.HasIndex("UserStatusId")
-                        .HasDatabaseName("ix_identities_user_status_id");
+                    b.ToTable("company_certificate_type_statuses", "portal");
 
-                    b.ToTable("identities", "portal", t =>
+                    b.HasData(
+                        new
                         {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_IDENTITY");
-
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_IDENTITY");
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTIVE"
                         });
-
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_IDENTITY", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITY\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_IDENTITY$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity20231115\" (\"id\", \"date_created\", \"company_id\", \"user_status_id\", \"user_entity_id\", \"identity_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"company_id\", \r\n  NEW.\"user_status_id\", \r\n  NEW.\"user_entity_id\", \r\n  NEW.\"identity_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_IDENTITY$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_IDENTITY AFTER INSERT\r\nON \"portal\".\"identities\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITY\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_IDENTITY", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITY\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_IDENTITY$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity20231115\" (\"id\", \"date_created\", \"company_id\", \"user_status_id\", \"user_entity_id\", \"identity_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"company_id\", \r\n  NEW.\"user_status_id\", \r\n  NEW.\"user_entity_id\", \r\n  NEW.\"identity_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_IDENTITY$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_IDENTITY AFTER UPDATE\r\nON \"portal\".\"identities\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITY\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityAssignedRole", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentifier", b =>
                 {
-                    b.Property<Guid>("IdentityId")
+                    b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
-                        .HasColumnName("identity_id");
+                        .HasColumnName("company_id");
 
-                    b.Property<Guid>("UserRoleId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_role_id");
+                    b.Property<int>("UniqueIdentifierId")
+                        .HasColumnType("integer")
+                        .HasColumnName("unique_identifier_id");
 
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("value");
 
-                    b.HasKey("IdentityId", "UserRoleId")
-                        .HasName("pk_identity_assigned_roles");
+                    b.HasKey("CompanyId", "UniqueIdentifierId")
+                        .HasName("pk_company_identifiers");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_identity_assigned_roles_last_editor_id");
+                    b.HasIndex("UniqueIdentifierId")
+                        .HasDatabaseName("ix_company_identifiers_unique_identifier_id");
 
-                    b.HasIndex("UserRoleId")
-                        .HasDatabaseName("ix_identity_assigned_roles_user_role_id");
+                    b.ToTable("company_identifiers", "portal");
+                });
 
-                    b.ToTable("identity_assigned_roles", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentityProvider", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE");
-                        });
+                    b.Property<Guid>("IdentityProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_provider_id");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity_assigned_role20230522\" (\"identity_id\", \"user_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"identity_id\", \r\n  NEW.\"user_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE AFTER INSERT\r\nON \"portal\".\"identity_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity_assigned_role20230522\" (\"identity_id\", \"user_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"identity_id\", \r\n  NEW.\"user_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE AFTER UPDATE\r\nON \"portal\".\"identity_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE\"();");
+                    b.HasKey("CompanyId", "IdentityProviderId")
+                        .HasName("pk_company_identity_providers");
+
+                    b.HasIndex("IdentityProviderId")
+                        .HasDatabaseName("ix_company_identity_providers_identity_provider_id");
+
+                    b.ToTable("company_identity_providers", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProvider", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyInvitation", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<int>("IdentityProviderCategoryId")
-                        .HasColumnType("integer")
-                        .HasColumnName("identity_provider_category_id");
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("application_id");
 
-                    b.Property<int>("IdentityProviderTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("identity_provider_type_id");
+                    b.Property<string>("ClientId")
+                        .HasColumnType("text")
+                        .HasColumnName("client_id");
 
-                    b.Property<Guid>("OwnerId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("owner_id");
+                    b.Property<byte[]>("ClientSecret")
+                        .HasColumnType("bytea")
+                        .HasColumnName("client_secret");
 
-                    b.HasKey("Id")
-                        .HasName("pk_identity_providers");
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("email");
 
-                    b.HasIndex("IdentityProviderCategoryId")
-                        .HasDatabaseName("ix_identity_providers_identity_provider_category_id");
+                    b.Property<int?>("EncryptionMode")
+                        .HasColumnType("integer")
+                        .HasColumnName("encryption_mode");
 
-                    b.HasIndex("IdentityProviderTypeId")
-                        .HasDatabaseName("ix_identity_providers_identity_provider_type_id");
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("first_name");
 
-                    b.HasIndex("OwnerId")
-                        .HasDatabaseName("ix_identity_providers_owner_id");
+                    b.Property<string>("IdpName")
+                        .HasColumnType("text")
+                        .HasColumnName("idp_name");
 
-                    b.ToTable("identity_providers", "portal");
-                });
+                    b.Property<byte[]>("InitializationVector")
+                        .HasColumnType("bytea")
+                        .HasColumnName("initialization_vector");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderAssignedProcess", b =>
-                {
-                    b.Property<Guid>("IdentityProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("identity_provider_id");
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_name");
 
                     b.Property<Guid>("ProcessId")
                         .HasColumnType("uuid")
                         .HasColumnName("process_id");
 
-                    b.HasKey("IdentityProviderId", "ProcessId")
-                        .HasName("pk_identity_provider_assigned_processes");
+                    b.Property<string>("ServiceAccountUserId")
+                        .HasColumnType("text")
+                        .HasColumnName("service_account_user_id");
 
-                    b.HasIndex("IdentityProviderId")
+                    b.Property<string>("UserName")
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_invitations");
+
+                    b.HasIndex("ApplicationId")
                         .IsUnique()
-                        .HasDatabaseName("ix_identity_provider_assigned_processes_identity_provider_id");
+                        .HasDatabaseName("ix_company_invitations_application_id");
 
                     b.HasIndex("ProcessId")
-                        .HasDatabaseName("ix_identity_provider_assigned_processes_process_id");
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_invitations_process_id");
 
-                    b.ToTable("identity_provider_assigned_processes", "portal");
+                    b.ToTable("company_invitations", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderCategory", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -5274,89 +4631,101 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_identity_provider_categories");
+                        .HasName("pk_company_roles");
 
-                    b.ToTable("identity_provider_categories", "portal");
+                    b.ToTable("company_roles", "portal");
 
                     b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "ACTIVE_PARTICIPANT"
+                        },
                         new
                         {
                             Id = 2,
-                            Label = "KEYCLOAK_OIDC"
+                            Label = "APP_PROVIDER"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "KEYCLOAK_SAML"
+                            Label = "SERVICE_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "OPERATOR"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "ONBOARDING_SERVICE_PROVIDER"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleAssignedRoleCollection", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<int>("CompanyRoleId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("company_role_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("UserRoleCollectionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_collection_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_identity_provider_types");
+                    b.HasKey("CompanyRoleId")
+                        .HasName("pk_company_role_assigned_role_collections");
 
-                    b.ToTable("identity_provider_types", "portal");
+                    b.HasIndex("UserRoleCollectionId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_role_assigned_role_collections_user_role_collection");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "OWN"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "MANAGED"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "SHARED"
-                        });
+                    b.ToTable("company_role_assigned_role_collections", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleDescription", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<int>("CompanyRoleId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("company_role_id");
 
-                    b.Property<string>("Label")
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.Property<string>("Description")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                        .HasColumnName("description");
+
+                    b.HasKey("CompanyRoleId", "LanguageShortName")
+                        .HasName("pk_company_role_descriptions");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_company_role_descriptions_language_short_name");
+
+                    b.ToTable("company_role_descriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleRegistrationData", b =>
+                {
+                    b.Property<int>("CompanyRoleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_role_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_identity_type");
+                    b.Property<bool>("IsRegistrationRole")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_registration_role");
 
-                    b.ToTable("identity_type", "portal");
+                    b.HasKey("CompanyRoleId")
+                        .HasName("pk_company_role_registration_data");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "COMPANY_USER"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "COMPANY_SERVICE_ACCOUNT"
-                        });
+                    b.ToTable("company_role_registration_data", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityUserStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyStatus", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -5369,457 +4738,362 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_identity_user_statuses");
+                        .HasName("pk_company_statuses");
 
-                    b.ToTable("identity_user_statuses", "portal");
+                    b.ToTable("company_statuses", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "ACTIVE"
+                            Label = "PENDING"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "INACTIVE"
+                            Label = "ACTIVE"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "DELETED"
+                            Label = "REJECTED"
                         },
                         new
                         {
                             Id = 4,
-                            Label = "PENDING"
+                            Label = "INACTIVE"
                         },
                         new
                         {
                             Id = 5,
-                            Label = "PENDING_DELETION"
+                            Label = "DELETED"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Invitation", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid>("CompanyApplicationId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_application_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.Property<Guid>("CompanyUserId")
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("email");
+
+                    b.Property<string>("Firstname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("firstname");
+
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<byte[]>("Lastlogin")
+                        .HasColumnType("bytea")
+                        .HasColumnName("lastlogin");
 
-                    b.Property<int>("InvitationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("invitation_status_id");
+                    b.Property<string>("Lastname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("lastname");
 
                     b.HasKey("Id")
-                        .HasName("pk_invitations");
+                        .HasName("pk_company_users");
 
-                    b.HasIndex("CompanyApplicationId")
-                        .HasDatabaseName("ix_invitations_company_application_id");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_company_users_last_editor_id");
 
-                    b.HasIndex("CompanyUserId")
-                        .HasDatabaseName("ix_invitations_company_user_id");
+                    b.ToTable("company_users", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYUSER");
 
-                    b.HasIndex("InvitationStatusId")
-                        .HasDatabaseName("ix_invitations_invitation_status_id");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYUSER");
+                        });
 
-                    b.ToTable("invitations", "portal");
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYUSER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYUSER\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYUSER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_user20230523\" (\"id\", \"email\", \"firstname\", \"lastlogin\", \"lastname\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"email\", \r\n  NEW.\"firstname\", \r\n  NEW.\"lastlogin\", \r\n  NEW.\"lastname\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYUSER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYUSER AFTER INSERT\r\nON \"portal\".\"company_users\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYUSER\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYUSER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYUSER\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYUSER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_user20230523\" (\"id\", \"email\", \"firstname\", \"lastlogin\", \"lastname\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"email\", \r\n  NEW.\"firstname\", \r\n  NEW.\"lastlogin\", \r\n  NEW.\"lastname\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYUSER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYUSER AFTER UPDATE\r\nON \"portal\".\"company_users\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYUSER\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.InvitationStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedAppFavourite", b =>
                 {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_invitation_statuses");
+                    b.HasKey("CompanyUserId", "AppId")
+                        .HasName("pk_company_user_assigned_app_favourites");
 
-                    b.ToTable("invitation_statuses", "portal");
+                    b.HasIndex("AppId")
+                        .HasDatabaseName("ix_company_user_assigned_app_favourites_app_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "CREATED"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "PENDING"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "ACCEPTED"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "DECLINED"
-                        });
+                    b.ToTable("company_user_assigned_app_favourites", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedBusinessPartner", b =>
                 {
-                    b.Property<string>("ShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("short_name")
-                        .IsFixedLength();
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
 
-                    b.HasKey("ShortName")
-                        .HasName("pk_languages");
+                    b.Property<string>("BusinessPartnerNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("business_partner_number");
 
-                    b.ToTable("languages", "portal");
+                    b.HasKey("CompanyUserId", "BusinessPartnerNumber")
+                        .HasName("pk_company_user_assigned_business_partners");
+
+                    b.ToTable("company_user_assigned_business_partners", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LanguageLongName", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedIdentityProvider", b =>
                 {
-                    b.Property<string>("ShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("short_name")
-                        .IsFixedLength();
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
 
-                    b.Property<string>("LanguageShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("language_short_name")
-                        .IsFixedLength();
+                    b.Property<Guid>("IdentityProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_provider_id");
 
-                    b.Property<string>("LongName")
+                    b.Property<string>("ProviderId")
                         .IsRequired()
                         .HasColumnType("text")
-                        .HasColumnName("long_name");
+                        .HasColumnName("provider_id");
 
-                    b.HasKey("ShortName", "LanguageShortName")
-                        .HasName("pk_language_long_names");
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
 
-                    b.HasIndex("LanguageShortName")
-                        .HasDatabaseName("ix_language_long_names_language_short_name");
+                    b.HasKey("CompanyUserId", "IdentityProviderId")
+                        .HasName("pk_company_user_assigned_identity_providers");
 
-                    b.ToTable("language_long_names", "portal");
+                    b.HasIndex("IdentityProviderId")
+                        .HasDatabaseName("ix_company_user_assigned_identity_providers_identity_provider_");
+
+                    b.ToTable("company_user_assigned_identity_providers", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LicenseType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedProcess", b =>
                 {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_license_types");
+                    b.HasKey("CompanyUserId", "ProcessId")
+                        .HasName("pk_company_user_assigned_processes");
 
-                    b.ToTable("license_types", "portal");
+                    b.HasIndex("CompanyUserId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_user_assigned_processes_company_user_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "COTS"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "FOSS"
-                        });
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_user_assigned_processes_process_id");
+
+                    b.ToTable("company_user_assigned_processes", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MailingInformation", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyWalletData", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<string>("Email")
+                    b.Property<string>("AuthenticationServiceUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("authentication_service_url");
+
+                    b.Property<string>("ClientId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("client_id");
+
+                    b.Property<byte[]>("ClientSecret")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("client_secret");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<string>("Did")
                         .IsRequired()
                         .HasColumnType("text")
-                        .HasColumnName("email");
+                        .HasColumnName("did");
+
+                    b.Property<JsonDocument>("DidDocument")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("did_document");
 
                     b.Property<int>("EncryptionMode")
                         .HasColumnType("integer")
                         .HasColumnName("encryption_mode");
 
                     b.Property<byte[]>("InitializationVector")
-                        .IsRequired()
                         .HasColumnType("bytea")
                         .HasColumnName("initialization_vector");
 
-                    b.Property<byte[]>("MailParameters")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("mail_parameters");
-
-                    b.Property<int>("MailingStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("mailing_status_id");
-
-                    b.Property<Guid>("ProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.Property<string>("Template")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("template");
-
                     b.HasKey("Id")
-                        .HasName("pk_mailing_informations");
-
-                    b.HasIndex("MailingStatusId")
-                        .HasDatabaseName("ix_mailing_informations_mailing_status_id");
+                        .HasName("pk_company_wallet_datas");
 
-                    b.HasIndex("ProcessId")
+                    b.HasIndex("CompanyId")
                         .IsUnique()
-                        .HasDatabaseName("ix_mailing_informations_process_id");
+                        .HasDatabaseName("ix_company_wallet_datas_company_id");
 
-                    b.ToTable("mailing_informations", "portal");
+                    b.ToTable("company_wallet_datas", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MailingStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", b =>
                 {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<string>("Label")
+                    b.Property<string>("ConnectorUrl")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                        .HasColumnName("connector_url");
 
-                    b.HasKey("Id")
-                        .HasName("pk_mailing_statuses");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.ToTable("mailing_statuses", "portal");
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "PENDING"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "SENT"
-                        });
-                });
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MediaType", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("location_id");
 
-                    b.Property<string>("Label")
+                    b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
-
-                    b.HasKey("Id")
-                        .HasName("pk_media_types");
-
-                    b.ToTable("media_types", "portal");
-
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "JPEG"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "GIF"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "PNG"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "SVG"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "TIFF"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "PDF"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "JSON"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "PEM"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "CA_CERT"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "PKX_CER"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Label = "OCTET"
-                        });
-                });
+                        .HasColumnName("name");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
+                    b.Property<Guid>("ProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("provider_id");
 
-                    b.Property<Guid>("ApplicationId")
+                    b.Property<Guid?>("SdCreationProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("application_id");
+                        .HasColumnName("sd_creation_process_id");
 
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<string>("ExternalId")
-                        .IsRequired()
+                    b.Property<string>("SelfDescriptionMessage")
                         .HasColumnType("text")
-                        .HasColumnName("external_id");
+                        .HasColumnName("self_description_message");
 
-                    b.Property<Guid>("OnboardingServiceProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("onboarding_service_provider_id");
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
 
-                    b.Property<Guid>("ProcessId")
+                    b.Property<Guid?>("TechnicalUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("process_id");
+                        .HasColumnName("technical_user_id");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("Id")
-                        .HasName("pk_network_registrations");
+                        .HasName("pk_connectors");
 
-                    b.HasIndex("ApplicationId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_network_registrations_application_id");
+                    b.HasIndex("HostId")
+                        .HasDatabaseName("ix_connectors_host_id");
 
-                    b.HasIndex("CompanyId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_network_registrations_company_id");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_connectors_last_editor_id");
 
-                    b.HasIndex("OnboardingServiceProviderId")
-                        .HasDatabaseName("ix_network_registrations_onboarding_service_provider_id");
+                    b.HasIndex("LocationId")
+                        .HasDatabaseName("ix_connectors_location_id");
 
-                    b.HasIndex("ProcessId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_network_registrations_process_id");
+                    b.HasIndex("ProviderId")
+                        .HasDatabaseName("ix_connectors_provider_id");
 
-                    b.HasIndex("ExternalId", "OnboardingServiceProviderId")
+                    b.HasIndex("SdCreationProcessId")
                         .IsUnique()
-                        .HasDatabaseName("ix_network_registrations_external_id_onboarding_service_provid");
-
-                    b.ToTable("network_registrations", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Notification", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Content")
-                        .HasColumnType("text")
-                        .HasColumnName("content");
+                        .HasDatabaseName("ix_connectors_sd_creation_process_id");
 
-                    b.Property<Guid?>("CreatorUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("creator_user_id");
+                    b.HasIndex("SelfDescriptionDocumentId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_connectors_self_description_document_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.HasIndex("StatusId")
+                        .HasDatabaseName("ix_connectors_status_id");
 
-                    b.Property<bool?>("Done")
-                        .HasColumnType("boolean")
-                        .HasColumnName("done");
+                    b.HasIndex("TechnicalUserId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_connectors_technical_user_id");
 
-                    b.Property<DateTimeOffset?>("DueDate")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("due_date");
+                    b.HasIndex("TypeId")
+                        .HasDatabaseName("ix_connectors_type_id");
 
-                    b.Property<bool>("IsRead")
-                        .HasColumnType("boolean")
-                        .HasColumnName("is_read");
+                    b.ToTable("connectors", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_CONNECTOR");
 
-                    b.Property<int>("NotificationTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("notification_type_id");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_CONNECTOR");
+                        });
 
-                    b.Property<Guid>("ReceiverUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("receiver_user_id");
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_CONNECTOR", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONNECTOR\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_CONNECTOR$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_connector20241008\" (\"id\", \"name\", \"connector_url\", \"type_id\", \"status_id\", \"provider_id\", \"host_id\", \"self_description_document_id\", \"location_id\", \"self_description_message\", \"date_last_changed\", \"technical_user_id\", \"sd_creation_process_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"connector_url\", \r\n  NEW.\"type_id\", \r\n  NEW.\"status_id\", \r\n  NEW.\"provider_id\", \r\n  NEW.\"host_id\", \r\n  NEW.\"self_description_document_id\", \r\n  NEW.\"location_id\", \r\n  NEW.\"self_description_message\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"technical_user_id\", \r\n  NEW.\"sd_creation_process_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_CONNECTOR$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_CONNECTOR AFTER INSERT\r\nON \"portal\".\"connectors\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONNECTOR\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_CONNECTOR", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONNECTOR\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_CONNECTOR$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_connector20241008\" (\"id\", \"name\", \"connector_url\", \"type_id\", \"status_id\", \"provider_id\", \"host_id\", \"self_description_document_id\", \"location_id\", \"self_description_message\", \"date_last_changed\", \"technical_user_id\", \"sd_creation_process_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"connector_url\", \r\n  NEW.\"type_id\", \r\n  NEW.\"status_id\", \r\n  NEW.\"provider_id\", \r\n  NEW.\"host_id\", \r\n  NEW.\"self_description_document_id\", \r\n  NEW.\"location_id\", \r\n  NEW.\"self_description_message\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"technical_user_id\", \r\n  NEW.\"sd_creation_process_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_CONNECTOR$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_CONNECTOR AFTER UPDATE\r\nON \"portal\".\"connectors\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONNECTOR\"();");
+                });
 
-                    b.HasKey("Id")
-                        .HasName("pk_notifications");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorAssignedOfferSubscription", b =>
+                {
+                    b.Property<Guid>("ConnectorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("connector_id");
 
-                    b.HasIndex("CreatorUserId")
-                        .HasDatabaseName("ix_notifications_creator_user_id");
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
 
-                    b.HasIndex("NotificationTypeId")
-                        .HasDatabaseName("ix_notifications_notification_type_id");
+                    b.HasKey("ConnectorId", "OfferSubscriptionId")
+                        .HasName("pk_connector_assigned_offer_subscriptions");
 
-                    b.HasIndex("ReceiverUserId")
-                        .HasDatabaseName("ix_notifications_receiver_user_id");
+                    b.HasIndex("OfferSubscriptionId")
+                        .HasDatabaseName("ix_connector_assigned_offer_subscriptions_offer_subscription_id");
 
-                    b.ToTable("notifications", "portal");
+                    b.ToTable("connector_assigned_offer_subscriptions", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTopic", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorStatus", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -5832,29 +5106,29 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_notification_topic");
+                        .HasName("pk_connector_statuses");
 
-                    b.ToTable("notification_topic", "portal");
+                    b.ToTable("connector_statuses", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "INFO"
+                            Label = "PENDING"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "ACTION"
+                            Label = "ACTIVE"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "OFFER"
+                            Label = "INACTIVE"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorType", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -5867,385 +5141,364 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_notification_type");
+                        .HasName("pk_connector_types");
 
-                    b.ToTable("notification_type", "portal");
+                    b.ToTable("connector_types", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "INFO"
+                            Label = "COMPANY_CONNECTOR"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "ACTION"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "WELCOME"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "WELCOME_USE_CASES"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "WELCOME_SERVICE_PROVIDER"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "WELCOME_CONNECTOR_REGISTRATION"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "WELCOME_APP_MARKETPLACE"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "APP_SUBSCRIPTION_REQUEST"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "APP_SUBSCRIPTION_ACTIVATION"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "CONNECTOR_REGISTERED"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Label = "APP_RELEASE_REQUEST"
-                        },
-                        new
-                        {
-                            Id = 12,
-                            Label = "TECHNICAL_USER_CREATION"
-                        },
-                        new
-                        {
-                            Id = 13,
-                            Label = "SERVICE_REQUEST"
-                        },
-                        new
-                        {
-                            Id = 14,
-                            Label = "SERVICE_ACTIVATION"
-                        },
-                        new
-                        {
-                            Id = 15,
-                            Label = "APP_ROLE_ADDED"
-                        },
-                        new
-                        {
-                            Id = 16,
-                            Label = "APP_RELEASE_APPROVAL"
-                        },
-                        new
-                        {
-                            Id = 17,
-                            Label = "SERVICE_RELEASE_REQUEST"
-                        },
-                        new
-                        {
-                            Id = 18,
-                            Label = "SERVICE_RELEASE_APPROVAL"
-                        },
-                        new
-                        {
-                            Id = 19,
-                            Label = "APP_RELEASE_REJECTION"
-                        },
-                        new
-                        {
-                            Id = 20,
-                            Label = "SERVICE_RELEASE_REJECTION"
-                        },
-                        new
-                        {
-                            Id = 21,
-                            Label = "ROLE_UPDATE_CORE_OFFER"
-                        },
-                        new
-                        {
-                            Id = 22,
-                            Label = "ROLE_UPDATE_APP_OFFER"
-                        },
-                        new
-                        {
-                            Id = 23,
-                            Label = "SUBSCRIPTION_URL_UPDATE"
-                        },
-                        new
-                        {
-                            Id = 24,
-                            Label = "CREDENTIAL_APPROVAL"
-                        },
-                        new
-                        {
-                            Id = 25,
-                            Label = "CREDENTIAL_REJECTED"
-                        },
-                        new
-                        {
-                            Id = 26,
-                            Label = "CREDENTIAL_EXPIRY"
-                        },
-                        new
-                        {
-                            Id = 27,
-                            Label = "APP_SUBSCRIPTION_DECLINE"
-                        },
-                        new
+                            Label = "CONNECTOR_AS_A_SERVICE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Consent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<string>("Comment")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("comment");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<int>("ConsentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("consent_status_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("Target")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("target");
+
+                    b.HasKey("Id")
+                        .HasName("pk_consents");
+
+                    b.HasIndex("AgreementId")
+                        .HasDatabaseName("ix_consents_agreement_id");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_consents_company_id");
+
+                    b.HasIndex("CompanyUserId")
+                        .HasDatabaseName("ix_consents_company_user_id");
+
+                    b.HasIndex("ConsentStatusId")
+                        .HasDatabaseName("ix_consents_consent_status_id");
+
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_consents_document_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_consents_last_editor_id");
+
+                    b.ToTable("consents", "portal", t =>
                         {
-                            Id = 28,
-                            Label = "SERVICE_SUBSCRIPTION_DECLINE"
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_CONSENT");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_CONSENT");
                         });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_CONSENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONSENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_CONSENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_consent20231115\" (\"id\", \"date_created\", \"comment\", \"consent_status_id\", \"target\", \"agreement_id\", \"company_id\", \"document_id\", \"company_user_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"comment\", \r\n  NEW.\"consent_status_id\", \r\n  NEW.\"target\", \r\n  NEW.\"agreement_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_CONSENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_CONSENT AFTER INSERT\r\nON \"portal\".\"consents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONSENT\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_CONSENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONSENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_CONSENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_consent20231115\" (\"id\", \"date_created\", \"comment\", \"consent_status_id\", \"target\", \"agreement_id\", \"company_id\", \"document_id\", \"company_user_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"comment\", \r\n  NEW.\"consent_status_id\", \r\n  NEW.\"target\", \r\n  NEW.\"agreement_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_CONSENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_CONSENT AFTER UPDATE\r\nON \"portal\".\"consents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONSENT\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTypeAssignedTopic", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOffer", b =>
                 {
-                    b.Property<int>("NotificationTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("notification_type_id");
-
-                    b.Property<int>("NotificationTopicId")
-                        .HasColumnType("integer")
-                        .HasColumnName("notification_topic_id");
+                    b.Property<Guid>("ConsentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("consent_id");
 
-                    b.HasKey("NotificationTypeId", "NotificationTopicId")
-                        .HasName("pk_notification_type_assigned_topics");
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.HasIndex("NotificationTopicId")
-                        .HasDatabaseName("ix_notification_type_assigned_topics_notification_topic_id");
+                    b.HasKey("ConsentId", "OfferId")
+                        .HasName("pk_consent_assigned_offers");
 
-                    b.HasIndex("NotificationTypeId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_notification_type_assigned_topics_notification_type_id");
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_consent_assigned_offers_offer_id");
 
-                    b.ToTable("notification_type_assigned_topics", "portal");
+                    b.ToTable("consent_assigned_offers", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOfferSubscription", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
+                    b.Property<Guid>("ConsentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("ContactEmail")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("contact_email");
-
-                    b.Property<string>("ContactNumber")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("contact_number");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                        .HasColumnName("consent_id");
 
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
 
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
+                    b.HasKey("ConsentId", "OfferSubscriptionId")
+                        .HasName("pk_consent_assigned_offer_subscriptions");
 
-                    b.Property<bool?>("DisplayTechnicalUser")
-                        .HasColumnType("boolean")
-                        .HasColumnName("display_technical_user");
+                    b.HasIndex("OfferSubscriptionId")
+                        .HasDatabaseName("ix_consent_assigned_offer_subscriptions_offer_subscription_id");
 
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
+                    b.ToTable("consent_assigned_offer_subscriptions", "portal");
+                });
 
-                    b.Property<int>("LicenseTypeId")
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentStatus", b =>
+                {
+                    b.Property<int>("Id")
                         .HasColumnType("integer")
-                        .HasColumnName("license_type_id");
-
-                    b.Property<string>("MarketingUrl")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("marketing_url");
+                        .HasColumnName("id");
 
-                    b.Property<string>("Name")
+                    b.Property<string>("Label")
+                        .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
+                        .HasColumnName("label");
 
-                    b.Property<int>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
+                    b.HasKey("Id")
+                        .HasName("pk_consent_statuses");
 
-                    b.Property<int>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
+                    b.ToTable("consent_statuses", "portal");
 
-                    b.Property<Guid>("ProviderCompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTIVE"
+                        });
+                });
 
-                    b.Property<Guid?>("SalesManagerId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Country", b =>
+                {
+                    b.Property<string>("Alpha2Code")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("alpha2code")
+                        .IsFixedLength()
+                        .HasAnnotation("Relational:JsonPropertyName", "alpha2code");
 
-                    b.HasKey("Id")
-                        .HasName("pk_offers");
+                    b.Property<string>("Alpha3Code")
+                        .HasMaxLength(3)
+                        .HasColumnType("character(3)")
+                        .HasColumnName("alpha3code")
+                        .IsFixedLength()
+                        .HasAnnotation("Relational:JsonPropertyName", "alpha3code");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_offers_last_editor_id");
+                    b.HasKey("Alpha2Code")
+                        .HasName("pk_countries");
 
-                    b.HasIndex("LicenseTypeId")
-                        .HasDatabaseName("ix_offers_license_type_id");
+                    b.ToTable("countries", "portal");
+                });
 
-                    b.HasIndex("OfferStatusId")
-                        .HasDatabaseName("ix_offers_offer_status_id");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryAssignedIdentifier", b =>
+                {
+                    b.Property<string>("CountryAlpha2Code")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("country_alpha2code")
+                        .HasAnnotation("Relational:JsonPropertyName", "country_alpha2code");
 
-                    b.HasIndex("OfferTypeId")
-                        .HasDatabaseName("ix_offers_offer_type_id");
+                    b.Property<int>("UniqueIdentifierId")
+                        .HasColumnType("integer")
+                        .HasColumnName("unique_identifier_id");
 
-                    b.HasIndex("ProviderCompanyId")
-                        .HasDatabaseName("ix_offers_provider_company_id");
+                    b.Property<int?>("BpdmIdentifierId")
+                        .HasColumnType("integer")
+                        .HasColumnName("bpdm_identifier_id");
 
-                    b.HasIndex("SalesManagerId")
-                        .HasDatabaseName("ix_offers_sales_manager_id");
+                    b.HasKey("CountryAlpha2Code", "UniqueIdentifierId")
+                        .HasName("pk_country_assigned_identifiers");
 
-                    b.ToTable("offers", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_OFFER");
+                    b.HasIndex("BpdmIdentifierId")
+                        .HasDatabaseName("ix_country_assigned_identifiers_bpdm_identifier_id");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_OFFER");
-                        });
+                    b.HasIndex("UniqueIdentifierId")
+                        .HasDatabaseName("ix_country_assigned_identifiers_unique_identifier_id");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_OFFER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFER\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_OFFER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer20241219\" (\"id\", \"name\", \"date_created\", \"date_released\", \"marketing_url\", \"contact_email\", \"contact_number\", \"display_technical_user\", \"offer_type_id\", \"sales_manager_id\", \"provider_company_id\", \"offer_status_id\", \"license_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_released\", \r\n  NEW.\"marketing_url\", \r\n  NEW.\"contact_email\", \r\n  NEW.\"contact_number\", \r\n  NEW.\"display_technical_user\", \r\n  NEW.\"offer_type_id\", \r\n  NEW.\"sales_manager_id\", \r\n  NEW.\"provider_company_id\", \r\n  NEW.\"offer_status_id\", \r\n  NEW.\"license_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_OFFER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_OFFER AFTER INSERT\r\nON \"portal\".\"offers\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFER\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_OFFER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFER\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_OFFER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer20241219\" (\"id\", \"name\", \"date_created\", \"date_released\", \"marketing_url\", \"contact_email\", \"contact_number\", \"display_technical_user\", \"offer_type_id\", \"sales_manager_id\", \"provider_company_id\", \"offer_status_id\", \"license_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_released\", \r\n  NEW.\"marketing_url\", \r\n  NEW.\"contact_email\", \r\n  NEW.\"contact_number\", \r\n  NEW.\"display_technical_user\", \r\n  NEW.\"offer_type_id\", \r\n  NEW.\"sales_manager_id\", \r\n  NEW.\"provider_company_id\", \r\n  NEW.\"offer_status_id\", \r\n  NEW.\"license_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_OFFER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_OFFER AFTER UPDATE\r\nON \"portal\".\"offers\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFER\"();");
+                    b.ToTable("country_assigned_identifiers", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedDocument", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryLongName", b =>
                 {
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                    b.Property<string>("Alpha2Code")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("alpha2code")
+                        .HasAnnotation("Relational:JsonPropertyName", "alpha2code");
 
-                    b.Property<Guid>("DocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("document_id");
+                    b.Property<string>("ShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("short_name");
 
-                    b.HasKey("OfferId", "DocumentId")
-                        .HasName("pk_offer_assigned_documents");
+                    b.Property<string>("LongName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("long_name");
 
-                    b.HasIndex("DocumentId")
-                        .HasDatabaseName("ix_offer_assigned_documents_document_id");
+                    b.HasKey("Alpha2Code", "ShortName")
+                        .HasName("pk_country_long_names");
 
-                    b.ToTable("offer_assigned_documents", "portal");
+                    b.HasIndex("ShortName")
+                        .HasDatabaseName("ix_country_long_names_short_name");
+
+                    b.ToTable("country_long_names", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedLicense", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", b =>
                 {
-                    b.Property<Guid>("OfferId")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("OfferLicenseId")
+                    b.Property<Guid?>("CompanyUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_license_id");
+                        .HasColumnName("company_user_id");
 
-                    b.HasKey("OfferId", "OfferLicenseId")
-                        .HasName("pk_offer_assigned_licenses");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.HasIndex("OfferLicenseId")
-                        .HasDatabaseName("ix_offer_assigned_licenses_offer_license_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.ToTable("offer_assigned_licenses", "portal");
-                });
+                    b.Property<byte[]>("DocumentContent")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedPrivacyPolicy", b =>
-                {
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                    b.Property<byte[]>("DocumentHash")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("document_name");
+
+                    b.Property<long>("DocumentSize")
+                        .HasColumnType("bigint")
+                        .HasColumnName("document_size");
 
-                    b.Property<int>("PrivacyPolicyId")
+                    b.Property<int>("DocumentStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("privacy_policy_id");
+                        .HasColumnName("document_status_id");
 
-                    b.HasKey("OfferId", "PrivacyPolicyId")
-                        .HasName("pk_offer_assigned_privacy_policies");
+                    b.Property<int>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
 
-                    b.HasIndex("PrivacyPolicyId")
-                        .HasDatabaseName("ix_offer_assigned_privacy_policies_privacy_policy_id");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.ToTable("offer_assigned_privacy_policies", "portal");
-                });
+                    b.Property<int>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferDescription", b =>
-                {
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                    b.HasKey("Id")
+                        .HasName("pk_documents");
 
-                    b.Property<string>("LanguageShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("language_short_name");
+                    b.HasIndex("CompanyUserId")
+                        .HasDatabaseName("ix_documents_company_user_id");
 
-                    b.Property<string>("DescriptionLong")
-                        .IsRequired()
-                        .HasMaxLength(4096)
-                        .HasColumnType("character varying(4096)")
-                        .HasColumnName("description_long");
+                    b.HasIndex("DocumentStatusId")
+                        .HasDatabaseName("ix_documents_document_status_id");
 
-                    b.Property<string>("DescriptionShort")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("description_short");
+                    b.HasIndex("DocumentTypeId")
+                        .HasDatabaseName("ix_documents_document_type_id");
 
-                    b.HasKey("OfferId", "LanguageShortName")
-                        .HasName("pk_offer_descriptions");
+                    b.HasIndex("MediaTypeId")
+                        .HasDatabaseName("ix_documents_media_type_id");
 
-                    b.HasIndex("LanguageShortName")
-                        .HasDatabaseName("ix_offer_descriptions_language_short_name");
+                    b.ToTable("documents", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_DOCUMENT");
 
-                    b.ToTable("offer_descriptions", "portal");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_DOCUMENT");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_DOCUMENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_DOCUMENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_DOCUMENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_document20241120\" (\"id\", \"date_created\", \"document_hash\", \"document_content\", \"document_name\", \"media_type_id\", \"document_type_id\", \"document_status_id\", \"company_user_id\", \"date_last_changed\", \"last_editor_id\", \"document_size\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"document_hash\", \r\n  NEW.\"document_content\", \r\n  NEW.\"document_name\", \r\n  NEW.\"media_type_id\", \r\n  NEW.\"document_type_id\", \r\n  NEW.\"document_status_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"document_size\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_DOCUMENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_DOCUMENT AFTER INSERT\r\nON \"portal\".\"documents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_DOCUMENT\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_DOCUMENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_DOCUMENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_DOCUMENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_document20241120\" (\"id\", \"date_created\", \"document_hash\", \"document_content\", \"document_name\", \"media_type_id\", \"document_type_id\", \"document_status_id\", \"company_user_id\", \"date_last_changed\", \"last_editor_id\", \"document_size\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"document_hash\", \r\n  NEW.\"document_content\", \r\n  NEW.\"document_name\", \r\n  NEW.\"media_type_id\", \r\n  NEW.\"document_type_id\", \r\n  NEW.\"document_status_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"document_size\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_DOCUMENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_DOCUMENT AFTER UPDATE\r\nON \"portal\".\"documents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_DOCUMENT\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferLicense", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentStatus", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
                         .HasColumnName("id");
 
-                    b.Property<string>("Licensetext")
+                    b.Property<string>("Label")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("licensetext");
+                        .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_offer_licenses");
+                        .HasName("pk_document_status");
 
-                    b.ToTable("offer_licenses", "portal");
+                    b.ToTable("document_status", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "PENDING"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "LOCKED"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "INACTIVE"
+                        });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentType", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -6258,34 +5511,196 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_offer_statuses");
+                        .HasName("pk_document_types");
 
-                    b.ToTable("offer_statuses", "portal");
+                    b.ToTable("document_types", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "CREATED"
+                            Label = "CX_FRAME_CONTRACT"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "IN_REVIEW"
+                            Label = "COMMERCIAL_REGISTER_EXTRACT"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "ACTIVE"
+                            Label = "APP_CONTRACT"
                         },
                         new
                         {
                             Id = 4,
-                            Label = "INACTIVE"
+                            Label = "CONFORMITY_APPROVAL_REGISTRATION"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "ADDITIONAL_DETAILS"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "APP_LEADIMAGE"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "APP_IMAGE"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "SELF_DESCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "APP_TECHNICAL_INFORMATION"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "CONFORMITY_APPROVAL_CONNECTOR"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "CONFORMITY_APPROVAL_BUSINESS_APPS"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "CONFORMITY_APPROVAL_SERVICES"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            Label = "SERVICE_LEADIMAGE"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            Label = "PRESENTATION"
+                        },
+                        new
+                        {
+                            Id = 15,
+                            Label = "COMPANY_CERTIFICATE"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("AuthenticationServiceUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("authentication_service_url");
+
+                    b.Property<byte[]>("ClientSecret")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("client_secret");
+
+                    b.Property<int>("EncryptionMode")
+                        .HasColumnType("integer")
+                        .HasColumnName("encryption_mode");
+
+                    b.Property<byte[]>("InitializationVector")
+                        .HasColumnType("bytea")
+                        .HasColumnName("initialization_vector");
+
+                    b.HasKey("Id")
+                        .HasName("pk_external_technical_users");
+
+                    b.ToTable("external_technical_users", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUserCreationData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<Guid>("TechnicalUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("technical_user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_external_technical_user_creation_data");
+
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_external_technical_user_creation_data_process_id");
+
+                    b.HasIndex("TechnicalUserId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_external_technical_user_creation_data_technical_user_id");
+
+                    b.ToTable("external_technical_user_creation_data", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamClient", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ClientClientId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("client_client_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_iam_clients");
+
+                    b.HasIndex("ClientClientId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_iam_clients_client_client_id");
+
+                    b.ToTable("iam_clients", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamIdentityProvider", b =>
+                {
+                    b.Property<string>("IamIdpAlias")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("iam_idp_alias");
+
+                    b.Property<Guid>("IdentityProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_provider_id");
+
+                    b.Property<string>("MetadataUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("metadata_url");
+
+                    b.HasKey("IamIdpAlias")
+                        .HasName("pk_iam_identity_providers");
+
+                    b.HasIndex("IdentityProviderId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_iam_identity_providers_identity_provider_id");
+
+                    b.ToTable("iam_identity_providers", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -6300,235 +5715,157 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<string>("Description")
-                        .HasMaxLength(4096)
-                        .HasColumnType("character varying(4096)")
-                        .HasColumnName("description");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.Property<string>("DisplayName")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("display_name");
+                    b.Property<int>("IdentityTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("identity_type_id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                    b.Property<string>("UserEntityId")
+                        .HasMaxLength(36)
+                        .HasColumnType("character varying(36)")
+                        .HasColumnName("user_entity_id");
 
-                    b.Property<int>("OfferSubscriptionStatusId")
-                        .ValueGeneratedOnAdd()
+                    b.Property<int>("UserStatusId")
                         .HasColumnType("integer")
-                        .HasDefaultValue(1)
-                        .HasColumnName("offer_subscription_status_id");
-
-                    b.Property<Guid?>("ProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.Property<Guid>("RequesterId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("requester_id");
+                        .HasColumnName("user_status_id")
+                        .HasAnnotation("Relational:JsonPropertyName", "user_status_id");
 
                     b.HasKey("Id")
-                        .HasName("pk_offer_subscriptions");
+                        .HasName("pk_identities");
 
                     b.HasIndex("CompanyId")
-                        .HasDatabaseName("ix_offer_subscriptions_company_id");
-
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_offer_subscriptions_last_editor_id");
+                        .HasDatabaseName("ix_identities_company_id");
 
-                    b.HasIndex("OfferId")
-                        .HasDatabaseName("ix_offer_subscriptions_offer_id");
+                    b.HasIndex("IdentityTypeId")
+                        .HasDatabaseName("ix_identities_identity_type_id");
 
-                    b.HasIndex("OfferSubscriptionStatusId")
-                        .HasDatabaseName("ix_offer_subscriptions_offer_subscription_status_id");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_identities_last_editor_id");
 
-                    b.HasIndex("ProcessId")
-                        .HasDatabaseName("ix_offer_subscriptions_process_id");
+                    b.HasIndex("UserEntityId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_identities_user_entity_id");
 
-                    b.HasIndex("RequesterId")
-                        .HasDatabaseName("ix_offer_subscriptions_requester_id");
+                    b.HasIndex("UserStatusId")
+                        .HasDatabaseName("ix_identities_user_status_id");
 
-                    b.ToTable("offer_subscriptions", "portal", t =>
+                    b.ToTable("identities", "portal", t =>
                         {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION");
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_IDENTITY");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_IDENTITY");
                         });
 
                     b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer_subscription20231115\" (\"id\", \"company_id\", \"offer_id\", \"offer_subscription_status_id\", \"display_name\", \"description\", \"requester_id\", \"last_editor_id\", \"process_id\", \"date_created\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"offer_subscription_status_id\", \r\n  NEW.\"display_name\", \r\n  NEW.\"description\", \r\n  NEW.\"requester_id\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"process_id\", \r\n  NEW.\"date_created\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION AFTER INSERT\r\nON \"portal\".\"offer_subscriptions\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer_subscription20231115\" (\"id\", \"company_id\", \"offer_id\", \"offer_subscription_status_id\", \"display_name\", \"description\", \"requester_id\", \"last_editor_id\", \"process_id\", \"date_created\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"offer_subscription_status_id\", \r\n  NEW.\"display_name\", \r\n  NEW.\"description\", \r\n  NEW.\"requester_id\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"process_id\", \r\n  NEW.\"date_created\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION AFTER UPDATE\r\nON \"portal\".\"offer_subscriptions\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION\"();");
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_IDENTITY", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITY\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_IDENTITY$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity20231115\" (\"id\", \"date_created\", \"company_id\", \"user_status_id\", \"user_entity_id\", \"identity_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"company_id\", \r\n  NEW.\"user_status_id\", \r\n  NEW.\"user_entity_id\", \r\n  NEW.\"identity_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_IDENTITY$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_IDENTITY AFTER INSERT\r\nON \"portal\".\"identities\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITY\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_IDENTITY", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITY\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_IDENTITY$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity20231115\" (\"id\", \"date_created\", \"company_id\", \"user_status_id\", \"user_entity_id\", \"identity_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"company_id\", \r\n  NEW.\"user_status_id\", \r\n  NEW.\"user_entity_id\", \r\n  NEW.\"identity_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_IDENTITY$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_IDENTITY AFTER UPDATE\r\nON \"portal\".\"identities\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITY\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionProcessData", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityAssignedRole", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
+                    b.Property<Guid>("IdentityId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("identity_id");
 
-                    b.Property<Guid>("OfferSubscriptionId")
+                    b.Property<Guid>("UserRoleId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
-
-                    b.Property<string>("OfferUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("offer_url");
-
-                    b.HasKey("Id")
-                        .HasName("pk_offer_subscriptions_process_datas");
-
-                    b.HasIndex("OfferSubscriptionId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_offer_subscriptions_process_datas_offer_subscription_id");
-
-                    b.ToTable("offer_subscriptions_process_datas", "portal");
-                });
+                        .HasColumnName("user_role_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionStatus", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.HasKey("IdentityId", "UserRoleId")
+                        .HasName("pk_identity_assigned_roles");
 
-                    b.HasKey("Id")
-                        .HasName("pk_offer_subscription_statuses");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_identity_assigned_roles_last_editor_id");
 
-                    b.ToTable("offer_subscription_statuses", "portal");
+                    b.HasIndex("UserRoleId")
+                        .HasDatabaseName("ix_identity_assigned_roles_user_role_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "PENDING"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "ACTIVE"
-                        },
-                        new
+                    b.ToTable("identity_assigned_roles", "portal", t =>
                         {
-                            Id = 3,
-                            Label = "INACTIVE"
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE");
                         });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity_assigned_role20230522\" (\"identity_id\", \"user_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"identity_id\", \r\n  NEW.\"user_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE AFTER INSERT\r\nON \"portal\".\"identity_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity_assigned_role20230522\" (\"identity_id\", \"user_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"identity_id\", \r\n  NEW.\"user_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE AFTER UPDATE\r\nON \"portal\".\"identity_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferTag", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProvider", b =>
                 {
-                    b.Property<Guid>("OfferId")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("tag_name")
-                        .HasAnnotation("Relational:JsonPropertyName", "tag_name");
+                        .HasColumnName("id");
 
-                    b.HasKey("OfferId", "Name")
-                        .HasName("pk_offer_tags");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.ToTable("offer_tags", "portal");
-                });
+                    b.Property<int>("IdentityProviderCategoryId")
+                        .HasColumnType("integer")
+                        .HasColumnName("identity_provider_category_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferType", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<int>("IdentityProviderTypeId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("identity_provider_type_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_id");
 
                     b.HasKey("Id")
-                        .HasName("pk_offer_types");
-
-                    b.ToTable("offer_types", "portal");
-
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "APP"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "CORE_COMPONENT"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "SERVICE"
-                        });
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OnboardingServiceProviderDetail", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasName("pk_identity_providers");
 
-                    b.Property<string>("AuthUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("auth_url");
+                    b.HasIndex("IdentityProviderCategoryId")
+                        .HasDatabaseName("ix_identity_providers_identity_provider_category_id");
 
-                    b.Property<string>("CallbackUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("callback_url");
+                    b.HasIndex("IdentityProviderTypeId")
+                        .HasDatabaseName("ix_identity_providers_identity_provider_type_id");
 
-                    b.Property<string>("ClientId")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("client_id");
+                    b.HasIndex("OwnerId")
+                        .HasDatabaseName("ix_identity_providers_owner_id");
 
-                    b.Property<byte[]>("ClientSecret")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("client_secret");
+                    b.ToTable("identity_providers", "portal");
+                });
 
-                    b.Property<Guid>("CompanyId")
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderAssignedProcess", b =>
+                {
+                    b.Property<Guid>("IdentityProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("identity_provider_id");
 
-                    b.Property<int>("EncryptionMode")
-                        .HasColumnType("integer")
-                        .HasColumnName("encryption_mode");
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
 
-                    b.Property<byte[]>("InitializationVector")
-                        .HasColumnType("bytea")
-                        .HasColumnName("initialization_vector");
+                    b.HasKey("IdentityProviderId", "ProcessId")
+                        .HasName("pk_identity_provider_assigned_processes");
 
-                    b.HasKey("Id")
-                        .HasName("pk_onboarding_service_provider_details");
+                    b.HasIndex("IdentityProviderId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_identity_provider_assigned_processes_identity_provider_id");
 
-                    b.HasIndex("CompanyId")
+                    b.HasIndex("ProcessId")
                         .IsUnique()
-                        .HasDatabaseName("ix_onboarding_service_provider_details_company_id");
+                        .HasDatabaseName("ix_identity_provider_assigned_processes_process_id");
 
-                    b.ToTable("onboarding_service_provider_details", "portal");
+                    b.ToTable("identity_provider_assigned_processes", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.PrivacyPolicy", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderCategory", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -6541,39 +5878,24 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_privacy_policies");
+                        .HasName("pk_identity_provider_categories");
 
-                    b.ToTable("privacy_policies", "portal");
+                    b.ToTable("identity_provider_categories", "portal");
 
                     b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "COMPANY_DATA"
-                        },
                         new
                         {
                             Id = 2,
-                            Label = "USER_DATA"
+                            Label = "KEYCLOAK_OIDC"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "LOCATION"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "BROWSER_HISTORY"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "NONE"
+                            Label = "KEYCLOAK_SAML"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderType", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -6586,559 +5908,1148 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_process_step_types");
+                        .HasName("pk_identity_provider_types");
 
-                    b.ToTable("process_step_types", "portal");
+                    b.ToTable("identity_provider_types", "portal");
 
                     b.HasData(
                         new
                         {
-                            Id = 1,
-                            Label = "MANUAL_VERIFY_REGISTRATION"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_PUSH"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_PULL"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_MANUAL"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "CREATE_IDENTITY_WALLET"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "RETRIGGER_IDENTITY_WALLET"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "START_CLEARING_HOUSE"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "RETRIGGER_CLEARING_HOUSE"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "AWAIT_CLEARING_HOUSE_RESPONSE"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "START_SELF_DESCRIPTION_LP"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Label = "RETRIGGER_SELF_DESCRIPTION_LP"
-                        },
-                        new
-                        {
-                            Id = 12,
-                            Label = "START_APPLICATION_ACTIVATION"
-                        },
-                        new
-                        {
-                            Id = 13,
-                            Label = "RETRIGGER_BUSINESS_PARTNER_NUMBER_PUSH"
-                        },
-                        new
-                        {
-                            Id = 14,
-                            Label = "RETRIGGER_BUSINESS_PARTNER_NUMBER_PULL"
-                        },
-                        new
-                        {
-                            Id = 16,
-                            Label = "MANUAL_TRIGGER_OVERRIDE_CLEARING_HOUSE"
-                        },
-                        new
-                        {
-                            Id = 17,
-                            Label = "START_OVERRIDE_CLEARING_HOUSE"
-                        },
-                        new
-                        {
-                            Id = 18,
-                            Label = "AWAIT_SELF_DESCRIPTION_LP_RESPONSE"
-                        },
-                        new
-                        {
-                            Id = 19,
-                            Label = "MANUAL_DECLINE_APPLICATION"
-                        },
-                        new
-                        {
-                            Id = 20,
-                            Label = "CREATE_DIM_WALLET"
-                        },
-                        new
-                        {
-                            Id = 21,
-                            Label = "AWAIT_DIM_RESPONSE_RESPONSE"
-                        },
-                        new
-                        {
-                            Id = 22,
-                            Label = "RETRIGGER_CREATE_DIM_WALLET"
-                        },
-                        new
-                        {
-                            Id = 23,
-                            Label = "VALIDATE_DID_DOCUMENT"
-                        },
-                        new
-                        {
-                            Id = 24,
-                            Label = "RETRIGGER_VALIDATE_DID_DOCUMENT"
-                        },
-                        new
-                        {
-                            Id = 25,
-                            Label = "REQUEST_BPN_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 26,
-                            Label = "AWAIT_BPN_CREDENTIAL_RESPONSE"
-                        },
-                        new
-                        {
-                            Id = 27,
-                            Label = "REQUEST_MEMBERSHIP_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 28,
-                            Label = "AWAIT_MEMBERSHIP_CREDENTIAL_RESPONSE"
-                        },
-                        new
-                        {
-                            Id = 29,
-                            Label = "TRANSMIT_BPN_DID"
-                        },
-                        new
-                        {
-                            Id = 30,
-                            Label = "RETRIGGER_TRANSMIT_DID_BPN"
-                        },
-                        new
-                        {
-                            Id = 31,
-                            Label = "RETRIGGER_REQUEST_BPN_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 32,
-                            Label = "RETRIGGER_REQUEST_MEMBERSHIP_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 33,
-                            Label = "ASSIGN_INITIAL_ROLES"
-                        },
-                        new
-                        {
-                            Id = 34,
-                            Label = "ASSIGN_BPN_TO_USERS"
-                        },
-                        new
-                        {
-                            Id = 35,
-                            Label = "REMOVE_REGISTRATION_ROLES"
-                        },
-                        new
-                        {
-                            Id = 36,
-                            Label = "SET_THEME"
-                        },
-                        new
-                        {
-                            Id = 37,
-                            Label = "SET_MEMBERSHIP"
-                        },
-                        new
-                        {
-                            Id = 38,
-                            Label = "FINISH_APPLICATION_ACTIVATION"
-                        },
-                        new
-                        {
-                            Id = 39,
-                            Label = "RETRIGGER_ASSIGN_INITIAL_ROLES"
-                        },
-                        new
-                        {
-                            Id = 40,
-                            Label = "RETRIGGER_ASSIGN_BPN_TO_USERS"
-                        },
-                        new
-                        {
-                            Id = 41,
-                            Label = "RETRIGGER_REMOVE_REGISTRATION_ROLES"
-                        },
-                        new
-                        {
-                            Id = 42,
-                            Label = "RETRIGGER_SET_THEME"
-                        },
-                        new
-                        {
-                            Id = 43,
-                            Label = "RETRIGGER_SET_MEMBERSHIP"
+                            Id = 1,
+                            Label = "OWN"
                         },
                         new
                         {
-                            Id = 100,
-                            Label = "TRIGGER_PROVIDER"
+                            Id = 2,
+                            Label = "MANAGED"
                         },
                         new
                         {
-                            Id = 101,
-                            Label = "AWAIT_START_AUTOSETUP"
-                        },
+                            Id = 3,
+                            Label = "SHARED"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_identity_type");
+
+                    b.ToTable("identity_type", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 102,
-                            Label = "OFFERSUBSCRIPTION_CLIENT_CREATION"
+                            Id = 1,
+                            Label = "COMPANY_USER"
                         },
                         new
                         {
-                            Id = 103,
-                            Label = "SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION"
-                        },
+                            Id = 2,
+                            Label = "TECHNICAL_USER"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityUserStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_identity_user_statuses");
+
+                    b.ToTable("identity_user_statuses", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 104,
-                            Label = "OFFERSUBSCRIPTION_TECHNICALUSER_CREATION"
+                            Id = 1,
+                            Label = "ACTIVE"
                         },
                         new
                         {
-                            Id = 105,
-                            Label = "ACTIVATE_SUBSCRIPTION"
+                            Id = 2,
+                            Label = "INACTIVE"
                         },
                         new
                         {
-                            Id = 106,
-                            Label = "TRIGGER_PROVIDER_CALLBACK"
+                            Id = 3,
+                            Label = "DELETED"
                         },
                         new
                         {
-                            Id = 107,
-                            Label = "RETRIGGER_PROVIDER"
+                            Id = 4,
+                            Label = "PENDING"
                         },
                         new
                         {
-                            Id = 108,
-                            Label = "RETRIGGER_OFFERSUBSCRIPTION_CLIENT_CREATION"
-                        },
+                            Id = 5,
+                            Label = "PENDING_DELETION"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Invitation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CompanyApplicationId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_application_id");
+
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<int>("InvitationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("invitation_status_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_invitations");
+
+                    b.HasIndex("CompanyApplicationId")
+                        .HasDatabaseName("ix_invitations_company_application_id");
+
+                    b.HasIndex("CompanyUserId")
+                        .HasDatabaseName("ix_invitations_company_user_id");
+
+                    b.HasIndex("InvitationStatusId")
+                        .HasDatabaseName("ix_invitations_invitation_status_id");
+
+                    b.ToTable("invitations", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.InvitationStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_invitation_statuses");
+
+                    b.ToTable("invitation_statuses", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 109,
-                            Label = "RETRIGGER_OFFERSUBSCRIPTION_TECHNICALUSER_CREATION"
+                            Id = 1,
+                            Label = "CREATED"
                         },
                         new
                         {
-                            Id = 110,
-                            Label = "RETRIGGER_PROVIDER_CALLBACK"
+                            Id = 2,
+                            Label = "PENDING"
                         },
                         new
                         {
-                            Id = 111,
-                            Label = "MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION"
+                            Id = 3,
+                            Label = "ACCEPTED"
                         },
                         new
                         {
-                            Id = 112,
-                            Label = "OFFERSUBSCRIPTION_CREATE_DIM_TECHNICAL_USER"
-                        },
+                            Id = 4,
+                            Label = "DECLINED"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", b =>
+                {
+                    b.Property<string>("ShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("short_name")
+                        .IsFixedLength();
+
+                    b.HasKey("ShortName")
+                        .HasName("pk_languages");
+
+                    b.ToTable("languages", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LanguageLongName", b =>
+                {
+                    b.Property<string>("ShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("short_name")
+                        .IsFixedLength();
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name")
+                        .IsFixedLength();
+
+                    b.Property<string>("LongName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("long_name");
+
+                    b.HasKey("ShortName", "LanguageShortName")
+                        .HasName("pk_language_long_names");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_language_long_names_language_short_name");
+
+                    b.ToTable("language_long_names", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LicenseType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_license_types");
+
+                    b.ToTable("license_types", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 113,
-                            Label = "RETRIGGER_OFFERSUBSCRIPTION_CREATE_DIM_TECHNICAL_USER"
+                            Id = 1,
+                            Label = "COTS"
                         },
                         new
                         {
-                            Id = 200,
-                            Label = "SYNCHRONIZE_USER"
-                        },
+                            Id = 2,
+                            Label = "FOSS"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MailingInformation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("email");
+
+                    b.Property<int>("EncryptionMode")
+                        .HasColumnType("integer")
+                        .HasColumnName("encryption_mode");
+
+                    b.Property<byte[]>("InitializationVector")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("initialization_vector");
+
+                    b.Property<byte[]>("MailParameters")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("mail_parameters");
+
+                    b.Property<int>("MailingStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("mailing_status_id");
+
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<string>("Template")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("template");
+
+                    b.HasKey("Id")
+                        .HasName("pk_mailing_informations");
+
+                    b.HasIndex("MailingStatusId")
+                        .HasDatabaseName("ix_mailing_informations_mailing_status_id");
+
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_mailing_informations_process_id");
+
+                    b.ToTable("mailing_informations", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MailingStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_mailing_statuses");
+
+                    b.ToTable("mailing_statuses", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 201,
-                            Label = "RETRIGGER_SYNCHRONIZE_USER"
+                            Id = 1,
+                            Label = "PENDING"
                         },
                         new
                         {
-                            Id = 202,
-                            Label = "TRIGGER_CALLBACK_OSP_SUBMITTED"
-                        },
+                            Id = 2,
+                            Label = "SENT"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MediaType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_media_types");
+
+                    b.ToTable("media_types", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 203,
-                            Label = "TRIGGER_CALLBACK_OSP_APPROVED"
+                            Id = 1,
+                            Label = "JPEG"
                         },
                         new
                         {
-                            Id = 204,
-                            Label = "TRIGGER_CALLBACK_OSP_DECLINED"
+                            Id = 2,
+                            Label = "GIF"
                         },
                         new
                         {
-                            Id = 205,
-                            Label = "RETRIGGER_CALLBACK_OSP_SUBMITTED"
+                            Id = 3,
+                            Label = "PNG"
                         },
                         new
                         {
-                            Id = 206,
-                            Label = "RETRIGGER_CALLBACK_OSP_APPROVED"
+                            Id = 4,
+                            Label = "SVG"
                         },
                         new
                         {
-                            Id = 207,
-                            Label = "RETRIGGER_CALLBACK_OSP_DECLINED"
+                            Id = 5,
+                            Label = "TIFF"
                         },
                         new
                         {
-                            Id = 208,
-                            Label = "MANUAL_DECLINE_OSP"
+                            Id = 6,
+                            Label = "PDF"
                         },
                         new
                         {
-                            Id = 209,
-                            Label = "REMOVE_KEYCLOAK_USERS"
+                            Id = 7,
+                            Label = "JSON"
                         },
                         new
                         {
-                            Id = 210,
-                            Label = "RETRIGGER_REMOVE_KEYCLOAK_USERS"
+                            Id = 8,
+                            Label = "PEM"
                         },
                         new
                         {
-                            Id = 301,
-                            Label = "SEND_MAIL"
+                            Id = 9,
+                            Label = "CA_CERT"
                         },
                         new
                         {
-                            Id = 302,
-                            Label = "RETRIGGER_SEND_MAIL"
+                            Id = 10,
+                            Label = "PKX_CER"
                         },
                         new
                         {
-                            Id = 400,
-                            Label = "INVITATION_CREATE_CENTRAL_IDP"
-                        },
+                            Id = 11,
+                            Label = "OCTET"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("application_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("ExternalId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("external_id");
+
+                    b.Property<Guid>("OnboardingServiceProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("onboarding_service_provider_id");
+
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_network_registrations");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_application_id");
+
+                    b.HasIndex("CompanyId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_company_id");
+
+                    b.HasIndex("OnboardingServiceProviderId")
+                        .HasDatabaseName("ix_network_registrations_onboarding_service_provider_id");
+
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_process_id");
+
+                    b.HasIndex("ExternalId", "OnboardingServiceProviderId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_external_id_onboarding_service_provid");
+
+                    b.ToTable("network_registrations", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Content")
+                        .HasColumnType("text")
+                        .HasColumnName("content");
+
+                    b.Property<Guid?>("CreatorUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_user_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<bool?>("Done")
+                        .HasColumnType("boolean")
+                        .HasColumnName("done");
+
+                    b.Property<DateTimeOffset?>("DueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("due_date");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<int>("NotificationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("notification_type_id");
+
+                    b.Property<Guid>("ReceiverUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("receiver_user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notifications");
+
+                    b.HasIndex("CreatorUserId")
+                        .HasDatabaseName("ix_notifications_creator_user_id");
+
+                    b.HasIndex("NotificationTypeId")
+                        .HasDatabaseName("ix_notifications_notification_type_id");
+
+                    b.HasIndex("ReceiverUserId")
+                        .HasDatabaseName("ix_notifications_receiver_user_id");
+
+                    b.ToTable("notifications", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTopic", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notification_topic");
+
+                    b.ToTable("notification_topic", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 401,
-                            Label = "INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT"
+                            Id = 1,
+                            Label = "INFO"
                         },
                         new
                         {
-                            Id = 402,
-                            Label = "INVITATION_ADD_REALM_ROLE"
+                            Id = 2,
+                            Label = "ACTION"
                         },
                         new
                         {
-                            Id = 403,
-                            Label = "INVITATION_CREATE_SHARED_REALM"
-                        },
+                            Id = 3,
+                            Label = "OFFER"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notification_type");
+
+                    b.ToTable("notification_type", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 404,
-                            Label = "INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER"
+                            Id = 1,
+                            Label = "INFO"
                         },
                         new
                         {
-                            Id = 405,
-                            Label = "INVITATION_UPDATE_CENTRAL_IDP_URLS"
+                            Id = 2,
+                            Label = "ACTION"
                         },
                         new
                         {
-                            Id = 406,
-                            Label = "INVITATION_CREATE_SHARED_CLIENT"
+                            Id = 3,
+                            Label = "WELCOME"
                         },
                         new
                         {
-                            Id = 407,
-                            Label = "INVITATION_ENABLE_CENTRAL_IDP"
+                            Id = 4,
+                            Label = "WELCOME_USE_CASES"
                         },
                         new
                         {
-                            Id = 408,
-                            Label = "INVITATION_CREATE_DATABASE_IDP"
+                            Id = 5,
+                            Label = "WELCOME_SERVICE_PROVIDER"
                         },
                         new
                         {
-                            Id = 409,
-                            Label = "INVITATION_CREATE_USER"
+                            Id = 6,
+                            Label = "WELCOME_CONNECTOR_REGISTRATION"
                         },
                         new
                         {
-                            Id = 410,
-                            Label = "RETRIGGER_INVITATION_CREATE_CENTRAL_IDP"
+                            Id = 7,
+                            Label = "WELCOME_APP_MARKETPLACE"
                         },
                         new
                         {
-                            Id = 411,
-                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT"
+                            Id = 8,
+                            Label = "APP_SUBSCRIPTION_REQUEST"
                         },
                         new
                         {
-                            Id = 412,
-                            Label = "RETRIGGER_INVITATION_ADD_REALM_ROLE"
+                            Id = 9,
+                            Label = "APP_SUBSCRIPTION_ACTIVATION"
                         },
                         new
                         {
-                            Id = 413,
-                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_REALM"
+                            Id = 10,
+                            Label = "CONNECTOR_REGISTERED"
                         },
                         new
                         {
-                            Id = 414,
-                            Label = "RETRIGGER_INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER"
+                            Id = 11,
+                            Label = "APP_RELEASE_REQUEST"
                         },
                         new
                         {
-                            Id = 415,
-                            Label = "RETRIGGER_INVITATION_UPDATE_CENTRAL_IDP_URLS"
+                            Id = 12,
+                            Label = "TECHNICAL_USER_CREATION"
                         },
                         new
                         {
-                            Id = 416,
-                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_CLIENT"
+                            Id = 13,
+                            Label = "SERVICE_REQUEST"
                         },
                         new
                         {
-                            Id = 417,
-                            Label = "RETRIGGER_INVITATION_ENABLE_CENTRAL_IDP"
+                            Id = 14,
+                            Label = "SERVICE_ACTIVATION"
                         },
                         new
                         {
-                            Id = 418,
-                            Label = "RETRIGGER_INVITATION_CREATE_USER"
+                            Id = 15,
+                            Label = "APP_ROLE_ADDED"
                         },
                         new
                         {
-                            Id = 419,
-                            Label = "RETRIGGER_INVITATION_CREATE_DATABASE_IDP"
+                            Id = 16,
+                            Label = "APP_RELEASE_APPROVAL"
                         },
                         new
                         {
-                            Id = 500,
-                            Label = "CREATE_DIM_TECHNICAL_USER"
+                            Id = 17,
+                            Label = "SERVICE_RELEASE_REQUEST"
                         },
                         new
                         {
-                            Id = 501,
-                            Label = "RETRIGGER_CREATE_DIM_TECHNICAL_USER"
+                            Id = 18,
+                            Label = "SERVICE_RELEASE_APPROVAL"
                         },
                         new
                         {
-                            Id = 502,
-                            Label = "AWAIT_CREATE_DIM_TECHNICAL_USER_RESPONSE"
+                            Id = 19,
+                            Label = "APP_RELEASE_REJECTION"
                         },
                         new
                         {
-                            Id = 504,
-                            Label = "DELETE_DIM_TECHNICAL_USER"
+                            Id = 20,
+                            Label = "SERVICE_RELEASE_REJECTION"
                         },
                         new
                         {
-                            Id = 505,
-                            Label = "AWAIT_DELETE_DIM_TECHNICAL_USER_RESPONSE"
+                            Id = 21,
+                            Label = "ROLE_UPDATE_CORE_OFFER"
                         },
                         new
                         {
-                            Id = 506,
-                            Label = "RETRIGGER_DELETE_DIM_TECHNICAL_USER"
+                            Id = 22,
+                            Label = "ROLE_UPDATE_APP_OFFER"
                         },
                         new
                         {
-                            Id = 600,
-                            Label = "DELETE_CENTRAL_USER"
+                            Id = 23,
+                            Label = "SUBSCRIPTION_URL_UPDATE"
                         },
                         new
                         {
-                            Id = 601,
-                            Label = "RETRIGGER_DELETE_CENTRAL_USER"
+                            Id = 24,
+                            Label = "CREDENTIAL_APPROVAL"
                         },
                         new
                         {
-                            Id = 602,
-                            Label = "DELETE_COMPANYUSER_ASSIGNED_PROCESS"
+                            Id = 25,
+                            Label = "CREDENTIAL_REJECTED"
                         },
                         new
                         {
-                            Id = 700,
-                            Label = "DELETE_IDP_SHARED_REALM"
+                            Id = 26,
+                            Label = "CREDENTIAL_EXPIRY"
                         },
                         new
                         {
-                            Id = 701,
-                            Label = "RETRIGGER_DELETE_IDP_SHARED_REALM"
+                            Id = 27,
+                            Label = "APP_SUBSCRIPTION_DECLINE"
                         },
                         new
                         {
-                            Id = 702,
-                            Label = "DELETE_IDP_SHARED_SERVICEACCOUNT"
-                        },
+                            Id = 28,
+                            Label = "SERVICE_SUBSCRIPTION_DECLINE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTypeAssignedTopic", b =>
+                {
+                    b.Property<int>("NotificationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("notification_type_id");
+
+                    b.Property<int>("NotificationTopicId")
+                        .HasColumnType("integer")
+                        .HasColumnName("notification_topic_id");
+
+                    b.HasKey("NotificationTypeId", "NotificationTopicId")
+                        .HasName("pk_notification_type_assigned_topics");
+
+                    b.HasIndex("NotificationTopicId")
+                        .HasDatabaseName("ix_notification_type_assigned_topics_notification_topic_id");
+
+                    b.HasIndex("NotificationTypeId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_notification_type_assigned_topics_notification_type_id");
+
+                    b.ToTable("notification_type_assigned_topics", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ContactEmail")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("contact_email");
+
+                    b.Property<string>("ContactNumber")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
+
+                    b.Property<bool?>("DisplayTechnicalUser")
+                        .HasColumnType("boolean")
+                        .HasColumnName("display_technical_user");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<int>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
+
+                    b.Property<string>("MarketingUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("marketing_url");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<int>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
+
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
+
+                    b.Property<Guid>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
+
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offers");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_offers_last_editor_id");
+
+                    b.HasIndex("LicenseTypeId")
+                        .HasDatabaseName("ix_offers_license_type_id");
+
+                    b.HasIndex("OfferStatusId")
+                        .HasDatabaseName("ix_offers_offer_status_id");
+
+                    b.HasIndex("OfferTypeId")
+                        .HasDatabaseName("ix_offers_offer_type_id");
+
+                    b.HasIndex("ProviderCompanyId")
+                        .HasDatabaseName("ix_offers_provider_company_id");
+
+                    b.HasIndex("SalesManagerId")
+                        .HasDatabaseName("ix_offers_sales_manager_id");
+
+                    b.ToTable("offers", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_OFFER");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_OFFER");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_OFFER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFER\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_OFFER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer20241219\" (\"id\", \"name\", \"date_created\", \"date_released\", \"marketing_url\", \"contact_email\", \"contact_number\", \"display_technical_user\", \"offer_type_id\", \"sales_manager_id\", \"provider_company_id\", \"offer_status_id\", \"license_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_released\", \r\n  NEW.\"marketing_url\", \r\n  NEW.\"contact_email\", \r\n  NEW.\"contact_number\", \r\n  NEW.\"display_technical_user\", \r\n  NEW.\"offer_type_id\", \r\n  NEW.\"sales_manager_id\", \r\n  NEW.\"provider_company_id\", \r\n  NEW.\"offer_status_id\", \r\n  NEW.\"license_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_OFFER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_OFFER AFTER INSERT\r\nON \"portal\".\"offers\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFER\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_OFFER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFER\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_OFFER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer20241219\" (\"id\", \"name\", \"date_created\", \"date_released\", \"marketing_url\", \"contact_email\", \"contact_number\", \"display_technical_user\", \"offer_type_id\", \"sales_manager_id\", \"provider_company_id\", \"offer_status_id\", \"license_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_released\", \r\n  NEW.\"marketing_url\", \r\n  NEW.\"contact_email\", \r\n  NEW.\"contact_number\", \r\n  NEW.\"display_technical_user\", \r\n  NEW.\"offer_type_id\", \r\n  NEW.\"sales_manager_id\", \r\n  NEW.\"provider_company_id\", \r\n  NEW.\"offer_status_id\", \r\n  NEW.\"license_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_OFFER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_OFFER AFTER UPDATE\r\nON \"portal\".\"offers\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFER\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedDocument", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.HasKey("OfferId", "DocumentId")
+                        .HasName("pk_offer_assigned_documents");
+
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_offer_assigned_documents_document_id");
+
+                    b.ToTable("offer_assigned_documents", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedLicense", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<Guid>("OfferLicenseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_license_id");
+
+                    b.HasKey("OfferId", "OfferLicenseId")
+                        .HasName("pk_offer_assigned_licenses");
+
+                    b.HasIndex("OfferLicenseId")
+                        .HasDatabaseName("ix_offer_assigned_licenses_offer_license_id");
+
+                    b.ToTable("offer_assigned_licenses", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedPrivacyPolicy", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<int>("PrivacyPolicyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("privacy_policy_id");
+
+                    b.HasKey("OfferId", "PrivacyPolicyId")
+                        .HasName("pk_offer_assigned_privacy_policies");
+
+                    b.HasIndex("PrivacyPolicyId")
+                        .HasDatabaseName("ix_offer_assigned_privacy_policies_privacy_policy_id");
+
+                    b.ToTable("offer_assigned_privacy_policies", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferDescription", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.Property<string>("DescriptionLong")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("description_long");
+
+                    b.Property<string>("DescriptionShort")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("description_short");
+
+                    b.HasKey("OfferId", "LanguageShortName")
+                        .HasName("pk_offer_descriptions");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_offer_descriptions_language_short_name");
+
+                    b.ToTable("offer_descriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferLicense", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Licensetext")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("licensetext");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_licenses");
+
+                    b.ToTable("offer_licenses", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_statuses");
+
+                    b.ToTable("offer_statuses", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 703,
-                            Label = "RETRIGGER_DELETE_IDP_SHARED_SERVICEACCOUNT"
+                            Id = 1,
+                            Label = "CREATED"
                         },
                         new
                         {
-                            Id = 704,
-                            Label = "DELETE_CENTRAL_IDENTITY_PROVIDER"
+                            Id = 2,
+                            Label = "IN_REVIEW"
                         },
                         new
                         {
-                            Id = 705,
-                            Label = "RETRIGGER_DELETE_CENTRAL_IDENTITY_PROVIDER"
+                            Id = 3,
+                            Label = "ACTIVE"
                         },
                         new
                         {
-                            Id = 706,
-                            Label = "DELETE_IDENTITY_PROVIDER"
-                        },
-                        new
+                            Id = 4,
+                            Label = "INACTIVE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<int>("OfferSubscriptionStatusId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(1)
+                        .HasColumnName("offer_subscription_status_id");
+
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_subscriptions");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_offer_subscriptions_company_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_offer_subscriptions_last_editor_id");
+
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_offer_subscriptions_offer_id");
+
+                    b.HasIndex("OfferSubscriptionStatusId")
+                        .HasDatabaseName("ix_offer_subscriptions_offer_subscription_status_id");
+
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_offer_subscriptions_process_id");
+
+                    b.HasIndex("RequesterId")
+                        .HasDatabaseName("ix_offer_subscriptions_requester_id");
+
+                    b.ToTable("offer_subscriptions", "portal", t =>
                         {
-                            Id = 800,
-                            Label = "SELF_DESCRIPTION_CONNECTOR_CREATION"
-                        },
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer_subscription20231115\" (\"id\", \"company_id\", \"offer_id\", \"offer_subscription_status_id\", \"display_name\", \"description\", \"requester_id\", \"last_editor_id\", \"process_id\", \"date_created\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"offer_subscription_status_id\", \r\n  NEW.\"display_name\", \r\n  NEW.\"description\", \r\n  NEW.\"requester_id\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"process_id\", \r\n  NEW.\"date_created\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION AFTER INSERT\r\nON \"portal\".\"offer_subscriptions\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer_subscription20231115\" (\"id\", \"company_id\", \"offer_id\", \"offer_subscription_status_id\", \"display_name\", \"description\", \"requester_id\", \"last_editor_id\", \"process_id\", \"date_created\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"offer_subscription_status_id\", \r\n  NEW.\"display_name\", \r\n  NEW.\"description\", \r\n  NEW.\"requester_id\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"process_id\", \r\n  NEW.\"date_created\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION AFTER UPDATE\r\nON \"portal\".\"offer_subscriptions\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionProcessData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
+
+                    b.Property<string>("OfferUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("offer_url");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_subscriptions_process_datas");
+
+                    b.HasIndex("OfferSubscriptionId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_offer_subscriptions_process_datas_offer_subscription_id");
+
+                    b.ToTable("offer_subscriptions_process_datas", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_subscription_statuses");
+
+                    b.ToTable("offer_subscription_statuses", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 801,
-                            Label = "SELF_DESCRIPTION_COMPANY_CREATION"
+                            Id = 1,
+                            Label = "PENDING"
                         },
                         new
                         {
-                            Id = 802,
-                            Label = "RETRIGGER_SELF_DESCRIPTION_CONNECTOR_CREATION"
+                            Id = 2,
+                            Label = "ACTIVE"
                         },
                         new
                         {
-                            Id = 803,
-                            Label = "RETRIGGER_SELF_DESCRIPTION_COMPANY_CREATION"
+                            Id = 3,
+                            Label = "INACTIVE"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferTag", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("tag_name")
+                        .HasAnnotation("Relational:JsonPropertyName", "tag_name");
+
+                    b.HasKey("OfferId", "Name")
+                        .HasName("pk_offer_tags");
+
+                    b.ToTable("offer_tags", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferType", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -7151,58 +7062,151 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_process_types");
+                        .HasName("pk_offer_types");
 
-                    b.ToTable("process_types", "portal");
+                    b.ToTable("offer_types", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "APPLICATION_CHECKLIST"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "OFFER_SUBSCRIPTION"
+                            Label = "APP"
                         },
                         new
                         {
-                            Id = 4,
-                            Label = "PARTNER_REGISTRATION"
+                            Id = 2,
+                            Label = "CORE_COMPONENT"
                         },
                         new
                         {
-                            Id = 5,
-                            Label = "MAILING"
-                        },
+                            Id = 3,
+                            Label = "SERVICE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OnboardingServiceProviderDetail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("AuthUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("auth_url");
+
+                    b.Property<string>("CallbackUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("callback_url");
+
+                    b.Property<string>("ClientId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("client_id");
+
+                    b.Property<byte[]>("ClientSecret")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("client_secret");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<int>("EncryptionMode")
+                        .HasColumnType("integer")
+                        .HasColumnName("encryption_mode");
+
+                    b.Property<byte[]>("InitializationVector")
+                        .HasColumnType("bytea")
+                        .HasColumnName("initialization_vector");
+
+                    b.HasKey("Id")
+                        .HasName("pk_onboarding_service_provider_details");
+
+                    b.HasIndex("CompanyId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_onboarding_service_provider_details_company_id");
+
+                    b.ToTable("onboarding_service_provider_details", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.PrivacyPolicy", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_privacy_policies");
+
+                    b.ToTable("privacy_policies", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 6,
-                            Label = "INVITATION"
+                            Id = 1,
+                            Label = "COMPANY_DATA"
                         },
                         new
                         {
-                            Id = 7,
-                            Label = "DIM_TECHNICAL_USER"
+                            Id = 2,
+                            Label = "USER_DATA"
                         },
                         new
                         {
-                            Id = 8,
-                            Label = "USER_PROVISIONING"
+                            Id = 3,
+                            Label = "LOCATION"
                         },
                         new
                         {
-                            Id = 9,
-                            Label = "IDENTITYPROVIDER_PROVISIONING"
+                            Id = 4,
+                            Label = "BROWSER_HISTORY"
                         },
                         new
                         {
-                            Id = 10,
-                            Label = "SELF_DESCRIPTION_CREATION"
+                            Id = 5,
+                            Label = "NONE"
                         });
                 });
 
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset?>("LockExpiryDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("lock_expiry_date");
+
+                    b.Property<int>("ProcessTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("process_type_id");
+
+                    b.Property<Guid>("Version")
+                        .IsConcurrencyToken()
+                        .HasColumnType("uuid")
+                        .HasColumnName("version");
+
+                    b.HasKey("Id")
+                        .HasName("pk_processes");
+
+                    b.HasIndex("ProcessTypeId")
+                        .HasDatabaseName("ix_processes_process_type_id");
+
+                    b.ToTable("processes", "portal");
+                });
+
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProviderCompanyDetail", b =>
                 {
                     b.Property<Guid>("Id")
@@ -7870,32 +7874,21 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToView("offer_subscription_view", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
-                {
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessType", null)
-                        .WithMany("Processes")
-                        .HasForeignKey("ProcessTypeId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("fk_processes_process_types_process_type_id");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStep<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStep<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
                         .WithMany("ProcessSteps")
                         .HasForeignKey("ProcessId")
                         .IsRequired()
                         .HasConstraintName("fk_process_steps_processes_process_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", null)
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "ProcessStepStatus")
                         .WithMany("ProcessSteps")
                         .HasForeignKey("ProcessStepStatusId")
-                        .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("fk_process_steps_process_step_status_process_type_id_process_s");
+                        .HasConstraintName("fk_process_steps_process_step_statuses_process_step_status_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepType", null)
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "ProcessStepType")
                         .WithMany("ProcessSteps")
                         .HasForeignKey("ProcessStepTypeId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -7903,6 +7896,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasConstraintName("fk_process_steps_process_step_types_process_step_type_id");
 
                     b.Navigation("Process");
+
+                    b.Navigation("ProcessStepStatus");
+
+                    b.Navigation("ProcessStepType");
                 });
 
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
@@ -8171,10 +8168,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_companies_company_statuses_company_status_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "SdCreationProcess")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "SdCreationProcess")
+                        .WithOne("SdCreationCompany")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "SdCreationProcessId")
-                        .HasConstraintName("fk_companies_process_process_type_id_process_step_type_id_sd_c");
+                        .HasConstraintName("fk_companies_processes_sd_creation_process_id");
 
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "SelfDescriptionDocument")
                         .WithMany("Companies")
@@ -8199,10 +8196,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_company_applications_company_application_statuses_applicati");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "ChecklistProcess")
-                        .WithMany()
-                        .HasForeignKey("ChecklistProcessId")
-                        .HasConstraintName("fk_company_applications_process_process_type_id_process_step_t");
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "ChecklistProcess")
+                        .WithOne("CompanyApplication")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", "ChecklistProcessId")
+                        .HasConstraintName("fk_company_applications_processes_checklist_process_id");
 
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationType", "CompanyApplicationType")
                         .WithMany("CompanyApplications")
@@ -8422,11 +8419,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_company_invitations_company_applications_application_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("CompanyInvitation")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyInvitation", "ProcessId")
                         .IsRequired()
-                        .HasConstraintName("fk_company_invitations_process_process_type_id_process_step_ty");
+                        .HasConstraintName("fk_company_invitations_processes_process_id");
 
                     b.Navigation("Application");
 
@@ -8567,12 +8564,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_company_user_assigned_processes_company_users_company_user_");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithMany()
-                        .HasForeignKey("ProcessId")
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("CompanyUserAssignedProcess")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedProcess", "ProcessId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("fk_company_user_assigned_processes_process_process_type_id_pro");
+                        .HasConstraintName("fk_company_user_assigned_processes_processes_process_id");
 
                     b.Navigation("CompanyUser");
 
@@ -8617,10 +8614,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_connectors_companies_provider_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "SdCreationProcess")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "SdCreationProcess")
+                        .WithOne("SdCreationConnector")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", "SdCreationProcessId")
-                        .HasConstraintName("fk_connectors_process_process_type_id_process_step_type_id_sd_");
+                        .HasConstraintName("fk_connectors_processes_sd_creation_process_id");
 
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "SelfDescriptionDocument")
                         .WithOne("Connector")
@@ -8865,11 +8862,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUserCreationData", b =>
                 {
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("ExternalTechnicalUserCreationData")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUserCreationData", "ProcessId")
                         .IsRequired()
-                        .HasConstraintName("fk_external_technical_user_creation_data_process_process_type_");
+                        .HasConstraintName("fk_external_technical_user_creation_data_processes_process_id");
 
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.TechnicalUser", "TechnicalUser")
                         .WithOne("ExternalTechnicalUserCreationData")
@@ -8989,12 +8986,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_identity_provider_assigned_processes_identity_providers_ide");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithMany()
-                        .HasForeignKey("ProcessId")
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("IdentityProviderAssignedProcess")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderAssignedProcess", "ProcessId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("fk_identity_provider_assigned_processes_process_process_type_i");
+                        .HasConstraintName("fk_identity_provider_assigned_processes_processes_process_id");
 
                     b.Navigation("IdentityProvider");
 
@@ -9056,11 +9053,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_mailing_informations_mailing_statuses_mailing_status_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("MailingInformation")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MailingInformation", "ProcessId")
                         .IsRequired()
-                        .HasConstraintName("fk_mailing_informations_process_process_type_id_process_step_t");
+                        .HasConstraintName("fk_mailing_informations_processes_process_id");
 
                     b.Navigation("MailingStatus");
 
@@ -9089,12 +9086,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_network_registrations_companies_onboarding_service_provider");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("NetworkRegistration")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", "ProcessId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("fk_network_registrations_process_process_type_id_process_step_");
+                        .HasConstraintName("fk_network_registrations_processes_process_id");
 
                     b.Navigation("Company");
 
@@ -9304,10 +9301,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_offer_subscriptions_offer_subscription_statuses_offer_subsc");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithMany()
-                        .HasForeignKey("ProcessId")
-                        .HasConstraintName("fk_offer_subscriptions_process_process_type_id_process_step_ty");
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("OfferSubscription")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", "ProcessId")
+                        .HasConstraintName("fk_offer_subscriptions_processes_process_id");
 
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "Requester")
                         .WithMany("RequestedSubscriptions")
@@ -9362,6 +9359,17 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Navigation("Company");
                 });
 
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId>", "ProcessType")
+                        .WithMany("Processes")
+                        .HasForeignKey("ProcessTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_processes_process_types_process_type_id");
+
+                    b.Navigation("ProcessType");
+                });
+
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProviderCompanyDetail", b =>
                 {
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
@@ -9577,16 +9585,21 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Navigation("TechnicalUser");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
                     b.Navigation("ProcessSteps");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
                     b.Navigation("ProcessSteps");
                 });
 
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId>", b =>
+                {
+                    b.Navigation("Processes");
+                });
+
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
                 {
                     b.Navigation("Companies");
@@ -9979,14 +9992,29 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Navigation("OfferAssignedPrivacyPolicies");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", b =>
                 {
+                    b.Navigation("CompanyApplication");
+
+                    b.Navigation("CompanyInvitation");
+
+                    b.Navigation("CompanyUserAssignedProcess");
+
+                    b.Navigation("ExternalTechnicalUserCreationData");
+
+                    b.Navigation("IdentityProviderAssignedProcess");
+
+                    b.Navigation("MailingInformation");
+
+                    b.Navigation("NetworkRegistration");
+
+                    b.Navigation("OfferSubscription");
+
                     b.Navigation("ProcessSteps");
-                });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessType", b =>
-                {
-                    b.Navigation("Processes");
+                    b.Navigation("SdCreationCompany");
+
+                    b.Navigation("SdCreationConnector");
                 });
 
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ServiceType", b =>
diff --git a/src/portalbackend/PortalBackend.Migrations/Migrations/20250122160213_240-CreateProcessPackage.cs b/src/portalbackend/PortalBackend.Migrations/Migrations/20250122160213_240-CreateProcessPackage.cs
new file mode 100644
index 0000000000..36f11f829c
--- /dev/null
+++ b/src/portalbackend/PortalBackend.Migrations/Migrations/20250122160213_240-CreateProcessPackage.cs
@@ -0,0 +1,82 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.Migrations.Migrations
+{
+    /// <inheritdoc />
+    public partial class _240CreateProcessPackage : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "fk_process_steps_process_step_statuses_process_step_status_id",
+                schema: "portal",
+                table: "process_steps");
+
+            migrationBuilder.UpdateData(
+                schema: "portal",
+                table: "identity_type",
+                keyColumn: "id",
+                keyValue: 2,
+                column: "label",
+                value: "TECHNICAL_USER");
+
+            migrationBuilder.AddForeignKey(
+                name: "fk_process_steps_process_step_statuses_process_step_status_id",
+                schema: "portal",
+                table: "process_steps",
+                column: "process_step_status_id",
+                principalSchema: "portal",
+                principalTable: "process_step_statuses",
+                principalColumn: "id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "fk_process_steps_process_step_statuses_process_step_status_id",
+                schema: "portal",
+                table: "process_steps");
+
+            migrationBuilder.UpdateData(
+                schema: "portal",
+                table: "identity_type",
+                keyColumn: "id",
+                keyValue: 2,
+                column: "label",
+                value: "COMPANY_SERVICE_ACCOUNT");
+
+            migrationBuilder.AddForeignKey(
+                name: "fk_process_steps_process_step_statuses_process_step_status_id",
+                schema: "portal",
+                table: "process_steps",
+                column: "process_step_status_id",
+                principalSchema: "portal",
+                principalTable: "process_step_statuses",
+                principalColumn: "id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}
diff --git a/src/portalbackend/PortalBackend.Migrations/Migrations/PortalDbContextModelSnapshot.cs b/src/portalbackend/PortalBackend.Migrations/Migrations/PortalDbContextModelSnapshot.cs
index 19a49426b7..59567a4160 100644
--- a/src/portalbackend/PortalBackend.Migrations/Migrations/PortalDbContextModelSnapshot.cs
+++ b/src/portalbackend/PortalBackend.Migrations/Migrations/PortalDbContextModelSnapshot.cs
@@ -41,36 +41,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<DateTimeOffset?>("LockExpiryDate")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("lock_expiry_date");
-
-                    b.Property<int>("ProcessTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("process_type_id");
-
-                    b.Property<Guid>("Version")
-                        .IsConcurrencyToken()
-                        .HasColumnType("uuid")
-                        .HasColumnName("version");
-
-                    b.HasKey("Id")
-                        .HasName("pk_processes");
-
-                    b.HasIndex("ProcessTypeId")
-                        .HasDatabaseName("ix_processes_process_type_id");
-
-                    b.ToTable("processes", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStep<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStep<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -116,7 +87,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("process_steps", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -161,931 +132,651 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditAppSubscriptionDetail20221118", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<Guid?>("AppInstanceId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_instance_id");
-
-                    b.Property<string>("AppSubscriptionUrl")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("app_subscription_url");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
+                    b.Property<int>("Id")
                         .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid>("OfferSubscriptionId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_app_subscription_detail20221118");
-
-                    b.ToTable("audit_app_subscription_detail20221118", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditAppSubscriptionDetail20231115", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<Guid?>("AppInstanceId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_instance_id");
-
-                    b.Property<string>("AppSubscriptionUrl")
+                    b.Property<string>("Label")
+                        .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("app_subscription_url");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid?>("OfferSubscriptionId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_app_subscription_detail20231115");
-
-                    b.ToTable("audit_app_subscription_detail20231115", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCertificateManagement20240416", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<int?>("CompanyCertificateStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_status_id");
-
-                    b.Property<int?>("CompanyCertificateTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_type_id");
-
-                    b.Property<Guid?>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("DocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("document_id");
-
-                    b.Property<string>("ExternalCertificateNumber")
-                        .HasColumnType("text")
-                        .HasColumnName("external_certificate_number");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Issuer")
-                        .HasColumnType("text")
-                        .HasColumnName("issuer");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("TrustLevel")
-                        .HasColumnType("text")
-                        .HasColumnName("trust_level");
-
-                    b.Property<DateTimeOffset?>("ValidFrom")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("valid_from");
-
-                    b.Property<DateTimeOffset?>("ValidTill")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("valid_till");
-
-                    b.Property<string>("Validator")
-                        .HasColumnType("text")
-                        .HasColumnName("validator");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_certificate_management20240416");
-
-                    b.ToTable("audit_certificate_management20240416", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20221005", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<int>("ApplicationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_status_id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_application20221005");
-
-                    b.ToTable("audit_company_application20221005", "portal");
-                });
+                        .HasColumnName("label");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20230214", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
+                    b.HasKey("Id")
+                        .HasName("pk_process_step_types");
 
-                    b.Property<int>("ApplicationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_status_id");
+                    b.ToTable("process_step_types", "portal");
 
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("ChecklistProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("checklist_process_id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_application20230214");
-
-                    b.ToTable("audit_company_application20230214", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20230824", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<int>("ApplicationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_status_id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("ChecklistProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("checklist_process_id");
-
-                    b.Property<int>("CompanyApplicationTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_application_type_id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid?>("OnboardingServiceProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("onboarding_service_provider_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_application20230824");
-
-                    b.ToTable("audit_company_application20230824", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20231115", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<int?>("ApplicationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_status_id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("ChecklistProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("checklist_process_id");
-
-                    b.Property<int?>("CompanyApplicationTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_application_type_id");
-
-                    b.Property<Guid?>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset?>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid?>("OnboardingServiceProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("onboarding_service_provider_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_application20231115");
-
-                    b.ToTable("audit_company_application20231115", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyAssignedRole2023316", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<int>("CompanyRoleId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_role_id");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_assigned_role2023316");
-
-                    b.ToTable("audit_company_assigned_role2023316", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUser20221005", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<int>("CompanyUserStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_user_status_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<string>("Email")
-                        .HasColumnType("text")
-                        .HasColumnName("email");
-
-                    b.Property<string>("Firstname")
-                        .HasColumnType("text")
-                        .HasColumnName("firstname");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<byte[]>("Lastlogin")
-                        .HasColumnType("bytea")
-                        .HasColumnName("lastlogin");
-
-                    b.Property<string>("Lastname")
-                        .HasColumnType("text")
-                        .HasColumnName("lastname");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_user20221005");
-
-                    b.ToTable("audit_company_user20221005", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUser20230522", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<string>("Email")
-                        .HasColumnType("text")
-                        .HasColumnName("email");
-
-                    b.Property<string>("Firstname")
-                        .HasColumnType("text")
-                        .HasColumnName("firstname");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<byte[]>("Lastlogin")
-                        .HasColumnType("bytea")
-                        .HasColumnName("lastlogin");
-
-                    b.Property<string>("Lastname")
-                        .HasColumnType("text")
-                        .HasColumnName("lastname");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_user20230523");
-
-                    b.ToTable("audit_company_user20230523", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUserAssignedRole20221018", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid>("CompanyUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid>("UserRoleId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_role_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_company_user_assigned_role20221018");
-
-                    b.ToTable("audit_company_user_assigned_role20221018", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230405", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<string>("ConnectorUrl")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("connector_url");
-
-                    b.Property<bool?>("DapsRegistrationSuccessful")
-                        .HasColumnType("boolean")
-                        .HasColumnName("daps_registration_successful");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("LocationId")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character varying(2)")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
-
-                    b.Property<Guid>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
-
-                    b.Property<int>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20230405");
-
-                    b.ToTable("audit_connector20230405", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230503", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("CompanyServiceAccountId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_service_account_id");
-
-                    b.Property<string>("ConnectorUrl")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("connector_url");
-
-                    b.Property<bool?>("DapsRegistrationSuccessful")
-                        .HasColumnType("boolean")
-                        .HasColumnName("daps_registration_successful");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("LocationId")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character varying(2)")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
-
-                    b.Property<Guid>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
-
-                    b.Property<int>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20230503");
-
-                    b.ToTable("audit_connector20230503", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230803", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
-
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("CompanyServiceAccountId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_service_account_id");
-
-                    b.Property<string>("ConnectorUrl")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("connector_url");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "MANUAL_VERIFY_REGISTRATION"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_PUSH"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_PULL"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_MANUAL"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "CREATE_IDENTITY_WALLET"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "RETRIGGER_IDENTITY_WALLET"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "START_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "RETRIGGER_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "AWAIT_CLEARING_HOUSE_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "START_SELF_DESCRIPTION_LP"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "RETRIGGER_SELF_DESCRIPTION_LP"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "START_APPLICATION_ACTIVATION"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            Label = "RETRIGGER_BUSINESS_PARTNER_NUMBER_PUSH"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            Label = "RETRIGGER_BUSINESS_PARTNER_NUMBER_PULL"
+                        },
+                        new
+                        {
+                            Id = 16,
+                            Label = "MANUAL_TRIGGER_OVERRIDE_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 17,
+                            Label = "START_OVERRIDE_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 18,
+                            Label = "AWAIT_SELF_DESCRIPTION_LP_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 19,
+                            Label = "MANUAL_DECLINE_APPLICATION"
+                        },
+                        new
+                        {
+                            Id = 20,
+                            Label = "CREATE_DIM_WALLET"
+                        },
+                        new
+                        {
+                            Id = 21,
+                            Label = "AWAIT_DIM_RESPONSE_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 22,
+                            Label = "RETRIGGER_CREATE_DIM_WALLET"
+                        },
+                        new
+                        {
+                            Id = 23,
+                            Label = "VALIDATE_DID_DOCUMENT"
+                        },
+                        new
+                        {
+                            Id = 24,
+                            Label = "RETRIGGER_VALIDATE_DID_DOCUMENT"
+                        },
+                        new
+                        {
+                            Id = 25,
+                            Label = "REQUEST_BPN_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 26,
+                            Label = "AWAIT_BPN_CREDENTIAL_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 27,
+                            Label = "REQUEST_MEMBERSHIP_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 28,
+                            Label = "AWAIT_MEMBERSHIP_CREDENTIAL_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 29,
+                            Label = "TRANSMIT_BPN_DID"
+                        },
+                        new
+                        {
+                            Id = 30,
+                            Label = "RETRIGGER_TRANSMIT_DID_BPN"
+                        },
+                        new
+                        {
+                            Id = 31,
+                            Label = "RETRIGGER_REQUEST_BPN_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 32,
+                            Label = "RETRIGGER_REQUEST_MEMBERSHIP_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 33,
+                            Label = "ASSIGN_INITIAL_ROLES"
+                        },
+                        new
+                        {
+                            Id = 34,
+                            Label = "ASSIGN_BPN_TO_USERS"
+                        },
+                        new
+                        {
+                            Id = 35,
+                            Label = "REMOVE_REGISTRATION_ROLES"
+                        },
+                        new
+                        {
+                            Id = 36,
+                            Label = "SET_THEME"
+                        },
+                        new
+                        {
+                            Id = 37,
+                            Label = "SET_MEMBERSHIP"
+                        },
+                        new
+                        {
+                            Id = 38,
+                            Label = "FINISH_APPLICATION_ACTIVATION"
+                        },
+                        new
+                        {
+                            Id = 39,
+                            Label = "RETRIGGER_ASSIGN_INITIAL_ROLES"
+                        },
+                        new
+                        {
+                            Id = 40,
+                            Label = "RETRIGGER_ASSIGN_BPN_TO_USERS"
+                        },
+                        new
+                        {
+                            Id = 41,
+                            Label = "RETRIGGER_REMOVE_REGISTRATION_ROLES"
+                        },
+                        new
+                        {
+                            Id = 42,
+                            Label = "RETRIGGER_SET_THEME"
+                        },
+                        new
+                        {
+                            Id = 43,
+                            Label = "RETRIGGER_SET_MEMBERSHIP"
+                        },
+                        new
+                        {
+                            Id = 100,
+                            Label = "TRIGGER_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 101,
+                            Label = "AWAIT_START_AUTOSETUP"
+                        },
+                        new
+                        {
+                            Id = 102,
+                            Label = "OFFERSUBSCRIPTION_CLIENT_CREATION"
+                        },
+                        new
+                        {
+                            Id = 103,
+                            Label = "SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION"
+                        },
+                        new
+                        {
+                            Id = 104,
+                            Label = "OFFERSUBSCRIPTION_TECHNICALUSER_CREATION"
+                        },
+                        new
+                        {
+                            Id = 105,
+                            Label = "ACTIVATE_SUBSCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 106,
+                            Label = "TRIGGER_PROVIDER_CALLBACK"
+                        },
+                        new
+                        {
+                            Id = 107,
+                            Label = "RETRIGGER_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 108,
+                            Label = "RETRIGGER_OFFERSUBSCRIPTION_CLIENT_CREATION"
+                        },
+                        new
+                        {
+                            Id = 109,
+                            Label = "RETRIGGER_OFFERSUBSCRIPTION_TECHNICALUSER_CREATION"
+                        },
+                        new
+                        {
+                            Id = 110,
+                            Label = "RETRIGGER_PROVIDER_CALLBACK"
+                        },
+                        new
+                        {
+                            Id = 111,
+                            Label = "MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 112,
+                            Label = "OFFERSUBSCRIPTION_CREATE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 113,
+                            Label = "RETRIGGER_OFFERSUBSCRIPTION_CREATE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 200,
+                            Label = "SYNCHRONIZE_USER"
+                        },
+                        new
+                        {
+                            Id = 201,
+                            Label = "RETRIGGER_SYNCHRONIZE_USER"
+                        },
+                        new
+                        {
+                            Id = 202,
+                            Label = "TRIGGER_CALLBACK_OSP_SUBMITTED"
+                        },
+                        new
+                        {
+                            Id = 203,
+                            Label = "TRIGGER_CALLBACK_OSP_APPROVED"
+                        },
+                        new
+                        {
+                            Id = 204,
+                            Label = "TRIGGER_CALLBACK_OSP_DECLINED"
+                        },
+                        new
+                        {
+                            Id = 205,
+                            Label = "RETRIGGER_CALLBACK_OSP_SUBMITTED"
+                        },
+                        new
+                        {
+                            Id = 206,
+                            Label = "RETRIGGER_CALLBACK_OSP_APPROVED"
+                        },
+                        new
+                        {
+                            Id = 207,
+                            Label = "RETRIGGER_CALLBACK_OSP_DECLINED"
+                        },
+                        new
+                        {
+                            Id = 208,
+                            Label = "MANUAL_DECLINE_OSP"
+                        },
+                        new
+                        {
+                            Id = 209,
+                            Label = "REMOVE_KEYCLOAK_USERS"
+                        },
+                        new
+                        {
+                            Id = 210,
+                            Label = "RETRIGGER_REMOVE_KEYCLOAK_USERS"
+                        },
+                        new
+                        {
+                            Id = 301,
+                            Label = "SEND_MAIL"
+                        },
+                        new
+                        {
+                            Id = 302,
+                            Label = "RETRIGGER_SEND_MAIL"
+                        },
+                        new
+                        {
+                            Id = 400,
+                            Label = "INVITATION_CREATE_CENTRAL_IDP"
+                        },
+                        new
+                        {
+                            Id = 401,
+                            Label = "INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT"
+                        },
+                        new
+                        {
+                            Id = 402,
+                            Label = "INVITATION_ADD_REALM_ROLE"
+                        },
+                        new
+                        {
+                            Id = 403,
+                            Label = "INVITATION_CREATE_SHARED_REALM"
+                        },
+                        new
+                        {
+                            Id = 404,
+                            Label = "INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER"
+                        },
+                        new
+                        {
+                            Id = 405,
+                            Label = "INVITATION_UPDATE_CENTRAL_IDP_URLS"
+                        },
+                        new
+                        {
+                            Id = 406,
+                            Label = "INVITATION_CREATE_SHARED_CLIENT"
+                        },
+                        new
+                        {
+                            Id = 407,
+                            Label = "INVITATION_ENABLE_CENTRAL_IDP"
+                        },
+                        new
+                        {
+                            Id = 408,
+                            Label = "INVITATION_CREATE_DATABASE_IDP"
+                        },
+                        new
+                        {
+                            Id = 409,
+                            Label = "INVITATION_CREATE_USER"
+                        },
+                        new
+                        {
+                            Id = 410,
+                            Label = "RETRIGGER_INVITATION_CREATE_CENTRAL_IDP"
+                        },
+                        new
+                        {
+                            Id = 411,
+                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT"
+                        },
+                        new
+                        {
+                            Id = 412,
+                            Label = "RETRIGGER_INVITATION_ADD_REALM_ROLE"
+                        },
+                        new
+                        {
+                            Id = 413,
+                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_REALM"
+                        },
+                        new
+                        {
+                            Id = 414,
+                            Label = "RETRIGGER_INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER"
+                        },
+                        new
+                        {
+                            Id = 415,
+                            Label = "RETRIGGER_INVITATION_UPDATE_CENTRAL_IDP_URLS"
+                        },
+                        new
+                        {
+                            Id = 416,
+                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_CLIENT"
+                        },
+                        new
+                        {
+                            Id = 417,
+                            Label = "RETRIGGER_INVITATION_ENABLE_CENTRAL_IDP"
+                        },
+                        new
+                        {
+                            Id = 418,
+                            Label = "RETRIGGER_INVITATION_CREATE_USER"
+                        },
+                        new
+                        {
+                            Id = 419,
+                            Label = "RETRIGGER_INVITATION_CREATE_DATABASE_IDP"
+                        },
+                        new
+                        {
+                            Id = 500,
+                            Label = "CREATE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 501,
+                            Label = "RETRIGGER_CREATE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 502,
+                            Label = "AWAIT_CREATE_DIM_TECHNICAL_USER_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 504,
+                            Label = "DELETE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 505,
+                            Label = "AWAIT_DELETE_DIM_TECHNICAL_USER_RESPONSE"
+                        },
+                        new
+                        {
+                            Id = 506,
+                            Label = "RETRIGGER_DELETE_DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 600,
+                            Label = "DELETE_CENTRAL_USER"
+                        },
+                        new
+                        {
+                            Id = 601,
+                            Label = "RETRIGGER_DELETE_CENTRAL_USER"
+                        },
+                        new
+                        {
+                            Id = 602,
+                            Label = "DELETE_COMPANYUSER_ASSIGNED_PROCESS"
+                        },
+                        new
+                        {
+                            Id = 700,
+                            Label = "DELETE_IDP_SHARED_REALM"
+                        },
+                        new
+                        {
+                            Id = 701,
+                            Label = "RETRIGGER_DELETE_IDP_SHARED_REALM"
+                        },
+                        new
+                        {
+                            Id = 702,
+                            Label = "DELETE_IDP_SHARED_SERVICEACCOUNT"
+                        },
+                        new
+                        {
+                            Id = 703,
+                            Label = "RETRIGGER_DELETE_IDP_SHARED_SERVICEACCOUNT"
+                        },
+                        new
+                        {
+                            Id = 704,
+                            Label = "DELETE_CENTRAL_IDENTITY_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 705,
+                            Label = "RETRIGGER_DELETE_CENTRAL_IDENTITY_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 706,
+                            Label = "DELETE_IDENTITY_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 800,
+                            Label = "SELF_DESCRIPTION_CONNECTOR_CREATION"
+                        },
+                        new
+                        {
+                            Id = 801,
+                            Label = "SELF_DESCRIPTION_COMPANY_CREATION"
+                        },
+                        new
+                        {
+                            Id = 802,
+                            Label = "RETRIGGER_SELF_DESCRIPTION_CONNECTOR_CREATION"
+                        },
+                        new
+                        {
+                            Id = 803,
+                            Label = "RETRIGGER_SELF_DESCRIPTION_COMPANY_CREATION"
+                        });
+                });
 
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId>", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
                         .HasColumnName("id");
 
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("LocationId")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character varying(2)")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
+                    b.Property<string>("Label")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
-
-                    b.Property<Guid>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
+                        .HasColumnName("label");
 
-                    b.Property<int>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
+                    b.HasKey("Id")
+                        .HasName("pk_process_types");
 
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20230803");
+                    b.ToTable("process_types", "portal");
 
-                    b.ToTable("audit_connector20230803", "portal");
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "APPLICATION_CHECKLIST"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "OFFER_SUBSCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "PARTNER_REGISTRATION"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "MAILING"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "INVITATION"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "DIM_TECHNICAL_USER"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "USER_PROVISIONING"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "IDENTITYPROVIDER_PROVISIONING"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "SELF_DESCRIPTION_CREATION"
+                        });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditAppSubscriptionDetail20221118", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
-
-                    b.Property<Guid?>("CompanyServiceAccountId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_service_account_id");
-
-                    b.Property<string>("ConnectorUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("connector_url");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("LocationId")
-                        .HasColumnType("text")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text")
-                        .HasColumnName("name");
-
-                    b.Property<Guid?>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                    b.Property<Guid?>("AppInstanceId")
                         .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int?>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
-
-                    b.Property<int?>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20231115");
-
-                    b.ToTable("audit_connector20231115", "portal");
-                });
+                        .HasColumnName("app_instance_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20240814", b =>
-                {
-                    b.Property<Guid>("AuditV1Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("audit_v1id");
+                    b.Property<string>("AppSubscriptionUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("app_subscription_url");
 
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
@@ -1099,22 +790,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid?>("CompanyServiceAccountId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_service_account_id");
-
-                    b.Property<string>("ConnectorUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("connector_url");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
-
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -1123,74 +798,43 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("LocationId")
-                        .HasColumnType("text")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text")
-                        .HasColumnName("name");
-
-                    b.Property<Guid?>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SdCreationProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sd_creation_process_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                    b.Property<Guid>("OfferSubscriptionId")
                         .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int?>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
-
-                    b.Property<int?>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
+                        .HasColumnName("offer_subscription_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20240814");
+                        .HasName("pk_audit_app_subscription_detail20221118");
 
-                    b.ToTable("audit_connector20240814", "portal");
+                    b.ToTable("audit_app_subscription_detail20221118", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20241008", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditAppSubscriptionDetail20231115", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
-                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("audit_v1date_last_changed");
-
-                    b.Property<Guid?>("AuditV1LastEditorId")
+                    b.Property<Guid?>("AppInstanceId")
                         .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
-
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
+                        .HasColumnName("app_instance_id");
 
-                    b.Property<string>("ConnectorUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("connector_url");
+                    b.Property<string>("AppSubscriptionUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("app_subscription_url");
 
-                    b.Property<DateTimeOffset?>("DateLastChanged")
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<Guid?>("HostId")
+                    b.Property<Guid?>("AuditV1LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("host_id");
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -1200,59 +844,23 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("LocationId")
-                        .HasColumnType("text")
-                        .HasColumnName("location_id");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text")
-                        .HasColumnName("name");
-
-                    b.Property<Guid?>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
-
-                    b.Property<Guid?>("SdCreationProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sd_creation_process_id");
-
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
-
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
-
-                    b.Property<int?>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
-
-                    b.Property<Guid?>("TechnicalUserId")
+                    b.Property<Guid?>("OfferSubscriptionId")
                         .HasColumnType("uuid")
-                        .HasColumnName("technical_user_id");
-
-                    b.Property<int?>("TypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("type_id");
+                        .HasColumnName("offer_subscription_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_connector20241008");
+                        .HasName("pk_audit_app_subscription_detail20231115");
 
-                    b.ToTable("audit_connector20241008", "portal");
+                    b.ToTable("audit_app_subscription_detail20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConsent20230412", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCertificateManagement20240416", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
-                    b.Property<Guid>("AgreementId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
-
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -1265,60 +873,74 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Comment")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("comment");
+                    b.Property<int?>("CompanyCertificateStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_status_id");
 
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                    b.Property<int?>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
 
-                    b.Property<Guid>("CompanyUserId")
+                    b.Property<Guid?>("CompanyId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
-
-                    b.Property<int>("ConsentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("consent_status_id");
+                        .HasColumnName("company_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
+                    b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                        .HasColumnName("date_last_changed");
 
                     b.Property<Guid?>("DocumentId")
                         .HasColumnType("uuid")
                         .HasColumnName("document_id");
 
+                    b.Property<string>("ExternalCertificateNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("external_certificate_number");
+
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
+                    b.Property<string>("Issuer")
+                        .HasColumnType("text")
+                        .HasColumnName("issuer");
+
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("Target")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("target");
+                    b.Property<string>("TrustLevel")
+                        .HasColumnType("text")
+                        .HasColumnName("trust_level");
+
+                    b.Property<DateTimeOffset?>("ValidFrom")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_from");
+
+                    b.Property<DateTimeOffset?>("ValidTill")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_till");
+
+                    b.Property<string>("Validator")
+                        .HasColumnType("text")
+                        .HasColumnName("validator");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_consent20230412");
+                        .HasName("pk_audit_certificate_management20240416");
 
-                    b.ToTable("audit_consent20230412", "portal");
+                    b.ToTable("audit_certificate_management20240416", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConsent20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20221005", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
-                    b.Property<Guid?>("AgreementId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
 
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
@@ -1332,29 +954,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Comment")
-                        .HasColumnType("text")
-                        .HasColumnName("comment");
-
-                    b.Property<Guid?>("CompanyId")
+                    b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<Guid?>("CompanyUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
-
-                    b.Property<int?>("ConsentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("consent_status_id");
-
-                    b.Property<DateTimeOffset?>("DateCreated")
+                    b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<Guid?>("DocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("document_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -1364,23 +974,23 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("Target")
-                        .HasColumnType("text")
-                        .HasColumnName("target");
-
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_consent20231115");
+                        .HasName("pk_audit_company_application20221005");
 
-                    b.ToTable("audit_consent20231115", "portal");
+                    b.ToTable("audit_company_application20221005", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20231108", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20230214", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -1393,9 +1003,13 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid?>("CompanyUserId")
+                    b.Property<Guid?>("ChecklistProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("checklist_process_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
                     b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
@@ -1405,30 +1019,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<byte[]>("DocumentContent")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_content");
-
-                    b.Property<byte[]>("DocumentHash")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_hash");
-
-                    b.Property<string>("DocumentName")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("document_name");
-
-                    b.Property<int>("DocumentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_status_id");
-
-                    b.Property<int>("DocumentTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_type_id");
-
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -1437,23 +1027,23 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int>("MediaTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("media_type_id");
-
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_document20231108");
+                        .HasName("pk_audit_company_application20230214");
 
-                    b.ToTable("audit_document20231108", "portal");
+                    b.ToTable("audit_company_application20230214", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20230824", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -1466,11 +1056,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid?>("CompanyUserId")
+                    b.Property<Guid?>("ChecklistProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("checklist_process_id");
 
-                    b.Property<DateTimeOffset?>("DateCreated")
+                    b.Property<int>("CompanyApplicationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_application_type_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
@@ -1478,26 +1076,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<byte[]>("DocumentContent")
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_content");
-
-                    b.Property<byte[]>("DocumentHash")
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_hash");
-
-                    b.Property<string>("DocumentName")
-                        .HasColumnType("text")
-                        .HasColumnName("document_name");
-
-                    b.Property<int?>("DocumentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_status_id");
-
-                    b.Property<int?>("DocumentTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_type_id");
-
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -1506,23 +1084,27 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int?>("MediaTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("media_type_id");
+                    b.Property<Guid?>("OnboardingServiceProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("onboarding_service_provider_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_document20231115");
+                        .HasName("pk_audit_company_application20230824");
 
-                    b.ToTable("audit_document20231115", "portal");
+                    b.ToTable("audit_company_application20230824", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20241120", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20231115", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
+                    b.Property<int?>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -1533,11 +1115,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("ChecklistProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("checklist_process_id");
+
+                    b.Property<int?>("CompanyApplicationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_application_type_id");
 
-                    b.Property<Guid?>("CompanyUserId")
+                    b.Property<Guid?>("CompanyId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("company_id");
 
                     b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
@@ -1547,30 +1137,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<byte[]>("DocumentContent")
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_content");
-
-                    b.Property<byte[]>("DocumentHash")
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_hash");
-
-                    b.Property<string>("DocumentName")
-                        .HasColumnType("text")
-                        .HasColumnName("document_name");
-
-                    b.Property<long?>("DocumentSize")
-                        .HasColumnType("bigint")
-                        .HasColumnName("document_size");
-
-                    b.Property<int?>("DocumentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_status_id");
-
-                    b.Property<int?>("DocumentTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_type_id");
-
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -1579,17 +1145,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int?>("MediaTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("media_type_id");
+                    b.Property<Guid?>("OnboardingServiceProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("onboarding_service_provider_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_document20241120");
+                        .HasName("pk_audit_company_application20231115");
 
-                    b.ToTable("audit_document20241120", "portal");
+                    b.ToTable("audit_company_application20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentity20230526", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyAssignedRole2023316", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1612,43 +1178,25 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<int>("CompanyRoleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_role_id");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<int>("IdentityTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("identity_type_id");
-
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("UserEntityId")
-                        .HasMaxLength(36)
-                        .HasColumnType("character varying(36)")
-                        .HasColumnName("user_entity_id");
-
-                    b.Property<int>("UserStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("user_status_id")
-                        .HasAnnotation("Relational:JsonPropertyName", "user_status_id");
-
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_identity20230526");
+                        .HasName("pk_audit_company_assigned_role2023316");
 
-                    b.ToTable("audit_identity20230526", "portal");
+                    b.ToTable("audit_company_assigned_role2023316", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentity20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUser20221005", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1667,11 +1215,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid?>("CompanyId")
+                    b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<DateTimeOffset?>("DateCreated")
+                    b.Property<int>("CompanyUserStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_user_status_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
@@ -1679,33 +1231,37 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
+                    b.Property<string>("Email")
+                        .HasColumnType("text")
+                        .HasColumnName("email");
+
+                    b.Property<string>("Firstname")
+                        .HasColumnType("text")
+                        .HasColumnName("firstname");
+
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<int?>("IdentityTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("identity_type_id");
-
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("UserEntityId")
-                        .HasColumnType("text")
-                        .HasColumnName("user_entity_id");
+                    b.Property<byte[]>("Lastlogin")
+                        .HasColumnType("bytea")
+                        .HasColumnName("lastlogin");
 
-                    b.Property<int?>("UserStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("user_status_id");
+                    b.Property<string>("Lastname")
+                        .HasColumnType("text")
+                        .HasColumnName("lastname");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_identity20231115");
+                        .HasName("pk_audit_company_user20221005");
 
-                    b.ToTable("audit_identity20231115", "portal");
+                    b.ToTable("audit_company_user20221005", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentityAssignedRole20230522", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUser20230522", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1724,25 +1280,41 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid>("IdentityId")
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text")
+                        .HasColumnName("email");
+
+                    b.Property<string>("Firstname")
+                        .HasColumnType("text")
+                        .HasColumnName("firstname");
+
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("identity_id");
+                        .HasColumnName("id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("UserRoleId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_role_id");
+                    b.Property<byte[]>("Lastlogin")
+                        .HasColumnType("bytea")
+                        .HasColumnName("lastlogin");
+
+                    b.Property<string>("Lastname")
+                        .HasColumnType("text")
+                        .HasColumnName("lastname");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_identity_assigned_role20230522");
+                        .HasName("pk_audit_company_user20230523");
 
-                    b.ToTable("audit_identity_assigned_role20230522", "portal");
+                    b.ToTable("audit_company_user20230523", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20230119", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUserAssignedRole20221018", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1761,70 +1333,25 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("ContactEmail")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_email");
-
-                    b.Property<string>("ContactNumber")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_number");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
-
-                    b.Property<Guid>("Id")
+                    b.Property<Guid>("CompanyUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("company_user_id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("MarketingUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("marketing_url");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text")
-                        .HasColumnName("name");
-
-                    b.Property<int>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
-
-                    b.Property<int>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
-
-                    b.Property<string>("Provider")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("provider");
-
-                    b.Property<Guid?>("ProviderCompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
-
-                    b.Property<Guid?>("SalesManagerId")
+                    b.Property<Guid>("UserRoleId")
                         .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+                        .HasColumnName("user_role_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer20230119");
+                        .HasName("pk_audit_company_user_assigned_role20221018");
 
-                    b.ToTable("audit_offer20230119", "portal");
+                    b.ToTable("audit_company_user_assigned_role20221018", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20230406", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230405", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1843,25 +1370,23 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("ContactEmail")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_email");
-
-                    b.Property<string>("ContactNumber")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_number");
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("connector_url");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<bool?>("DapsRegistrationSuccessful")
+                        .HasColumnType("boolean")
+                        .HasColumnName("daps_registration_successful");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -1871,46 +1396,45 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int>("LicenseTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("license_type_id");
-
-                    b.Property<string>("MarketingUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("marketing_url");
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("location_id");
 
                     b.Property<string>("Name")
-                        .HasColumnType("text")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("name");
 
-                    b.Property<int>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
+                    b.Property<Guid>("ProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_id");
 
-                    b.Property<int>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<string>("Provider")
-                        .IsRequired()
+                    b.Property<string>("SelfDescriptionMessage")
                         .HasColumnType("text")
-                        .HasColumnName("provider");
+                        .HasColumnName("self_description_message");
 
-                    b.Property<Guid?>("ProviderCompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
 
-                    b.Property<Guid?>("SalesManagerId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer20230406");
+                        .HasName("pk_audit_connector20230405");
 
-                    b.ToTable("audit_offer20230406", "portal");
+                    b.ToTable("audit_connector20230405", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230503", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -1929,25 +1453,27 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("ContactEmail")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_email");
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
 
-                    b.Property<string>("ContactNumber")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_number");
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("connector_url");
 
-                    b.Property<DateTimeOffset?>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<bool?>("DapsRegistrationSuccessful")
+                        .HasColumnType("boolean")
+                        .HasColumnName("daps_registration_successful");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -1957,45 +1483,45 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int?>("LicenseTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("license_type_id");
-
-                    b.Property<string>("MarketingUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("marketing_url");
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("location_id");
 
                     b.Property<string>("Name")
-                        .HasColumnType("text")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("name");
 
-                    b.Property<int?>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
+                    b.Property<Guid>("ProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_id");
 
-                    b.Property<int?>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<string>("Provider")
+                    b.Property<string>("SelfDescriptionMessage")
                         .HasColumnType("text")
-                        .HasColumnName("provider");
+                        .HasColumnName("self_description_message");
 
-                    b.Property<Guid?>("ProviderCompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
 
-                    b.Property<Guid?>("SalesManagerId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer20231115");
+                        .HasName("pk_audit_connector20230503");
 
-                    b.ToTable("audit_offer20231115", "portal");
+                    b.ToTable("audit_connector20230503", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20240911", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230803", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2014,25 +1540,23 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("ContactEmail")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_email");
-
-                    b.Property<string>("ContactNumber")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_number");
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
 
-                    b.Property<DateTimeOffset?>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("connector_url");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -2042,41 +1566,45 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int?>("LicenseTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("license_type_id");
-
-                    b.Property<string>("MarketingUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("marketing_url");
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("location_id");
 
                     b.Property<string>("Name")
-                        .HasColumnType("text")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("name");
 
-                    b.Property<int?>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
-
-                    b.Property<int?>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
-
-                    b.Property<Guid?>("ProviderCompanyId")
+                    b.Property<Guid>("ProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
+                        .HasColumnName("provider_id");
 
-                    b.Property<Guid?>("SalesManagerId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+                        .HasColumnName("self_description_document_id");
+
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer20240911");
+                        .HasName("pk_audit_connector20230803");
 
-                    b.ToTable("audit_offer20240911", "portal");
+                    b.ToTable("audit_connector20230803", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20241219", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20231115", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2095,29 +1623,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("ContactEmail")
-                        .HasColumnType("text")
-                        .HasColumnName("contact_email");
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
 
-                    b.Property<string>("ContactNumber")
+                    b.Property<string>("ConnectorUrl")
                         .HasColumnType("text")
-                        .HasColumnName("contact_number");
-
-                    b.Property<DateTimeOffset?>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                        .HasColumnName("connector_url");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
-
-                    b.Property<bool?>("DisplayTechnicalUser")
-                        .HasColumnType("boolean")
-                        .HasColumnName("display_technical_user");
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -2127,41 +1647,41 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int?>("LicenseTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("license_type_id");
-
-                    b.Property<string>("MarketingUrl")
+                    b.Property<string>("LocationId")
                         .HasColumnType("text")
-                        .HasColumnName("marketing_url");
+                        .HasColumnName("location_id");
 
                     b.Property<string>("Name")
                         .HasColumnType("text")
                         .HasColumnName("name");
 
-                    b.Property<int?>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
-
-                    b.Property<int?>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
-
-                    b.Property<Guid?>("ProviderCompanyId")
+                    b.Property<Guid?>("ProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
+                        .HasColumnName("provider_id");
 
-                    b.Property<Guid?>("SalesManagerId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+                        .HasColumnName("self_description_document_id");
+
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int?>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<int?>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer20241219");
+                        .HasName("pk_audit_connector20231115");
 
-                    b.ToTable("audit_offer20241219", "portal");
+                    b.ToTable("audit_connector20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20221005", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20240814", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2172,53 +1692,77 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<Guid?>("AuditV1LastEditorId")
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
+
+                    b.Property<string>("ConnectorUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("connector_url");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("HostId")
                         .HasColumnType("uuid")
-                        .HasColumnName("audit_v1last_editor_id");
+                        .HasColumnName("host_id");
 
-                    b.Property<int>("AuditV1OperationId")
-                        .HasColumnType("integer")
-                        .HasColumnName("audit_v1operation_id");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<string>("Description")
+                    b.Property<string>("LocationId")
                         .HasColumnType("text")
-                        .HasColumnName("description");
+                        .HasColumnName("location_id");
 
-                    b.Property<string>("DisplayName")
+                    b.Property<string>("Name")
                         .HasColumnType("text")
-                        .HasColumnName("display_name");
+                        .HasColumnName("name");
 
-                    b.Property<Guid>("Id")
+                    b.Property<Guid?>("ProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("provider_id");
 
-                    b.Property<Guid?>("LastEditorId")
+                    b.Property<Guid?>("SdCreationProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
+                        .HasColumnName("sd_creation_process_id");
 
-                    b.Property<Guid>("OfferId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<int>("OfferSubscriptionStatusId")
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int?>("StatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("offer_subscription_status_id");
+                        .HasColumnName("status_id");
 
-                    b.Property<Guid>("RequesterId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("requester_id");
+                    b.Property<int?>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer_subscription20221005");
+                        .HasName("pk_audit_connector20240814");
 
-                    b.ToTable("audit_offer_subscription20221005", "portal");
+                    b.ToTable("audit_connector20240814", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20230317", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20241008", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2237,17 +1781,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<string>("Description")
+                    b.Property<string>("ConnectorUrl")
                         .HasColumnType("text")
-                        .HasColumnName("description");
+                        .HasColumnName("connector_url");
 
-                    b.Property<string>("DisplayName")
-                        .HasColumnType("text")
-                        .HasColumnName("display_name");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -2257,35 +1801,59 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferId")
+                    b.Property<string>("LocationId")
+                        .HasColumnType("text")
+                        .HasColumnName("location_id");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<Guid?>("ProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                        .HasColumnName("provider_id");
 
-                    b.Property<int>("OfferSubscriptionStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_subscription_status_id");
+                    b.Property<Guid?>("SdCreationProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sd_creation_process_id");
 
-                    b.Property<Guid?>("ProcessId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("process_id");
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<Guid>("RequesterId")
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int?>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<Guid?>("TechnicalUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("requester_id");
+                        .HasColumnName("technical_user_id");
+
+                    b.Property<int?>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer_subscription20230317");
+                        .HasName("pk_audit_connector20241008");
 
-                    b.ToTable("audit_offer_subscription20230317", "portal");
+                    b.ToTable("audit_connector20241008", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20231013", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConsent20230412", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -2298,21 +1866,30 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
+                    b.Property<string>("Comment")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("comment");
+
                     b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<int>("ConsentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("consent_status_id");
+
                     b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<string>("Description")
-                        .HasColumnType("text")
-                        .HasColumnName("description");
-
-                    b.Property<string>("DisplayName")
-                        .HasColumnType("text")
-                        .HasColumnName("display_name");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -2322,35 +1899,28 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
-
-                    b.Property<int>("OfferSubscriptionStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_subscription_status_id");
-
-                    b.Property<Guid?>("ProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.Property<Guid>("RequesterId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("requester_id");
+                    b.Property<string>("Target")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("target");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer_subscription20231013");
+                        .HasName("pk_audit_consent20230412");
 
-                    b.ToTable("audit_offer_subscription20231013", "portal");
+                    b.ToTable("audit_consent20230412", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConsent20231115", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("audit_v1id");
 
+                    b.Property<Guid?>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
                     b.Property<DateTimeOffset>("AuditV1DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("audit_v1date_last_changed");
@@ -2363,21 +1933,29 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
+                    b.Property<string>("Comment")
+                        .HasColumnType("text")
+                        .HasColumnName("comment");
+
                     b.Property<Guid?>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
+                    b.Property<Guid?>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<int?>("ConsentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("consent_status_id");
+
                     b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<string>("Description")
-                        .HasColumnType("text")
-                        .HasColumnName("description");
-
-                    b.Property<string>("DisplayName")
-                        .HasColumnType("text")
-                        .HasColumnName("display_name");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
 
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
@@ -2387,29 +1965,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid?>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
-
-                    b.Property<int?>("OfferSubscriptionStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_subscription_status_id");
-
-                    b.Property<Guid?>("ProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.Property<Guid?>("RequesterId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("requester_id");
+                    b.Property<string>("Target")
+                        .HasColumnType("text")
+                        .HasColumnName("target");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_offer_subscription20231115");
+                        .HasName("pk_audit_consent20231115");
 
-                    b.ToTable("audit_offer_subscription20231115", "portal");
+                    b.ToTable("audit_consent20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditProviderCompanyDetail20230614", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20231108", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2428,18 +1994,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("AutoSetupCallbackUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("auto_setup_callback_url");
-
-                    b.Property<string>("AutoSetupUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("auto_setup_url");
-
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid?>("CompanyUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("company_user_id");
 
                     b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
@@ -2449,6 +2006,30 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
+                    b.Property<byte[]>("DocumentContent")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
+
+                    b.Property<byte[]>("DocumentHash")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("document_name");
+
+                    b.Property<int>("DocumentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_status_id");
+
+                    b.Property<int>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
+
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -2457,13 +2038,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
+                    b.Property<int>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
+
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_provider_company_detail20230614");
+                        .HasName("pk_audit_document20231108");
 
-                    b.ToTable("audit_provider_company_detail20230614", "portal");
+                    b.ToTable("audit_document20231108", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditProviderCompanyDetail20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20231115", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2482,17 +2067,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("AutoSetupCallbackUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("auto_setup_callback_url");
-
-                    b.Property<string>("AutoSetupUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("auto_setup_url");
-
-                    b.Property<Guid?>("CompanyId")
+                    b.Property<Guid?>("CompanyUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("company_user_id");
 
                     b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
@@ -2502,6 +2079,26 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
+                    b.Property<byte[]>("DocumentContent")
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
+
+                    b.Property<byte[]>("DocumentHash")
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .HasColumnType("text")
+                        .HasColumnName("document_name");
+
+                    b.Property<int?>("DocumentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_status_id");
+
+                    b.Property<int?>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
+
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -2510,13 +2107,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
+                    b.Property<int?>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
+
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_provider_company_detail20231115");
+                        .HasName("pk_audit_document20231115");
 
-                    b.ToTable("audit_provider_company_detail20231115", "portal");
+                    b.ToTable("audit_document20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditUserRole20221017", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20241120", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2535,6 +2136,42 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
+                    b.Property<Guid?>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<byte[]>("DocumentContent")
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
+
+                    b.Property<byte[]>("DocumentHash")
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .HasColumnType("text")
+                        .HasColumnName("document_name");
+
+                    b.Property<long?>("DocumentSize")
+                        .HasColumnType("bigint")
+                        .HasColumnName("document_size");
+
+                    b.Property<int?>("DocumentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_status_id");
+
+                    b.Property<int?>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
+
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid")
                         .HasColumnName("id");
@@ -2543,22 +2180,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
-
-                    b.Property<string>("UserRoleText")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("user_role");
+                    b.Property<int?>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
 
                     b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_user_role20221017");
+                        .HasName("pk_audit_document20241120");
 
-                    b.ToTable("audit_user_role20221017", "portal");
+                    b.ToTable("audit_document20241120", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditUserRole20231115", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentity20230526", b =>
                 {
                     b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
@@ -2577,47 +2209,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<Guid?>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
-
-                    b.Property<string>("UserRoleText")
-                        .HasColumnType("text")
-                        .HasColumnName("user_role");
-
-                    b.HasKey("AuditV1Id")
-                        .HasName("pk_audit_user_role20231115");
-
-                    b.ToTable("audit_user_role20231115", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
+                    b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("City")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("city");
-
-                    b.Property<string>("CountryAlpha2Code")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("country_alpha2code")
-                        .HasAnnotation("Relational:JsonPropertyName", "country_alpha2code");
+                        .HasColumnName("company_id");
 
                     b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
@@ -2627,424 +2221,324 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<string>("Region")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("region");
-
-                    b.Property<string>("Streetadditional")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("streetadditional");
-
-                    b.Property<string>("Streetname")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("streetname");
-
-                    b.Property<string>("Streetnumber")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("streetnumber");
-
-                    b.Property<string>("Zipcode")
-                        .HasMaxLength(12)
-                        .HasColumnType("character varying(12)")
-                        .HasColumnName("zipcode");
-
-                    b.HasKey("Id")
-                        .HasName("pk_addresses");
-
-                    b.HasIndex("CountryAlpha2Code")
-                        .HasDatabaseName("ix_addresses_country_alpha2code");
-
-                    b.ToTable("addresses", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", b =>
-                {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<int>("AgreementCategoryId")
-                        .HasColumnType("integer")
-                        .HasColumnName("agreement_category_id");
-
-                    b.Property<string>("AgreementLink")
-                        .HasColumnType("text")
-                        .HasColumnName("agreement_link");
-
-                    b.Property<int>("AgreementStatusId")
-                        .ValueGeneratedOnAdd()
+                    b.Property<int>("IdentityTypeId")
                         .HasColumnType("integer")
-                        .HasDefaultValue(1)
-                        .HasColumnName("agreement_status_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("DocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("document_id");
-
-                    b.Property<Guid>("IssuerCompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("issuer_company_id");
-
-                    b.Property<bool>("Mandatory")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true)
-                        .HasColumnName("mandatory");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
-
-                    b.Property<Guid?>("UseCaseId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("use_case_id");
-
-                    b.HasKey("Id")
-                        .HasName("pk_agreements");
-
-                    b.HasIndex("AgreementCategoryId")
-                        .HasDatabaseName("ix_agreements_agreement_category_id");
-
-                    b.HasIndex("AgreementStatusId")
-                        .HasDatabaseName("ix_agreements_agreement_status_id");
-
-                    b.HasIndex("DocumentId")
-                        .HasDatabaseName("ix_agreements_document_id");
-
-                    b.HasIndex("IssuerCompanyId")
-                        .HasDatabaseName("ix_agreements_issuer_company_id");
-
-                    b.HasIndex("UseCaseId")
-                        .HasDatabaseName("ix_agreements_use_case_id");
-
-                    b.ToTable("agreements", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedCompanyRole", b =>
-                {
-                    b.Property<Guid>("AgreementId")
+                        .HasColumnName("identity_type_id");
+
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<int>("CompanyRoleId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_role_id");
+                    b.Property<string>("UserEntityId")
+                        .HasMaxLength(36)
+                        .HasColumnType("character varying(36)")
+                        .HasColumnName("user_entity_id");
 
-                    b.HasKey("AgreementId", "CompanyRoleId")
-                        .HasName("pk_agreement_assigned_company_roles");
+                    b.Property<int>("UserStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("user_status_id")
+                        .HasAnnotation("Relational:JsonPropertyName", "user_status_id");
 
-                    b.HasIndex("CompanyRoleId")
-                        .HasDatabaseName("ix_agreement_assigned_company_roles_company_role_id");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_identity20230526");
 
-                    b.ToTable("agreement_assigned_company_roles", "portal");
+                    b.ToTable("audit_identity20230526", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOffer", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentity20231115", b =>
                 {
-                    b.Property<Guid>("AgreementId")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<Guid>("OfferId")
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.HasKey("AgreementId", "OfferId")
-                        .HasName("pk_agreement_assigned_offers");
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.HasIndex("OfferId")
-                        .HasDatabaseName("ix_agreement_assigned_offers_offer_id");
+                    b.Property<Guid?>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                    b.ToTable("agreement_assigned_offers", "portal");
-                });
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOfferType", b =>
-                {
-                    b.Property<Guid>("AgreementId")
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
+                        .HasColumnName("id");
 
-                    b.Property<int>("OfferTypeId")
+                    b.Property<int?>("IdentityTypeId")
                         .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
-
-                    b.HasKey("AgreementId", "OfferTypeId")
-                        .HasName("pk_agreement_assigned_offer_types");
+                        .HasColumnName("identity_type_id");
 
-                    b.HasIndex("OfferTypeId")
-                        .HasDatabaseName("ix_agreement_assigned_offer_types_offer_type_id");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.ToTable("agreement_assigned_offer_types", "portal");
-                });
+                    b.Property<string>("UserEntityId")
+                        .HasColumnType("text")
+                        .HasColumnName("user_entity_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementCategory", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<int?>("UserStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
-
-                    b.HasKey("Id")
-                        .HasName("pk_agreement_categories");
+                        .HasColumnName("user_status_id");
 
-                    b.ToTable("agreement_categories", "portal");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_identity20231115");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "CX_FRAME_CONTRACT"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "APP_CONTRACT"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "DATA_CONTRACT"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "SERVICE_CONTRACT"
-                        });
+                    b.ToTable("audit_identity20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentityAssignedRole20230522", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("IdentityId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_agreement_statuses");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.ToTable("agreement_statuses", "portal");
+                    b.Property<Guid>("UserRoleId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "ACTIVE"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "INACTIVE"
-                        });
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_identity_assigned_role20230522");
+
+                    b.ToTable("audit_identity_assigned_role20230522", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppAssignedUseCase", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20230119", b =>
                 {
-                    b.Property<Guid>("AppId")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("app_id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<Guid>("UseCaseId")
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("use_case_id");
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.HasKey("AppId", "UseCaseId")
-                        .HasName("pk_app_assigned_use_cases");
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.HasIndex("UseCaseId")
-                        .HasDatabaseName("ix_app_assigned_use_cases_use_case_id");
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
 
-                    b.ToTable("app_assigned_use_cases", "portal");
-                });
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstance", b =>
-                {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid>("AppId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_id");
-
-                    b.Property<Guid>("IamClientId")
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("iam_client_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_app_instances");
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
 
-                    b.HasIndex("AppId")
-                        .HasDatabaseName("ix_app_instances_app_id");
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
 
-                    b.HasIndex("IamClientId")
-                        .HasDatabaseName("ix_app_instances_iam_client_id");
+                    b.Property<int>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
 
-                    b.ToTable("app_instances", "portal");
-                });
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceAssignedTechnicalUser", b =>
-                {
-                    b.Property<Guid>("AppInstanceId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_instance_id");
+                    b.Property<string>("Provider")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("provider");
 
-                    b.Property<Guid>("TechnicalUserId")
+                    b.Property<Guid?>("ProviderCompanyId")
                         .HasColumnType("uuid")
-                        .HasColumnName("technical_user_id");
+                        .HasColumnName("provider_company_id");
 
-                    b.HasKey("AppInstanceId", "TechnicalUserId")
-                        .HasName("pk_app_instance_assigned_technical_users");
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
 
-                    b.HasIndex("TechnicalUserId")
-                        .HasDatabaseName("ix_app_instance_assigned_technical_users_technical_user_id");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20230119");
 
-                    b.ToTable("app_instance_assigned_technical_users", "portal");
+                    b.ToTable("audit_offer20230119", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceSetup", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20230406", b =>
                 {
-                    b.Property<Guid>("Id")
+                    b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid>("AppId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_id");
-
-                    b.Property<string>("InstanceUrl")
-                        .HasColumnType("text")
-                        .HasColumnName("instance_url");
-
-                    b.Property<bool>("IsSingleInstance")
-                        .HasColumnType("boolean")
-                        .HasColumnName("is_single_instance");
+                        .HasColumnName("audit_v1id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_app_instance_setups");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.HasIndex("AppId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_app_instance_setups_app_id");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.ToTable("app_instance_setups", "portal");
-                });
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppLanguage", b =>
-                {
-                    b.Property<Guid>("AppId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_id");
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
 
-                    b.Property<string>("LanguageShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("language_short_name");
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
 
-                    b.HasKey("AppId", "LanguageShortName")
-                        .HasName("pk_app_languages");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.HasIndex("LanguageShortName")
-                        .HasDatabaseName("ix_app_languages_language_short_name");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.ToTable("app_languages", "portal");
-                });
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppSubscriptionDetail", b =>
-                {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid?>("AppInstanceId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("app_instance_id");
-
-                    b.Property<string>("AppSubscriptionUrl")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("app_subscription_url");
-
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferSubscriptionId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
+                    b.Property<int>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_app_subscription_details");
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
 
-                    b.HasIndex("AppInstanceId")
-                        .HasDatabaseName("ix_app_subscription_details_app_instance_id");
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_app_subscription_details_last_editor_id");
+                    b.Property<int>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
 
-                    b.HasIndex("OfferSubscriptionId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_app_subscription_details_offer_subscription_id");
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
 
-                    b.ToTable("app_subscription_details", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL");
+                    b.Property<string>("Provider")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("provider");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL");
-                        });
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_app_subscription_detail20231115\" (\"id\", \"offer_subscription_id\", \"app_instance_id\", \"app_subscription_url\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"offer_subscription_id\", \r\n  NEW.\"app_instance_id\", \r\n  NEW.\"app_subscription_url\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL AFTER INSERT\r\nON \"portal\".\"app_subscription_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_app_subscription_detail20231115\" (\"id\", \"offer_subscription_id\", \"app_instance_id\", \"app_subscription_url\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"offer_subscription_id\", \r\n  NEW.\"app_instance_id\", \r\n  NEW.\"app_subscription_url\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL AFTER UPDATE\r\nON \"portal\".\"app_subscription_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL\"();");
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20230406");
+
+                    b.ToTable("audit_offer20230406", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntry", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20231115", b =>
                 {
-                    b.Property<Guid>("ApplicationId")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("application_id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<int>("ApplicationChecklistEntryTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_checklist_entry_type_id");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<int>("ApplicationChecklistEntryStatusId")
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("application_checklist_entry_status_id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Comment")
+                    b.Property<string>("ContactEmail")
                         .HasColumnType("text")
-                        .HasColumnName("comment");
+                        .HasColumnName("contact_email");
 
-                    b.Property<DateTimeOffset>("DateCreated")
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
@@ -3052,1075 +2546,855 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.HasKey("ApplicationId", "ApplicationChecklistEntryTypeId")
-                        .HasName("pk_application_checklist");
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
 
-                    b.HasIndex("ApplicationChecklistEntryStatusId")
-                        .HasDatabaseName("ix_application_checklist_application_checklist_entry_status_id");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
-                    b.HasIndex("ApplicationChecklistEntryTypeId")
-                        .HasDatabaseName("ix_application_checklist_application_checklist_entry_type_id");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.ToTable("application_checklist", "portal");
-                });
+                    b.Property<int?>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryStatus", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("OfferStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("offer_status_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<int?>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_application_checklist_statuses");
+                    b.Property<string>("Provider")
+                        .HasColumnType("text")
+                        .HasColumnName("provider");
 
-                    b.ToTable("application_checklist_statuses", "portal");
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "TO_DO"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "IN_PROGRESS"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "DONE"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "FAILED"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "SKIPPED"
-                        });
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20231115");
+
+                    b.ToTable("audit_offer20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20240911", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
 
-                    b.HasKey("Id")
-                        .HasName("pk_application_checklist_types");
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
 
-                    b.ToTable("application_checklist_types", "portal");
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "REGISTRATION_VERIFICATION"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "BUSINESS_PARTNER_NUMBER"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "IDENTITY_WALLET"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "BPNL_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "MEMBERSHIP_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "CLEARING_HOUSE"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "SELF_DESCRIPTION_LP"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "APPLICATION_ACTIVATION"
-                        });
-                });
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AuditOperation", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_audit_operation");
+                    b.Property<int?>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
 
-                    b.ToTable("audit_operation", "portal");
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "INSERT"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "UPDATE"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "DELETE"
-                        });
-                });
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.BpdmIdentifier", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<int?>("OfferStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("offer_status_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<int?>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_bpdm_identifiers");
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
 
-                    b.ToTable("bpdm_identifiers", "portal");
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "EU_VAT_ID_DE"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "CH_UID"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "EU_VAT_ID_FR"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "FR_SIREN"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "EU_VAT_ID_AT"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "DE_BNUM"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "CZ_ICO"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "EU_VAT_ID_CZ"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "EU_VAT_ID_PL"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "EU_VAT_ID_BE"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Label = "EU_VAT_ID_CH"
-                        },
-                        new
-                        {
-                            Id = 12,
-                            Label = "EU_VAT_ID_DK"
-                        },
-                        new
-                        {
-                            Id = 13,
-                            Label = "EU_VAT_ID_ES"
-                        },
-                        new
-                        {
-                            Id = 14,
-                            Label = "EU_VAT_ID_GB"
-                        },
-                        new
-                        {
-                            Id = 15,
-                            Label = "EU_VAT_ID_NO"
-                        },
-                        new
-                        {
-                            Id = 16,
-                            Label = "BE_ENT_NO"
-                        },
-                        new
-                        {
-                            Id = 17,
-                            Label = "CVR_DK"
-                        },
-                        new
-                        {
-                            Id = 18,
-                            Label = "ID_CRN"
-                        },
-                        new
-                        {
-                            Id = 19,
-                            Label = "NO_ORGID"
-                        },
-                        new
-                        {
-                            Id = 20,
-                            Label = "LEI_ID"
-                        });
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20240911");
+
+                    b.ToTable("audit_offer20240911", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20241219", b =>
                 {
-                    b.Property<Guid>("Id")
+                    b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<Guid?>("AddressId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("address_id");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<string>("BusinessPartnerNumber")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasColumnName("business_partner_number");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.Property<int>("CompanyStatusId")
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("company_status_id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<string>("DidDocumentLocation")
-                        .HasColumnType("text")
-                        .HasColumnName("did_document_location");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
 
-                    b.Property<Guid?>("SdCreationProcessId")
+                    b.Property<bool?>("DisplayTechnicalUser")
+                        .HasColumnType("boolean")
+                        .HasColumnName("display_technical_user");
+
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("sd_creation_process_id");
+                        .HasColumnName("id");
 
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<string>("Shortname")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("shortname");
+                    b.Property<int?>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_companies");
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
 
-                    b.HasIndex("AddressId")
-                        .HasDatabaseName("ix_companies_address_id");
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
 
-                    b.HasIndex("CompanyStatusId")
-                        .HasDatabaseName("ix_companies_company_status_id");
+                    b.Property<int?>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
 
-                    b.HasIndex("SdCreationProcessId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_companies_sd_creation_process_id");
+                    b.Property<int?>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
 
-                    b.HasIndex("SelfDescriptionDocumentId")
-                        .HasDatabaseName("ix_companies_self_description_document_id");
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
 
-                    b.ToTable("companies", "portal");
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20241219");
+
+                    b.ToTable("audit_offer20241219", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20221005", b =>
                 {
-                    b.Property<Guid>("Id")
+                    b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<int>("ApplicationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("application_status_id");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<Guid?>("ChecklistProcessId")
+                    b.Property<Guid?>("AuditV1LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("checklist_process_id");
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.Property<int>("CompanyApplicationTypeId")
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("company_application_type_id");
+                        .HasColumnName("audit_v1operation_id");
 
                     b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
 
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid?>("OnboardingServiceProviderId")
+                    b.Property<Guid>("OfferId")
                         .HasColumnType("uuid")
-                        .HasColumnName("onboarding_service_provider_id");
-
-                    b.HasKey("Id")
-                        .HasName("pk_company_applications");
-
-                    b.HasIndex("ApplicationStatusId")
-                        .HasDatabaseName("ix_company_applications_application_status_id");
-
-                    b.HasIndex("ChecklistProcessId")
-                        .HasDatabaseName("ix_company_applications_checklist_process_id");
-
-                    b.HasIndex("CompanyApplicationTypeId")
-                        .HasDatabaseName("ix_company_applications_company_application_type_id");
-
-                    b.HasIndex("CompanyId")
-                        .HasDatabaseName("ix_company_applications_company_id");
-
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_company_applications_last_editor_id");
-
-                    b.HasIndex("OnboardingServiceProviderId")
-                        .HasDatabaseName("ix_company_applications_onboarding_service_provider_id");
-
-                    b.ToTable("company_applications", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION");
-
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION");
-                        });
-
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_application20231115\" (\"id\", \"date_created\", \"date_last_changed\", \"application_status_id\", \"company_id\", \"checklist_process_id\", \"company_application_type_id\", \"onboarding_service_provider_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"application_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"checklist_process_id\", \r\n  NEW.\"company_application_type_id\", \r\n  NEW.\"onboarding_service_provider_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION AFTER INSERT\r\nON \"portal\".\"company_applications\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_application20231115\" (\"id\", \"date_created\", \"date_last_changed\", \"application_status_id\", \"company_id\", \"checklist_process_id\", \"company_application_type_id\", \"onboarding_service_provider_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"application_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"checklist_process_id\", \r\n  NEW.\"company_application_type_id\", \r\n  NEW.\"onboarding_service_provider_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION AFTER UPDATE\r\nON \"portal\".\"company_applications\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION\"();");
-                });
+                        .HasColumnName("offer_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationStatus", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<int>("OfferSubscriptionStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                        .HasColumnName("offer_subscription_status_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_application_statuses");
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
 
-                    b.ToTable("company_application_statuses", "portal");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20221005");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "CREATED"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "ADD_COMPANY_DATA"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "INVITE_USER"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "SELECT_COMPANY_ROLE"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "UPLOAD_DOCUMENTS"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "VERIFY"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "SUBMITTED"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "CONFIRMED"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "DECLINED"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "CANCELLED_BY_CUSTOMER"
-                        });
+                    b.ToTable("audit_offer_subscription20221005", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20230317", b =>
                 {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_application_types");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.ToTable("company_application_types", "portal");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "INTERNAL"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "EXTERNAL"
-                        });
-                });
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedRole", b =>
-                {
                     b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<int>("CompanyRoleId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_role_id");
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.HasKey("CompanyId", "CompanyRoleId")
-                        .HasName("pk_company_assigned_roles");
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.HasIndex("CompanyRoleId")
-                        .HasDatabaseName("ix_company_assigned_roles_company_role_id");
+                    b.Property<int>("OfferSubscriptionStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_subscription_status_id");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_company_assigned_roles_last_editor_id");
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
 
-                    b.ToTable("company_assigned_roles", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE");
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE");
-                        });
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20230317");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_assigned_role2023316\" (\"company_id\", \"company_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"company_id\", \r\n  NEW.\"company_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE AFTER INSERT\r\nON \"portal\".\"company_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_assigned_role2023316\" (\"company_id\", \"company_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"company_id\", \r\n  NEW.\"company_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE AFTER UPDATE\r\nON \"portal\".\"company_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE\"();");
+                    b.ToTable("audit_offer_subscription20230317", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedUseCase", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20231013", b =>
                 {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
                     b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<Guid>("UseCaseId")
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("use_case_id");
+                        .HasColumnName("id");
 
-                    b.HasKey("CompanyId", "UseCaseId")
-                        .HasName("pk_company_assigned_use_cases");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.HasIndex("UseCaseId")
-                        .HasDatabaseName("ix_company_assigned_use_cases_use_case_id");
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.ToTable("company_assigned_use_cases", "portal");
+                    b.Property<int>("OfferSubscriptionStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_subscription_status_id");
+
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20231013");
+
+                    b.ToTable("audit_offer_subscription20231013", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificate", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20231115", b =>
                 {
-                    b.Property<Guid>("Id")
+                    b.Property<Guid>("AuditV1Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<int>("CompanyCertificateStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_status_id");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<int>("CompanyCertificateTypeId")
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("company_certificate_type_id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid?>("CompanyId")
                         .HasColumnType("uuid")
                         .HasColumnName("company_id");
 
-                    b.Property<DateTimeOffset?>("DateLastChanged")
+                    b.Property<DateTimeOffset?>("DateCreated")
                         .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid>("DocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("document_id");
+                        .HasColumnName("date_created");
 
-                    b.Property<string>("ExternalCertificateNumber")
+                    b.Property<string>("Description")
                         .HasColumnType("text")
-                        .HasColumnName("external_certificate_number");
+                        .HasColumnName("description");
 
-                    b.Property<string>("Issuer")
+                    b.Property<string>("DisplayName")
                         .HasColumnType("text")
-                        .HasColumnName("issuer");
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("TrustLevel")
-                        .HasColumnType("text")
-                        .HasColumnName("trust_level");
+                    b.Property<Guid?>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.Property<DateTimeOffset?>("ValidFrom")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("valid_from");
+                    b.Property<int?>("OfferSubscriptionStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_subscription_status_id");
 
-                    b.Property<DateTimeOffset?>("ValidTill")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("valid_till");
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
 
-                    b.Property<string>("Validator")
-                        .HasColumnType("text")
-                        .HasColumnName("validator");
+                    b.Property<Guid?>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_certificates");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20231115");
 
-                    b.HasIndex("CompanyCertificateStatusId")
-                        .HasDatabaseName("ix_company_certificates_company_certificate_status_id");
+                    b.ToTable("audit_offer_subscription20231115", "portal");
+                });
 
-                    b.HasIndex("CompanyCertificateTypeId")
-                        .HasDatabaseName("ix_company_certificates_company_certificate_type_id");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditProviderCompanyDetail20230614", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
 
-                    b.HasIndex("CompanyId")
-                        .HasDatabaseName("ix_company_certificates_company_id");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.HasIndex("DocumentId")
-                        .HasDatabaseName("ix_company_certificates_document_id");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.ToTable("company_certificates", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE");
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE");
-                        });
+                    b.Property<string>("AutoSetupCallbackUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_callback_url");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_certificate_management20240416\" (\"id\", \"valid_from\", \"valid_till\", \"company_certificate_type_id\", \"company_certificate_status_id\", \"company_id\", \"document_id\", \"external_certificate_number\", \"issuer\", \"trust_level\", \"validator\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"valid_from\", \r\n  NEW.\"valid_till\", \r\n  NEW.\"company_certificate_type_id\", \r\n  NEW.\"company_certificate_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"external_certificate_number\", \r\n  NEW.\"issuer\", \r\n  NEW.\"trust_level\", \r\n  NEW.\"validator\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE AFTER INSERT\r\nON \"portal\".\"company_certificates\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_certificate_management20240416\" (\"id\", \"valid_from\", \"valid_till\", \"company_certificate_type_id\", \"company_certificate_status_id\", \"company_id\", \"document_id\", \"external_certificate_number\", \"issuer\", \"trust_level\", \"validator\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"valid_from\", \r\n  NEW.\"valid_till\", \r\n  NEW.\"company_certificate_type_id\", \r\n  NEW.\"company_certificate_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"external_certificate_number\", \r\n  NEW.\"issuer\", \r\n  NEW.\"trust_level\", \r\n  NEW.\"validator\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE AFTER UPDATE\r\nON \"portal\".\"company_certificates\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE\"();");
-                });
+                    b.Property<string>("AutoSetupUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_url");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateAssignedSite", b =>
-                {
-                    b.Property<Guid>("CompanyCertificateId")
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_certificate_id");
+                        .HasColumnName("id");
 
-                    b.Property<string>("Site")
-                        .HasColumnType("text")
-                        .HasColumnName("site");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.HasKey("CompanyCertificateId", "Site")
-                        .HasName("pk_company_certificate_assigned_sites");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_provider_company_detail20230614");
 
-                    b.ToTable("company_certificate_assigned_sites", "portal");
+                    b.ToTable("audit_provider_company_detail20230614", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditProviderCompanyDetail20231115", b =>
                 {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
-
-                    b.HasKey("Id")
-                        .HasName("pk_company_certificate_statuses");
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
 
-                    b.ToTable("company_certificate_statuses", "portal");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "ACTIVE"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "INACTIVE"
-                        });
-                });
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateType", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<int>("AuditV1OperationId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<string>("AutoSetupCallbackUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_callback_url");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_certificate_types");
+                    b.Property<string>("AutoSetupUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_url");
 
-                    b.ToTable("company_certificate_types", "portal");
+                    b.Property<Guid?>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "AEO_CTPAT_Security_Declaration"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "ISO_9001"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "IATF_16949"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "ISO_14001_EMAS_or_national_certification"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "ISO_45001_OHSAS_18001_or_national_certification"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "ISO_IEC_27001"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "ISO_50001_or_national_certification"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "ISO_IEC_17025"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "ISO_15504_SPICE"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "B_BBEE_Certificate_of_South_Africa"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Label = "IATF"
-                        },
-                        new
-                        {
-                            Id = 12,
-                            Label = "TISAX"
-                        });
-                });
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeAssignedStatus", b =>
-                {
-                    b.Property<int>("CompanyCertificateTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_type_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.Property<int>("CompanyCertificateTypeStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_type_status_id");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
-                    b.HasKey("CompanyCertificateTypeId")
-                        .HasName("pk_company_certificate_type_assigned_statuses");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.HasIndex("CompanyCertificateTypeStatusId")
-                        .HasDatabaseName("ix_company_certificate_type_assigned_statuses_company_certific");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_provider_company_detail20231115");
 
-                    b.ToTable("company_certificate_type_assigned_statuses", "portal");
+                    b.ToTable("audit_provider_company_detail20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeDescription", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditUserRole20221017", b =>
                 {
-                    b.Property<int>("CompanyCertificateTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_certificate_type_id");
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
 
-                    b.Property<string>("LanguageShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("language_short_name");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("description");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.HasKey("CompanyCertificateTypeId", "LanguageShortName")
-                        .HasName("pk_company_certificate_type_descriptions");
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-                    b.HasIndex("LanguageShortName")
-                        .HasDatabaseName("ix_company_certificate_type_descriptions_language_short_name");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
 
-                    b.ToTable("company_certificate_type_descriptions", "portal");
-                });
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeStatus", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.Property<string>("Label")
+                    b.Property<string>("UserRoleText")
                         .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
-
-                    b.HasKey("Id")
-                        .HasName("pk_company_certificate_type_statuses");
+                        .HasColumnType("text")
+                        .HasColumnName("user_role");
 
-                    b.ToTable("company_certificate_type_statuses", "portal");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_user_role20221017");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "ACTIVE"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "INACTIVE"
-                        });
+                    b.ToTable("audit_user_role20221017", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentifier", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditUserRole20231115", b =>
                 {
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<int>("UniqueIdentifierId")
-                        .HasColumnType("integer")
-                        .HasColumnName("unique_identifier_id");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("value");
+                        .HasColumnName("audit_v1id");
 
-                    b.HasKey("CompanyId", "UniqueIdentifierId")
-                        .HasName("pk_company_identifiers");
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
 
-                    b.HasIndex("UniqueIdentifierId")
-                        .HasDatabaseName("ix_company_identifiers_unique_identifier_id");
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
 
-                    b.ToTable("company_identifiers", "portal");
-                });
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentityProvider", b =>
-                {
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("IdentityProviderId")
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("identity_provider_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.HasKey("CompanyId", "IdentityProviderId")
-                        .HasName("pk_company_identity_providers");
+                    b.Property<Guid?>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.HasIndex("IdentityProviderId")
-                        .HasDatabaseName("ix_company_identity_providers_identity_provider_id");
+                    b.Property<string>("UserRoleText")
+                        .HasColumnType("text")
+                        .HasColumnName("user_role");
 
-                    b.ToTable("company_identity_providers", "portal");
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_user_role20231115");
+
+                    b.ToTable("audit_user_role20231115", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyInvitation", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid>("ApplicationId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("application_id");
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("city");
 
-                    b.Property<string>("ClientId")
-                        .HasColumnType("text")
-                        .HasColumnName("client_id");
+                    b.Property<string>("CountryAlpha2Code")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("country_alpha2code")
+                        .HasAnnotation("Relational:JsonPropertyName", "country_alpha2code");
 
-                    b.Property<byte[]>("ClientSecret")
-                        .HasColumnType("bytea")
-                        .HasColumnName("client_secret");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("email");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.Property<int?>("EncryptionMode")
-                        .HasColumnType("integer")
-                        .HasColumnName("encryption_mode");
+                    b.Property<string>("Region")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("region");
 
-                    b.Property<string>("FirstName")
+                    b.Property<string>("Streetadditional")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("streetadditional");
+
+                    b.Property<string>("Streetname")
                         .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("first_name");
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("streetname");
 
-                    b.Property<string>("IdpName")
-                        .HasColumnType("text")
-                        .HasColumnName("idp_name");
+                    b.Property<string>("Streetnumber")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("streetnumber");
 
-                    b.Property<byte[]>("InitializationVector")
-                        .HasColumnType("bytea")
-                        .HasColumnName("initialization_vector");
+                    b.Property<string>("Zipcode")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("zipcode");
 
-                    b.Property<string>("LastName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("last_name");
+                    b.HasKey("Id")
+                        .HasName("pk_addresses");
 
-                    b.Property<Guid>("ProcessId")
+                    b.HasIndex("CountryAlpha2Code")
+                        .HasDatabaseName("ix_addresses_country_alpha2code");
+
+                    b.ToTable("addresses", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("process_id");
+                        .HasColumnName("id");
 
-                    b.Property<string>("ServiceAccountUserId")
-                        .HasColumnType("text")
-                        .HasColumnName("service_account_user_id");
+                    b.Property<int>("AgreementCategoryId")
+                        .HasColumnType("integer")
+                        .HasColumnName("agreement_category_id");
 
-                    b.Property<string>("UserName")
+                    b.Property<string>("AgreementLink")
                         .HasColumnType("text")
-                        .HasColumnName("user_name");
+                        .HasColumnName("agreement_link");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_invitations");
+                    b.Property<int>("AgreementStatusId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(1)
+                        .HasColumnName("agreement_status_id");
 
-                    b.HasIndex("ApplicationId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_company_invitations_application_id");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.HasIndex("ProcessId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_company_invitations_process_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.ToTable("company_invitations", "portal");
-                });
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<Guid>("IssuerCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("issuer_company_id");
 
-                    b.Property<string>("Label")
+                    b.Property<bool>("Mandatory")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(true)
+                        .HasColumnName("mandatory");
+
+                    b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                        .HasColumnName("name");
+
+                    b.Property<Guid?>("UseCaseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("use_case_id");
 
                     b.HasKey("Id")
-                        .HasName("pk_company_roles");
+                        .HasName("pk_agreements");
 
-                    b.ToTable("company_roles", "portal");
+                    b.HasIndex("AgreementCategoryId")
+                        .HasDatabaseName("ix_agreements_agreement_category_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "ACTIVE_PARTICIPANT"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "APP_PROVIDER"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "SERVICE_PROVIDER"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "OPERATOR"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "ONBOARDING_SERVICE_PROVIDER"
-                        });
+                    b.HasIndex("AgreementStatusId")
+                        .HasDatabaseName("ix_agreements_agreement_status_id");
+
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_agreements_document_id");
+
+                    b.HasIndex("IssuerCompanyId")
+                        .HasDatabaseName("ix_agreements_issuer_company_id");
+
+                    b.HasIndex("UseCaseId")
+                        .HasDatabaseName("ix_agreements_use_case_id");
+
+                    b.ToTable("agreements", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleAssignedRoleCollection", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedCompanyRole", b =>
                 {
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
                     b.Property<int>("CompanyRoleId")
                         .HasColumnType("integer")
                         .HasColumnName("company_role_id");
 
-                    b.Property<Guid>("UserRoleCollectionId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_role_collection_id");
-
-                    b.HasKey("CompanyRoleId")
-                        .HasName("pk_company_role_assigned_role_collections");
+                    b.HasKey("AgreementId", "CompanyRoleId")
+                        .HasName("pk_agreement_assigned_company_roles");
 
-                    b.HasIndex("UserRoleCollectionId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_company_role_assigned_role_collections_user_role_collection");
+                    b.HasIndex("CompanyRoleId")
+                        .HasDatabaseName("ix_agreement_assigned_company_roles_company_role_id");
 
-                    b.ToTable("company_role_assigned_role_collections", "portal");
+                    b.ToTable("agreement_assigned_company_roles", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleDescription", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOffer", b =>
                 {
-                    b.Property<int>("CompanyRoleId")
-                        .HasColumnType("integer")
-                        .HasColumnName("company_role_id");
-
-                    b.Property<string>("LanguageShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("language_short_name");
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
 
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("description");
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.HasKey("CompanyRoleId", "LanguageShortName")
-                        .HasName("pk_company_role_descriptions");
+                    b.HasKey("AgreementId", "OfferId")
+                        .HasName("pk_agreement_assigned_offers");
 
-                    b.HasIndex("LanguageShortName")
-                        .HasDatabaseName("ix_company_role_descriptions_language_short_name");
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_agreement_assigned_offers_offer_id");
 
-                    b.ToTable("company_role_descriptions", "portal");
+                    b.ToTable("agreement_assigned_offers", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleRegistrationData", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOfferType", b =>
                 {
-                    b.Property<int>("CompanyRoleId")
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<int>("OfferTypeId")
                         .HasColumnType("integer")
-                        .HasColumnName("company_role_id");
+                        .HasColumnName("offer_type_id");
 
-                    b.Property<bool>("IsRegistrationRole")
-                        .HasColumnType("boolean")
-                        .HasColumnName("is_registration_role");
+                    b.HasKey("AgreementId", "OfferTypeId")
+                        .HasName("pk_agreement_assigned_offer_types");
 
-                    b.HasKey("CompanyRoleId")
-                        .HasName("pk_company_role_registration_data");
+                    b.HasIndex("OfferTypeId")
+                        .HasDatabaseName("ix_agreement_assigned_offer_types_offer_type_id");
 
-                    b.ToTable("company_role_registration_data", "portal");
+                    b.ToTable("agreement_assigned_offer_types", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementCategory", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4133,361 +3407,370 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_company_statuses");
+                        .HasName("pk_agreement_categories");
 
-                    b.ToTable("company_statuses", "portal");
+                    b.ToTable("agreement_categories", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "PENDING"
+                            Label = "CX_FRAME_CONTRACT"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "ACTIVE"
+                            Label = "APP_CONTRACT"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "REJECTED"
+                            Label = "DATA_CONTRACT"
                         },
                         new
                         {
                             Id = 4,
-                            Label = "INACTIVE"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "DELETED"
+                            Label = "SERVICE_CONTRACT"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementStatus", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
                         .HasColumnName("id");
 
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("email");
-
-                    b.Property<string>("Firstname")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("firstname");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<byte[]>("Lastlogin")
-                        .HasColumnType("bytea")
-                        .HasColumnName("lastlogin");
-
-                    b.Property<string>("Lastname")
+                    b.Property<string>("Label")
+                        .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("lastname");
+                        .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_company_users");
+                        .HasName("pk_agreement_statuses");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_company_users_last_editor_id");
+                    b.ToTable("agreement_statuses", "portal");
 
-                    b.ToTable("company_users", "portal", t =>
+                    b.HasData(
+                        new
                         {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYUSER");
-
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYUSER");
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTIVE"
                         });
-
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYUSER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYUSER\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYUSER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_user20230523\" (\"id\", \"email\", \"firstname\", \"lastlogin\", \"lastname\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"email\", \r\n  NEW.\"firstname\", \r\n  NEW.\"lastlogin\", \r\n  NEW.\"lastname\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYUSER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYUSER AFTER INSERT\r\nON \"portal\".\"company_users\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYUSER\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYUSER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYUSER\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYUSER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_user20230523\" (\"id\", \"email\", \"firstname\", \"lastlogin\", \"lastname\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"email\", \r\n  NEW.\"firstname\", \r\n  NEW.\"lastlogin\", \r\n  NEW.\"lastname\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYUSER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYUSER AFTER UPDATE\r\nON \"portal\".\"company_users\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYUSER\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedAppFavourite", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppAssignedUseCase", b =>
                 {
-                    b.Property<Guid>("CompanyUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
-
                     b.Property<Guid>("AppId")
                         .HasColumnType("uuid")
                         .HasColumnName("app_id");
 
-                    b.HasKey("CompanyUserId", "AppId")
-                        .HasName("pk_company_user_assigned_app_favourites");
-
-                    b.HasIndex("AppId")
-                        .HasDatabaseName("ix_company_user_assigned_app_favourites_app_id");
-
-                    b.ToTable("company_user_assigned_app_favourites", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedBusinessPartner", b =>
-                {
-                    b.Property<Guid>("CompanyUserId")
+                    b.Property<Guid>("UseCaseId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("use_case_id");
 
-                    b.Property<string>("BusinessPartnerNumber")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasColumnName("business_partner_number");
+                    b.HasKey("AppId", "UseCaseId")
+                        .HasName("pk_app_assigned_use_cases");
 
-                    b.HasKey("CompanyUserId", "BusinessPartnerNumber")
-                        .HasName("pk_company_user_assigned_business_partners");
+                    b.HasIndex("UseCaseId")
+                        .HasDatabaseName("ix_app_assigned_use_cases_use_case_id");
 
-                    b.ToTable("company_user_assigned_business_partners", "portal");
+                    b.ToTable("app_assigned_use_cases", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedIdentityProvider", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstance", b =>
                 {
-                    b.Property<Guid>("CompanyUserId")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("IdentityProviderId")
+                    b.Property<Guid>("AppId")
                         .HasColumnType("uuid")
-                        .HasColumnName("identity_provider_id");
+                        .HasColumnName("app_id");
 
-                    b.Property<string>("ProviderId")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("provider_id");
+                    b.Property<Guid>("IamClientId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("iam_client_id");
 
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("user_name");
+                    b.HasKey("Id")
+                        .HasName("pk_app_instances");
 
-                    b.HasKey("CompanyUserId", "IdentityProviderId")
-                        .HasName("pk_company_user_assigned_identity_providers");
+                    b.HasIndex("AppId")
+                        .HasDatabaseName("ix_app_instances_app_id");
 
-                    b.HasIndex("IdentityProviderId")
-                        .HasDatabaseName("ix_company_user_assigned_identity_providers_identity_provider_");
+                    b.HasIndex("IamClientId")
+                        .HasDatabaseName("ix_app_instances_iam_client_id");
 
-                    b.ToTable("company_user_assigned_identity_providers", "portal");
+                    b.ToTable("app_instances", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedProcess", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceAssignedTechnicalUser", b =>
                 {
-                    b.Property<Guid>("CompanyUserId")
+                    b.Property<Guid>("AppInstanceId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("app_instance_id");
 
-                    b.Property<Guid>("ProcessId")
+                    b.Property<Guid>("TechnicalUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.HasKey("CompanyUserId", "ProcessId")
-                        .HasName("pk_company_user_assigned_processes");
+                        .HasColumnName("technical_user_id");
 
-                    b.HasIndex("CompanyUserId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_company_user_assigned_processes_company_user_id");
+                    b.HasKey("AppInstanceId", "TechnicalUserId")
+                        .HasName("pk_app_instance_assigned_technical_users");
 
-                    b.HasIndex("ProcessId")
-                        .HasDatabaseName("ix_company_user_assigned_processes_process_id");
+                    b.HasIndex("TechnicalUserId")
+                        .HasDatabaseName("ix_app_instance_assigned_technical_users_technical_user_id");
 
-                    b.ToTable("company_user_assigned_processes", "portal");
+                    b.ToTable("app_instance_assigned_technical_users", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyWalletData", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceSetup", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<string>("AuthenticationServiceUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("authentication_service_url");
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
 
-                    b.Property<string>("ClientId")
-                        .IsRequired()
+                    b.Property<string>("InstanceUrl")
                         .HasColumnType("text")
-                        .HasColumnName("client_id");
-
-                    b.Property<byte[]>("ClientSecret")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("client_secret");
+                        .HasColumnName("instance_url");
 
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                    b.Property<bool>("IsSingleInstance")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_single_instance");
 
-                    b.Property<string>("Did")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("did");
+                    b.HasKey("Id")
+                        .HasName("pk_app_instance_setups");
 
-                    b.Property<JsonDocument>("DidDocument")
-                        .IsRequired()
-                        .HasColumnType("jsonb")
-                        .HasColumnName("did_document");
+                    b.HasIndex("AppId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_app_instance_setups_app_id");
 
-                    b.Property<int>("EncryptionMode")
-                        .HasColumnType("integer")
-                        .HasColumnName("encryption_mode");
+                    b.ToTable("app_instance_setups", "portal");
+                });
 
-                    b.Property<byte[]>("InitializationVector")
-                        .HasColumnType("bytea")
-                        .HasColumnName("initialization_vector");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppLanguage", b =>
+                {
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_company_wallet_datas");
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
 
-                    b.HasIndex("CompanyId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_company_wallet_datas_company_id");
+                    b.HasKey("AppId", "LanguageShortName")
+                        .HasName("pk_app_languages");
 
-                    b.ToTable("company_wallet_datas", "portal");
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_app_languages_language_short_name");
+
+                    b.ToTable("app_languages", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppSubscriptionDetail", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<string>("ConnectorUrl")
-                        .IsRequired()
+                    b.Property<Guid?>("AppInstanceId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_instance_id");
+
+                    b.Property<string>("AppSubscriptionUrl")
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("connector_url");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<Guid?>("HostId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("host_id");
+                        .HasColumnName("app_subscription_url");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<string>("LocationId")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("location_id");
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
 
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
+                    b.HasKey("Id")
+                        .HasName("pk_app_subscription_details");
 
-                    b.Property<Guid>("ProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_id");
+                    b.HasIndex("AppInstanceId")
+                        .HasDatabaseName("ix_app_subscription_details_app_instance_id");
 
-                    b.Property<Guid?>("SdCreationProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sd_creation_process_id");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_app_subscription_details_last_editor_id");
 
-                    b.Property<Guid?>("SelfDescriptionDocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("self_description_document_id");
+                    b.HasIndex("OfferSubscriptionId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_app_subscription_details_offer_subscription_id");
 
-                    b.Property<string>("SelfDescriptionMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("self_description_message");
+                    b.ToTable("app_subscription_details", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL");
 
-                    b.Property<int>("StatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("status_id");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL");
+                        });
 
-                    b.Property<Guid?>("TechnicalUserId")
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_app_subscription_detail20231115\" (\"id\", \"offer_subscription_id\", \"app_instance_id\", \"app_subscription_url\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"offer_subscription_id\", \r\n  NEW.\"app_instance_id\", \r\n  NEW.\"app_subscription_url\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL AFTER INSERT\r\nON \"portal\".\"app_subscription_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_app_subscription_detail20231115\" (\"id\", \"offer_subscription_id\", \"app_instance_id\", \"app_subscription_url\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"offer_subscription_id\", \r\n  NEW.\"app_instance_id\", \r\n  NEW.\"app_subscription_url\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL AFTER UPDATE\r\nON \"portal\".\"app_subscription_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntry", b =>
+                {
+                    b.Property<Guid>("ApplicationId")
                         .HasColumnType("uuid")
-                        .HasColumnName("technical_user_id");
+                        .HasColumnName("application_id");
 
-                    b.Property<int>("TypeId")
+                    b.Property<int>("ApplicationChecklistEntryTypeId")
                         .HasColumnType("integer")
-                        .HasColumnName("type_id");
+                        .HasColumnName("application_checklist_entry_type_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_connectors");
+                    b.Property<int>("ApplicationChecklistEntryStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_checklist_entry_status_id");
 
-                    b.HasIndex("HostId")
-                        .HasDatabaseName("ix_connectors_host_id");
+                    b.Property<string>("Comment")
+                        .HasColumnType("text")
+                        .HasColumnName("comment");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_connectors_last_editor_id");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.HasIndex("LocationId")
-                        .HasDatabaseName("ix_connectors_location_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.HasIndex("ProviderId")
-                        .HasDatabaseName("ix_connectors_provider_id");
+                    b.HasKey("ApplicationId", "ApplicationChecklistEntryTypeId")
+                        .HasName("pk_application_checklist");
 
-                    b.HasIndex("SdCreationProcessId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_connectors_sd_creation_process_id");
+                    b.HasIndex("ApplicationChecklistEntryStatusId")
+                        .HasDatabaseName("ix_application_checklist_application_checklist_entry_status_id");
 
-                    b.HasIndex("SelfDescriptionDocumentId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_connectors_self_description_document_id");
+                    b.HasIndex("ApplicationChecklistEntryTypeId")
+                        .HasDatabaseName("ix_application_checklist_application_checklist_entry_type_id");
 
-                    b.HasIndex("StatusId")
-                        .HasDatabaseName("ix_connectors_status_id");
+                    b.ToTable("application_checklist", "portal");
+                });
 
-                    b.HasIndex("TechnicalUserId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_connectors_technical_user_id");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
 
-                    b.HasIndex("TypeId")
-                        .HasDatabaseName("ix_connectors_type_id");
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
 
-                    b.ToTable("connectors", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_CONNECTOR");
+                    b.HasKey("Id")
+                        .HasName("pk_application_checklist_statuses");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_CONNECTOR");
-                        });
+                    b.ToTable("application_checklist_statuses", "portal");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_CONNECTOR", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONNECTOR\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_CONNECTOR$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_connector20241008\" (\"id\", \"name\", \"connector_url\", \"type_id\", \"status_id\", \"provider_id\", \"host_id\", \"self_description_document_id\", \"location_id\", \"self_description_message\", \"date_last_changed\", \"technical_user_id\", \"sd_creation_process_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"connector_url\", \r\n  NEW.\"type_id\", \r\n  NEW.\"status_id\", \r\n  NEW.\"provider_id\", \r\n  NEW.\"host_id\", \r\n  NEW.\"self_description_document_id\", \r\n  NEW.\"location_id\", \r\n  NEW.\"self_description_message\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"technical_user_id\", \r\n  NEW.\"sd_creation_process_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_CONNECTOR$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_CONNECTOR AFTER INSERT\r\nON \"portal\".\"connectors\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONNECTOR\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_CONNECTOR", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONNECTOR\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_CONNECTOR$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_connector20241008\" (\"id\", \"name\", \"connector_url\", \"type_id\", \"status_id\", \"provider_id\", \"host_id\", \"self_description_document_id\", \"location_id\", \"self_description_message\", \"date_last_changed\", \"technical_user_id\", \"sd_creation_process_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"connector_url\", \r\n  NEW.\"type_id\", \r\n  NEW.\"status_id\", \r\n  NEW.\"provider_id\", \r\n  NEW.\"host_id\", \r\n  NEW.\"self_description_document_id\", \r\n  NEW.\"location_id\", \r\n  NEW.\"self_description_message\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"technical_user_id\", \r\n  NEW.\"sd_creation_process_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_CONNECTOR$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_CONNECTOR AFTER UPDATE\r\nON \"portal\".\"connectors\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONNECTOR\"();");
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "TO_DO"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "IN_PROGRESS"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "DONE"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "FAILED"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "SKIPPED"
+                        });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorAssignedOfferSubscription", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryType", b =>
                 {
-                    b.Property<Guid>("ConnectorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("connector_id");
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("OfferSubscriptionId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
 
-                    b.HasKey("ConnectorId", "OfferSubscriptionId")
-                        .HasName("pk_connector_assigned_offer_subscriptions");
+                    b.HasKey("Id")
+                        .HasName("pk_application_checklist_types");
 
-                    b.HasIndex("OfferSubscriptionId")
-                        .HasDatabaseName("ix_connector_assigned_offer_subscriptions_offer_subscription_id");
+                    b.ToTable("application_checklist_types", "portal");
 
-                    b.ToTable("connector_assigned_offer_subscriptions", "portal");
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "REGISTRATION_VERIFICATION"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "BUSINESS_PARTNER_NUMBER"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "IDENTITY_WALLET"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "BPNL_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "MEMBERSHIP_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "SELF_DESCRIPTION_LP"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "APPLICATION_ACTIVATION"
+                        });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AuditOperation", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4500,29 +3783,29 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_connector_statuses");
+                        .HasName("pk_audit_operation");
 
-                    b.ToTable("connector_statuses", "portal");
+                    b.ToTable("audit_operation", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "PENDING"
+                            Label = "INSERT"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "ACTIVE"
+                            Label = "UPDATE"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "INACTIVE"
+                            Label = "DELETE"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.BpdmIdentifier", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4535,140 +3818,253 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_connector_types");
+                        .HasName("pk_bpdm_identifiers");
 
-                    b.ToTable("connector_types", "portal");
+                    b.ToTable("bpdm_identifiers", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "COMPANY_CONNECTOR"
+                            Label = "EU_VAT_ID_DE"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "CONNECTOR_AS_A_SERVICE"
+                            Label = "CH_UID"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "EU_VAT_ID_FR"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "FR_SIREN"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "EU_VAT_ID_AT"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "DE_BNUM"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "CZ_ICO"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "EU_VAT_ID_CZ"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "EU_VAT_ID_PL"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "EU_VAT_ID_BE"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "EU_VAT_ID_CH"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "EU_VAT_ID_DK"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            Label = "EU_VAT_ID_ES"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            Label = "EU_VAT_ID_GB"
+                        },
+                        new
+                        {
+                            Id = 15,
+                            Label = "EU_VAT_ID_NO"
+                        },
+                        new
+                        {
+                            Id = 16,
+                            Label = "BE_ENT_NO"
+                        },
+                        new
+                        {
+                            Id = 17,
+                            Label = "CVR_DK"
+                        },
+                        new
+                        {
+                            Id = 18,
+                            Label = "ID_CRN"
+                        },
+                        new
+                        {
+                            Id = 19,
+                            Label = "NO_ORGID"
+                        },
+                        new
+                        {
+                            Id = 20,
+                            Label = "LEI_ID"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Consent", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid>("AgreementId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("agreement_id");
-
-                    b.Property<string>("Comment")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("comment");
-
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid?>("AddressId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("address_id");
 
-                    b.Property<Guid>("CompanyUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                    b.Property<string>("BusinessPartnerNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("business_partner_number");
 
-                    b.Property<int>("ConsentStatusId")
+                    b.Property<int>("CompanyStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("consent_status_id");
+                        .HasColumnName("company_status_id");
 
                     b.Property<DateTimeOffset>("DateCreated")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<Guid?>("DocumentId")
+                    b.Property<string>("DidDocumentLocation")
+                        .HasColumnType("text")
+                        .HasColumnName("did_document_location");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<Guid?>("SdCreationProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("document_id");
+                        .HasColumnName("sd_creation_process_id");
 
-                    b.Property<Guid?>("LastEditorId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<string>("Target")
+                    b.Property<string>("Shortname")
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("target");
+                        .HasColumnName("shortname");
 
                     b.HasKey("Id")
-                        .HasName("pk_consents");
-
-                    b.HasIndex("AgreementId")
-                        .HasDatabaseName("ix_consents_agreement_id");
-
-                    b.HasIndex("CompanyId")
-                        .HasDatabaseName("ix_consents_company_id");
-
-                    b.HasIndex("CompanyUserId")
-                        .HasDatabaseName("ix_consents_company_user_id");
-
-                    b.HasIndex("ConsentStatusId")
-                        .HasDatabaseName("ix_consents_consent_status_id");
+                        .HasName("pk_companies");
 
-                    b.HasIndex("DocumentId")
-                        .HasDatabaseName("ix_consents_document_id");
+                    b.HasIndex("AddressId")
+                        .HasDatabaseName("ix_companies_address_id");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_consents_last_editor_id");
+                    b.HasIndex("CompanyStatusId")
+                        .HasDatabaseName("ix_companies_company_status_id");
 
-                    b.ToTable("consents", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_CONSENT");
+                    b.HasIndex("SdCreationProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_companies_sd_creation_process_id");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_CONSENT");
-                        });
+                    b.HasIndex("SelfDescriptionDocumentId")
+                        .HasDatabaseName("ix_companies_self_description_document_id");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_CONSENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONSENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_CONSENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_consent20231115\" (\"id\", \"date_created\", \"comment\", \"consent_status_id\", \"target\", \"agreement_id\", \"company_id\", \"document_id\", \"company_user_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"comment\", \r\n  NEW.\"consent_status_id\", \r\n  NEW.\"target\", \r\n  NEW.\"agreement_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_CONSENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_CONSENT AFTER INSERT\r\nON \"portal\".\"consents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONSENT\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_CONSENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONSENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_CONSENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_consent20231115\" (\"id\", \"date_created\", \"comment\", \"consent_status_id\", \"target\", \"agreement_id\", \"company_id\", \"document_id\", \"company_user_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"comment\", \r\n  NEW.\"consent_status_id\", \r\n  NEW.\"target\", \r\n  NEW.\"agreement_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_CONSENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_CONSENT AFTER UPDATE\r\nON \"portal\".\"consents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONSENT\"();");
+                    b.ToTable("companies", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOffer", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", b =>
                 {
-                    b.Property<Guid>("ConsentId")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("consent_id");
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("OfferId")
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
+                    b.Property<Guid?>("ChecklistProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                        .HasColumnName("checklist_process_id");
 
-                    b.HasKey("ConsentId", "OfferId")
-                        .HasName("pk_consent_assigned_offers");
+                    b.Property<int>("CompanyApplicationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_application_type_id");
 
-                    b.HasIndex("OfferId")
-                        .HasDatabaseName("ix_consent_assigned_offers_offer_id");
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                    b.ToTable("consent_assigned_offers", "portal");
-                });
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOfferSubscription", b =>
-                {
-                    b.Property<Guid>("ConsentId")
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("consent_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferSubscriptionId")
+                    b.Property<Guid?>("OnboardingServiceProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
+                        .HasColumnName("onboarding_service_provider_id");
 
-                    b.HasKey("ConsentId", "OfferSubscriptionId")
-                        .HasName("pk_consent_assigned_offer_subscriptions");
+                    b.HasKey("Id")
+                        .HasName("pk_company_applications");
+
+                    b.HasIndex("ApplicationStatusId")
+                        .HasDatabaseName("ix_company_applications_application_status_id");
+
+                    b.HasIndex("ChecklistProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_applications_checklist_process_id");
+
+                    b.HasIndex("CompanyApplicationTypeId")
+                        .HasDatabaseName("ix_company_applications_company_application_type_id");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_company_applications_company_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_company_applications_last_editor_id");
+
+                    b.HasIndex("OnboardingServiceProviderId")
+                        .HasDatabaseName("ix_company_applications_onboarding_service_provider_id");
+
+                    b.ToTable("company_applications", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION");
 
-                    b.HasIndex("OfferSubscriptionId")
-                        .HasDatabaseName("ix_consent_assigned_offer_subscriptions_offer_subscription_id");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION");
+                        });
 
-                    b.ToTable("consent_assigned_offer_subscriptions", "portal");
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_application20231115\" (\"id\", \"date_created\", \"date_last_changed\", \"application_status_id\", \"company_id\", \"checklist_process_id\", \"company_application_type_id\", \"onboarding_service_provider_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"application_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"checklist_process_id\", \r\n  NEW.\"company_application_type_id\", \r\n  NEW.\"onboarding_service_provider_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION AFTER INSERT\r\nON \"portal\".\"company_applications\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_application20231115\" (\"id\", \"date_created\", \"date_last_changed\", \"application_status_id\", \"company_id\", \"checklist_process_id\", \"company_application_type_id\", \"onboarding_service_provider_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"application_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"checklist_process_id\", \r\n  NEW.\"company_application_type_id\", \r\n  NEW.\"onboarding_service_provider_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION AFTER UPDATE\r\nON \"portal\".\"company_applications\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationStatus", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4681,183 +4077,246 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_consent_statuses");
+                        .HasName("pk_company_application_statuses");
 
-                    b.ToTable("consent_statuses", "portal");
+                    b.ToTable("company_application_statuses", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "ACTIVE"
+                            Label = "CREATED"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "INACTIVE"
+                            Label = "ADD_COMPANY_DATA"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "INVITE_USER"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "SELECT_COMPANY_ROLE"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "UPLOAD_DOCUMENTS"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "VERIFY"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "SUBMITTED"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "CONFIRMED"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "DECLINED"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "CANCELLED_BY_CUSTOMER"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Country", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationType", b =>
                 {
-                    b.Property<string>("Alpha2Code")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("alpha2code")
-                        .IsFixedLength()
-                        .HasAnnotation("Relational:JsonPropertyName", "alpha2code");
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
 
-                    b.Property<string>("Alpha3Code")
-                        .HasMaxLength(3)
-                        .HasColumnType("character(3)")
-                        .HasColumnName("alpha3code")
-                        .IsFixedLength()
-                        .HasAnnotation("Relational:JsonPropertyName", "alpha3code");
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
 
-                    b.HasKey("Alpha2Code")
-                        .HasName("pk_countries");
+                    b.HasKey("Id")
+                        .HasName("pk_company_application_types");
 
-                    b.ToTable("countries", "portal");
+                    b.ToTable("company_application_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "INTERNAL"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "EXTERNAL"
+                        });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryAssignedIdentifier", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedRole", b =>
                 {
-                    b.Property<string>("CountryAlpha2Code")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("country_alpha2code")
-                        .HasAnnotation("Relational:JsonPropertyName", "country_alpha2code");
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                    b.Property<int>("UniqueIdentifierId")
+                    b.Property<int>("CompanyRoleId")
                         .HasColumnType("integer")
-                        .HasColumnName("unique_identifier_id");
+                        .HasColumnName("company_role_id");
 
-                    b.Property<int?>("BpdmIdentifierId")
-                        .HasColumnType("integer")
-                        .HasColumnName("bpdm_identifier_id");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.HasKey("CountryAlpha2Code", "UniqueIdentifierId")
-                        .HasName("pk_country_assigned_identifiers");
+                    b.HasKey("CompanyId", "CompanyRoleId")
+                        .HasName("pk_company_assigned_roles");
 
-                    b.HasIndex("BpdmIdentifierId")
-                        .HasDatabaseName("ix_country_assigned_identifiers_bpdm_identifier_id");
+                    b.HasIndex("CompanyRoleId")
+                        .HasDatabaseName("ix_company_assigned_roles_company_role_id");
 
-                    b.HasIndex("UniqueIdentifierId")
-                        .HasDatabaseName("ix_country_assigned_identifiers_unique_identifier_id");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_company_assigned_roles_last_editor_id");
 
-                    b.ToTable("country_assigned_identifiers", "portal");
+                    b.ToTable("company_assigned_roles", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_assigned_role2023316\" (\"company_id\", \"company_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"company_id\", \r\n  NEW.\"company_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE AFTER INSERT\r\nON \"portal\".\"company_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_assigned_role2023316\" (\"company_id\", \"company_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"company_id\", \r\n  NEW.\"company_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE AFTER UPDATE\r\nON \"portal\".\"company_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryLongName", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedUseCase", b =>
                 {
-                    b.Property<string>("Alpha2Code")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("alpha2code")
-                        .HasAnnotation("Relational:JsonPropertyName", "alpha2code");
-
-                    b.Property<string>("ShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("short_name");
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                    b.Property<string>("LongName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("long_name");
+                    b.Property<Guid>("UseCaseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("use_case_id");
 
-                    b.HasKey("Alpha2Code", "ShortName")
-                        .HasName("pk_country_long_names");
+                    b.HasKey("CompanyId", "UseCaseId")
+                        .HasName("pk_company_assigned_use_cases");
 
-                    b.HasIndex("ShortName")
-                        .HasDatabaseName("ix_country_long_names_short_name");
+                    b.HasIndex("UseCaseId")
+                        .HasDatabaseName("ix_company_assigned_use_cases_use_case_id");
 
-                    b.ToTable("country_long_names", "portal");
+                    b.ToTable("company_assigned_use_cases", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificate", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid?>("CompanyUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                    b.Property<int>("CompanyCertificateStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_status_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<int>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
                     b.Property<DateTimeOffset?>("DateLastChanged")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_changed");
 
-                    b.Property<byte[]>("DocumentContent")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_content");
-
-                    b.Property<byte[]>("DocumentHash")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("document_hash");
-
-                    b.Property<string>("DocumentName")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("document_name");
-
-                    b.Property<long>("DocumentSize")
-                        .HasColumnType("bigint")
-                        .HasColumnName("document_size");
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
 
-                    b.Property<int>("DocumentStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_status_id");
+                    b.Property<string>("ExternalCertificateNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("external_certificate_number");
 
-                    b.Property<int>("DocumentTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("document_type_id");
+                    b.Property<string>("Issuer")
+                        .HasColumnType("text")
+                        .HasColumnName("issuer");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<int>("MediaTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("media_type_id");
+                    b.Property<string>("TrustLevel")
+                        .HasColumnType("text")
+                        .HasColumnName("trust_level");
+
+                    b.Property<DateTimeOffset?>("ValidFrom")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_from");
+
+                    b.Property<DateTimeOffset?>("ValidTill")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_till");
+
+                    b.Property<string>("Validator")
+                        .HasColumnType("text")
+                        .HasColumnName("validator");
 
                     b.HasKey("Id")
-                        .HasName("pk_documents");
+                        .HasName("pk_company_certificates");
 
-                    b.HasIndex("CompanyUserId")
-                        .HasDatabaseName("ix_documents_company_user_id");
+                    b.HasIndex("CompanyCertificateStatusId")
+                        .HasDatabaseName("ix_company_certificates_company_certificate_status_id");
 
-                    b.HasIndex("DocumentStatusId")
-                        .HasDatabaseName("ix_documents_document_status_id");
+                    b.HasIndex("CompanyCertificateTypeId")
+                        .HasDatabaseName("ix_company_certificates_company_certificate_type_id");
 
-                    b.HasIndex("DocumentTypeId")
-                        .HasDatabaseName("ix_documents_document_type_id");
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_company_certificates_company_id");
 
-                    b.HasIndex("MediaTypeId")
-                        .HasDatabaseName("ix_documents_media_type_id");
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_company_certificates_document_id");
 
-                    b.ToTable("documents", "portal", t =>
+                    b.ToTable("company_certificates", "portal", t =>
                         {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_DOCUMENT");
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_DOCUMENT");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE");
                         });
 
                     b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_DOCUMENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_DOCUMENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_DOCUMENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_document20241120\" (\"id\", \"date_created\", \"document_hash\", \"document_content\", \"document_name\", \"media_type_id\", \"document_type_id\", \"document_status_id\", \"company_user_id\", \"date_last_changed\", \"last_editor_id\", \"document_size\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"document_hash\", \r\n  NEW.\"document_content\", \r\n  NEW.\"document_name\", \r\n  NEW.\"media_type_id\", \r\n  NEW.\"document_type_id\", \r\n  NEW.\"document_status_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"document_size\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_DOCUMENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_DOCUMENT AFTER INSERT\r\nON \"portal\".\"documents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_DOCUMENT\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_DOCUMENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_DOCUMENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_DOCUMENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_document20241120\" (\"id\", \"date_created\", \"document_hash\", \"document_content\", \"document_name\", \"media_type_id\", \"document_type_id\", \"document_status_id\", \"company_user_id\", \"date_last_changed\", \"last_editor_id\", \"document_size\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"document_hash\", \r\n  NEW.\"document_content\", \r\n  NEW.\"document_name\", \r\n  NEW.\"media_type_id\", \r\n  NEW.\"document_type_id\", \r\n  NEW.\"document_status_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"document_size\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_DOCUMENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_DOCUMENT AFTER UPDATE\r\nON \"portal\".\"documents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_DOCUMENT\"();");
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_certificate_management20240416\" (\"id\", \"valid_from\", \"valid_till\", \"company_certificate_type_id\", \"company_certificate_status_id\", \"company_id\", \"document_id\", \"external_certificate_number\", \"issuer\", \"trust_level\", \"validator\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"valid_from\", \r\n  NEW.\"valid_till\", \r\n  NEW.\"company_certificate_type_id\", \r\n  NEW.\"company_certificate_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"external_certificate_number\", \r\n  NEW.\"issuer\", \r\n  NEW.\"trust_level\", \r\n  NEW.\"validator\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE AFTER INSERT\r\nON \"portal\".\"company_certificates\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYCERTIFICATE\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_certificate_management20240416\" (\"id\", \"valid_from\", \"valid_till\", \"company_certificate_type_id\", \"company_certificate_status_id\", \"company_id\", \"document_id\", \"external_certificate_number\", \"issuer\", \"trust_level\", \"validator\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"valid_from\", \r\n  NEW.\"valid_till\", \r\n  NEW.\"company_certificate_type_id\", \r\n  NEW.\"company_certificate_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"external_certificate_number\", \r\n  NEW.\"issuer\", \r\n  NEW.\"trust_level\", \r\n  NEW.\"validator\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE AFTER UPDATE\r\nON \"portal\".\"company_certificates\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYCERTIFICATE\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateAssignedSite", b =>
+                {
+                    b.Property<Guid>("CompanyCertificateId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_certificate_id");
+
+                    b.Property<string>("Site")
+                        .HasColumnType("text")
+                        .HasColumnName("site");
+
+                    b.HasKey("CompanyCertificateId", "Site")
+                        .HasName("pk_company_certificate_assigned_sites");
+
+                    b.ToTable("company_certificate_assigned_sites", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateStatus", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4870,29 +4329,24 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_document_status");
+                        .HasName("pk_company_certificate_statuses");
 
-                    b.ToTable("document_status", "portal");
+                    b.ToTable("company_certificate_statuses", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "PENDING"
+                            Label = "ACTIVE"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "LOCKED"
-                        },
-                        new
-                        {
-                            Id = 3,
                             Label = "INACTIVE"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateType", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -4905,360 +4359,263 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_document_types");
+                        .HasName("pk_company_certificate_types");
 
-                    b.ToTable("document_types", "portal");
+                    b.ToTable("company_certificate_types", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "CX_FRAME_CONTRACT"
+                            Label = "AEO_CTPAT_Security_Declaration"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "COMMERCIAL_REGISTER_EXTRACT"
+                            Label = "ISO_9001"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "APP_CONTRACT"
+                            Label = "IATF_16949"
                         },
                         new
                         {
                             Id = 4,
-                            Label = "CONFORMITY_APPROVAL_REGISTRATION"
+                            Label = "ISO_14001_EMAS_or_national_certification"
                         },
                         new
                         {
                             Id = 5,
-                            Label = "ADDITIONAL_DETAILS"
+                            Label = "ISO_45001_OHSAS_18001_or_national_certification"
                         },
                         new
                         {
                             Id = 6,
-                            Label = "APP_LEADIMAGE"
+                            Label = "ISO_IEC_27001"
                         },
                         new
                         {
                             Id = 7,
-                            Label = "APP_IMAGE"
+                            Label = "ISO_50001_or_national_certification"
                         },
                         new
                         {
                             Id = 8,
-                            Label = "SELF_DESCRIPTION"
+                            Label = "ISO_IEC_17025"
                         },
                         new
                         {
                             Id = 9,
-                            Label = "APP_TECHNICAL_INFORMATION"
+                            Label = "ISO_15504_SPICE"
                         },
                         new
                         {
                             Id = 10,
-                            Label = "CONFORMITY_APPROVAL_CONNECTOR"
+                            Label = "B_BBEE_Certificate_of_South_Africa"
                         },
                         new
                         {
                             Id = 11,
-                            Label = "CONFORMITY_APPROVAL_BUSINESS_APPS"
+                            Label = "IATF"
                         },
                         new
                         {
                             Id = 12,
-                            Label = "CONFORMITY_APPROVAL_SERVICES"
-                        },
-                        new
-                        {
-                            Id = 13,
-                            Label = "SERVICE_LEADIMAGE"
-                        },
-                        new
-                        {
-                            Id = 14,
-                            Label = "PRESENTATION"
-                        },
-                        new
-                        {
-                            Id = 15,
-                            Label = "COMPANY_CERTIFICATE"
+                            Label = "TISAX"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUser", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeAssignedStatus", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("AuthenticationServiceUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("authentication_service_url");
-
-                    b.Property<byte[]>("ClientSecret")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("client_secret");
+                    b.Property<int>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
 
-                    b.Property<int>("EncryptionMode")
+                    b.Property<int>("CompanyCertificateTypeStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("encryption_mode");
+                        .HasColumnName("company_certificate_type_status_id");
 
-                    b.Property<byte[]>("InitializationVector")
-                        .HasColumnType("bytea")
-                        .HasColumnName("initialization_vector");
+                    b.HasKey("CompanyCertificateTypeId")
+                        .HasName("pk_company_certificate_type_assigned_statuses");
 
-                    b.HasKey("Id")
-                        .HasName("pk_external_technical_users");
+                    b.HasIndex("CompanyCertificateTypeStatusId")
+                        .HasDatabaseName("ix_company_certificate_type_assigned_statuses_company_certific");
 
-                    b.ToTable("external_technical_users", "portal");
+                    b.ToTable("company_certificate_type_assigned_statuses", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUserCreationData", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeDescription", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid>("ProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.Property<Guid>("TechnicalUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("technical_user_id");
-
-                    b.HasKey("Id")
-                        .HasName("pk_external_technical_user_creation_data");
-
-                    b.HasIndex("ProcessId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_external_technical_user_creation_data_process_id");
-
-                    b.HasIndex("TechnicalUserId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_external_technical_user_creation_data_technical_user_id");
-
-                    b.ToTable("external_technical_user_creation_data", "portal");
-                });
+                    b.Property<int>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamClient", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
 
-                    b.Property<string>("ClientClientId")
+                    b.Property<string>("Description")
                         .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("client_client_id");
-
-                    b.HasKey("Id")
-                        .HasName("pk_iam_clients");
-
-                    b.HasIndex("ClientClientId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_iam_clients_client_client_id");
-
-                    b.ToTable("iam_clients", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamIdentityProvider", b =>
-                {
-                    b.Property<string>("IamIdpAlias")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("iam_idp_alias");
-
-                    b.Property<Guid>("IdentityProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("identity_provider_id");
-
-                    b.Property<string>("MetadataUrl")
                         .HasColumnType("text")
-                        .HasColumnName("metadata_url");
+                        .HasColumnName("description");
 
-                    b.HasKey("IamIdpAlias")
-                        .HasName("pk_iam_identity_providers");
+                    b.HasKey("CompanyCertificateTypeId", "LanguageShortName")
+                        .HasName("pk_company_certificate_type_descriptions");
 
-                    b.HasIndex("IdentityProviderId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_iam_identity_providers_identity_provider_id");
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_company_certificate_type_descriptions_language_short_name");
 
-                    b.ToTable("iam_identity_providers", "portal");
+                    b.ToTable("company_certificate_type_descriptions", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyCertificateTypeStatus", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<Guid>("CompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
-
-                    b.Property<int>("IdentityTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("identity_type_id");
-
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
-
-                    b.Property<string>("UserEntityId")
-                        .HasMaxLength(36)
-                        .HasColumnType("character varying(36)")
-                        .HasColumnName("user_entity_id");
-
-                    b.Property<int>("UserStatusId")
+                    b.Property<int>("Id")
                         .HasColumnType("integer")
-                        .HasColumnName("user_status_id")
-                        .HasAnnotation("Relational:JsonPropertyName", "user_status_id");
-
-                    b.HasKey("Id")
-                        .HasName("pk_identities");
-
-                    b.HasIndex("CompanyId")
-                        .HasDatabaseName("ix_identities_company_id");
-
-                    b.HasIndex("IdentityTypeId")
-                        .HasDatabaseName("ix_identities_identity_type_id");
+                        .HasColumnName("id");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_identities_last_editor_id");
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
 
-                    b.HasIndex("UserEntityId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_identities_user_entity_id");
+                    b.HasKey("Id")
+                        .HasName("pk_company_certificate_type_statuses");
 
-                    b.HasIndex("UserStatusId")
-                        .HasDatabaseName("ix_identities_user_status_id");
+                    b.ToTable("company_certificate_type_statuses", "portal");
 
-                    b.ToTable("identities", "portal", t =>
+                    b.HasData(
+                        new
                         {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_IDENTITY");
-
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_IDENTITY");
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTIVE"
                         });
-
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_IDENTITY", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITY\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_IDENTITY$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity20231115\" (\"id\", \"date_created\", \"company_id\", \"user_status_id\", \"user_entity_id\", \"identity_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"company_id\", \r\n  NEW.\"user_status_id\", \r\n  NEW.\"user_entity_id\", \r\n  NEW.\"identity_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_IDENTITY$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_IDENTITY AFTER INSERT\r\nON \"portal\".\"identities\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITY\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_IDENTITY", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITY\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_IDENTITY$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity20231115\" (\"id\", \"date_created\", \"company_id\", \"user_status_id\", \"user_entity_id\", \"identity_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"company_id\", \r\n  NEW.\"user_status_id\", \r\n  NEW.\"user_entity_id\", \r\n  NEW.\"identity_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_IDENTITY$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_IDENTITY AFTER UPDATE\r\nON \"portal\".\"identities\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITY\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityAssignedRole", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentifier", b =>
                 {
-                    b.Property<Guid>("IdentityId")
+                    b.Property<Guid>("CompanyId")
                         .HasColumnType("uuid")
-                        .HasColumnName("identity_id");
+                        .HasColumnName("company_id");
 
-                    b.Property<Guid>("UserRoleId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_role_id");
+                    b.Property<int>("UniqueIdentifierId")
+                        .HasColumnType("integer")
+                        .HasColumnName("unique_identifier_id");
 
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("value");
 
-                    b.HasKey("IdentityId", "UserRoleId")
-                        .HasName("pk_identity_assigned_roles");
+                    b.HasKey("CompanyId", "UniqueIdentifierId")
+                        .HasName("pk_company_identifiers");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_identity_assigned_roles_last_editor_id");
+                    b.HasIndex("UniqueIdentifierId")
+                        .HasDatabaseName("ix_company_identifiers_unique_identifier_id");
 
-                    b.HasIndex("UserRoleId")
-                        .HasDatabaseName("ix_identity_assigned_roles_user_role_id");
+                    b.ToTable("company_identifiers", "portal");
+                });
 
-                    b.ToTable("identity_assigned_roles", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentityProvider", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE");
-                        });
+                    b.Property<Guid>("IdentityProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_provider_id");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity_assigned_role20230522\" (\"identity_id\", \"user_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"identity_id\", \r\n  NEW.\"user_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE AFTER INSERT\r\nON \"portal\".\"identity_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity_assigned_role20230522\" (\"identity_id\", \"user_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"identity_id\", \r\n  NEW.\"user_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE AFTER UPDATE\r\nON \"portal\".\"identity_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE\"();");
+                    b.HasKey("CompanyId", "IdentityProviderId")
+                        .HasName("pk_company_identity_providers");
+
+                    b.HasIndex("IdentityProviderId")
+                        .HasDatabaseName("ix_company_identity_providers_identity_provider_id");
+
+                    b.ToTable("company_identity_providers", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProvider", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyInvitation", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
-
-                    b.Property<int>("IdentityProviderCategoryId")
-                        .HasColumnType("integer")
-                        .HasColumnName("identity_provider_category_id");
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("application_id");
 
-                    b.Property<int>("IdentityProviderTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("identity_provider_type_id");
+                    b.Property<string>("ClientId")
+                        .HasColumnType("text")
+                        .HasColumnName("client_id");
 
-                    b.Property<Guid>("OwnerId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("owner_id");
+                    b.Property<byte[]>("ClientSecret")
+                        .HasColumnType("bytea")
+                        .HasColumnName("client_secret");
 
-                    b.HasKey("Id")
-                        .HasName("pk_identity_providers");
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("email");
 
-                    b.HasIndex("IdentityProviderCategoryId")
-                        .HasDatabaseName("ix_identity_providers_identity_provider_category_id");
+                    b.Property<int?>("EncryptionMode")
+                        .HasColumnType("integer")
+                        .HasColumnName("encryption_mode");
 
-                    b.HasIndex("IdentityProviderTypeId")
-                        .HasDatabaseName("ix_identity_providers_identity_provider_type_id");
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("first_name");
 
-                    b.HasIndex("OwnerId")
-                        .HasDatabaseName("ix_identity_providers_owner_id");
+                    b.Property<string>("IdpName")
+                        .HasColumnType("text")
+                        .HasColumnName("idp_name");
 
-                    b.ToTable("identity_providers", "portal");
-                });
+                    b.Property<byte[]>("InitializationVector")
+                        .HasColumnType("bytea")
+                        .HasColumnName("initialization_vector");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderAssignedProcess", b =>
-                {
-                    b.Property<Guid>("IdentityProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("identity_provider_id");
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_name");
 
                     b.Property<Guid>("ProcessId")
                         .HasColumnType("uuid")
                         .HasColumnName("process_id");
 
-                    b.HasKey("IdentityProviderId", "ProcessId")
-                        .HasName("pk_identity_provider_assigned_processes");
+                    b.Property<string>("ServiceAccountUserId")
+                        .HasColumnType("text")
+                        .HasColumnName("service_account_user_id");
 
-                    b.HasIndex("IdentityProviderId")
+                    b.Property<string>("UserName")
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_invitations");
+
+                    b.HasIndex("ApplicationId")
                         .IsUnique()
-                        .HasDatabaseName("ix_identity_provider_assigned_processes_identity_provider_id");
+                        .HasDatabaseName("ix_company_invitations_application_id");
 
                     b.HasIndex("ProcessId")
-                        .HasDatabaseName("ix_identity_provider_assigned_processes_process_id");
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_invitations_process_id");
 
-                    b.ToTable("identity_provider_assigned_processes", "portal");
+                    b.ToTable("company_invitations", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderCategory", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -5271,89 +4628,101 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_identity_provider_categories");
+                        .HasName("pk_company_roles");
 
-                    b.ToTable("identity_provider_categories", "portal");
+                    b.ToTable("company_roles", "portal");
 
                     b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "ACTIVE_PARTICIPANT"
+                        },
                         new
                         {
                             Id = 2,
-                            Label = "KEYCLOAK_OIDC"
+                            Label = "APP_PROVIDER"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "KEYCLOAK_SAML"
+                            Label = "SERVICE_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "OPERATOR"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "ONBOARDING_SERVICE_PROVIDER"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleAssignedRoleCollection", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<int>("CompanyRoleId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("company_role_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("UserRoleCollectionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_collection_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_identity_provider_types");
+                    b.HasKey("CompanyRoleId")
+                        .HasName("pk_company_role_assigned_role_collections");
 
-                    b.ToTable("identity_provider_types", "portal");
+                    b.HasIndex("UserRoleCollectionId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_role_assigned_role_collections_user_role_collection");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "OWN"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "MANAGED"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "SHARED"
-                        });
+                    b.ToTable("company_role_assigned_role_collections", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleDescription", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<int>("CompanyRoleId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("company_role_id");
 
-                    b.Property<string>("Label")
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.Property<string>("Description")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                        .HasColumnName("description");
+
+                    b.HasKey("CompanyRoleId", "LanguageShortName")
+                        .HasName("pk_company_role_descriptions");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_company_role_descriptions_language_short_name");
+
+                    b.ToTable("company_role_descriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleRegistrationData", b =>
+                {
+                    b.Property<int>("CompanyRoleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_role_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_identity_type");
+                    b.Property<bool>("IsRegistrationRole")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_registration_role");
 
-                    b.ToTable("identity_type", "portal");
+                    b.HasKey("CompanyRoleId")
+                        .HasName("pk_company_role_registration_data");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "COMPANY_USER"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "COMPANY_SERVICE_ACCOUNT"
-                        });
+                    b.ToTable("company_role_registration_data", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityUserStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyStatus", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -5366,457 +4735,362 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_identity_user_statuses");
+                        .HasName("pk_company_statuses");
 
-                    b.ToTable("identity_user_statuses", "portal");
+                    b.ToTable("company_statuses", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "ACTIVE"
+                            Label = "PENDING"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "INACTIVE"
+                            Label = "ACTIVE"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "DELETED"
+                            Label = "REJECTED"
                         },
                         new
                         {
                             Id = 4,
-                            Label = "PENDING"
+                            Label = "INACTIVE"
                         },
                         new
                         {
                             Id = 5,
-                            Label = "PENDING_DELETION"
+                            Label = "DELETED"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Invitation", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<Guid>("CompanyApplicationId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("company_application_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.Property<Guid>("CompanyUserId")
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("email");
+
+                    b.Property<string>("Firstname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("firstname");
+
+                    b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_user_id");
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.Property<byte[]>("Lastlogin")
+                        .HasColumnType("bytea")
+                        .HasColumnName("lastlogin");
 
-                    b.Property<int>("InvitationStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("invitation_status_id");
+                    b.Property<string>("Lastname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("lastname");
 
                     b.HasKey("Id")
-                        .HasName("pk_invitations");
+                        .HasName("pk_company_users");
 
-                    b.HasIndex("CompanyApplicationId")
-                        .HasDatabaseName("ix_invitations_company_application_id");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_company_users_last_editor_id");
 
-                    b.HasIndex("CompanyUserId")
-                        .HasDatabaseName("ix_invitations_company_user_id");
+                    b.ToTable("company_users", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYUSER");
 
-                    b.HasIndex("InvitationStatusId")
-                        .HasDatabaseName("ix_invitations_invitation_status_id");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYUSER");
+                        });
 
-                    b.ToTable("invitations", "portal");
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYUSER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYUSER\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYUSER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_user20230523\" (\"id\", \"email\", \"firstname\", \"lastlogin\", \"lastname\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"email\", \r\n  NEW.\"firstname\", \r\n  NEW.\"lastlogin\", \r\n  NEW.\"lastname\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYUSER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYUSER AFTER INSERT\r\nON \"portal\".\"company_users\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYUSER\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYUSER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYUSER\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYUSER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_user20230523\" (\"id\", \"email\", \"firstname\", \"lastlogin\", \"lastname\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"email\", \r\n  NEW.\"firstname\", \r\n  NEW.\"lastlogin\", \r\n  NEW.\"lastname\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYUSER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYUSER AFTER UPDATE\r\nON \"portal\".\"company_users\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYUSER\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.InvitationStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedAppFavourite", b =>
                 {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_invitation_statuses");
+                    b.HasKey("CompanyUserId", "AppId")
+                        .HasName("pk_company_user_assigned_app_favourites");
 
-                    b.ToTable("invitation_statuses", "portal");
+                    b.HasIndex("AppId")
+                        .HasDatabaseName("ix_company_user_assigned_app_favourites_app_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "CREATED"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "PENDING"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "ACCEPTED"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "DECLINED"
-                        });
+                    b.ToTable("company_user_assigned_app_favourites", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedBusinessPartner", b =>
                 {
-                    b.Property<string>("ShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("short_name")
-                        .IsFixedLength();
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
 
-                    b.HasKey("ShortName")
-                        .HasName("pk_languages");
+                    b.Property<string>("BusinessPartnerNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("business_partner_number");
 
-                    b.ToTable("languages", "portal");
+                    b.HasKey("CompanyUserId", "BusinessPartnerNumber")
+                        .HasName("pk_company_user_assigned_business_partners");
+
+                    b.ToTable("company_user_assigned_business_partners", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LanguageLongName", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedIdentityProvider", b =>
                 {
-                    b.Property<string>("ShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("short_name")
-                        .IsFixedLength();
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
 
-                    b.Property<string>("LanguageShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("language_short_name")
-                        .IsFixedLength();
+                    b.Property<Guid>("IdentityProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_provider_id");
 
-                    b.Property<string>("LongName")
+                    b.Property<string>("ProviderId")
                         .IsRequired()
                         .HasColumnType("text")
-                        .HasColumnName("long_name");
+                        .HasColumnName("provider_id");
 
-                    b.HasKey("ShortName", "LanguageShortName")
-                        .HasName("pk_language_long_names");
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
 
-                    b.HasIndex("LanguageShortName")
-                        .HasDatabaseName("ix_language_long_names_language_short_name");
+                    b.HasKey("CompanyUserId", "IdentityProviderId")
+                        .HasName("pk_company_user_assigned_identity_providers");
 
-                    b.ToTable("language_long_names", "portal");
+                    b.HasIndex("IdentityProviderId")
+                        .HasDatabaseName("ix_company_user_assigned_identity_providers_identity_provider_");
+
+                    b.ToTable("company_user_assigned_identity_providers", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LicenseType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedProcess", b =>
                 {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
 
-                    b.HasKey("Id")
-                        .HasName("pk_license_types");
+                    b.HasKey("CompanyUserId", "ProcessId")
+                        .HasName("pk_company_user_assigned_processes");
 
-                    b.ToTable("license_types", "portal");
+                    b.HasIndex("CompanyUserId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_user_assigned_processes_company_user_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "COTS"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "FOSS"
-                        });
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_user_assigned_processes_process_id");
+
+                    b.ToTable("company_user_assigned_processes", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MailingInformation", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyWalletData", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<string>("Email")
+                    b.Property<string>("AuthenticationServiceUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("authentication_service_url");
+
+                    b.Property<string>("ClientId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("client_id");
+
+                    b.Property<byte[]>("ClientSecret")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("client_secret");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<string>("Did")
                         .IsRequired()
                         .HasColumnType("text")
-                        .HasColumnName("email");
+                        .HasColumnName("did");
+
+                    b.Property<JsonDocument>("DidDocument")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("did_document");
 
                     b.Property<int>("EncryptionMode")
                         .HasColumnType("integer")
                         .HasColumnName("encryption_mode");
 
                     b.Property<byte[]>("InitializationVector")
-                        .IsRequired()
                         .HasColumnType("bytea")
                         .HasColumnName("initialization_vector");
 
-                    b.Property<byte[]>("MailParameters")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("mail_parameters");
-
-                    b.Property<int>("MailingStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("mailing_status_id");
-
-                    b.Property<Guid>("ProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.Property<string>("Template")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("template");
-
                     b.HasKey("Id")
-                        .HasName("pk_mailing_informations");
-
-                    b.HasIndex("MailingStatusId")
-                        .HasDatabaseName("ix_mailing_informations_mailing_status_id");
+                        .HasName("pk_company_wallet_datas");
 
-                    b.HasIndex("ProcessId")
+                    b.HasIndex("CompanyId")
                         .IsUnique()
-                        .HasDatabaseName("ix_mailing_informations_process_id");
+                        .HasDatabaseName("ix_company_wallet_datas_company_id");
 
-                    b.ToTable("mailing_informations", "portal");
+                    b.ToTable("company_wallet_datas", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MailingStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", b =>
                 {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
                         .HasColumnName("id");
 
-                    b.Property<string>("Label")
+                    b.Property<string>("ConnectorUrl")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                        .HasColumnName("connector_url");
 
-                    b.HasKey("Id")
-                        .HasName("pk_mailing_statuses");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.ToTable("mailing_statuses", "portal");
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "PENDING"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "SENT"
-                        });
-                });
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MediaType", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("location_id");
 
-                    b.Property<string>("Label")
+                    b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
-
-                    b.HasKey("Id")
-                        .HasName("pk_media_types");
-
-                    b.ToTable("media_types", "portal");
-
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "JPEG"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "GIF"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "PNG"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "SVG"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "TIFF"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "PDF"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "JSON"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "PEM"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "CA_CERT"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "PKX_CER"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Label = "OCTET"
-                        });
-                });
+                        .HasColumnName("name");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
+                    b.Property<Guid>("ProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("provider_id");
 
-                    b.Property<Guid>("ApplicationId")
+                    b.Property<Guid?>("SdCreationProcessId")
                         .HasColumnType("uuid")
-                        .HasColumnName("application_id");
+                        .HasColumnName("sd_creation_process_id");
 
-                    b.Property<Guid>("CompanyId")
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                        .HasColumnName("self_description_document_id");
 
-                    b.Property<string>("ExternalId")
-                        .IsRequired()
+                    b.Property<string>("SelfDescriptionMessage")
                         .HasColumnType("text")
-                        .HasColumnName("external_id");
+                        .HasColumnName("self_description_message");
 
-                    b.Property<Guid>("OnboardingServiceProviderId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("onboarding_service_provider_id");
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
 
-                    b.Property<Guid>("ProcessId")
+                    b.Property<Guid?>("TechnicalUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("process_id");
+                        .HasColumnName("technical_user_id");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
 
                     b.HasKey("Id")
-                        .HasName("pk_network_registrations");
+                        .HasName("pk_connectors");
 
-                    b.HasIndex("ApplicationId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_network_registrations_application_id");
+                    b.HasIndex("HostId")
+                        .HasDatabaseName("ix_connectors_host_id");
 
-                    b.HasIndex("CompanyId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_network_registrations_company_id");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_connectors_last_editor_id");
 
-                    b.HasIndex("OnboardingServiceProviderId")
-                        .HasDatabaseName("ix_network_registrations_onboarding_service_provider_id");
+                    b.HasIndex("LocationId")
+                        .HasDatabaseName("ix_connectors_location_id");
 
-                    b.HasIndex("ProcessId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_network_registrations_process_id");
+                    b.HasIndex("ProviderId")
+                        .HasDatabaseName("ix_connectors_provider_id");
 
-                    b.HasIndex("ExternalId", "OnboardingServiceProviderId")
+                    b.HasIndex("SdCreationProcessId")
                         .IsUnique()
-                        .HasDatabaseName("ix_network_registrations_external_id_onboarding_service_provid");
-
-                    b.ToTable("network_registrations", "portal");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Notification", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("Content")
-                        .HasColumnType("text")
-                        .HasColumnName("content");
+                        .HasDatabaseName("ix_connectors_sd_creation_process_id");
 
-                    b.Property<Guid?>("CreatorUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("creator_user_id");
+                    b.HasIndex("SelfDescriptionDocumentId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_connectors_self_description_document_id");
 
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                    b.HasIndex("StatusId")
+                        .HasDatabaseName("ix_connectors_status_id");
 
-                    b.Property<bool?>("Done")
-                        .HasColumnType("boolean")
-                        .HasColumnName("done");
+                    b.HasIndex("TechnicalUserId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_connectors_technical_user_id");
 
-                    b.Property<DateTimeOffset?>("DueDate")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("due_date");
+                    b.HasIndex("TypeId")
+                        .HasDatabaseName("ix_connectors_type_id");
 
-                    b.Property<bool>("IsRead")
-                        .HasColumnType("boolean")
-                        .HasColumnName("is_read");
+                    b.ToTable("connectors", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_CONNECTOR");
 
-                    b.Property<int>("NotificationTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("notification_type_id");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_CONNECTOR");
+                        });
 
-                    b.Property<Guid>("ReceiverUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("receiver_user_id");
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_CONNECTOR", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONNECTOR\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_CONNECTOR$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_connector20241008\" (\"id\", \"name\", \"connector_url\", \"type_id\", \"status_id\", \"provider_id\", \"host_id\", \"self_description_document_id\", \"location_id\", \"self_description_message\", \"date_last_changed\", \"technical_user_id\", \"sd_creation_process_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"connector_url\", \r\n  NEW.\"type_id\", \r\n  NEW.\"status_id\", \r\n  NEW.\"provider_id\", \r\n  NEW.\"host_id\", \r\n  NEW.\"self_description_document_id\", \r\n  NEW.\"location_id\", \r\n  NEW.\"self_description_message\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"technical_user_id\", \r\n  NEW.\"sd_creation_process_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_CONNECTOR$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_CONNECTOR AFTER INSERT\r\nON \"portal\".\"connectors\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONNECTOR\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_CONNECTOR", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONNECTOR\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_CONNECTOR$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_connector20241008\" (\"id\", \"name\", \"connector_url\", \"type_id\", \"status_id\", \"provider_id\", \"host_id\", \"self_description_document_id\", \"location_id\", \"self_description_message\", \"date_last_changed\", \"technical_user_id\", \"sd_creation_process_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"connector_url\", \r\n  NEW.\"type_id\", \r\n  NEW.\"status_id\", \r\n  NEW.\"provider_id\", \r\n  NEW.\"host_id\", \r\n  NEW.\"self_description_document_id\", \r\n  NEW.\"location_id\", \r\n  NEW.\"self_description_message\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"technical_user_id\", \r\n  NEW.\"sd_creation_process_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_CONNECTOR$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_CONNECTOR AFTER UPDATE\r\nON \"portal\".\"connectors\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONNECTOR\"();");
+                });
 
-                    b.HasKey("Id")
-                        .HasName("pk_notifications");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorAssignedOfferSubscription", b =>
+                {
+                    b.Property<Guid>("ConnectorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("connector_id");
 
-                    b.HasIndex("CreatorUserId")
-                        .HasDatabaseName("ix_notifications_creator_user_id");
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
 
-                    b.HasIndex("NotificationTypeId")
-                        .HasDatabaseName("ix_notifications_notification_type_id");
+                    b.HasKey("ConnectorId", "OfferSubscriptionId")
+                        .HasName("pk_connector_assigned_offer_subscriptions");
 
-                    b.HasIndex("ReceiverUserId")
-                        .HasDatabaseName("ix_notifications_receiver_user_id");
+                    b.HasIndex("OfferSubscriptionId")
+                        .HasDatabaseName("ix_connector_assigned_offer_subscriptions_offer_subscription_id");
 
-                    b.ToTable("notifications", "portal");
+                    b.ToTable("connector_assigned_offer_subscriptions", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTopic", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorStatus", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -5829,29 +5103,29 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_notification_topic");
+                        .HasName("pk_connector_statuses");
 
-                    b.ToTable("notification_topic", "portal");
+                    b.ToTable("connector_statuses", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "INFO"
+                            Label = "PENDING"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "ACTION"
+                            Label = "ACTIVE"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "OFFER"
+                            Label = "INACTIVE"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorType", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -5864,385 +5138,364 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_notification_type");
+                        .HasName("pk_connector_types");
 
-                    b.ToTable("notification_type", "portal");
+                    b.ToTable("connector_types", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "INFO"
+                            Label = "COMPANY_CONNECTOR"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "ACTION"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "WELCOME"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "WELCOME_USE_CASES"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "WELCOME_SERVICE_PROVIDER"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "WELCOME_CONNECTOR_REGISTRATION"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "WELCOME_APP_MARKETPLACE"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "APP_SUBSCRIPTION_REQUEST"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "APP_SUBSCRIPTION_ACTIVATION"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "CONNECTOR_REGISTERED"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Label = "APP_RELEASE_REQUEST"
-                        },
-                        new
-                        {
-                            Id = 12,
-                            Label = "TECHNICAL_USER_CREATION"
-                        },
-                        new
-                        {
-                            Id = 13,
-                            Label = "SERVICE_REQUEST"
-                        },
-                        new
-                        {
-                            Id = 14,
-                            Label = "SERVICE_ACTIVATION"
-                        },
-                        new
-                        {
-                            Id = 15,
-                            Label = "APP_ROLE_ADDED"
-                        },
-                        new
-                        {
-                            Id = 16,
-                            Label = "APP_RELEASE_APPROVAL"
-                        },
-                        new
-                        {
-                            Id = 17,
-                            Label = "SERVICE_RELEASE_REQUEST"
-                        },
-                        new
-                        {
-                            Id = 18,
-                            Label = "SERVICE_RELEASE_APPROVAL"
-                        },
-                        new
-                        {
-                            Id = 19,
-                            Label = "APP_RELEASE_REJECTION"
-                        },
-                        new
-                        {
-                            Id = 20,
-                            Label = "SERVICE_RELEASE_REJECTION"
-                        },
-                        new
-                        {
-                            Id = 21,
-                            Label = "ROLE_UPDATE_CORE_OFFER"
-                        },
-                        new
-                        {
-                            Id = 22,
-                            Label = "ROLE_UPDATE_APP_OFFER"
-                        },
-                        new
-                        {
-                            Id = 23,
-                            Label = "SUBSCRIPTION_URL_UPDATE"
-                        },
-                        new
-                        {
-                            Id = 24,
-                            Label = "CREDENTIAL_APPROVAL"
-                        },
-                        new
-                        {
-                            Id = 25,
-                            Label = "CREDENTIAL_REJECTED"
-                        },
-                        new
-                        {
-                            Id = 26,
-                            Label = "CREDENTIAL_EXPIRY"
-                        },
-                        new
-                        {
-                            Id = 27,
-                            Label = "APP_SUBSCRIPTION_DECLINE"
-                        },
-                        new
+                            Label = "CONNECTOR_AS_A_SERVICE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Consent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<string>("Comment")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("comment");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<int>("ConsentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("consent_status_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("Target")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("target");
+
+                    b.HasKey("Id")
+                        .HasName("pk_consents");
+
+                    b.HasIndex("AgreementId")
+                        .HasDatabaseName("ix_consents_agreement_id");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_consents_company_id");
+
+                    b.HasIndex("CompanyUserId")
+                        .HasDatabaseName("ix_consents_company_user_id");
+
+                    b.HasIndex("ConsentStatusId")
+                        .HasDatabaseName("ix_consents_consent_status_id");
+
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_consents_document_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_consents_last_editor_id");
+
+                    b.ToTable("consents", "portal", t =>
                         {
-                            Id = 28,
-                            Label = "SERVICE_SUBSCRIPTION_DECLINE"
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_CONSENT");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_CONSENT");
                         });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_CONSENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONSENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_CONSENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_consent20231115\" (\"id\", \"date_created\", \"comment\", \"consent_status_id\", \"target\", \"agreement_id\", \"company_id\", \"document_id\", \"company_user_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"comment\", \r\n  NEW.\"consent_status_id\", \r\n  NEW.\"target\", \r\n  NEW.\"agreement_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_CONSENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_CONSENT AFTER INSERT\r\nON \"portal\".\"consents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONSENT\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_CONSENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONSENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_CONSENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_consent20231115\" (\"id\", \"date_created\", \"comment\", \"consent_status_id\", \"target\", \"agreement_id\", \"company_id\", \"document_id\", \"company_user_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"comment\", \r\n  NEW.\"consent_status_id\", \r\n  NEW.\"target\", \r\n  NEW.\"agreement_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_CONSENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_CONSENT AFTER UPDATE\r\nON \"portal\".\"consents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONSENT\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTypeAssignedTopic", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOffer", b =>
                 {
-                    b.Property<int>("NotificationTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("notification_type_id");
-
-                    b.Property<int>("NotificationTopicId")
-                        .HasColumnType("integer")
-                        .HasColumnName("notification_topic_id");
+                    b.Property<Guid>("ConsentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("consent_id");
 
-                    b.HasKey("NotificationTypeId", "NotificationTopicId")
-                        .HasName("pk_notification_type_assigned_topics");
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
 
-                    b.HasIndex("NotificationTopicId")
-                        .HasDatabaseName("ix_notification_type_assigned_topics_notification_topic_id");
+                    b.HasKey("ConsentId", "OfferId")
+                        .HasName("pk_consent_assigned_offers");
 
-                    b.HasIndex("NotificationTypeId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_notification_type_assigned_topics_notification_type_id");
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_consent_assigned_offers_offer_id");
 
-                    b.ToTable("notification_type_assigned_topics", "portal");
+                    b.ToTable("consent_assigned_offers", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOfferSubscription", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
+                    b.Property<Guid>("ConsentId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("ContactEmail")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("contact_email");
-
-                    b.Property<string>("ContactNumber")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("contact_number");
-
-                    b.Property<DateTimeOffset>("DateCreated")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_created");
+                        .HasColumnName("consent_id");
 
-                    b.Property<DateTimeOffset?>("DateLastChanged")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_last_changed");
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
 
-                    b.Property<DateTimeOffset?>("DateReleased")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date_released");
+                    b.HasKey("ConsentId", "OfferSubscriptionId")
+                        .HasName("pk_consent_assigned_offer_subscriptions");
 
-                    b.Property<bool?>("DisplayTechnicalUser")
-                        .HasColumnType("boolean")
-                        .HasColumnName("display_technical_user");
+                    b.HasIndex("OfferSubscriptionId")
+                        .HasDatabaseName("ix_consent_assigned_offer_subscriptions_offer_subscription_id");
 
-                    b.Property<Guid?>("LastEditorId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_editor_id");
+                    b.ToTable("consent_assigned_offer_subscriptions", "portal");
+                });
 
-                    b.Property<int>("LicenseTypeId")
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentStatus", b =>
+                {
+                    b.Property<int>("Id")
                         .HasColumnType("integer")
-                        .HasColumnName("license_type_id");
-
-                    b.Property<string>("MarketingUrl")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("marketing_url");
+                        .HasColumnName("id");
 
-                    b.Property<string>("Name")
+                    b.Property<string>("Label")
+                        .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("name");
+                        .HasColumnName("label");
 
-                    b.Property<int>("OfferStatusId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_status_id");
+                    b.HasKey("Id")
+                        .HasName("pk_consent_statuses");
 
-                    b.Property<int>("OfferTypeId")
-                        .HasColumnType("integer")
-                        .HasColumnName("offer_type_id");
+                    b.ToTable("consent_statuses", "portal");
 
-                    b.Property<Guid>("ProviderCompanyId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("provider_company_id");
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTIVE"
+                        });
+                });
 
-                    b.Property<Guid?>("SalesManagerId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("sales_manager_id");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Country", b =>
+                {
+                    b.Property<string>("Alpha2Code")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("alpha2code")
+                        .IsFixedLength()
+                        .HasAnnotation("Relational:JsonPropertyName", "alpha2code");
 
-                    b.HasKey("Id")
-                        .HasName("pk_offers");
+                    b.Property<string>("Alpha3Code")
+                        .HasMaxLength(3)
+                        .HasColumnType("character(3)")
+                        .HasColumnName("alpha3code")
+                        .IsFixedLength()
+                        .HasAnnotation("Relational:JsonPropertyName", "alpha3code");
 
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_offers_last_editor_id");
+                    b.HasKey("Alpha2Code")
+                        .HasName("pk_countries");
 
-                    b.HasIndex("LicenseTypeId")
-                        .HasDatabaseName("ix_offers_license_type_id");
+                    b.ToTable("countries", "portal");
+                });
 
-                    b.HasIndex("OfferStatusId")
-                        .HasDatabaseName("ix_offers_offer_status_id");
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryAssignedIdentifier", b =>
+                {
+                    b.Property<string>("CountryAlpha2Code")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("country_alpha2code")
+                        .HasAnnotation("Relational:JsonPropertyName", "country_alpha2code");
 
-                    b.HasIndex("OfferTypeId")
-                        .HasDatabaseName("ix_offers_offer_type_id");
+                    b.Property<int>("UniqueIdentifierId")
+                        .HasColumnType("integer")
+                        .HasColumnName("unique_identifier_id");
 
-                    b.HasIndex("ProviderCompanyId")
-                        .HasDatabaseName("ix_offers_provider_company_id");
+                    b.Property<int?>("BpdmIdentifierId")
+                        .HasColumnType("integer")
+                        .HasColumnName("bpdm_identifier_id");
 
-                    b.HasIndex("SalesManagerId")
-                        .HasDatabaseName("ix_offers_sales_manager_id");
+                    b.HasKey("CountryAlpha2Code", "UniqueIdentifierId")
+                        .HasName("pk_country_assigned_identifiers");
 
-                    b.ToTable("offers", "portal", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_OFFER");
+                    b.HasIndex("BpdmIdentifierId")
+                        .HasDatabaseName("ix_country_assigned_identifiers_bpdm_identifier_id");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_OFFER");
-                        });
+                    b.HasIndex("UniqueIdentifierId")
+                        .HasDatabaseName("ix_country_assigned_identifiers_unique_identifier_id");
 
-                    b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_OFFER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFER\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_OFFER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer20241219\" (\"id\", \"name\", \"date_created\", \"date_released\", \"marketing_url\", \"contact_email\", \"contact_number\", \"display_technical_user\", \"offer_type_id\", \"sales_manager_id\", \"provider_company_id\", \"offer_status_id\", \"license_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_released\", \r\n  NEW.\"marketing_url\", \r\n  NEW.\"contact_email\", \r\n  NEW.\"contact_number\", \r\n  NEW.\"display_technical_user\", \r\n  NEW.\"offer_type_id\", \r\n  NEW.\"sales_manager_id\", \r\n  NEW.\"provider_company_id\", \r\n  NEW.\"offer_status_id\", \r\n  NEW.\"license_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_OFFER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_OFFER AFTER INSERT\r\nON \"portal\".\"offers\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFER\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_OFFER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFER\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_OFFER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer20241219\" (\"id\", \"name\", \"date_created\", \"date_released\", \"marketing_url\", \"contact_email\", \"contact_number\", \"display_technical_user\", \"offer_type_id\", \"sales_manager_id\", \"provider_company_id\", \"offer_status_id\", \"license_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_released\", \r\n  NEW.\"marketing_url\", \r\n  NEW.\"contact_email\", \r\n  NEW.\"contact_number\", \r\n  NEW.\"display_technical_user\", \r\n  NEW.\"offer_type_id\", \r\n  NEW.\"sales_manager_id\", \r\n  NEW.\"provider_company_id\", \r\n  NEW.\"offer_status_id\", \r\n  NEW.\"license_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_OFFER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_OFFER AFTER UPDATE\r\nON \"portal\".\"offers\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFER\"();");
+                    b.ToTable("country_assigned_identifiers", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedDocument", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryLongName", b =>
                 {
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                    b.Property<string>("Alpha2Code")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("alpha2code")
+                        .HasAnnotation("Relational:JsonPropertyName", "alpha2code");
 
-                    b.Property<Guid>("DocumentId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("document_id");
+                    b.Property<string>("ShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("short_name");
 
-                    b.HasKey("OfferId", "DocumentId")
-                        .HasName("pk_offer_assigned_documents");
+                    b.Property<string>("LongName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("long_name");
 
-                    b.HasIndex("DocumentId")
-                        .HasDatabaseName("ix_offer_assigned_documents_document_id");
+                    b.HasKey("Alpha2Code", "ShortName")
+                        .HasName("pk_country_long_names");
 
-                    b.ToTable("offer_assigned_documents", "portal");
+                    b.HasIndex("ShortName")
+                        .HasDatabaseName("ix_country_long_names_short_name");
+
+                    b.ToTable("country_long_names", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedLicense", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", b =>
                 {
-                    b.Property<Guid>("OfferId")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                        .HasColumnName("id");
 
-                    b.Property<Guid>("OfferLicenseId")
+                    b.Property<Guid?>("CompanyUserId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_license_id");
+                        .HasColumnName("company_user_id");
 
-                    b.HasKey("OfferId", "OfferLicenseId")
-                        .HasName("pk_offer_assigned_licenses");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.HasIndex("OfferLicenseId")
-                        .HasDatabaseName("ix_offer_assigned_licenses_offer_license_id");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.ToTable("offer_assigned_licenses", "portal");
-                });
+                    b.Property<byte[]>("DocumentContent")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedPrivacyPolicy", b =>
-                {
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                    b.Property<byte[]>("DocumentHash")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("document_name");
+
+                    b.Property<long>("DocumentSize")
+                        .HasColumnType("bigint")
+                        .HasColumnName("document_size");
 
-                    b.Property<int>("PrivacyPolicyId")
+                    b.Property<int>("DocumentStatusId")
                         .HasColumnType("integer")
-                        .HasColumnName("privacy_policy_id");
+                        .HasColumnName("document_status_id");
 
-                    b.HasKey("OfferId", "PrivacyPolicyId")
-                        .HasName("pk_offer_assigned_privacy_policies");
+                    b.Property<int>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
 
-                    b.HasIndex("PrivacyPolicyId")
-                        .HasDatabaseName("ix_offer_assigned_privacy_policies_privacy_policy_id");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.ToTable("offer_assigned_privacy_policies", "portal");
-                });
+                    b.Property<int>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferDescription", b =>
-                {
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                    b.HasKey("Id")
+                        .HasName("pk_documents");
 
-                    b.Property<string>("LanguageShortName")
-                        .HasMaxLength(2)
-                        .HasColumnType("character(2)")
-                        .HasColumnName("language_short_name");
+                    b.HasIndex("CompanyUserId")
+                        .HasDatabaseName("ix_documents_company_user_id");
 
-                    b.Property<string>("DescriptionLong")
-                        .IsRequired()
-                        .HasMaxLength(4096)
-                        .HasColumnType("character varying(4096)")
-                        .HasColumnName("description_long");
+                    b.HasIndex("DocumentStatusId")
+                        .HasDatabaseName("ix_documents_document_status_id");
 
-                    b.Property<string>("DescriptionShort")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("description_short");
+                    b.HasIndex("DocumentTypeId")
+                        .HasDatabaseName("ix_documents_document_type_id");
 
-                    b.HasKey("OfferId", "LanguageShortName")
-                        .HasName("pk_offer_descriptions");
+                    b.HasIndex("MediaTypeId")
+                        .HasDatabaseName("ix_documents_media_type_id");
 
-                    b.HasIndex("LanguageShortName")
-                        .HasDatabaseName("ix_offer_descriptions_language_short_name");
+                    b.ToTable("documents", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_DOCUMENT");
 
-                    b.ToTable("offer_descriptions", "portal");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_DOCUMENT");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_DOCUMENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_DOCUMENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_DOCUMENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_document20241120\" (\"id\", \"date_created\", \"document_hash\", \"document_content\", \"document_name\", \"media_type_id\", \"document_type_id\", \"document_status_id\", \"company_user_id\", \"date_last_changed\", \"last_editor_id\", \"document_size\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"document_hash\", \r\n  NEW.\"document_content\", \r\n  NEW.\"document_name\", \r\n  NEW.\"media_type_id\", \r\n  NEW.\"document_type_id\", \r\n  NEW.\"document_status_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"document_size\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_DOCUMENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_DOCUMENT AFTER INSERT\r\nON \"portal\".\"documents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_DOCUMENT\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_DOCUMENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_DOCUMENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_DOCUMENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_document20241120\" (\"id\", \"date_created\", \"document_hash\", \"document_content\", \"document_name\", \"media_type_id\", \"document_type_id\", \"document_status_id\", \"company_user_id\", \"date_last_changed\", \"last_editor_id\", \"document_size\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"document_hash\", \r\n  NEW.\"document_content\", \r\n  NEW.\"document_name\", \r\n  NEW.\"media_type_id\", \r\n  NEW.\"document_type_id\", \r\n  NEW.\"document_status_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"document_size\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_DOCUMENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_DOCUMENT AFTER UPDATE\r\nON \"portal\".\"documents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_DOCUMENT\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferLicense", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentStatus", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
                         .HasColumnName("id");
 
-                    b.Property<string>("Licensetext")
+                    b.Property<string>("Label")
                         .IsRequired()
                         .HasMaxLength(255)
                         .HasColumnType("character varying(255)")
-                        .HasColumnName("licensetext");
+                        .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_offer_licenses");
+                        .HasName("pk_document_status");
 
-                    b.ToTable("offer_licenses", "portal");
+                    b.ToTable("document_status", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "PENDING"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "LOCKED"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "INACTIVE"
+                        });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferStatus", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentType", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -6255,34 +5508,196 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_offer_statuses");
+                        .HasName("pk_document_types");
 
-                    b.ToTable("offer_statuses", "portal");
+                    b.ToTable("document_types", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "CREATED"
+                            Label = "CX_FRAME_CONTRACT"
                         },
                         new
                         {
                             Id = 2,
-                            Label = "IN_REVIEW"
+                            Label = "COMMERCIAL_REGISTER_EXTRACT"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "ACTIVE"
+                            Label = "APP_CONTRACT"
                         },
                         new
                         {
                             Id = 4,
-                            Label = "INACTIVE"
+                            Label = "CONFORMITY_APPROVAL_REGISTRATION"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "ADDITIONAL_DETAILS"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "APP_LEADIMAGE"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "APP_IMAGE"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "SELF_DESCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "APP_TECHNICAL_INFORMATION"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "CONFORMITY_APPROVAL_CONNECTOR"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "CONFORMITY_APPROVAL_BUSINESS_APPS"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "CONFORMITY_APPROVAL_SERVICES"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            Label = "SERVICE_LEADIMAGE"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            Label = "PRESENTATION"
+                        },
+                        new
+                        {
+                            Id = 15,
+                            Label = "COMPANY_CERTIFICATE"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("AuthenticationServiceUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("authentication_service_url");
+
+                    b.Property<byte[]>("ClientSecret")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("client_secret");
+
+                    b.Property<int>("EncryptionMode")
+                        .HasColumnType("integer")
+                        .HasColumnName("encryption_mode");
+
+                    b.Property<byte[]>("InitializationVector")
+                        .HasColumnType("bytea")
+                        .HasColumnName("initialization_vector");
+
+                    b.HasKey("Id")
+                        .HasName("pk_external_technical_users");
+
+                    b.ToTable("external_technical_users", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUserCreationData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<Guid>("TechnicalUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("technical_user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_external_technical_user_creation_data");
+
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_external_technical_user_creation_data_process_id");
+
+                    b.HasIndex("TechnicalUserId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_external_technical_user_creation_data_technical_user_id");
+
+                    b.ToTable("external_technical_user_creation_data", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamClient", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ClientClientId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("client_client_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_iam_clients");
+
+                    b.HasIndex("ClientClientId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_iam_clients_client_client_id");
+
+                    b.ToTable("iam_clients", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamIdentityProvider", b =>
+                {
+                    b.Property<string>("IamIdpAlias")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("iam_idp_alias");
+
+                    b.Property<Guid>("IdentityProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_provider_id");
+
+                    b.Property<string>("MetadataUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("metadata_url");
+
+                    b.HasKey("IamIdpAlias")
+                        .HasName("pk_iam_identity_providers");
+
+                    b.HasIndex("IdentityProviderId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_iam_identity_providers_identity_provider_id");
+
+                    b.ToTable("iam_identity_providers", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -6297,235 +5712,157 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_created");
 
-                    b.Property<string>("Description")
-                        .HasMaxLength(4096)
-                        .HasColumnType("character varying(4096)")
-                        .HasColumnName("description");
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
 
-                    b.Property<string>("DisplayName")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("display_name");
+                    b.Property<int>("IdentityTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("identity_type_id");
 
                     b.Property<Guid?>("LastEditorId")
                         .HasColumnType("uuid")
                         .HasColumnName("last_editor_id");
 
-                    b.Property<Guid>("OfferId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
+                    b.Property<string>("UserEntityId")
+                        .HasMaxLength(36)
+                        .HasColumnType("character varying(36)")
+                        .HasColumnName("user_entity_id");
 
-                    b.Property<int>("OfferSubscriptionStatusId")
-                        .ValueGeneratedOnAdd()
+                    b.Property<int>("UserStatusId")
                         .HasColumnType("integer")
-                        .HasDefaultValue(1)
-                        .HasColumnName("offer_subscription_status_id");
-
-                    b.Property<Guid?>("ProcessId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("process_id");
-
-                    b.Property<Guid>("RequesterId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("requester_id");
+                        .HasColumnName("user_status_id")
+                        .HasAnnotation("Relational:JsonPropertyName", "user_status_id");
 
                     b.HasKey("Id")
-                        .HasName("pk_offer_subscriptions");
+                        .HasName("pk_identities");
 
                     b.HasIndex("CompanyId")
-                        .HasDatabaseName("ix_offer_subscriptions_company_id");
-
-                    b.HasIndex("LastEditorId")
-                        .HasDatabaseName("ix_offer_subscriptions_last_editor_id");
+                        .HasDatabaseName("ix_identities_company_id");
 
-                    b.HasIndex("OfferId")
-                        .HasDatabaseName("ix_offer_subscriptions_offer_id");
+                    b.HasIndex("IdentityTypeId")
+                        .HasDatabaseName("ix_identities_identity_type_id");
 
-                    b.HasIndex("OfferSubscriptionStatusId")
-                        .HasDatabaseName("ix_offer_subscriptions_offer_subscription_status_id");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_identities_last_editor_id");
 
-                    b.HasIndex("ProcessId")
-                        .HasDatabaseName("ix_offer_subscriptions_process_id");
+                    b.HasIndex("UserEntityId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_identities_user_entity_id");
 
-                    b.HasIndex("RequesterId")
-                        .HasDatabaseName("ix_offer_subscriptions_requester_id");
+                    b.HasIndex("UserStatusId")
+                        .HasDatabaseName("ix_identities_user_status_id");
 
-                    b.ToTable("offer_subscriptions", "portal", t =>
+                    b.ToTable("identities", "portal", t =>
                         {
-                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION");
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_IDENTITY");
 
-                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION");
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_IDENTITY");
                         });
 
                     b
-                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer_subscription20231115\" (\"id\", \"company_id\", \"offer_id\", \"offer_subscription_status_id\", \"display_name\", \"description\", \"requester_id\", \"last_editor_id\", \"process_id\", \"date_created\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"offer_subscription_status_id\", \r\n  NEW.\"display_name\", \r\n  NEW.\"description\", \r\n  NEW.\"requester_id\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"process_id\", \r\n  NEW.\"date_created\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION AFTER INSERT\r\nON \"portal\".\"offer_subscriptions\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION\"();")
-                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer_subscription20231115\" (\"id\", \"company_id\", \"offer_id\", \"offer_subscription_status_id\", \"display_name\", \"description\", \"requester_id\", \"last_editor_id\", \"process_id\", \"date_created\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"offer_subscription_status_id\", \r\n  NEW.\"display_name\", \r\n  NEW.\"description\", \r\n  NEW.\"requester_id\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"process_id\", \r\n  NEW.\"date_created\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION AFTER UPDATE\r\nON \"portal\".\"offer_subscriptions\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION\"();");
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_IDENTITY", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITY\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_IDENTITY$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity20231115\" (\"id\", \"date_created\", \"company_id\", \"user_status_id\", \"user_entity_id\", \"identity_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"company_id\", \r\n  NEW.\"user_status_id\", \r\n  NEW.\"user_entity_id\", \r\n  NEW.\"identity_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_IDENTITY$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_IDENTITY AFTER INSERT\r\nON \"portal\".\"identities\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITY\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_IDENTITY", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITY\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_IDENTITY$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity20231115\" (\"id\", \"date_created\", \"company_id\", \"user_status_id\", \"user_entity_id\", \"identity_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"company_id\", \r\n  NEW.\"user_status_id\", \r\n  NEW.\"user_entity_id\", \r\n  NEW.\"identity_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_IDENTITY$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_IDENTITY AFTER UPDATE\r\nON \"portal\".\"identities\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITY\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionProcessData", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityAssignedRole", b =>
                 {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
+                    b.Property<Guid>("IdentityId")
                         .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasColumnName("identity_id");
 
-                    b.Property<Guid>("OfferSubscriptionId")
+                    b.Property<Guid>("UserRoleId")
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_subscription_id");
-
-                    b.Property<string>("OfferUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("offer_url");
-
-                    b.HasKey("Id")
-                        .HasName("pk_offer_subscriptions_process_datas");
-
-                    b.HasIndex("OfferSubscriptionId")
-                        .IsUnique()
-                        .HasDatabaseName("ix_offer_subscriptions_process_datas_offer_subscription_id");
-
-                    b.ToTable("offer_subscriptions_process_datas", "portal");
-                });
+                        .HasColumnName("user_role_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionStatus", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.HasKey("IdentityId", "UserRoleId")
+                        .HasName("pk_identity_assigned_roles");
 
-                    b.HasKey("Id")
-                        .HasName("pk_offer_subscription_statuses");
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_identity_assigned_roles_last_editor_id");
 
-                    b.ToTable("offer_subscription_statuses", "portal");
+                    b.HasIndex("UserRoleId")
+                        .HasDatabaseName("ix_identity_assigned_roles_user_role_id");
 
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "PENDING"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "ACTIVE"
-                        },
-                        new
+                    b.ToTable("identity_assigned_roles", "portal", t =>
                         {
-                            Id = 3,
-                            Label = "INACTIVE"
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE");
                         });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity_assigned_role20230522\" (\"identity_id\", \"user_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"identity_id\", \r\n  NEW.\"user_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE AFTER INSERT\r\nON \"portal\".\"identity_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity_assigned_role20230522\" (\"identity_id\", \"user_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"identity_id\", \r\n  NEW.\"user_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE AFTER UPDATE\r\nON \"portal\".\"identity_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE\"();");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferTag", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProvider", b =>
                 {
-                    b.Property<Guid>("OfferId")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasColumnName("offer_id");
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("tag_name")
-                        .HasAnnotation("Relational:JsonPropertyName", "tag_name");
+                        .HasColumnName("id");
 
-                    b.HasKey("OfferId", "Name")
-                        .HasName("pk_offer_tags");
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
 
-                    b.ToTable("offer_tags", "portal");
-                });
+                    b.Property<int>("IdentityProviderCategoryId")
+                        .HasColumnType("integer")
+                        .HasColumnName("identity_provider_category_id");
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferType", b =>
-                {
-                    b.Property<int>("Id")
+                    b.Property<int>("IdentityProviderTypeId")
                         .HasColumnType("integer")
-                        .HasColumnName("id");
+                        .HasColumnName("identity_provider_type_id");
 
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("character varying(255)")
-                        .HasColumnName("label");
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_id");
 
                     b.HasKey("Id")
-                        .HasName("pk_offer_types");
-
-                    b.ToTable("offer_types", "portal");
-
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "APP"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "CORE_COMPONENT"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "SERVICE"
-                        });
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OnboardingServiceProviderDetail", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
+                        .HasName("pk_identity_providers");
 
-                    b.Property<string>("AuthUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("auth_url");
+                    b.HasIndex("IdentityProviderCategoryId")
+                        .HasDatabaseName("ix_identity_providers_identity_provider_category_id");
 
-                    b.Property<string>("CallbackUrl")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("callback_url");
+                    b.HasIndex("IdentityProviderTypeId")
+                        .HasDatabaseName("ix_identity_providers_identity_provider_type_id");
 
-                    b.Property<string>("ClientId")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("client_id");
+                    b.HasIndex("OwnerId")
+                        .HasDatabaseName("ix_identity_providers_owner_id");
 
-                    b.Property<byte[]>("ClientSecret")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("client_secret");
+                    b.ToTable("identity_providers", "portal");
+                });
 
-                    b.Property<Guid>("CompanyId")
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderAssignedProcess", b =>
+                {
+                    b.Property<Guid>("IdentityProviderId")
                         .HasColumnType("uuid")
-                        .HasColumnName("company_id");
+                        .HasColumnName("identity_provider_id");
 
-                    b.Property<int>("EncryptionMode")
-                        .HasColumnType("integer")
-                        .HasColumnName("encryption_mode");
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
 
-                    b.Property<byte[]>("InitializationVector")
-                        .HasColumnType("bytea")
-                        .HasColumnName("initialization_vector");
+                    b.HasKey("IdentityProviderId", "ProcessId")
+                        .HasName("pk_identity_provider_assigned_processes");
 
-                    b.HasKey("Id")
-                        .HasName("pk_onboarding_service_provider_details");
+                    b.HasIndex("IdentityProviderId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_identity_provider_assigned_processes_identity_provider_id");
 
-                    b.HasIndex("CompanyId")
+                    b.HasIndex("ProcessId")
                         .IsUnique()
-                        .HasDatabaseName("ix_onboarding_service_provider_details_company_id");
+                        .HasDatabaseName("ix_identity_provider_assigned_processes_process_id");
 
-                    b.ToTable("onboarding_service_provider_details", "portal");
+                    b.ToTable("identity_provider_assigned_processes", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.PrivacyPolicy", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderCategory", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -6538,39 +5875,24 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_privacy_policies");
+                        .HasName("pk_identity_provider_categories");
 
-                    b.ToTable("privacy_policies", "portal");
+                    b.ToTable("identity_provider_categories", "portal");
 
                     b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Label = "COMPANY_DATA"
-                        },
                         new
                         {
                             Id = 2,
-                            Label = "USER_DATA"
+                            Label = "KEYCLOAK_OIDC"
                         },
                         new
                         {
                             Id = 3,
-                            Label = "LOCATION"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "BROWSER_HISTORY"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "NONE"
+                            Label = "KEYCLOAK_SAML"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderType", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -6583,559 +5905,1148 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_process_step_types");
+                        .HasName("pk_identity_provider_types");
 
-                    b.ToTable("process_step_types", "portal");
+                    b.ToTable("identity_provider_types", "portal");
 
                     b.HasData(
                         new
                         {
-                            Id = 1,
-                            Label = "MANUAL_VERIFY_REGISTRATION"
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_PUSH"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_PULL"
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_MANUAL"
-                        },
-                        new
-                        {
-                            Id = 5,
-                            Label = "CREATE_IDENTITY_WALLET"
-                        },
-                        new
-                        {
-                            Id = 6,
-                            Label = "RETRIGGER_IDENTITY_WALLET"
-                        },
-                        new
-                        {
-                            Id = 7,
-                            Label = "START_CLEARING_HOUSE"
-                        },
-                        new
-                        {
-                            Id = 8,
-                            Label = "RETRIGGER_CLEARING_HOUSE"
-                        },
-                        new
-                        {
-                            Id = 9,
-                            Label = "AWAIT_CLEARING_HOUSE_RESPONSE"
-                        },
-                        new
-                        {
-                            Id = 10,
-                            Label = "START_SELF_DESCRIPTION_LP"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Label = "RETRIGGER_SELF_DESCRIPTION_LP"
-                        },
-                        new
-                        {
-                            Id = 12,
-                            Label = "START_APPLICATION_ACTIVATION"
-                        },
-                        new
-                        {
-                            Id = 13,
-                            Label = "RETRIGGER_BUSINESS_PARTNER_NUMBER_PUSH"
-                        },
-                        new
-                        {
-                            Id = 14,
-                            Label = "RETRIGGER_BUSINESS_PARTNER_NUMBER_PULL"
-                        },
-                        new
-                        {
-                            Id = 16,
-                            Label = "MANUAL_TRIGGER_OVERRIDE_CLEARING_HOUSE"
-                        },
-                        new
-                        {
-                            Id = 17,
-                            Label = "START_OVERRIDE_CLEARING_HOUSE"
-                        },
-                        new
-                        {
-                            Id = 18,
-                            Label = "AWAIT_SELF_DESCRIPTION_LP_RESPONSE"
-                        },
-                        new
-                        {
-                            Id = 19,
-                            Label = "MANUAL_DECLINE_APPLICATION"
-                        },
-                        new
-                        {
-                            Id = 20,
-                            Label = "CREATE_DIM_WALLET"
-                        },
-                        new
-                        {
-                            Id = 21,
-                            Label = "AWAIT_DIM_RESPONSE_RESPONSE"
-                        },
-                        new
-                        {
-                            Id = 22,
-                            Label = "RETRIGGER_CREATE_DIM_WALLET"
-                        },
-                        new
-                        {
-                            Id = 23,
-                            Label = "VALIDATE_DID_DOCUMENT"
-                        },
-                        new
-                        {
-                            Id = 24,
-                            Label = "RETRIGGER_VALIDATE_DID_DOCUMENT"
-                        },
-                        new
-                        {
-                            Id = 25,
-                            Label = "REQUEST_BPN_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 26,
-                            Label = "AWAIT_BPN_CREDENTIAL_RESPONSE"
-                        },
-                        new
-                        {
-                            Id = 27,
-                            Label = "REQUEST_MEMBERSHIP_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 28,
-                            Label = "AWAIT_MEMBERSHIP_CREDENTIAL_RESPONSE"
-                        },
-                        new
-                        {
-                            Id = 29,
-                            Label = "TRANSMIT_BPN_DID"
-                        },
-                        new
-                        {
-                            Id = 30,
-                            Label = "RETRIGGER_TRANSMIT_DID_BPN"
-                        },
-                        new
-                        {
-                            Id = 31,
-                            Label = "RETRIGGER_REQUEST_BPN_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 32,
-                            Label = "RETRIGGER_REQUEST_MEMBERSHIP_CREDENTIAL"
-                        },
-                        new
-                        {
-                            Id = 33,
-                            Label = "ASSIGN_INITIAL_ROLES"
-                        },
-                        new
-                        {
-                            Id = 34,
-                            Label = "ASSIGN_BPN_TO_USERS"
-                        },
-                        new
-                        {
-                            Id = 35,
-                            Label = "REMOVE_REGISTRATION_ROLES"
-                        },
-                        new
-                        {
-                            Id = 36,
-                            Label = "SET_THEME"
-                        },
-                        new
-                        {
-                            Id = 37,
-                            Label = "SET_MEMBERSHIP"
-                        },
-                        new
-                        {
-                            Id = 38,
-                            Label = "FINISH_APPLICATION_ACTIVATION"
-                        },
-                        new
-                        {
-                            Id = 39,
-                            Label = "RETRIGGER_ASSIGN_INITIAL_ROLES"
-                        },
-                        new
-                        {
-                            Id = 40,
-                            Label = "RETRIGGER_ASSIGN_BPN_TO_USERS"
-                        },
-                        new
-                        {
-                            Id = 41,
-                            Label = "RETRIGGER_REMOVE_REGISTRATION_ROLES"
-                        },
-                        new
-                        {
-                            Id = 42,
-                            Label = "RETRIGGER_SET_THEME"
-                        },
-                        new
-                        {
-                            Id = 43,
-                            Label = "RETRIGGER_SET_MEMBERSHIP"
+                            Id = 1,
+                            Label = "OWN"
                         },
                         new
                         {
-                            Id = 100,
-                            Label = "TRIGGER_PROVIDER"
+                            Id = 2,
+                            Label = "MANAGED"
                         },
                         new
                         {
-                            Id = 101,
-                            Label = "AWAIT_START_AUTOSETUP"
-                        },
+                            Id = 3,
+                            Label = "SHARED"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_identity_type");
+
+                    b.ToTable("identity_type", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 102,
-                            Label = "OFFERSUBSCRIPTION_CLIENT_CREATION"
+                            Id = 1,
+                            Label = "COMPANY_USER"
                         },
                         new
                         {
-                            Id = 103,
-                            Label = "SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION"
-                        },
+                            Id = 2,
+                            Label = "TECHNICAL_USER"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityUserStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_identity_user_statuses");
+
+                    b.ToTable("identity_user_statuses", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 104,
-                            Label = "OFFERSUBSCRIPTION_TECHNICALUSER_CREATION"
+                            Id = 1,
+                            Label = "ACTIVE"
                         },
                         new
                         {
-                            Id = 105,
-                            Label = "ACTIVATE_SUBSCRIPTION"
+                            Id = 2,
+                            Label = "INACTIVE"
                         },
                         new
                         {
-                            Id = 106,
-                            Label = "TRIGGER_PROVIDER_CALLBACK"
+                            Id = 3,
+                            Label = "DELETED"
                         },
                         new
                         {
-                            Id = 107,
-                            Label = "RETRIGGER_PROVIDER"
+                            Id = 4,
+                            Label = "PENDING"
                         },
                         new
                         {
-                            Id = 108,
-                            Label = "RETRIGGER_OFFERSUBSCRIPTION_CLIENT_CREATION"
-                        },
+                            Id = 5,
+                            Label = "PENDING_DELETION"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Invitation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CompanyApplicationId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_application_id");
+
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<int>("InvitationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("invitation_status_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_invitations");
+
+                    b.HasIndex("CompanyApplicationId")
+                        .HasDatabaseName("ix_invitations_company_application_id");
+
+                    b.HasIndex("CompanyUserId")
+                        .HasDatabaseName("ix_invitations_company_user_id");
+
+                    b.HasIndex("InvitationStatusId")
+                        .HasDatabaseName("ix_invitations_invitation_status_id");
+
+                    b.ToTable("invitations", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.InvitationStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_invitation_statuses");
+
+                    b.ToTable("invitation_statuses", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 109,
-                            Label = "RETRIGGER_OFFERSUBSCRIPTION_TECHNICALUSER_CREATION"
+                            Id = 1,
+                            Label = "CREATED"
                         },
                         new
                         {
-                            Id = 110,
-                            Label = "RETRIGGER_PROVIDER_CALLBACK"
+                            Id = 2,
+                            Label = "PENDING"
                         },
                         new
                         {
-                            Id = 111,
-                            Label = "MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION"
+                            Id = 3,
+                            Label = "ACCEPTED"
                         },
                         new
                         {
-                            Id = 112,
-                            Label = "OFFERSUBSCRIPTION_CREATE_DIM_TECHNICAL_USER"
-                        },
+                            Id = 4,
+                            Label = "DECLINED"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", b =>
+                {
+                    b.Property<string>("ShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("short_name")
+                        .IsFixedLength();
+
+                    b.HasKey("ShortName")
+                        .HasName("pk_languages");
+
+                    b.ToTable("languages", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LanguageLongName", b =>
+                {
+                    b.Property<string>("ShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("short_name")
+                        .IsFixedLength();
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name")
+                        .IsFixedLength();
+
+                    b.Property<string>("LongName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("long_name");
+
+                    b.HasKey("ShortName", "LanguageShortName")
+                        .HasName("pk_language_long_names");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_language_long_names_language_short_name");
+
+                    b.ToTable("language_long_names", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LicenseType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_license_types");
+
+                    b.ToTable("license_types", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 113,
-                            Label = "RETRIGGER_OFFERSUBSCRIPTION_CREATE_DIM_TECHNICAL_USER"
+                            Id = 1,
+                            Label = "COTS"
                         },
                         new
                         {
-                            Id = 200,
-                            Label = "SYNCHRONIZE_USER"
-                        },
+                            Id = 2,
+                            Label = "FOSS"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MailingInformation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("email");
+
+                    b.Property<int>("EncryptionMode")
+                        .HasColumnType("integer")
+                        .HasColumnName("encryption_mode");
+
+                    b.Property<byte[]>("InitializationVector")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("initialization_vector");
+
+                    b.Property<byte[]>("MailParameters")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("mail_parameters");
+
+                    b.Property<int>("MailingStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("mailing_status_id");
+
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<string>("Template")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("template");
+
+                    b.HasKey("Id")
+                        .HasName("pk_mailing_informations");
+
+                    b.HasIndex("MailingStatusId")
+                        .HasDatabaseName("ix_mailing_informations_mailing_status_id");
+
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_mailing_informations_process_id");
+
+                    b.ToTable("mailing_informations", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MailingStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_mailing_statuses");
+
+                    b.ToTable("mailing_statuses", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 201,
-                            Label = "RETRIGGER_SYNCHRONIZE_USER"
+                            Id = 1,
+                            Label = "PENDING"
                         },
                         new
                         {
-                            Id = 202,
-                            Label = "TRIGGER_CALLBACK_OSP_SUBMITTED"
-                        },
+                            Id = 2,
+                            Label = "SENT"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MediaType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_media_types");
+
+                    b.ToTable("media_types", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 203,
-                            Label = "TRIGGER_CALLBACK_OSP_APPROVED"
+                            Id = 1,
+                            Label = "JPEG"
                         },
                         new
                         {
-                            Id = 204,
-                            Label = "TRIGGER_CALLBACK_OSP_DECLINED"
+                            Id = 2,
+                            Label = "GIF"
                         },
                         new
                         {
-                            Id = 205,
-                            Label = "RETRIGGER_CALLBACK_OSP_SUBMITTED"
+                            Id = 3,
+                            Label = "PNG"
                         },
                         new
                         {
-                            Id = 206,
-                            Label = "RETRIGGER_CALLBACK_OSP_APPROVED"
+                            Id = 4,
+                            Label = "SVG"
                         },
                         new
                         {
-                            Id = 207,
-                            Label = "RETRIGGER_CALLBACK_OSP_DECLINED"
+                            Id = 5,
+                            Label = "TIFF"
                         },
                         new
                         {
-                            Id = 208,
-                            Label = "MANUAL_DECLINE_OSP"
+                            Id = 6,
+                            Label = "PDF"
                         },
                         new
                         {
-                            Id = 209,
-                            Label = "REMOVE_KEYCLOAK_USERS"
+                            Id = 7,
+                            Label = "JSON"
                         },
                         new
                         {
-                            Id = 210,
-                            Label = "RETRIGGER_REMOVE_KEYCLOAK_USERS"
+                            Id = 8,
+                            Label = "PEM"
                         },
                         new
                         {
-                            Id = 301,
-                            Label = "SEND_MAIL"
+                            Id = 9,
+                            Label = "CA_CERT"
                         },
                         new
                         {
-                            Id = 302,
-                            Label = "RETRIGGER_SEND_MAIL"
+                            Id = 10,
+                            Label = "PKX_CER"
                         },
                         new
                         {
-                            Id = 400,
-                            Label = "INVITATION_CREATE_CENTRAL_IDP"
-                        },
+                            Id = 11,
+                            Label = "OCTET"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("application_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("ExternalId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("external_id");
+
+                    b.Property<Guid>("OnboardingServiceProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("onboarding_service_provider_id");
+
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_network_registrations");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_application_id");
+
+                    b.HasIndex("CompanyId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_company_id");
+
+                    b.HasIndex("OnboardingServiceProviderId")
+                        .HasDatabaseName("ix_network_registrations_onboarding_service_provider_id");
+
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_process_id");
+
+                    b.HasIndex("ExternalId", "OnboardingServiceProviderId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_external_id_onboarding_service_provid");
+
+                    b.ToTable("network_registrations", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Content")
+                        .HasColumnType("text")
+                        .HasColumnName("content");
+
+                    b.Property<Guid?>("CreatorUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_user_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<bool?>("Done")
+                        .HasColumnType("boolean")
+                        .HasColumnName("done");
+
+                    b.Property<DateTimeOffset?>("DueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("due_date");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<int>("NotificationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("notification_type_id");
+
+                    b.Property<Guid>("ReceiverUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("receiver_user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notifications");
+
+                    b.HasIndex("CreatorUserId")
+                        .HasDatabaseName("ix_notifications_creator_user_id");
+
+                    b.HasIndex("NotificationTypeId")
+                        .HasDatabaseName("ix_notifications_notification_type_id");
+
+                    b.HasIndex("ReceiverUserId")
+                        .HasDatabaseName("ix_notifications_receiver_user_id");
+
+                    b.ToTable("notifications", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTopic", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notification_topic");
+
+                    b.ToTable("notification_topic", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 401,
-                            Label = "INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT"
+                            Id = 1,
+                            Label = "INFO"
                         },
                         new
                         {
-                            Id = 402,
-                            Label = "INVITATION_ADD_REALM_ROLE"
+                            Id = 2,
+                            Label = "ACTION"
                         },
                         new
                         {
-                            Id = 403,
-                            Label = "INVITATION_CREATE_SHARED_REALM"
-                        },
+                            Id = 3,
+                            Label = "OFFER"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notification_type");
+
+                    b.ToTable("notification_type", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 404,
-                            Label = "INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER"
+                            Id = 1,
+                            Label = "INFO"
                         },
                         new
                         {
-                            Id = 405,
-                            Label = "INVITATION_UPDATE_CENTRAL_IDP_URLS"
+                            Id = 2,
+                            Label = "ACTION"
                         },
                         new
                         {
-                            Id = 406,
-                            Label = "INVITATION_CREATE_SHARED_CLIENT"
+                            Id = 3,
+                            Label = "WELCOME"
                         },
                         new
                         {
-                            Id = 407,
-                            Label = "INVITATION_ENABLE_CENTRAL_IDP"
+                            Id = 4,
+                            Label = "WELCOME_USE_CASES"
                         },
                         new
                         {
-                            Id = 408,
-                            Label = "INVITATION_CREATE_DATABASE_IDP"
+                            Id = 5,
+                            Label = "WELCOME_SERVICE_PROVIDER"
                         },
                         new
                         {
-                            Id = 409,
-                            Label = "INVITATION_CREATE_USER"
+                            Id = 6,
+                            Label = "WELCOME_CONNECTOR_REGISTRATION"
                         },
                         new
                         {
-                            Id = 410,
-                            Label = "RETRIGGER_INVITATION_CREATE_CENTRAL_IDP"
+                            Id = 7,
+                            Label = "WELCOME_APP_MARKETPLACE"
                         },
                         new
                         {
-                            Id = 411,
-                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT"
+                            Id = 8,
+                            Label = "APP_SUBSCRIPTION_REQUEST"
                         },
                         new
                         {
-                            Id = 412,
-                            Label = "RETRIGGER_INVITATION_ADD_REALM_ROLE"
+                            Id = 9,
+                            Label = "APP_SUBSCRIPTION_ACTIVATION"
                         },
                         new
                         {
-                            Id = 413,
-                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_REALM"
+                            Id = 10,
+                            Label = "CONNECTOR_REGISTERED"
                         },
                         new
                         {
-                            Id = 414,
-                            Label = "RETRIGGER_INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER"
+                            Id = 11,
+                            Label = "APP_RELEASE_REQUEST"
                         },
                         new
                         {
-                            Id = 415,
-                            Label = "RETRIGGER_INVITATION_UPDATE_CENTRAL_IDP_URLS"
+                            Id = 12,
+                            Label = "TECHNICAL_USER_CREATION"
                         },
                         new
                         {
-                            Id = 416,
-                            Label = "RETRIGGER_INVITATION_CREATE_SHARED_CLIENT"
+                            Id = 13,
+                            Label = "SERVICE_REQUEST"
                         },
                         new
                         {
-                            Id = 417,
-                            Label = "RETRIGGER_INVITATION_ENABLE_CENTRAL_IDP"
+                            Id = 14,
+                            Label = "SERVICE_ACTIVATION"
                         },
                         new
                         {
-                            Id = 418,
-                            Label = "RETRIGGER_INVITATION_CREATE_USER"
+                            Id = 15,
+                            Label = "APP_ROLE_ADDED"
                         },
                         new
                         {
-                            Id = 419,
-                            Label = "RETRIGGER_INVITATION_CREATE_DATABASE_IDP"
+                            Id = 16,
+                            Label = "APP_RELEASE_APPROVAL"
                         },
                         new
                         {
-                            Id = 500,
-                            Label = "CREATE_DIM_TECHNICAL_USER"
+                            Id = 17,
+                            Label = "SERVICE_RELEASE_REQUEST"
                         },
                         new
                         {
-                            Id = 501,
-                            Label = "RETRIGGER_CREATE_DIM_TECHNICAL_USER"
+                            Id = 18,
+                            Label = "SERVICE_RELEASE_APPROVAL"
                         },
                         new
                         {
-                            Id = 502,
-                            Label = "AWAIT_CREATE_DIM_TECHNICAL_USER_RESPONSE"
+                            Id = 19,
+                            Label = "APP_RELEASE_REJECTION"
                         },
                         new
                         {
-                            Id = 504,
-                            Label = "DELETE_DIM_TECHNICAL_USER"
+                            Id = 20,
+                            Label = "SERVICE_RELEASE_REJECTION"
                         },
                         new
                         {
-                            Id = 505,
-                            Label = "AWAIT_DELETE_DIM_TECHNICAL_USER_RESPONSE"
+                            Id = 21,
+                            Label = "ROLE_UPDATE_CORE_OFFER"
                         },
                         new
                         {
-                            Id = 506,
-                            Label = "RETRIGGER_DELETE_DIM_TECHNICAL_USER"
+                            Id = 22,
+                            Label = "ROLE_UPDATE_APP_OFFER"
                         },
                         new
                         {
-                            Id = 600,
-                            Label = "DELETE_CENTRAL_USER"
+                            Id = 23,
+                            Label = "SUBSCRIPTION_URL_UPDATE"
                         },
                         new
                         {
-                            Id = 601,
-                            Label = "RETRIGGER_DELETE_CENTRAL_USER"
+                            Id = 24,
+                            Label = "CREDENTIAL_APPROVAL"
                         },
                         new
                         {
-                            Id = 602,
-                            Label = "DELETE_COMPANYUSER_ASSIGNED_PROCESS"
+                            Id = 25,
+                            Label = "CREDENTIAL_REJECTED"
                         },
                         new
                         {
-                            Id = 700,
-                            Label = "DELETE_IDP_SHARED_REALM"
+                            Id = 26,
+                            Label = "CREDENTIAL_EXPIRY"
                         },
                         new
                         {
-                            Id = 701,
-                            Label = "RETRIGGER_DELETE_IDP_SHARED_REALM"
+                            Id = 27,
+                            Label = "APP_SUBSCRIPTION_DECLINE"
                         },
                         new
                         {
-                            Id = 702,
-                            Label = "DELETE_IDP_SHARED_SERVICEACCOUNT"
-                        },
+                            Id = 28,
+                            Label = "SERVICE_SUBSCRIPTION_DECLINE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTypeAssignedTopic", b =>
+                {
+                    b.Property<int>("NotificationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("notification_type_id");
+
+                    b.Property<int>("NotificationTopicId")
+                        .HasColumnType("integer")
+                        .HasColumnName("notification_topic_id");
+
+                    b.HasKey("NotificationTypeId", "NotificationTopicId")
+                        .HasName("pk_notification_type_assigned_topics");
+
+                    b.HasIndex("NotificationTopicId")
+                        .HasDatabaseName("ix_notification_type_assigned_topics_notification_topic_id");
+
+                    b.HasIndex("NotificationTypeId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_notification_type_assigned_topics_notification_type_id");
+
+                    b.ToTable("notification_type_assigned_topics", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ContactEmail")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("contact_email");
+
+                    b.Property<string>("ContactNumber")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
+
+                    b.Property<bool?>("DisplayTechnicalUser")
+                        .HasColumnType("boolean")
+                        .HasColumnName("display_technical_user");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<int>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
+
+                    b.Property<string>("MarketingUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("marketing_url");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<int>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
+
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
+
+                    b.Property<Guid>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
+
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offers");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_offers_last_editor_id");
+
+                    b.HasIndex("LicenseTypeId")
+                        .HasDatabaseName("ix_offers_license_type_id");
+
+                    b.HasIndex("OfferStatusId")
+                        .HasDatabaseName("ix_offers_offer_status_id");
+
+                    b.HasIndex("OfferTypeId")
+                        .HasDatabaseName("ix_offers_offer_type_id");
+
+                    b.HasIndex("ProviderCompanyId")
+                        .HasDatabaseName("ix_offers_provider_company_id");
+
+                    b.HasIndex("SalesManagerId")
+                        .HasDatabaseName("ix_offers_sales_manager_id");
+
+                    b.ToTable("offers", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_OFFER");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_OFFER");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_OFFER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFER\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_OFFER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer20241219\" (\"id\", \"name\", \"date_created\", \"date_released\", \"marketing_url\", \"contact_email\", \"contact_number\", \"display_technical_user\", \"offer_type_id\", \"sales_manager_id\", \"provider_company_id\", \"offer_status_id\", \"license_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_released\", \r\n  NEW.\"marketing_url\", \r\n  NEW.\"contact_email\", \r\n  NEW.\"contact_number\", \r\n  NEW.\"display_technical_user\", \r\n  NEW.\"offer_type_id\", \r\n  NEW.\"sales_manager_id\", \r\n  NEW.\"provider_company_id\", \r\n  NEW.\"offer_status_id\", \r\n  NEW.\"license_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_OFFER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_OFFER AFTER INSERT\r\nON \"portal\".\"offers\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFER\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_OFFER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFER\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_OFFER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer20241219\" (\"id\", \"name\", \"date_created\", \"date_released\", \"marketing_url\", \"contact_email\", \"contact_number\", \"display_technical_user\", \"offer_type_id\", \"sales_manager_id\", \"provider_company_id\", \"offer_status_id\", \"license_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_released\", \r\n  NEW.\"marketing_url\", \r\n  NEW.\"contact_email\", \r\n  NEW.\"contact_number\", \r\n  NEW.\"display_technical_user\", \r\n  NEW.\"offer_type_id\", \r\n  NEW.\"sales_manager_id\", \r\n  NEW.\"provider_company_id\", \r\n  NEW.\"offer_status_id\", \r\n  NEW.\"license_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_OFFER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_OFFER AFTER UPDATE\r\nON \"portal\".\"offers\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFER\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedDocument", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.HasKey("OfferId", "DocumentId")
+                        .HasName("pk_offer_assigned_documents");
+
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_offer_assigned_documents_document_id");
+
+                    b.ToTable("offer_assigned_documents", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedLicense", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<Guid>("OfferLicenseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_license_id");
+
+                    b.HasKey("OfferId", "OfferLicenseId")
+                        .HasName("pk_offer_assigned_licenses");
+
+                    b.HasIndex("OfferLicenseId")
+                        .HasDatabaseName("ix_offer_assigned_licenses_offer_license_id");
+
+                    b.ToTable("offer_assigned_licenses", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedPrivacyPolicy", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<int>("PrivacyPolicyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("privacy_policy_id");
+
+                    b.HasKey("OfferId", "PrivacyPolicyId")
+                        .HasName("pk_offer_assigned_privacy_policies");
+
+                    b.HasIndex("PrivacyPolicyId")
+                        .HasDatabaseName("ix_offer_assigned_privacy_policies_privacy_policy_id");
+
+                    b.ToTable("offer_assigned_privacy_policies", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferDescription", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.Property<string>("DescriptionLong")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("description_long");
+
+                    b.Property<string>("DescriptionShort")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("description_short");
+
+                    b.HasKey("OfferId", "LanguageShortName")
+                        .HasName("pk_offer_descriptions");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_offer_descriptions_language_short_name");
+
+                    b.ToTable("offer_descriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferLicense", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Licensetext")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("licensetext");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_licenses");
+
+                    b.ToTable("offer_licenses", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_statuses");
+
+                    b.ToTable("offer_statuses", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 703,
-                            Label = "RETRIGGER_DELETE_IDP_SHARED_SERVICEACCOUNT"
+                            Id = 1,
+                            Label = "CREATED"
                         },
                         new
                         {
-                            Id = 704,
-                            Label = "DELETE_CENTRAL_IDENTITY_PROVIDER"
+                            Id = 2,
+                            Label = "IN_REVIEW"
                         },
                         new
                         {
-                            Id = 705,
-                            Label = "RETRIGGER_DELETE_CENTRAL_IDENTITY_PROVIDER"
+                            Id = 3,
+                            Label = "ACTIVE"
                         },
                         new
                         {
-                            Id = 706,
-                            Label = "DELETE_IDENTITY_PROVIDER"
-                        },
-                        new
+                            Id = 4,
+                            Label = "INACTIVE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<int>("OfferSubscriptionStatusId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(1)
+                        .HasColumnName("offer_subscription_status_id");
+
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_subscriptions");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_offer_subscriptions_company_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_offer_subscriptions_last_editor_id");
+
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_offer_subscriptions_offer_id");
+
+                    b.HasIndex("OfferSubscriptionStatusId")
+                        .HasDatabaseName("ix_offer_subscriptions_offer_subscription_status_id");
+
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_offer_subscriptions_process_id");
+
+                    b.HasIndex("RequesterId")
+                        .HasDatabaseName("ix_offer_subscriptions_requester_id");
+
+                    b.ToTable("offer_subscriptions", "portal", t =>
                         {
-                            Id = 800,
-                            Label = "SELF_DESCRIPTION_CONNECTOR_CREATION"
-                        },
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer_subscription20231115\" (\"id\", \"company_id\", \"offer_id\", \"offer_subscription_status_id\", \"display_name\", \"description\", \"requester_id\", \"last_editor_id\", \"process_id\", \"date_created\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"offer_subscription_status_id\", \r\n  NEW.\"display_name\", \r\n  NEW.\"description\", \r\n  NEW.\"requester_id\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"process_id\", \r\n  NEW.\"date_created\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION AFTER INSERT\r\nON \"portal\".\"offer_subscriptions\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer_subscription20231115\" (\"id\", \"company_id\", \"offer_id\", \"offer_subscription_status_id\", \"display_name\", \"description\", \"requester_id\", \"last_editor_id\", \"process_id\", \"date_created\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"offer_subscription_status_id\", \r\n  NEW.\"display_name\", \r\n  NEW.\"description\", \r\n  NEW.\"requester_id\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"process_id\", \r\n  NEW.\"date_created\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION AFTER UPDATE\r\nON \"portal\".\"offer_subscriptions\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionProcessData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
+
+                    b.Property<string>("OfferUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("offer_url");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_subscriptions_process_datas");
+
+                    b.HasIndex("OfferSubscriptionId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_offer_subscriptions_process_datas_offer_subscription_id");
+
+                    b.ToTable("offer_subscriptions_process_datas", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_subscription_statuses");
+
+                    b.ToTable("offer_subscription_statuses", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 801,
-                            Label = "SELF_DESCRIPTION_COMPANY_CREATION"
+                            Id = 1,
+                            Label = "PENDING"
                         },
                         new
                         {
-                            Id = 802,
-                            Label = "RETRIGGER_SELF_DESCRIPTION_CONNECTOR_CREATION"
+                            Id = 2,
+                            Label = "ACTIVE"
                         },
                         new
                         {
-                            Id = 803,
-                            Label = "RETRIGGER_SELF_DESCRIPTION_COMPANY_CREATION"
+                            Id = 3,
+                            Label = "INACTIVE"
                         });
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferTag", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("tag_name")
+                        .HasAnnotation("Relational:JsonPropertyName", "tag_name");
+
+                    b.HasKey("OfferId", "Name")
+                        .HasName("pk_offer_tags");
+
+                    b.ToTable("offer_tags", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferType", b =>
                 {
                     b.Property<int>("Id")
                         .HasColumnType("integer")
@@ -7148,58 +7059,151 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("label");
 
                     b.HasKey("Id")
-                        .HasName("pk_process_types");
+                        .HasName("pk_offer_types");
 
-                    b.ToTable("process_types", "portal");
+                    b.ToTable("offer_types", "portal");
 
                     b.HasData(
                         new
                         {
                             Id = 1,
-                            Label = "APPLICATION_CHECKLIST"
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Label = "OFFER_SUBSCRIPTION"
+                            Label = "APP"
                         },
                         new
                         {
-                            Id = 4,
-                            Label = "PARTNER_REGISTRATION"
+                            Id = 2,
+                            Label = "CORE_COMPONENT"
                         },
                         new
                         {
-                            Id = 5,
-                            Label = "MAILING"
-                        },
+                            Id = 3,
+                            Label = "SERVICE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OnboardingServiceProviderDetail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("AuthUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("auth_url");
+
+                    b.Property<string>("CallbackUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("callback_url");
+
+                    b.Property<string>("ClientId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("client_id");
+
+                    b.Property<byte[]>("ClientSecret")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("client_secret");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<int>("EncryptionMode")
+                        .HasColumnType("integer")
+                        .HasColumnName("encryption_mode");
+
+                    b.Property<byte[]>("InitializationVector")
+                        .HasColumnType("bytea")
+                        .HasColumnName("initialization_vector");
+
+                    b.HasKey("Id")
+                        .HasName("pk_onboarding_service_provider_details");
+
+                    b.HasIndex("CompanyId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_onboarding_service_provider_details_company_id");
+
+                    b.ToTable("onboarding_service_provider_details", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.PrivacyPolicy", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_privacy_policies");
+
+                    b.ToTable("privacy_policies", "portal");
+
+                    b.HasData(
                         new
                         {
-                            Id = 6,
-                            Label = "INVITATION"
+                            Id = 1,
+                            Label = "COMPANY_DATA"
                         },
                         new
                         {
-                            Id = 7,
-                            Label = "DIM_TECHNICAL_USER"
+                            Id = 2,
+                            Label = "USER_DATA"
                         },
                         new
                         {
-                            Id = 8,
-                            Label = "USER_PROVISIONING"
+                            Id = 3,
+                            Label = "LOCATION"
                         },
                         new
                         {
-                            Id = 9,
-                            Label = "IDENTITYPROVIDER_PROVISIONING"
+                            Id = 4,
+                            Label = "BROWSER_HISTORY"
                         },
                         new
                         {
-                            Id = 10,
-                            Label = "SELF_DESCRIPTION_CREATION"
+                            Id = 5,
+                            Label = "NONE"
                         });
                 });
 
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset?>("LockExpiryDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("lock_expiry_date");
+
+                    b.Property<int>("ProcessTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("process_type_id");
+
+                    b.Property<Guid>("Version")
+                        .IsConcurrencyToken()
+                        .HasColumnType("uuid")
+                        .HasColumnName("version");
+
+                    b.HasKey("Id")
+                        .HasName("pk_processes");
+
+                    b.HasIndex("ProcessTypeId")
+                        .HasDatabaseName("ix_processes_process_type_id");
+
+                    b.ToTable("processes", "portal");
+                });
+
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProviderCompanyDetail", b =>
                 {
                     b.Property<Guid>("Id")
@@ -7867,32 +7871,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToView("offer_subscription_view", "portal");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
-                {
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessType", null)
-                        .WithMany("Processes")
-                        .HasForeignKey("ProcessTypeId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("fk_processes_process_types_process_type_id");
-                });
-
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStep<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStep<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
                         .WithMany("ProcessSteps")
                         .HasForeignKey("ProcessId")
                         .IsRequired()
                         .HasConstraintName("fk_process_steps_processes_process_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", null)
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "ProcessStepStatus")
                         .WithMany("ProcessSteps")
                         .HasForeignKey("ProcessStepStatusId")
-                        .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("fk_process_steps_process_step_status_process_type_id_process_s");
+                        .HasConstraintName("fk_process_steps_process_step_statuses_process_step_status_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepType", null)
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "ProcessStepType")
                         .WithMany("ProcessSteps")
                         .HasForeignKey("ProcessStepTypeId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -7900,6 +7893,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasConstraintName("fk_process_steps_process_step_types_process_step_type_id");
 
                     b.Navigation("Process");
+
+                    b.Navigation("ProcessStepStatus");
+
+                    b.Navigation("ProcessStepType");
                 });
 
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
@@ -8168,10 +8165,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_companies_company_statuses_company_status_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "SdCreationProcess")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "SdCreationProcess")
+                        .WithOne("SdCreationCompany")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "SdCreationProcessId")
-                        .HasConstraintName("fk_companies_process_process_type_id_process_step_type_id_sd_c");
+                        .HasConstraintName("fk_companies_processes_sd_creation_process_id");
 
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "SelfDescriptionDocument")
                         .WithMany("Companies")
@@ -8196,10 +8193,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_company_applications_company_application_statuses_applicati");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "ChecklistProcess")
-                        .WithMany()
-                        .HasForeignKey("ChecklistProcessId")
-                        .HasConstraintName("fk_company_applications_process_process_type_id_process_step_t");
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "ChecklistProcess")
+                        .WithOne("CompanyApplication")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", "ChecklistProcessId")
+                        .HasConstraintName("fk_company_applications_processes_checklist_process_id");
 
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationType", "CompanyApplicationType")
                         .WithMany("CompanyApplications")
@@ -8419,11 +8416,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_company_invitations_company_applications_application_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("CompanyInvitation")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyInvitation", "ProcessId")
                         .IsRequired()
-                        .HasConstraintName("fk_company_invitations_process_process_type_id_process_step_ty");
+                        .HasConstraintName("fk_company_invitations_processes_process_id");
 
                     b.Navigation("Application");
 
@@ -8564,12 +8561,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_company_user_assigned_processes_company_users_company_user_");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithMany()
-                        .HasForeignKey("ProcessId")
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("CompanyUserAssignedProcess")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedProcess", "ProcessId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("fk_company_user_assigned_processes_process_process_type_id_pro");
+                        .HasConstraintName("fk_company_user_assigned_processes_processes_process_id");
 
                     b.Navigation("CompanyUser");
 
@@ -8614,10 +8611,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_connectors_companies_provider_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "SdCreationProcess")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "SdCreationProcess")
+                        .WithOne("SdCreationConnector")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", "SdCreationProcessId")
-                        .HasConstraintName("fk_connectors_process_process_type_id_process_step_type_id_sd_");
+                        .HasConstraintName("fk_connectors_processes_sd_creation_process_id");
 
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "SelfDescriptionDocument")
                         .WithOne("Connector")
@@ -8862,11 +8859,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUserCreationData", b =>
                 {
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("ExternalTechnicalUserCreationData")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ExternalTechnicalUserCreationData", "ProcessId")
                         .IsRequired()
-                        .HasConstraintName("fk_external_technical_user_creation_data_process_process_type_");
+                        .HasConstraintName("fk_external_technical_user_creation_data_processes_process_id");
 
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.TechnicalUser", "TechnicalUser")
                         .WithOne("ExternalTechnicalUserCreationData")
@@ -8986,12 +8983,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_identity_provider_assigned_processes_identity_providers_ide");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithMany()
-                        .HasForeignKey("ProcessId")
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("IdentityProviderAssignedProcess")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderAssignedProcess", "ProcessId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("fk_identity_provider_assigned_processes_process_process_type_i");
+                        .HasConstraintName("fk_identity_provider_assigned_processes_processes_process_id");
 
                     b.Navigation("IdentityProvider");
 
@@ -9053,11 +9050,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_mailing_informations_mailing_statuses_mailing_status_id");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("MailingInformation")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MailingInformation", "ProcessId")
                         .IsRequired()
-                        .HasConstraintName("fk_mailing_informations_process_process_type_id_process_step_t");
+                        .HasConstraintName("fk_mailing_informations_processes_process_id");
 
                     b.Navigation("MailingStatus");
 
@@ -9086,12 +9083,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_network_registrations_companies_onboarding_service_provider");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithOne()
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("NetworkRegistration")
                         .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", "ProcessId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("fk_network_registrations_process_process_type_id_process_step_");
+                        .HasConstraintName("fk_network_registrations_processes_process_id");
 
                     b.Navigation("Company");
 
@@ -9301,10 +9298,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("fk_offer_subscriptions_offer_subscription_statuses_offer_subsc");
 
-                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", "Process")
-                        .WithMany()
-                        .HasForeignKey("ProcessId")
-                        .HasConstraintName("fk_offer_subscriptions_process_process_type_id_process_step_ty");
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("OfferSubscription")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", "ProcessId")
+                        .HasConstraintName("fk_offer_subscriptions_processes_process_id");
 
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "Requester")
                         .WithMany("RequestedSubscriptions")
@@ -9359,6 +9356,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Company");
                 });
 
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId>", "ProcessType")
+                        .WithMany("Processes")
+                        .HasForeignKey("ProcessTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_processes_process_types_process_type_id");
+
+                    b.Navigation("ProcessType");
+                });
+
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProviderCompanyDetail", b =>
                 {
                     b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
@@ -9574,16 +9582,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("TechnicalUser");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.Process<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
                     b.Navigation("ProcessSteps");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepStatus<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessStepType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessStepTypeId>", b =>
                 {
                     b.Navigation("ProcessSteps");
                 });
 
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities.ProcessType<Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process, Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums.ProcessTypeId>", b =>
+                {
+                    b.Navigation("Processes");
+                });
+
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
                 {
                     b.Navigation("Companies");
@@ -9976,14 +9989,29 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("OfferAssignedPrivacyPolicies");
                 });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepType", b =>
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", b =>
                 {
+                    b.Navigation("CompanyApplication");
+
+                    b.Navigation("CompanyInvitation");
+
+                    b.Navigation("CompanyUserAssignedProcess");
+
+                    b.Navigation("ExternalTechnicalUserCreationData");
+
+                    b.Navigation("IdentityProviderAssignedProcess");
+
+                    b.Navigation("MailingInformation");
+
+                    b.Navigation("NetworkRegistration");
+
+                    b.Navigation("OfferSubscription");
+
                     b.Navigation("ProcessSteps");
-                });
 
-            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessType", b =>
-                {
-                    b.Navigation("Processes");
+                    b.Navigation("SdCreationCompany");
+
+                    b.Navigation("SdCreationConnector");
                 });
 
             modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ServiceType", b =>
diff --git a/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj b/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj
index b33b623d02..d97efb9367 100644
--- a/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj
+++ b/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj
@@ -46,7 +46,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\framework\Framework.Logging\Framework.Logging.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Models\Framework.Models.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Seeding\Framework.Seeding.csproj" />
     <ProjectReference Include="..\..\processes\Processes.ProcessIdentity\Processes.ProcessIdentity.csproj" />
     <ProjectReference Include="..\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
diff --git a/src/portalbackend/PortalBackend.Migrations/Seeder/BatchInsertSeeder.cs b/src/portalbackend/PortalBackend.Migrations/Seeder/BatchInsertSeeder.cs
index 68d7c715fe..d580b589a7 100644
--- a/src/portalbackend/PortalBackend.Migrations/Seeder/BatchInsertSeeder.cs
+++ b/src/portalbackend/PortalBackend.Migrations/Seeder/BatchInsertSeeder.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2022 BMW Group AG
  * Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -140,8 +139,8 @@ private async Task SeedBaseEntity(CancellationToken cancellationToken)
         await SeedTableForBaseEntity<AppInstance>("app_instances", cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
         await SeedTableForBaseEntity<AppSubscriptionDetail>("app_subscription_details", cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
         await SeedTableForBaseEntity<UseCase>("use_cases", cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
-        await SeedTableForBaseEntity<ProcessStep<ProcessTypeId, ProcessStepTypeId>>("process_steps", cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
-        await SeedTableForBaseEntity<Process<ProcessTypeId, ProcessStepTypeId>>("processes", cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
+        await SeedTableForBaseEntity<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>("process_steps", cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
+        await SeedTableForBaseEntity<Process>("processes", cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
         await SeedTableForBaseEntity<AppInstanceSetup>("app_instance_setups", cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
         await SeedTableForBaseEntity<TechnicalUserProfile>("technical_user_profiles", cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
         await SeedTableForBaseEntity<CompanyCertificate>("company_certificates", cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/Company.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/Company.cs
index b3ea2580e0..81861531d5 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/Company.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/Company.cs
@@ -18,7 +18,6 @@
  ********************************************************************************/
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using System.ComponentModel.DataAnnotations;
 
@@ -88,7 +87,7 @@ public Company(Guid id, string name, CompanyStatusId companyStatusId, DateTimeOf
     public virtual CompanyStatus? CompanyStatus { get; set; }
     public virtual Document? SelfDescriptionDocument { get; set; }
     public virtual CompanyWalletData? CompanyWalletData { get; set; }
-    public virtual Process<ProcessTypeId, ProcessStepTypeId>? SdCreationProcess { get; set; }
+    public virtual Process? SdCreationProcess { get; set; }
     public virtual ICollection<Agreement> Agreements { get; private set; }
     public virtual ICollection<Offer> BoughtOffers { get; private set; }
     public virtual ICollection<CompanyApplication> CompanyApplications { get; private set; }
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyApplication.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyApplication.cs
index 93294d70c3..38a84b1a91 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyApplication.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyApplication.cs
@@ -18,7 +18,6 @@
  ********************************************************************************/
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Auditing;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
@@ -64,7 +63,7 @@ public CompanyApplication(Guid id, Guid companyId, CompanyApplicationStatusId ap
     // Navigation properties
     public virtual CompanyApplicationStatus? ApplicationStatus { get; set; }
     public virtual Company? Company { get; set; }
-    public virtual Process<ProcessTypeId, ProcessStepTypeId>? ChecklistProcess { get; set; }
+    public virtual Process? ChecklistProcess { get; set; }
     public virtual CompanyApplicationType? CompanyApplicationType { get; set; }
     public virtual Company? OnboardingServiceProvider { get; set; }
     public virtual NetworkRegistration? NetworkRegistration { get; set; }
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyInvitation.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyInvitation.cs
index 2a4415cd80..f23accb094 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyInvitation.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyInvitation.cs
@@ -18,8 +18,6 @@
  ********************************************************************************/
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 
@@ -66,7 +64,7 @@ public CompanyInvitation(Guid id, Guid applicationId, string firstName, string l
 
     public string? ServiceAccountUserId { get; set; }
 
-    public virtual Process<ProcessTypeId, ProcessStepTypeId>? Process { get; private set; }
+    public virtual Process? Process { get; private set; }
 
     public virtual CompanyApplication? Application { get; private set; }
 }
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyUserAssignedProcess.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyUserAssignedProcess.cs
index ffb0af1e75..440beb080c 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyUserAssignedProcess.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyUserAssignedProcess.cs
@@ -17,9 +17,6 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
-
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 
 public class CompanyUserAssignedProcess
@@ -35,5 +32,5 @@ public CompanyUserAssignedProcess(Guid companyUserId, Guid processId)
 
     // Navigation properties
     public virtual CompanyUser? CompanyUser { get; private set; }
-    public virtual Process<ProcessTypeId, ProcessStepTypeId>? Process { get; private set; }
+    public virtual Process? Process { get; private set; }
 }
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/Connector.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/Connector.cs
index 411b008ef6..d5df5d336f 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/Connector.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/Connector.cs
@@ -18,7 +18,6 @@
  ********************************************************************************/
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Auditing;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
@@ -82,7 +81,7 @@ public Connector(Guid id, string name, string locationId, string connectorUrl)
     public virtual Country? Location { get; set; }
     public virtual TechnicalUser? TechnicalUser { get; set; }
     public virtual Identity? LastEditor { get; set; }
-    public virtual Process<ProcessTypeId, ProcessStepTypeId>? SdCreationProcess { get; set; }
+    public virtual Process? SdCreationProcess { get; set; }
 
     /// <summary>
     /// Mapping to the assigned document
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/ExternalTechnicalUserCreationData.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/ExternalTechnicalUserCreationData.cs
index 49573b680f..2bd7834fb9 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/ExternalTechnicalUserCreationData.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/ExternalTechnicalUserCreationData.cs
@@ -17,9 +17,6 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
-
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 
 public class ExternalTechnicalUserCreationData(Guid id, Guid technicalUserId, Guid processId)
@@ -30,5 +27,5 @@ public class ExternalTechnicalUserCreationData(Guid id, Guid technicalUserId, Gu
 
     // Navigational Properties
     public TechnicalUser? TechnicalUser { get; private set; }
-    public Process<ProcessTypeId, ProcessStepTypeId>? Process { get; private set; }
+    public Process? Process { get; private set; }
 }
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/IdentityProviderAssignedProcess.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/IdentityProviderAssignedProcess.cs
index 2d392d2a62..cd0d3410e0 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/IdentityProviderAssignedProcess.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/IdentityProviderAssignedProcess.cs
@@ -17,9 +17,6 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
-
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 
 public class IdentityProviderAssignedProcess
@@ -35,5 +32,5 @@ public IdentityProviderAssignedProcess(Guid identityProviderId, Guid processId)
 
     // Navigation properties
     public virtual IdentityProvider? IdentityProvider { get; private set; }
-    public virtual Process<ProcessTypeId, ProcessStepTypeId>? Process { get; private set; }
+    public virtual Process? Process { get; private set; }
 }
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/MailingInformation.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/MailingInformation.cs
index 6a3bf602b2..805fb45b42 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/MailingInformation.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/MailingInformation.cs
@@ -18,7 +18,6 @@
  ********************************************************************************/
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
@@ -51,7 +50,7 @@ public MailingInformation(Guid id, Guid processId, string email, string template
     public byte[] InitializationVector { get; set; }
     public int EncryptionMode { get; set; }
 
-    public virtual Process<ProcessTypeId, ProcessStepTypeId>? Process { get; private set; }
+    public virtual Process? Process { get; private set; }
 
     public virtual MailingStatus? MailingStatus { get; private set; }
 }
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/NetworkRegistration.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/NetworkRegistration.cs
index 50c0adc3b9..2fd5d178d0 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/NetworkRegistration.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/NetworkRegistration.cs
@@ -18,8 +18,6 @@
  ********************************************************************************/
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 
@@ -62,5 +60,5 @@ public NetworkRegistration(Guid id, string externalId, Guid companyId, Guid proc
 
     public virtual CompanyApplication? CompanyApplication { get; private set; }
 
-    public virtual Process<ProcessTypeId, ProcessStepTypeId>? Process { get; private set; }
+    public virtual Process? Process { get; private set; }
 }
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/OfferSubscription.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/OfferSubscription.cs
index bc7013fefb..9fd518eb93 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/OfferSubscription.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/OfferSubscription.cs
@@ -18,7 +18,6 @@
  ********************************************************************************/
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Auditing;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
@@ -121,7 +120,7 @@ public OfferSubscription(Guid id, Guid offerId, Guid companyId, OfferSubscriptio
     /// <summary>
     /// Assigned Process.
     /// </summary>
-    public virtual Process<ProcessTypeId, ProcessStepTypeId>? Process { get; set; }
+    public virtual Process? Process { get; set; }
 
     /// <summary>
     /// Requester
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/ProcessStepType.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/Process.cs
similarity index 56%
rename from src/portalbackend/PortalBackend.PortalEntities/Entities/ProcessStepType.cs
rename to src/portalbackend/PortalBackend.PortalEntities/Entities/Process.cs
index fab08039fe..c8f0a79d43 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/ProcessStepType.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/Process.cs
@@ -19,29 +19,20 @@
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
-using System.ComponentModel.DataAnnotations;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 
-public class ProcessStepType
+public class Process(Guid id, ProcessTypeId processTypeId, Guid version) : AbstractProcess<Process, ProcessTypeId, ProcessStepTypeId>(id, processTypeId, version)
 {
-    private ProcessStepType()
-    {
-        Label = null!;
-        ProcessSteps = new HashSet<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-    }
-
-    public ProcessStepType(ProcessStepTypeId processStepTypeId) : this()
-    {
-        Id = processStepTypeId;
-        Label = processStepTypeId.ToString();
-    }
-
-    public ProcessStepTypeId Id { get; private set; }
-
-    [MaxLength(255)]
-    public string Label { get; private set; }
-
     // Navigation properties
-    public virtual ICollection<ProcessStep<ProcessTypeId, ProcessStepTypeId>> ProcessSteps { get; private set; }
+    public virtual CompanyApplication? CompanyApplication { get; set; }
+    public virtual OfferSubscription? OfferSubscription { get; set; }
+    public virtual NetworkRegistration? NetworkRegistration { get; set; }
+    public virtual MailingInformation? MailingInformation { get; set; }
+    public virtual CompanyInvitation? CompanyInvitation { get; set; }
+    public virtual ExternalTechnicalUserCreationData? ExternalTechnicalUserCreationData { get; set; }
+    public virtual CompanyUserAssignedProcess? CompanyUserAssignedProcess { get; set; }
+    public virtual IdentityProviderAssignedProcess? IdentityProviderAssignedProcess { get; set; }
+    public virtual Company? SdCreationCompany { get; set; }
+    public virtual Connector? SdCreationConnector { get; set; }
 }
diff --git a/src/portalbackend/PortalBackend.PortalEntities/PortalDbContext.cs b/src/portalbackend/PortalBackend.PortalEntities/PortalDbContext.cs
index a9aa8a9443..6bb8136412 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/PortalDbContext.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/PortalDbContext.cs
@@ -20,7 +20,6 @@
 using Microsoft.EntityFrameworkCore;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Identity;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Context;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Auditing;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
@@ -37,16 +36,9 @@ namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities;
 /// The Trigger Framework requires new Guid() to convert it to gen_random_uuid(),
 /// for the Id field we'll use a randomly set UUID to satisfy SonarCloud.
 /// </remarks>
-public class PortalDbContext : ProcessDbContext<ProcessTypeId, ProcessStepTypeId>
+public class PortalDbContext(DbContextOptions<PortalDbContext> options, IAuditHandler auditHandler) : ProcessDbContext<Process, ProcessTypeId, ProcessStepTypeId>(options)
 {
-    private readonly IAuditHandler _auditHandler;
-
-    protected PortalDbContext() =>
-        throw new InvalidOperationException("IdentityService should never be null");
-
-    public PortalDbContext(DbContextOptions<PortalDbContext> options, IAuditHandler auditHandler)
-     : base(options) =>
-        _auditHandler = auditHandler;
+    private readonly IAuditHandler _auditHandler = auditHandler;
 
     public virtual DbSet<Address> Addresses { get; set; } = default!;
     public virtual DbSet<Agreement> Agreements { get; set; } = default!;
@@ -179,11 +171,6 @@ public PortalDbContext(DbContextOptions<PortalDbContext> options, IAuditHandler
     public virtual DbSet<OfferSubscriptionStatus> OfferSubscriptionStatuses { get; set; } = default!;
     public virtual DbSet<OfferSubscriptionProcessData> OfferSubscriptionsProcessDatas { get; set; } = default!;
     public virtual DbSet<OnboardingServiceProviderDetail> OnboardingServiceProviderDetails { get; set; } = default!;
-    public virtual DbSet<Process<ProcessTypeId, ProcessStepTypeId>> Processes { get; set; } = default!;
-    public virtual DbSet<ProcessStep<ProcessTypeId, ProcessStepTypeId>> ProcessSteps { get; set; } = default!;
-    public virtual DbSet<ProcessStepStatus<ProcessTypeId, ProcessStepTypeId>> ProcessStepStatuses { get; set; } = default!;
-    public virtual DbSet<ProcessStepType> ProcessStepTypes { get; set; } = default!;
-    public virtual DbSet<ProcessType> ProcessTypes { get; set; } = default!;
     public virtual DbSet<ProviderCompanyDetail> ProviderCompanyDetails { get; set; } = default!;
     public virtual DbSet<PrivacyPolicy> PrivacyPolicies { get; set; } = default!;
     public virtual DbSet<ServiceDetail> ServiceDetails { get; set; } = default!;
@@ -544,7 +531,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .OnDelete(DeleteBehavior.ClientSetNull);
 
             entity.HasOne(d => d.SdCreationProcess)
-                .WithOne()
+                .WithOne(p => p.SdCreationCompany)
                 .HasForeignKey<Company>(d => d.SdCreationProcessId)
                 .OnDelete(DeleteBehavior.ClientSetNull);
 
@@ -1123,7 +1110,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .OnDelete(DeleteBehavior.ClientSetNull);
 
             entity.HasOne(d => d.SdCreationProcess)
-                .WithOne()
+                .WithOne(p => p.SdCreationConnector)
                 .HasForeignKey<Connector>(d => d.SdCreationProcessId)
                 .OnDelete(DeleteBehavior.ClientSetNull);
 
@@ -1255,20 +1242,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                     .Select(e => new BpdmIdentifier(e))
             );
 
-        modelBuilder.Entity<ProcessType>()
-            .HasData(
-                Enum.GetValues(typeof(ProcessTypeId))
-                    .Cast<ProcessTypeId>()
-                    .Select(e => new ProcessType(e))
-            );
-
-        modelBuilder.Entity<ProcessStepType>()
-            .HasData(
-                Enum.GetValues(typeof(ProcessStepTypeId))
-                    .Cast<ProcessStepTypeId>()
-                    .Select(e => new ProcessStepType(e))
-            );
-
         modelBuilder.Entity<PrivacyPolicy>()
             .HasData(
                 Enum.GetValues(typeof(PrivacyPolicyId))
@@ -1415,7 +1388,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .OnDelete(DeleteBehavior.ClientSetNull);
 
             entity.HasOne(x => x.Process)
-                .WithOne()
+                .WithOne(x => x.NetworkRegistration)
                 .HasForeignKey<NetworkRegistration>(x => x.ProcessId);
 
             entity.HasOne(x => x.OnboardingServiceProvider)
@@ -1446,7 +1419,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .OnDelete(DeleteBehavior.ClientSetNull);
 
             entity.HasOne(x => x.Process)
-                .WithOne()
+                .WithOne(x => x.CompanyInvitation)
                 .HasForeignKey<CompanyInvitation>(x => x.ProcessId)
                 .OnDelete(DeleteBehavior.ClientSetNull);
         });
@@ -1474,7 +1447,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.HasKey(x => x.Id);
 
             entity.HasOne(x => x.Process)
-                .WithOne()
+                .WithOne(x => x.MailingInformation)
                 .HasForeignKey<MailingInformation>(x => x.ProcessId)
                 .OnDelete(DeleteBehavior.ClientSetNull);
 
@@ -1489,7 +1462,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.HasKey(x => x.Id);
 
             entity.HasOne(x => x.Process)
-                .WithOne()
+                .WithOne(x => x.ExternalTechnicalUserCreationData)
                 .HasForeignKey<ExternalTechnicalUserCreationData>(x => x.ProcessId)
                 .OnDelete(DeleteBehavior.ClientSetNull);
 
diff --git a/src/processes/ApplicationChecklist.Executor/ApplicationChecklist.Executor.csproj b/src/processes/ApplicationChecklist.Executor/ApplicationChecklist.Executor.csproj
index f4b0f0afc1..b7b073baf6 100644
--- a/src/processes/ApplicationChecklist.Executor/ApplicationChecklist.Executor.csproj
+++ b/src/processes/ApplicationChecklist.Executor/ApplicationChecklist.Executor.csproj
@@ -31,7 +31,6 @@
       <ProjectReference Include="..\..\externalsystems\BpnDidResolver.Library\BpnDidResolver.Library.csproj" />
       <ProjectReference Include="..\..\externalsystems\Dim.Library\Dim.Library.csproj" />
       <ProjectReference Include="..\..\externalsystems\IssuerComponent.Library\IssuerComponent.Library.csproj" />
-      <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
       <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
       <ProjectReference Include="..\ApplicationChecklist.Config\ApplicationChecklist.Config.csproj" />
diff --git a/src/processes/ApplicationChecklist.Library/ApplicationChecklist.Library.csproj b/src/processes/ApplicationChecklist.Library/ApplicationChecklist.Library.csproj
index e0c7cb3f22..a6707aa88e 100644
--- a/src/processes/ApplicationChecklist.Library/ApplicationChecklist.Library.csproj
+++ b/src/processes/ApplicationChecklist.Library/ApplicationChecklist.Library.csproj
@@ -29,7 +29,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     </ItemGroup>
 
diff --git a/src/processes/ApplicationChecklist.Library/IApplicationChecklistService.cs b/src/processes/ApplicationChecklist.Library/IApplicationChecklistService.cs
index 027b4ee4c7..e5c3138d0d 100644
--- a/src/processes/ApplicationChecklist.Library/IApplicationChecklistService.cs
+++ b/src/processes/ApplicationChecklist.Library/IApplicationChecklistService.cs
@@ -17,7 +17,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
@@ -27,7 +27,7 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Processes.ApplicationChecklist.Lib
 
 public interface IApplicationChecklistService
 {
-    record ManualChecklistProcessStepData(Guid ApplicationId, Process<ProcessTypeId, ProcessStepTypeId> Process, Guid ProcessStepId, ApplicationChecklistEntryTypeId EntryTypeId, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId StatusId, string? Comment)> Checklist, IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>> ProcessSteps);
+    record ManualChecklistProcessStepData(Guid ApplicationId, IProcess<ProcessTypeId> Process, Guid ProcessStepId, ApplicationChecklistEntryTypeId EntryTypeId, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId StatusId, string? Comment)> Checklist, IEnumerable<IProcessStep<ProcessStepTypeId>> ProcessSteps);
     record WorkerChecklistProcessStepData(Guid ApplicationId, ProcessStepTypeId ProcessStepTypeId, ImmutableDictionary<ApplicationChecklistEntryTypeId, ApplicationChecklistEntryStatusId> Checklist, IEnumerable<ProcessStepTypeId> ProcessStepTypeIds);
     record WorkerChecklistProcessStepExecutionResult(ProcessStepStatusId StepStatusId, Action<ApplicationChecklistEntry>? ModifyChecklistEntry, IEnumerable<ProcessStepTypeId>? ScheduleStepTypeIds, IEnumerable<ProcessStepTypeId>? SkipStepTypeIds, bool Modified, string? ProcessMessage);
 
diff --git a/src/processes/ApplicationChecklist.Library/VerifyApplicationChecklistDataExtensions.cs b/src/processes/ApplicationChecklist.Library/VerifyApplicationChecklistDataExtensions.cs
index 72388b081e..30a176725c 100644
--- a/src/processes/ApplicationChecklist.Library/VerifyApplicationChecklistDataExtensions.cs
+++ b/src/processes/ApplicationChecklist.Library/VerifyApplicationChecklistDataExtensions.cs
@@ -23,6 +23,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using System.Collections.Immutable;
 
@@ -72,7 +73,7 @@ public static void ValidateApplicationChecklistData(
         }
     }
 
-    public static IApplicationChecklistService.ManualChecklistProcessStepData CreateManualChecklistProcessStepData(this VerifyChecklistData checklistData, Guid applicationId, ApplicationChecklistEntryTypeId entryTypeId, ProcessStep<ProcessTypeId, ProcessStepTypeId> processStep) =>
+    public static IApplicationChecklistService.ManualChecklistProcessStepData CreateManualChecklistProcessStepData(this VerifyChecklistData checklistData, Guid applicationId, ApplicationChecklistEntryTypeId entryTypeId, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId> processStep) =>
         new(
             applicationId,
             checklistData.Process ?? throw new UnexpectedConditionException("checklistData.Process should never be null here"),
diff --git a/src/processes/DimUserProcess.Executor/DimUserProcess.Executor.csproj b/src/processes/DimUserProcess.Executor/DimUserProcess.Executor.csproj
index bdd6bc8082..2dc4442658 100644
--- a/src/processes/DimUserProcess.Executor/DimUserProcess.Executor.csproj
+++ b/src/processes/DimUserProcess.Executor/DimUserProcess.Executor.csproj
@@ -30,7 +30,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\externalsystems\Dim.Library\Dim.Library.csproj" />
     <ProjectReference Include="..\..\externalsystems\Provisioning.Library\Provisioning.Library.csproj"/>
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj"/>
     <ProjectReference Include="..\..\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
   </ItemGroup>
diff --git a/src/processes/IdentityProviderProvisioning.Executor/IdentityProviderProvisioning.Executor.csproj b/src/processes/IdentityProviderProvisioning.Executor/IdentityProviderProvisioning.Executor.csproj
index 98f3f2d9bb..f1f448fc06 100644
--- a/src/processes/IdentityProviderProvisioning.Executor/IdentityProviderProvisioning.Executor.csproj
+++ b/src/processes/IdentityProviderProvisioning.Executor/IdentityProviderProvisioning.Executor.csproj
@@ -31,6 +31,5 @@
     <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
     <ProjectReference Include="..\..\provisioning\Provisioning.Library\Provisioning.Library.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/processes/Invitation.Executor/Invitation.Executor.csproj b/src/processes/Invitation.Executor/Invitation.Executor.csproj
index eb3204a031..4ca77b162e 100644
--- a/src/processes/Invitation.Executor/Invitation.Executor.csproj
+++ b/src/processes/Invitation.Executor/Invitation.Executor.csproj
@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\externalsystems\Provisioning.Library\Provisioning.Library.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
     <ProjectReference Include="..\Mailing.Library\Mailing.Library.csproj" />
diff --git a/src/processes/Mailing.Executor/Mailing.Executor.csproj b/src/processes/Mailing.Executor/Mailing.Executor.csproj
index d75d9058fa..78745cd612 100644
--- a/src/processes/Mailing.Executor/Mailing.Executor.csproj
+++ b/src/processes/Mailing.Executor/Mailing.Executor.csproj
@@ -28,7 +28,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\mailing\Mailing.SendMail\Mailing.SendMail.csproj" />
     <ProjectReference Include="..\..\provisioning\Provisioning.Library\Provisioning.Library.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
diff --git a/src/processes/Mailing.Library/Mailing.Library.csproj b/src/processes/Mailing.Library/Mailing.Library.csproj
index 1a83a9840d..04af8656c0 100644
--- a/src/processes/Mailing.Library/Mailing.Library.csproj
+++ b/src/processes/Mailing.Library/Mailing.Library.csproj
@@ -28,7 +28,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     </ItemGroup>
 
diff --git a/src/processes/NetworkRegistration.Executor/NetworkRegistration.Executor.csproj b/src/processes/NetworkRegistration.Executor/NetworkRegistration.Executor.csproj
index b45edbdc29..ec7dcba8fd 100644
--- a/src/processes/NetworkRegistration.Executor/NetworkRegistration.Executor.csproj
+++ b/src/processes/NetworkRegistration.Executor/NetworkRegistration.Executor.csproj
@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\externalsystems\OnboardingServiceProvider.Library\OnboardingServiceProvider.Library.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\NetworkRegistration.Library\NetworkRegistration.Library.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
   </ItemGroup>
diff --git a/src/processes/NetworkRegistration.Library/NetworkRegistration.Library.csproj b/src/processes/NetworkRegistration.Library/NetworkRegistration.Library.csproj
index af86cf626a..a8601fe875 100644
--- a/src/processes/NetworkRegistration.Library/NetworkRegistration.Library.csproj
+++ b/src/processes/NetworkRegistration.Library/NetworkRegistration.Library.csproj
@@ -35,7 +35,6 @@
     <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
     <ProjectReference Include="..\..\provisioning\Provisioning.Library\Provisioning.Library.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\Mailing.Library\Mailing.Library.csproj" />
   </ItemGroup>
 
diff --git a/src/processes/OfferSubscription.Executor/OfferSubscription.Executor.csproj b/src/processes/OfferSubscription.Executor/OfferSubscription.Executor.csproj
index e5dbb8b72b..21c55dc666 100644
--- a/src/processes/OfferSubscription.Executor/OfferSubscription.Executor.csproj
+++ b/src/processes/OfferSubscription.Executor/OfferSubscription.Executor.csproj
@@ -31,7 +31,6 @@
         <ProjectReference Include="..\..\externalsystems\OfferProvider.Library\OfferProvider.Library.csproj" />
         <ProjectReference Include="..\..\marketplace\Offers.Library\Offers.Library.csproj" />
         <ProjectReference Include="..\..\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
-        <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/processes/OfferSubscription.Library/OfferSubscription.Library.csproj b/src/processes/OfferSubscription.Library/OfferSubscription.Library.csproj
index dbe0c30d3c..61cf78f353 100644
--- a/src/processes/OfferSubscription.Library/OfferSubscription.Library.csproj
+++ b/src/processes/OfferSubscription.Library/OfferSubscription.Library.csproj
@@ -32,9 +32,7 @@
     </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
-    <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/processes/Processes.ProcessIdentity/ProcessIdentityDataDetermination.cs b/src/processes/Processes.ProcessIdentity/ProcessIdentityDataDetermination.cs
index 7534cb9a85..00493a7b3d 100644
--- a/src/processes/Processes.ProcessIdentity/ProcessIdentityDataDetermination.cs
+++ b/src/processes/Processes.ProcessIdentity/ProcessIdentityDataDetermination.cs
@@ -18,6 +18,7 @@
  ********************************************************************************/
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Identity;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.ProcessIdentity;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories;
@@ -34,7 +35,7 @@ public class ProcessIdentityDataDetermination(
     /// <inheritdoc />
     public async Task GetIdentityData()
     {
-        (Framework.Identity.IdentityTypeId IdentityTypeId, Guid CompanyId) identityData;
+        (IdentityTypeId IdentityTypeId, Guid CompanyId) identityData;
 
         if ((identityData = await _identityRepository.GetActiveIdentityDataByIdentityId(processIdentityDataBuilder.IdentityId).ConfigureAwait(ConfigureAwaitOptions.None)) == default)
             throw new ConflictException($"Identity {processIdentityDataBuilder.IdentityId} could not be found");
diff --git a/src/processes/Processes.ProcessIdentity/Processes.ProcessIdentity.csproj b/src/processes/Processes.ProcessIdentity/Processes.ProcessIdentity.csproj
index 867094eaf6..433ee6a500 100644
--- a/src/processes/Processes.ProcessIdentity/Processes.ProcessIdentity.csproj
+++ b/src/processes/Processes.ProcessIdentity/Processes.ProcessIdentity.csproj
@@ -30,9 +30,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Processes.ProcessIdentity\Framework.Processes.ProcessIdentity.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
-    <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/processes/Processes.Worker/Program.cs b/src/processes/Processes.Worker/Program.cs
index 5fe76cd1d9..04cac7d871 100644
--- a/src/processes/Processes.Worker/Program.cs
+++ b/src/processes/Processes.Worker/Program.cs
@@ -22,18 +22,13 @@
 using Microsoft.Extensions.Hosting;
 using Org.Eclipse.TractusX.Portal.Backend.ApplicationActivation.Library.DependencyInjection;
 using Org.Eclipse.TractusX.Portal.Backend.BpnDidResolver.Library.DependencyInjection;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Worker.Library;
 using Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling;
 using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Factory;
 using Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail;
 using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.DependencyInjection;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.Processes.ApplicationChecklist.Config;
 using Org.Eclipse.TractusX.Portal.Backend.Processes.ApplicationChecklist.Executor;
@@ -59,7 +54,6 @@
         {
             services
                 .AddMailingAndTemplateManager(hostContext.Configuration)
-                .AddScoped<IRepositories, ProcessRepositories<ProcessTypeId, ProcessStepTypeId, PortalDbContext>>()
                 .AddProcessExecutionService<ProcessTypeId, ProcessStepTypeId>(hostContext.Configuration.GetSection("Processes"))
                 .AddTransient<IProcessTypeExecutor<ProcessTypeId, ProcessStepTypeId>, ApplicationChecklistProcessTypeExecutor>()
                 .AddOfferSubscriptionProcessExecutor(hostContext.Configuration)
diff --git a/src/processes/SelfDescriptionCreation.Executor/SelfDescriptionCreation.Executor.csproj b/src/processes/SelfDescriptionCreation.Executor/SelfDescriptionCreation.Executor.csproj
index 10548945a2..853f160ed0 100644
--- a/src/processes/SelfDescriptionCreation.Executor/SelfDescriptionCreation.Executor.csproj
+++ b/src/processes/SelfDescriptionCreation.Executor/SelfDescriptionCreation.Executor.csproj
@@ -30,7 +30,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\externalsystems\SdFactory.Library\SdFactory.Library.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/processes/UserProvisioning.Executor/UserProvisioning.Executor.csproj b/src/processes/UserProvisioning.Executor/UserProvisioning.Executor.csproj
index 2f4d25ab73..c7148aeb9d 100644
--- a/src/processes/UserProvisioning.Executor/UserProvisioning.Executor.csproj
+++ b/src/processes/UserProvisioning.Executor/UserProvisioning.Executor.csproj
@@ -31,6 +31,5 @@
     <ProjectReference Include="..\..\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
     <ProjectReference Include="..\..\provisioning\Provisioning.Library\Provisioning.Library.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/provisioning/Provisioning.Library/Provisioning.Library.csproj b/src/provisioning/Provisioning.Library/Provisioning.Library.csproj
index b4122d0ce5..7496cfc0fb 100644
--- a/src/provisioning/Provisioning.Library/Provisioning.Library.csproj
+++ b/src/provisioning/Provisioning.Library/Provisioning.Library.csproj
@@ -31,7 +31,6 @@
     <ProjectReference Include="..\..\framework\Framework.Async\Framework.Async.csproj" />
     <ProjectReference Include="..\..\framework\Framework.ErrorHandling\Framework.ErrorHandling.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\Provisioning.DBAccess\Provisioning.DBAccess.csproj" />
     <ProjectReference Include="..\..\keycloak\Keycloak.ErrorHandling\Keycloak.ErrorHandling.csproj" />
     <ProjectReference Include="..\..\keycloak\Keycloak.Factory\Keycloak.Factory.csproj" />
diff --git a/src/provisioning/Provisioning.Library/Service/TechnicalUserCreation.cs b/src/provisioning/Provisioning.Library/Service/TechnicalUserCreation.cs
index 240d3c6ea4..1351050a5d 100644
--- a/src/provisioning/Provisioning.Library/Service/TechnicalUserCreation.cs
+++ b/src/provisioning/Provisioning.Library/Service/TechnicalUserCreation.cs
@@ -148,7 +148,7 @@ private Guid CreateDatabaseServiceAccount(
         IUserRolesRepository userRolesRepository,
         Action<TechnicalUser>? setOptionalParameter)
     {
-        var identity = portalRepositories.GetInstance<IUserRepository>().CreateIdentity(companyId, userStatusId, IdentityTypeId.COMPANY_SERVICE_ACCOUNT, null);
+        var identity = portalRepositories.GetInstance<IUserRepository>().CreateIdentity(companyId, userStatusId, IdentityTypeId.TECHNICAL_USER, null);
         var serviceAccount = serviceAccountsRepository.CreateTechnicalUser(
             identity.Id,
             name,
diff --git a/src/registration/ApplicationActivation.Library/ApplicationActivation.Library.csproj b/src/registration/ApplicationActivation.Library/ApplicationActivation.Library.csproj
index e8e7dc7bb7..7ae0fadbe0 100644
--- a/src/registration/ApplicationActivation.Library/ApplicationActivation.Library.csproj
+++ b/src/registration/ApplicationActivation.Library/ApplicationActivation.Library.csproj
@@ -36,7 +36,6 @@
     <ItemGroup>
       <ProjectReference Include="..\..\externalsystems\Custodian.Library\Custodian.Library.csproj" />
       <ProjectReference Include="..\..\framework\Framework.DateTimeProvider\Framework.DateTimeProvider.csproj" />
-      <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\notifications\Notifications.Library\Notifications.Library.csproj" />
       <ProjectReference Include="..\..\processes\Mailing.Library\Mailing.Library.csproj" />
       <ProjectReference Include="..\..\provisioning\Provisioning.Library\Provisioning.Library.csproj" />
diff --git a/src/registration/Registration.Service/Registration.Service.csproj b/src/registration/Registration.Service/Registration.Service.csproj
index ab9d577c9c..3114aceb2d 100644
--- a/src/registration/Registration.Service/Registration.Service.csproj
+++ b/src/registration/Registration.Service/Registration.Service.csproj
@@ -54,7 +54,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\keycloak\Keycloak.Authentication\Keycloak.Authentication.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     <ProjectReference Include="..\..\processes\ApplicationChecklist.Config\ApplicationChecklist.Config.csproj" />
diff --git a/src/web/Web.Identity/MandatoryIdentityClaimHandler.cs b/src/web/Web.Identity/MandatoryIdentityClaimHandler.cs
index 4d4c9775f8..1caec94e7d 100644
--- a/src/web/Web.Identity/MandatoryIdentityClaimHandler.cs
+++ b/src/web/Web.Identity/MandatoryIdentityClaimHandler.cs
@@ -20,6 +20,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Logging;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Identity;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories;
 using System.Security.Claims;
@@ -60,8 +61,8 @@ protected override async Task HandleRequirementAsync(AuthorizationHandlerContext
         {
             PolicyTypeId.ValidIdentity => claimsIdentityDataBuilder.IdentityId != Guid.Empty,
             PolicyTypeId.ValidCompany => (await GetCompanyId().ConfigureAwait(false)) != Guid.Empty,
-            PolicyTypeId.CompanyUser => claimsIdentityDataBuilder.IdentityTypeId == Framework.Identity.IdentityTypeId.COMPANY_USER,
-            PolicyTypeId.ServiceAccount => claimsIdentityDataBuilder.IdentityTypeId == Framework.Identity.IdentityTypeId.COMPANY_SERVICE_ACCOUNT,
+            PolicyTypeId.CompanyUser => claimsIdentityDataBuilder.IdentityTypeId == IdentityTypeId.COMPANY_USER,
+            PolicyTypeId.ServiceAccount => claimsIdentityDataBuilder.IdentityTypeId == IdentityTypeId.TECHNICAL_USER,
             _ => throw new UnexpectedConditionException($"unexpected PolicyTypeId {requirement.PolicyTypeId}")
         })
         {
@@ -79,7 +80,7 @@ private async ValueTask InitializeClaims(ClaimsPrincipal principal)
         if (Guid.TryParse(preferredUserName, out var identityId))
         {
             claimsIdentityDataBuilder.AddIdentityId(identityId);
-            claimsIdentityDataBuilder.AddIdentityTypeId(Framework.Identity.IdentityTypeId.COMPANY_USER);
+            claimsIdentityDataBuilder.AddIdentityTypeId(IdentityTypeId.COMPANY_USER);
             claimsIdentityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Initialized;
             return;
         }
@@ -89,7 +90,7 @@ private async ValueTask InitializeClaims(ClaimsPrincipal principal)
         if (!string.IsNullOrWhiteSpace(clientId) && (serviceAccountData = await _technicalUserRepository.GetTechnicalUserDataByClientId(clientId).ConfigureAwait(ConfigureAwaitOptions.None)) != default)
         {
             claimsIdentityDataBuilder.AddIdentityId(serviceAccountData.IdentityId);
-            claimsIdentityDataBuilder.AddIdentityTypeId(Framework.Identity.IdentityTypeId.COMPANY_SERVICE_ACCOUNT);
+            claimsIdentityDataBuilder.AddIdentityTypeId(IdentityTypeId.TECHNICAL_USER);
             claimsIdentityDataBuilder.AddCompanyId(serviceAccountData.CompanyId);
             claimsIdentityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Complete;
             return;
@@ -98,7 +99,7 @@ private async ValueTask InitializeClaims(ClaimsPrincipal principal)
         var sub = principal.Claims.SingleOrDefault(x => x.Type == PortalClaimTypes.Sub)?.Value;
         logger.LogInformation("Preferred user name {PreferredUserName} couldn't be parsed to uuid for sub {Sub}", preferredUserName, sub);
 
-        (Guid IdentityId, Framework.Identity.IdentityTypeId IdentityTypeId, Guid CompanyId) identityData;
+        (Guid IdentityId, IdentityTypeId IdentityTypeId, Guid CompanyId) identityData;
         if (!string.IsNullOrWhiteSpace(sub) && (identityData = await _identityRepository.GetActiveIdentityDataByUserEntityId(sub).ConfigureAwait(ConfigureAwaitOptions.None)) != default)
         {
             claimsIdentityDataBuilder.AddIdentityId(identityData.IdentityId);
diff --git a/src/web/Web.Identity/Web.Identity.csproj b/src/web/Web.Identity/Web.Identity.csproj
index f3a74e5fc2..3a96d93b67 100644
--- a/src/web/Web.Identity/Web.Identity.csproj
+++ b/src/web/Web.Identity/Web.Identity.csproj
@@ -32,9 +32,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
-      <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
-      <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/web/Web.PublicInfos/Web.PublicInfos.csproj b/src/web/Web.PublicInfos/Web.PublicInfos.csproj
index e2d1880c3c..7d0185c54b 100644
--- a/src/web/Web.PublicInfos/Web.PublicInfos.csproj
+++ b/src/web/Web.PublicInfos/Web.PublicInfos.csproj
@@ -32,10 +32,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
-    <ProjectReference Include="..\..\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
     <ProjectReference Include="..\Web.Identity\Web.Identity.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/administration/Administration.Service.Tests/Administration.Service.Tests.csproj b/tests/administration/Administration.Service.Tests/Administration.Service.Tests.csproj
index 7f0a0a6a27..7089db3e7a 100644
--- a/tests/administration/Administration.Service.Tests/Administration.Service.Tests.csproj
+++ b/tests/administration/Administration.Service.Tests/Administration.Service.Tests.csproj
@@ -34,10 +34,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\administration\Administration.Service\Administration.Service.csproj" />
-    <ProjectReference Include="..\..\..\src\externalsystems\OnboardingServiceProvider.Library\OnboardingServiceProvider.Library.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-    <ProjectReference Include="..\..\..\src\web\Web.PublicInfos\Web.PublicInfos.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs
index c3bc4b1f62..92aa9b7f4e 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs
@@ -1186,18 +1186,18 @@ public async Task TriggerSelfDescriptionCreation_WithMissingSdDocsForConnectorAn
     {
         // Arrange
         var processId = Guid.NewGuid();
-        var processes = new List<Process<ProcessTypeId, ProcessStepTypeId>>();
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var processes = new List<Process>();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
         A.CallTo(() => _processStepRepository.CreateProcess(A<ProcessTypeId>._))
             .Invokes((ProcessTypeId processTypeId) =>
             {
-                processes.Add(new Process<ProcessTypeId, ProcessStepTypeId>(processId, processTypeId, Guid.NewGuid()));
+                processes.Add(new Process(processId, processTypeId, Guid.NewGuid()));
             })
-            .Returns(new Process<ProcessTypeId, ProcessStepTypeId>(processId, default, default));
+            .Returns(new Process(processId, default, default));
         A.CallTo(() => _processStepRepository.CreateProcessStep(A<ProcessStepTypeId>._, A<ProcessStepStatusId>._, processId))
             .Invokes((ProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid _) =>
             {
-                processSteps.Add(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, processStepStatusId, processId, DateTimeOffset.UtcNow));
+                processSteps.Add(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, processStepStatusId, processId, DateTimeOffset.UtcNow));
             });
         A.CallTo(() => _companyRepository.GetCompanyIdsWithMissingSelfDescription())
             .Returns(new[] { Guid.NewGuid(), Guid.NewGuid() }.ToAsyncEnumerable());
@@ -1224,18 +1224,18 @@ public async Task TriggerSelfDescriptionCreation_WithoutMissingSdDocsForCompany_
     {
         // Arrange
         var processId = Guid.NewGuid();
-        var processes = new List<Process<ProcessTypeId, ProcessStepTypeId>>();
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var processes = new List<Process>();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
         A.CallTo(() => _processStepRepository.CreateProcess(A<ProcessTypeId>._))
             .Invokes((ProcessTypeId processTypeId) =>
             {
-                processes.Add(new Process<ProcessTypeId, ProcessStepTypeId>(processId, processTypeId, Guid.NewGuid()));
+                processes.Add(new Process(processId, processTypeId, Guid.NewGuid()));
             })
-            .Returns(new Process<ProcessTypeId, ProcessStepTypeId>(processId, default, default));
+            .Returns(new Process(processId, default, default));
         A.CallTo(() => _processStepRepository.CreateProcessStep(A<ProcessStepTypeId>._, A<ProcessStepStatusId>._, processId))
             .Invokes((ProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid _) =>
             {
-                processSteps.Add(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, processStepStatusId, processId, DateTimeOffset.UtcNow));
+                processSteps.Add(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, processStepStatusId, processId, DateTimeOffset.UtcNow));
             });
         A.CallTo(() => _companyRepository.GetCompanyIdsWithMissingSelfDescription())
             .Returns(Enumerable.Empty<Guid>().ToAsyncEnumerable());
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/ConnectorsBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/ConnectorsBusinessLogicTests.cs
index 0ce872f954..6afd63efb6 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/ConnectorsBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/ConnectorsBusinessLogicTests.cs
@@ -1384,18 +1384,18 @@ public async Task TriggerSelfDescriptionCreation_WithMissingSdDocsForConnector_C
     {
         // Arrange
         var processId = Guid.NewGuid();
-        var processes = new List<Process<ProcessTypeId, ProcessStepTypeId>>();
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var processes = new List<Process>();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
         A.CallTo(() => _processStepRepository.CreateProcess(A<ProcessTypeId>._))
             .Invokes((ProcessTypeId processTypeId) =>
             {
-                processes.Add(new Process<ProcessTypeId, ProcessStepTypeId>(processId, processTypeId, Guid.NewGuid()));
+                processes.Add(new Process(processId, processTypeId, Guid.NewGuid()));
             })
-            .Returns(new Process<ProcessTypeId, ProcessStepTypeId>(processId, default, default));
+            .Returns(new Process(processId, default, default));
         A.CallTo(() => _processStepRepository.CreateProcessStep(A<ProcessStepTypeId>._, A<ProcessStepStatusId>._, processId))
             .Invokes((ProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid _) =>
             {
-                processSteps.Add(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, processStepStatusId, processId, DateTimeOffset.UtcNow));
+                processSteps.Add(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, processStepStatusId, processId, DateTimeOffset.UtcNow));
             });
         A.CallTo(() => _connectorsRepository.GetConnectorIdsWithMissingSelfDescription())
             .Returns(new[] { Guid.NewGuid(), Guid.NewGuid() }.ToAsyncEnumerable());
@@ -1422,18 +1422,18 @@ public async Task TriggerSelfDescriptionCreation_WithoutMissingSdDocsForConnecto
     {
         // Arrange
         var processId = Guid.NewGuid();
-        var processes = new List<Process<ProcessTypeId, ProcessStepTypeId>>();
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var processes = new List<Process>();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
         A.CallTo(() => _processStepRepository.CreateProcess(A<ProcessTypeId>._))
             .Invokes((ProcessTypeId processTypeId) =>
             {
-                processes.Add(new Process<ProcessTypeId, ProcessStepTypeId>(processId, processTypeId, Guid.NewGuid()));
+                processes.Add(new Process(processId, processTypeId, Guid.NewGuid()));
             })
-            .Returns(new Process<ProcessTypeId, ProcessStepTypeId>(processId, default, default));
+            .Returns(new Process(processId, default, default));
         A.CallTo(() => _processStepRepository.CreateProcessStep(A<ProcessStepTypeId>._, A<ProcessStepStatusId>._, processId))
             .Invokes((ProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid _) =>
             {
-                processSteps.Add(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, processStepStatusId, processId, DateTimeOffset.UtcNow));
+                processSteps.Add(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, processStepStatusId, processId, DateTimeOffset.UtcNow));
             });
         A.CallTo(() => _connectorsRepository.GetConnectorIdsWithMissingSelfDescription())
             .Returns(Enumerable.Empty<Guid>().ToAsyncEnumerable());
@@ -1514,7 +1514,7 @@ private void SetupIdentity()
     private void SetupTechnicalIdentity()
     {
         A.CallTo(() => _identity.IdentityId).Returns(ServiceAccountUserId);
-        A.CallTo(() => _identity.IdentityTypeId).Returns(IdentityTypeId.COMPANY_SERVICE_ACCOUNT);
+        A.CallTo(() => _identity.IdentityTypeId).Returns(IdentityTypeId.TECHNICAL_USER);
     }
 
     private void SetupFakesForGetMissingSdDocConnectors(int count = 5)
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/InvitationBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/InvitationBusinessLogicTests.cs
index 8f01147466..70baba3aa4 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/InvitationBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/InvitationBusinessLogicTests.cs
@@ -88,8 +88,8 @@ public async Task ExecuteInvitation_WithoutEmail_ThrowsControllerArgumentExcepti
     [Fact]
     public async Task ExecuteInvitation_WithValidData_CreatesExpected()
     {
-        var processes = new List<Process<ProcessTypeId, ProcessStepTypeId>>();
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var processes = new List<Process>();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
         var invitations = new List<CompanyInvitation>();
 
         SetupFakesForInvite(processes, processSteps, invitations);
@@ -162,11 +162,11 @@ public async Task RetriggerCreateCentralIdp_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_CENTRAL_IDP;
         var processStepTypeId = ProcessStepTypeId.INVITATION_CREATE_CENTRAL_IDP;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((true, verifyProcessData));
 
@@ -185,7 +185,7 @@ public async Task RetriggerCreateCentralIdp_WithNotExistingProcess_ThrowsExcepti
     {
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_USER;
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((false, _fixture.Create<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()));
         async Task Act() => await _sut.RetriggerCreateCentralIdp(process.Id);
@@ -207,11 +207,11 @@ public async Task RetriggerCreateSharedIdpServiceAccount_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT;
         var processStepTypeId = ProcessStepTypeId.INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((true, verifyProcessData));
 
@@ -230,7 +230,7 @@ public async Task RetriggerCreateSharedIdpServiceAccount_WithNotExistingProcess_
     {
         // Arrange
         var stepToTrigger = ProcessStepTypeId.INVITATION_CREATE_SHARED_IDP_SERVICE_ACCOUNT;
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((false, _fixture.Create<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()));
         async Task Act() => await _sut.RetriggerCreateDatabaseIdp(process.Id);
@@ -252,11 +252,11 @@ public async Task RetriggerUpdateCentralIdpUrls_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_UPDATE_CENTRAL_IDP_URLS;
         var processStepTypeId = ProcessStepTypeId.INVITATION_UPDATE_CENTRAL_IDP_URLS;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((true, verifyProcessData));
 
@@ -275,7 +275,7 @@ public async Task RetriggerUpdateCentralIdpUrls_WithNotExistingProcess_ThrowsExc
     {
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_UPDATE_CENTRAL_IDP_URLS;
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((false, _fixture.Create<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()));
         async Task Act() => await _sut.RetriggerCreateDatabaseIdp(process.Id);
@@ -297,11 +297,11 @@ public async Task RetriggerCreateCentralIdpOrgMapper_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER;
         var processStepTypeId = ProcessStepTypeId.INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((true, verifyProcessData));
 
@@ -320,7 +320,7 @@ public async Task RetriggerCreateCentralIdpOrgMapper_WithNotExistingProcess_Thro
     {
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_CENTRAL_IDP_ORG_MAPPER;
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((false, _fixture.Create<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()));
         async Task Act() => await _sut.RetriggerCreateCentralIdpOrgMapper(process.Id);
@@ -342,11 +342,11 @@ public async Task RetriggerCreateSharedRealmIdpClient_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_SHARED_REALM;
         var processStepTypeId = ProcessStepTypeId.INVITATION_CREATE_SHARED_REALM;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((true, verifyProcessData));
 
@@ -365,7 +365,7 @@ public async Task RetriggerCreateSharedRealmIdpClient_WithNotExistingProcess_Thr
     {
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_SHARED_REALM;
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((false, _fixture.Create<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()));
         async Task Act() => await _sut.RetriggerCreateSharedRealmIdpClient(process.Id);
@@ -387,11 +387,11 @@ public async Task RetriggerEnableCentralIdp_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_ENABLE_CENTRAL_IDP;
         var processStepTypeId = ProcessStepTypeId.INVITATION_ENABLE_CENTRAL_IDP;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((true, verifyProcessData));
 
@@ -410,7 +410,7 @@ public async Task RetriggerEnableCentralIdp_WithNotExistingProcess_ThrowsExcepti
     {
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_ENABLE_CENTRAL_IDP;
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((false, _fixture.Create<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()));
         async Task Act() => await _sut.RetriggerEnableCentralIdp(process.Id);
@@ -432,11 +432,11 @@ public async Task RetriggerCreateDatabaseIdp_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_DATABASE_IDP;
         var processStepTypeId = ProcessStepTypeId.INVITATION_CREATE_DATABASE_IDP;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((true, verifyProcessData));
 
@@ -455,7 +455,7 @@ public async Task RetriggerCreateDatabaseIdp_WithNotExistingProcess_ThrowsExcept
     {
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_DATABASE_IDP;
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((false, _fixture.Create<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()));
         async Task Act() => await _sut.RetriggerCreateDatabaseIdp(process.Id);
@@ -477,11 +477,11 @@ public async Task RetriggerInvitationCreateUser_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_USER;
         var processStepTypeId = ProcessStepTypeId.INVITATION_CREATE_USER;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With<DateTimeOffset?>(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With<DateTimeOffset?>(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((true, verifyProcessData));
 
@@ -500,7 +500,7 @@ public async Task RetriggerInvitationCreateUser_WithNotExistingProcess_ThrowsExc
     {
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_INVITATION_CREATE_USER;
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         A.CallTo(() => _processStepRepository.IsValidProcess(process.Id, ProcessTypeId.INVITATION, A<IEnumerable<ProcessStepTypeId>>.That.Matches(x => x.Count() == 1 && x.Single() == stepToTrigger)))
             .Returns((false, _fixture.Create<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()));
         async Task Act() => await _sut.RetriggerInvitationCreateUser(process.Id);
@@ -516,20 +516,20 @@ public async Task RetriggerInvitationCreateUser_WithNotExistingProcess_ThrowsExc
 
     #region Setup
 
-    private void SetupFakesForInvite(List<Process<ProcessTypeId, ProcessStepTypeId>> processes, List<ProcessStep<ProcessTypeId, ProcessStepTypeId>> processSteps, List<CompanyInvitation> invitations)
+    private void SetupFakesForInvite(List<Process> processes, List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>> processSteps, List<CompanyInvitation> invitations)
     {
         var createdProcessId = Guid.NewGuid();
         A.CallTo(() => _processStepRepository.CreateProcess(A<ProcessTypeId>._))
             .ReturnsLazily((ProcessTypeId processTypeId) =>
             {
-                var process = new Process<ProcessTypeId, ProcessStepTypeId>(createdProcessId, processTypeId, Guid.NewGuid());
+                var process = new Process(createdProcessId, processTypeId, Guid.NewGuid());
                 processes.Add(process);
                 return process;
             });
         A.CallTo(() => _processStepRepository.CreateProcessStep(A<ProcessStepTypeId>._, A<ProcessStepStatusId>._, A<Guid>._))
             .ReturnsLazily((ProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid processId) =>
             {
-                var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, processStepStatusId, processId,
+                var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, processStepStatusId, processId,
                     DateTimeOffset.UtcNow);
                 processSteps.Add(processStep);
                 return processStep;
@@ -558,12 +558,12 @@ private void SetupFakesForInvite(List<Process<ProcessTypeId, ProcessStepTypeId>>
             });
     }
 
-    private void SetupFakesForRetrigger(List<ProcessStep<ProcessTypeId, ProcessStepTypeId>> processSteps)
+    private void SetupFakesForRetrigger(List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>> processSteps)
     {
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)>>._))
             .Invokes((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepTypeStatus) =>
                 {
-                    processSteps.AddRange(processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList());
+                    processSteps.AddRange(processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList());
                 });
     }
 
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
index ccafed6069..db47559033 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
@@ -379,7 +379,7 @@ public async Task HandlePartnerRegistration_WithUserCreationThrowsException_Thro
             .Returns(new Company(newCompanyId, null!, default, default));
 
         A.CallTo(() => _processStepRepository.CreateProcess(ProcessTypeId.PARTNER_REGISTRATION))
-            .Returns(new Process<ProcessTypeId, ProcessStepTypeId>(processId, default, default));
+            .Returns(new Process(processId, default, default));
 
         A.CallTo(() => _userProvisioningService.GetOrCreateCompanyUser(A<IUserRepository>._, A<string>._, A<UserCreationRoleDataIdpInfo>._, A<Guid>._, A<Guid>._, "BPNL00000001TEST"))
             .Throws(new UnexpectedConditionException("Test message"));
@@ -432,8 +432,8 @@ public async Task HandlePartnerRegistration_WithIdpNotSetAndOnlyOneIdp_CallsExpe
         var addresses = new List<Address>();
         var companies = new List<Company>();
         var companyAssignedRoles = new List<CompanyAssignedRole>();
-        var processes = new List<Process<ProcessTypeId, ProcessStepTypeId>>();
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var processes = new List<Process>();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
         var companyApplications = new List<CompanyApplication>();
         var networkRegistrations = new List<NetworkRegistration>();
 
@@ -486,14 +486,14 @@ public async Task HandlePartnerRegistration_WithIdpNotSetAndOnlyOneIdp_CallsExpe
         A.CallTo(() => _processStepRepository.CreateProcess(ProcessTypeId.PARTNER_REGISTRATION))
             .ReturnsLazily((ProcessTypeId processTypeId) =>
             {
-                var process = new Process<ProcessTypeId, ProcessStepTypeId>(newProcessId, processTypeId, Guid.NewGuid());
+                var process = new Process(newProcessId, processTypeId, Guid.NewGuid());
                 processes.Add(process);
                 return process;
             });
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .Invokes((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> foo) =>
             {
-                processSteps.AddRange(foo.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)));
+                processSteps.AddRange(foo.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)));
             });
         A.CallTo(() => _applicationRepository.CreateCompanyApplication(A<Guid>._, A<CompanyApplicationStatusId>._, A<CompanyApplicationTypeId>._, A<Action<CompanyApplication>>._))
             .ReturnsLazily((Guid companyId, CompanyApplicationStatusId companyApplicationStatusId, CompanyApplicationTypeId applicationTypeId, Action<CompanyApplication>? setOptionalFields) =>
@@ -528,7 +528,7 @@ public async Task HandlePartnerRegistration_WithIdpNotSetAndOnlyOneIdp_CallsExpe
                 x.Shortname == data.ShortName &&
                 x.CompanyStatusId == CompanyStatusId.PENDING);
         processes.Should().ContainSingle()
-            .Which.Should().Match<Process<ProcessTypeId, ProcessStepTypeId>>(
+            .Which.Should().Match<Process>(
                 x => x.ProcessTypeId == ProcessTypeId.PARTNER_REGISTRATION);
         processSteps.Should().HaveCount(2).And.Satisfy(
                 x => x.ProcessStepStatusId == ProcessStepStatusId.TODO && x.ProcessStepTypeId == ProcessStepTypeId.SYNCHRONIZE_USER,
@@ -567,8 +567,8 @@ public async Task HandlePartnerRegistration_WithValidData_CallsExpected(string?
         var addresses = new List<Address>();
         var companies = new List<Company>();
         var companyAssignedRoles = new List<CompanyAssignedRole>();
-        var processes = new List<Process<ProcessTypeId, ProcessStepTypeId>>();
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var processes = new List<Process>();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
         var companyApplications = new List<CompanyApplication>();
         var networkRegistrations = new List<NetworkRegistration>();
         var invitations = new List<Invitation>();
@@ -622,14 +622,14 @@ public async Task HandlePartnerRegistration_WithValidData_CallsExpected(string?
         A.CallTo(() => _processStepRepository.CreateProcess(A<ProcessTypeId>._))
             .ReturnsLazily((ProcessTypeId processTypeId) =>
             {
-                var process = new Process<ProcessTypeId, ProcessStepTypeId>(newProcessId, processTypeId, Guid.NewGuid());
+                var process = new Process(newProcessId, processTypeId, Guid.NewGuid());
                 processes.Add(process);
                 return process;
             });
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .Invokes((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepTypeStatus) =>
             {
-                processSteps.AddRange(processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList());
+                processSteps.AddRange(processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList());
             });
         A.CallTo(() => _applicationRepository.CreateCompanyApplication(A<Guid>._, A<CompanyApplicationStatusId>._, A<CompanyApplicationTypeId>._, A<Action<CompanyApplication>>._))
             .ReturnsLazily((Guid companyId, CompanyApplicationStatusId companyApplicationStatusId, CompanyApplicationTypeId applicationTypeId, Action<CompanyApplication>? setOptionalFields) =>
@@ -669,7 +669,7 @@ public async Task HandlePartnerRegistration_WithValidData_CallsExpected(string?
                 x.Shortname == data.ShortName &&
                 x.CompanyStatusId == CompanyStatusId.PENDING);
         processes.Should().ContainSingle()
-            .Which.Should().Match<Process<ProcessTypeId, ProcessStepTypeId>>(x =>
+            .Which.Should().Match<Process>(x =>
                 x.ProcessTypeId == ProcessTypeId.PARTNER_REGISTRATION);
         processSteps.Should().HaveCount(2).And.Satisfy(
             x => x.ProcessStepStatusId == ProcessStepStatusId.TODO && x.ProcessStepTypeId == ProcessStepTypeId.SYNCHRONIZE_USER,
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
index 036164d1c6..8b8d63aeab 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
@@ -709,11 +709,11 @@ public async Task TriggerChecklistAsync_WithValidData_ReturnsExpected(Applicatio
         var applicationId = _fixture.Create<Guid>();
         var context = new IApplicationChecklistService.ManualChecklistProcessStepData(
             applicationId,
-            new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()),
+            new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()),
             Guid.NewGuid(),
             typeId,
             ImmutableDictionary.Create<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>(),
-            Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>());
+            Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>());
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(applicationId,
                 typeId,
                 A<IEnumerable<ApplicationChecklistEntryStatusId>>._,
@@ -1061,11 +1061,11 @@ public async Task RetriggerDeleteIdpSharedRealm_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_DELETE_IDP_SHARED_REALM;
         var processStepTypeId = ProcessStepTypeId.DELETE_IDP_SHARED_REALM;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(A<Guid>._, A<ProcessTypeId>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns((true, verifyProcessData));
 
@@ -1107,11 +1107,11 @@ public async Task RetriggerDeleteIdpSharedServiceAccount_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_DELETE_IDP_SHARED_SERVICEACCOUNT;
         var processStepTypeId = ProcessStepTypeId.DELETE_IDP_SHARED_SERVICEACCOUNT;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(A<Guid>._, A<ProcessTypeId>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns((true, verifyProcessData));
 
@@ -1153,11 +1153,11 @@ public async Task RetriggerDeleteCentralIdentityProvider_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_DELETE_CENTRAL_IDENTITY_PROVIDER;
         var processStepTypeId = ProcessStepTypeId.DELETE_CENTRAL_IDENTITY_PROVIDER;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(A<Guid>._, A<ProcessTypeId>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns((true, verifyProcessData));
 
@@ -1199,11 +1199,11 @@ public async Task RetriggerDeleteCentralUser_CallsExpected()
         // Arrange
         var stepToTrigger = ProcessStepTypeId.RETRIGGER_DELETE_CENTRAL_USER;
         var processStepTypeId = ProcessStepTypeId.DELETE_CENTRAL_USER;
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Build<Process>().With(x => x.LockExpiryDate, default(DateTimeOffset?)).Create();
         var processStepId = Guid.NewGuid();
         SetupFakesForRetrigger(processSteps);
-        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
+        var verifyProcessData = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow), 1));
         A.CallTo(() => _processStepRepository.IsValidProcess(A<Guid>._, A<ProcessTypeId>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns((true, verifyProcessData));
 
@@ -1282,9 +1282,9 @@ private void SetupForUpdateCompanyBpn(ApplicationChecklistEntry? applicationChec
             }.ToAsyncEnumerable());
 
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(IdWithoutBpn, ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER, A<IEnumerable<ApplicationChecklistEntryStatusId>>._, A<ProcessStepTypeId>._, A<IEnumerable<ApplicationChecklistEntryTypeId>?>._, A<IEnumerable<ProcessStepTypeId>?>._))
-            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
             ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create(ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, (ApplicationChecklistEntryStatusId.DONE, default(string?))) }),
-            Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+            Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
     }
 
     private void SetupForApproveRegistrationVerification(ApplicationChecklistEntry applicationChecklistEntry)
@@ -1296,13 +1296,13 @@ private void SetupForApproveRegistrationVerification(ApplicationChecklistEntry a
             });
 
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(IdWithoutBpn, ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, A<IEnumerable<ApplicationChecklistEntryStatusId>>._, A<ProcessStepTypeId>._, A<IEnumerable<ApplicationChecklistEntryTypeId>?>._, A<IEnumerable<ProcessStepTypeId>?>._))
-            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
             ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create(ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER, (ApplicationChecklistEntryStatusId.IN_PROGRESS, default(string?))) }),
-            Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+            Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(IdWithBpn, ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, A<IEnumerable<ApplicationChecklistEntryStatusId>>._, A<ProcessStepTypeId>._, A<IEnumerable<ApplicationChecklistEntryTypeId>?>._, A<IEnumerable<ProcessStepTypeId>?>._))
-            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
             ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create(ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER, (ApplicationChecklistEntryStatusId.DONE, default(string?))) }),
-            Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+            Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
     }
 
     private void SetupForDeclineRegistrationVerification(ApplicationChecklistEntry applicationChecklistEntry, CompanyApplication application, Company company, ApplicationChecklistEntryStatusId checklistStatusId, IdentityProviderTypeId idpTypeId)
@@ -1314,13 +1314,13 @@ private void SetupForDeclineRegistrationVerification(ApplicationChecklistEntry a
             });
 
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(IdWithoutBpn, ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, A<IEnumerable<ApplicationChecklistEntryStatusId>>._, A<ProcessStepTypeId>._, A<IEnumerable<ApplicationChecklistEntryTypeId>?>._, A<IEnumerable<ProcessStepTypeId>?>._))
-            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
             ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create(ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, (checklistStatusId, default(string?))) }),
-            Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+            Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(IdWithBpn, ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, A<IEnumerable<ApplicationChecklistEntryStatusId>>._, A<ProcessStepTypeId>._, A<IEnumerable<ApplicationChecklistEntryTypeId>?>._, A<IEnumerable<ProcessStepTypeId>?>._))
-            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
             ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create(ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, (ApplicationChecklistEntryStatusId.DONE, default(string?))) }),
-            Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+            Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
 
         A.CallTo(() => _applicationRepository.GetCompanyIdNameForSubmittedApplication(IdWithBpn))
             .Returns((CompanyId, CompanyName, ExistingExternalId, Enumerable.Repeat((IdpId, IamAliasId, idpTypeId, Enumerable.Repeat(UserId, 1)), 1), Enumerable.Repeat(UserId, 1)));
@@ -1346,12 +1346,12 @@ private void SetupForDeclineRegistrationVerification(ApplicationChecklistEntry a
             });
     }
 
-    private void SetupFakesForRetrigger(List<ProcessStep<ProcessTypeId, ProcessStepTypeId>> processSteps)
+    private void SetupFakesForRetrigger(List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>> processSteps)
     {
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)>>._))
             .Invokes((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepTypeStatus) =>
                 {
-                    processSteps.AddRange(processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList());
+                    processSteps.AddRange(processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList());
                 });
     }
 
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/ServiceAccountManagementTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/ServiceAccountManagementTests.cs
index 1cb08129f2..acb4722119 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/ServiceAccountManagementTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/ServiceAccountManagementTests.cs
@@ -127,8 +127,8 @@ private void SetupDeleteOwnCompanyServiceAccount(bool isDimServiceAccount, Ident
                     (
                         ProcessTypeId.OFFER_SUBSCRIPTION,
                         new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(
-                            new Process<ProcessTypeId, ProcessStepTypeId>(id, ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid()),
-                            processStepTypeIds?.Select(stepTypeId => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), stepTypeId, ProcessStepStatusId.TODO, id, _fixture.Create<DateTimeOffset>())) ?? Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()),
+                            new Process(id, ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid()),
+                            processStepTypeIds?.Select(stepTypeId => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), stepTypeId, ProcessStepStatusId.TODO, id, _fixture.Create<DateTimeOffset>())) ?? Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()),
                         Guid.NewGuid()));
         }
 
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/SubscriptionConfigurationBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/SubscriptionConfigurationBusinessLogicTests.cs
index 85c25bb5bf..1d5215955c 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/SubscriptionConfigurationBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/SubscriptionConfigurationBusinessLogicTests.cs
@@ -105,9 +105,9 @@ public async Task RetriggerProvider_WithValidInput_ReturnsExpected()
         // Arrange
         var processStepId = Guid.NewGuid();
         var processId = Guid.NewGuid();
-        var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.RETRIGGER_PROVIDER, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
+        var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.RETRIGGER_PROVIDER, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
         A.CallTo(() => _offerSubscriptionProcessService.VerifySubscriptionAndProcessSteps(OfferSubscriptionId, ProcessStepTypeId.RETRIGGER_PROVIDER, null, true))
-            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.RETRIGGER_PROVIDER, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), new[] { processStep }, _portalRepositories));
+            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.RETRIGGER_PROVIDER, _fixture.Create<Process>(), new[] { processStep }, _portalRepositories));
 
         // Act
         await _sut.RetriggerProvider(OfferSubscriptionId);
@@ -126,9 +126,9 @@ public async Task RetriggerCreateClient_WithValidInput_ReturnsExpected()
         // Arrange
         var processStepId = Guid.NewGuid();
         var processId = Guid.NewGuid();
-        var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.RETRIGGER_OFFERSUBSCRIPTION_CLIENT_CREATION, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
+        var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.RETRIGGER_OFFERSUBSCRIPTION_CLIENT_CREATION, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
         A.CallTo(() => _offerSubscriptionProcessService.VerifySubscriptionAndProcessSteps(OfferSubscriptionId, ProcessStepTypeId.RETRIGGER_OFFERSUBSCRIPTION_CLIENT_CREATION, null, true))
-            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.RETRIGGER_OFFERSUBSCRIPTION_CLIENT_CREATION, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), new[] { processStep }, _portalRepositories));
+            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.RETRIGGER_OFFERSUBSCRIPTION_CLIENT_CREATION, _fixture.Create<Process>(), new[] { processStep }, _portalRepositories));
 
         // Act
         await _sut.RetriggerCreateClient(OfferSubscriptionId);
@@ -147,9 +147,9 @@ public async Task RetriggerCreateTechnicalUser_WithValidInput_ReturnsExpected()
         // Arrange
         var processStepId = Guid.NewGuid();
         var processId = Guid.NewGuid();
-        var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.RETRIGGER_OFFERSUBSCRIPTION_TECHNICALUSER_CREATION, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
+        var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.RETRIGGER_OFFERSUBSCRIPTION_TECHNICALUSER_CREATION, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
         A.CallTo(() => _offerSubscriptionProcessService.VerifySubscriptionAndProcessSteps(OfferSubscriptionId, ProcessStepTypeId.RETRIGGER_OFFERSUBSCRIPTION_TECHNICALUSER_CREATION, null, true))
-            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.RETRIGGER_OFFERSUBSCRIPTION_TECHNICALUSER_CREATION, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), new[] { processStep }, _portalRepositories));
+            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.RETRIGGER_OFFERSUBSCRIPTION_TECHNICALUSER_CREATION, _fixture.Create<Process>(), new[] { processStep }, _portalRepositories));
 
         // Act
         await _sut.RetriggerCreateTechnicalUser(OfferSubscriptionId);
@@ -168,9 +168,9 @@ public async Task RetriggerProviderCallback_WithValidInput_ReturnsExpected()
         // Arrange
         var processStepId = Guid.NewGuid();
         var processId = Guid.NewGuid();
-        var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.RETRIGGER_PROVIDER_CALLBACK, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
+        var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.RETRIGGER_PROVIDER_CALLBACK, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
         A.CallTo(() => _offerSubscriptionProcessService.VerifySubscriptionAndProcessSteps(OfferSubscriptionId, ProcessStepTypeId.RETRIGGER_PROVIDER_CALLBACK, null, false))
-            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.RETRIGGER_PROVIDER_CALLBACK, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), new[] { processStep }, _portalRepositories));
+            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.RETRIGGER_PROVIDER_CALLBACK, _fixture.Create<Process>(), new[] { processStep }, _portalRepositories));
 
         // Act
         await _sut.RetriggerProviderCallback(OfferSubscriptionId);
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/TechnicalUserBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/TechnicalUserBusinessLogicTests.cs
index 87db5fb9dc..2fd5a2b76b 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/TechnicalUserBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/TechnicalUserBusinessLogicTests.cs
@@ -694,8 +694,8 @@ public async Task HandleServiceAccountCreationCallback_WithValidOfferSubscriptio
     {
         // Arrange
         const ProcessStepTypeId stepToTrigger = ProcessStepTypeId.AWAIT_CREATE_DIM_TECHNICAL_USER_RESPONSE;
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
-        var context = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, [new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)]);
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
+        var context = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, [new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)]);
         A.CallTo(() => _technicalUserRepository.GetProcessDataForTechnicalUserCallback(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns((ProcessTypeId.OFFER_SUBSCRIPTION, context, Guid.NewGuid(), Guid.NewGuid()));
 
@@ -717,7 +717,7 @@ public async Task HandleServiceAccountCreationCallback_WithNotExistingProcess_Th
     {
         // Arrange
         var stepToTrigger = ProcessStepTypeId.AWAIT_CREATE_DIM_TECHNICAL_USER_RESPONSE;
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processTypeId, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), processTypeId, Guid.NewGuid());
         A.CallTo(() => _technicalUserRepository.GetProcessDataForTechnicalUserCallback(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns<(ProcessTypeId, VerifyProcessData<ProcessTypeId, ProcessStepTypeId>, Guid?, Guid?)>(default);
 
@@ -739,8 +739,8 @@ public async Task HandleServiceAccountCreationCallback_WithOfferSubscriptionIdNo
     {
         // Arrange
         const ProcessStepTypeId stepToTrigger = ProcessStepTypeId.AWAIT_CREATE_DIM_TECHNICAL_USER_RESPONSE;
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
-        var context = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, [new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)]);
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
+        var context = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(process, [new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), stepToTrigger, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)]);
         A.CallTo(() => _technicalUserRepository.GetProcessDataForTechnicalUserCallback(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns((ProcessTypeId.OFFER_SUBSCRIPTION, context, null, null));
 
diff --git a/tests/externalsystems/Bpdm.Library/Bpdm.Library.csproj b/tests/externalsystems/Bpdm.Library/Bpdm.Library.csproj
index 2c63097bdc..5eed02ec31 100644
--- a/tests/externalsystems/Bpdm.Library/Bpdm.Library.csproj
+++ b/tests/externalsystems/Bpdm.Library/Bpdm.Library.csproj
@@ -36,7 +36,6 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\..\src\externalsystems\Bpdm.Library\Bpdm.Library.csproj" />
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
 </Project>
diff --git a/tests/externalsystems/BpnDidResolver.Library.Tests/BpnDidResolver.Library.Tests.csproj b/tests/externalsystems/BpnDidResolver.Library.Tests/BpnDidResolver.Library.Tests.csproj
index 58641062be..a74d258900 100644
--- a/tests/externalsystems/BpnDidResolver.Library.Tests/BpnDidResolver.Library.Tests.csproj
+++ b/tests/externalsystems/BpnDidResolver.Library.Tests/BpnDidResolver.Library.Tests.csproj
@@ -36,7 +36,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\externalsystems\BpnDidResolver.Library\BpnDidResolver.Library.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/externalsystems/Clearinghouse.Library.Tests/Clearinghouse.Library.Tests.csproj b/tests/externalsystems/Clearinghouse.Library.Tests/Clearinghouse.Library.Tests.csproj
index 68beae79bb..36f0b90283 100644
--- a/tests/externalsystems/Clearinghouse.Library.Tests/Clearinghouse.Library.Tests.csproj
+++ b/tests/externalsystems/Clearinghouse.Library.Tests/Clearinghouse.Library.Tests.csproj
@@ -36,7 +36,6 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\..\src\externalsystems\Clearinghouse.Library\Clearinghouse.Library.csproj" />
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
 </Project>
diff --git a/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseBusinessLogicTests.cs b/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseBusinessLogicTests.cs
index 715947512d..c2e4a66787 100644
--- a/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseBusinessLogicTests.cs
+++ b/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseBusinessLogicTests.cs
@@ -443,7 +443,7 @@ private void SetupForProcessClearinghouseResponse(ApplicationChecklistEntry appl
                 ProcessStepTypeId.AWAIT_CLEARING_HOUSE_RESPONSE,
                 A<IEnumerable<ApplicationChecklistEntryTypeId>?>._,
                 A<IEnumerable<ProcessStepTypeId>?>._))
-            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(Guid.Empty, new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.Empty, ApplicationChecklistEntryTypeId.CLEARING_HOUSE, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty, new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(Guid.Empty, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.Empty, ApplicationChecklistEntryTypeId.CLEARING_HOUSE, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty, new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
     }
 
     private void SetupForCheckEndClearinghouseProcesses(IEnumerable<ApplicationChecklistEntry> applicationChecklistEntries)
@@ -473,7 +473,7 @@ private void SetupForCheckEndClearinghouseProcesses(IEnumerable<ApplicationCheck
                 IEnumerable<ApplicationChecklistEntryTypeId>? _,
                 IEnumerable<ProcessStepTypeId>? _) => new IApplicationChecklistService.ManualChecklistProcessStepData(
                 id,
-                new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()),
+                new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()),
                 Guid.Empty,
                 ApplicationChecklistEntryTypeId.CLEARING_HOUSE,
                 ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty,
diff --git a/tests/externalsystems/Custodian.Library.Tests/Custodian.Library.Tests.csproj b/tests/externalsystems/Custodian.Library.Tests/Custodian.Library.Tests.csproj
index d86d243535..2ec31f1677 100644
--- a/tests/externalsystems/Custodian.Library.Tests/Custodian.Library.Tests.csproj
+++ b/tests/externalsystems/Custodian.Library.Tests/Custodian.Library.Tests.csproj
@@ -36,7 +36,6 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\..\src\externalsystems\Custodian.Library\Custodian.Library.csproj" />
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
 </Project>
diff --git a/tests/externalsystems/Dim.Library.Tests/Dim.Library.Tests.csproj b/tests/externalsystems/Dim.Library.Tests/Dim.Library.Tests.csproj
index e67b5a0069..453c56b6e1 100644
--- a/tests/externalsystems/Dim.Library.Tests/Dim.Library.Tests.csproj
+++ b/tests/externalsystems/Dim.Library.Tests/Dim.Library.Tests.csproj
@@ -36,7 +36,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\externalsystems\Dim.Library\Dim.Library.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/externalsystems/Dim.Library.Tests/DimBusinessLogicTests.cs b/tests/externalsystems/Dim.Library.Tests/DimBusinessLogicTests.cs
index 7fdceaa1e9..f5b9d06d02 100644
--- a/tests/externalsystems/Dim.Library.Tests/DimBusinessLogicTests.cs
+++ b/tests/externalsystems/Dim.Library.Tests/DimBusinessLogicTests.cs
@@ -296,10 +296,10 @@ public async Task ProcessDimResponse_WithMultipleSubmittedApplications_ThrowsCon
     public async Task ProcessDimResponse_WithDidSchemaInvalid_CallsExpected()
     {
         // Arrange
-        var context = new IApplicationChecklistService.ManualChecklistProcessStepData(ApplicationId, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), Guid.NewGuid(), ApplicationChecklistEntryTypeId.IDENTITY_WALLET, new Dictionary<ApplicationChecklistEntryTypeId, ValueTuple<ApplicationChecklistEntryStatusId, string?>>()
+        var context = new IApplicationChecklistService.ManualChecklistProcessStepData(ApplicationId, _fixture.Create<Process>(), Guid.NewGuid(), ApplicationChecklistEntryTypeId.IDENTITY_WALLET, new Dictionary<ApplicationChecklistEntryTypeId, ValueTuple<ApplicationChecklistEntryStatusId, string?>>()
         {
             { ApplicationChecklistEntryTypeId.IDENTITY_WALLET, new(ApplicationChecklistEntryStatusId.TO_DO, string.Empty) }
-        }.ToImmutableDictionary(), Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>());
+        }.ToImmutableDictionary(), Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>());
         var didDocument = JsonDocument.Parse("{\n  \"@context\": [\n    \"https://www.w3.org/ns/did/v1\",\n    \"https://w3id.org/security/suites/ed25519-2020/v1\"\n  ],\n  \"id\": \"did:web:example.com:did:BPNL0000000000XX\",\n  \"verificationMethod\": [\n     {\n         \"id\": [\"did:web:example.com:did:BPNL0000000000XX#key-0\"],\n         \"type\": \"JsonWebKey2020\",\n         \"publicKeyJwk\": {\n            \"kty\": \"JsonWebKey2020\",\n            \"crv\": \"Ed25519\",\n            \"x\": \"3534354354353\"\n         }\n     }\n   ],\n   \"services\": [\n     {\n         \"id\": [\"did:web:example.com:did:BPNL0000000000XX#key-0\"],\n         \"type\": \"CredentialStore\",\n         \"serviceEndpoint\": \"test.org:123\"\n     }\n  ]\n}");
         var data = _fixture.Build<DimWalletData>()
             .With(x => x.DidDocument, didDocument)
@@ -325,10 +325,10 @@ public async Task ProcessDimResponse_WithDidSchemaInvalid_CallsExpected()
     public async Task ProcessDimResponse_WithFailingSchemaValidation_CallsExpected()
     {
         // Arrange
-        var context = new IApplicationChecklistService.ManualChecklistProcessStepData(ApplicationId, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), Guid.NewGuid(), ApplicationChecklistEntryTypeId.IDENTITY_WALLET, new Dictionary<ApplicationChecklistEntryTypeId, ValueTuple<ApplicationChecklistEntryStatusId, string?>>()
+        var context = new IApplicationChecklistService.ManualChecklistProcessStepData(ApplicationId, _fixture.Create<Process>(), Guid.NewGuid(), ApplicationChecklistEntryTypeId.IDENTITY_WALLET, new Dictionary<ApplicationChecklistEntryTypeId, ValueTuple<ApplicationChecklistEntryStatusId, string?>>()
         {
             { ApplicationChecklistEntryTypeId.IDENTITY_WALLET, new (ApplicationChecklistEntryStatusId.TO_DO, string.Empty )}
-        }.ToImmutableDictionary(), Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>());
+        }.ToImmutableDictionary(), Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>());
         var didDocument = JsonDocument.Parse("{\n  \"@context\": [\n \"abc\" ],\n  \"id\": \"did:web:example.org:did:BPNL0000000000XX\",\n  \"verificationMethod\": [\n     {\n         \"id\": [\"did:web:example.com:did:BPNL0000000000XX#key-0\"],\n         \"publicKeyJwk\": {\n            \"kty\": \"JsonWebKey2020\",\n            \"crv\": \"Ed25519\",\n            \"x\": \"3534354354353\"\n         }\n     }\n   ],\n   \"services\": [\n     {\n         \"id\": [\"did:web:example.com:did:BPNL0000000000XX#key-0\"],\n         \"serviceEndpoint\": \"test.org:123\"\n     }\n  ]\n}");
         var data = _fixture.Build<DimWalletData>().With(x => x.DidDocument, didDocument).With(x => x.Did, "did:web:example.org:did:BPNL0000000000XX").Create();
         var companyId = Guid.NewGuid();
@@ -353,11 +353,11 @@ public async Task ProcessDimResponse_WithValid_CallsExpected()
         // Arrange
         var context = new IApplicationChecklistService.ManualChecklistProcessStepData(
             ApplicationId,
-            _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(),
+            _fixture.Create<Process>(),
             Guid.NewGuid(),
             ApplicationChecklistEntryTypeId.IDENTITY_WALLET,
             ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create<ApplicationChecklistEntryTypeId, ValueTuple<ApplicationChecklistEntryStatusId, string?>>(ApplicationChecklistEntryTypeId.IDENTITY_WALLET, new(ApplicationChecklistEntryStatusId.TO_DO, string.Empty)) }),
-            Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>());
+            Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>());
 
         const string jsonData = """
                                         {
diff --git a/tests/externalsystems/IssuerComponent.Library.Tests/IssuerComponent.Library.Tests.csproj b/tests/externalsystems/IssuerComponent.Library.Tests/IssuerComponent.Library.Tests.csproj
index 2c07b41d0b..3aaa580393 100644
--- a/tests/externalsystems/IssuerComponent.Library.Tests/IssuerComponent.Library.Tests.csproj
+++ b/tests/externalsystems/IssuerComponent.Library.Tests/IssuerComponent.Library.Tests.csproj
@@ -42,7 +42,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\externalsystems\IssuerComponent.Library\IssuerComponent.Library.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/externalsystems/IssuerComponent.Library.Tests/IssuerComponentBusinessLogicTests.cs b/tests/externalsystems/IssuerComponent.Library.Tests/IssuerComponentBusinessLogicTests.cs
index 1e0d2ab14a..3f14bb93ef 100644
--- a/tests/externalsystems/IssuerComponent.Library.Tests/IssuerComponentBusinessLogicTests.cs
+++ b/tests/externalsystems/IssuerComponent.Library.Tests/IssuerComponentBusinessLogicTests.cs
@@ -273,7 +273,7 @@ public async Task StoreBpnlCredential_WithSuccessful_UpdatesEntry()
                 ProcessStepTypeId.AWAIT_BPN_CREDENTIAL_RESPONSE,
                 A<IEnumerable<ApplicationChecklistEntryTypeId>?>._,
                 A<IEnumerable<ProcessStepTypeId>?>._))
-            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(Guid.Empty, new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.Empty, ApplicationChecklistEntryTypeId.BPNL_CREDENTIAL, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty, Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(Guid.Empty, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.Empty, ApplicationChecklistEntryTypeId.BPNL_CREDENTIAL, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty, Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
         SetupForProcessIssuerComponentResponse(entry);
 
         // Act
@@ -299,7 +299,7 @@ public async Task StoreBpnlCredential_WithUnsuccessful_UpdatesEntry()
                 ProcessStepTypeId.AWAIT_MEMBERSHIP_CREDENTIAL_RESPONSE,
                 A<IEnumerable<ApplicationChecklistEntryTypeId>?>._,
                 A<IEnumerable<ProcessStepTypeId>?>._))
-            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(Guid.Empty, new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.Empty, ApplicationChecklistEntryTypeId.MEMBERSHIP_CREDENTIAL, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty, Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(Guid.Empty, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.Empty, ApplicationChecklistEntryTypeId.MEMBERSHIP_CREDENTIAL, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty, Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
         SetupForProcessIssuerComponentResponse(entry);
 
         // Act
@@ -492,7 +492,7 @@ public async Task StoreMembershipCredential_WithSuccessful_UpdatesEntry()
                 ProcessStepTypeId.AWAIT_MEMBERSHIP_CREDENTIAL_RESPONSE,
                 A<IEnumerable<ApplicationChecklistEntryTypeId>?>._,
                 A<IEnumerable<ProcessStepTypeId>?>._))
-            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(Guid.Empty, new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.Empty, ApplicationChecklistEntryTypeId.MEMBERSHIP_CREDENTIAL, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty, Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(Guid.Empty, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.Empty, ApplicationChecklistEntryTypeId.MEMBERSHIP_CREDENTIAL, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty, Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
         SetupForProcessIssuerComponentResponse(entry);
 
         // Act
@@ -518,7 +518,7 @@ public async Task StoreMembershipCredential_WithUnsuccessful_UpdatesEntry()
                 ProcessStepTypeId.AWAIT_MEMBERSHIP_CREDENTIAL_RESPONSE,
                 A<IEnumerable<ApplicationChecklistEntryTypeId>?>._,
                 A<IEnumerable<ProcessStepTypeId>?>._))
-            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(Guid.Empty, new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.Empty, ApplicationChecklistEntryTypeId.MEMBERSHIP_CREDENTIAL, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty, Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(Guid.Empty, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.Empty, ApplicationChecklistEntryTypeId.MEMBERSHIP_CREDENTIAL, ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty, Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
         SetupForProcessIssuerComponentResponse(entry);
 
         // Act
diff --git a/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProvider.Library.Tests.csproj b/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProvider.Library.Tests.csproj
index b73a6724a3..e35b8e8f07 100644
--- a/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProvider.Library.Tests.csproj
+++ b/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProvider.Library.Tests.csproj
@@ -41,7 +41,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\externalsystems\OnboardingServiceProvider.Library\OnboardingServiceProvider.Library.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/externalsystems/SdFactory.Library.Tests/SdFactory.Library.Tests.csproj b/tests/externalsystems/SdFactory.Library.Tests/SdFactory.Library.Tests.csproj
index e7525c93d0..e5afe962a9 100644
--- a/tests/externalsystems/SdFactory.Library.Tests/SdFactory.Library.Tests.csproj
+++ b/tests/externalsystems/SdFactory.Library.Tests/SdFactory.Library.Tests.csproj
@@ -40,7 +40,6 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\..\src\externalsystems\SdFactory.Library\SdFactory.Library.csproj" />
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
 </Project>
diff --git a/tests/externalsystems/SdFactory.Library.Tests/SdFactoryBusinessLogicTests.cs b/tests/externalsystems/SdFactory.Library.Tests/SdFactoryBusinessLogicTests.cs
index 13ddc84c04..7a7c6457dc 100644
--- a/tests/externalsystems/SdFactory.Library.Tests/SdFactoryBusinessLogicTests.cs
+++ b/tests/externalsystems/SdFactory.Library.Tests/SdFactoryBusinessLogicTests.cs
@@ -41,7 +41,7 @@ public class SdFactoryBusinessLogicTests
     private const string CountryCode = "DE";
     private const string Bpn = "BPNL000000000009";
     private static readonly Guid ApplicationId = new("ac1cf001-7fbc-1f2f-817f-bce058020001");
-    private readonly Process<ProcessTypeId, ProcessStepTypeId> _process;
+    private readonly Process _process;
     private static readonly Guid CompanyId = new("b4697623-dd87-410d-abb8-6d4f4d87ab58");
 
     private static readonly IEnumerable<(UniqueIdentifierId Id, string Value)> UniqueIdentifiers = new List<(UniqueIdentifierId Id, string Value)>
@@ -67,7 +67,7 @@ public SdFactoryBusinessLogicTests()
         _fixture = new Fixture().Customize(new AutoFakeItEasyCustomization { ConfigureMembers = true });
         _fixture.ConfigureFixture();
 
-        _process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        _process = _fixture.Create<Process>();
 
         _documents = new HashSet<Document>();
         _applicationRepository = A.Fake<IApplicationRepository>();
@@ -548,7 +548,7 @@ private void SetupForProcessFinish(Company company, ApplicationChecklistEntry ap
             .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(ApplicationId, _process, Guid.NewGuid(),
                 ApplicationChecklistEntryTypeId.SELF_DESCRIPTION_LP,
                 ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty,
-                Enumerable.Empty<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()));
+                Enumerable.Empty<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()));
         A.CallTo(() => _checklistService.FinalizeChecklistEntryAndProcessSteps(
                 A<IApplicationChecklistService.ManualChecklistProcessStepData>._, A<Action<ApplicationChecklistEntry>>._, A<Action<ApplicationChecklistEntry>>._,
                 A<IEnumerable<ProcessStepTypeId>>._))
diff --git a/tests/maintenance/Maintenance.App.Tests/Maintenance.App.Tests.csproj b/tests/maintenance/Maintenance.App.Tests/Maintenance.App.Tests.csproj
index df18c48291..03257a9dca 100644
--- a/tests/maintenance/Maintenance.App.Tests/Maintenance.App.Tests.csproj
+++ b/tests/maintenance/Maintenance.App.Tests/Maintenance.App.Tests.csproj
@@ -44,11 +44,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.ProcessIdentity\Framework.Processes.ProcessIdentity.csproj" />
         <ProjectReference Include="..\..\..\src\maintenance\Maintenance.App\Maintenance.App.csproj" />
-        <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.Migrations\PortalBackend.Migrations.csproj" />
-        <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
 
diff --git a/tests/marketplace/Apps.Service.Tests/Apps.Service.Tests.csproj b/tests/marketplace/Apps.Service.Tests/Apps.Service.Tests.csproj
index 4f1913b3b5..8028f90e3a 100644
--- a/tests/marketplace/Apps.Service.Tests/Apps.Service.Tests.csproj
+++ b/tests/marketplace/Apps.Service.Tests/Apps.Service.Tests.csproj
@@ -41,12 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\..\src\marketplace\Apps.Service\Apps.Service.csproj" />
-    <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
-    <ProjectReference Include="..\..\..\src\web\Web.PublicInfos\Web.PublicInfos.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
-    <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/marketplace/Offer.Library.Web.Tests/Offer.Library.Web.Tests.csproj b/tests/marketplace/Offer.Library.Web.Tests/Offer.Library.Web.Tests.csproj
index b812ce2e88..0b34898cbc 100644
--- a/tests/marketplace/Offer.Library.Web.Tests/Offer.Library.Web.Tests.csproj
+++ b/tests/marketplace/Offer.Library.Web.Tests/Offer.Library.Web.Tests.csproj
@@ -40,8 +40,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\..\src\marketplace\Offers.Library.Web\Offers.Library.Web.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
diff --git a/tests/marketplace/Offers.Library.Tests/Offers.Library.Tests.csproj b/tests/marketplace/Offers.Library.Tests/Offers.Library.Tests.csproj
index 81be80c810..c0db3875d0 100644
--- a/tests/marketplace/Offers.Library.Tests/Offers.Library.Tests.csproj
+++ b/tests/marketplace/Offers.Library.Tests/Offers.Library.Tests.csproj
@@ -40,10 +40,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\..\src\marketplace\Offers.Library\Offers.Library.csproj" />
-    <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/marketplace/Offers.Library.Tests/Service/OfferSetupServiceTests.cs b/tests/marketplace/Offers.Library.Tests/Service/OfferSetupServiceTests.cs
index 92e8ff2bdf..6dceb33217 100644
--- a/tests/marketplace/Offers.Library.Tests/Service/OfferSetupServiceTests.cs
+++ b/tests/marketplace/Offers.Library.Tests/Service/OfferSetupServiceTests.cs
@@ -763,7 +763,7 @@ public async Task StartAutoSetupAsync_WithValidSingleInstance_ThrowsConflictExce
             .With(x => x.AppInstanceIds, [Guid.NewGuid()])
             .Create();
         var offerSubscriptionId = Guid.NewGuid();
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         var data = new OfferAutoSetupData(offerSubscriptionId, "https://www.test.de");
         A.CallTo(() => _offerSubscriptionsRepository.GetOfferDetailsAndCheckProviderCompany(offerSubscriptionId, _companyId, offerTypeId))
             .Returns(transferData);
@@ -774,7 +774,7 @@ public async Task StartAutoSetupAsync_WithValidSingleInstance_ThrowsConflictExce
                 ProcessStepTypeId.AWAIT_START_AUTOSETUP,
                 process,
                 [
-                    new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.AWAIT_START_AUTOSETUP, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.Now)
+                    new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.AWAIT_START_AUTOSETUP, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.Now)
                 ],
                 _portalRepositories));
 
@@ -799,7 +799,7 @@ public async Task StartAutoSetupAsync_WithValidMultiInstance_ReturnsExpected(Off
             .With(x => x.AppInstanceIds, [Guid.NewGuid(), Guid.NewGuid()])
             .Create();
         var offerSubscriptionId = Guid.NewGuid();
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         var data = new OfferAutoSetupData(offerSubscriptionId, "https://www.test.de");
         A.CallTo(() => _offerSubscriptionsRepository.GetOfferDetailsAndCheckProviderCompany(offerSubscriptionId, _companyId, offerTypeId))
             .Returns(transferData);
@@ -810,7 +810,7 @@ public async Task StartAutoSetupAsync_WithValidMultiInstance_ReturnsExpected(Off
                 ProcessStepTypeId.AWAIT_START_AUTOSETUP,
                 process,
                 [
-                    new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.AWAIT_START_AUTOSETUP, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.Now)
+                    new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.AWAIT_START_AUTOSETUP, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.Now)
                 ],
                 _portalRepositories));
 
@@ -918,11 +918,11 @@ public async Task CreateSingleInstanceSubscriptionDetail_WithWrongCompanyId_Thro
     public async Task CreateSingleInstanceSubscriptionDetail_WithValidData_ReturnsExpected()
     {
         // Arrange
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         var manualProcessStepData = new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(
             ProcessStepTypeId.SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION,
             process,
-            Enumerable.Repeat(new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(),
+            Enumerable.Repeat(new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(),
                 ProcessStepTypeId.SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION, ProcessStepStatusId.TODO, process.Id,
                 DateTimeOffset.UtcNow), 1),
             _portalRepositories);
@@ -1237,12 +1237,12 @@ public async Task ActivateSubscription_WithValidData_ReturnsExpected()
     {
         // Arrange
         var offerSubscription = new OfferSubscription(Guid.NewGuid(), _validOfferId, CompanyUserCompanyId, OfferSubscriptionStatusId.PENDING, _companyUserId, default);
-        var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, ProcessStepStatusId.TODO, Guid.NewGuid(), DateTimeOffset.Now);
+        var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, ProcessStepStatusId.TODO, Guid.NewGuid(), DateTimeOffset.Now);
 
         A.CallTo(() => _offerSubscriptionsRepository.CheckOfferSubscriptionForProvider(offerSubscription.Id, _companyId))
             .Returns(true);
         A.CallTo(() => _offerSubscriptionProcessService.VerifySubscriptionAndProcessSteps(offerSubscription.Id, ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, null, true))
-            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), [processStep], _portalRepositories));
+            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, _fixture.Create<Process>(), [processStep], _portalRepositories));
 
         // Act
         await _sut.TriggerActivateSubscription(offerSubscription.Id);
@@ -1282,14 +1282,14 @@ public async Task ActivateSingleInstanceSubscription_WithValidData_ReturnsExpect
         // Arrange
         var offerSubscription = new OfferSubscription(Guid.NewGuid(), _validOfferId, CompanyUserCompanyId, OfferSubscriptionStatusId.PENDING, _companyUserId, default);
         var offerSubscriptionProcessDataId = Guid.NewGuid();
-        var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, ProcessStepStatusId.TODO, Guid.NewGuid(), DateTimeOffset.Now);
+        var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, ProcessStepStatusId.TODO, Guid.NewGuid(), DateTimeOffset.Now);
 
         A.CallTo(() => _notificationService.CreateNotificationsWithExistenceCheck(A<IEnumerable<UserRoleConfig>>._, null, A<IEnumerable<(string?, NotificationTypeId)>>._, A<Guid>._, A<string>._, A<string>._, A<bool?>._))
             .Returns(new[] { Guid.NewGuid() }.AsFakeIAsyncEnumerable(out var createNotificationsEnumerator));
         A.CallTo(() => _offerSubscriptionsRepository.GetSubscriptionActivationDataByIdAsync(offerSubscription.Id))
             .Returns(new SubscriptionActivationData(_validOfferId, OfferSubscriptionStatusId.PENDING, OfferTypeId.APP, "Test App", "Stark Industries", _companyId, requesterEmail, "Tony", "Stark", Guid.NewGuid(), new(true, null), [Guid.NewGuid()], offerSubscriptionProcessDataId, Guid.NewGuid(), _companyId, null, Enumerable.Empty<string>(), true));
         A.CallTo(() => _offerSubscriptionProcessService.VerifySubscriptionAndProcessSteps(offerSubscription.Id, ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, null, true))
-            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), [processStep], _portalRepositories));
+            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, _fixture.Create<Process>(), [processStep], _portalRepositories));
 
         A.CallTo(() => _notificationRepository.CheckNotificationExistsForParam(A<Guid>._, A<NotificationTypeId>._, A<string>._, A<string>._))
             .Returns(false);
@@ -1343,7 +1343,7 @@ public async Task ActivateMultipleInstancesSubscription_WithValidData_ReturnsExp
         // Arrange
         var offerSubscription = new OfferSubscription(Guid.NewGuid(), _validOfferId, CompanyUserCompanyId, OfferSubscriptionStatusId.PENDING, _companyUserId, default);
         var offerSubscriptionProcessDataId = Guid.NewGuid();
-        var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, ProcessStepStatusId.TODO, Guid.NewGuid(), DateTimeOffset.Now);
+        var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, ProcessStepStatusId.TODO, Guid.NewGuid(), DateTimeOffset.Now);
 
         var clientClientId = _fixture.Create<string>();
         var serviceAccountClientIds = _fixture.CreateMany<string>().ToImmutableArray();
@@ -1353,7 +1353,7 @@ public async Task ActivateMultipleInstancesSubscription_WithValidData_ReturnsExp
         A.CallTo(() => _offerSubscriptionsRepository.GetSubscriptionActivationDataByIdAsync(offerSubscription.Id))
             .Returns(new SubscriptionActivationData(_validOfferId, OfferSubscriptionStatusId.PENDING, OfferTypeId.APP, "Test App", "Stark Industries", _companyId, requesterEmail, "Tony", "Stark", Guid.NewGuid(), new(false, null), [Guid.NewGuid()], offerSubscriptionProcessDataId, Guid.NewGuid(), _companyId, clientClientId, serviceAccountClientIds, hasCallbackUrl));
         A.CallTo(() => _offerSubscriptionProcessService.VerifySubscriptionAndProcessSteps(offerSubscription.Id, ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, null, true))
-            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), [processStep], _portalRepositories));
+            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.ACTIVATE_SUBSCRIPTION, _fixture.Create<Process>(), [processStep], _portalRepositories));
 
         A.CallTo(() => _notificationRepository.CheckNotificationExistsForParam(A<Guid>._, A<NotificationTypeId>._, A<string>._, A<string>._))
             .Returns(false);
@@ -1417,9 +1417,9 @@ public async Task TriggerActivateSubscription_WithCompanyNotProvider_ThrowsNotFo
         var offerSubscriptionId = Guid.NewGuid();
         var processStepId = Guid.NewGuid();
         var processId = Guid.NewGuid();
-        var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
+        var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
         A.CallTo(() => _offerSubscriptionProcessService.VerifySubscriptionAndProcessSteps(offerSubscriptionId, ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, null, true))
-            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), [processStep], _portalRepositories));
+            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, _fixture.Create<Process>(), [processStep], _portalRepositories));
         A.CallTo(() => _offerSubscriptionsRepository.CheckOfferSubscriptionForProvider(offerSubscriptionId, _identityService.IdentityData.CompanyId))
             .Returns(false);
 
@@ -1438,9 +1438,9 @@ public async Task TriggerActivateSubscription_WithNotExistingOfferSubscription_T
         var offerSubscriptionId = Guid.NewGuid();
         var processStepId = Guid.NewGuid();
         var processId = Guid.NewGuid();
-        var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
+        var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, ProcessStepStatusId.TODO, processId, DateTimeOffset.Now);
         A.CallTo(() => _offerSubscriptionProcessService.VerifySubscriptionAndProcessSteps(offerSubscriptionId, ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, null, true))
-            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>(), [processStep], _portalRepositories));
+            .Returns(new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(ProcessStepTypeId.MANUAL_TRIGGER_ACTIVATE_SUBSCRIPTION, _fixture.Create<Process>(), [processStep], _portalRepositories));
         A.CallTo(() => _offerSubscriptionsRepository.CheckOfferSubscriptionForProvider(offerSubscriptionId, _identityService.IdentityData.CompanyId))
             .Returns(true);
 
diff --git a/tests/marketplace/Services.Service.Tests/Services.Service.Tests.csproj b/tests/marketplace/Services.Service.Tests/Services.Service.Tests.csproj
index bb59996a31..050933ed57 100644
--- a/tests/marketplace/Services.Service.Tests/Services.Service.Tests.csproj
+++ b/tests/marketplace/Services.Service.Tests/Services.Service.Tests.csproj
@@ -42,11 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\..\src\marketplace\Services.Service\Services.Service.csproj" />
-    <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
-    <ProjectReference Include="..\..\..\src\web\Web.PublicInfos\Web.PublicInfos.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/notifications/Notifications.Library.Tests/Notifications.Library.Tests.csproj b/tests/notifications/Notifications.Library.Tests/Notifications.Library.Tests.csproj
index b869fdd9ec..c2482f176c 100644
--- a/tests/notifications/Notifications.Library.Tests/Notifications.Library.Tests.csproj
+++ b/tests/notifications/Notifications.Library.Tests/Notifications.Library.Tests.csproj
@@ -41,9 +41,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\..\src\notifications\Notifications.Library\Notifications.Library.csproj" />
-        <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
 
diff --git a/tests/notifications/Notifications.Service.Tests/Notifications.Service.Tests.csproj b/tests/notifications/Notifications.Service.Tests/Notifications.Service.Tests.csproj
index d1076134ff..a49e321512 100644
--- a/tests/notifications/Notifications.Service.Tests/Notifications.Service.Tests.csproj
+++ b/tests/notifications/Notifications.Service.Tests/Notifications.Service.Tests.csproj
@@ -41,10 +41,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-      <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\..\src\notifications\Notifications.Service\Notifications.Service.csproj" />
-      <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
       <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
 
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/LockableProcessEntityTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/LockableProcessEntityTests.cs
index 0a6a51c11a..90cb72d170 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/LockableProcessEntityTests.cs
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/LockableProcessEntityTests.cs
@@ -19,8 +19,8 @@
 
 using Microsoft.EntityFrameworkCore;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Tests.Setup;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Xunit.Extensions.AssemblyFixture;
 
@@ -56,7 +56,7 @@ public async Task IsLocked_ReturnsExpected()
     {
         var (processId, _, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         var result = process!.IsLocked();
         result.Should().BeFalse();
@@ -68,7 +68,7 @@ public async Task ReleaseLock_ReturnsExpected()
     {
         var (processId, _, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         var result = process!.ReleaseLock();
         result.Should().BeFalse();
@@ -80,7 +80,7 @@ public async Task UpdateVersion_UpdateVersion_ReturnsExpected()
     {
         var (processId, version, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         process!.UpdateVersion();
         process!.Version.Should().NotBe(version);
@@ -88,7 +88,7 @@ public async Task UpdateVersion_UpdateVersion_ReturnsExpected()
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
 
-        var updated = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var updated = await context.FindAsync<Process>(processId);
         updated.Should().NotBeNull();
         updated!.Version.Should().Be(process.Version);
         updated.UpdateVersion();
@@ -97,7 +97,7 @@ public async Task UpdateVersion_UpdateVersion_ReturnsExpected()
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
 
-        var result = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var result = await context.FindAsync<Process>(processId);
         result.Should().NotBeNull();
         result!.Version.Should().Be(updated.Version);
     }
@@ -107,7 +107,7 @@ public async Task TryLock_IsLocked_ReturnsExpected()
     {
         var (processId, version, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         var isLocked = process!.TryLock(_soon);
         isLocked.Should().BeTrue();
@@ -115,7 +115,7 @@ public async Task TryLock_IsLocked_ReturnsExpected()
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
 
-        var locked = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var locked = await context.FindAsync<Process>(processId);
         locked.Should().NotBeNull();
         locked!.Version.Should().Be(process.Version);
         var result = locked.IsLocked();
@@ -131,7 +131,7 @@ public async Task IsLockExpired_ReturnsExpected(TimeFrame timeFrame, bool expect
     {
         var (processId, version, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         process!.Version.Should().Be(version);
         var result = process.IsLockExpired(GetDateTimeOffset(timeFrame)!.Value);
@@ -147,7 +147,7 @@ public async Task TryLock_IsLockExpired_ReturnsExpected(TimeFrame timeFrame, boo
     {
         var (processId, version, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         var isLocked = process!.TryLock(_soon);
         isLocked.Should().BeTrue();
@@ -155,7 +155,7 @@ public async Task TryLock_IsLockExpired_ReturnsExpected(TimeFrame timeFrame, boo
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
 
-        var locked = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var locked = await context.FindAsync<Process>(processId);
         locked.Should().NotBeNull();
         locked!.Version.Should().Be(process.Version);
         var result = locked.IsLockExpired(GetDateTimeOffset(timeFrame)!.Value);
@@ -168,7 +168,7 @@ public async Task TryLock_TryLock_ReturnsExpected()
     {
         var (processId, version, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         var isLocked = process!.TryLock(_soon);
         isLocked.Should().BeTrue();
@@ -176,7 +176,7 @@ public async Task TryLock_TryLock_ReturnsExpected()
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
 
-        var locked = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var locked = await context.FindAsync<Process>(processId);
         locked.Should().NotBeNull();
         locked!.Version.Should().Be(process.Version);
         var result = locked.TryLock(_soon);
@@ -190,7 +190,7 @@ public async Task TryLock_ReleaseLock_ReturnsExpected()
     {
         var (processId, version, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         var isLocked = process!.TryLock(_soon);
         isLocked.Should().BeTrue();
@@ -198,7 +198,7 @@ public async Task TryLock_ReleaseLock_ReturnsExpected()
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
 
-        var locked = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var locked = await context.FindAsync<Process>(processId);
         locked.Should().NotBeNull();
         locked!.Version.Should().Be(process.Version);
         var isReleased = locked.ReleaseLock();
@@ -214,14 +214,14 @@ public async Task UpdateWithParallelUpdate_Throws()
     {
         var (processId, version, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         process!.UpdateVersion();
         process!.Version.Should().NotBe(version);
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
 
-        var parallel = context.Attach(new Process<ProcessTypeId, ProcessStepTypeId>(processId, default, version)).Entity;
+        var parallel = context.Attach(new Process(processId, default, version)).Entity;
         parallel!.Version.Should().NotBe(process.Version);
         parallel.UpdateVersion();
         parallel!.Version.Should().NotBe(version);
@@ -235,14 +235,14 @@ public async Task UpdateWithParallelLock_Throws()
     {
         var (processId, version, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         process!.UpdateVersion();
         process!.Version.Should().NotBe(version);
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
 
-        var parallel = context.Attach(new Process<ProcessTypeId, ProcessStepTypeId>(processId, default, version)).Entity;
+        var parallel = context.Attach(new Process(processId, default, version)).Entity;
         parallel!.Version.Should().NotBe(process.Version);
         var isReLocked = parallel.TryLock(_soon);
         isReLocked.Should().BeTrue();
@@ -257,7 +257,7 @@ public async Task LockWithParallelUpdate_Throws()
     {
         var (processId, version, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         var locked = process!.TryLock(_soon);
         locked.Should().BeTrue();
@@ -265,7 +265,7 @@ public async Task LockWithParallelUpdate_Throws()
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
 
-        var parallel = context.Attach(new Process<ProcessTypeId, ProcessStepTypeId>(processId, default, version)).Entity;
+        var parallel = context.Attach(new Process(processId, default, version)).Entity;
         parallel!.Version.Should().NotBe(process.Version);
         parallel.UpdateVersion();
         parallel!.Version.Should().NotBe(version);
@@ -279,7 +279,7 @@ public async Task LockWithParallelLock_Throws()
     {
         var (processId, version, context) = await CreateProcessAndContext();
 
-        var process = await context.FindAsync<Process<ProcessTypeId, ProcessStepTypeId>>(processId);
+        var process = await context.FindAsync<Process>(processId);
         process.Should().NotBeNull();
         var isLocked = process!.TryLock(_soon);
         isLocked.Should().BeTrue();
@@ -287,7 +287,7 @@ public async Task LockWithParallelLock_Throws()
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
 
-        var parallel = context.Attach(new Process<ProcessTypeId, ProcessStepTypeId>(processId, default, version)).Entity;
+        var parallel = context.Attach(new Process(processId, default, version)).Entity;
         parallel!.Version.Should().NotBe(process.Version);
         var isReLocked = parallel.TryLock(_soon);
         isReLocked.Should().BeTrue();
@@ -320,7 +320,7 @@ public enum TimeFrame
     private async Task<(Guid Id, Guid Version, DbContext Context)> CreateProcessAndContext()
     {
         var context = await _dbTestDbFixture.GetPortalDbContext();
-        var process = context.Add(new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid())).Entity;
+        var process = context.Add(new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid())).Entity;
         await context.SaveChangesAsync();
         context.ChangeTracker.Clear();
         return (process.Id, process.Version, context);
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj b/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj
index 0acecd9a0e..d76b047140 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj
@@ -42,13 +42,9 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Async\Framework.Async.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
-    <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.Migrations\PortalBackend.Migrations.csproj" />
-    <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
+    <ProjectReference Include="..\..\..\src\framework\Framework.Async\Framework.Async.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/ProcessStepRepositoryTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/ProcessStepRepositoryTests.cs
index e9af644540..72afb120b5 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/ProcessStepRepositoryTests.cs
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/ProcessStepRepositoryTests.cs
@@ -24,6 +24,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Tests.Setup;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using System.Collections.Immutable;
 using Xunit.Extensions.AssemblyFixture;
@@ -63,9 +64,9 @@ public async Task CreateProcess_CreatesSuccessfully()
             .And.AllSatisfy(x =>
             {
                 x.State.Should().Be(EntityState.Added);
-                x.Entity.Should().BeOfType<Process<ProcessTypeId, ProcessStepTypeId>>();
+                x.Entity.Should().BeOfType<Process>();
             });
-        changeTracker.Entries().Select(x => x.Entity).Cast<Process<ProcessTypeId, ProcessStepTypeId>>()
+        changeTracker.Entries().Select(x => x.Entity).Cast<Process>()
             .Should().Satisfy(
                 x => x.Id == result.Id && x.ProcessTypeId == ProcessTypeId.APPLICATION_CHECKLIST
             );
@@ -95,9 +96,9 @@ public async Task CreateProcessStepRange_CreateSuccessfully()
             .And.AllSatisfy(x =>
             {
                 x.State.Should().Be(EntityState.Added);
-                x.Entity.Should().BeOfType<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+                x.Entity.Should().BeOfType<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
             });
-        changeTracker.Entries().Select(x => x.Entity).Cast<ProcessStep<ProcessTypeId, ProcessStepTypeId>>()
+        changeTracker.Entries().Select(x => x.Entity).Cast<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>()
             .Should().Satisfy(
                 x => x.Id == result.ElementAt(0).Id && x.ProcessId == processId && x.ProcessStepTypeId == processStepTypeIds[0] && x.ProcessStepStatusId == ProcessStepStatusId.TODO,
                 x => x.Id == result.ElementAt(1).Id && x.ProcessId == processId && x.ProcessStepTypeId == processStepTypeIds[1] && x.ProcessStepStatusId == ProcessStepStatusId.TODO,
@@ -135,7 +136,7 @@ public async Task AttachAndModifyProcessStep_WithExistingProcessStep_UpdatesStat
         changedEntries.Should().HaveCount(1);
         var changedEntity = changedEntries.Single();
         changedEntity.State.Should().Be(EntityState.Modified);
-        changedEntity.Entity.Should().BeOfType<ProcessStep<ProcessTypeId, ProcessStepTypeId>>().Which.ProcessStepStatusId.Should().Be(ProcessStepStatusId.DONE);
+        changedEntity.Entity.Should().BeOfType<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>().Which.ProcessStepStatusId.Should().Be(ProcessStepStatusId.DONE);
     }
 
     #endregion
@@ -146,7 +147,7 @@ public async Task AttachAndModifyProcessStep_WithExistingProcessStep_UpdatesStat
     public async Task AttachAndModifyProcessSteps_UpdatesStatus()
     {
         // Arrange
-        var stepData = _fixture.CreateMany<(Guid ProcessStepId, ProcessStep<ProcessTypeId, ProcessStepTypeId> InitialStep, ProcessStep<ProcessTypeId, ProcessStepTypeId> ModifiedStep)>(5).ToImmutableArray();
+        var stepData = _fixture.CreateMany<(Guid ProcessStepId, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId> InitialStep, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId> ModifiedStep)>(5).ToImmutableArray();
 
         var (sut, dbContext) = await CreateSutWithContext();
 
@@ -171,7 +172,7 @@ public async Task AttachAndModifyProcessSteps_UpdatesStatus()
         var changedEntries = changeTracker.Entries().ToList();
         changeTracker.HasChanges().Should().BeTrue();
         changedEntries.Should().HaveCount(5).And.AllSatisfy(entry => entry.State.Should().Be(EntityState.Modified));
-        changedEntries.Select(entry => entry.Entity).Should().AllBeOfType<ProcessStep<ProcessTypeId, ProcessStepTypeId>>().Which.Should().Satisfy(
+        changedEntries.Select(entry => entry.Entity).Should().AllBeOfType<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>().Which.Should().Satisfy(
             step => step.Id == stepData[0].ProcessStepId && step.ProcessStepStatusId == stepData[0].ModifiedStep.ProcessStepStatusId && step.DateLastChanged == stepData[0].ModifiedStep.DateLastChanged && step.Message == stepData[0].ModifiedStep.Message,
             step => step.Id == stepData[1].ProcessStepId && step.ProcessStepStatusId == stepData[1].ModifiedStep.ProcessStepStatusId && step.DateLastChanged == stepData[1].ModifiedStep.DateLastChanged && step.Message == stepData[1].ModifiedStep.Message,
             step => step.Id == stepData[2].ProcessStepId && step.ProcessStepStatusId == stepData[2].ModifiedStep.ProcessStepStatusId && step.DateLastChanged == stepData[2].ModifiedStep.DateLastChanged && step.Message == stepData[2].ModifiedStep.Message,
@@ -184,7 +185,7 @@ public async Task AttachAndModifyProcessSteps_UpdatesStatus()
     public async Task AttachAndModifyProcessSteps_WithUnmodifiedData_SkipsUpdateStatus()
     {
         // Arrange
-        var stepData = _fixture.CreateMany<(Guid ProcessStepId, ProcessStep<ProcessTypeId, ProcessStepTypeId> InitialStep)>(5).ToImmutableArray();
+        var stepData = _fixture.CreateMany<(Guid ProcessStepId, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId> InitialStep)>(5).ToImmutableArray();
 
         var (sut, dbContext) = await CreateSutWithContext();
 
@@ -207,7 +208,7 @@ public async Task AttachAndModifyProcessSteps_WithUnmodifiedData_SkipsUpdateStat
         var changedEntries = changeTracker.Entries().ToList();
         changeTracker.HasChanges().Should().BeFalse();
         changedEntries.Should().HaveCount(5).And.AllSatisfy(entry => entry.State.Should().Be(EntityState.Unchanged));
-        changedEntries.Select(entry => entry.Entity).Should().AllBeOfType<ProcessStep<ProcessTypeId, ProcessStepTypeId>>().Which.Should().Satisfy(
+        changedEntries.Select(entry => entry.Entity).Should().AllBeOfType<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>().Which.Should().Satisfy(
             step => step.Id == stepData[0].ProcessStepId && step.ProcessStepStatusId == stepData[0].InitialStep.ProcessStepStatusId && step.DateLastChanged == stepData[0].InitialStep.DateLastChanged && step.Message == stepData[0].InitialStep.Message,
             step => step.Id == stepData[1].ProcessStepId && step.ProcessStepStatusId == stepData[1].InitialStep.ProcessStepStatusId && step.DateLastChanged == stepData[1].InitialStep.DateLastChanged && step.Message == stepData[1].InitialStep.Message,
             step => step.Id == stepData[2].ProcessStepId && step.ProcessStepStatusId == stepData[2].InitialStep.ProcessStepStatusId && step.DateLastChanged == stepData[2].InitialStep.DateLastChanged && step.Message == stepData[2].InitialStep.Message,
@@ -220,7 +221,7 @@ public async Task AttachAndModifyProcessSteps_WithUnmodifiedData_SkipsUpdateStat
     public async Task AttachAndModifyProcessSteps_WithUnmodifiedData_UpdatesLastChanged()
     {
         // Arrange
-        var stepData = _fixture.CreateMany<(Guid ProcessStepId, ProcessStep<ProcessTypeId, ProcessStepTypeId> InitialStep)>(5).ToImmutableArray();
+        var stepData = _fixture.CreateMany<(Guid ProcessStepId, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId> InitialStep)>(5).ToImmutableArray();
 
         var (sut, dbContext) = await CreateSutWithContext();
 
@@ -240,7 +241,7 @@ public async Task AttachAndModifyProcessSteps_WithUnmodifiedData_UpdatesLastChan
         var changedEntries = changeTracker.Entries().ToList();
         changeTracker.HasChanges().Should().BeTrue();
         changedEntries.Should().HaveCount(5).And.AllSatisfy(entry => entry.State.Should().Be(EntityState.Modified));
-        changedEntries.Select(entry => entry.Entity).Should().AllBeOfType<ProcessStep<ProcessTypeId, ProcessStepTypeId>>().Which.Should().Satisfy(
+        changedEntries.Select(entry => entry.Entity).Should().AllBeOfType<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>().Which.Should().Satisfy(
             step => step.Id == stepData[0].ProcessStepId && step.ProcessStepStatusId == stepData[0].InitialStep.ProcessStepStatusId && step.DateLastChanged != stepData[0].InitialStep.DateLastChanged && step.Message == stepData[0].InitialStep.Message,
             step => step.Id == stepData[1].ProcessStepId && step.ProcessStepStatusId == stepData[1].InitialStep.ProcessStepStatusId && step.DateLastChanged != stepData[1].InitialStep.DateLastChanged && step.Message == stepData[1].InitialStep.Message,
             step => step.Id == stepData[2].ProcessStepId && step.ProcessStepStatusId == stepData[2].InitialStep.ProcessStepStatusId && step.DateLastChanged != stepData[2].InitialStep.DateLastChanged && step.Message == stepData[2].InitialStep.Message,
@@ -366,17 +367,17 @@ public async Task IsValidProcess_WithNotExistingProcess_ReturnsExpected()
 
     #endregion
 
-    private async Task<(ProcessStepRepository<Process<ProcessTypeId, ProcessStepTypeId>, ProcessStep<ProcessTypeId, ProcessStepTypeId>, ProcessStepStatus<ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId> sut, PortalDbContext dbContext)> CreateSutWithContext()
+    private async Task<(ProcessStepRepository<Process, ProcessType<Process, ProcessTypeId>, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>, ProcessStepType<Process, ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId> sut, PortalDbContext dbContext)> CreateSutWithContext()
     {
         var context = await _dbTestDbFixture.GetPortalDbContext();
-        var sut = new ProcessStepRepository<Process<ProcessTypeId, ProcessStepTypeId>, ProcessStep<ProcessTypeId, ProcessStepTypeId>, ProcessStepStatus<ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>(new PortalProcessDbContextAccess(context));
+        var sut = new ProcessStepRepository<Process, ProcessType<Process, ProcessTypeId>, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>, ProcessStepType<Process, ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>(new PortalProcessDbContextAccess(context));
         return (sut, context);
     }
 
-    private async Task<ProcessStepRepository<Process<ProcessTypeId, ProcessStepTypeId>, ProcessStep<ProcessTypeId, ProcessStepTypeId>, ProcessStepStatus<ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>> CreateSut()
+    private async Task<ProcessStepRepository<Process, ProcessType<Process, ProcessTypeId>, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>, ProcessStepType<Process, ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>> CreateSut()
     {
         var context = await _dbTestDbFixture.GetPortalDbContext();
-        var sut = new ProcessStepRepository<Process<ProcessTypeId, ProcessStepTypeId>, ProcessStep<ProcessTypeId, ProcessStepTypeId>, ProcessStepStatus<ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>(new PortalProcessDbContextAccess(context));
+        var sut = new ProcessStepRepository<Process, ProcessType<Process, ProcessTypeId>, ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>, ProcessStepType<Process, ProcessTypeId, ProcessStepTypeId>, ProcessTypeId, ProcessStepTypeId>(new PortalProcessDbContextAccess(context));
         return sut;
     }
 }
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/companies.unittest.json b/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/companies.unittest.json
index c7fb3d342e..79959e6335 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/companies.unittest.json
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/companies.unittest.json
@@ -65,7 +65,7 @@
     "date_created": "2022-03-24 18:01:33.438000 +00:00",
     "business_partner_number": "BPNL00000003LLHN",
     "name": "Security Companies",
-    "shortname": "Security Companirs",
+    "shortname": "Security Companies",
     "company_status_id": 1,
     "address_id": "86da3e1c-a634-41a6-ad44-9880746123e4",
     "self_description_document_id": null
diff --git a/tests/portalbackend/PortalBackend.Migrations.Tests/PortalBackend.Migrations.Tests.csproj b/tests/portalbackend/PortalBackend.Migrations.Tests/PortalBackend.Migrations.Tests.csproj
index 5e1c829fd3..5c774afe60 100644
--- a/tests/portalbackend/PortalBackend.Migrations.Tests/PortalBackend.Migrations.Tests.csproj
+++ b/tests/portalbackend/PortalBackend.Migrations.Tests/PortalBackend.Migrations.Tests.csproj
@@ -43,7 +43,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.Migrations\PortalBackend.Migrations.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
diff --git a/tests/portalbackend/PortalBackend.Migrations.Tests/TestDataDbFixture.cs b/tests/portalbackend/PortalBackend.Migrations.Tests/TestDataDbFixture.cs
index b163f67aa9..b826b48a74 100644
--- a/tests/portalbackend/PortalBackend.Migrations.Tests/TestDataDbFixture.cs
+++ b/tests/portalbackend/PortalBackend.Migrations.Tests/TestDataDbFixture.cs
@@ -63,8 +63,7 @@ public PortalDbContext GetPortalDbContext()
     /// </summary>
     public async Task InitializeAsync()
     {
-        await _container.StartAsync()
-            ;
+        await _container.StartAsync();
 
         var optionsBuilder = new DbContextOptionsBuilder<PortalDbContext>();
 
@@ -78,8 +77,8 @@ await _container.StartAsync()
 
         var seederOptions = Options.Create(new SeederSettings
         {
-            TestDataEnvironments = new[] { "test" },
-            DataPaths = new[] { "Seeder/Data", "Seeder/Data/overwrite" }
+            TestDataEnvironments = ["test"],
+            DataPaths = ["Seeder/Data", "Seeder/Data/overwrite"]
         });
         var insertSeeder = new BatchInsertSeeder(context,
             LoggerFactory.Create(builder => builder.AddConsole()).CreateLogger<BatchInsertSeeder>(),
@@ -94,7 +93,6 @@ await _container.StartAsync()
     /// <inheritdoc />
     public async Task DisposeAsync()
     {
-        await _container.DisposeAsync()
-            ;
+        await _container.DisposeAsync();
     }
 }
diff --git a/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklist.Executor.Tests.csproj b/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklist.Executor.Tests.csproj
index 811ef5c807..f5a32144da 100644
--- a/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklist.Executor.Tests.csproj
+++ b/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklist.Executor.Tests.csproj
@@ -39,9 +39,7 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
-        <ProjectReference Include="..\..\..\src\processes\Processes.Worker\Processes.Worker.csproj" />
+        <ProjectReference Include="..\..\..\src\processes\ApplicationChecklist.Executor\ApplicationChecklist.Executor.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
 </Project>
diff --git a/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklist.Library.Tests.csproj b/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklist.Library.Tests.csproj
index 76a522563f..c04fcf67c6 100644
--- a/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklist.Library.Tests.csproj
+++ b/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklist.Library.Tests.csproj
@@ -39,7 +39,6 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-      <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\..\src\processes\ApplicationChecklist.Library\ApplicationChecklist.Library.csproj" />
       <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
diff --git a/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistServiceTests.cs b/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistServiceTests.cs
index 1792ab9bf5..a4cc976958 100644
--- a/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistServiceTests.cs
+++ b/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistServiceTests.cs
@@ -65,7 +65,7 @@ public async Task VerifyChecklistEntryAndProcessSteps()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var entryTypeId = _fixture.Create<ApplicationChecklistEntryTypeId>();
         var entryStatusIds = _fixture.CreateMany<ApplicationChecklistEntryStatusId>(Enum.GetValues<ApplicationChecklistEntryStatusId>().Length - 1).ToImmutableArray();
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
@@ -76,13 +76,13 @@ public async Task VerifyChecklistEntryAndProcessSteps()
         var comment = "Test Purpose";
 
         IEnumerable<(ApplicationChecklistEntryTypeId, ApplicationChecklistEntryStatusId, string?)>? checklistData = null;
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? processSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? processSteps = null;
 
         A.CallTo(() => _applicationChecklistRepository.GetChecklistProcessStepData(A<Guid>._, A<IEnumerable<ApplicationChecklistEntryTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._))
             .ReturnsLazily((Guid appId, IEnumerable<ApplicationChecklistEntryTypeId> entryTypes, IEnumerable<ProcessStepTypeId> processStepTypes) =>
             {
                 checklistData = entryTypes.Zip(ProduceEntryStatusIds(entryStatusIds), (typeId, statusId) => (typeId, statusId, comment)).ToImmutableArray();
-                processSteps = processStepTypes.Select(typeId => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), typeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)).ToImmutableArray();
+                processSteps = processStepTypes.Select(typeId => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), typeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)).ToImmutableArray();
                 return applicationId == appId ?
                     new VerifyChecklistData(
                     true,
@@ -141,7 +141,7 @@ public async Task VerifyChecklistEntry_LockedProcess_Throws()
         // Arrange
         var applicationId = Guid.NewGuid();
         var lockExpiryDate = DateTimeOffset.UtcNow;
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()) { LockExpiryDate = lockExpiryDate };
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()) { LockExpiryDate = lockExpiryDate };
         var entryTypeId = _fixture.Create<ApplicationChecklistEntryTypeId>();
         var entryStatusIds = _fixture.CreateMany<ApplicationChecklistEntryStatusId>(Enum.GetValues<ApplicationChecklistEntryStatusId>().Length - 1).ToImmutableArray();
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
@@ -190,7 +190,7 @@ public async Task VerifyChecklistEntry_InvalidApplicationStatus_Throws()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var entryTypeId = _fixture.Create<ApplicationChecklistEntryTypeId>();
         var entryStatusIds = _fixture.CreateMany<ApplicationChecklistEntryStatusId>(Enum.GetValues<ApplicationChecklistEntryStatusId>().Length - 1).ToImmutableArray();
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
@@ -215,7 +215,7 @@ public async Task VerifyChecklistEntry_UnexpectedEntryData_Throws()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var entryTypeId = _fixture.Create<ApplicationChecklistEntryTypeId>();
         var entryStatusIds = _fixture.CreateMany<ApplicationChecklistEntryStatusId>(1).ToImmutableArray();
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
@@ -223,7 +223,7 @@ public async Task VerifyChecklistEntry_UnexpectedEntryData_Throws()
         IEnumerable<ProcessStepTypeId>? processStepTypeIds = null;
 
         var entryData = Enum.GetValues<ApplicationChecklistEntryTypeId>().Except(new[] { entryTypeId }).Select(entryTypeId => (entryTypeId, entryStatusIds.First(), "Test Purpose")).ToImmutableArray();
-        var processSteps = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) };
+        var processSteps = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) };
 
         A.CallTo(() => _applicationChecklistRepository.GetChecklistProcessStepData(A<Guid>._, A<IEnumerable<ApplicationChecklistEntryTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns(new VerifyChecklistData(true, process, entryData, processSteps));
@@ -242,7 +242,7 @@ public async Task VerifyChecklistEntry_UnexpectedQueryResult_Throws()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var entryTypeId = _fixture.Create<ApplicationChecklistEntryTypeId>();
         var entryStatusIds = _fixture.CreateMany<ApplicationChecklistEntryStatusId>(1).ToImmutableArray();
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
@@ -266,7 +266,7 @@ public async Task VerifyChecklistEntry_UnexpectedEntryStatusData_Throws()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var entryTypeId = _fixture.Create<ApplicationChecklistEntryTypeId>();
         var entryStatusIds = _fixture.CreateMany<ApplicationChecklistEntryStatusId>(1).ToImmutableArray();
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
@@ -274,7 +274,7 @@ public async Task VerifyChecklistEntry_UnexpectedEntryStatusData_Throws()
         IEnumerable<ProcessStepTypeId>? processStepTypeIds = null;
 
         var entryData = new[] { (entryTypeId, Enum.GetValues<ApplicationChecklistEntryStatusId>().Except(entryStatusIds).First(), "Test Purpose") };
-        var processSteps = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) };
+        var processSteps = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) };
 
         A.CallTo(() => _applicationChecklistRepository.GetChecklistProcessStepData(A<Guid>._, A<IEnumerable<ApplicationChecklistEntryTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns(new VerifyChecklistData(true, process, entryData!, processSteps));
@@ -293,7 +293,7 @@ public async Task VerifyChecklistEntry_UnexpectedProcessStepData_Throws()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var entryTypeId = _fixture.Create<ApplicationChecklistEntryTypeId>();
         var entryStatusIds = _fixture.CreateMany<ApplicationChecklistEntryStatusId>(1).ToImmutableArray();
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
@@ -301,7 +301,7 @@ public async Task VerifyChecklistEntry_UnexpectedProcessStepData_Throws()
         IEnumerable<ProcessStepTypeId>? processStepTypeIds = null;
 
         var entryData = new[] { (entryTypeId, entryStatusIds.First(), "Test Purpose") };
-        var processSteps = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), Enum.GetValues<ProcessStepTypeId>().Except(new[] { processStepTypeId }).First(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) };
+        var processSteps = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), Enum.GetValues<ProcessStepTypeId>().Except(new[] { processStepTypeId }).First(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) };
 
         A.CallTo(() => _applicationChecklistRepository.GetChecklistProcessStepData(A<Guid>._, A<IEnumerable<ApplicationChecklistEntryTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns(new VerifyChecklistData(true, process, entryData!, processSteps));
@@ -320,7 +320,7 @@ public async Task VerifyChecklistEntry_UnexpectedProcessStepStatus_Throws()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var entryTypeId = _fixture.Create<ApplicationChecklistEntryTypeId>();
         var entryStatusIds = _fixture.CreateMany<ApplicationChecklistEntryStatusId>(1).ToImmutableArray();
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
@@ -328,7 +328,7 @@ public async Task VerifyChecklistEntry_UnexpectedProcessStepStatus_Throws()
         IEnumerable<ProcessStepTypeId>? processStepTypeIds = null;
 
         var entryData = new[] { (entryTypeId, entryStatusIds.First(), "Test Purpose") };
-        var processSteps = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.SKIPPED, process.Id, DateTimeOffset.UtcNow) };
+        var processSteps = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.SKIPPED, process.Id, DateTimeOffset.UtcNow) };
 
         A.CallTo(() => _applicationChecklistRepository.GetChecklistProcessStepData(A<Guid>._, A<IEnumerable<ApplicationChecklistEntryTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns(new VerifyChecklistData(true, process, entryData!, processSteps));
@@ -351,14 +351,14 @@ public void RequestLock_UnlockedProcess_Success()
     {
         // Arrange
         var version = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, version);
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, version);
         var context = new IApplicationChecklistService.ManualChecklistProcessStepData(
             Guid.NewGuid(),
             process,
             Guid.NewGuid(),
             _fixture.Create<ApplicationChecklistEntryTypeId>(),
             _fixture.Create<Dictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>>().ToImmutableDictionary(),
-            new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) }
+            new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) }
         );
         var lockExpiryDate = _fixture.Create<DateTimeOffset>();
 
@@ -366,8 +366,8 @@ public void RequestLock_UnlockedProcess_Success()
         _service.RequestLock(context, lockExpiryDate);
 
         // Assert
-        A.CallTo(() => _portalRepositories.Attach(A<Process<ProcessTypeId, ProcessStepTypeId>>._, null)).MustHaveHappenedOnceExactly();
-        context.Process.Should().Match<Process<ProcessTypeId, ProcessStepTypeId>>(x => x.Version != version && x.LockExpiryDate == lockExpiryDate);
+        A.CallTo(() => _portalRepositories.Attach(A<IProcess<ProcessTypeId>>._, null)).MustHaveHappenedOnceExactly();
+        context.Process.Should().Match<Process>(x => x.Version != version && x.LockExpiryDate == lockExpiryDate);
     }
 
     [Fact]
@@ -376,14 +376,14 @@ public void RequestLock_LockedProcess_Throws()
         // Arrange
         var version = Guid.NewGuid();
         var lockExpiryDate = _fixture.Create<DateTimeOffset>();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, version) { LockExpiryDate = lockExpiryDate };
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, version) { LockExpiryDate = lockExpiryDate };
         var context = new IApplicationChecklistService.ManualChecklistProcessStepData(
             Guid.NewGuid(),
             process,
             Guid.NewGuid(),
             _fixture.Create<ApplicationChecklistEntryTypeId>(),
             _fixture.Create<Dictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>>().ToImmutableDictionary(),
-            new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) }
+            new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) }
         );
 
         // Act
@@ -391,8 +391,8 @@ public void RequestLock_LockedProcess_Throws()
 
         // Assert
         result.Message.Should().Be("process TryLock should never fail here");
-        A.CallTo(() => _portalRepositories.Attach(A<Process<ProcessTypeId, ProcessStepTypeId>>._, null)).MustHaveHappenedOnceExactly();
-        context.Process.Should().Match<Process<ProcessTypeId, ProcessStepTypeId>>(x => x.Version == version && x.LockExpiryDate == lockExpiryDate);
+        A.CallTo(() => _portalRepositories.Attach(A<IProcess<ProcessTypeId>>._, null)).MustHaveHappenedOnceExactly();
+        context.Process.Should().Match<Process>(x => x.Version == version && x.LockExpiryDate == lockExpiryDate);
     }
 
     #endregion
@@ -403,14 +403,14 @@ public void RequestLock_LockedProcess_Throws()
     public void FinalizeChecklistEntryAndProcessSteps_ReturnsExpected()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var context = new IApplicationChecklistService.ManualChecklistProcessStepData(
             Guid.NewGuid(),
             process,
             Guid.NewGuid(),
             _fixture.Create<ApplicationChecklistEntryTypeId>(),
             _fixture.Create<Dictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>>().ToImmutableDictionary(),
-            new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) }
+            new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) }
         );
 
         ApplicationChecklistEntry? modifiedChecklistEntry = null;
@@ -422,22 +422,22 @@ public void FinalizeChecklistEntryAndProcessSteps_ReturnsExpected()
                 modify(modifiedChecklistEntry);
             });
 
-        ProcessStep<ProcessTypeId, ProcessStepTypeId>? modifiedProcessStep = null;
+        ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>? modifiedProcessStep = null;
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid processStepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                modifiedProcessStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
+                modifiedProcessStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
                 initialize?.Invoke(modifiedProcessStep);
                 modify(modifiedProcessStep);
             });
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? newProcessSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? newProcessSteps = null;
 
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .ReturnsLazily((IEnumerable<(ProcessStepTypeId StepTypeId, ProcessStepStatusId StepStatusId, Guid ProcessId)> processStepTypeStatus) =>
             {
-                newProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.StepTypeId, x.StepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList();
+                newProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.StepTypeId, x.StepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList();
                 return newProcessSteps;
             });
 
@@ -481,32 +481,32 @@ public void FinalizeChecklistEntryAndProcessSteps_ReturnsExpected()
     public void FinalizeChecklistEntry_NoModifyEnty_ReturnsExpected()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var context = new IApplicationChecklistService.ManualChecklistProcessStepData(
             Guid.NewGuid(),
             process,
             Guid.NewGuid(),
             _fixture.Create<ApplicationChecklistEntryTypeId>(),
             _fixture.Create<Dictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>>().ToImmutableDictionary(),
-            new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) }
+            new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) }
         );
 
-        ProcessStep<ProcessTypeId, ProcessStepTypeId>? modifiedProcessStep = null;
+        ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>? modifiedProcessStep = null;
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid processStepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                modifiedProcessStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
+                modifiedProcessStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
                 initialize?.Invoke(modifiedProcessStep);
                 modify(modifiedProcessStep);
             });
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? newProcessSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? newProcessSteps = null;
 
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .ReturnsLazily((IEnumerable<(ProcessStepTypeId StepTypeId, ProcessStepStatusId StepStatusId, Guid ProcessId)> processStepTypeStatus) =>
             {
-                newProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.StepTypeId, x.StepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList();
+                newProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.StepTypeId, x.StepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList();
                 return newProcessSteps;
             });
 
@@ -546,14 +546,14 @@ public void FinalizeChecklistEntry_NoModifyEnty_ReturnsExpected()
     public void FinalizeChecklistEntryNullProcessSteps_ReturnsExpected()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var context = new IApplicationChecklistService.ManualChecklistProcessStepData(
             Guid.NewGuid(),
             process,
             Guid.NewGuid(),
             _fixture.Create<ApplicationChecklistEntryTypeId>(),
             _fixture.Create<Dictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>>().ToImmutableDictionary(),
-            new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) }
+            new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) }
         );
 
         ApplicationChecklistEntry? modifiedChecklistEntry = null;
@@ -565,12 +565,12 @@ public void FinalizeChecklistEntryNullProcessSteps_ReturnsExpected()
                 modify(modifiedChecklistEntry);
             });
 
-        ProcessStep<ProcessTypeId, ProcessStepTypeId>? modifiedProcessStep = null;
+        ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>? modifiedProcessStep = null;
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid processStepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                modifiedProcessStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
+                modifiedProcessStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
                 initialize?.Invoke(modifiedProcessStep);
                 modify(modifiedProcessStep);
             });
@@ -607,11 +607,11 @@ public void FinalizeChecklistEntryNullProcessSteps_ReturnsExpected()
     public void SkipProcessSteps()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid());
         var processStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(3);
         var processSteps = _fixture.CreateMany<ProcessStepTypeId>(97)
-            .Select(stepTypeId => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), stepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow))
-            .Concat(processStepTypeIds.Select(stepTypeId => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), stepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)))
+            .Select(stepTypeId => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), stepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow))
+            .Concat(processStepTypeIds.Select(stepTypeId => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), stepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)))
             .ToImmutableArray();
 
         var context = new IApplicationChecklistService.ManualChecklistProcessStepData(
@@ -623,12 +623,12 @@ public void SkipProcessSteps()
             processSteps
         );
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid processStepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
+                var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
                 initialize?.Invoke(step);
                 modify(step);
                 modifiedProcessSteps.Add(step);
diff --git a/tests/processes/DimUserProcess.Executor.Tests/DimUserProcess.Executor.Tests.csproj b/tests/processes/DimUserProcess.Executor.Tests/DimUserProcess.Executor.Tests.csproj
index 429d5c5b19..6783200ad3 100644
--- a/tests/processes/DimUserProcess.Executor.Tests/DimUserProcess.Executor.Tests.csproj
+++ b/tests/processes/DimUserProcess.Executor.Tests/DimUserProcess.Executor.Tests.csproj
@@ -35,8 +35,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
     <ProjectReference Include="..\..\..\src\processes\DimUserProcess.Executor\DimUserProcess.Executor.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
diff --git a/tests/processes/IdentityProviderProvisioning.Executor.Tests/IdentityProviderProvisioning.Executor.Tests.csproj b/tests/processes/IdentityProviderProvisioning.Executor.Tests/IdentityProviderProvisioning.Executor.Tests.csproj
index b6a7070fa3..9e8cdb42b2 100644
--- a/tests/processes/IdentityProviderProvisioning.Executor.Tests/IdentityProviderProvisioning.Executor.Tests.csproj
+++ b/tests/processes/IdentityProviderProvisioning.Executor.Tests/IdentityProviderProvisioning.Executor.Tests.csproj
@@ -38,8 +38,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
     <ProjectReference Include="..\..\..\src\processes\IdentityProviderProvisioning.Executor\IdentityProviderProvisioning.Executor.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
diff --git a/tests/processes/Invitation.Executor.Tests/Invitation.Executor.Tests.csproj b/tests/processes/Invitation.Executor.Tests/Invitation.Executor.Tests.csproj
index ff445bc409..2e2a2ad945 100644
--- a/tests/processes/Invitation.Executor.Tests/Invitation.Executor.Tests.csproj
+++ b/tests/processes/Invitation.Executor.Tests/Invitation.Executor.Tests.csproj
@@ -41,9 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
-    <ProjectReference Include="..\..\..\src\processes\Processes.Worker\Processes.Worker.csproj" />
+    <ProjectReference Include="..\..\..\src\processes\Invitation.Executor\Invitation.Executor.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/processes/Mailing.Executor.Tests/Mailing.Executor.Tests.csproj b/tests/processes/Mailing.Executor.Tests/Mailing.Executor.Tests.csproj
index cde28db981..3a877707fa 100644
--- a/tests/processes/Mailing.Executor.Tests/Mailing.Executor.Tests.csproj
+++ b/tests/processes/Mailing.Executor.Tests/Mailing.Executor.Tests.csproj
@@ -41,9 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
-    <ProjectReference Include="..\..\..\src\processes\Processes.Worker\Processes.Worker.csproj" />
+    <ProjectReference Include="..\..\..\src\processes\Mailing.Executor\Mailing.Executor.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/processes/Mailing.Library.Tests/Mailing.Library.Tests.csproj b/tests/processes/Mailing.Library.Tests/Mailing.Library.Tests.csproj
index 1d460a1129..e0216c69d0 100644
--- a/tests/processes/Mailing.Library.Tests/Mailing.Library.Tests.csproj
+++ b/tests/processes/Mailing.Library.Tests/Mailing.Library.Tests.csproj
@@ -44,7 +44,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
       <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
       <ProjectReference Include="..\..\..\src\processes\Mailing.Library\Mailing.Library.csproj" />
     </ItemGroup>
diff --git a/tests/processes/NetworkRegistration.Executor.Tests/NetworkRegistration.Executor.Tests.csproj b/tests/processes/NetworkRegistration.Executor.Tests/NetworkRegistration.Executor.Tests.csproj
index d1a6a91550..79a3d8b82a 100644
--- a/tests/processes/NetworkRegistration.Executor.Tests/NetworkRegistration.Executor.Tests.csproj
+++ b/tests/processes/NetworkRegistration.Executor.Tests/NetworkRegistration.Executor.Tests.csproj
@@ -39,8 +39,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
     <ProjectReference Include="..\..\..\src\processes\NetworkRegistration.Executor\NetworkRegistration.Executor.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
diff --git a/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistration.Library.Tests.csproj b/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistration.Library.Tests.csproj
index a09fd1eb70..d9dfe9700b 100644
--- a/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistration.Library.Tests.csproj
+++ b/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistration.Library.Tests.csproj
@@ -39,9 +39,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-    <ProjectReference Include="..\..\..\src\processes\Mailing.Library\Mailing.Library.csproj" />
     <ProjectReference Include="..\..\..\src\processes\NetworkRegistration.Library\NetworkRegistration.Library.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
diff --git a/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistrationProcessHelperTests.cs b/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistrationProcessHelperTests.cs
index 9e9c9a41b3..0f23ba2be7 100644
--- a/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistrationProcessHelperTests.cs
+++ b/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistrationProcessHelperTests.cs
@@ -25,6 +25,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions;
 
@@ -94,18 +95,18 @@ public async Task TriggerProcessStep_WithValidData_CallsExpected(ProcessStepType
         // Arrange
         var externalId = Guid.NewGuid();
         var processId = Guid.NewGuid();
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
-        var processStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.TODO, processId, DateTimeOffset.UtcNow);
+        var processStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.TODO, processId, DateTimeOffset.UtcNow);
         var data = new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(
-            new Process<ProcessTypeId, ProcessStepTypeId>(processId, ProcessTypeId.PARTNER_REGISTRATION, Guid.NewGuid()),
+            new Process(processId, ProcessTypeId.PARTNER_REGISTRATION, Guid.NewGuid()),
             new[] { processStep });
         A.CallTo(() => _networkRepository.IsValidRegistration(externalId.ToString(), A<IEnumerable<ProcessStepTypeId>>.That.IsSameSequenceAs(new[] { processStepTypeId })))
             .Returns((true, data));
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<ValueTuple<ProcessStepTypeId, ProcessStepStatusId, Guid>>>._))
             .Invokes((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepTypeStatus) =>
                 {
-                    processSteps.AddRange(processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)));
+                    processSteps.AddRange(processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)));
                 });
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessSteps(A<IEnumerable<ValueTuple<Guid, Action<IProcessStep<ProcessStepTypeId>>?, Action<IProcessStep<ProcessStepTypeId>>>>>._))
             .Invokes((IEnumerable<(Guid ProcessStepId, Action<IProcessStep<ProcessStepTypeId>>? Initialize, Action<IProcessStep<ProcessStepTypeId>> Modify)> processStepIdsInitializeModifyData) =>
@@ -124,7 +125,7 @@ public async Task TriggerProcessStep_WithValidData_CallsExpected(ProcessStepType
         // Assert
         A.CallTo(() => _portalRepositories.SaveAsync()).MustHaveHappenedOnceExactly();
         processSteps.Should().ContainSingle()
-            .Which.Should().Match<ProcessStep<ProcessTypeId, ProcessStepTypeId>>(x =>
+            .Which.Should().Match<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>(x =>
                 x.ProcessStepTypeId == retriggeredStep &&
                 x.ProcessStepStatusId == ProcessStepStatusId.TODO);
         processStep.ProcessStepStatusId.Should().Be(ProcessStepStatusId.DONE);
diff --git a/tests/processes/OfferSubscription.Executor.Tests/OfferSubscription.Executor.Tests.csproj b/tests/processes/OfferSubscription.Executor.Tests/OfferSubscription.Executor.Tests.csproj
index 9844950729..53dbfd4d11 100644
--- a/tests/processes/OfferSubscription.Executor.Tests/OfferSubscription.Executor.Tests.csproj
+++ b/tests/processes/OfferSubscription.Executor.Tests/OfferSubscription.Executor.Tests.csproj
@@ -40,7 +40,6 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
         <ProjectReference Include="..\..\..\src\processes\Processes.Worker\Processes.Worker.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
diff --git a/tests/processes/OfferSubscription.Library.Tests/OfferSubscription.Library.Tests.csproj b/tests/processes/OfferSubscription.Library.Tests/OfferSubscription.Library.Tests.csproj
index a6681472de..da5bc3dfc5 100644
--- a/tests/processes/OfferSubscription.Library.Tests/OfferSubscription.Library.Tests.csproj
+++ b/tests/processes/OfferSubscription.Library.Tests/OfferSubscription.Library.Tests.csproj
@@ -40,7 +40,6 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\..\src\processes\OfferSubscription.Library\OfferSubscription.Library.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
diff --git a/tests/processes/OfferSubscription.Library.Tests/OfferSubscriptionProcessServiceTests.cs b/tests/processes/OfferSubscription.Library.Tests/OfferSubscriptionProcessServiceTests.cs
index 94c899c8a8..9d8bcba5d6 100644
--- a/tests/processes/OfferSubscription.Library.Tests/OfferSubscriptionProcessServiceTests.cs
+++ b/tests/processes/OfferSubscription.Library.Tests/OfferSubscriptionProcessServiceTests.cs
@@ -25,6 +25,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using System.Collections.Immutable;
 
@@ -65,19 +66,19 @@ public async Task VerifySubscriptionAndProcessSteps()
     {
         // Arrange
         var subscriptionId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
         var processStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(Enum.GetValues<ProcessStepTypeId>().Length - 2).ToImmutableArray();
         var allProcessStepTypeIds = processStepTypeIds.Append(processStepTypeId).Distinct().ToImmutableArray();
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? processSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? processSteps = null;
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
             .Returns((true, false));
         A.CallTo(() => _offerSubscriptionsRepository.GetProcessStepData(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .ReturnsLazily((Guid id, IEnumerable<ProcessStepTypeId> processStepTypes) =>
             {
-                processSteps = processStepTypes.Select(typeId => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), typeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)).ToImmutableArray();
+                processSteps = processStepTypes.Select(typeId => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), typeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)).ToImmutableArray();
                 return subscriptionId == id ?
                     new VerifyProcessData<ProcessTypeId, ProcessStepTypeId>(
                     process,
@@ -128,7 +129,7 @@ public async Task VerifySubscriptionAndProcessSteps_WithActive_Throws()
         // Arrange
         var subscriptionId = Guid.NewGuid();
         var lockExpiryDate = DateTimeOffset.UtcNow;
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid()) { LockExpiryDate = lockExpiryDate };
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid()) { LockExpiryDate = lockExpiryDate };
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
         var processStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(Enum.GetValues<ProcessStepTypeId>().Length - 2).ToImmutableArray();
 
@@ -176,7 +177,7 @@ public async Task VerifySubscriptionAndProcessSteps_LockedProcess_Throws()
         // Arrange
         var subscriptionId = Guid.NewGuid();
         var lockExpiryDate = DateTimeOffset.UtcNow;
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid()) { LockExpiryDate = lockExpiryDate };
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid()) { LockExpiryDate = lockExpiryDate };
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
         var processStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(Enum.GetValues<ProcessStepTypeId>().Length - 2).ToImmutableArray();
 
@@ -200,7 +201,7 @@ public async Task VerifySubscriptionAndProcessSteps_WithoutProcessSteps_Throws()
     {
         // Arrange
         var subscriptionId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
         IEnumerable<ProcessStepTypeId>? processStepTypeIds = null;
 
@@ -223,11 +224,11 @@ public async Task VerifySubscriptionAndProcessSteps_UnexpectedProcessStepData_Th
     {
         // Arrange
         var subscriptionId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
         IEnumerable<ProcessStepTypeId>? processStepTypeIds = null;
 
-        var processSteps = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.SKIPPED, process.Id, DateTimeOffset.UtcNow) };
+        var processSteps = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.SKIPPED, process.Id, DateTimeOffset.UtcNow) };
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
             .Returns((true, false));
@@ -248,11 +249,11 @@ public async Task VerifySubscriptionAndProcessSteps_NoEligibleProcessStep_Throws
     {
         // Arrange
         var subscriptionId = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
         IEnumerable<ProcessStepTypeId>? processStepTypeIds = null;
 
-        var processSteps = _fixture.CreateMany<ProcessStepTypeId>(5).Where(typeId => typeId != processStepTypeId).Select(typeId => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), typeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)).ToImmutableArray();
+        var processSteps = _fixture.CreateMany<ProcessStepTypeId>(5).Where(typeId => typeId != processStepTypeId).Select(typeId => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), typeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)).ToImmutableArray();
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
             .Returns((true, false));
@@ -276,17 +277,17 @@ public async Task VerifySubscriptionAndProcessSteps_NoEligibleProcessStep_Throws
     public void FinalizeProcessSteps_ReturnsExpected()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
         var processStepId = Guid.NewGuid();
         var context = new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(
             processStepTypeId,
             process,
-            new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(processStepId, processStepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) },
+            new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(processStepId, processStepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) },
             _portalRepositories
         );
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? modifiedProcessSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? modifiedProcessSteps = null;
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessSteps(A<IEnumerable<(Guid, Action<IProcessStep<ProcessStepTypeId>>?, Action<IProcessStep<ProcessStepTypeId>>)>>._))
             .Invokes((IEnumerable<(Guid ProcessStepId, Action<IProcessStep<ProcessStepTypeId>>? Initialize, Action<IProcessStep<ProcessStepTypeId>> Modify)> stepsToModify) =>
@@ -294,19 +295,19 @@ public void FinalizeProcessSteps_ReturnsExpected()
                 modifiedProcessSteps = stepsToModify.Select(
                     stepToModify =>
                     {
-                        var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
+                        var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
                         stepToModify.Initialize?.Invoke(step);
                         stepToModify.Modify(step);
                         return step;
                     });
             });
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? newProcessSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? newProcessSteps = null;
 
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .ReturnsLazily((IEnumerable<(ProcessStepTypeId StepTypeId, ProcessStepStatusId StepStatusId, Guid ProcessId)> processStepTypeStatus) =>
             {
-                newProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.StepTypeId, x.StepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList();
+                newProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.StepTypeId, x.StepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList();
                 return newProcessSteps;
             });
 
@@ -323,7 +324,7 @@ public void FinalizeProcessSteps_ReturnsExpected()
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .MustHaveHappenedOnceExactly();
 
-        modifiedProcessSteps.Should().NotBeNull().And.ContainSingle().Which.Should().Match<ProcessStep<ProcessTypeId, ProcessStepTypeId>>(
+        modifiedProcessSteps.Should().NotBeNull().And.ContainSingle().Which.Should().Match<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>(
             step =>
                 step.Id == processStepId &&
                 step.ProcessStepStatusId == ProcessStepStatusId.DONE
@@ -344,17 +345,17 @@ public void FinalizeProcessSteps_ReturnsExpected()
     public void FinalizeProcessSteps_NoModifyEnty_ReturnsExpected()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
         var processStepId = Guid.NewGuid();
         var context = new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(
             processStepTypeId,
             process,
-            new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(processStepId, processStepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) },
+            new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(processStepId, processStepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) },
             _portalRepositories
         );
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? modifiedProcessSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? modifiedProcessSteps = null;
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessSteps(A<IEnumerable<(Guid, Action<IProcessStep<ProcessStepTypeId>>?, Action<IProcessStep<ProcessStepTypeId>>)>>._))
             .Invokes((IEnumerable<(Guid ProcessStepId, Action<IProcessStep<ProcessStepTypeId>>? Initialize, Action<IProcessStep<ProcessStepTypeId>> Modify)> stepsToModify) =>
@@ -362,19 +363,19 @@ public void FinalizeProcessSteps_NoModifyEnty_ReturnsExpected()
                 modifiedProcessSteps = stepsToModify.Select(
                     stepToModify =>
                     {
-                        var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
+                        var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
                         stepToModify.Initialize?.Invoke(step);
                         stepToModify.Modify(step);
                         return step;
                     });
             });
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? newProcessSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? newProcessSteps = null;
 
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .ReturnsLazily((IEnumerable<(ProcessStepTypeId StepTypeId, ProcessStepStatusId StepStatusId, Guid ProcessId)> processStepTypeStatus) =>
             {
-                newProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.StepTypeId, x.StepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList();
+                newProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.StepTypeId, x.StepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList();
                 return newProcessSteps;
             });
 
@@ -392,7 +393,7 @@ public void FinalizeProcessSteps_NoModifyEnty_ReturnsExpected()
             .MustHaveHappenedOnceExactly();
 
         modifiedProcessSteps
-            .Should().NotBeNull().And.ContainSingle().Which.Should().Match<ProcessStep<ProcessTypeId, ProcessStepTypeId>>(
+            .Should().NotBeNull().And.ContainSingle().Which.Should().Match<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>(
                 step =>
                     step.Id == processStepId &&
                     step.ProcessStepStatusId == ProcessStepStatusId.DONE
@@ -413,16 +414,16 @@ public void FinalizeProcessSteps_NoModifyEnty_ReturnsExpected()
     public void FinalizeProcessSteps_NullProcessSteps_ReturnsExpected()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.OFFER_SUBSCRIPTION, Guid.NewGuid());
         var processStepTypeId = _fixture.Create<ProcessStepTypeId>();
         var processStepId = Guid.NewGuid();
         var context = new ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>(
             processStepTypeId,
             process,
-            new ProcessStep<ProcessTypeId, ProcessStepTypeId>[] { new(processStepId, processStepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) },
+            new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[] { new(processStepId, processStepTypeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow) },
             _portalRepositories
         );
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? modifiedProcessSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? modifiedProcessSteps = null;
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessSteps(A<IEnumerable<(Guid, Action<IProcessStep<ProcessStepTypeId>>?, Action<IProcessStep<ProcessStepTypeId>>)>>._))
             .Invokes((IEnumerable<(Guid ProcessStepId, Action<IProcessStep<ProcessStepTypeId>>? Initialize, Action<IProcessStep<ProcessStepTypeId>> Modify)> stepsToModify) =>
@@ -430,7 +431,7 @@ public void FinalizeProcessSteps_NullProcessSteps_ReturnsExpected()
                 modifiedProcessSteps = stepsToModify.Select(
                     stepToModify =>
                     {
-                        var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
+                        var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(processStepId, default, default, default, default);
                         stepToModify.Initialize?.Invoke(step);
                         stepToModify.Modify(step);
                         return step;
@@ -448,7 +449,7 @@ public void FinalizeProcessSteps_NullProcessSteps_ReturnsExpected()
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .MustNotHaveHappened();
 
-        modifiedProcessSteps.Should().NotBeNull().And.ContainSingle().Which.Should().Match<ProcessStep<ProcessTypeId, ProcessStepTypeId>>(
+        modifiedProcessSteps.Should().NotBeNull().And.ContainSingle().Which.Should().Match<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>(
             step =>
                 step.Id == processStepId &&
                 step.ProcessStepStatusId == ProcessStepStatusId.DONE);
diff --git a/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs b/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs
index 9ef640a716..73a6a18d22 100644
--- a/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs
+++ b/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs
@@ -25,6 +25,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Extensions;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Models;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions;
 using System.Collections.Immutable;
@@ -60,8 +61,8 @@ public ManualProcessDataExtensionsTests()
     public void CreateManualProcessData_ReturnsExpected()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
-        var processSteps = _fixture.CreateMany<(Guid ProcessStepId, DateTimeOffset Now)>(5).Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(x.ProcessStepId, _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, x.Now)).ToImmutableArray();
+        var process = new Process(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
+        var processSteps = _fixture.CreateMany<(Guid ProcessStepId, DateTimeOffset Now)>(5).Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(x.ProcessStepId, _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, x.Now)).ToImmutableArray();
         var stepTypeId = processSteps[2].ProcessStepTypeId;
 
         var sut = _fixture.Build<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()
@@ -101,7 +102,7 @@ public void CreateManualProcessData_WithNullProcess_Throws()
     {
         // Arrange
         var sut = _fixture.Build<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()
-            .With(x => x.Process, default(Process<ProcessTypeId, ProcessStepTypeId>?))
+            .With(x => x.Process, default(Process?))
             .Create();
 
         var Act = () => sut.CreateManualProcessData(_fixture.Create<ProcessStepTypeId>(), _processRepositories, _getProcessEntityName);
@@ -118,7 +119,7 @@ public void CreateManualProcessData_WithLockedProcess_Throws()
     {
         // Arrange
         var expiryDate = _fixture.Create<DateTimeOffset>();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = expiryDate };
+        var process = new Process(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = expiryDate };
         var sut = _fixture.Build<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()
             .With(x => x.Process, process)
             .Create();
@@ -136,11 +137,11 @@ public void CreateManualProcessData_WithLockedProcess_Throws()
     public void CreateManualProcessData_WithNullProcessSteps_Throws()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
+        var process = new Process(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
 
         var sut = _fixture.Build<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()
             .With(x => x.Process, process)
-            .With(x => x.ProcessSteps, default(IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>?))
+            .With(x => x.ProcessSteps, default(IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>?))
             .Create();
 
         var Act = () => sut.CreateManualProcessData(_fixture.Create<ProcessStepTypeId>(), _processRepositories, _getProcessEntityName);
@@ -156,8 +157,8 @@ public void CreateManualProcessData_WithNullProcessSteps_Throws()
     public void CreateManualProcessData_WithInvalidProcessStepStatus_Throws()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
-        var processSteps = _fixture.CreateMany<(Guid ProcessStepId, DateTimeOffset Now)>(5).Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(x.ProcessStepId, _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.DONE, process.Id, x.Now)).ToImmutableArray();
+        var process = new Process(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
+        var processSteps = _fixture.CreateMany<(Guid ProcessStepId, DateTimeOffset Now)>(5).Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(x.ProcessStepId, _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.DONE, process.Id, x.Now)).ToImmutableArray();
 
         var sut = _fixture.Build<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()
             .With(x => x.Process, process)
@@ -177,8 +178,8 @@ public void CreateManualProcessData_WithInvalidProcessStepStatus_Throws()
     public void CreateManualProcessData_WithInvalidProcessStepType_Throws()
     {
         // Arrange
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
-        var processSteps = _fixture.CreateMany<(Guid ProcessStepId, DateTimeOffset Now)>(5).Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(x.ProcessStepId, _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, x.Now)).ToImmutableArray();
+        var process = new Process(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
+        var processSteps = _fixture.CreateMany<(Guid ProcessStepId, DateTimeOffset Now)>(5).Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(x.ProcessStepId, _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, x.Now)).ToImmutableArray();
         var stepTypeId = Enum.GetValues<ProcessStepTypeId>().Except(processSteps.Select(step => step.ProcessStepTypeId)).First();
 
         var sut = _fixture.Build<VerifyProcessData<ProcessTypeId, ProcessStepTypeId>>()
@@ -204,7 +205,7 @@ public void RequestLock_WithUnLockedProcess_ReturnsExpected()
     {
         // Arrange
         var expiryDate = _fixture.Create<DateTimeOffset>();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
+        var process = new Process(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
         var sut = _fixture.Build<ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>>()
             .With(x => x.Process, process)
             .With(x => x.ProcessRepositories, _processRepositories)
@@ -223,7 +224,7 @@ public void RequestLock_WithLockedProcess_Throws()
     {
         // Arrange
         var expiryDate = _fixture.Create<DateTimeOffset>();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = expiryDate };
+        var process = new Process(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = expiryDate };
         var sut = _fixture.Build<ManualProcessStepData<ProcessTypeId, ProcessStepTypeId>>()
             .With(x => x.Process, process)
             .With(x => x.ProcessRepositories, _processRepositories)
@@ -247,28 +248,28 @@ public void RequestLock_WithLockedProcess_Throws()
     public void SkipProcessSteps_ReturnsExpected()
     {
         // Arrange
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         var stepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(4).ToArray();
         var before = DateTimeOffset.UtcNow.AddDays(-1);
-        var processSteps0 = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[]
+        var processSteps0 = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[]
             {
                 new(Guid.NewGuid(), stepTypeIds[0], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[0], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[0], ProcessStepStatusId.TODO, process.Id, before)
             };
-        var processSteps1 = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[]
+        var processSteps1 = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[]
             {
                 new(Guid.NewGuid(), stepTypeIds[1], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[1], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[1], ProcessStepStatusId.TODO, process.Id, before)
             };
-        var processSteps2 = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[]
+        var processSteps2 = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[]
             {
                 new(Guid.NewGuid(), stepTypeIds[2], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[2], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[2], ProcessStepStatusId.TODO, process.Id, before)
             };
-        var processSteps3 = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[]
+        var processSteps3 = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[]
             {
                 new(Guid.NewGuid(), stepTypeIds[3], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[3], ProcessStepStatusId.TODO, process.Id, before),
@@ -291,14 +292,14 @@ public void SkipProcessSteps_ReturnsExpected()
                 processSteps3[2],
             };
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessSteps(A<IEnumerable<(Guid, Action<IProcessStep<ProcessStepTypeId>>?, Action<IProcessStep<ProcessStepTypeId>>)>>._))
             .Invokes((IEnumerable<(Guid ProcessStepId, Action<IProcessStep<ProcessStepTypeId>>? Initialize, Action<IProcessStep<ProcessStepTypeId>> Modify)> processStepIdInitializeModify) =>
             {
                 foreach (var (stepId, initialize, modify) in processStepIdInitializeModify)
                 {
-                    var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
+                    var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
                     initialize?.Invoke(step);
                     modify(step);
                     modifiedProcessSteps.Add(step);
@@ -337,28 +338,28 @@ public void SkipProcessSteps_ReturnsExpected()
     public void SkipProcessStepsExcept_ReturnsExpected()
     {
         // Arrange
-        var process = _fixture.Create<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var process = _fixture.Create<Process>();
         var stepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(4).ToArray();
         var before = DateTimeOffset.UtcNow.AddDays(-1);
-        var processSteps0 = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[]
+        var processSteps0 = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[]
             {
                 new(Guid.NewGuid(), stepTypeIds[0], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[0], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[0], ProcessStepStatusId.TODO, process.Id, before)
             };
-        var processSteps1 = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[]
+        var processSteps1 = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[]
             {
                 new(Guid.NewGuid(), stepTypeIds[1], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[1], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[1], ProcessStepStatusId.TODO, process.Id, before)
             };
-        var processSteps2 = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[]
+        var processSteps2 = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[]
             {
                 new(Guid.NewGuid(), stepTypeIds[2], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[2], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[2], ProcessStepStatusId.TODO, process.Id, before)
             };
-        var processSteps3 = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[]
+        var processSteps3 = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[]
             {
                 new(Guid.NewGuid(), stepTypeIds[3], ProcessStepStatusId.TODO, process.Id, before),
                 new(Guid.NewGuid(), stepTypeIds[3], ProcessStepStatusId.TODO, process.Id, before),
@@ -381,14 +382,14 @@ public void SkipProcessStepsExcept_ReturnsExpected()
                 processSteps3[2],
             };
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessSteps(A<IEnumerable<(Guid, Action<IProcessStep<ProcessStepTypeId>>?, Action<IProcessStep<ProcessStepTypeId>>)>>._))
             .Invokes((IEnumerable<(Guid ProcessStepId, Action<IProcessStep<ProcessStepTypeId>>? Initialize, Action<IProcessStep<ProcessStepTypeId>> Modify)> processStepIdInitializeModify) =>
             {
                 foreach (var (stepId, initialize, modify) in processStepIdInitializeModify)
                 {
-                    var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
+                    var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
                     initialize?.Invoke(step);
                     modify(step);
                     modifiedProcessSteps.Add(step);
@@ -427,11 +428,11 @@ public void ScheduleProcessSteps_ReturnsExpected()
         var stepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(3);
         var now = DateTimeOffset.UtcNow;
 
-        var createdSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var createdSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .ReturnsLazily((IEnumerable<(ProcessStepTypeId ProcesssStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepTypeStatusProcessIds) =>
             {
-                createdSteps.AddRange(processStepTypeStatusProcessIds.Select(data => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), data.ProcesssStepTypeId, data.ProcessStepStatusId, data.ProcessId, now)));
+                createdSteps.AddRange(processStepTypeStatusProcessIds.Select(data => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), data.ProcesssStepTypeId, data.ProcessStepStatusId, data.ProcessId, now)));
                 return createdSteps;
             });
 
@@ -463,27 +464,27 @@ public void FinalizeProcessStep_ReturnsExpected(bool locked)
     {
         // Arrange
         var version = Guid.NewGuid();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>()
+        var process = _fixture.Build<Process>()
             .With(x => x.Version, version)
             .With(x => x.LockExpiryDate, locked ? DateTimeOffset.UtcNow : default(DateTimeOffset?))
             .Create();
         var stepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(3).ToArray();
         var before = DateTimeOffset.UtcNow.AddDays(-1);
-        var processSteps = new ProcessStep<ProcessTypeId, ProcessStepTypeId>[]
+        var processSteps = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>[]
         {
             new(Guid.NewGuid(), stepTypeIds[0], ProcessStepStatusId.TODO, process.Id, before),
             new(Guid.NewGuid(), stepTypeIds[1], ProcessStepStatusId.TODO, process.Id, before),
             new(Guid.NewGuid(), stepTypeIds[2], ProcessStepStatusId.TODO, process.Id, before)
         };
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessSteps(A<IEnumerable<(Guid, Action<IProcessStep<ProcessStepTypeId>>?, Action<IProcessStep<ProcessStepTypeId>>)>>._))
             .Invokes((IEnumerable<(Guid ProcessStepId, Action<IProcessStep<ProcessStepTypeId>>? Initialize, Action<IProcessStep<ProcessStepTypeId>> Modify)> processStepIdInitializeModify) =>
             {
                 foreach (var (stepId, initialize, modify) in processStepIdInitializeModify)
                 {
-                    var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
+                    var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
                     initialize?.Invoke(step);
                     modify(step);
                     modifiedProcessSteps.Add(step);
@@ -503,7 +504,7 @@ public void FinalizeProcessStep_ReturnsExpected(bool locked)
 
         process.LockExpiryDate.Should().BeNull();
         process.Version.Should().NotBe(version);
-        modifiedProcessSteps.Should().ContainSingle().Which.Should().Match<ProcessStep<ProcessTypeId, ProcessStepTypeId>>(
+        modifiedProcessSteps.Should().ContainSingle().Which.Should().Match<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>(
             x => x.Id == processSteps[1].Id && x.ProcessStepStatusId == ProcessStepStatusId.DONE && x.DateLastChanged != before
         );
     }
diff --git a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs
index 972029ef6b..233a8b58a0 100644
--- a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs
+++ b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs
@@ -22,11 +22,12 @@
 using Microsoft.Extensions.Options;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Concrete.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.DBAccess;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Library.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.ProcessIdentity;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Worker.Library;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using System.Collections.Immutable;
 
@@ -82,7 +83,7 @@ public async Task ExecuteAsync_WithNoPendingItems_NoServiceCall()
     {
         // Arrange
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
-            .Returns(Array.Empty<Process<ProcessTypeId, ProcessStepTypeId>>().ToAsyncEnumerable());
+            .Returns(Array.Empty<IProcess<ProcessTypeId>>().ToAsyncEnumerable());
 
         // Act
         await _service.ExecuteAsync(CancellationToken.None);
@@ -97,7 +98,7 @@ public async Task ExecuteAsync_WithNoPendingItems_NoServiceCall()
     public async Task ExecuteAsync_WithPendingItems_CallsProcessExpectedNumberOfTimes()
     {
         // Arrange
-        var processData = _fixture.CreateMany<Guid>().Select(x => new Process<ProcessTypeId, ProcessStepTypeId>(x, ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid())).ToImmutableArray();
+        var processData = _fixture.CreateMany<Guid>().Select(x => new Process(x, ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid())).ToImmutableArray();
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
             .Returns(processData.ToAsyncEnumerable());
 
@@ -120,7 +121,7 @@ public async Task ExecuteAsync_WithPendingItems_CallsProcessExpectedNumberOfTime
     public async Task ExecuteAsync_ExecuteProcess_Returns_Unmodified()
     {
         // Arrange
-        var processData = _fixture.CreateMany<Guid>().Select(x => new Process<ProcessTypeId, ProcessStepTypeId>(x, ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid())).ToImmutableArray();
+        var processData = _fixture.CreateMany<Guid>().Select(x => new Process(x, ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid())).ToImmutableArray();
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
             .Returns(processData.ToAsyncEnumerable());
 
@@ -145,7 +146,7 @@ public async Task ExecuteAsync_ExecuteProcess_Returns_RequestLock()
         // Arrange
         var processId = Guid.NewGuid();
         var processVersion = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(processId, ProcessTypeId.APPLICATION_CHECKLIST, processVersion);
+        var process = new Process(processId, ProcessTypeId.APPLICATION_CHECKLIST, processVersion);
         var processData = new[] { process };
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
             .Returns(processData.ToAsyncEnumerable());
@@ -195,7 +196,7 @@ public async Task ExecuteAsync_ExecuteProcess_Returns_RequestLockTwice()
         // Arrange
         var processId = Guid.NewGuid();
         var processVersion = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(processId, ProcessTypeId.APPLICATION_CHECKLIST, processVersion);
+        var process = new Process(processId, ProcessTypeId.APPLICATION_CHECKLIST, processVersion);
         var processData = new[] { process };
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
             .Returns(processData.ToAsyncEnumerable());
@@ -248,8 +249,8 @@ public async Task ExecuteAsync_ExecuteProcess_Returns_RequestLockThenThrows()
         var secondId = Guid.NewGuid();
         var firstVersion = Guid.NewGuid();
         var secondVersion = Guid.NewGuid();
-        var firstProcess = new Process<ProcessTypeId, ProcessStepTypeId>(firstId, ProcessTypeId.APPLICATION_CHECKLIST, firstVersion);
-        var secondProcess = new Process<ProcessTypeId, ProcessStepTypeId>(secondId, ProcessTypeId.APPLICATION_CHECKLIST, secondVersion);
+        var firstProcess = new Process(firstId, ProcessTypeId.APPLICATION_CHECKLIST, firstVersion);
+        var secondProcess = new Process(secondId, ProcessTypeId.APPLICATION_CHECKLIST, secondVersion);
 
         var processData = new[] { firstProcess, secondProcess };
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
@@ -261,7 +262,7 @@ public async Task ExecuteAsync_ExecuteProcess_Returns_RequestLockThenThrows()
             throw new Exception("normal error");
         }
 
-        Process<ProcessTypeId, ProcessStepTypeId>? process = null;
+        Process? process = null;
 
         A.CallTo(() => _processExecutor.ExecuteProcess(firstId, A<ProcessTypeId>._, A<CancellationToken>._))
             .ReturnsLazily((Guid Id, ProcessTypeId _, CancellationToken _) =>
@@ -323,7 +324,7 @@ public async Task ExecuteAsync_ExecuteProcess_Returns_UnmodifiedSafeRequested()
     {
         // Arrange
         var firstVersion = Guid.NewGuid();
-        var process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, firstVersion);
+        var process = new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, firstVersion);
         var processData = new[] { process };
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
             .Returns(processData.ToAsyncEnumerable());
@@ -370,19 +371,19 @@ public async Task ExecuteAsync_ExecuteProcess_Returns_RequestLock_SaveAsyncThrow
         // Arrange
         var firstProcessId = Guid.NewGuid();
         var firstVersion = Guid.NewGuid();
-        var firstProcess = new Process<ProcessTypeId, ProcessStepTypeId>(firstProcessId, ProcessTypeId.APPLICATION_CHECKLIST, firstVersion);
+        var firstProcess = new Process(firstProcessId, ProcessTypeId.APPLICATION_CHECKLIST, firstVersion);
         var secondProcessId = Guid.NewGuid();
         var secondVersion = Guid.NewGuid();
-        var secondProcess = new Process<ProcessTypeId, ProcessStepTypeId>(secondProcessId, ProcessTypeId.APPLICATION_CHECKLIST, secondVersion);
+        var secondProcess = new Process(secondProcessId, ProcessTypeId.APPLICATION_CHECKLIST, secondVersion);
         var thirdProcessId = Guid.NewGuid();
         var thirdVersion = Guid.NewGuid();
-        var thirdProcess = new Process<ProcessTypeId, ProcessStepTypeId>(thirdProcessId, ProcessTypeId.APPLICATION_CHECKLIST, thirdVersion);
+        var thirdProcess = new Process(thirdProcessId, ProcessTypeId.APPLICATION_CHECKLIST, thirdVersion);
         var processData = new[] { firstProcess, secondProcess, thirdProcess };
         var error = new Exception("save conflict error");
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
             .Returns(processData.ToAsyncEnumerable());
 
-        Process<ProcessTypeId, ProcessStepTypeId>? process = null;
+        Process? process = null;
 
         A.CallTo(() => _processExecutor.ExecuteProcess(firstProcessId, A<ProcessTypeId>._, A<CancellationToken>._))
             .ReturnsLazily((Guid _, ProcessTypeId _, CancellationToken _) =>
@@ -448,7 +449,7 @@ public async Task ExecuteAsync_IgnoresLockedProcesses_LogsInformation()
     {
         var lockExpiryDate = _fixture.Create<DateTimeOffset>();
         // Arrange
-        var processData = _fixture.CreateMany<Guid>().Select(x => new Process<ProcessTypeId, ProcessStepTypeId>(x, ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()) { LockExpiryDate = lockExpiryDate }).ToImmutableArray();
+        var processData = _fixture.CreateMany<Guid>().Select(x => new Process(x, ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()) { LockExpiryDate = lockExpiryDate }).ToImmutableArray();
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
             .Returns(processData.ToAsyncEnumerable());
 
@@ -470,7 +471,7 @@ public async Task ExecuteAsync_IgnoresLockedProcesses_LogsInformation()
     public async Task ExecuteAsync_WithException_LogsError()
     {
         // Arrange
-        var processData = _fixture.CreateMany<Guid>().Select(x => new Process<ProcessTypeId, ProcessStepTypeId>(x, ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid())).ToImmutableArray();
+        var processData = _fixture.CreateMany<Guid>().Select(x => new Process(x, ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid())).ToImmutableArray();
         var error = new Exception("Only a test");
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
             .Returns(processData.ToAsyncEnumerable());
@@ -496,7 +497,7 @@ public async Task ExecuteAsync_WithException_LogsError()
     public async Task ExecuteAsync_WithSystemException_Exits()
     {
         // Arrange
-        var processData = _fixture.CreateMany<Guid>().Select(x => new Process<ProcessTypeId, ProcessStepTypeId>(x, ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid())).ToImmutableArray();
+        var processData = _fixture.CreateMany<Guid>().Select(x => new Process(x, ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid())).ToImmutableArray();
         var error = new SystemException("unrecoverable failure");
         A.CallTo(() => _processStepRepository.GetActiveProcesses(A<IEnumerable<ProcessTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._, A<DateTimeOffset>._))
             .Returns(processData.ToAsyncEnumerable());
diff --git a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs
index 1ed19d5e34..2c606dd18a 100644
--- a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs
+++ b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs
@@ -26,6 +26,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Processes.Worker.Library;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using System.Collections.Immutable;
 
@@ -152,21 +153,21 @@ public async Task ExecuteProcess_WithInitialSteps_ReturnsExpected(ProcessStepSta
         A.CallTo(() => _processTypeExecutor.ExecuteProcessStep(A<ProcessStepTypeId>._, A<IEnumerable<ProcessStepTypeId>>._, A<CancellationToken>._))
             .Returns(new IProcessTypeExecutor<ProcessTypeId, ProcessStepTypeId>.StepExecutionResult(false, stepStatusId, null, null, null));
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? createdProcessSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? createdProcessSteps = null;
 
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .ReturnsLazily((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepTypeStatus) =>
             {
-                createdProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToImmutableList();
+                createdProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToImmutableList();
                 return createdProcessSteps;
             });
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid stepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
+                var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
                 initialize?.Invoke(step);
                 modify(step);
                 modifiedProcessSteps.Add(step);
@@ -260,12 +261,12 @@ public async Task ExecuteProcess_NoScheduleOrSkippedSteps_ReturnsExpected(Proces
         A.CallTo(() => _processTypeExecutor.ExecuteProcessStep(A<ProcessStepTypeId>._, A<IEnumerable<ProcessStepTypeId>>._, A<CancellationToken>._))
             .Returns(new IProcessTypeExecutor<ProcessTypeId, ProcessStepTypeId>.StepExecutionResult(false, stepStatusId, null, null, null));
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid stepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
+                var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
                 initialize?.Invoke(step);
                 modify(step);
                 modifiedProcessSteps.Add(step);
@@ -372,12 +373,12 @@ public async Task ExecuteProcess_NoScheduleOrSkippedSteps_SingleStepTypeWithDupl
         A.CallTo(() => _processTypeExecutor.ExecuteProcessStep(A<ProcessStepTypeId>._, A<IEnumerable<ProcessStepTypeId>>._, A<CancellationToken>._))
             .Returns(new IProcessTypeExecutor<ProcessTypeId, ProcessStepTypeId>.StepExecutionResult(false, stepStatusId, null, null, null));
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid stepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
+                var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
                 initialize?.Invoke(step);
                 modify(step);
                 modifiedProcessSteps.Add(step);
@@ -479,21 +480,21 @@ public async Task ExecuteProcess_WithScheduledSteps_ReturnsExpected(ProcessStepS
         A.CallTo(() => _processTypeExecutor.ExecuteProcessStep(A<ProcessStepTypeId>.That.Not.IsEqualTo(processStepData.StepTypeId), A<IEnumerable<ProcessStepTypeId>>._, A<CancellationToken>._))
             .Returns(new IProcessTypeExecutor<ProcessTypeId, ProcessStepTypeId>.StepExecutionResult(false, stepStatusId, null, null, null));
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? createdProcessSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? createdProcessSteps = null;
 
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .ReturnsLazily((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepTypeStatus) =>
             {
-                createdProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToImmutableList();
+                createdProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToImmutableList();
                 return createdProcessSteps;
             });
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid stepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
+                var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
                 initialize?.Invoke(step);
                 modify(step);
                 modifiedProcessSteps.Add(step);
@@ -587,21 +588,21 @@ public async Task ExecuteProcess_WithDuplicateScheduledSteps_ReturnsExpected(Pro
             .Then
             .Returns(new IProcessTypeExecutor<ProcessTypeId, ProcessStepTypeId>.StepExecutionResult(false, stepStatusId, null, null, null));
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? createdProcessSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? createdProcessSteps = null;
 
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .ReturnsLazily((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepTypeStatus) =>
             {
-                createdProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToImmutableList();
+                createdProcessSteps = processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToImmutableList();
                 return createdProcessSteps;
             });
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid stepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
+                var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
                 initialize?.Invoke(step);
                 modify(step);
                 modifiedProcessSteps.Add(step);
@@ -685,12 +686,12 @@ public async Task ExecuteProcess_WithSkippedSteps_ReturnsExpected(ProcessStepSta
         A.CallTo(() => _processTypeExecutor.ExecuteProcessStep(A<ProcessStepTypeId>._, A<IEnumerable<ProcessStepTypeId>>._, A<CancellationToken>._))
             .Returns(new IProcessTypeExecutor<ProcessTypeId, ProcessStepTypeId>.StepExecutionResult(false, stepStatusId, null, skipStepTypeIds.Select(x => x), null));
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid stepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
+                var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
                 initialize?.Invoke(step);
                 modify(step);
                 modifiedProcessSteps.Add(step);
@@ -775,12 +776,12 @@ public async Task ExecuteProcess_ProcessThrowsTestException_ReturnsExpected(bool
         A.CallTo(() => _processTypeExecutor.ExecuteProcessStep(A<ProcessStepTypeId>._, A<IEnumerable<ProcessStepTypeId>>._, A<CancellationToken>._))
             .Throws(error);
 
-        var modifiedProcessSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var modifiedProcessSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
 
         A.CallTo(() => _processStepRepository.AttachAndModifyProcessStep(A<Guid>._, A<Action<IProcessStep<ProcessStepTypeId>>>._, A<Action<IProcessStep<ProcessStepTypeId>>>._))
             .Invokes((Guid stepId, Action<IProcessStep<ProcessStepTypeId>>? initialize, Action<IProcessStep<ProcessStepTypeId>> modify) =>
             {
-                var step = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
+                var step = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(stepId, default, default, Guid.Empty, default);
                 initialize?.Invoke(step);
                 modify(step);
                 modifiedProcessSteps.Add(step);
diff --git a/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj b/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj
index 2a5945a700..c6db073c0a 100644
--- a/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj
+++ b/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj
@@ -39,8 +39,6 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.ProcessIdentity\Framework.Processes.ProcessIdentity.csproj" />
         <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
diff --git a/tests/processes/SelfDescriptionCreation.Executor.Tests/SelfDescriptionCreation.Executor.Tests.csproj b/tests/processes/SelfDescriptionCreation.Executor.Tests/SelfDescriptionCreation.Executor.Tests.csproj
index c796268dc8..84b4fa297e 100644
--- a/tests/processes/SelfDescriptionCreation.Executor.Tests/SelfDescriptionCreation.Executor.Tests.csproj
+++ b/tests/processes/SelfDescriptionCreation.Executor.Tests/SelfDescriptionCreation.Executor.Tests.csproj
@@ -41,8 +41,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
     <ProjectReference Include="..\..\..\src\processes\SelfDescriptionCreation.Executor\SelfDescriptionCreation.Executor.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
diff --git a/tests/processes/UserProvisioning.Executor.Tests/UserProvisioning.Executor.Tests.csproj b/tests/processes/UserProvisioning.Executor.Tests/UserProvisioning.Executor.Tests.csproj
index 125322b0a0..20d274612f 100644
--- a/tests/processes/UserProvisioning.Executor.Tests/UserProvisioning.Executor.Tests.csproj
+++ b/tests/processes/UserProvisioning.Executor.Tests/UserProvisioning.Executor.Tests.csproj
@@ -38,8 +38,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Worker.Library\Framework.Processes.Worker.Library.csproj" />
     <ProjectReference Include="..\..\..\src\processes\UserProvisioning.Executor\UserProvisioning.Executor.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
diff --git a/tests/provisioning/Provisioning.Library.Tests/Extensions/TechnicalUserCreationTests.cs b/tests/provisioning/Provisioning.Library.Tests/Extensions/TechnicalUserCreationTests.cs
index 65998d1b62..9328b10f44 100644
--- a/tests/provisioning/Provisioning.Library.Tests/Extensions/TechnicalUserCreationTests.cs
+++ b/tests/provisioning/Provisioning.Library.Tests/Extensions/TechnicalUserCreationTests.cs
@@ -159,7 +159,7 @@ public async Task CreateServiceAccountAsync_WithValidData_ReturnsExpected(bool e
                 x.ServiceAccountData.AuthData.IamClientAuthMethod == IamClientAuthMethod.SECRET
             );
 
-        A.CallTo(() => _userRepository.CreateIdentity(_companyId, UserStatusId.ACTIVE, IdentityTypeId.COMPANY_SERVICE_ACCOUNT, null))
+        A.CallTo(() => _userRepository.CreateIdentity(_companyId, UserStatusId.ACTIVE, IdentityTypeId.TECHNICAL_USER, null))
             .MustHaveHappenedOnceExactly();
         A.CallTo(() => _technicalUserRepository.CreateTechnicalUser(_identityId, "testName", "abc", "sa1", TechnicalUserTypeId.OWN, TechnicalUserKindId.INTERNAL, ServiceAccountCreationAction))
             .MustHaveHappenedOnceExactly();
@@ -204,7 +204,7 @@ public async Task CreateServiceAccountAsync_WithValidData_ReturnsExpected(bool e
         identities.Should().ContainSingle().Which.Should().Match<Identity>(
             x => x.CompanyId == _companyId &&
                  x.UserStatusId == UserStatusId.ACTIVE &&
-                 x.IdentityTypeId == IdentityTypeId.COMPANY_SERVICE_ACCOUNT);
+                 x.IdentityTypeId == IdentityTypeId.TECHNICAL_USER);
     }
 
     [Fact]
@@ -248,7 +248,7 @@ public async Task CreateServiceAccountAsync_WithValidDimData_ReturnsExpected()
         A.CallTo(() => _provisioningManager.AddProtocolMapperAsync(A<string>._))
             .MustNotHaveHappened();
 
-        A.CallTo(() => _userRepository.CreateIdentity(_companyId, UserStatusId.PENDING, IdentityTypeId.COMPANY_SERVICE_ACCOUNT, null))
+        A.CallTo(() => _userRepository.CreateIdentity(_companyId, UserStatusId.PENDING, IdentityTypeId.TECHNICAL_USER, null))
             .MustHaveHappenedOnceExactly();
         A.CallTo(() => _technicalUserRepository.CreateTechnicalUser(_identityId, "dim-testName", "abc", null, TechnicalUserTypeId.OWN, TechnicalUserKindId.EXTERNAL, ServiceAccountCreationAction))
             .MustHaveHappenedOnceExactly();
@@ -272,7 +272,7 @@ public async Task CreateServiceAccountAsync_WithValidDimData_ReturnsExpected()
         identities.Should().ContainSingle().Which.Should().Match<Identity>(
             x => x.CompanyId == _companyId &&
                  x.UserStatusId == UserStatusId.PENDING &&
-                 x.IdentityTypeId == IdentityTypeId.COMPANY_SERVICE_ACCOUNT);
+                 x.IdentityTypeId == IdentityTypeId.TECHNICAL_USER);
     }
 
     [Fact]
@@ -308,7 +308,7 @@ public async Task CreateServiceAccountAsync_WithValidDataPlus_ReturnsExpected()
                      x.Name == "dim-testName" &&
                      x.ServiceAccountData == null);
 
-        A.CallTo(() => _userRepository.CreateIdentity(_companyId, UserStatusId.ACTIVE, IdentityTypeId.COMPANY_SERVICE_ACCOUNT, null))
+        A.CallTo(() => _userRepository.CreateIdentity(_companyId, UserStatusId.ACTIVE, IdentityTypeId.TECHNICAL_USER, null))
             .MustHaveHappenedOnceExactly();
         A.CallTo(() => _technicalUserRepository.CreateTechnicalUser(_identityId, "testName", "abc", "sa1", TechnicalUserTypeId.OWN, TechnicalUserKindId.INTERNAL, ServiceAccountCreationAction))
             .MustHaveHappenedOnceExactly();
@@ -332,7 +332,7 @@ public async Task CreateServiceAccountAsync_WithValidDataPlus_ReturnsExpected()
         A.CallTo(() => _provisioningManager.AddProtocolMapperAsync("internal-sa1"))
             .MustHaveHappenedOnceExactly();
 
-        A.CallTo(() => _userRepository.CreateIdentity(_companyId, UserStatusId.ACTIVE, IdentityTypeId.COMPANY_SERVICE_ACCOUNT, null))
+        A.CallTo(() => _userRepository.CreateIdentity(_companyId, UserStatusId.ACTIVE, IdentityTypeId.TECHNICAL_USER, null))
             .MustHaveHappenedOnceExactly();
         A.CallTo(() => _technicalUserRepository.CreateTechnicalUser(_secondId, "dim-testName", "abc", null, TechnicalUserTypeId.OWN, TechnicalUserKindId.EXTERNAL, ServiceAccountCreationAction))
             .MustHaveHappenedOnceExactly();
@@ -349,7 +349,7 @@ public async Task CreateServiceAccountAsync_WithValidDataPlus_ReturnsExpected()
                 x => x.Name == "dim-testName" && x.ClientClientId == null && x.TechnicalUserKindId == TechnicalUserKindId.EXTERNAL
             );
         identities.Should().HaveCount(2)
-            .And.AllSatisfy(x => x.Should().Match<Identity>(x => x.CompanyId == _companyId && x.IdentityTypeId == IdentityTypeId.COMPANY_SERVICE_ACCOUNT))
+            .And.AllSatisfy(x => x.Should().Match<Identity>(x => x.CompanyId == _companyId && x.IdentityTypeId == IdentityTypeId.TECHNICAL_USER))
             .And.Satisfy(
                 x => x.Id == _identityId && x.UserStatusId == UserStatusId.ACTIVE,
                 x => x.Id == _secondId && x.UserStatusId == UserStatusId.PENDING
@@ -414,9 +414,9 @@ private void Setup(ICollection<TechnicalUser>? serviceAccounts = null, ICollecti
             }.ToAsyncEnumerable());
 
         A.CallTo(() => _processStepRepository.CreateProcess(A<ProcessTypeId>._))
-            .ReturnsLazily((ProcessTypeId processTypeId) => new Process<ProcessTypeId, ProcessStepTypeId>(_processId, processTypeId, Guid.NewGuid())).Once();
+            .ReturnsLazily((ProcessTypeId processTypeId) => new Process(_processId, processTypeId, Guid.NewGuid())).Once();
         A.CallTo(() => _processStepRepository.CreateProcessStep(A<ProcessStepTypeId>._, A<ProcessStepStatusId>._, A<Guid>._))
-            .ReturnsLazily((ProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid processId) => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(_processStepId, processStepTypeId, processStepStatusId, processId, DateTimeOffset.UtcNow)).Once();
+            .ReturnsLazily((ProcessStepTypeId processStepTypeId, ProcessStepStatusId processStepStatusId, Guid processId) => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(_processStepId, processStepTypeId, processStepStatusId, processId, DateTimeOffset.UtcNow)).Once();
     }
 
     #endregion
diff --git a/tests/provisioning/Provisioning.Library.Tests/Provisioning.Library.Tests.csproj b/tests/provisioning/Provisioning.Library.Tests/Provisioning.Library.Tests.csproj
index 2873d0f884..e7bd9480d7 100644
--- a/tests/provisioning/Provisioning.Library.Tests/Provisioning.Library.Tests.csproj
+++ b/tests/provisioning/Provisioning.Library.Tests/Provisioning.Library.Tests.csproj
@@ -38,9 +38,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
-    <ProjectReference Include="..\..\..\src\keycloak\Keycloak.Factory\Keycloak.Factory.csproj" />
     <ProjectReference Include="..\..\..\src\provisioning\Provisioning.Library\Provisioning.Library.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
diff --git a/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivation.Library.Tests.csproj b/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivation.Library.Tests.csproj
index 305cc19337..455067324a 100644
--- a/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivation.Library.Tests.csproj
+++ b/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivation.Library.Tests.csproj
@@ -39,8 +39,6 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\externalsystems\Custodian.Library\Custodian.Library.csproj" />
-        <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
         <ProjectReference Include="..\..\..\src\registration\ApplicationActivation.Library\ApplicationActivation.Library.csproj" />
         <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
     </ItemGroup>
diff --git a/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivationTests.cs b/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivationTests.cs
index f2dc779a86..a601158029 100644
--- a/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivationTests.cs
+++ b/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivationTests.cs
@@ -700,7 +700,7 @@ public async Task SaveApplicationActivationToDatabase_WithoutNetworkRegistration
     public async Task SaveApplicationActivationToDatabase_WithExternalApplication_ApprovesRequestAndCreatesNotifications()
     {
         //Arrange
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
         var companyApplication = _fixture.Build<CompanyApplication>()
             .With(x => x.ApplicationStatusId, CompanyApplicationStatusId.SUBMITTED)
             .Create();
@@ -708,7 +708,7 @@ public async Task SaveApplicationActivationToDatabase_WithExternalApplication_Ap
             .With(x => x.CompanyStatusId, CompanyStatusId.PENDING)
             .Create();
         A.CallTo(() => _applicationRepository.GetCompanyAndApplicationDetailsForApprovalAsync(A<Guid>.That.Matches(x => x == IdWithTypeExternal)))
-            .Returns((company.Id, company.Name, company.BusinessPartnerNumber, CompanyApplicationTypeId.EXTERNAL, new(new Process<ProcessTypeId, ProcessStepTypeId>(ProcessId, ProcessTypeId.PARTNER_REGISTRATION, Guid.NewGuid()), [])));
+            .Returns((company.Id, company.Name, company.BusinessPartnerNumber, CompanyApplicationTypeId.EXTERNAL, new(new Process(ProcessId, ProcessTypeId.PARTNER_REGISTRATION, Guid.NewGuid()), [])));
         A.CallTo(() =>
                 _applicationRepository.AttachAndModifyCompanyApplication(A<Guid>._, A<Action<CompanyApplication>>._))
             .Invokes((Guid _, Action<CompanyApplication> setOptionalParameters) =>
@@ -725,7 +725,7 @@ public async Task SaveApplicationActivationToDatabase_WithExternalApplication_Ap
                 x.Single().ProcessStepTypeId == ProcessStepTypeId.TRIGGER_CALLBACK_OSP_APPROVED)))
             .Invokes((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> steps) =>
             {
-                processSteps.AddRange(steps.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)));
+                processSteps.AddRange(steps.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)));
             });
         SetupNotifications();
         var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(
diff --git a/tests/registration/Registration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs b/tests/registration/Registration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
index 39b2f670e0..1db4ea2bcd 100644
--- a/tests/registration/Registration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
+++ b/tests/registration/Registration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
@@ -271,7 +271,7 @@ public async Task Submit_WithValidData_CallsExpected()
         var agreementId1 = Guid.NewGuid();
         var processId = Guid.NewGuid();
         var submitProcessId = Guid.NewGuid();
-        var processSteps = new List<ProcessStep<ProcessTypeId, ProcessStepTypeId>>();
+        var processSteps = new List<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>();
         var application = new CompanyApplication(applicationId, _identity.CompanyId, CompanyApplicationStatusId.CREATED, CompanyApplicationTypeId.EXTERNAL, DateTimeOffset.UtcNow);
 
         var data = new PartnerSubmitData(
@@ -295,7 +295,7 @@ public async Task Submit_WithValidData_CallsExpected()
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)>>._))
             .Invokes((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> steps) =>
                 {
-                    processSteps.AddRange(steps.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)));
+                    processSteps.AddRange(steps.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)));
                 });
         var consents = new List<Consent>();
         var now = DateTimeOffset.UtcNow;
@@ -308,7 +308,7 @@ public async Task Submit_WithValidData_CallsExpected()
                 }
             });
         A.CallTo(() => _processStepRepository.CreateProcess(ProcessTypeId.APPLICATION_CHECKLIST))
-            .ReturnsLazily((ProcessTypeId processTypeId) => new Process<ProcessTypeId, ProcessStepTypeId>(processId, processTypeId, Guid.NewGuid()));
+            .ReturnsLazily((ProcessTypeId processTypeId) => new Process(processId, processTypeId, Guid.NewGuid()));
         A.CallTo(() => _checklistService.CreateInitialChecklistAsync(applicationId))
             .Returns(new[]
             {
@@ -445,12 +445,12 @@ public async Task DeclineOsp_WithValid_ExecutesExpected()
         var invitation = _fixture.Build<Invitation>().With(x => x.InvitationStatusId, InvitationStatusId.PENDING).Create();
         var identityId = Guid.NewGuid();
         var currentVersion = Guid.NewGuid();
-        var process = _fixture.Build<Process<ProcessTypeId, ProcessStepTypeId>>()
+        var process = _fixture.Build<Process>()
             .With(x => x.LockExpiryDate, default(DateTimeOffset?))
             .With(x => x.Version, currentVersion).Create();
-        var currentProcessStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.MANUAL_DECLINE_OSP, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow);
-        var removeUsersProcessStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.REMOVE_KEYCLOAK_USERS, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow);
-        var otherProcessStep = new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.SYNCHRONIZE_USER, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow);
+        var currentProcessStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.MANUAL_DECLINE_OSP, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow);
+        var removeUsersProcessStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.REMOVE_KEYCLOAK_USERS, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow);
+        var otherProcessStep = new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), ProcessStepTypeId.SYNCHRONIZE_USER, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow);
         var existingProcessSteps = new[] { currentProcessStep, removeUsersProcessStep, otherProcessStep };
         var data = _fixture.Create<DeclineOspData>();
         A.CallTo(() => _networkRepository.GetDeclineDataForApplicationId(application.Id, CompanyApplicationTypeId.EXTERNAL, A<IEnumerable<CompanyApplicationStatusId>>._, IdentityCompanyId))
diff --git a/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs b/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
index 57f6468db4..0a9464df4a 100644
--- a/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
+++ b/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
@@ -2242,12 +2242,12 @@ public async Task SubmitRegistrationAsync_WithDocumentId_Success()
 
         var utcNow = DateTimeOffset.UtcNow;
 
-        Process<ProcessTypeId, ProcessStepTypeId>? process = null;
+        Process? process = null;
 
         A.CallTo(() => _processStepRepository.CreateProcess(ProcessTypeId.APPLICATION_CHECKLIST))
             .ReturnsLazily((ProcessTypeId processTypeId) =>
             {
-                process = new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), processTypeId, Guid.NewGuid());
+                process = new Process(Guid.NewGuid(), processTypeId, Guid.NewGuid());
                 return process;
             });
 
@@ -2260,12 +2260,12 @@ public async Task SubmitRegistrationAsync_WithDocumentId_Success()
                 setOptionalParameters(application);
             });
 
-        IEnumerable<ProcessStep<ProcessTypeId, ProcessStepTypeId>>? processSteps = null;
+        IEnumerable<ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>>? processSteps = null;
 
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .ReturnsLazily((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepTypeStatus) =>
             {
-                processSteps = processStepTypeStatus.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, utcNow)).ToImmutableArray();
+                processSteps = processStepTypeStatus.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, utcNow)).ToImmutableArray();
                 return processSteps;
             });
         var settings = new RegistrationSettings
@@ -3597,18 +3597,18 @@ public async Task DeclineApplicationRegistrationAsync_CallsExpected()
                 }
             });
 
-        var createdProcessesBuilder = ImmutableArray.CreateBuilder<Process<ProcessTypeId, ProcessStepTypeId>>();
+        var createdProcessesBuilder = ImmutableArray.CreateBuilder<Process>();
         A.CallTo(() => _processStepRepository.CreateProcessRange(A<IEnumerable<ProcessTypeId>>._))
             .ReturnsLazily((IEnumerable<ProcessTypeId> processTypeIds) =>
             {
-                var processes = processTypeIds.Select(x => new Process<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x, Guid.NewGuid())).ToImmutableArray();
+                var processes = processTypeIds.Select(x => new Process(Guid.NewGuid(), x, Guid.NewGuid())).ToImmutableArray();
                 createdProcessesBuilder.AddRange(processes);
                 return processes;
             });
 
         A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .ReturnsLazily((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepStatusTypeIds) =>
-                processStepStatusTypeIds.Select(x => new ProcessStep<ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToImmutableArray());
+                processStepStatusTypeIds.Select(x => new ProcessStep<Process, ProcessTypeId, ProcessStepTypeId>(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToImmutableArray());
 
         var modifiedIdentitiesBuilder = ImmutableArray.CreateBuilder<(Identity Initial, Identity Modified)>();
         A.CallTo(() => _userRepository.AttachAndModifyIdentities(A<IEnumerable<(Guid IdentityId, Action<Identity>?, Action<Identity>)>>._))
diff --git a/tests/registration/Registration.Service.Tests/Registration.Service.Tests.csproj b/tests/registration/Registration.Service.Tests/Registration.Service.Tests.csproj
index 1f8fe0aa31..b5b80811e6 100644
--- a/tests/registration/Registration.Service.Tests/Registration.Service.Tests.csproj
+++ b/tests/registration/Registration.Service.Tests/Registration.Service.Tests.csproj
@@ -42,8 +42,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\..\src\registration\Registration.Service\Registration.Service.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
diff --git a/tests/shared/Tests.Shared/Tests.Shared.csproj b/tests/shared/Tests.Shared/Tests.Shared.csproj
index 7edea56082..fc5079486f 100644
--- a/tests/shared/Tests.Shared/Tests.Shared.csproj
+++ b/tests/shared/Tests.Shared/Tests.Shared.csproj
@@ -32,14 +32,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\..\src\framework\Framework.Token\Framework.Token.csproj" />
     <ProjectReference Include="..\..\..\src\keycloak\Keycloak.Library\Keycloak.Library.csproj" />
-    <ProjectReference Include="..\..\..\src\provisioning\Provisioning.Library\Provisioning.Library.csproj" />
     <ProjectReference Include="..\..\framework\Framework.Tests.Shared\Framework.Tests.Shared.csproj" />
     <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.Migrations\PortalBackend.Migrations.csproj" />
-    <ProjectReference Include="..\..\..\src\portalbackend\PortalBackend.PortalEntities\PortalBackend.PortalEntities.csproj" />
     <ProjectReference Include="..\..\..\src\web\Web.Identity\Web.Identity.csproj" />
     <ProjectReference Include="..\..\..\src\web\Web.PublicInfos\Web.PublicInfos.csproj" />
   </ItemGroup>
diff --git a/tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs b/tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs
index 9cbd1d0097..aac95bf0b3 100644
--- a/tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs
+++ b/tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs
@@ -76,7 +76,7 @@ public MandatoryIdentityClaimHandlerTests()
 
         A.CallTo(() => _technicalUserRepository.GetTechnicalUserDataByClientId(_clientId)).Returns((_serviceAccountId, _serviceAccountCompanyId));
         A.CallTo(() => _identityRepository.GetActiveIdentityDataByUserEntityId(_subject_company_user)).Returns((_companyUserId, IdentityTypeId.COMPANY_USER, _companyUserCompanyId));
-        A.CallTo(() => _identityRepository.GetActiveIdentityDataByUserEntityId(_subject_service_account)).Returns((_serviceAccountId, IdentityTypeId.COMPANY_SERVICE_ACCOUNT, _serviceAccountCompanyId));
+        A.CallTo(() => _identityRepository.GetActiveIdentityDataByUserEntityId(_subject_service_account)).Returns((_serviceAccountId, IdentityTypeId.TECHNICAL_USER, _serviceAccountCompanyId));
         A.CallTo(() => _identityRepository.GetActiveCompanyIdByIdentityId(_companyUserId)).Returns(_companyUserCompanyId);
 
         _mockLogger = A.Fake<IMockLogger<MandatoryIdentityClaimHandler>>();
@@ -88,18 +88,18 @@ public MandatoryIdentityClaimHandlerTests()
     [InlineData("preferred_username", "eceefebe-8f34-4d11-85ef-767786a95a92", PolicyTypeId.CompanyUser, IClaimsIdentityDataBuilderStatus.Initialized, true, "eceefebe-8f34-4d11-85ef-767786a95a92", IdentityTypeId.COMPANY_USER, "00000000-0000-0000-0000-000000000000")]
     [InlineData("preferred_username", "eceefebe-8f34-4d11-85ef-767786a95a92", PolicyTypeId.ServiceAccount, IClaimsIdentityDataBuilderStatus.Initialized, false, "eceefebe-8f34-4d11-85ef-767786a95a92", IdentityTypeId.COMPANY_USER, "00000000-0000-0000-0000-000000000000")]
     [InlineData("preferred_username", "eceefebe-8f34-4d11-85ef-767786a95a92", PolicyTypeId.ValidCompany, IClaimsIdentityDataBuilderStatus.Complete, true, "eceefebe-8f34-4d11-85ef-767786a95a92", IdentityTypeId.COMPANY_USER, "0d0de79b-c05d-4153-9c97-7331900880d2")]
-    [InlineData("client_id", "valid_client", PolicyTypeId.ValidIdentity, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.COMPANY_SERVICE_ACCOUNT, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
-    [InlineData("client_id", "valid_client", PolicyTypeId.CompanyUser, IClaimsIdentityDataBuilderStatus.Complete, false, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.COMPANY_SERVICE_ACCOUNT, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
-    [InlineData("client_id", "valid_client", PolicyTypeId.ServiceAccount, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.COMPANY_SERVICE_ACCOUNT, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
-    [InlineData("client_id", "valid_client", PolicyTypeId.ValidCompany, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.COMPANY_SERVICE_ACCOUNT, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
+    [InlineData("client_id", "valid_client", PolicyTypeId.ValidIdentity, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.TECHNICAL_USER, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
+    [InlineData("client_id", "valid_client", PolicyTypeId.CompanyUser, IClaimsIdentityDataBuilderStatus.Complete, false, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.TECHNICAL_USER, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
+    [InlineData("client_id", "valid_client", PolicyTypeId.ServiceAccount, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.TECHNICAL_USER, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
+    [InlineData("client_id", "valid_client", PolicyTypeId.ValidCompany, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.TECHNICAL_USER, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
     [InlineData("sub", "valid_sub_company_user", PolicyTypeId.ValidIdentity, IClaimsIdentityDataBuilderStatus.Complete, true, "eceefebe-8f34-4d11-85ef-767786a95a92", IdentityTypeId.COMPANY_USER, "0d0de79b-c05d-4153-9c97-7331900880d2")]
     [InlineData("sub", "valid_sub_company_user", PolicyTypeId.CompanyUser, IClaimsIdentityDataBuilderStatus.Complete, true, "eceefebe-8f34-4d11-85ef-767786a95a92", IdentityTypeId.COMPANY_USER, "0d0de79b-c05d-4153-9c97-7331900880d2")]
     [InlineData("sub", "valid_sub_company_user", PolicyTypeId.ServiceAccount, IClaimsIdentityDataBuilderStatus.Complete, false, "eceefebe-8f34-4d11-85ef-767786a95a92", IdentityTypeId.COMPANY_USER, "0d0de79b-c05d-4153-9c97-7331900880d2")]
     [InlineData("sub", "valid_sub_company_user", PolicyTypeId.ValidCompany, IClaimsIdentityDataBuilderStatus.Complete, true, "eceefebe-8f34-4d11-85ef-767786a95a92", IdentityTypeId.COMPANY_USER, "0d0de79b-c05d-4153-9c97-7331900880d2")]
-    [InlineData("sub", "valid_sub_service_account", PolicyTypeId.ValidIdentity, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.COMPANY_SERVICE_ACCOUNT, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
-    [InlineData("sub", "valid_sub_service_account", PolicyTypeId.CompanyUser, IClaimsIdentityDataBuilderStatus.Complete, false, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.COMPANY_SERVICE_ACCOUNT, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
-    [InlineData("sub", "valid_sub_service_account", PolicyTypeId.ServiceAccount, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.COMPANY_SERVICE_ACCOUNT, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
-    [InlineData("sub", "valid_sub_service_account", PolicyTypeId.ValidCompany, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.COMPANY_SERVICE_ACCOUNT, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
+    [InlineData("sub", "valid_sub_service_account", PolicyTypeId.ValidIdentity, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.TECHNICAL_USER, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
+    [InlineData("sub", "valid_sub_service_account", PolicyTypeId.CompanyUser, IClaimsIdentityDataBuilderStatus.Complete, false, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.TECHNICAL_USER, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
+    [InlineData("sub", "valid_sub_service_account", PolicyTypeId.ServiceAccount, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.TECHNICAL_USER, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
+    [InlineData("sub", "valid_sub_service_account", PolicyTypeId.ValidCompany, IClaimsIdentityDataBuilderStatus.Complete, true, "53472768-6cb5-41b0-9421-5c956e44e8c8", IdentityTypeId.TECHNICAL_USER, "a61092d7-1516-4ccf-b922-0308bbb087e3")]
     [InlineData(null, null, PolicyTypeId.ValidIdentity, IClaimsIdentityDataBuilderStatus.Empty, false, "00000000-0000-0000-0000-000000000000", default(IdentityTypeId), "00000000-0000-0000-0000-000000000000")]
     [InlineData(null, null, PolicyTypeId.CompanyUser, IClaimsIdentityDataBuilderStatus.Empty, false, "00000000-0000-0000-0000-000000000000", default(IdentityTypeId), "00000000-0000-0000-0000-000000000000")]
     [InlineData(null, null, PolicyTypeId.ServiceAccount, IClaimsIdentityDataBuilderStatus.Empty, false, "00000000-0000-0000-0000-000000000000", default(IdentityTypeId), "00000000-0000-0000-0000-000000000000")]
diff --git a/tests/web/Web.Identity.Tests/Web.Identity.Tests.csproj b/tests/web/Web.Identity.Tests/Web.Identity.Tests.csproj
index 74029f8341..4ab34aaa9a 100644
--- a/tests/web/Web.Identity.Tests/Web.Identity.Tests.csproj
+++ b/tests/web/Web.Identity.Tests/Web.Identity.Tests.csproj
@@ -40,8 +40,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\..\src\web\Web.Identity\Web.Identity.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>
diff --git a/tests/web/Web.PublicInfos.Tests/Web.PublicInfos.Tests.csproj b/tests/web/Web.PublicInfos.Tests/Web.PublicInfos.Tests.csproj
index 799ffe3963..136c434a89 100644
--- a/tests/web/Web.PublicInfos.Tests/Web.PublicInfos.Tests.csproj
+++ b/tests/web/Web.PublicInfos.Tests/Web.PublicInfos.Tests.csproj
@@ -39,8 +39,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\framework\Framework.Identity\Framework.Identity.csproj" />
-    <ProjectReference Include="..\..\..\src\framework\Framework.Processes.Library.Concrete\Framework.Processes.Library.Concrete.csproj" />
     <ProjectReference Include="..\..\..\src\web\Web.PublicInfos\Web.PublicInfos.csproj" />
     <ProjectReference Include="..\..\shared\Tests.Shared\Tests.Shared.csproj" />
   </ItemGroup>