diff --git a/BMA.EHR.Application/Repositories/PrefixRepository.cs b/BMA.EHR.Application/Repositories/PrefixRepository.cs
index 1b6a2b15..2e540744 100644
--- a/BMA.EHR.Application/Repositories/PrefixRepository.cs
+++ b/BMA.EHR.Application/Repositories/PrefixRepository.cs
@@ -1,11 +1,12 @@
 using BMA.EHR.Application.Common.Interfaces;
+using BMA.EHR.Domain.Models.Documents;
 using BMA.EHR.Domain.Models.MetaData;
 using Microsoft.AspNetCore.Http;
 using System.Security.AccessControl;
 
 namespace BMA.EHR.Application.Repositories
 {
-    public class PrefixRepository : GenericRepository<Guid, Prefix>
+    public class PrefixRepository : GenericRepository<Guid, Document>
     {
         private readonly IApplicationDBContext _dbContext;
         private readonly IHttpContextAccessor _httpContextAccessor;
diff --git a/BMA.EHR.Domain/Models/Documents/Document.cs b/BMA.EHR.Domain/Models/Documents/Document.cs
index 82bf5cc9..98a119a4 100644
--- a/BMA.EHR.Domain/Models/Documents/Document.cs
+++ b/BMA.EHR.Domain/Models/Documents/Document.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace BMA.EHR.Profile.Service.Models.Documents
+namespace BMA.EHR.Domain.Models.Documents
 {
     public class Document
     {
diff --git a/BMA.EHR.Domain/Models/HR/Profile.cs b/BMA.EHR.Domain/Models/HR/Profile.cs
index 04043cd4..d406c038 100644
--- a/BMA.EHR.Domain/Models/HR/Profile.cs
+++ b/BMA.EHR.Domain/Models/HR/Profile.cs
@@ -1,7 +1,7 @@
-using BMA.EHR.Profile.Service.Models.Documents;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
 using BMA.EHR.Domain.Models.Base;
+using BMA.EHR.Domain.Models.Documents;
 
 namespace BMA.EHR.Profile.Service.Models.HR
 {
diff --git a/BMA.EHR.Domain/Models/HR/ProfileAvatarHistory.cs b/BMA.EHR.Domain/Models/HR/ProfileAvatarHistory.cs
index 27ab1f94..8da7e4ba 100644
--- a/BMA.EHR.Domain/Models/HR/ProfileAvatarHistory.cs
+++ b/BMA.EHR.Domain/Models/HR/ProfileAvatarHistory.cs
@@ -1,7 +1,6 @@
-using BMA.EHR.Profile.Service.Models.Documents;
-using System.ComponentModel.DataAnnotations;
+using BMA.EHR.Domain.Models.Base;
+using BMA.EHR.Domain.Models.Documents;
 using Microsoft.EntityFrameworkCore;
-using BMA.EHR.Domain.Models.Base;
 
 namespace BMA.EHR.Profile.Service.Models.HR
 {
diff --git a/BMA.EHR.Domain/Models/HR/ProfileChangeName.cs b/BMA.EHR.Domain/Models/HR/ProfileChangeName.cs
index c4c1048a..928d1f62 100644
--- a/BMA.EHR.Domain/Models/HR/ProfileChangeName.cs
+++ b/BMA.EHR.Domain/Models/HR/ProfileChangeName.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using BMA.EHR.Domain.Models.Base;
+using BMA.EHR.Domain.Models.Documents;
 using Microsoft.EntityFrameworkCore;
-using BMA.EHR.Profile.Service.Models.Documents;
-using BMA.EHR.Domain.Models.Base;
+using System.ComponentModel.DataAnnotations;
 
 namespace BMA.EHR.Profile.Service.Models.HR
 {
diff --git a/BMA.EHR.Domain/Models/HR/ProfileChangeNameHistory.cs b/BMA.EHR.Domain/Models/HR/ProfileChangeNameHistory.cs
index 18562565..fdfac89d 100644
--- a/BMA.EHR.Domain/Models/HR/ProfileChangeNameHistory.cs
+++ b/BMA.EHR.Domain/Models/HR/ProfileChangeNameHistory.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using BMA.EHR.Domain.Models.Base;
+using BMA.EHR.Domain.Models.Documents;
 using Microsoft.EntityFrameworkCore;
-using BMA.EHR.Profile.Service.Models.Documents;
-using BMA.EHR.Domain.Models.Base;
+using System.ComponentModel.DataAnnotations;
 
 namespace BMA.EHR.Profile.Service.Models.HR
 {
diff --git a/BMA.EHR.Domain/Models/HR/ProfileOrganization.cs b/BMA.EHR.Domain/Models/HR/ProfileOrganization.cs
index 50873ee2..70c4c58a 100644
--- a/BMA.EHR.Domain/Models/HR/ProfileOrganization.cs
+++ b/BMA.EHR.Domain/Models/HR/ProfileOrganization.cs
@@ -1,7 +1,5 @@
-using BMA.EHR.Profile.Service.Models.Documents;
-using System.ComponentModel.DataAnnotations;
+using BMA.EHR.Domain.Models.Base;
 using Microsoft.EntityFrameworkCore;
-using BMA.EHR.Domain.Models.Base;
 
 namespace BMA.EHR.Profile.Service.Models.HR
 {
diff --git a/BMA.EHR.Domain/Models/HR/ProfilePaper.cs b/BMA.EHR.Domain/Models/HR/ProfilePaper.cs
index 216b61e1..41cda1f7 100644
--- a/BMA.EHR.Domain/Models/HR/ProfilePaper.cs
+++ b/BMA.EHR.Domain/Models/HR/ProfilePaper.cs
@@ -1,5 +1,5 @@
 using BMA.EHR.Domain.Models.Base;
-using BMA.EHR.Profile.Service.Models.Documents;
+using BMA.EHR.Domain.Models.Documents;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations;
 
diff --git a/BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj b/BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj
index e355a7c5..3ad1be21 100644
--- a/BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj
+++ b/BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj
@@ -15,6 +15,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
     <PackageReference Include="Oracle.EntityFrameworkCore" Version="7.21.9" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
diff --git a/BMA.EHR.Infrastructure/Persistence/ApplicationDBContext.cs b/BMA.EHR.Infrastructure/Persistence/ApplicationDBContext.cs
index 6fbdab9e..fadf6b47 100644
--- a/BMA.EHR.Infrastructure/Persistence/ApplicationDBContext.cs
+++ b/BMA.EHR.Infrastructure/Persistence/ApplicationDBContext.cs
@@ -1,4 +1,5 @@
 using BMA.EHR.Application.Common.Interfaces;
+using BMA.EHR.Domain.Models.Documents;
 using BMA.EHR.Domain.Models.MetaData;
 using Microsoft.EntityFrameworkCore;
 
@@ -94,67 +95,18 @@ namespace BMA.EHR.Infrastructure.Persistence
 
         #endregion
 
+        #region " Documents "
+
+        public DbSet<Document> Documents { get; set; }
+
+        #endregion
+
         #endregion
 
         public ApplicationDBContext(DbContextOptions<ApplicationDBContext> options) : base(options)
         {
         }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            
-
-            //Ignore Existing table from other service
-            //modelBuilder.Ignore<Prefix>();
-            //modelBuilder.Ignore<BloodGroup>();
-            //modelBuilder.Ignore<Gender>();
-            //modelBuilder.Ignore<PhysicalStatus>();
-            //modelBuilder.Ignore<Religion>();
-            //modelBuilder.Ignore<EducationLevel>();
-            //modelBuilder.Ignore<PositionPath>();
-            //modelBuilder.Ignore<PositionType>();
-            //modelBuilder.Ignore<PositionEmployeePosition>();
-            //modelBuilder.Ignore<PositionEmployeePositionSide>();
-            //modelBuilder.Ignore<PositionEmployeeGroup>();
-            //modelBuilder.Ignore<PositionEmployeeLine>();
-            //modelBuilder.Ignore<PositionEmployeeLevel>();
-            //modelBuilder.Ignore<PositionEmployeeStatus>();
-            //modelBuilder.Ignore<PositionLine>();
-            //modelBuilder.Ignore<PositionExecutive>();
-            //modelBuilder.Ignore<PositionStatus>();
-            //modelBuilder.Ignore<PositionLevel>();
-            //modelBuilder.Ignore<Relationship>();
-            //modelBuilder.Ignore<Position>();
-            //modelBuilder.Ignore<PositionPathSide>();
-            //modelBuilder.Ignore<PositionExecutiveSide>();
-            //modelBuilder.Ignore<InsigniaType>();
-            //modelBuilder.Ignore<Insignia>();
-            //modelBuilder.Ignore<Province>();
-            //modelBuilder.Ignore<District>();
-            //modelBuilder.Ignore<SubDistrict>();
-            //modelBuilder.Ignore<Holiday>();
-            //modelBuilder.Ignore<OrganizationType>();
-            //modelBuilder.Ignore<OrganizationLevel>();
-            //modelBuilder.Ignore<OrganizationOrganization>();
-            //modelBuilder.Ignore<OrganizationShortName>();
-            //modelBuilder.Ignore<OrganizationStatus>();
-            //modelBuilder.Ignore<OrganizationAgency>();
-            //modelBuilder.Ignore<OrganizationGovernmentAgency>();
-            //modelBuilder.Ignore<OrganizationTelExternal>();
-            //modelBuilder.Ignore<OrganizationTelInternal>();
-            //modelBuilder.Ignore<OrganizationFax>();
-            //modelBuilder.Ignore<RoyalHierarchy>();
-            //modelBuilder.Ignore<RoyalType>();
-            //modelBuilder.Ignore<Royal>();
-
-            base.OnModelCreating(modelBuilder);
-        }
-
-        public override DbSet<TEntity> Set<TEntity>() where TEntity : class
-        {
-            return base.Set<TEntity>();
-        }
-
         public Task<int> SaveChangesAsync()
         {
             return base.SaveChangesAsync();