diff --git a/Marechai/Pages/Admin/Details/Book.razor.cs b/Marechai/Pages/Admin/Details/Book.razor.cs
index bf2e6625..1f94f312 100644
--- a/Marechai/Pages/Admin/Details/Book.razor.cs
+++ b/Marechai/Pages/Admin/Details/Book.razor.cs
@@ -81,12 +81,14 @@ namespace Marechai.Pages.Admin.Details
                !_creating)
                 return;
 
-            _countries           = await CountriesService.GetAsync();
-            _companies           = await CompaniesService.GetAsync();
-            _roles               = await DocumentRolesService.GetEnabledAsync();
-            _model               = _creating ? new BookViewModel() : await Service.GetAsync(Id);
-            _authState           = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-            _addingCompanyRoleId = _roles.First().Id;
+            _countries               = await CountriesService.GetAsync();
+            _companies               = await CompaniesService.GetAsync();
+            _roles                   = await DocumentRolesService.GetEnabledAsync();
+            _machineFamilies         = await MachineFamiliesService.GetAsync();
+            _model                   = _creating ? new BookViewModel() : await Service.GetAsync(Id);
+            _authState               = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+            _addingCompanyRoleId     = _roles.First().Id;
+            _bookCompanies           = await CompaniesByBookService.GetByBook(Id);
 
             _editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant().
                                                       StartsWith("admin/books/edit/",
diff --git a/Marechai/Pages/Admin/Details/Document.razor.cs b/Marechai/Pages/Admin/Details/Document.razor.cs
index 34761469..c968e38f 100644
--- a/Marechai/Pages/Admin/Details/Document.razor.cs
+++ b/Marechai/Pages/Admin/Details/Document.razor.cs
@@ -84,6 +84,7 @@ namespace Marechai.Pages.Admin.Details
             _model               = _creating ? new DocumentViewModel() : await Service.GetAsync(Id);
             _authState           = await AuthenticationStateProvider.GetAuthenticationStateAsync();
             _addingCompanyRoleId = _roles.First().Id;
+            _documentCompanies   = await CompaniesByDocumentService.GetByDocument(Id);
 
             _editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant().
                                                       StartsWith("admin/documents/edit/",
diff --git a/Marechai/Pages/Admin/Details/Magazine.razor.cs b/Marechai/Pages/Admin/Details/Magazine.razor.cs
index 4ba271bd..b3a14d3a 100644
--- a/Marechai/Pages/Admin/Details/Magazine.razor.cs
+++ b/Marechai/Pages/Admin/Details/Magazine.razor.cs
@@ -85,6 +85,7 @@ namespace Marechai.Pages.Admin.Details
             _model               = _creating ? new MagazineViewModel() : await Service.GetAsync(Id);
             _authState           = await AuthenticationStateProvider.GetAuthenticationStateAsync();
             _addingCompanyRoleId = _roles.First().Id;
+            _magazineCompanies   = await CompaniesByMagazineService.GetByMagazine(Id);
 
             _editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant().
                                                       StartsWith("admin/magazines/edit/",
diff --git a/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs b/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs
index f1f5d867..c0860351 100644
--- a/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs
+++ b/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs
@@ -77,12 +77,13 @@ namespace Marechai.Pages.Admin.Details
                !_creating)
                 return;
 
-            _softwareFamilies    = await Service.GetAsync();
-            _companies           = await CompaniesService.GetAsync();
-            _roles               = await DocumentRolesService.GetEnabledAsync();
-            _model               = _creating ? new SoftwareFamilyViewModel() : await Service.GetAsync(Id);
-            _authState           = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-            _addingCompanyRoleId = _roles.First().Id;
+            _softwareFamilies        = await Service.GetAsync();
+            _companies               = await CompaniesService.GetAsync();
+            _roles                   = await DocumentRolesService.GetEnabledAsync();
+            _model                   = _creating ? new SoftwareFamilyViewModel() : await Service.GetAsync(Id);
+            _authState               = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+            _addingCompanyRoleId     = _roles.First().Id;
+            _softwareFamilyCompanies = await CompaniesBySoftwareFamilyService.GetBySoftwareFamily(Id);
 
             _editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant().
                                                       StartsWith("admin/software_families/edit/",
diff --git a/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs b/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs
index 7e85aa18..5fef93a4 100644
--- a/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs
+++ b/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs
@@ -40,7 +40,7 @@ namespace Marechai.Pages.Admin.Details
     {
         bool                                    _addingCompany;
         int?                                    _addingCompanyId;
-        string                   _addingCompanyRoleId;
+        string                                  _addingCompanyRoleId;
         AuthenticationState                     _authState;
         List<CompanyViewModel>                  _companies;
         bool                                    _creating;
@@ -94,13 +94,14 @@ namespace Marechai.Pages.Admin.Details
                !_creating)
                 return;
 
-            _softwareVariants    = await Service.GetAsync();
-            _softwareVersions    = await SoftwareVersionsService.GetAsync();
-            _companies           = await CompaniesService.GetAsync();
-            _roles               = await DocumentRolesService.GetEnabledAsync();
-            _model               = _creating ? new SoftwareVariantViewModel() : await Service.GetAsync(Id);
-            _authState           = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-            _addingCompanyRoleId = _roles.First().Id;
+            _softwareVariants         = await Service.GetAsync();
+            _softwareVersions         = await SoftwareVersionsService.GetAsync();
+            _companies                = await CompaniesService.GetAsync();
+            _roles                    = await DocumentRolesService.GetEnabledAsync();
+            _model                    = _creating ? new SoftwareVariantViewModel() : await Service.GetAsync(Id);
+            _authState                = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+            _addingCompanyRoleId      = _roles.First().Id;
+            _softwareVariantCompanies = await CompaniesBySoftwareVariantService.GetBySoftwareVariant(Id);
 
             _editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant().
                                                       StartsWith("admin/software_variants/edit/",
diff --git a/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs b/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs
index 37262255..39025b3e 100644
--- a/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs
+++ b/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs
@@ -82,14 +82,15 @@ namespace Marechai.Pages.Admin.Details
                !_creating)
                 return;
 
-            _softwareVersions    = await Service.GetAsync();
-            _softwareFamilies    = await SoftwareFamiliesService.GetAsync();
-            _licenses            = await LicensesService.GetAsync();
-            _companies           = await CompaniesService.GetAsync();
-            _roles               = await DocumentRolesService.GetEnabledAsync();
-            _model               = _creating ? new SoftwareVersionViewModel() : await Service.GetAsync(Id);
-            _authState           = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-            _addingCompanyRoleId = _roles.First().Id;
+            _softwareVersions         = await Service.GetAsync();
+            _softwareFamilies         = await SoftwareFamiliesService.GetAsync();
+            _licenses                 = await LicensesService.GetAsync();
+            _companies                = await CompaniesService.GetAsync();
+            _roles                    = await DocumentRolesService.GetEnabledAsync();
+            _model                    = _creating ? new SoftwareVersionViewModel() : await Service.GetAsync(Id);
+            _authState                = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+            _addingCompanyRoleId      = _roles.First().Id;
+            _softwareVersionCompanies = await CompaniesBySoftwareVersionService.GetBySoftwareVersion(Id);
 
             _editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant().
                                                       StartsWith("admin/software_versions/edit/",