From 569eaa09f6d8b172468b017d5083d58bd12de928 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Wed, 5 Aug 2020 21:00:35 +0100
Subject: [PATCH] Code re-style.

---
 .../20180805214952_InitialMigration.cs        |   47 +-
 .../20180806192514_UseExistingEnumerations.cs |    4 +-
 .../20180806201559_SingularizeModelNames.cs   |    4 +-
 ...180806202841_BrowserTestFieldsAsBoolean.cs |    4 +-
 .../Migrations/20180806222713_LogosGuid.cs    |    4 +-
 .../20180807193120_CorrectLogosInCompany.cs   |    4 +-
 .../20180811130603_CreateIdentitySchema.cs    |   58 +-
 ...0190518145625_RemoveCompanyDescriptions.cs |    3 +-
 .../20190518150032_AddCompanyDescriptions.cs  |    3 +-
 .../20190527020604_MachinePhotos.cs           |    3 +-
 .../Migrations/20190527160705_Licenses.cs     |    6 +-
 .../20190529194436_AddOwnedMachines.cs        |   39 +-
 .../Migrations/20190601122952_AddScreens.cs   |   15 +-
 .../Migrations/20190602021943_AddPerson.cs    |   14 +-
 .../Migrations/20190603165746_AddIso639.cs    |   13 +-
 .../20190605142832_AddPeopleByCompany.cs      |    9 +-
 .../Migrations/20190616210450_AddDocuments.cs |    8 +-
 .../20190616211045_AddDocumentRoles.cs        |    3 +-
 .../20190616232349_AddDocumentPeople.cs       |    3 +-
 .../20190616233045_AddPeopleByDocument.cs     |    5 +-
 .../20190616233807_AddDocumentCompany.cs      |    3 +-
 .../20190616234431_AddCompaniesByDocument.cs  |    5 +-
 .../20190616235255_AddDocumentsByMachine.cs   |    3 +-
 ...90617010136_AddDocumentsByMachineFamily.cs |    3 +-
 .../Migrations/20190617012113_AddBooks.cs     |   18 +-
 .../20190617014131_AddCompaniesByBook.cs      |    4 +-
 .../20190617015011_AddPeopleByBook.cs         |    4 +-
 .../20190617020655_AddBooksByMachine.cs       |    3 +-
 .../20190617021725_AddBooksByMachineFamily.cs |    3 +-
 .../20190617024228_AddMagazineIssues.cs       |    6 +-
 .../20190617025439_AddCompaniesByMagazine.cs  |    5 +-
 .../20190617030141_AddPeopleByMagazine.cs     |    5 +-
 .../20190617031250_AddMagazinesByMachine.cs   |    3 +-
 ...90617031843_AddMagazinesByMachineFamily.cs |    3 +-
 .../20200601020415_SetDetaulfsForBooleans.cs  |    4 +-
 .../20200609211809_AddAuditTable.cs           |    9 +-
 .../20200610194822_AddCurrencyInflation.cs    |    3 +-
 .../20200610200500_AddCurrencyPegging.cs      |    6 +-
 .../20200610205411_AddDumpHardware.cs         |    5 +-
 .../Migrations/20200610215731_AddFiles.cs     |   21 +-
 .../20200610220719_AddFileDataStreams.cs      |    5 +-
 .../20200610225546_AddFilesystems.cs          |   29 +-
 .../20200610233739_AddLogicalPartitions.cs    |   15 +-
 .../Migrations/20200611000722_AddMedia.cs     |   35 +-
 ...00611004927_AddLogicalPartitionsByMedia.cs |    3 +-
 .../Migrations/20200611010054_AddMediaDump.cs |    3 +-
 .../20200611022135_AddMediaDumpFileImage.cs   |   16 +-
 .../20200611024009_AddMediaDumpImages.cs      |    6 +-
 ...0611024934_AddMediaDumpSubchannelImages.cs |   15 +-
 .../20200611030041_AddMediaDumpTrackImages.cs |   15 +-
 .../20200611032953_AddMediaFiles.cs           |   30 +-
 .../Migrations/20200611035031_AddDumps.cs     |    9 +-
 .../20200611174904_AddSoftwareFamily.cs       |   11 +-
 .../20200611180218_AddSoftwareVersion.cs      |   15 +-
 .../20200611212211_AddSoftwareVariant.cs      |   73 +-
 .../20200611221232_AddMasteringTexts.cs       |    6 +-
 .../20200611223854_AddMediaTagDumps.cs        |    3 +-
 ...611230627_AddSoftwareByCompilationMedia.cs |    6 +-
 Marechai.Database/Models/MarechaiContext.cs   |   24 +-
 Marechai.Database/Operations/Update.cs        |  115 +-
 Marechai.Database/Schemas/Sql/V10.cs          |  130 +-
 Marechai.Database/Schemas/Sql/V11.cs          |   37 +-
 Marechai.Database/Schemas/Sql/V12.cs          |  178 +-
 Marechai.Database/Schemas/Sql/V13.cs          |  240 +-
 Marechai.Database/Schemas/Sql/V14.cs          |  111 +-
 Marechai.Database/Schemas/Sql/V15.cs          |  111 +-
 Marechai.Database/Schemas/Sql/V16.cs          |  100 +-
 Marechai.Database/Schemas/Sql/V17.cs          |   84 +-
 Marechai.Database/Schemas/Sql/V18.cs          |   50 +-
 Marechai.Database/Schemas/Sql/V19.cs          |   85 +-
 Marechai.Database/Schemas/Sql/V20.cs          |   15 +-
 Marechai.Database/Schemas/Sql/V21.cs          |   17 +-
 Marechai.Database/Schemas/Sql/V22.cs          |   36 +-
 Marechai.Database/Schemas/Sql/V4.cs           |  173 +-
 Marechai.Database/Schemas/Sql/V5.cs           |   16 +-
 Marechai.Database/Schemas/Sql/V6.cs           |  172 +-
 Marechai.Database/Schemas/Sql/V7.cs           |   53 +-
 Marechai.Database/Schemas/Sql/V8.cs           |   21 +-
 Marechai.Database/Schemas/Sql/V9.cs           |   18 +-
 Marechai.Database/Seeders/DocumentRoles.cs    | 1084 ++++--
 Marechai.Database/Seeders/Iso4217.cs          |    8 +-
 Marechai.Database/Seeders/Iso639.cs           |   10 +-
 Marechai.Database/Seeders/License.cs          | 3045 ++++++++++++-----
 Marechai.Database/Seeders/Roles.cs            |    3 +-
 Marechai.Database/Seeders/Users.cs            |    4 +-
 .../Areas/Identity/IdentityHostingStartup.cs  |    2 +-
 .../Pages/Account/AccessDenied.cshtml.cs      |    2 +-
 .../Pages/Account/ExternalLogin.cshtml.cs     |    7 +-
 .../Pages/Account/ForgotPassword.cshtml.cs    |    3 +-
 .../ForgotPasswordConfirmation.cshtml.cs      |    2 +-
 .../Identity/Pages/Account/Lockout.cshtml.cs  |    2 +-
 .../Identity/Pages/Account/Login.cshtml.cs    |    3 +-
 .../Identity/Pages/Account/Logout.cshtml.cs   |    2 +-
 .../Manage/DownloadPersonalData.cshtml.cs     |    7 +-
 .../Pages/Account/Manage/Email.cshtml.cs      |    8 +-
 .../Manage/ResetAuthenticator.cshtml.cs       |    2 +-
 .../Identity/Pages/Account/Register.cshtml.cs |   11 +-
 .../Account/RegisterConfirmation.cshtml.cs    |    5 +-
 .../Account/ResendEmailConfirmation.cshtml.cs |    5 +-
 .../ResetPasswordConfirmation.cshtml.cs       |    2 +-
 Marechai/Helpers/ImageMagick.cs               |  250 +-
 Marechai/Helpers/Photos.cs                    |   80 +-
 Marechai/Helpers/SvgRender.cs                 |   10 +-
 Marechai/Interop/DetectOS.cs                  |  168 +-
 Marechai/Interop/Version.cs                   |    2 +-
 .../Admin/Details/CreateMachinePhoto.razor.cs |   40 +-
 .../Pages/Admin/Details/MachinePhoto.razor.cs |   30 +-
 Marechai/Pages/_Host.cshtml.cs                |    6 +-
 Marechai/Services/AdminService.cs             |    2 +-
 Marechai/Services/BrowserTestsService.cs      |    8 +-
 Marechai/Services/CompaniesService.cs         |   92 +-
 Marechai/Services/CompanyLogosService.cs      |    4 +-
 Marechai/Services/ComputersService.cs         |   24 +-
 Marechai/Services/ConsolesService.cs          |   24 +-
 Marechai/Services/DocumentCompaniesService.cs |   10 +-
 Marechai/Services/DocumentPeopleService.cs    |   18 +-
 Marechai/Services/GpusByMachineService.cs     |   10 +-
 Marechai/Services/GpusService.cs              |   45 +-
 ...tructionSetExtensionsByProcessorService.cs |   10 +-
 .../InstructionSetExtensionsService.cs        |    6 +-
 Marechai/Services/InstructionSetsService.cs   |    6 +-
 Marechai/Services/LicensesService.cs          |   25 +-
 Marechai/Services/MachineFamiliesService.cs   |   11 +-
 Marechai/Services/MachinePhotosService.cs     |  111 +-
 Marechai/Services/MachinesService.cs          |   50 +-
 Marechai/Services/MemoriesByMachineService.cs |   13 +-
 Marechai/Services/NewsService.cs              |    6 +-
 Marechai/Services/PeopleService.cs            |   46 +-
 .../Services/ProcessorsByMachineService.cs    |   12 +-
 Marechai/Services/ProcessorsService.cs        |  139 +-
 Marechai/Services/ResolutionsByGpuService.cs  |   17 +-
 .../Services/ResolutionsByScreenService.cs    |   17 +-
 Marechai/Services/ResolutionsService.cs       |   26 +-
 Marechai/Services/ScreensByMachineService.cs  |   36 +-
 Marechai/Services/ScreensService.cs           |   44 +-
 .../Services/SoundSynthsByMachineService.cs   |   10 +-
 Marechai/Services/SoundSynthsService.cs       |   73 +-
 Marechai/Services/StorageByMachineService.cs  |   10 +-
 Marechai/ViewModels/CompanyViewModel.cs       |   40 +-
 Marechai/ViewModels/NewsViewModel.cs          |    2 +-
 Marechai/ViewModels/ResolutionViewModel.cs    |    4 +-
 Marechai/ViewModels/ScreenViewModel.cs        |    4 +-
 142 files changed, 5327 insertions(+), 2877 deletions(-)

diff --git a/Marechai.Database/Migrations/20180805214952_InitialMigration.cs b/Marechai.Database/Migrations/20180805214952_InitialMigration.cs
index 2d5d7200..a9db2838 100644
--- a/Marechai.Database/Migrations/20180805214952_InitialMigration.cs
+++ b/Marechai.Database/Migrations/20180805214952_InitialMigration.cs
@@ -230,7 +230,8 @@ namespace Marechai.Database.Migrations
                 city        = table.Column<string>("varchar(80)", nullable: true),
                 province    = table.Column<string>("varchar(80)", nullable: true),
                 postal_code = table.Column<string>("varchar(25)", nullable: true),
-                country     = table.Column<short>("smallint(3)", nullable: true), status = table.Column<int>("int(11)")
+                country     = table.Column<short>("smallint(3)", nullable: true),
+                status      = table.Column<int>("int(11)")
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_companies", x => x.id);
@@ -246,7 +247,8 @@ namespace Marechai.Database.Migrations
             {
                 id = table.Column<int>("int(11)").
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                company_id = table.Column<int>("int(11)"), text = table.Column<string>("text", nullable: true)
+                company_id = table.Column<int>("int(11)"),
+                text       = table.Column<string>("text", nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_company_descriptions", x => x.id);
@@ -257,13 +259,16 @@ namespace Marechai.Database.Migrations
             {
                 id = table.Column<int>("int(11)").
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                company_id = table.Column<int>("int(11)"), year = table.Column<int>("int(4)", nullable: true),
+                company_id = table.Column<int>("int(11)"),
+                year       = table.Column<int>("int(4)", nullable: true),
                 logo_guid  = table.Column<string>("char(36)")
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_company_logos", x => new
                 {
-                    x.id, x.company_id, x.logo_guid
+                    x.id,
+                    x.company_id,
+                    x.logo_guid
                 });
 
                 table.ForeignKey("fk_company_logos_company1", x => x.company_id, "companies", "id",
@@ -280,7 +285,8 @@ namespace Marechai.Database.Migrations
                 introduced  = table.Column<DateTime>("datetime", nullable: true),
                 package     = table.Column<string>("varchar(45)", nullable: true),
                 process     = table.Column<string>("varchar(45)", nullable: true),
-                process_nm  = table.Column<float>(nullable: true), die_size = table.Column<float>(nullable: true),
+                process_nm  = table.Column<float>(nullable: true),
+                die_size    = table.Column<float>(nullable: true),
                 transistors = table.Column<long>("bigint(20)", nullable: true)
             }, constraints: table =>
             {
@@ -294,7 +300,8 @@ namespace Marechai.Database.Migrations
             {
                 id = table.Column<int>("int(11)").
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                company = table.Column<int>("int(11)"), name = table.Column<string>("varchar(255)")
+                company = table.Column<int>("int(11)"),
+                name    = table.Column<string>("varchar(255)")
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_machine_families", x => x.id);
@@ -321,14 +328,17 @@ namespace Marechai.Database.Migrations
                 cores            = table.Column<int>("int(11)", nullable: true),
                 threads_per_core = table.Column<int>("int(11)", nullable: true),
                 process          = table.Column<string>("varchar(45)", nullable: true),
-                process_nm       = table.Column<float>(nullable: true), die_size = table.Column<float>(nullable: true),
+                process_nm       = table.Column<float>(nullable: true),
+                die_size         = table.Column<float>(nullable: true),
                 transistors      = table.Column<long>("bigint(20)", nullable: true),
                 data_bus         = table.Column<int>("int(11)", nullable: true),
                 addr_bus         = table.Column<int>("int(11)", nullable: true),
                 SIMD_registers   = table.Column<int>("int(11)", nullable: true),
                 SIMD_size        = table.Column<int>("int(11)", nullable: true),
-                L1_instruction   = table.Column<float>(nullable: true), L1_data = table.Column<float>(nullable: true),
-                L2               = table.Column<float>(nullable: true), L3      = table.Column<float>(nullable: true)
+                L1_instruction   = table.Column<float>(nullable: true),
+                L1_data          = table.Column<float>(nullable: true),
+                L2               = table.Column<float>(nullable: true),
+                L3               = table.Column<float>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_processors", x => x.id);
@@ -364,7 +374,8 @@ namespace Marechai.Database.Migrations
 
             migrationBuilder.CreateTable("resolutions_by_gpu", table => new
             {
-                gpu = table.Column<int>("int(11)"), resolution = table.Column<int>("int(11)"),
+                gpu        = table.Column<int>("int(11)"),
+                resolution = table.Column<int>("int(11)"),
                 id = table.Column<long>("bigint(20)").
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
             }, constraints: table =>
@@ -403,12 +414,15 @@ namespace Marechai.Database.Migrations
             {
                 id = table.Column<int>("int(11)").
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                processor_id = table.Column<int>("int(11)"), extension_id = table.Column<int>("int(11)")
+                processor_id = table.Column<int>("int(11)"),
+                extension_id = table.Column<int>("int(11)")
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_instruction_set_extensions_by_processor", x => new
                 {
-                    x.id, x.processor_id, x.extension_id
+                    x.id,
+                    x.processor_id,
+                    x.extension_id
                 });
 
                 table.ForeignKey("fk_extension_extension_id", x => x.extension_id, "instruction_set_extensions", "id",
@@ -420,7 +434,8 @@ namespace Marechai.Database.Migrations
 
             migrationBuilder.CreateTable("gpus_by_machine", table => new
             {
-                gpu = table.Column<int>("int(11)"), machine = table.Column<int>("int(11)"),
+                gpu     = table.Column<int>("int(11)"),
+                machine = table.Column<int>("int(11)"),
                 id = table.Column<long>("bigint(20)").
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
             }, constraints: table =>
@@ -453,7 +468,8 @@ namespace Marechai.Database.Migrations
 
             migrationBuilder.CreateTable("processors_by_machine", table => new
             {
-                processor = table.Column<int>("int(11)"), machine = table.Column<int>("int(11)"),
+                processor = table.Column<int>("int(11)"),
+                machine   = table.Column<int>("int(11)"),
                 speed     = table.Column<float>(nullable: true),
                 id = table.Column<long>("bigint(20)").
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
@@ -470,7 +486,8 @@ namespace Marechai.Database.Migrations
 
             migrationBuilder.CreateTable("sound_by_machine", table => new
             {
-                sound_synth = table.Column<int>("int(11)"), machine = table.Column<int>("int(11)"),
+                sound_synth = table.Column<int>("int(11)"),
+                machine     = table.Column<int>("int(11)"),
                 id = table.Column<long>("bigint(20)").
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
             }, constraints: table =>
diff --git a/Marechai.Database/Migrations/20180806192514_UseExistingEnumerations.cs b/Marechai.Database/Migrations/20180806192514_UseExistingEnumerations.cs
index ef9b13c6..678ce035 100644
--- a/Marechai.Database/Migrations/20180806192514_UseExistingEnumerations.cs
+++ b/Marechai.Database/Migrations/20180806192514_UseExistingEnumerations.cs
@@ -29,8 +29,8 @@ namespace Marechai.Database.Migrations
 {
     public partial class UseExistingEnumerations : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder) { }
+        protected override void Up(MigrationBuilder migrationBuilder) {}
 
-        protected override void Down(MigrationBuilder migrationBuilder) { }
+        protected override void Down(MigrationBuilder migrationBuilder) {}
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Migrations/20180806201559_SingularizeModelNames.cs b/Marechai.Database/Migrations/20180806201559_SingularizeModelNames.cs
index c7895d93..f8662d26 100644
--- a/Marechai.Database/Migrations/20180806201559_SingularizeModelNames.cs
+++ b/Marechai.Database/Migrations/20180806201559_SingularizeModelNames.cs
@@ -29,8 +29,8 @@ namespace Marechai.Database.Migrations
 {
     public partial class SingularizeModelNames : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder) { }
+        protected override void Up(MigrationBuilder migrationBuilder) {}
 
-        protected override void Down(MigrationBuilder migrationBuilder) { }
+        protected override void Down(MigrationBuilder migrationBuilder) {}
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Migrations/20180806202841_BrowserTestFieldsAsBoolean.cs b/Marechai.Database/Migrations/20180806202841_BrowserTestFieldsAsBoolean.cs
index d2c1a8d4..f5140d30 100644
--- a/Marechai.Database/Migrations/20180806202841_BrowserTestFieldsAsBoolean.cs
+++ b/Marechai.Database/Migrations/20180806202841_BrowserTestFieldsAsBoolean.cs
@@ -4,8 +4,8 @@ namespace Marechai.Database.Migrations
 {
     public partial class BrowserTestFieldsAsBoolean : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder) { }
+        protected override void Up(MigrationBuilder migrationBuilder) {}
 
-        protected override void Down(MigrationBuilder migrationBuilder) { }
+        protected override void Down(MigrationBuilder migrationBuilder) {}
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Migrations/20180806222713_LogosGuid.cs b/Marechai.Database/Migrations/20180806222713_LogosGuid.cs
index 7bb445aa..8b8187b0 100644
--- a/Marechai.Database/Migrations/20180806222713_LogosGuid.cs
+++ b/Marechai.Database/Migrations/20180806222713_LogosGuid.cs
@@ -29,8 +29,8 @@ namespace Marechai.Database.Migrations
 {
     public partial class LogosGuid : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder) { }
+        protected override void Up(MigrationBuilder migrationBuilder) {}
 
-        protected override void Down(MigrationBuilder migrationBuilder) { }
+        protected override void Down(MigrationBuilder migrationBuilder) {}
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Migrations/20180807193120_CorrectLogosInCompany.cs b/Marechai.Database/Migrations/20180807193120_CorrectLogosInCompany.cs
index d9b8b73e..cdbfd1ab 100644
--- a/Marechai.Database/Migrations/20180807193120_CorrectLogosInCompany.cs
+++ b/Marechai.Database/Migrations/20180807193120_CorrectLogosInCompany.cs
@@ -29,8 +29,8 @@ namespace Marechai.Database.Migrations
 {
     public partial class CorrectLogosInCompany : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder) { }
+        protected override void Up(MigrationBuilder migrationBuilder) {}
 
-        protected override void Down(MigrationBuilder migrationBuilder) { }
+        protected override void Down(MigrationBuilder migrationBuilder) {}
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Migrations/20180811130603_CreateIdentitySchema.cs b/Marechai.Database/Migrations/20180811130603_CreateIdentitySchema.cs
index f3e37d40..aea18c52 100644
--- a/Marechai.Database/Migrations/20180811130603_CreateIdentitySchema.cs
+++ b/Marechai.Database/Migrations/20180811130603_CreateIdentitySchema.cs
@@ -35,7 +35,8 @@ namespace Marechai.Database.Migrations
         {
             migrationBuilder.CreateTable("AspNetRoles", table => new
             {
-                Id               = table.Column<string>(), Name = table.Column<string>(maxLength: 256, nullable: true),
+                Id               = table.Column<string>(),
+                Name             = table.Column<string>(maxLength: 256, nullable: true),
                 NormalizedName   = table.Column<string>(maxLength: 256, nullable: true),
                 ConcurrencyStamp = table.Column<string>(nullable: true)
             }, constraints: table =>
@@ -45,18 +46,21 @@ namespace Marechai.Database.Migrations
 
             migrationBuilder.CreateTable("AspNetUsers", table => new
             {
-                Id                 = table.Column<string>(),
-                UserName           = table.Column<string>(maxLength: 256, nullable: true),
-                NormalizedUserName = table.Column<string>(maxLength: 256, nullable: true),
-                Email              = table.Column<string>(maxLength: 256, nullable: true),
-                NormalizedEmail    = table.Column<string>(maxLength: 256, nullable: true),
-                EmailConfirmed     = table.Column<bool>(), PasswordHash = table.Column<string>(nullable: true),
-                SecurityStamp      = table.Column<string>(nullable: true),
-                ConcurrencyStamp   = table.Column<string>(nullable: true),
-                PhoneNumber        = table.Column<string>(nullable: true), PhoneNumberConfirmed = table.Column<bool>(),
-                TwoFactorEnabled   = table.Column<bool>(),
-                LockoutEnd         = table.Column<DateTimeOffset>(nullable: true),
-                LockoutEnabled     = table.Column<bool>(), AccessFailedCount = table.Column<int>()
+                Id                   = table.Column<string>(),
+                UserName             = table.Column<string>(maxLength: 256, nullable: true),
+                NormalizedUserName   = table.Column<string>(maxLength: 256, nullable: true),
+                Email                = table.Column<string>(maxLength: 256, nullable: true),
+                NormalizedEmail      = table.Column<string>(maxLength: 256, nullable: true),
+                EmailConfirmed       = table.Column<bool>(),
+                PasswordHash         = table.Column<string>(nullable: true),
+                SecurityStamp        = table.Column<string>(nullable: true),
+                ConcurrencyStamp     = table.Column<string>(nullable: true),
+                PhoneNumber          = table.Column<string>(nullable: true),
+                PhoneNumberConfirmed = table.Column<bool>(),
+                TwoFactorEnabled     = table.Column<bool>(),
+                LockoutEnd           = table.Column<DateTimeOffset>(nullable: true),
+                LockoutEnabled       = table.Column<bool>(),
+                AccessFailedCount    = table.Column<int>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_AspNetUsers", x => x.Id);
@@ -66,7 +70,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<int>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                RoleId     = table.Column<string>(), ClaimType = table.Column<string>(nullable: true),
+                RoleId     = table.Column<string>(),
+                ClaimType  = table.Column<string>(nullable: true),
                 ClaimValue = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
@@ -80,7 +85,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<int>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                UserId     = table.Column<string>(), ClaimType = table.Column<string>(nullable: true),
+                UserId     = table.Column<string>(),
+                ClaimType  = table.Column<string>(nullable: true),
                 ClaimValue = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
@@ -94,12 +100,14 @@ namespace Marechai.Database.Migrations
             {
                 LoginProvider       = table.Column<string>(maxLength: 128),
                 ProviderKey         = table.Column<string>(maxLength: 128),
-                ProviderDisplayName = table.Column<string>(nullable: true), UserId = table.Column<string>()
+                ProviderDisplayName = table.Column<string>(nullable: true),
+                UserId              = table.Column<string>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_AspNetUserLogins", x => new
                 {
-                    x.LoginProvider, x.ProviderKey
+                    x.LoginProvider,
+                    x.ProviderKey
                 });
 
                 table.ForeignKey("FK_AspNetUserLogins_AspNetUsers_UserId", x => x.UserId, "AspNetUsers", "Id",
@@ -108,12 +116,14 @@ namespace Marechai.Database.Migrations
 
             migrationBuilder.CreateTable("AspNetUserRoles", table => new
             {
-                UserId = table.Column<string>(), RoleId = table.Column<string>()
+                UserId = table.Column<string>(),
+                RoleId = table.Column<string>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_AspNetUserRoles", x => new
                 {
-                    x.UserId, x.RoleId
+                    x.UserId,
+                    x.RoleId
                 });
 
                 table.ForeignKey("FK_AspNetUserRoles_AspNetRoles_RoleId", x => x.RoleId, "AspNetRoles", "Id",
@@ -125,13 +135,17 @@ namespace Marechai.Database.Migrations
 
             migrationBuilder.CreateTable("AspNetUserTokens", table => new
             {
-                UserId = table.Column<string>(), LoginProvider       = table.Column<string>(maxLength: 128),
-                Name   = table.Column<string>(maxLength: 128), Value = table.Column<string>(nullable: true)
+                UserId        = table.Column<string>(),
+                LoginProvider = table.Column<string>(maxLength: 128),
+                Name          = table.Column<string>(maxLength: 128),
+                Value         = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_AspNetUserTokens", x => new
                 {
-                    x.UserId, x.LoginProvider, x.Name
+                    x.UserId,
+                    x.LoginProvider,
+                    x.Name
                 });
 
                 table.ForeignKey("FK_AspNetUserTokens_AspNetUsers_UserId", x => x.UserId, "AspNetUsers", "Id",
diff --git a/Marechai.Database/Migrations/20190518145625_RemoveCompanyDescriptions.cs b/Marechai.Database/Migrations/20190518145625_RemoveCompanyDescriptions.cs
index 95cb5178..f91d1517 100644
--- a/Marechai.Database/Migrations/20190518145625_RemoveCompanyDescriptions.cs
+++ b/Marechai.Database/Migrations/20190518145625_RemoveCompanyDescriptions.cs
@@ -14,7 +14,8 @@ namespace Marechai.Database.Migrations
             {
                 id = table.Column<int>("int(11)").
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                company_id = table.Column<int>("int(11)"), text = table.Column<string>("text", nullable: true)
+                company_id = table.Column<int>("int(11)"),
+                text       = table.Column<string>("text", nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_company_descriptions", x => x.id);
diff --git a/Marechai.Database/Migrations/20190518150032_AddCompanyDescriptions.cs b/Marechai.Database/Migrations/20190518150032_AddCompanyDescriptions.cs
index fa8c1216..edc8ab90 100644
--- a/Marechai.Database/Migrations/20190518150032_AddCompanyDescriptions.cs
+++ b/Marechai.Database/Migrations/20190518150032_AddCompanyDescriptions.cs
@@ -11,7 +11,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<int>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                CompanyId = table.Column<int>(), Text = table.Column<string>(nullable: true)
+                CompanyId = table.Column<int>(),
+                Text      = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_CompanyDescriptions", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190527020604_MachinePhotos.cs b/Marechai.Database/Migrations/20190527020604_MachinePhotos.cs
index 25084396..70d5823b 100644
--- a/Marechai.Database/Migrations/20190527020604_MachinePhotos.cs
+++ b/Marechai.Database/Migrations/20190527020604_MachinePhotos.cs
@@ -12,7 +12,8 @@ namespace Marechai.Database.Migrations
 
             migrationBuilder.CreateTable("MachinePhotos", table => new
             {
-                Id                    = table.Column<Guid>(), Author = table.Column<string>(nullable: true),
+                Id                    = table.Column<Guid>(),
+                Author                = table.Column<string>(nullable: true),
                 CameraManufacturer    = table.Column<string>(nullable: true),
                 CameraModel           = table.Column<string>(nullable: true),
                 ColorSpace            = table.Column<string>(nullable: true),
diff --git a/Marechai.Database/Migrations/20190527160705_Licenses.cs b/Marechai.Database/Migrations/20190527160705_Licenses.cs
index 9e390dfb..8d32f605 100644
--- a/Marechai.Database/Migrations/20190527160705_Licenses.cs
+++ b/Marechai.Database/Migrations/20190527160705_Licenses.cs
@@ -11,8 +11,10 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<int>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                Name        = table.Column<string>(), SPDX      = table.Column<string>(nullable: true),
-                FsfApproved = table.Column<bool>(), OsiApproved = table.Column<bool>(),
+                Name        = table.Column<string>(),
+                SPDX        = table.Column<string>(nullable: true),
+                FsfApproved = table.Column<bool>(),
+                OsiApproved = table.Column<bool>(),
                 Link        = table.Column<string>(maxLength: 512, nullable: true),
                 Text        = table.Column<string>("longtext", maxLength: 131072, nullable: true)
             }, constraints: table =>
diff --git a/Marechai.Database/Migrations/20190529194436_AddOwnedMachines.cs b/Marechai.Database/Migrations/20190529194436_AddOwnedMachines.cs
index 6fb65a38..8212deb0 100644
--- a/Marechai.Database/Migrations/20190529194436_AddOwnedMachines.cs
+++ b/Marechai.Database/Migrations/20190529194436_AddOwnedMachines.cs
@@ -12,13 +12,17 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                AcquisitionDate     = table.Column<DateTime>(), LostDate  = table.Column<DateTime>(nullable: true),
-                Status              = table.Column<int>(), LastStatusDate = table.Column<DateTime>(nullable: true),
-                Trade               = table.Column<bool>(), Boxed         = table.Column<bool>(),
+                AcquisitionDate     = table.Column<DateTime>(),
+                LostDate            = table.Column<DateTime>(nullable: true),
+                Status              = table.Column<int>(),
+                LastStatusDate      = table.Column<DateTime>(nullable: true),
+                Trade               = table.Column<bool>(),
+                Boxed               = table.Column<bool>(),
                 Manuals             = table.Column<bool>(),
                 SerialNumber        = table.Column<string>(nullable: true),
                 SerialNumberVisible = table.Column<bool>(nullable: false, defaultValue: true),
-                MachineId           = table.Column<int>(), UserId = table.Column<string>(nullable: true)
+                MachineId           = table.Column<int>(),
+                UserId              = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_OwnedMachines", x => x.Id);
@@ -34,7 +38,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                GpuId = table.Column<int>(), OwnedMachineId = table.Column<long>()
+                GpuId          = table.Column<int>(),
+                OwnedMachineId = table.Column<long>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_GpusByOwnedMachine", x => x.Id);
@@ -50,8 +55,11 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                OwnedMachineId = table.Column<long>(), Type  = table.Column<int>(), Usage = table.Column<int>(),
-                Size           = table.Column<long>(), Speed = table.Column<double>()
+                OwnedMachineId = table.Column<long>(),
+                Type           = table.Column<int>(),
+                Usage          = table.Column<int>(),
+                Size           = table.Column<long>(),
+                Speed          = table.Column<double>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MemoryByOwnedMachine", x => x.Id);
@@ -62,7 +70,8 @@ namespace Marechai.Database.Migrations
 
             migrationBuilder.CreateTable("OwnedMachinePhotos", table => new
             {
-                Id                    = table.Column<Guid>(), Author = table.Column<string>(nullable: true),
+                Id                    = table.Column<Guid>(),
+                Author                = table.Column<string>(nullable: true),
                 CameraManufacturer    = table.Column<string>(nullable: true),
                 CameraModel           = table.Column<string>(nullable: true),
                 ColorSpace            = table.Column<ushort>(nullable: true),
@@ -97,7 +106,8 @@ namespace Marechai.Database.Migrations
                 VerticalResolution = table.Column<double>(nullable: true),
                 WhiteBalance       = table.Column<ushort>(nullable: true),
                 UserId             = table.Column<string>(nullable: true),
-                LicenseId          = table.Column<int>(), OwnedMachineId = table.Column<long>()
+                LicenseId          = table.Column<int>(),
+                OwnedMachineId     = table.Column<long>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_OwnedMachinePhotos", x => x.Id);
@@ -116,7 +126,9 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                ProcessorId = table.Column<int>(), OwnedMachineId = table.Column<long>(), Speed = table.Column<float>()
+                ProcessorId    = table.Column<int>(),
+                OwnedMachineId = table.Column<long>(),
+                Speed          = table.Column<float>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_ProcessorsByOwnedMachine", x => x.Id);
@@ -132,7 +144,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                SoundSynthId = table.Column<int>(), OwnedMachineId = table.Column<long>()
+                SoundSynthId   = table.Column<int>(),
+                OwnedMachineId = table.Column<long>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_SoundByOwnedMachine", x => x.Id);
@@ -148,7 +161,9 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                OwnedMachineId = table.Column<long>(), Type = table.Column<int>(), Interface = table.Column<int>(),
+                OwnedMachineId = table.Column<long>(),
+                Type           = table.Column<int>(),
+                Interface      = table.Column<int>(),
                 Capacity       = table.Column<long>()
             }, constraints: table =>
             {
diff --git a/Marechai.Database/Migrations/20190601122952_AddScreens.cs b/Marechai.Database/Migrations/20190601122952_AddScreens.cs
index d63084e4..c97074a5 100644
--- a/Marechai.Database/Migrations/20190601122952_AddScreens.cs
+++ b/Marechai.Database/Migrations/20190601122952_AddScreens.cs
@@ -11,9 +11,12 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<int>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                Width           = table.Column<double>(nullable: true), Height = table.Column<double>(nullable: true),
-                Diagonal        = table.Column<double>(), NativeResolutionId   = table.Column<int>(),
-                EffectiveColors = table.Column<long>(nullable: true), Type     = table.Column<string>()
+                Width              = table.Column<double>(nullable: true),
+                Height             = table.Column<double>(nullable: true),
+                Diagonal           = table.Column<double>(),
+                NativeResolutionId = table.Column<int>(),
+                EffectiveColors    = table.Column<long>(nullable: true),
+                Type               = table.Column<string>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_Screens", x => x.Id);
@@ -26,7 +29,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                ScreenId = table.Column<int>(), ResolutionId = table.Column<int>()
+                ScreenId     = table.Column<int>(),
+                ResolutionId = table.Column<int>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_ResolutionsByScreen", x => x.Id);
@@ -42,7 +46,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                ScreenId = table.Column<int>(), MachineId = table.Column<int>()
+                ScreenId  = table.Column<int>(),
+                MachineId = table.Column<int>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_ScreensByMachine", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190602021943_AddPerson.cs b/Marechai.Database/Migrations/20190602021943_AddPerson.cs
index 039d1dd1..62aed4ac 100644
--- a/Marechai.Database/Migrations/20190602021943_AddPerson.cs
+++ b/Marechai.Database/Migrations/20190602021943_AddPerson.cs
@@ -12,11 +12,15 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<int>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                Name      = table.Column<string>(), Surname = table.Column<string>(),
-                BirthDate = table.Column<DateTime>(),
-                DeathDate = table.Column<DateTime>(nullable: true), Webpage = table.Column<string>(nullable: true),
-                Twitter   = table.Column<string>(nullable: true), Facebook  = table.Column<string>(nullable: true),
-                Photo     = table.Column<Guid>(), CountryOfBirthId          = table.Column<short>(nullable: true)
+                Name             = table.Column<string>(),
+                Surname          = table.Column<string>(),
+                BirthDate        = table.Column<DateTime>(),
+                DeathDate        = table.Column<DateTime>(nullable: true),
+                Webpage          = table.Column<string>(nullable: true),
+                Twitter          = table.Column<string>(nullable: true),
+                Facebook         = table.Column<string>(nullable: true),
+                Photo            = table.Column<Guid>(),
+                CountryOfBirthId = table.Column<short>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_People", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190603165746_AddIso639.cs b/Marechai.Database/Migrations/20190603165746_AddIso639.cs
index 2393eceb..0060786e 100644
--- a/Marechai.Database/Migrations/20190603165746_AddIso639.cs
+++ b/Marechai.Database/Migrations/20190603165746_AddIso639.cs
@@ -8,11 +8,14 @@ namespace Marechai.Database.Migrations
         {
             migrationBuilder.CreateTable("ISO_639-3", table => new
             {
-                Id      = table.Column<string>("char(3)"), Part2B = table.Column<string>("char(3)", nullable: true),
-                Part2T  = table.Column<string>("char(3)", nullable: true),
-                Part1   = table.Column<string>("char(2)", nullable: true), Scope = table.Column<string>("char(1)"),
-                Type    = table.Column<string>("char(1)"), Ref_Name              = table.Column<string>("varchar(150)"),
-                Comment = table.Column<string>("varchar(150)", nullable: true)
+                Id       = table.Column<string>("char(3)"),
+                Part2B   = table.Column<string>("char(3)", nullable: true),
+                Part2T   = table.Column<string>("char(3)", nullable: true),
+                Part1    = table.Column<string>("char(2)", nullable: true),
+                Scope    = table.Column<string>("char(1)"),
+                Type     = table.Column<string>("char(1)"),
+                Ref_Name = table.Column<string>("varchar(150)"),
+                Comment  = table.Column<string>("varchar(150)", nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_ISO_639-3", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190605142832_AddPeopleByCompany.cs b/Marechai.Database/Migrations/20190605142832_AddPeopleByCompany.cs
index b6756bfc..3074adc5 100644
--- a/Marechai.Database/Migrations/20190605142832_AddPeopleByCompany.cs
+++ b/Marechai.Database/Migrations/20190605142832_AddPeopleByCompany.cs
@@ -12,9 +12,12 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                PersonId = table.Column<int>(), CompanyId                  = table.Column<int>(),
-                Position = table.Column<string>(nullable: true), Start     = table.Column<DateTime>(nullable: true),
-                End      = table.Column<DateTime>(nullable: true), Ongoing = table.Column<bool>()
+                PersonId  = table.Column<int>(),
+                CompanyId = table.Column<int>(),
+                Position  = table.Column<string>(nullable: true),
+                Start     = table.Column<DateTime>(nullable: true),
+                End       = table.Column<DateTime>(nullable: true),
+                Ongoing   = table.Column<bool>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_PeopleByCompany", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190616210450_AddDocuments.cs b/Marechai.Database/Migrations/20190616210450_AddDocuments.cs
index e3ab9123..cd34608b 100644
--- a/Marechai.Database/Migrations/20190616210450_AddDocuments.cs
+++ b/Marechai.Database/Migrations/20190616210450_AddDocuments.cs
@@ -12,9 +12,11 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                Title     = table.Column<string>(), NativeTitle               = table.Column<string>(nullable: true),
-                Published = table.Column<DateTime>(nullable: true), CountryId = table.Column<short>(nullable: true),
-                Synopsis  = table.Column<string>(maxLength: 262144, nullable: true)
+                Title       = table.Column<string>(),
+                NativeTitle = table.Column<string>(nullable: true),
+                Published   = table.Column<DateTime>(nullable: true),
+                CountryId   = table.Column<short>(nullable: true),
+                Synopsis    = table.Column<string>(maxLength: 262144, nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_Documents", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190616211045_AddDocumentRoles.cs b/Marechai.Database/Migrations/20190616211045_AddDocumentRoles.cs
index 92ed550a..0cd9a09d 100644
--- a/Marechai.Database/Migrations/20190616211045_AddDocumentRoles.cs
+++ b/Marechai.Database/Migrations/20190616211045_AddDocumentRoles.cs
@@ -8,7 +8,8 @@ namespace Marechai.Database.Migrations
         {
             migrationBuilder.CreateTable("DocumentRoles", table => new
             {
-                Id      = table.Column<string>("char(3)"), Name = table.Column<string>(nullable: true),
+                Id      = table.Column<string>("char(3)"),
+                Name    = table.Column<string>(nullable: true),
                 Enabled = table.Column<bool>(nullable: false, defaultValue: true)
             }, constraints: table =>
             {
diff --git a/Marechai.Database/Migrations/20190616232349_AddDocumentPeople.cs b/Marechai.Database/Migrations/20190616232349_AddDocumentPeople.cs
index de26da8c..127d7365 100644
--- a/Marechai.Database/Migrations/20190616232349_AddDocumentPeople.cs
+++ b/Marechai.Database/Migrations/20190616232349_AddDocumentPeople.cs
@@ -13,7 +13,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<int>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                Name     = table.Column<string>(), Surname = table.Column<string>(),
+                Name     = table.Column<string>(),
+                Surname  = table.Column<string>(),
                 PersonId = table.Column<int>(nullable: true)
             }, constraints: table =>
             {
diff --git a/Marechai.Database/Migrations/20190616233045_AddPeopleByDocument.cs b/Marechai.Database/Migrations/20190616233045_AddPeopleByDocument.cs
index 9056aecc..61a4a734 100644
--- a/Marechai.Database/Migrations/20190616233045_AddPeopleByDocument.cs
+++ b/Marechai.Database/Migrations/20190616233045_AddPeopleByDocument.cs
@@ -11,8 +11,9 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                PersonId = table.Column<int>(), DocumentId = table.Column<long>(),
-                RoleId   = table.Column<string>("char(3)")
+                PersonId   = table.Column<int>(),
+                DocumentId = table.Column<long>(),
+                RoleId     = table.Column<string>("char(3)")
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_PeopleByDocuments", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190616233807_AddDocumentCompany.cs b/Marechai.Database/Migrations/20190616233807_AddDocumentCompany.cs
index 20eff1c2..c3734d73 100644
--- a/Marechai.Database/Migrations/20190616233807_AddDocumentCompany.cs
+++ b/Marechai.Database/Migrations/20190616233807_AddDocumentCompany.cs
@@ -13,7 +13,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<int>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                Name = table.Column<string>(), CompanyId = table.Column<int>(nullable: true)
+                Name      = table.Column<string>(),
+                CompanyId = table.Column<int>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_DocumentCompanies", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190616234431_AddCompaniesByDocument.cs b/Marechai.Database/Migrations/20190616234431_AddCompaniesByDocument.cs
index d60e6bf6..d04353ea 100644
--- a/Marechai.Database/Migrations/20190616234431_AddCompaniesByDocument.cs
+++ b/Marechai.Database/Migrations/20190616234431_AddCompaniesByDocument.cs
@@ -11,8 +11,9 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                CompanyId = table.Column<int>(), DocumentId = table.Column<long>(),
-                RoleId    = table.Column<string>("char(3)")
+                CompanyId  = table.Column<int>(),
+                DocumentId = table.Column<long>(),
+                RoleId     = table.Column<string>("char(3)")
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_CompaniesByDocuments", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190616235255_AddDocumentsByMachine.cs b/Marechai.Database/Migrations/20190616235255_AddDocumentsByMachine.cs
index cdf4f9fb..91d0e55e 100644
--- a/Marechai.Database/Migrations/20190616235255_AddDocumentsByMachine.cs
+++ b/Marechai.Database/Migrations/20190616235255_AddDocumentsByMachine.cs
@@ -11,7 +11,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                DocumentId = table.Column<long>(), MachineId = table.Column<int>()
+                DocumentId = table.Column<long>(),
+                MachineId  = table.Column<int>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_DocumentsByMachines", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617010136_AddDocumentsByMachineFamily.cs b/Marechai.Database/Migrations/20190617010136_AddDocumentsByMachineFamily.cs
index c115d8ca..f42ae55e 100644
--- a/Marechai.Database/Migrations/20190617010136_AddDocumentsByMachineFamily.cs
+++ b/Marechai.Database/Migrations/20190617010136_AddDocumentsByMachineFamily.cs
@@ -11,7 +11,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                DocumentId = table.Column<long>(), MachineFamilyId = table.Column<int>()
+                DocumentId      = table.Column<long>(),
+                MachineFamilyId = table.Column<int>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_DocumentsByMachineFamily", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617012113_AddBooks.cs b/Marechai.Database/Migrations/20190617012113_AddBooks.cs
index fadd226e..c4a862b7 100644
--- a/Marechai.Database/Migrations/20190617012113_AddBooks.cs
+++ b/Marechai.Database/Migrations/20190617012113_AddBooks.cs
@@ -12,14 +12,16 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                Title      = table.Column<string>(), NativeTitle               = table.Column<string>(nullable: true),
-                Published  = table.Column<DateTime>(nullable: true), CountryId = table.Column<short>(nullable: true),
-                Synopsis   = table.Column<string>(maxLength: 262144, nullable: true),
-                Isbn       = table.Column<string>(maxLength: 13, nullable: true),
-                Pages      = table.Column<short>(nullable: true),
-                Edition    = table.Column<int>(nullable: true),
-                PreviousId = table.Column<long>(nullable: true),
-                SourceId   = table.Column<long>(nullable: true)
+                Title       = table.Column<string>(),
+                NativeTitle = table.Column<string>(nullable: true),
+                Published   = table.Column<DateTime>(nullable: true),
+                CountryId   = table.Column<short>(nullable: true),
+                Synopsis    = table.Column<string>(maxLength: 262144, nullable: true),
+                Isbn        = table.Column<string>(maxLength: 13, nullable: true),
+                Pages       = table.Column<short>(nullable: true),
+                Edition     = table.Column<int>(nullable: true),
+                PreviousId  = table.Column<long>(nullable: true),
+                SourceId    = table.Column<long>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_Books", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617014131_AddCompaniesByBook.cs b/Marechai.Database/Migrations/20190617014131_AddCompaniesByBook.cs
index e8a793f5..ba20789f 100644
--- a/Marechai.Database/Migrations/20190617014131_AddCompaniesByBook.cs
+++ b/Marechai.Database/Migrations/20190617014131_AddCompaniesByBook.cs
@@ -11,7 +11,9 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                CompanyId = table.Column<int>(), BookId = table.Column<long>(), RoleId = table.Column<string>("char(3)")
+                CompanyId = table.Column<int>(),
+                BookId    = table.Column<long>(),
+                RoleId    = table.Column<string>("char(3)")
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_CompaniesByBooks", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617015011_AddPeopleByBook.cs b/Marechai.Database/Migrations/20190617015011_AddPeopleByBook.cs
index ac0a8069..b7f23cd3 100644
--- a/Marechai.Database/Migrations/20190617015011_AddPeopleByBook.cs
+++ b/Marechai.Database/Migrations/20190617015011_AddPeopleByBook.cs
@@ -11,7 +11,9 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                PersonId = table.Column<int>(), BookId = table.Column<long>(), RoleId = table.Column<string>("char(3)")
+                PersonId = table.Column<int>(),
+                BookId   = table.Column<long>(),
+                RoleId   = table.Column<string>("char(3)")
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_PeopleByBooks", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617020655_AddBooksByMachine.cs b/Marechai.Database/Migrations/20190617020655_AddBooksByMachine.cs
index 239bdfe3..58a331f9 100644
--- a/Marechai.Database/Migrations/20190617020655_AddBooksByMachine.cs
+++ b/Marechai.Database/Migrations/20190617020655_AddBooksByMachine.cs
@@ -11,7 +11,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                BookId = table.Column<long>(), MachineId = table.Column<int>()
+                BookId    = table.Column<long>(),
+                MachineId = table.Column<int>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_BooksByMachines", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617021725_AddBooksByMachineFamily.cs b/Marechai.Database/Migrations/20190617021725_AddBooksByMachineFamily.cs
index 2b93814d..e81efae7 100644
--- a/Marechai.Database/Migrations/20190617021725_AddBooksByMachineFamily.cs
+++ b/Marechai.Database/Migrations/20190617021725_AddBooksByMachineFamily.cs
@@ -11,7 +11,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                BookId = table.Column<long>(), MachineFamilyId = table.Column<int>()
+                BookId          = table.Column<long>(),
+                MachineFamilyId = table.Column<int>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_BooksByMachineFamilies", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617024228_AddMagazineIssues.cs b/Marechai.Database/Migrations/20190617024228_AddMagazineIssues.cs
index 6098e3d7..40227990 100644
--- a/Marechai.Database/Migrations/20190617024228_AddMagazineIssues.cs
+++ b/Marechai.Database/Migrations/20190617024228_AddMagazineIssues.cs
@@ -12,10 +12,12 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                MagazineId    = table.Column<long>(), Caption = table.Column<string>(),
+                MagazineId    = table.Column<long>(),
+                Caption       = table.Column<string>(),
                 NativeCaption = table.Column<string>(nullable: true),
                 Published     = table.Column<DateTime>(nullable: true),
-                ProductCode   = table.Column<string>(maxLength: 18, nullable: true), Pages = table.Column<short>()
+                ProductCode   = table.Column<string>(maxLength: 18, nullable: true),
+                Pages         = table.Column<short>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MagazineIssues", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617025439_AddCompaniesByMagazine.cs b/Marechai.Database/Migrations/20190617025439_AddCompaniesByMagazine.cs
index 5bae2b86..f081f2b7 100644
--- a/Marechai.Database/Migrations/20190617025439_AddCompaniesByMagazine.cs
+++ b/Marechai.Database/Migrations/20190617025439_AddCompaniesByMagazine.cs
@@ -11,8 +11,9 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                CompanyId = table.Column<int>(), MagazineId = table.Column<long>(),
-                RoleId    = table.Column<string>("char(3)")
+                CompanyId  = table.Column<int>(),
+                MagazineId = table.Column<long>(),
+                RoleId     = table.Column<string>("char(3)")
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_CompaniesByMagazines", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617030141_AddPeopleByMagazine.cs b/Marechai.Database/Migrations/20190617030141_AddPeopleByMagazine.cs
index 577e07a6..4dbed99f 100644
--- a/Marechai.Database/Migrations/20190617030141_AddPeopleByMagazine.cs
+++ b/Marechai.Database/Migrations/20190617030141_AddPeopleByMagazine.cs
@@ -11,8 +11,9 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                PersonId = table.Column<int>(), MagazineId = table.Column<long>(),
-                RoleId   = table.Column<string>("char(3)")
+                PersonId   = table.Column<int>(),
+                MagazineId = table.Column<long>(),
+                RoleId     = table.Column<string>("char(3)")
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_PeopleByMagazines", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617031250_AddMagazinesByMachine.cs b/Marechai.Database/Migrations/20190617031250_AddMagazinesByMachine.cs
index 61d401d2..d4d0084f 100644
--- a/Marechai.Database/Migrations/20190617031250_AddMagazinesByMachine.cs
+++ b/Marechai.Database/Migrations/20190617031250_AddMagazinesByMachine.cs
@@ -11,7 +11,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                MagazineId = table.Column<long>(), MachineId = table.Column<int>()
+                MagazineId = table.Column<long>(),
+                MachineId  = table.Column<int>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MagazinesByMachines", x => x.Id);
diff --git a/Marechai.Database/Migrations/20190617031843_AddMagazinesByMachineFamily.cs b/Marechai.Database/Migrations/20190617031843_AddMagazinesByMachineFamily.cs
index cf74176d..b715596a 100644
--- a/Marechai.Database/Migrations/20190617031843_AddMagazinesByMachineFamily.cs
+++ b/Marechai.Database/Migrations/20190617031843_AddMagazinesByMachineFamily.cs
@@ -11,7 +11,8 @@ namespace Marechai.Database.Migrations
             {
                 Id = table.Column<long>().
                            Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                MagazineId = table.Column<long>(), MachineFamilyId = table.Column<int>()
+                MagazineId      = table.Column<long>(),
+                MachineFamilyId = table.Column<int>()
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MagazinesByMachinesFamilies", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200601020415_SetDetaulfsForBooleans.cs b/Marechai.Database/Migrations/20200601020415_SetDetaulfsForBooleans.cs
index d728f583..821be751 100644
--- a/Marechai.Database/Migrations/20200601020415_SetDetaulfsForBooleans.cs
+++ b/Marechai.Database/Migrations/20200601020415_SetDetaulfsForBooleans.cs
@@ -4,8 +4,8 @@ namespace Marechai.Database.Migrations
 {
     public partial class SetDetaulfsForBooleans : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder) { }
+        protected override void Up(MigrationBuilder migrationBuilder) {}
 
-        protected override void Down(MigrationBuilder migrationBuilder) { }
+        protected override void Down(MigrationBuilder migrationBuilder) {}
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Migrations/20200609211809_AddAuditTable.cs b/Marechai.Database/Migrations/20200609211809_AddAuditTable.cs
index ca2f32ce..ad9496a8 100644
--- a/Marechai.Database/Migrations/20200609211809_AddAuditTable.cs
+++ b/Marechai.Database/Migrations/20200609211809_AddAuditTable.cs
@@ -18,9 +18,12 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Type = table.Column<byte>(nullable: false), UserId = table.Column<string>(nullable: false),
-                Table = table.Column<string>(nullable: true), Keys = table.Column<string>(nullable: true),
-                OldValues = table.Column<string>(nullable: true), NewValues = table.Column<string>(nullable: true),
+                Type            = table.Column<byte>(nullable: false),
+                UserId          = table.Column<string>(nullable: false),
+                Table           = table.Column<string>(nullable: true),
+                Keys            = table.Column<string>(nullable: true),
+                OldValues       = table.Column<string>(nullable: true),
+                NewValues       = table.Column<string>(nullable: true),
                 AffectedColumns = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
diff --git a/Marechai.Database/Migrations/20200610194822_AddCurrencyInflation.cs b/Marechai.Database/Migrations/20200610194822_AddCurrencyInflation.cs
index 54beb1f0..2b362d83 100644
--- a/Marechai.Database/Migrations/20200610194822_AddCurrencyInflation.cs
+++ b/Marechai.Database/Migrations/20200610194822_AddCurrencyInflation.cs
@@ -43,7 +43,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                CurrencyCode = table.Column<string>(nullable: false), Year = table.Column<uint>(nullable: false),
+                CurrencyCode = table.Column<string>(nullable: false),
+                Year         = table.Column<uint>(nullable: false),
                 Inflation    = table.Column<float>(nullable: false)
             }, constraints: table =>
             {
diff --git a/Marechai.Database/Migrations/20200610200500_AddCurrencyPegging.cs b/Marechai.Database/Migrations/20200610200500_AddCurrencyPegging.cs
index 9a1fa8e2..ebf7d75b 100644
--- a/Marechai.Database/Migrations/20200610200500_AddCurrencyPegging.cs
+++ b/Marechai.Database/Migrations/20200610200500_AddCurrencyPegging.cs
@@ -44,8 +44,10 @@ namespace Marechai.Database.Migrations
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
                 SourceCode      = table.Column<string>(nullable: false),
-                DestinationCode = table.Column<string>(nullable: false), Ratio = table.Column<float>(nullable: false),
-                Start           = table.Column<DateTime>(nullable: false), End = table.Column<DateTime>(nullable: true)
+                DestinationCode = table.Column<string>(nullable: false),
+                Ratio           = table.Column<float>(nullable: false),
+                Start           = table.Column<DateTime>(nullable: false),
+                End             = table.Column<DateTime>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_CurrenciesPegging", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200610205411_AddDumpHardware.cs b/Marechai.Database/Migrations/20200610205411_AddDumpHardware.cs
index ce83c6b0..dc1f8c33 100644
--- a/Marechai.Database/Migrations/20200610205411_AddDumpHardware.cs
+++ b/Marechai.Database/Migrations/20200610205411_AddDumpHardware.cs
@@ -50,9 +50,6 @@ namespace Marechai.Database.Migrations
             migrationBuilder.CreateIndex("IX_DumpHardwares_SoftwareVersion", "DumpHardwares", "SoftwareVersion");
         }
 
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable("DumpHardwares");
-        }
+        protected override void Down(MigrationBuilder migrationBuilder) => migrationBuilder.DropTable("DumpHardwares");
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Migrations/20200610215731_AddFiles.cs b/Marechai.Database/Migrations/20200610215731_AddFiles.cs
index a0b21891..2bbe027c 100644
--- a/Marechai.Database/Migrations/20200610215731_AddFiles.cs
+++ b/Marechai.Database/Migrations/20200610215731_AddFiles.cs
@@ -43,14 +43,19 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Size = table.Column<ulong>(nullable: false), Md5 = table.Column<byte[]>("binary(16)", nullable: true),
-                Sha1 = table.Column<byte[]>("binary(20)", nullable: true),
-                Sha256 = table.Column<byte[]>("binary(32)", nullable: true),
-                Sha3 = table.Column<byte[]>("binary(64)", nullable: true),
-                Spamsum = table.Column<string>(nullable: true), Mime = table.Column<string>(nullable: true),
-                Magic = table.Column<string>(nullable: true), AccoustId = table.Column<string>(nullable: true),
-                Infected = table.Column<bool>(nullable: false), Malware = table.Column<string>(nullable: true),
-                Hack = table.Column<bool>(nullable: false), HackGroup = table.Column<string>(nullable: true)
+                Size      = table.Column<ulong>(nullable: false),
+                Md5       = table.Column<byte[]>("binary(16)", nullable: true),
+                Sha1      = table.Column<byte[]>("binary(20)", nullable: true),
+                Sha256    = table.Column<byte[]>("binary(32)", nullable: true),
+                Sha3      = table.Column<byte[]>("binary(64)", nullable: true),
+                Spamsum   = table.Column<string>(nullable: true),
+                Mime      = table.Column<string>(nullable: true),
+                Magic     = table.Column<string>(nullable: true),
+                AccoustId = table.Column<string>(nullable: true),
+                Infected  = table.Column<bool>(nullable: false),
+                Malware   = table.Column<string>(nullable: true),
+                Hack      = table.Column<bool>(nullable: false),
+                HackGroup = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_Files", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200610220719_AddFileDataStreams.cs b/Marechai.Database/Migrations/20200610220719_AddFileDataStreams.cs
index a79103f5..cb2552a1 100644
--- a/Marechai.Database/Migrations/20200610220719_AddFileDataStreams.cs
+++ b/Marechai.Database/Migrations/20200610220719_AddFileDataStreams.cs
@@ -43,8 +43,9 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Name = table.Column<string>(maxLength: 255, nullable: true),
-                Size = table.Column<ulong>(nullable: false), FileId = table.Column<ulong>(nullable: false)
+                Name   = table.Column<string>(maxLength: 255, nullable: true),
+                Size   = table.Column<ulong>(nullable: false),
+                FileId = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_FileDataStreams", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200610225546_AddFilesystems.cs b/Marechai.Database/Migrations/20200610225546_AddFilesystems.cs
index 927c1530..13690f28 100644
--- a/Marechai.Database/Migrations/20200610225546_AddFilesystems.cs
+++ b/Marechai.Database/Migrations/20200610225546_AddFilesystems.cs
@@ -43,19 +43,24 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Type = table.Column<string>(nullable: false), CreationDate = table.Column<DateTime>(nullable: true),
-                ModificationDate = table.Column<DateTime>(nullable: true),
-                BackupDate = table.Column<DateTime>(nullable: true), ClusterSize = table.Column<int>(nullable: false),
-                Clusters = table.Column<ulong>(nullable: false), Files = table.Column<ulong>(nullable: true),
-                Bootable = table.Column<bool>(nullable: false), Serial = table.Column<string>(nullable: true),
-                Label = table.Column<string>(nullable: true), FreeClusters = table.Column<ulong>(nullable: true),
-                ExpirationDate = table.Column<DateTime>(nullable: true),
-                EffectiveDate = table.Column<DateTime>(nullable: true),
-                SystemIdentifier = table.Column<string>(nullable: true),
-                VolumeSetIdentifier = table.Column<string>(nullable: true),
-                PublisherIdentifier = table.Column<string>(nullable: true),
+                Type                   = table.Column<string>(nullable: false),
+                CreationDate           = table.Column<DateTime>(nullable: true),
+                ModificationDate       = table.Column<DateTime>(nullable: true),
+                BackupDate             = table.Column<DateTime>(nullable: true),
+                ClusterSize            = table.Column<int>(nullable: false),
+                Clusters               = table.Column<ulong>(nullable: false),
+                Files                  = table.Column<ulong>(nullable: true),
+                Bootable               = table.Column<bool>(nullable: false),
+                Serial                 = table.Column<string>(nullable: true),
+                Label                  = table.Column<string>(nullable: true),
+                FreeClusters           = table.Column<ulong>(nullable: true),
+                ExpirationDate         = table.Column<DateTime>(nullable: true),
+                EffectiveDate          = table.Column<DateTime>(nullable: true),
+                SystemIdentifier       = table.Column<string>(nullable: true),
+                VolumeSetIdentifier    = table.Column<string>(nullable: true),
+                PublisherIdentifier    = table.Column<string>(nullable: true),
                 DataPreparerIdentifier = table.Column<string>(nullable: true),
-                ApplicationIdentifier = table.Column<string>(nullable: true)
+                ApplicationIdentifier  = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_Filesystems", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200610233739_AddLogicalPartitions.cs b/Marechai.Database/Migrations/20200610233739_AddLogicalPartitions.cs
index 49620a0d..930ec727 100644
--- a/Marechai.Database/Migrations/20200610233739_AddLogicalPartitions.cs
+++ b/Marechai.Database/Migrations/20200610233739_AddLogicalPartitions.cs
@@ -43,10 +43,14 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Sequence    = table.Column<uint>(nullable: false), Name          = table.Column<string>(nullable: true),
-                Type        = table.Column<string>(nullable: false), FirstSector = table.Column<ulong>(nullable: false),
-                LastSector  = table.Column<ulong>(nullable: false), Size         = table.Column<ulong>(nullable: false),
-                Description = table.Column<string>(nullable: true), Scheme       = table.Column<string>(nullable: true)
+                Sequence    = table.Column<uint>(nullable: false),
+                Name        = table.Column<string>(nullable: true),
+                Type        = table.Column<string>(nullable: false),
+                FirstSector = table.Column<ulong>(nullable: false),
+                LastSector  = table.Column<ulong>(nullable: false),
+                Size        = table.Column<ulong>(nullable: false),
+                Description = table.Column<string>(nullable: true),
+                Scheme      = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_LogicalPartitions", x => x.Id);
@@ -62,7 +66,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                FilesystemId = table.Column<ulong>(nullable: false), PartitionId = table.Column<ulong>(nullable: false)
+                FilesystemId = table.Column<ulong>(nullable: false),
+                PartitionId  = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_FilesystemsByLogicalPartition", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200611000722_AddMedia.cs b/Marechai.Database/Migrations/20200611000722_AddMedia.cs
index 55c36050..3c81afbb 100644
--- a/Marechai.Database/Migrations/20200611000722_AddMedia.cs
+++ b/Marechai.Database/Migrations/20200611000722_AddMedia.cs
@@ -43,19 +43,30 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Title = table.Column<string>(nullable: true), Sequence = table.Column<ushort>(nullable: true),
-                LastSequence = table.Column<ushort>(nullable: true), Type = table.Column<uint>(nullable: false),
-                WriteOffset = table.Column<int>(nullable: true), Sides = table.Column<ushort>(nullable: true),
-                Layers = table.Column<ushort>(nullable: true), Sessions = table.Column<ushort>(nullable: true),
-                Tracks = table.Column<ushort>(nullable: true), Sectors = table.Column<ulong>(nullable: false),
-                Size = table.Column<ulong>(nullable: false), CopyProtection = table.Column<string>(nullable: true),
-                PartNumber = table.Column<string>(nullable: true), SerialNumber = table.Column<string>(nullable: true),
-                Barcode = table.Column<string>(nullable: true), CatalogueNumber = table.Column<string>(nullable: true),
-                Manufacturer = table.Column<string>(nullable: true), Model = table.Column<string>(nullable: true),
-                Revision = table.Column<string>(nullable: true), Firmware = table.Column<string>(nullable: true),
+                Title             = table.Column<string>(nullable: true),
+                Sequence          = table.Column<ushort>(nullable: true),
+                LastSequence      = table.Column<ushort>(nullable: true),
+                Type              = table.Column<uint>(nullable: false),
+                WriteOffset       = table.Column<int>(nullable: true),
+                Sides             = table.Column<ushort>(nullable: true),
+                Layers            = table.Column<ushort>(nullable: true),
+                Sessions          = table.Column<ushort>(nullable: true),
+                Tracks            = table.Column<ushort>(nullable: true),
+                Sectors           = table.Column<ulong>(nullable: false),
+                Size              = table.Column<ulong>(nullable: false),
+                CopyProtection    = table.Column<string>(nullable: true),
+                PartNumber        = table.Column<string>(nullable: true),
+                SerialNumber      = table.Column<string>(nullable: true),
+                Barcode           = table.Column<string>(nullable: true),
+                CatalogueNumber   = table.Column<string>(nullable: true),
+                Manufacturer      = table.Column<string>(nullable: true),
+                Model             = table.Column<string>(nullable: true),
+                Revision          = table.Column<string>(nullable: true),
+                Firmware          = table.Column<string>(nullable: true),
                 PhysicalBlockSize = table.Column<int>(nullable: true),
-                LogicalBlockSize = table.Column<int>(nullable: true), BlockSizes = table.Column<string>(nullable: true),
-                StorageInterface = table.Column<int>(nullable: true)
+                LogicalBlockSize  = table.Column<int>(nullable: true),
+                BlockSizes        = table.Column<string>(nullable: true),
+                StorageInterface  = table.Column<int>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_Media", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200611004927_AddLogicalPartitionsByMedia.cs b/Marechai.Database/Migrations/20200611004927_AddLogicalPartitionsByMedia.cs
index 985ee9a8..c2ba517d 100644
--- a/Marechai.Database/Migrations/20200611004927_AddLogicalPartitionsByMedia.cs
+++ b/Marechai.Database/Migrations/20200611004927_AddLogicalPartitionsByMedia.cs
@@ -43,7 +43,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                MediaId = table.Column<ulong>(nullable: false), PartitionId = table.Column<ulong>(nullable: false)
+                MediaId     = table.Column<ulong>(nullable: false),
+                PartitionId = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_LogicalPartitionsByMedia", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200611010054_AddMediaDump.cs b/Marechai.Database/Migrations/20200611010054_AddMediaDump.cs
index 8f7ecbb5..404e766e 100644
--- a/Marechai.Database/Migrations/20200611010054_AddMediaDump.cs
+++ b/Marechai.Database/Migrations/20200611010054_AddMediaDump.cs
@@ -43,7 +43,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                MediaId = table.Column<ulong>(nullable: false), Format = table.Column<string>(nullable: true),
+                MediaId = table.Column<ulong>(nullable: false),
+                Format  = table.Column<string>(nullable: true),
                 Status  = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
diff --git a/Marechai.Database/Migrations/20200611022135_AddMediaDumpFileImage.cs b/Marechai.Database/Migrations/20200611022135_AddMediaDumpFileImage.cs
index 4966bcb9..9e93a3f6 100644
--- a/Marechai.Database/Migrations/20200611022135_AddMediaDumpFileImage.cs
+++ b/Marechai.Database/Migrations/20200611022135_AddMediaDumpFileImage.cs
@@ -43,13 +43,15 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                MediaDumpId = table.Column<ulong>(nullable: false), FileSequence = table.Column<long>(nullable: false),
-                PartitionSequence = table.Column<short>(nullable: false), Size = table.Column<ulong>(nullable: false),
-                Md5 = table.Column<byte[]>("binary(16)", nullable: true),
-                Sha1 = table.Column<byte[]>("binary(20)", nullable: true),
-                Sha256 = table.Column<byte[]>("binary(32)", nullable: true),
-                Sha3 = table.Column<byte[]>("binary(64)", nullable: true),
-                Spamsum = table.Column<string>(nullable: true)
+                MediaDumpId       = table.Column<ulong>(nullable: false),
+                FileSequence      = table.Column<long>(nullable: false),
+                PartitionSequence = table.Column<short>(nullable: false),
+                Size              = table.Column<ulong>(nullable: false),
+                Md5               = table.Column<byte[]>("binary(16)", nullable: true),
+                Sha1              = table.Column<byte[]>("binary(20)", nullable: true),
+                Sha256            = table.Column<byte[]>("binary(32)", nullable: true),
+                Sha3              = table.Column<byte[]>("binary(64)", nullable: true),
+                Spamsum           = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MediaDumpFileImages", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200611024009_AddMediaDumpImages.cs b/Marechai.Database/Migrations/20200611024009_AddMediaDumpImages.cs
index 6ef60f22..044f0bc9 100644
--- a/Marechai.Database/Migrations/20200611024009_AddMediaDumpImages.cs
+++ b/Marechai.Database/Migrations/20200611024009_AddMediaDumpImages.cs
@@ -18,12 +18,14 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                MediaDumpId = table.Column<ulong>(nullable: false), Size = table.Column<ulong>(nullable: false),
+                MediaDumpId = table.Column<ulong>(nullable: false),
+                Size        = table.Column<ulong>(nullable: false),
                 Md5         = table.Column<byte[]>("binary(16)", nullable: true),
                 Sha1        = table.Column<byte[]>("binary(20)", nullable: true),
                 Sha256      = table.Column<byte[]>("binary(32)", nullable: true),
                 Sha3        = table.Column<byte[]>("binary(64)", nullable: true),
-                Spamsum     = table.Column<string>(nullable: true), AccoustId = table.Column<string>(nullable: true)
+                Spamsum     = table.Column<string>(nullable: true),
+                AccoustId   = table.Column<string>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MediaDumpImages", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200611024934_AddMediaDumpSubchannelImages.cs b/Marechai.Database/Migrations/20200611024934_AddMediaDumpSubchannelImages.cs
index bec7caf7..da83c0e0 100644
--- a/Marechai.Database/Migrations/20200611024934_AddMediaDumpSubchannelImages.cs
+++ b/Marechai.Database/Migrations/20200611024934_AddMediaDumpSubchannelImages.cs
@@ -43,12 +43,15 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                TrackSequence = table.Column<short>(nullable: false), Status = table.Column<byte>(nullable: false),
-                Size = table.Column<ulong>(nullable: false), Md5 = table.Column<byte[]>("binary(16)", nullable: true),
-                Sha1 = table.Column<byte[]>("binary(20)", nullable: true),
-                Sha256 = table.Column<byte[]>("binary(32)", nullable: true),
-                Sha3 = table.Column<byte[]>("binary(64)", nullable: true),
-                Spamsum = table.Column<string>(nullable: true), MediaDumpId = table.Column<ulong>(nullable: true)
+                TrackSequence = table.Column<short>(nullable: false),
+                Status        = table.Column<byte>(nullable: false),
+                Size          = table.Column<ulong>(nullable: false),
+                Md5           = table.Column<byte[]>("binary(16)", nullable: true),
+                Sha1          = table.Column<byte[]>("binary(20)", nullable: true),
+                Sha256        = table.Column<byte[]>("binary(32)", nullable: true),
+                Sha3          = table.Column<byte[]>("binary(64)", nullable: true),
+                Spamsum       = table.Column<string>(nullable: true),
+                MediaDumpId   = table.Column<ulong>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MediaDumpSubchannelImages", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200611030041_AddMediaDumpTrackImages.cs b/Marechai.Database/Migrations/20200611030041_AddMediaDumpTrackImages.cs
index 2a6d4a15..299d0f08 100644
--- a/Marechai.Database/Migrations/20200611030041_AddMediaDumpTrackImages.cs
+++ b/Marechai.Database/Migrations/20200611030041_AddMediaDumpTrackImages.cs
@@ -45,12 +45,15 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                TrackSequence = table.Column<short>(nullable: false), Format = table.Column<string>(nullable: true),
-                Size = table.Column<ulong>(nullable: false), Md5 = table.Column<byte[]>("binary(16)", nullable: true),
-                Sha1 = table.Column<byte[]>("binary(20)", nullable: true),
-                Sha256 = table.Column<byte[]>("binary(32)", nullable: true),
-                Sha3 = table.Column<byte[]>("binary(64)", nullable: true),
-                Spamsum = table.Column<string>(nullable: true), MediaDumpId = table.Column<ulong>(nullable: true)
+                TrackSequence = table.Column<short>(nullable: false),
+                Format        = table.Column<string>(nullable: true),
+                Size          = table.Column<ulong>(nullable: false),
+                Md5           = table.Column<byte[]>("binary(16)", nullable: true),
+                Sha1          = table.Column<byte[]>("binary(20)", nullable: true),
+                Sha256        = table.Column<byte[]>("binary(32)", nullable: true),
+                Sha3          = table.Column<byte[]>("binary(64)", nullable: true),
+                Spamsum       = table.Column<string>(nullable: true),
+                MediaDumpId   = table.Column<ulong>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MediaDumpTrackImages", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200611032953_AddMediaFiles.cs b/Marechai.Database/Migrations/20200611032953_AddMediaFiles.cs
index c7bbdc7a..40f5880f 100644
--- a/Marechai.Database/Migrations/20200611032953_AddMediaFiles.cs
+++ b/Marechai.Database/Migrations/20200611032953_AddMediaFiles.cs
@@ -53,19 +53,22 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Path = table.Column<string>(maxLength: 8192, nullable: false),
-                Name = table.Column<string>(maxLength: 255, nullable: false),
-                PathSeparator = table.Column<string>(nullable: false),
-                IsDirectory = table.Column<bool>(nullable: false),
-                CreationDate = table.Column<DateTime>(nullable: true),
-                AccessDate = table.Column<DateTime>(nullable: true),
+                Path             = table.Column<string>(maxLength: 8192, nullable: false),
+                Name             = table.Column<string>(maxLength: 255, nullable: false),
+                PathSeparator    = table.Column<string>(nullable: false),
+                IsDirectory      = table.Column<bool>(nullable: false),
+                CreationDate     = table.Column<DateTime>(nullable: true),
+                AccessDate       = table.Column<DateTime>(nullable: true),
                 StatusChangeDate = table.Column<DateTime>(nullable: true),
-                BackupDate = table.Column<DateTime>(nullable: true),
-                LastWriteDate = table.Column<DateTime>(nullable: true),
-                Attributes = table.Column<ulong>(nullable: false), PosixMode = table.Column<ushort>(nullable: true),
-                DeviceNumber = table.Column<uint>(nullable: true), GroupId = table.Column<ulong>(nullable: true),
-                UserId = table.Column<ulong>(nullable: true), Inode = table.Column<ulong>(nullable: true),
-                Links = table.Column<ulong>(nullable: true)
+                BackupDate       = table.Column<DateTime>(nullable: true),
+                LastWriteDate    = table.Column<DateTime>(nullable: true),
+                Attributes       = table.Column<ulong>(nullable: false),
+                PosixMode        = table.Column<ushort>(nullable: true),
+                DeviceNumber     = table.Column<uint>(nullable: true),
+                GroupId          = table.Column<ulong>(nullable: true),
+                UserId           = table.Column<ulong>(nullable: true),
+                Inode            = table.Column<ulong>(nullable: true),
+                Links            = table.Column<ulong>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MediaFiles", x => x.Id);
@@ -104,7 +107,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                FilesystemId = table.Column<ulong>(nullable: false), FileId = table.Column<ulong>(nullable: false)
+                FilesystemId = table.Column<ulong>(nullable: false),
+                FileId       = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_FilesByFilesystem", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200611035031_AddDumps.cs b/Marechai.Database/Migrations/20200611035031_AddDumps.cs
index 766b65c4..1070a8b1 100644
--- a/Marechai.Database/Migrations/20200611035031_AddDumps.cs
+++ b/Marechai.Database/Migrations/20200611035031_AddDumps.cs
@@ -45,9 +45,12 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Dumper       = table.Column<string>(nullable: true), UserId = table.Column<string>(nullable: true),
-                DumpingGroup = table.Column<string>(nullable: true), DumpDate = table.Column<DateTime>(nullable: true),
-                MediaId      = table.Column<ulong>(nullable: true), MediaDumpId = table.Column<ulong>(nullable: true)
+                Dumper       = table.Column<string>(nullable: true),
+                UserId       = table.Column<string>(nullable: true),
+                DumpingGroup = table.Column<string>(nullable: true),
+                DumpDate     = table.Column<DateTime>(nullable: true),
+                MediaId      = table.Column<ulong>(nullable: true),
+                MediaDumpId  = table.Column<ulong>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_Dumps", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200611174904_AddSoftwareFamily.cs b/Marechai.Database/Migrations/20200611174904_AddSoftwareFamily.cs
index c4562b81..42d323cf 100644
--- a/Marechai.Database/Migrations/20200611174904_AddSoftwareFamily.cs
+++ b/Marechai.Database/Migrations/20200611174904_AddSoftwareFamily.cs
@@ -43,8 +43,9 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Name     = table.Column<string>(nullable: false), Introduced = table.Column<DateTime>(nullable: true),
-                ParentId = table.Column<ulong>(nullable: true)
+                Name       = table.Column<string>(nullable: false),
+                Introduced = table.Column<DateTime>(nullable: true),
+                ParentId   = table.Column<ulong>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_SoftwareFamilies", x => x.Id);
@@ -63,7 +64,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                RoleId = table.Column<string>(nullable: false), CompanyId = table.Column<int>(nullable: false),
+                RoleId           = table.Column<string>(nullable: false),
+                CompanyId        = table.Column<int>(nullable: false),
                 SoftwareFamilyId = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
@@ -90,7 +92,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                RoleId           = table.Column<string>(nullable: false), PersonId = table.Column<int>(nullable: false),
+                RoleId           = table.Column<string>(nullable: false),
+                PersonId         = table.Column<int>(nullable: false),
                 SoftwareFamilyId = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
diff --git a/Marechai.Database/Migrations/20200611180218_AddSoftwareVersion.cs b/Marechai.Database/Migrations/20200611180218_AddSoftwareVersion.cs
index a46357d6..5123a7bd 100644
--- a/Marechai.Database/Migrations/20200611180218_AddSoftwareVersion.cs
+++ b/Marechai.Database/Migrations/20200611180218_AddSoftwareVersion.cs
@@ -43,9 +43,12 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                FamilyId   = table.Column<ulong>(nullable: false), Name        = table.Column<string>(nullable: true),
-                Codename   = table.Column<string>(nullable: true), Version     = table.Column<string>(nullable: false),
-                Introduced = table.Column<DateTime>(nullable: true), LicenseId = table.Column<int>(nullable: true),
+                FamilyId   = table.Column<ulong>(nullable: false),
+                Name       = table.Column<string>(nullable: true),
+                Codename   = table.Column<string>(nullable: true),
+                Version    = table.Column<string>(nullable: false),
+                Introduced = table.Column<DateTime>(nullable: true),
+                LicenseId  = table.Column<int>(nullable: true),
                 PreviousId = table.Column<ulong>(nullable: true)
             }, constraints: table =>
             {
@@ -72,7 +75,8 @@ namespace Marechai.Database.Migrations
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
                 CompanyId         = table.Column<int>(nullable: false),
-                SoftwareVersionId = table.Column<ulong>(nullable: false), RoleId = table.Column<string>(nullable: false)
+                SoftwareVersionId = table.Column<ulong>(nullable: false),
+                RoleId            = table.Column<string>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_CompaniesBySoftwareVersion", x => x.Id);
@@ -98,7 +102,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                SoftwareVersionId = table.Column<ulong>(nullable: false), PersonId = table.Column<int>(nullable: false),
+                SoftwareVersionId = table.Column<ulong>(nullable: false),
+                PersonId          = table.Column<int>(nullable: false),
                 RoleId            = table.Column<string>(nullable: false)
             }, constraints: table =>
             {
diff --git a/Marechai.Database/Migrations/20200611212211_AddSoftwareVariant.cs b/Marechai.Database/Migrations/20200611212211_AddSoftwareVariant.cs
index e99c4ac2..f989704c 100644
--- a/Marechai.Database/Migrations/20200611212211_AddSoftwareVariant.cs
+++ b/Marechai.Database/Migrations/20200611212211_AddSoftwareVariant.cs
@@ -43,16 +43,19 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Name = table.Column<string>(nullable: true), Version = table.Column<string>(nullable: true),
-                Introduced = table.Column<DateTime>(nullable: true), ParentId = table.Column<ulong>(nullable: true),
+                Name              = table.Column<string>(nullable: true),
+                Version           = table.Column<string>(nullable: true),
+                Introduced        = table.Column<DateTime>(nullable: true),
+                ParentId          = table.Column<ulong>(nullable: true),
                 SoftwareVersionId = table.Column<ulong>(nullable: false),
-                MinimumMemory = table.Column<ulong>(nullable: true),
+                MinimumMemory     = table.Column<ulong>(nullable: true),
                 RecommendedMemory = table.Column<ulong>(nullable: true),
-                RequiredStorage = table.Column<ulong>(nullable: true),
-                PartNumber = table.Column<string>(nullable: true), SerialNumber = table.Column<string>(nullable: true),
-                ProductCode = table.Column<string>(nullable: true),
-                CatalogueNumber = table.Column<string>(nullable: true),
-                DistributionMode = table.Column<uint>(nullable: false)
+                RequiredStorage   = table.Column<ulong>(nullable: true),
+                PartNumber        = table.Column<string>(nullable: true),
+                SerialNumber      = table.Column<string>(nullable: true),
+                ProductCode       = table.Column<string>(nullable: true),
+                CatalogueNumber   = table.Column<string>(nullable: true),
+                DistributionMode  = table.Column<uint>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_SoftwareVariants", x => x.Id);
@@ -75,7 +78,8 @@ namespace Marechai.Database.Migrations
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
                 CompanyId         = table.Column<int>(nullable: false),
-                SoftwareVariantId = table.Column<ulong>(nullable: false), RoleId = table.Column<string>(nullable: false)
+                SoftwareVariantId = table.Column<ulong>(nullable: false),
+                RoleId            = table.Column<string>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_CompaniesBySoftwareVariant", x => x.Id);
@@ -101,8 +105,10 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                GpuId   = table.Column<int>(nullable: false), SoftwareVariantId = table.Column<ulong>(nullable: false),
-                Minimum = table.Column<bool>(nullable: true), Recommended       = table.Column<bool>(nullable: true)
+                GpuId             = table.Column<int>(nullable: false),
+                SoftwareVariantId = table.Column<ulong>(nullable: false),
+                Minimum           = table.Column<bool>(nullable: true),
+                Recommended       = table.Column<bool>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_GpusBySoftwareVariant", x => x.Id);
@@ -198,7 +204,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                MachineId = table.Column<int>(nullable: false), SoftwareVariantId = table.Column<ulong>(nullable: false)
+                MachineId         = table.Column<int>(nullable: false),
+                SoftwareVariantId = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MachinesBySoftwareVariant", x => x.Id);
@@ -221,7 +228,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                MediaId = table.Column<ulong>(nullable: false), SoftwareVariantId = table.Column<ulong>(nullable: false)
+                MediaId           = table.Column<ulong>(nullable: false),
+                SoftwareVariantId = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_MediaBySoftwareVariant", x => x.Id);
@@ -244,7 +252,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                SoftwareVariantId = table.Column<ulong>(nullable: false), PersonId = table.Column<int>(nullable: false),
+                SoftwareVariantId = table.Column<ulong>(nullable: false),
+                PersonId          = table.Column<int>(nullable: false),
                 RoleId            = table.Column<string>(nullable: false)
             }, constraints: table =>
             {
@@ -272,8 +281,10 @@ namespace Marechai.Database.Migrations
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
                 ProcessorId       = table.Column<int>(nullable: false),
-                SoftwareVariantId = table.Column<ulong>(nullable: false), Speed = table.Column<float>(nullable: true),
-                Minimum           = table.Column<bool>(nullable: true), Recommended = table.Column<bool>(nullable: true)
+                SoftwareVariantId = table.Column<ulong>(nullable: false),
+                Speed             = table.Column<float>(nullable: true),
+                Minimum           = table.Column<bool>(nullable: true),
+                Recommended       = table.Column<bool>(nullable: true)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_ProcessorsBySoftwareVariant", x => x.Id);
@@ -370,19 +381,23 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Path = table.Column<string>(maxLength: 8192, nullable: false),
-                Name = table.Column<string>(maxLength: 255, nullable: false),
-                PathSeparator = table.Column<string>(nullable: false),
-                IsDirectory = table.Column<bool>(nullable: false),
-                CreationDate = table.Column<DateTime>(nullable: true),
-                AccessDate = table.Column<DateTime>(nullable: true),
-                StatusChangeDate = table.Column<DateTime>(nullable: true),
-                BackupDate = table.Column<DateTime>(nullable: true),
-                LastWriteDate = table.Column<DateTime>(nullable: true),
-                Attributes = table.Column<ulong>(nullable: false), PosixMode = table.Column<ushort>(nullable: true),
-                DeviceNumber = table.Column<uint>(nullable: true), GroupId = table.Column<ulong>(nullable: true),
-                UserId = table.Column<ulong>(nullable: true), Inode = table.Column<ulong>(nullable: true),
-                Links = table.Column<ulong>(nullable: true), SoftwareVariantId = table.Column<ulong>(nullable: false)
+                Path              = table.Column<string>(maxLength: 8192, nullable: false),
+                Name              = table.Column<string>(maxLength: 255, nullable: false),
+                PathSeparator     = table.Column<string>(nullable: false),
+                IsDirectory       = table.Column<bool>(nullable: false),
+                CreationDate      = table.Column<DateTime>(nullable: true),
+                AccessDate        = table.Column<DateTime>(nullable: true),
+                StatusChangeDate  = table.Column<DateTime>(nullable: true),
+                BackupDate        = table.Column<DateTime>(nullable: true),
+                LastWriteDate     = table.Column<DateTime>(nullable: true),
+                Attributes        = table.Column<ulong>(nullable: false),
+                PosixMode         = table.Column<ushort>(nullable: true),
+                DeviceNumber      = table.Column<uint>(nullable: true),
+                GroupId           = table.Column<ulong>(nullable: true),
+                UserId            = table.Column<ulong>(nullable: true),
+                Inode             = table.Column<ulong>(nullable: true),
+                Links             = table.Column<ulong>(nullable: true),
+                SoftwareVariantId = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_StandaloneFiles", x => x.Id);
diff --git a/Marechai.Database/Migrations/20200611221232_AddMasteringTexts.cs b/Marechai.Database/Migrations/20200611221232_AddMasteringTexts.cs
index ee93543e..e5d529dd 100644
--- a/Marechai.Database/Migrations/20200611221232_AddMasteringTexts.cs
+++ b/Marechai.Database/Migrations/20200611221232_AddMasteringTexts.cs
@@ -43,8 +43,10 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Type    = table.Column<byte>(nullable: false), Text  = table.Column<string>(nullable: false),
-                Side    = table.Column<short>(nullable: true), Layer = table.Column<short>(nullable: true),
+                Type    = table.Column<byte>(nullable: false),
+                Text    = table.Column<string>(nullable: false),
+                Side    = table.Column<short>(nullable: true),
+                Layer   = table.Column<short>(nullable: true),
                 MediaId = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
diff --git a/Marechai.Database/Migrations/20200611223854_AddMediaTagDumps.cs b/Marechai.Database/Migrations/20200611223854_AddMediaTagDumps.cs
index a6c04a8f..5cc23a03 100644
--- a/Marechai.Database/Migrations/20200611223854_AddMediaTagDumps.cs
+++ b/Marechai.Database/Migrations/20200611223854_AddMediaTagDumps.cs
@@ -43,7 +43,8 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                MediaDumpId = table.Column<ulong>(nullable: false), Type = table.Column<int>(nullable: false),
+                MediaDumpId = table.Column<ulong>(nullable: false),
+                Type        = table.Column<int>(nullable: false),
                 FileId      = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
diff --git a/Marechai.Database/Migrations/20200611230627_AddSoftwareByCompilationMedia.cs b/Marechai.Database/Migrations/20200611230627_AddSoftwareByCompilationMedia.cs
index cf0c4639..ea1a2454 100644
--- a/Marechai.Database/Migrations/20200611230627_AddSoftwareByCompilationMedia.cs
+++ b/Marechai.Database/Migrations/20200611230627_AddSoftwareByCompilationMedia.cs
@@ -43,8 +43,10 @@ namespace Marechai.Database.Migrations
                 UpdatedOn = table.Column<DateTime>(nullable: false).
                                   Annotation("MySql:ValueGenerationStrategy",
                                              MySqlValueGenerationStrategy.ComputedColumn),
-                Path = table.Column<string>(nullable: true), PathSeparator = table.Column<string>(nullable: false),
-                SoftwareVariantId = table.Column<ulong>(nullable: false), MediaId = table.Column<ulong>(nullable: false)
+                Path              = table.Column<string>(nullable: true),
+                PathSeparator     = table.Column<string>(nullable: false),
+                SoftwareVariantId = table.Column<ulong>(nullable: false),
+                MediaId           = table.Column<ulong>(nullable: false)
             }, constraints: table =>
             {
                 table.PrimaryKey("PK_SoftwareVariantByCompilationMedia", x => x.Id);
diff --git a/Marechai.Database/Models/MarechaiContext.cs b/Marechai.Database/Models/MarechaiContext.cs
index aa9d0747..d80a8f0a 100644
--- a/Marechai.Database/Models/MarechaiContext.cs
+++ b/Marechai.Database/Models/MarechaiContext.cs
@@ -40,9 +40,9 @@ namespace Marechai.Database.Models
             new ValueConverter<string, byte[]>(v => HexStringToBytesConverter.StringToHex(v),
                                                v => HexStringToBytesConverter.HexToString(v));
 
-        public MarechaiContext() { }
+        public MarechaiContext() {}
 
-        public MarechaiContext(DbContextOptions<MarechaiContext> options) : base(options) { }
+        public MarechaiContext(DbContextOptions<MarechaiContext> options) : base(options) {}
 
         public virtual DbSet<Book>                                Books                               { get; set; }
         public virtual DbSet<BooksByMachine>                      BooksByMachines                     { get; set; }
@@ -457,7 +457,9 @@ namespace Marechai.Database.Models
             {
                 entity.HasKey(e => new
                 {
-                    e.Id, e.CompanyId, LogoGuid = e.Guid
+                    e.Id,
+                    e.CompanyId,
+                    LogoGuid = e.Guid
                 });
 
                 entity.ToTable("company_logos");
@@ -666,7 +668,9 @@ namespace Marechai.Database.Models
             {
                 entity.HasKey(e => new
                 {
-                    e.Id, e.ProcessorId, e.ExtensionId
+                    e.Id,
+                    e.ProcessorId,
+                    e.ExtensionId
                 });
 
                 entity.ToTable("instruction_set_extensions_by_processor");
@@ -1369,17 +1373,23 @@ namespace Marechai.Database.Models
 
                 entity.HasIndex(e => new
                 {
-                    e.Width, e.Height
+                    e.Width,
+                    e.Height
                 }).HasName("idx_resolutions_resolution");
 
                 entity.HasIndex(e => new
                 {
-                    e.Width, e.Height, e.Colors
+                    e.Width,
+                    e.Height,
+                    e.Colors
                 }).HasName("idx_resolutions_resolution_with_color");
 
                 entity.HasIndex(e => new
                 {
-                    e.Width, e.Height, e.Colors, e.Palette
+                    e.Width,
+                    e.Height,
+                    e.Colors,
+                    e.Palette
                 }).HasName("idx_resolutions_resolution_with_color_and_palette");
 
                 entity.Property(e => e.Id).HasColumnName("id").HasColumnType("int(11)");
diff --git a/Marechai.Database/Operations/Update.cs b/Marechai.Database/Operations/Update.cs
index 08227e83..7eab93d6 100644
--- a/Marechai.Database/Operations/Update.cs
+++ b/Marechai.Database/Operations/Update.cs
@@ -1046,31 +1046,30 @@ namespace Marechai.Database
             trans             = dbCon.BeginTransaction();
             dbCmd.Transaction = trans;
 
-            dbCmd.CommandText =
-                "CREATE INDEX `idx_processors_company` ON `processors` (`company`);\n"                   +
-                "CREATE INDEX `idx_processors_model_code` ON `processors` (`model_code`);\n"             +
-                "CREATE INDEX `idx_processors_introduced` ON `processors` (`introduced`);\n"             +
-                "CREATE INDEX `idx_processors_instruction_set` ON `processors` (`instruction_set`);\n"   +
-                "CREATE INDEX `idx_processors_speed` ON `processors` (`speed`);\n"                       +
-                "CREATE INDEX `idx_processors_package` ON `processors` (`package`);\n"                   +
-                "CREATE INDEX `idx_processors_GPRs` ON `processors` (`GPRs`);\n"                         +
-                "CREATE INDEX `idx_processors_GPR_size` ON `processors` (`GPR_size`);\n"                 +
-                "CREATE INDEX `idx_processors_FPRs` ON `processors` (`FPRs`);\n"                         +
-                "CREATE INDEX `idx_processors_FPR_size` ON `processors` (`FPR_size`);\n"                 +
-                "CREATE INDEX `idx_processors_cores` ON `processors` (`cores`);\n"                       +
-                "CREATE INDEX `idx_processors_threads_per_core` ON `processors` (`threads_per_core`);\n" +
-                "CREATE INDEX `idx_processors_process` ON `processors` (`process`);\n"                   +
-                "CREATE INDEX `idx_processors_process_nm` ON `processors` (`process_nm`);\n"             +
-                "CREATE INDEX `idx_processors_die_size` ON `processors` (`die_size`);\n"                 +
-                "CREATE INDEX `idx_processors_transistors` ON `processors` (`transistors`);\n"           +
-                "CREATE INDEX `idx_processors_data_bus` ON `processors` (`data_bus`);\n"                 +
-                "CREATE INDEX `idx_processors_addr_bus` ON `processors` (`addr_bus`);\n"                 +
-                "CREATE INDEX `idx_processors_SIMD_registers` ON `processors` (`SIMD_registers`);\n"     +
-                "CREATE INDEX `idx_processors_SIMD_size` ON `processors` (`SIMD_size`);\n"               +
-                "CREATE INDEX `idx_processors_L1_instruction` ON `processors` (`L1_instruction`);\n"     +
-                "CREATE INDEX `idx_processors_L1_data` ON `processors` (`L1_data`);\n"                   +
-                "CREATE INDEX `idx_processors_L2` ON `processors` (`L2`);\n"                             +
-                "CREATE INDEX `idx_processors_L3` ON `processors` (`L3`);";
+            dbCmd.CommandText = "CREATE INDEX `idx_processors_company` ON `processors` (`company`);\n" +
+                                "CREATE INDEX `idx_processors_model_code` ON `processors` (`model_code`);\n" +
+                                "CREATE INDEX `idx_processors_introduced` ON `processors` (`introduced`);\n" +
+                                "CREATE INDEX `idx_processors_instruction_set` ON `processors` (`instruction_set`);\n" +
+                                "CREATE INDEX `idx_processors_speed` ON `processors` (`speed`);\n" +
+                                "CREATE INDEX `idx_processors_package` ON `processors` (`package`);\n" +
+                                "CREATE INDEX `idx_processors_GPRs` ON `processors` (`GPRs`);\n" +
+                                "CREATE INDEX `idx_processors_GPR_size` ON `processors` (`GPR_size`);\n" +
+                                "CREATE INDEX `idx_processors_FPRs` ON `processors` (`FPRs`);\n" +
+                                "CREATE INDEX `idx_processors_FPR_size` ON `processors` (`FPR_size`);\n" +
+                                "CREATE INDEX `idx_processors_cores` ON `processors` (`cores`);\n" +
+                                "CREATE INDEX `idx_processors_threads_per_core` ON `processors` (`threads_per_core`);\n" +
+                                "CREATE INDEX `idx_processors_process` ON `processors` (`process`);\n" +
+                                "CREATE INDEX `idx_processors_process_nm` ON `processors` (`process_nm`);\n" +
+                                "CREATE INDEX `idx_processors_die_size` ON `processors` (`die_size`);\n" +
+                                "CREATE INDEX `idx_processors_transistors` ON `processors` (`transistors`);\n" +
+                                "CREATE INDEX `idx_processors_data_bus` ON `processors` (`data_bus`);\n" +
+                                "CREATE INDEX `idx_processors_addr_bus` ON `processors` (`addr_bus`);\n" +
+                                "CREATE INDEX `idx_processors_SIMD_registers` ON `processors` (`SIMD_registers`);\n" +
+                                "CREATE INDEX `idx_processors_SIMD_size` ON `processors` (`SIMD_size`);\n" +
+                                "CREATE INDEX `idx_processors_L1_instruction` ON `processors` (`L1_instruction`);\n" +
+                                "CREATE INDEX `idx_processors_L1_data` ON `processors` (`L1_data`);\n" +
+                                "CREATE INDEX `idx_processors_L2` ON `processors` (`L2`);\n" +
+                                "CREATE INDEX `idx_processors_L3` ON `processors` (`L3`);";
 
             dbCmd.ExecuteNonQuery();
             trans.Commit();
@@ -1512,27 +1511,27 @@ namespace Marechai.Database
             dbCmd.Transaction = trans;
 
             dbCmd.CommandText =
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_company`, ADD INDEX `idx_machines_company` (`company`);\n"             +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_year`, ADD INDEX `idx_machines_year` (`year`);\n"                      +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_model`, ADD INDEX `idx_machines_model` (`model`);\n"                   +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_cpu1`, ADD INDEX `idx_machines_cpu1` (`cpu1`);\n"                      +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_cpu2`, ADD INDEX `idx_machines_cpu2` (`cpu2`);\n"                      +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_mhz1`, ADD INDEX `idx_machines_mhz1` (`mhz1`);\n"                      +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_mhz2`, ADD INDEX `idx_machines_mhz2` (`mhz2`);\n"                      +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_ram`, ADD INDEX `idx_machines_ram` (`ram`);\n"                         +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_rom`, ADD INDEX `idx_machines_rom` (`rom`);\n"                         +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_gpu`, ADD INDEX `idx_machines_gpu` (`gpu`);\n"                         +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_vram`, ADD INDEX `idx_machines_vram` (`vram`);\n"                      +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_colors`, ADD INDEX `idx_machines_colors` (`colors`);\n"                +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_res`, ADD INDEX `idx_machines_res` (`res`);\n"                         +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_company`, ADD INDEX `idx_machines_company` (`company`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_year`, ADD INDEX `idx_machines_year` (`year`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_model`, ADD INDEX `idx_machines_model` (`model`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_cpu1`, ADD INDEX `idx_machines_cpu1` (`cpu1`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_cpu2`, ADD INDEX `idx_machines_cpu2` (`cpu2`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_mhz1`, ADD INDEX `idx_machines_mhz1` (`mhz1`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_mhz2`, ADD INDEX `idx_machines_mhz2` (`mhz2`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_ram`, ADD INDEX `idx_machines_ram` (`ram`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_rom`, ADD INDEX `idx_machines_rom` (`rom`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_gpu`, ADD INDEX `idx_machines_gpu` (`gpu`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_vram`, ADD INDEX `idx_machines_vram` (`vram`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_colors`, ADD INDEX `idx_machines_colors` (`colors`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_res`, ADD INDEX `idx_machines_res` (`res`);\n" +
                 "ALTER TABLE `machines` DROP INDEX `idx_computers_sound_synth`, ADD INDEX `idx_machines_sound_synth` (`sound_synth`);\n" +
                 "ALTER TABLE `machines` DROP INDEX `idx_computers_music_synth`, ADD INDEX `idx_machines_music_synth` (`music_synth`);\n" +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_hdd1`, ADD INDEX `idx_machines_hdd1` (`hdd1`);\n"                      +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_hdd2`, ADD INDEX `idx_machines_hdd2` (`hdd2`);\n"                      +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_hdd3`, ADD INDEX `idx_machines_hdd3` (`hdd3`);\n"                      +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_disk1`, ADD INDEX `idx_machines_disk1` (`disk1`);\n"                   +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_disk2`, ADD INDEX `idx_machines_disk2` (`disk2`);\n"                   +
-                "ALTER TABLE `machines` DROP INDEX `idx_computers_cap1`, ADD INDEX `idx_machines_cap1` (`cap1`);\n"                      +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_hdd1`, ADD INDEX `idx_machines_hdd1` (`hdd1`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_hdd2`, ADD INDEX `idx_machines_hdd2` (`hdd2`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_hdd3`, ADD INDEX `idx_machines_hdd3` (`hdd3`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_disk1`, ADD INDEX `idx_machines_disk1` (`disk1`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_disk2`, ADD INDEX `idx_machines_disk2` (`disk2`);\n" +
+                "ALTER TABLE `machines` DROP INDEX `idx_computers_cap1`, ADD INDEX `idx_machines_cap1` (`cap1`);\n" +
                 "ALTER TABLE `machines` DROP INDEX `idx_computers_cap2`, ADD INDEX `idx_machines_cap2` (`cap2`);";
 
             dbCmd.ExecuteNonQuery();
@@ -1566,15 +1565,15 @@ namespace Marechai.Database
             dbCmd.Transaction = trans;
 
             dbCmd.CommandText =
-                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_company` (company) REFERENCES `companies` (`id`) ON UPDATE CASCADE;\n"            +
-                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_cpu1` (cpu1) REFERENCES `processors` (`id`) ON UPDATE CASCADE;\n"                 +
-                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_cpu2` (cpu2) REFERENCES `processors` (`id`) ON UPDATE CASCADE;\n"                 +
-                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk1` (disk1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"             +
-                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk2` (disk2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"             +
-                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_gpu` (gpu) REFERENCES `gpus` (`id`) ON UPDATE CASCADE;\n"                         +
-                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd1` (hdd1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
-                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd2` (hdd2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
-                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd3` (hdd3) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
+                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_company` (company) REFERENCES `companies` (`id`) ON UPDATE CASCADE;\n" +
+                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_cpu1` (cpu1) REFERENCES `processors` (`id`) ON UPDATE CASCADE;\n" +
+                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_cpu2` (cpu2) REFERENCES `processors` (`id`) ON UPDATE CASCADE;\n" +
+                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk1` (disk1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk2` (disk2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_gpu` (gpu) REFERENCES `gpus` (`id`) ON UPDATE CASCADE;\n" +
+                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd1` (hdd1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd2` (hdd2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+                "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd3` (hdd3) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
                 "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_music_synth` (music_synth) REFERENCES `sound_synths` (`id`) ON UPDATE CASCADE;\n" +
                 "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_sound_synth` (sound_synth) REFERENCES `sound_synths` (`id`) ON UPDATE CASCADE;";
 
@@ -1675,13 +1674,11 @@ namespace Marechai.Database
                 param3.Value = (string)dataRow["model"];
                 param4.Value = dataRow["cpu1"] == DBNull.Value ? (object)null : (int)dataRow["cpu1"];
 
-                param5.Value = dataRow["mhz1"] == DBNull.Value ? (object)null
-                                    : float.Parse(dataRow["mhz1"].ToString());
+                param5.Value = dataRow["mhz1"] == DBNull.Value ? (object)null : float.Parse(dataRow["mhz1"].ToString());
 
                 param6.Value = dataRow["cpu2"] == DBNull.Value ? (object)null : (int)dataRow["cpu2"];
 
-                param7.Value = dataRow["mhz2"] == DBNull.Value ? (object)null
-                                    : float.Parse(dataRow["mhz2"].ToString());
+                param7.Value = dataRow["mhz2"] == DBNull.Value ? (object)null : float.Parse(dataRow["mhz2"].ToString());
 
                 param8.Value  = (int)dataRow["ram"];
                 param9.Value  = (int)dataRow["rom"];
@@ -2549,7 +2546,7 @@ namespace Marechai.Database
 
                     switch(media)
                     {
-                        case"disk1":
+                        case "disk1":
                             if(dataRow["cap1"] != DBNull.Value)
                                 if(int.TryParse((string)dataRow["cap1"], out int cap))
                                     param4.Value = cap == 0
@@ -2559,7 +2556,7 @@ namespace Marechai.Database
                                                            : cap * 1024;
 
                             break;
-                        case"disk2":
+                        case "disk2":
                             if(dataRow["cap2"] != DBNull.Value)
                                 if(int.TryParse((string)dataRow["cap2"], out int cap))
                                     param4.Value = cap == 0
diff --git a/Marechai.Database/Schemas/Sql/V10.cs b/Marechai.Database/Schemas/Sql/V10.cs
index 7817e5b8..67ef10b1 100644
--- a/Marechai.Database/Schemas/Sql/V10.cs
+++ b/Marechai.Database/Schemas/Sql/V10.cs
@@ -62,62 +62,59 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string OwnedConsoles = V9.OwnedConsoles;
 
-        public static readonly string Processors =
-            "CREATE TABLE `processors` (\n"                                                                                 +
-            "`id` int(11) NOT NULL AUTO_INCREMENT,\n"                                                                       +
-            "`name` char(50) NOT NULL DEFAULT '',\n"                                                                        +
-            "`company` int(11) DEFAULT NULL,\n"                                                                             +
-            "`model_code` varchar(45) DEFAULT NULL,\n"                                                                      +
-            "`introduced` datetime DEFAULT NULL,\n"                                                                         +
-            "`instruction_set` int(11) DEFAULT NULL,\n"                                                                     +
-            "`speed` double DEFAULT NULL,\n"                                                                                +
-            "`package` varchar(45) DEFAULT NULL,\n"                                                                         +
-            "`GPRs` int(11) DEFAULT NULL,\n"                                                                                +
-            "`GPR_size` int(11) DEFAULT NULL,\n"                                                                            +
-            "`FPRs` int(11) DEFAULT NULL,\n"                                                                                +
-            "`FPR_size` int(11) DEFAULT NULL,\n"                                                                            +
-            "`cores` int(11) DEFAULT NULL,\n"                                                                               +
-            "`threads_per_core` int(11) DEFAULT NULL,\n"                                                                    +
-            "`process` varchar(45) DEFAULT NULL,\n"                                                                         +
-            "`process_nm` float DEFAULT NULL,\n"                                                                            +
-            "`die_size` float DEFAULT NULL,\n"                                                                              +
-            "`transistors` bigint(20) DEFAULT NULL,\n"                                                                      +
-            "`data_bus` int(11) DEFAULT NULL,\n"                                                                            +
-            "`addr_bus` int(11) DEFAULT NULL,\n"                                                                            +
-            "`SIMD_registers` int(11) DEFAULT NULL,\n"                                                                      +
-            "`SIMD_size` int(11) DEFAULT NULL,\n"                                                                           +
-            "`L1_instruction` float DEFAULT NULL,\n"                                                                        +
-            "`L1_data` float DEFAULT NULL,\n"                                                                               +
-            "`L2` float DEFAULT NULL,\n"                                                                                    +
-            "`L3` float DEFAULT NULL,\n"                                                                                    +
-            "PRIMARY KEY (`id`),\n"                                                                                         +
-            "KEY `idx_processors_name` (`name`),\n"                                                                         +
-            "KEY `idx_processors_company` (`company`),\n"                                                                   +
-            "KEY `idx_processors_model_code` (`model_code`),\n"                                                             +
-            "KEY `idx_processors_introduced` (`introduced`),\n"                                                             +
-            "KEY `idx_processors_instruction_set` (`instruction_set`),\n"                                                   +
-            "KEY `idx_processors_speed` (`speed`),\n"                                                                       +
-            "KEY `idx_processors_package` (`package`),\n"                                                                   +
-            "KEY `idx_processors_GPRs` (`GPRs`),\n"                                                                         +
-            "KEY `idx_processors_GPR_size` (`GPR_size`),\n"                                                                 +
-            "KEY `idx_processors_FPRs` (`FPRs`),\n"                                                                         +
-            "KEY `idx_processors_FPR_size` (`FPR_size`),\n"                                                                 +
-            "KEY `idx_processors_cores` (`cores`),\n"                                                                       +
-            "KEY `idx_processors_threads_per_core` (`threads_per_core`),\n"                                                 +
-            "KEY `idx_processors_process` (`process`),\n"                                                                   +
-            "KEY `idx_processors_process_nm` (`process_nm`),\n"                                                             +
-            "KEY `idx_processors_die_size` (`die_size`),\n"                                                                 +
-            "KEY `idx_processors_transistors` (`transistors`),\n"                                                           +
-            "KEY `idx_processors_data_bus` (`data_bus`),\n"                                                                 +
-            "KEY `idx_processors_addr_bus` (`addr_bus`),\n"                                                                 +
-            "KEY `idx_processors_SIMD_registers` (`SIMD_registers`),\n"                                                     +
-            "KEY `idx_processors_SIMD_size` (`SIMD_size`),\n"                                                               +
-            "KEY `idx_processors_L1_instruction` (`L1_instruction`),\n"                                                     +
-            "KEY `idx_processors_L1_data` (`L1_data`),\n"                                                                   +
-            "KEY `idx_processors_L2` (`L2`),\n"                                                                             +
-            "KEY `idx_processors_L3` (`L3`),\n"                                                                             +
-            "CONSTRAINT `fk_processors_company` FOREIGN KEY (`company`) REFERENCES `companies` (`id`) ON UPDATE CASCADE,\n" +
-            "CONSTRAINT `fk_processors_instruction_set` FOREIGN KEY (`instruction_set`) REFERENCES `instruction_sets` (`id`) ON UPDATE CASCADE);";
+        public static readonly string Processors = "CREATE TABLE `processors` (\n" +
+                                                   "`id` int(11) NOT NULL AUTO_INCREMENT,\n" +
+                                                   "`name` char(50) NOT NULL DEFAULT '',\n" +
+                                                   "`company` int(11) DEFAULT NULL,\n" +
+                                                   "`model_code` varchar(45) DEFAULT NULL,\n" +
+                                                   "`introduced` datetime DEFAULT NULL,\n" +
+                                                   "`instruction_set` int(11) DEFAULT NULL,\n" +
+                                                   "`speed` double DEFAULT NULL,\n" +
+                                                   "`package` varchar(45) DEFAULT NULL,\n" +
+                                                   "`GPRs` int(11) DEFAULT NULL,\n" +
+                                                   "`GPR_size` int(11) DEFAULT NULL,\n" +
+                                                   "`FPRs` int(11) DEFAULT NULL,\n" +
+                                                   "`FPR_size` int(11) DEFAULT NULL,\n" +
+                                                   "`cores` int(11) DEFAULT NULL,\n" +
+                                                   "`threads_per_core` int(11) DEFAULT NULL,\n" +
+                                                   "`process` varchar(45) DEFAULT NULL,\n" +
+                                                   "`process_nm` float DEFAULT NULL,\n" +
+                                                   "`die_size` float DEFAULT NULL,\n" +
+                                                   "`transistors` bigint(20) DEFAULT NULL,\n" +
+                                                   "`data_bus` int(11) DEFAULT NULL,\n" +
+                                                   "`addr_bus` int(11) DEFAULT NULL,\n" +
+                                                   "`SIMD_registers` int(11) DEFAULT NULL,\n" +
+                                                   "`SIMD_size` int(11) DEFAULT NULL,\n" +
+                                                   "`L1_instruction` float DEFAULT NULL,\n" +
+                                                   "`L1_data` float DEFAULT NULL,\n" + "`L2` float DEFAULT NULL,\n" +
+                                                   "`L3` float DEFAULT NULL,\n" + "PRIMARY KEY (`id`),\n" +
+                                                   "KEY `idx_processors_name` (`name`),\n" +
+                                                   "KEY `idx_processors_company` (`company`),\n" +
+                                                   "KEY `idx_processors_model_code` (`model_code`),\n" +
+                                                   "KEY `idx_processors_introduced` (`introduced`),\n" +
+                                                   "KEY `idx_processors_instruction_set` (`instruction_set`),\n" +
+                                                   "KEY `idx_processors_speed` (`speed`),\n" +
+                                                   "KEY `idx_processors_package` (`package`),\n" +
+                                                   "KEY `idx_processors_GPRs` (`GPRs`),\n" +
+                                                   "KEY `idx_processors_GPR_size` (`GPR_size`),\n" +
+                                                   "KEY `idx_processors_FPRs` (`FPRs`),\n" +
+                                                   "KEY `idx_processors_FPR_size` (`FPR_size`),\n" +
+                                                   "KEY `idx_processors_cores` (`cores`),\n" +
+                                                   "KEY `idx_processors_threads_per_core` (`threads_per_core`),\n" +
+                                                   "KEY `idx_processors_process` (`process`),\n" +
+                                                   "KEY `idx_processors_process_nm` (`process_nm`),\n" +
+                                                   "KEY `idx_processors_die_size` (`die_size`),\n" +
+                                                   "KEY `idx_processors_transistors` (`transistors`),\n" +
+                                                   "KEY `idx_processors_data_bus` (`data_bus`),\n" +
+                                                   "KEY `idx_processors_addr_bus` (`addr_bus`),\n" +
+                                                   "KEY `idx_processors_SIMD_registers` (`SIMD_registers`),\n" +
+                                                   "KEY `idx_processors_SIMD_size` (`SIMD_size`),\n" +
+                                                   "KEY `idx_processors_L1_instruction` (`L1_instruction`),\n" +
+                                                   "KEY `idx_processors_L1_data` (`L1_data`),\n" +
+                                                   "KEY `idx_processors_L2` (`L2`),\n" +
+                                                   "KEY `idx_processors_L3` (`L3`),\n" +
+                                                   "CONSTRAINT `fk_processors_company` FOREIGN KEY (`company`) REFERENCES `companies` (`id`) ON UPDATE CASCADE,\n" +
+                                                   "CONSTRAINT `fk_processors_instruction_set` FOREIGN KEY (`instruction_set`) REFERENCES `instruction_sets` (`id`) ON UPDATE CASCADE);";
 
         public static readonly string SoundSynths = V9.SoundSynths;
 
@@ -146,18 +143,13 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string InstructionSetExtensionsByProcessor =
             "CREATE TABLE IF NOT EXISTS `instruction_set_extensions_by_processor` (\n" +
-            "`id` INT           NOT NULL AUTO_INCREMENT,\n"                            +
-            "`processor_id` INT NOT NULL,\n"                                           +
-            "`extension_id` INT     NOT NULL,\n"                                       +
-            "PRIMARY                KEY (`id`, `processor_id`, `extension_id`),\n"     +
-            "INDEX `idx_setextension_processor` (`processor_id` ASC),\n"               +
-            "INDEX `idx_setextension_extension` (`extension_id` ASC),\n"               +
-            "CONSTRAINT `fk_extension_processor_id`\n"                                 +
-            "FOREIGN KEY (`processor_id`)\n"                                           +
-            "REFERENCES `processors` (`id`)\n"                                         + "ON DELETE RESTRICT\n" +
-            "ON UPDATE CASCADE,\n"                                                     +
-            "CONSTRAINT `fk_extension_extension_id`\n"                                 + "FOREIGN KEY (`extension_id`)\n" +
-            "REFERENCES `instruction_set_extensions` (`id`)\n"                         +
-            "ON DELETE RESTRICT\n"                                                     + "ON UPDATE CASCADE);";
+            "`id` INT           NOT NULL AUTO_INCREMENT,\n" + "`processor_id` INT NOT NULL,\n" +
+            "`extension_id` INT     NOT NULL,\n" +
+            "PRIMARY                KEY (`id`, `processor_id`, `extension_id`),\n" +
+            "INDEX `idx_setextension_processor` (`processor_id` ASC),\n" +
+            "INDEX `idx_setextension_extension` (`extension_id` ASC),\n" + "CONSTRAINT `fk_extension_processor_id`\n" +
+            "FOREIGN KEY (`processor_id`)\n" + "REFERENCES `processors` (`id`)\n" + "ON DELETE RESTRICT\n" +
+            "ON UPDATE CASCADE,\n" + "CONSTRAINT `fk_extension_extension_id`\n" + "FOREIGN KEY (`extension_id`)\n" +
+            "REFERENCES `instruction_set_extensions` (`id`)\n" + "ON DELETE RESTRICT\n" + "ON UPDATE CASCADE);";
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Schemas/Sql/V11.cs b/Marechai.Database/Schemas/Sql/V11.cs
index a6767f1b..c768f6f6 100644
--- a/Marechai.Database/Schemas/Sql/V11.cs
+++ b/Marechai.Database/Schemas/Sql/V11.cs
@@ -48,25 +48,24 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Forbidden = V10.Forbidden;
 
-        public static readonly string Gpus = "CREATE TABLE `gpus` (\n"                       +
-                                             "`id` int(11)     NOT NULL AUTO_INCREMENT,\n"   +
-                                             "`name` char(128) NOT NULL DEFAULT '',\n"       +
-                                             "`company` int(11)    DEFAULT NULL,\n"          +
-                                             "`model_code` varchar(45) DEFAULT NULL,\n"      +
-                                             "`introduced` datetime DEFAULT NULL,\n"         +
-                                             "`package` varchar(45) DEFAULT NULL,\n"         +
-                                             "`process` varchar(45) DEFAULT NULL,\n"         +
-                                             "`process_nm` float DEFAULT NULL,\n"            +
-                                             "`die_size` float       DEFAULT NULL,\n"        +
-                                             "`transistors` bigint(20) DEFAULT NULL,\n"      + "PRIMARY KEY (`id`),\n" +
-                                             "KEY `idx_gpus_name` (`name`),\n"               +
-                                             "KEY `idx_gpus_company` (`company`),\n"         +
-                                             "KEY `idx_gpus_model_code` (`model_code`),\n"   +
-                                             "KEY `idx_gpus_introduced` (`introduced`),\n"   +
-                                             "KEY `idx_gpus_package` (`package`),\n"         +
-                                             "KEY `idx_gpus_process` (`process`),\n"         +
-                                             "KEY `idx_gpus_process_nm` (`process_nm`),\n"   +
-                                             "KEY `idx_gpus_die_size` (`die_size`),\n"       +
+        public static readonly string Gpus = "CREATE TABLE `gpus` (\n" + "`id` int(11)     NOT NULL AUTO_INCREMENT,\n" +
+                                             "`name` char(128) NOT NULL DEFAULT '',\n" +
+                                             "`company` int(11)    DEFAULT NULL,\n" +
+                                             "`model_code` varchar(45) DEFAULT NULL,\n" +
+                                             "`introduced` datetime DEFAULT NULL,\n" +
+                                             "`package` varchar(45) DEFAULT NULL,\n" +
+                                             "`process` varchar(45) DEFAULT NULL,\n" +
+                                             "`process_nm` float DEFAULT NULL,\n" +
+                                             "`die_size` float       DEFAULT NULL,\n" +
+                                             "`transistors` bigint(20) DEFAULT NULL,\n" + "PRIMARY KEY (`id`),\n" +
+                                             "KEY `idx_gpus_name` (`name`),\n" +
+                                             "KEY `idx_gpus_company` (`company`),\n" +
+                                             "KEY `idx_gpus_model_code` (`model_code`),\n" +
+                                             "KEY `idx_gpus_introduced` (`introduced`),\n" +
+                                             "KEY `idx_gpus_package` (`package`),\n" +
+                                             "KEY `idx_gpus_process` (`process`),\n" +
+                                             "KEY `idx_gpus_process_nm` (`process_nm`),\n" +
+                                             "KEY `idx_gpus_die_size` (`die_size`),\n" +
                                              "KEY `idx_gpus_transistors` (`transistors`),\n" +
                                              "CONSTRAINT `fk_gpus_company` FOREIGN KEY (`company`) REFERENCES `companies` (`id`) ON UPDATE CASCADE);";
 
diff --git a/Marechai.Database/Schemas/Sql/V12.cs b/Marechai.Database/Schemas/Sql/V12.cs
index 5d12e07a..a3049381 100644
--- a/Marechai.Database/Schemas/Sql/V12.cs
+++ b/Marechai.Database/Schemas/Sql/V12.cs
@@ -40,110 +40,104 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V11.Companies;
 
-        public static readonly string Computers = "CREATE TABLE `computers` (\n"                       +
-                                                  "`id` int(11) NOT NULL AUTO_INCREMENT,\n"            +
-                                                  "`company` int(11) NOT NULL DEFAULT '0',\n"          +
-                                                  "`year` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                  "`model` char(50) NOT NULL DEFAULT '',\n"            +
-                                                  "`cpu1` int(11) DEFAULT NULL,\n"                     +
-                                                  "`mhz1` int(11) DEFAULT NULL,\n"                     +
-                                                  "`cpu2` int(11) DEFAULT NULL,\n"                     +
-                                                  "`mhz2` decimal(11,2) DEFAULT NULL,\n"               +
-                                                  "`bits` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                  "`ram` int(11) NOT NULL DEFAULT '0',\n"              +
-                                                  "`rom` int(11) NOT NULL DEFAULT '0',\n"              +
-                                                  "`gpu` int(11) DEFAULT NULL,\n"                      +
-                                                  "`vram` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                  "`colors` int(11) NOT NULL DEFAULT '0',\n"           +
-                                                  "`res` char(10) NOT NULL DEFAULT '',\n"              +
-                                                  "`sound_synth` int(11) NOT NULL DEFAULT '0',\n"      +
-                                                  "`music_synth` int(11) NOT NULL DEFAULT '0',\n"      +
-                                                  "`sound_channels` int(11) NOT NULL DEFAULT '0',\n"   +
-                                                  "`music_channels` int(11) NOT NULL DEFAULT '0',\n"   +
-                                                  "`hdd1` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                  "`hdd2` int(11) DEFAULT NULL,\n"                     +
-                                                  "`hdd3` int(11) DEFAULT NULL,\n"                     +
-                                                  "`disk1` int(11) NOT NULL DEFAULT '0',\n"            +
-                                                  "`cap1` char(25) NOT NULL DEFAULT '0',\n"            +
-                                                  "`disk2` int(11) DEFAULT NULL,\n"                    +
-                                                  "`cap2` char(25) DEFAULT NULL,\n"                    +
-                                                  "PRIMARY KEY (`id`),\n"                              +
-                                                  "KEY `idx_computers_company` (`company`),\n"         +
-                                                  "KEY `idx_computers_year` (`year`),\n"               +
-                                                  "KEY `idx_computers_model` (`model`),\n"             +
-                                                  "KEY `idx_computers_cpu1` (`cpu1`),\n"               +
-                                                  "KEY `idx_computers_cpu2` (`cpu2`),\n"               +
-                                                  "KEY `idx_computers_mhz1` (`mhz1`),\n"               +
-                                                  "KEY `idx_computers_mhz2` (`mhz2`),\n"               +
-                                                  "KEY `idx_computers_bits` (`bits`),\n"               +
-                                                  "KEY `idx_computers_ram` (`ram`),\n"                 +
-                                                  "KEY `idx_computers_rom` (`rom`),\n"                 +
-                                                  "KEY `idx_computers_gpu` (`gpu`),\n"                 +
-                                                  "KEY `idx_computers_vram` (`vram`),\n"               +
-                                                  "KEY `idx_computers_colors` (`colors`),\n"           +
-                                                  "KEY `idx_computers_res` (`res`),\n"                 +
+        public static readonly string Computers = "CREATE TABLE `computers` (\n" +
+                                                  "`id` int(11) NOT NULL AUTO_INCREMENT,\n" +
+                                                  "`company` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`year` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`model` char(50) NOT NULL DEFAULT '',\n" +
+                                                  "`cpu1` int(11) DEFAULT NULL,\n" + "`mhz1` int(11) DEFAULT NULL,\n" +
+                                                  "`cpu2` int(11) DEFAULT NULL,\n" +
+                                                  "`mhz2` decimal(11,2) DEFAULT NULL,\n" +
+                                                  "`bits` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`ram` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`rom` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`gpu` int(11) DEFAULT NULL,\n" +
+                                                  "`vram` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`colors` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`res` char(10) NOT NULL DEFAULT '',\n" +
+                                                  "`sound_synth` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`music_synth` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`sound_channels` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`music_channels` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`hdd1` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`hdd2` int(11) DEFAULT NULL,\n" + "`hdd3` int(11) DEFAULT NULL,\n" +
+                                                  "`disk1` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`cap1` char(25) NOT NULL DEFAULT '0',\n" +
+                                                  "`disk2` int(11) DEFAULT NULL,\n" +
+                                                  "`cap2` char(25) DEFAULT NULL,\n" + "PRIMARY KEY (`id`),\n" +
+                                                  "KEY `idx_computers_company` (`company`),\n" +
+                                                  "KEY `idx_computers_year` (`year`),\n" +
+                                                  "KEY `idx_computers_model` (`model`),\n" +
+                                                  "KEY `idx_computers_cpu1` (`cpu1`),\n" +
+                                                  "KEY `idx_computers_cpu2` (`cpu2`),\n" +
+                                                  "KEY `idx_computers_mhz1` (`mhz1`),\n" +
+                                                  "KEY `idx_computers_mhz2` (`mhz2`),\n" +
+                                                  "KEY `idx_computers_bits` (`bits`),\n" +
+                                                  "KEY `idx_computers_ram` (`ram`),\n" +
+                                                  "KEY `idx_computers_rom` (`rom`),\n" +
+                                                  "KEY `idx_computers_gpu` (`gpu`),\n" +
+                                                  "KEY `idx_computers_vram` (`vram`),\n" +
+                                                  "KEY `idx_computers_colors` (`colors`),\n" +
+                                                  "KEY `idx_computers_res` (`res`),\n" +
                                                   "KEY `idx_computers_sound_synth` (`sound_synth`),\n" +
                                                   "KEY `idx_computers_music_synth` (`music_synth`),\n" +
-                                                  "KEY `idx_computers_hdd1` (`hdd1`),\n"               +
-                                                  "KEY `idx_computers_hdd2` (`hdd2`),\n"               +
-                                                  "KEY `idx_computers_hdd3` (`hdd3`),\n"               +
-                                                  "KEY `idx_computers_disk1` (`disk1`),\n"             +
-                                                  "KEY `idx_computers_disk2` (`disk2`),\n"             +
-                                                  "KEY `idx_computers_cap1` (`cap1`),\n"               +
+                                                  "KEY `idx_computers_hdd1` (`hdd1`),\n" +
+                                                  "KEY `idx_computers_hdd2` (`hdd2`),\n" +
+                                                  "KEY `idx_computers_hdd3` (`hdd3`),\n" +
+                                                  "KEY `idx_computers_disk1` (`disk1`),\n" +
+                                                  "KEY `idx_computers_disk2` (`disk2`),\n" +
+                                                  "KEY `idx_computers_cap1` (`cap1`),\n" +
                                                   "KEY `idx_computers_cap2` (`cap2`))";
 
-        public static readonly string Consoles = "CREATE TABLE `consoles` (\n"                       +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,\n"           +
-                                                 "`company` int(11) NOT NULL DEFAULT '0',\n"         +
-                                                 "`model` char(50) NOT NULL DEFAULT '',\n"           +
-                                                 "`year` int(11) NOT NULL DEFAULT '0',\n"            +
-                                                 "`cpu1` int(11) DEFAULT NULL,\n"                    +
-                                                 "`mhz1` int(11) DEFAULT NULL,\n"                    +
-                                                 "`cpu2` int(11) DEFAULT NULL,\n"                    +
-                                                 "`mhz2` decimal(11,2) DEFAULT NULL,\n"              +
-                                                 "`bits` int(11) NOT NULL DEFAULT '0',\n"            +
-                                                 "`ram` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                 "`rom` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                 "`gpu` int(11) DEFAULT NULL,\n"                     +
-                                                 "`vram` int(11) NOT NULL DEFAULT '0',\n"            +
-                                                 "`res` char(11) NOT NULL DEFAULT '',\n"             +
-                                                 "`colors` int(11) NOT NULL DEFAULT '0',\n"          +
-                                                 "`palette` int(11) NOT NULL DEFAULT '0',\n"         +
-                                                 "`sound_synth` int(11) NOT NULL DEFAULT '0',\n"     +
-                                                 "`schannels` int(11) NOT NULL DEFAULT '0',\n"       +
-                                                 "`music_synth` int(11) NOT NULL DEFAULT '0',\n"     +
-                                                 "`mchannels` int(11) NOT NULL DEFAULT '0',\n"       +
-                                                 "`format` int(11) NOT NULL DEFAULT '0',\n"          +
-                                                 "`cap` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                 "PRIMARY KEY (`id`),\n"                             +
-                                                 "KEY `idx_consoles_company` (`company`),\n"         +
-                                                 "KEY `idx_consoles_year` (`year`),\n"               +
-                                                 "KEY `idx_consoles_model` (`model`),\n"             +
-                                                 "KEY `idx_consoles_cpu1` (`cpu1`),\n"               +
-                                                 "KEY `idx_consoles_cpu2` (`cpu2`),\n"               +
-                                                 "KEY `idx_consoles_mhz1` (`mhz1`),\n"               +
-                                                 "KEY `idx_consoles_mhz2` (`mhz2`),\n"               +
-                                                 "KEY `idx_consoles_bits` (`bits`),\n"               +
-                                                 "KEY `idx_consoles_ram` (`ram`),\n"                 +
-                                                 "KEY `idx_consoles_rom` (`rom`),\n"                 +
-                                                 "KEY `idx_consoles_gpu` (`gpu`),\n"                 +
-                                                 "KEY `idx_consoles_vram` (`vram`),\n"               +
-                                                 "KEY `idx_consoles_colors` (`colors`),\n"           +
-                                                 "KEY `idx_consoles_res` (`res`),\n"                 +
+        public static readonly string Consoles = "CREATE TABLE `consoles` (\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,\n" +
+                                                 "`company` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`model` char(50) NOT NULL DEFAULT '',\n" +
+                                                 "`year` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`cpu1` int(11) DEFAULT NULL,\n" + "`mhz1` int(11) DEFAULT NULL,\n" +
+                                                 "`cpu2` int(11) DEFAULT NULL,\n" +
+                                                 "`mhz2` decimal(11,2) DEFAULT NULL,\n" +
+                                                 "`bits` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`ram` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`rom` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`gpu` int(11) DEFAULT NULL,\n" +
+                                                 "`vram` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`res` char(11) NOT NULL DEFAULT '',\n" +
+                                                 "`colors` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`palette` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`sound_synth` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`schannels` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`music_synth` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`mchannels` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`format` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`cap` int(11) NOT NULL DEFAULT '0',\n" + "PRIMARY KEY (`id`),\n" +
+                                                 "KEY `idx_consoles_company` (`company`),\n" +
+                                                 "KEY `idx_consoles_year` (`year`),\n" +
+                                                 "KEY `idx_consoles_model` (`model`),\n" +
+                                                 "KEY `idx_consoles_cpu1` (`cpu1`),\n" +
+                                                 "KEY `idx_consoles_cpu2` (`cpu2`),\n" +
+                                                 "KEY `idx_consoles_mhz1` (`mhz1`),\n" +
+                                                 "KEY `idx_consoles_mhz2` (`mhz2`),\n" +
+                                                 "KEY `idx_consoles_bits` (`bits`),\n" +
+                                                 "KEY `idx_consoles_ram` (`ram`),\n" +
+                                                 "KEY `idx_consoles_rom` (`rom`),\n" +
+                                                 "KEY `idx_consoles_gpu` (`gpu`),\n" +
+                                                 "KEY `idx_consoles_vram` (`vram`),\n" +
+                                                 "KEY `idx_consoles_colors` (`colors`),\n" +
+                                                 "KEY `idx_consoles_res` (`res`),\n" +
                                                  "KEY `idx_consoles_sound_synth` (`sound_synth`),\n" +
                                                  "KEY `idx_consoles_music_synth` (`music_synth`),\n" +
-                                                 "KEY `idx_consoles_palette` (`palette`),\n"         +
-                                                 "KEY `idx_consoles_format` (`format`),\n"           +
+                                                 "KEY `idx_consoles_palette` (`palette`),\n" +
+                                                 "KEY `idx_consoles_format` (`format`),\n" +
                                                  "KEY `idx_consoles_cap` (`cap`));";
 
         public static readonly string DiskFormats = V11.DiskFormats;
 
         public static readonly string Forbidden = V11.Forbidden;
 
-        public static readonly string Gpus =
-            V11.Gpus                                                                         + "\n" +
-            $"INSERT INTO `gpus` (`id`, `name`) VALUES ({Operations.DB_NONE}, `DB_NONE`);\n" +
-            $"INSERT INTO `gpus` (`id`, `name`) VALUES ({Operations.DB_SOFTWARE}, `DB_FRAMEBUFFER`);";
+        public static readonly string Gpus = V11.Gpus + "\n" +
+                                             $"INSERT INTO `gpus` (`id`, `name`) VALUES ({Operations.DB_NONE}, `DB_NONE`);\n" +
+                                             $"INSERT INTO `gpus` (`id`, `name`) VALUES ({Operations.DB_SOFTWARE}, `DB_FRAMEBUFFER`);";
 
         public static readonly string Logs = V11.Logs;
 
diff --git a/Marechai.Database/Schemas/Sql/V13.cs b/Marechai.Database/Schemas/Sql/V13.cs
index c5745ed9..7f4e9359 100644
--- a/Marechai.Database/Schemas/Sql/V13.cs
+++ b/Marechai.Database/Schemas/Sql/V13.cs
@@ -40,100 +40,95 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V12.Companies;
 
-        public static readonly string Computers = "CREATE TABLE `computers` (\n"                       +
-                                                  "`id` int(11) NOT NULL AUTO_INCREMENT,\n"            +
-                                                  "`company` int(11) NOT NULL DEFAULT '0',\n"          +
-                                                  "`year` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                  "`model` char(50) NOT NULL DEFAULT '',\n"            +
-                                                  "`cpu1` int(11) DEFAULT NULL,\n"                     +
-                                                  "`mhz1` int(11) DEFAULT NULL,\n"                     +
-                                                  "`cpu2` int(11) DEFAULT NULL,\n"                     +
-                                                  "`mhz2` decimal(11,2) DEFAULT NULL,\n"               +
-                                                  "`bits` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                  "`ram` int(11) NOT NULL DEFAULT '0',\n"              +
-                                                  "`rom` int(11) NOT NULL DEFAULT '0',\n"              +
-                                                  "`gpu` int(11) DEFAULT NULL,\n"                      +
-                                                  "`vram` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                  "`colors` int(11) NOT NULL DEFAULT '0',\n"           +
-                                                  "`res` char(10) NOT NULL DEFAULT '',\n"              +
-                                                  "`sound_synth` int(11) NOT NULL DEFAULT '0',\n"      +
-                                                  "`music_synth` int(11) NOT NULL DEFAULT '0',\n"      +
-                                                  "`sound_channels` int(11) NOT NULL DEFAULT '0',\n"   +
-                                                  "`music_channels` int(11) NOT NULL DEFAULT '0',\n"   +
-                                                  "`hdd1` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                  "`hdd2` int(11) DEFAULT NULL,\n"                     +
-                                                  "`hdd3` int(11) DEFAULT NULL,\n"                     +
-                                                  "`disk1` int(11) NOT NULL DEFAULT '0',\n"            +
-                                                  "`cap1` char(25) NOT NULL DEFAULT '0',\n"            +
-                                                  "`disk2` int(11) DEFAULT NULL,\n"                    +
-                                                  "`cap2` char(25) DEFAULT NULL,\n"                    +
-                                                  "PRIMARY KEY (`id`),\n"                              +
-                                                  "KEY `idx_computers_company` (`company`),\n"         +
-                                                  "KEY `idx_computers_year` (`year`),\n"               +
-                                                  "KEY `idx_computers_model` (`model`),\n"             +
-                                                  "KEY `idx_computers_cpu1` (`cpu1`),\n"               +
-                                                  "KEY `idx_computers_cpu2` (`cpu2`),\n"               +
-                                                  "KEY `idx_computers_mhz1` (`mhz1`),\n"               +
-                                                  "KEY `idx_computers_mhz2` (`mhz2`),\n"               +
-                                                  "KEY `idx_computers_bits` (`bits`),\n"               +
-                                                  "KEY `idx_computers_ram` (`ram`),\n"                 +
-                                                  "KEY `idx_computers_rom` (`rom`),\n"                 +
-                                                  "KEY `idx_computers_gpu` (`gpu`),\n"                 +
-                                                  "KEY `idx_computers_vram` (`vram`),\n"               +
-                                                  "KEY `idx_computers_colors` (`colors`),\n"           +
-                                                  "KEY `idx_computers_res` (`res`),\n"                 +
+        public static readonly string Computers = "CREATE TABLE `computers` (\n" +
+                                                  "`id` int(11) NOT NULL AUTO_INCREMENT,\n" +
+                                                  "`company` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`year` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`model` char(50) NOT NULL DEFAULT '',\n" +
+                                                  "`cpu1` int(11) DEFAULT NULL,\n" + "`mhz1` int(11) DEFAULT NULL,\n" +
+                                                  "`cpu2` int(11) DEFAULT NULL,\n" +
+                                                  "`mhz2` decimal(11,2) DEFAULT NULL,\n" +
+                                                  "`bits` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`ram` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`rom` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`gpu` int(11) DEFAULT NULL,\n" +
+                                                  "`vram` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`colors` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`res` char(10) NOT NULL DEFAULT '',\n" +
+                                                  "`sound_synth` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`music_synth` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`sound_channels` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`music_channels` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`hdd1` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`hdd2` int(11) DEFAULT NULL,\n" + "`hdd3` int(11) DEFAULT NULL,\n" +
+                                                  "`disk1` int(11) NOT NULL DEFAULT '0',\n" +
+                                                  "`cap1` char(25) NOT NULL DEFAULT '0',\n" +
+                                                  "`disk2` int(11) DEFAULT NULL,\n" +
+                                                  "`cap2` char(25) DEFAULT NULL,\n" + "PRIMARY KEY (`id`),\n" +
+                                                  "KEY `idx_computers_company` (`company`),\n" +
+                                                  "KEY `idx_computers_year` (`year`),\n" +
+                                                  "KEY `idx_computers_model` (`model`),\n" +
+                                                  "KEY `idx_computers_cpu1` (`cpu1`),\n" +
+                                                  "KEY `idx_computers_cpu2` (`cpu2`),\n" +
+                                                  "KEY `idx_computers_mhz1` (`mhz1`),\n" +
+                                                  "KEY `idx_computers_mhz2` (`mhz2`),\n" +
+                                                  "KEY `idx_computers_bits` (`bits`),\n" +
+                                                  "KEY `idx_computers_ram` (`ram`),\n" +
+                                                  "KEY `idx_computers_rom` (`rom`),\n" +
+                                                  "KEY `idx_computers_gpu` (`gpu`),\n" +
+                                                  "KEY `idx_computers_vram` (`vram`),\n" +
+                                                  "KEY `idx_computers_colors` (`colors`),\n" +
+                                                  "KEY `idx_computers_res` (`res`),\n" +
                                                   "KEY `idx_computers_sound_synth` (`sound_synth`),\n" +
                                                   "KEY `idx_computers_music_synth` (`music_synth`),\n" +
-                                                  "KEY `idx_computers_hdd1` (`hdd1`),\n"               +
-                                                  "KEY `idx_computers_hdd2` (`hdd2`),\n"               +
-                                                  "KEY `idx_computers_hdd3` (`hdd3`),\n"               +
-                                                  "KEY `idx_computers_disk1` (`disk1`),\n"             +
-                                                  "KEY `idx_computers_disk2` (`disk2`),\n"             +
-                                                  "KEY `idx_computers_cap1` (`cap1`),\n"               +
+                                                  "KEY `idx_computers_hdd1` (`hdd1`),\n" +
+                                                  "KEY `idx_computers_hdd2` (`hdd2`),\n" +
+                                                  "KEY `idx_computers_hdd3` (`hdd3`),\n" +
+                                                  "KEY `idx_computers_disk1` (`disk1`),\n" +
+                                                  "KEY `idx_computers_disk2` (`disk2`),\n" +
+                                                  "KEY `idx_computers_cap1` (`cap1`),\n" +
                                                   "KEY `idx_computers_cap2` (`cap2`));";
 
-        public static readonly string Consoles = "CREATE TABLE `consoles` (\n"                       +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,\n"           +
-                                                 "`company` int(11) NOT NULL DEFAULT '0',\n"         +
-                                                 "`model` char(50) NOT NULL DEFAULT '',\n"           +
-                                                 "`year` int(11) NOT NULL DEFAULT '0',\n"            +
-                                                 "`cpu1` int(11) DEFAULT NULL,\n"                    +
-                                                 "`mhz1` int(11) DEFAULT NULL,\n"                    +
-                                                 "`cpu2` int(11) DEFAULT NULL,\n"                    +
-                                                 "`mhz2` decimal(11,2) DEFAULT NULL,\n"              +
-                                                 "`bits` int(11) NOT NULL DEFAULT '0',\n"            +
-                                                 "`ram` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                 "`rom` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                 "`gpu` int(11) DEFAULT NULL,\n"                     +
-                                                 "`vram` int(11) NOT NULL DEFAULT '0',\n"            +
-                                                 "`res` char(11) NOT NULL DEFAULT '',\n"             +
-                                                 "`colors` int(11) NOT NULL DEFAULT '0',\n"          +
-                                                 "`palette` int(11) NOT NULL DEFAULT '0',\n"         +
-                                                 "`sound_synth` int(11) NOT NULL DEFAULT '0',\n"     +
-                                                 "`schannels` int(11) NOT NULL DEFAULT '0',\n"       +
-                                                 "`music_synth` int(11) NOT NULL DEFAULT '0',\n"     +
-                                                 "`mchannels` int(11) NOT NULL DEFAULT '0',\n"       +
-                                                 "`format` int(11) NOT NULL DEFAULT '0',\n"          +
-                                                 "`cap` int(11) NOT NULL DEFAULT '0',\n"             +
-                                                 "PRIMARY KEY (`id`),\n"                             +
-                                                 "KEY `idx_consoles_company` (`company`),\n"         +
-                                                 "KEY `idx_consoles_year` (`year`),\n"               +
-                                                 "KEY `idx_consoles_model` (`model`),\n"             +
-                                                 "KEY `idx_consoles_cpu1` (`cpu1`),\n"               +
-                                                 "KEY `idx_consoles_cpu2` (`cpu2`),\n"               +
-                                                 "KEY `idx_consoles_mhz1` (`mhz1`),\n"               +
-                                                 "KEY `idx_consoles_mhz2` (`mhz2`),\n"               +
-                                                 "KEY `idx_consoles_bits` (`bits`),\n"               +
-                                                 "KEY `idx_consoles_ram` (`ram`),\n"                 +
-                                                 "KEY `idx_consoles_rom` (`rom`),\n"                 +
-                                                 "KEY `idx_consoles_gpu` (`gpu`),\n"                 +
-                                                 "KEY `idx_consoles_vram` (`vram`),\n"               +
-                                                 "KEY `idx_consoles_colors` (`colors`),\n"           +
-                                                 "KEY `idx_consoles_res` (`res`),\n"                 +
+        public static readonly string Consoles = "CREATE TABLE `consoles` (\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,\n" +
+                                                 "`company` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`model` char(50) NOT NULL DEFAULT '',\n" +
+                                                 "`year` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`cpu1` int(11) DEFAULT NULL,\n" + "`mhz1` int(11) DEFAULT NULL,\n" +
+                                                 "`cpu2` int(11) DEFAULT NULL,\n" +
+                                                 "`mhz2` decimal(11,2) DEFAULT NULL,\n" +
+                                                 "`bits` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`ram` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`rom` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`gpu` int(11) DEFAULT NULL,\n" +
+                                                 "`vram` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`res` char(11) NOT NULL DEFAULT '',\n" +
+                                                 "`colors` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`palette` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`sound_synth` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`schannels` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`music_synth` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`mchannels` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`format` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`cap` int(11) NOT NULL DEFAULT '0',\n" + "PRIMARY KEY (`id`),\n" +
+                                                 "KEY `idx_consoles_company` (`company`),\n" +
+                                                 "KEY `idx_consoles_year` (`year`),\n" +
+                                                 "KEY `idx_consoles_model` (`model`),\n" +
+                                                 "KEY `idx_consoles_cpu1` (`cpu1`),\n" +
+                                                 "KEY `idx_consoles_cpu2` (`cpu2`),\n" +
+                                                 "KEY `idx_consoles_mhz1` (`mhz1`),\n" +
+                                                 "KEY `idx_consoles_mhz2` (`mhz2`),\n" +
+                                                 "KEY `idx_consoles_bits` (`bits`),\n" +
+                                                 "KEY `idx_consoles_ram` (`ram`),\n" +
+                                                 "KEY `idx_consoles_rom` (`rom`),\n" +
+                                                 "KEY `idx_consoles_gpu` (`gpu`),\n" +
+                                                 "KEY `idx_consoles_vram` (`vram`),\n" +
+                                                 "KEY `idx_consoles_colors` (`colors`),\n" +
+                                                 "KEY `idx_consoles_res` (`res`),\n" +
                                                  "KEY `idx_consoles_sound_synth` (`sound_synth`),\n" +
                                                  "KEY `idx_consoles_music_synth` (`music_synth`),\n" +
-                                                 "KEY `idx_consoles_palette` (`palette`),\n"         +
-                                                 "KEY `idx_consoles_format` (`format`),\n"           +
+                                                 "KEY `idx_consoles_palette` (`palette`),\n" +
+                                                 "KEY `idx_consoles_format` (`format`),\n" +
                                                  "KEY `idx_consoles_cap` (`cap`));";
 
         public static readonly string DiskFormats = V12.DiskFormats;
@@ -154,50 +149,49 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Processors = V12.Processors;
 
-        public static readonly string SoundSynths = "CREATE TABLE `sound_synths` (\n"                       +
-                                                    "`id` int(11) NOT NULL AUTO_INCREMENT,\n"               +
-                                                    "`name` char(50) NOT NULL DEFAULT '',\n"                +
-                                                    "`company` int(11) DEFAULT NULL,\n"                     +
-                                                    "`model_code` varchar(45) DEFAULT NULL,\n"              +
-                                                    "`introduced` datetime DEFAULT NULL,\n"                 +
-                                                    "`voices` int(11) DEFAULT NULL,\n"                      +
-                                                    "`frequency` double DEFAULT NULL,\n"                    +
-                                                    "`depth` int(11) DEFAULT NULL,\n"                       +
-                                                    "`square_wave` int(11) DEFAULT NULL,\n"                 +
-                                                    "`white_noise` int(11) DEFAULT NULL,\n"                 +
-                                                    "`type` int(11) DEFAULT NULL,\n"                        +
-                                                    "PRIMARY KEY (`id`),\n"                                 +
-                                                    "KEY `idx_sound_synths_name` (`name`),\n"               +
-                                                    "KEY `idx_sound_synths_company` (`company`),\n"         +
-                                                    "KEY `idx_sound_synths_model_code` (`model_code`),\n"   +
-                                                    "KEY `idx_sound_synths_introduced` (`introduced`),\n"   +
-                                                    "KEY `idx_sound_synths_voices` (`voices`),\n"           +
-                                                    "KEY `idx_sound_synths_frequency` (`frequency`),\n"     +
-                                                    "KEY `idx_sound_synths_depth` (`depth`),\n"             +
+        public static readonly string SoundSynths = "CREATE TABLE `sound_synths` (\n" +
+                                                    "`id` int(11) NOT NULL AUTO_INCREMENT,\n" +
+                                                    "`name` char(50) NOT NULL DEFAULT '',\n" +
+                                                    "`company` int(11) DEFAULT NULL,\n" +
+                                                    "`model_code` varchar(45) DEFAULT NULL,\n" +
+                                                    "`introduced` datetime DEFAULT NULL,\n" +
+                                                    "`voices` int(11) DEFAULT NULL,\n" +
+                                                    "`frequency` double DEFAULT NULL,\n" +
+                                                    "`depth` int(11) DEFAULT NULL,\n" +
+                                                    "`square_wave` int(11) DEFAULT NULL,\n" +
+                                                    "`white_noise` int(11) DEFAULT NULL,\n" +
+                                                    "`type` int(11) DEFAULT NULL,\n" + "PRIMARY KEY (`id`),\n" +
+                                                    "KEY `idx_sound_synths_name` (`name`),\n" +
+                                                    "KEY `idx_sound_synths_company` (`company`),\n" +
+                                                    "KEY `idx_sound_synths_model_code` (`model_code`),\n" +
+                                                    "KEY `idx_sound_synths_introduced` (`introduced`),\n" +
+                                                    "KEY `idx_sound_synths_voices` (`voices`),\n" +
+                                                    "KEY `idx_sound_synths_frequency` (`frequency`),\n" +
+                                                    "KEY `idx_sound_synths_depth` (`depth`),\n" +
                                                     "KEY `idx_sound_synths_square_wave` (`square_wave`),\n" +
                                                     "KEY `idx_sound_synths_white_noise` (`white_noise`),\n" +
-                                                    "KEY `idx_sound_synths_type` (`type`),\n"               +
+                                                    "KEY `idx_sound_synths_type` (`type`),\n" +
                                                     "CONSTRAINT `fk_sound_synths_company` FOREIGN KEY (`company`) REFERENCES `companies` (`id`) ON UPDATE CASCADE);";
 
         public static readonly string ComputersForeignKeys =
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_company (company) REFERENCES companies (id);\n"                              +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu1 (cpu1) REFERENCES processors (id);\n"                                   +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu2 (cpu2) REFERENCES processors (id);\n"                                   +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_gpu (gpu) REFERENCES gpus (id);\n"                                           +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_sound_synth (sound_synth) REFERENCES sound_synths (id);\n"                   +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_company (company) REFERENCES companies (id);\n" +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu1 (cpu1) REFERENCES processors (id);\n" +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu2 (cpu2) REFERENCES processors (id);\n" +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_gpu (gpu) REFERENCES gpus (id);\n" +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_sound_synth (sound_synth) REFERENCES sound_synths (id);\n" +
             "ALTER TABLE computers ADD FOREIGN KEY fk_computers_music_synth (music_synth) REFERENCES sound_synths (id) ON UPDATE CASCADE;\n" +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd1 (hdd1) REFERENCES disk_formats (id);\n"                                 +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd2 (hdd2) REFERENCES disk_formats (id);\n"                                 +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd3 (hdd3) REFERENCES disk_formats (id);\n"                                 +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_disk1 (disk1) REFERENCES disk_formats (id);\n"                               +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd1 (hdd1) REFERENCES disk_formats (id);\n" +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd2 (hdd2) REFERENCES disk_formats (id);\n" +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd3 (hdd3) REFERENCES disk_formats (id);\n" +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_disk1 (disk1) REFERENCES disk_formats (id);\n" +
             "ALTER TABLE computers ADD FOREIGN KEY fk_computers_disk2 (disk2) REFERENCES disk_formats (id);";
 
         public static readonly string ConsolesForeignKeys =
-            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_company (company) REFERENCES companies (id);\n"                              +
-            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu1 (cpu1) REFERENCES processors (id);\n"                                   +
-            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu2 (cpu2) REFERENCES processors (id);\n"                                   +
-            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_gpu (gpu) REFERENCES gpus (id);\n"                                           +
-            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_sound_synth (sound_synth) REFERENCES sound_synths (id);\n"                   +
+            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_company (company) REFERENCES companies (id);\n" +
+            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu1 (cpu1) REFERENCES processors (id);\n" +
+            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu2 (cpu2) REFERENCES processors (id);\n" +
+            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_gpu (gpu) REFERENCES gpus (id);\n" +
+            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_sound_synth (sound_synth) REFERENCES sound_synths (id);\n" +
             "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_music_synth (music_synth) REFERENCES sound_synths (id) ON UPDATE CASCADE;\n" +
             "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_format (format) REFERENCES disk_formats (id);";
 
diff --git a/Marechai.Database/Schemas/Sql/V14.cs b/Marechai.Database/Schemas/Sql/V14.cs
index eaa7e856..07602cbe 100644
--- a/Marechai.Database/Schemas/Sql/V14.cs
+++ b/Marechai.Database/Schemas/Sql/V14.cs
@@ -40,56 +40,53 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V13.Companies;
 
-        public static readonly string Machines = "CREATE TABLE `machines` (;\n"                       +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n"           +
-                                                 "`company` int(11) NOT NULL DEFAULT '0',;\n"         +
-                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "`model` char(50) NOT NULL DEFAULT '',;\n"           +
-                                                 "`cpu1` int(11) DEFAULT NULL,;\n"                    +
-                                                 "`mhz1` int(11) DEFAULT NULL,;\n"                    +
-                                                 "`cpu2` int(11) DEFAULT NULL,;\n"                    +
-                                                 "`mhz2` decimal(11,2) DEFAULT NULL,;\n"              +
-                                                 "`ram` int(11) NOT NULL DEFAULT '0',;\n"             +
-                                                 "`rom` int(11) NOT NULL DEFAULT '0',;\n"             +
-                                                 "`gpu` int(11) DEFAULT NULL,;\n"                     +
-                                                 "`vram` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "`colors` int(11) NOT NULL DEFAULT '0',;\n"          +
-                                                 "`res` char(10) NOT NULL DEFAULT '',;\n"             +
-                                                 "`sound_synth` int(11) NOT NULL DEFAULT '0',;\n"     +
-                                                 "`music_synth` int(11) NOT NULL DEFAULT '0',;\n"     +
-                                                 "`sound_channels` int(11) NOT NULL DEFAULT '0',;\n"  +
-                                                 "`music_channels` int(11) NOT NULL DEFAULT '0',;\n"  +
-                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "`hdd2` int(11) DEFAULT NULL,;\n"                    +
-                                                 "`hdd3` int(11) DEFAULT NULL,;\n"                    +
-                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n"           +
-                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n"           +
-                                                 "`disk2` int(11) DEFAULT NULL,;\n"                   +
-                                                 "`cap2` char(25) DEFAULT NULL,;\n"                   +
-                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "PRIMARY KEY (`id`),;\n"                             +
-                                                 "KEY `idx_machines_company` (`company`),;\n"         +
-                                                 "KEY `idx_machines_year` (`year`),;\n"               +
-                                                 "KEY `idx_machines_model` (`model`),;\n"             +
-                                                 "KEY `idx_machines_cpu1` (`cpu1`),;\n"               +
-                                                 "KEY `idx_machines_cpu2` (`cpu2`),;\n"               +
-                                                 "KEY `idx_machines_mhz1` (`mhz1`),;\n"               +
-                                                 "KEY `idx_machines_mhz2` (`mhz2`),;\n"               +
-                                                 "KEY `idx_machines_ram` (`ram`),;\n"                 +
-                                                 "KEY `idx_machines_rom` (`rom`),;\n"                 +
-                                                 "KEY `idx_machines_gpu` (`gpu`),;\n"                 +
-                                                 "KEY `idx_machines_vram` (`vram`),;\n"               +
-                                                 "KEY `idx_machines_colors` (`colors`),;\n"           +
-                                                 "KEY `idx_machines_res` (`res`),;\n"                 +
+        public static readonly string Machines = "CREATE TABLE `machines` (;\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n" +
+                                                 "`company` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`model` char(50) NOT NULL DEFAULT '',;\n" +
+                                                 "`cpu1` int(11) DEFAULT NULL,;\n" + "`mhz1` int(11) DEFAULT NULL,;\n" +
+                                                 "`cpu2` int(11) DEFAULT NULL,;\n" +
+                                                 "`mhz2` decimal(11,2) DEFAULT NULL,;\n" +
+                                                 "`ram` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`rom` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`gpu` int(11) DEFAULT NULL,;\n" +
+                                                 "`vram` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`colors` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`res` char(10) NOT NULL DEFAULT '',;\n" +
+                                                 "`sound_synth` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`music_synth` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`sound_channels` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`music_channels` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`hdd2` int(11) DEFAULT NULL,;\n" + "`hdd3` int(11) DEFAULT NULL,;\n" +
+                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n" +
+                                                 "`disk2` int(11) DEFAULT NULL,;\n" +
+                                                 "`cap2` char(25) DEFAULT NULL,;\n" +
+                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n" + "PRIMARY KEY (`id`),;\n" +
+                                                 "KEY `idx_machines_company` (`company`),;\n" +
+                                                 "KEY `idx_machines_year` (`year`),;\n" +
+                                                 "KEY `idx_machines_model` (`model`),;\n" +
+                                                 "KEY `idx_machines_cpu1` (`cpu1`),;\n" +
+                                                 "KEY `idx_machines_cpu2` (`cpu2`),;\n" +
+                                                 "KEY `idx_machines_mhz1` (`mhz1`),;\n" +
+                                                 "KEY `idx_machines_mhz2` (`mhz2`),;\n" +
+                                                 "KEY `idx_machines_ram` (`ram`),;\n" +
+                                                 "KEY `idx_machines_rom` (`rom`),;\n" +
+                                                 "KEY `idx_machines_gpu` (`gpu`),;\n" +
+                                                 "KEY `idx_machines_vram` (`vram`),;\n" +
+                                                 "KEY `idx_machines_colors` (`colors`),;\n" +
+                                                 "KEY `idx_machines_res` (`res`),;\n" +
                                                  "KEY `idx_machines_sound_synth` (`sound_synth`),;\n" +
                                                  "KEY `idx_machines_music_synth` (`music_synth`),;\n" +
-                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n"               +
-                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n"               +
-                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n"               +
-                                                 "KEY `idx_machines_disk1` (`disk1`),;\n"             +
-                                                 "KEY `idx_machines_disk2` (`disk2`),;\n"             +
-                                                 "KEY `idx_machines_cap1` (`cap1`),;\n"               +
-                                                 "KEY `idx_machines_cap2` (`cap2`),;\n"               +
+                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n" +
+                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n" +
+                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n" +
+                                                 "KEY `idx_machines_disk1` (`disk1`),;\n" +
+                                                 "KEY `idx_machines_disk2` (`disk2`),;\n" +
+                                                 "KEY `idx_machines_cap1` (`cap1`),;\n" +
+                                                 "KEY `idx_machines_cap2` (`cap2`),;\n" +
                                                  "KEY `idx_machines_type` (`type`));";
 
         public static readonly string DiskFormats = V13.DiskFormats;
@@ -119,15 +116,15 @@ namespace Marechai.Database.Schemas.Sql
         public static readonly string Iso3166NumericValues = V13.Iso3166NumericValues;
 
         public static readonly string MachinesForeignKeys =
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_company` (company) REFERENCES `companies` (`id`) ON UPDATE CASCADE;\n"            +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_cpu1` (cpu1) REFERENCES `processors` (`id`) ON UPDATE CASCADE;\n"                 +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_cpu2` (cpu2) REFERENCES `processors` (`id`) ON UPDATE CASCADE;\n"                 +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk1` (disk1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"             +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk2` (disk2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"             +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_gpu` (gpu) REFERENCES `gpus` (`id`) ON UPDATE CASCADE;\n"                         +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd1` (hdd1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd2` (hdd2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd3` (hdd3) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_company` (company) REFERENCES `companies` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_cpu1` (cpu1) REFERENCES `processors` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_cpu2` (cpu2) REFERENCES `processors` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk1` (disk1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk2` (disk2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_gpu` (gpu) REFERENCES `gpus` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd1` (hdd1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd2` (hdd2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd3` (hdd3) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
             "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_music_synth` (music_synth) REFERENCES `sound_synths` (`id`) ON UPDATE CASCADE;\n" +
             "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_sound_synth` (sound_synth) REFERENCES `sound_synths` (`id`) ON UPDATE CASCADE;";
 
diff --git a/Marechai.Database/Schemas/Sql/V15.cs b/Marechai.Database/Schemas/Sql/V15.cs
index 1ac9d04a..3e5d648e 100644
--- a/Marechai.Database/Schemas/Sql/V15.cs
+++ b/Marechai.Database/Schemas/Sql/V15.cs
@@ -40,48 +40,46 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V14.Companies;
 
-        public static readonly string Machines = "CREATE TABLE `machines` (;\n"                       +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n"           +
-                                                 "`company` int(11) NOT NULL DEFAULT '0',;\n"         +
-                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "`model` char(50) NOT NULL DEFAULT '',;\n"           +
-                                                 "`ram` int(11) NOT NULL DEFAULT '0',;\n"             +
-                                                 "`rom` int(11) NOT NULL DEFAULT '0',;\n"             +
-                                                 "`gpu` int(11) DEFAULT NULL,;\n"                     +
-                                                 "`vram` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "`colors` int(11) NOT NULL DEFAULT '0',;\n"          +
-                                                 "`res` char(10) NOT NULL DEFAULT '',;\n"             +
-                                                 "`sound_synth` int(11) NOT NULL DEFAULT '0',;\n"     +
-                                                 "`music_synth` int(11) NOT NULL DEFAULT '0',;\n"     +
-                                                 "`sound_channels` int(11) NOT NULL DEFAULT '0',;\n"  +
-                                                 "`music_channels` int(11) NOT NULL DEFAULT '0',;\n"  +
-                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "`hdd2` int(11) DEFAULT NULL,;\n"                    +
-                                                 "`hdd3` int(11) DEFAULT NULL,;\n"                    +
-                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n"           +
-                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n"           +
-                                                 "`disk2` int(11) DEFAULT NULL,;\n"                   +
-                                                 "`cap2` char(25) DEFAULT NULL,;\n"                   +
-                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "PRIMARY KEY (`id`),;\n"                             +
-                                                 "KEY `idx_machines_company` (`company`),;\n"         +
-                                                 "KEY `idx_machines_year` (`year`),;\n"               +
-                                                 "KEY `idx_machines_model` (`model`),;\n"             +
-                                                 "KEY `idx_machines_ram` (`ram`),;\n"                 +
-                                                 "KEY `idx_machines_rom` (`rom`),;\n"                 +
-                                                 "KEY `idx_machines_gpu` (`gpu`),;\n"                 +
-                                                 "KEY `idx_machines_vram` (`vram`),;\n"               +
-                                                 "KEY `idx_machines_colors` (`colors`),;\n"           +
-                                                 "KEY `idx_machines_res` (`res`),;\n"                 +
+        public static readonly string Machines = "CREATE TABLE `machines` (;\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n" +
+                                                 "`company` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`model` char(50) NOT NULL DEFAULT '',;\n" +
+                                                 "`ram` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`rom` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`gpu` int(11) DEFAULT NULL,;\n" +
+                                                 "`vram` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`colors` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`res` char(10) NOT NULL DEFAULT '',;\n" +
+                                                 "`sound_synth` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`music_synth` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`sound_channels` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`music_channels` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`hdd2` int(11) DEFAULT NULL,;\n" + "`hdd3` int(11) DEFAULT NULL,;\n" +
+                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n" +
+                                                 "`disk2` int(11) DEFAULT NULL,;\n" +
+                                                 "`cap2` char(25) DEFAULT NULL,;\n" +
+                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n" + "PRIMARY KEY (`id`),;\n" +
+                                                 "KEY `idx_machines_company` (`company`),;\n" +
+                                                 "KEY `idx_machines_year` (`year`),;\n" +
+                                                 "KEY `idx_machines_model` (`model`),;\n" +
+                                                 "KEY `idx_machines_ram` (`ram`),;\n" +
+                                                 "KEY `idx_machines_rom` (`rom`),;\n" +
+                                                 "KEY `idx_machines_gpu` (`gpu`),;\n" +
+                                                 "KEY `idx_machines_vram` (`vram`),;\n" +
+                                                 "KEY `idx_machines_colors` (`colors`),;\n" +
+                                                 "KEY `idx_machines_res` (`res`),;\n" +
                                                  "KEY `idx_machines_sound_synth` (`sound_synth`),;\n" +
                                                  "KEY `idx_machines_music_synth` (`music_synth`),;\n" +
-                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n"               +
-                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n"               +
-                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n"               +
-                                                 "KEY `idx_machines_disk1` (`disk1`),;\n"             +
-                                                 "KEY `idx_machines_disk2` (`disk2`),;\n"             +
-                                                 "KEY `idx_machines_cap1` (`cap1`),;\n"               +
-                                                 "KEY `idx_machines_cap2` (`cap2`),;\n"               +
+                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n" +
+                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n" +
+                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n" +
+                                                 "KEY `idx_machines_disk1` (`disk1`),;\n" +
+                                                 "KEY `idx_machines_disk2` (`disk2`),;\n" +
+                                                 "KEY `idx_machines_cap1` (`cap1`),;\n" +
+                                                 "KEY `idx_machines_cap2` (`cap2`),;\n" +
                                                  "KEY `idx_machines_type` (`type`));";
 
         public static readonly string DiskFormats = V14.DiskFormats;
@@ -105,13 +103,13 @@ namespace Marechai.Database.Schemas.Sql
         public static readonly string SoundSynths = V14.SoundSynths;
 
         public static readonly string MachinesForeignKeys =
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_company` (company) REFERENCES `companies` (`id`) ON UPDATE CASCADE;\n"            +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk1` (disk1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"             +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk2` (disk2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"             +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_gpu` (gpu) REFERENCES `gpus` (`id`) ON UPDATE CASCADE;\n"                         +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd1` (hdd1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd2` (hdd2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd3` (hdd3) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_company` (company) REFERENCES `companies` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk1` (disk1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk2` (disk2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_gpu` (gpu) REFERENCES `gpus` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd1` (hdd1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd2` (hdd2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd3` (hdd3) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
             "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_music_synth` (music_synth) REFERENCES `sound_synths` (`id`) ON UPDATE CASCADE;\n" +
             "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_sound_synth` (sound_synth) REFERENCES `sound_synths` (`id`) ON UPDATE CASCADE;";
 
@@ -131,15 +129,14 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string InstructionSetExtensionsByProcessor = V14.InstructionSetExtensionsByProcessor;
 
-        public static readonly string ProcessorsByMachine =
-            "CREATE TABLE `processors_by_machine` (\n"                                                                                                  +
-            "`processor` INT NOT NULL, \n"                                                                                                              +
-            "`machine` INT NOT NULL,\n"                                                                                                                 +
-            "`speed` FLOAT DEFAULT NULL, \n"                                                                                                            +
-            "KEY `idx_processors_by_machine_processor` (`processor`),\n"                                                                                +
-            "KEY `idx_processors_by_machine_machine` (`machine`),\n"                                                                                    +
-            "KEY `idx_processors_by_machine_speed` (`speed`),\n"                                                                                        +
-            "CONSTRAINT `fk_processors_by_machine_machine` FOREIGN KEY (`machine`) REFERENCES `machines` (`id`) ON UPDATE CASCADE ON DELETE CASCADE,\n" +
-            "CONSTRAINT `fk_processors_by_machine_processor` FOREIGN KEY (`processor`) REFERENCES `processors` (`id`) ON UPDATE CASCADE ON DELETE CASCADE);";
+        public static readonly string ProcessorsByMachine = "CREATE TABLE `processors_by_machine` (\n" +
+                                                            "`processor` INT NOT NULL, \n" +
+                                                            "`machine` INT NOT NULL,\n" +
+                                                            "`speed` FLOAT DEFAULT NULL, \n" +
+                                                            "KEY `idx_processors_by_machine_processor` (`processor`),\n" +
+                                                            "KEY `idx_processors_by_machine_machine` (`machine`),\n" +
+                                                            "KEY `idx_processors_by_machine_speed` (`speed`),\n" +
+                                                            "CONSTRAINT `fk_processors_by_machine_machine` FOREIGN KEY (`machine`) REFERENCES `machines` (`id`) ON UPDATE CASCADE ON DELETE CASCADE,\n" +
+                                                            "CONSTRAINT `fk_processors_by_machine_processor` FOREIGN KEY (`processor`) REFERENCES `processors` (`id`) ON UPDATE CASCADE ON DELETE CASCADE);";
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Schemas/Sql/V16.cs b/Marechai.Database/Schemas/Sql/V16.cs
index e484abd1..f7794b10 100644
--- a/Marechai.Database/Schemas/Sql/V16.cs
+++ b/Marechai.Database/Schemas/Sql/V16.cs
@@ -40,46 +40,44 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V15.Companies;
 
-        public static readonly string Machines = "CREATE TABLE `machines` (;\n"                       +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n"           +
-                                                 "`company` int(11) NOT NULL DEFAULT '0',;\n"         +
-                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "`model` char(50) NOT NULL DEFAULT '',;\n"           +
-                                                 "`ram` int(11) NOT NULL DEFAULT '0',;\n"             +
-                                                 "`rom` int(11) NOT NULL DEFAULT '0',;\n"             +
-                                                 "`vram` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "`colors` int(11) NOT NULL DEFAULT '0',;\n"          +
-                                                 "`res` char(10) NOT NULL DEFAULT '',;\n"             +
-                                                 "`sound_synth` int(11) NOT NULL DEFAULT '0',;\n"     +
-                                                 "`music_synth` int(11) NOT NULL DEFAULT '0',;\n"     +
-                                                 "`sound_channels` int(11) NOT NULL DEFAULT '0',;\n"  +
-                                                 "`music_channels` int(11) NOT NULL DEFAULT '0',;\n"  +
-                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "`hdd2` int(11) DEFAULT NULL,;\n"                    +
-                                                 "`hdd3` int(11) DEFAULT NULL,;\n"                    +
-                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n"           +
-                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n"           +
-                                                 "`disk2` int(11) DEFAULT NULL,;\n"                   +
-                                                 "`cap2` char(25) DEFAULT NULL,;\n"                   +
-                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n"            +
-                                                 "PRIMARY KEY (`id`),;\n"                             +
-                                                 "KEY `idx_machines_company` (`company`),;\n"         +
-                                                 "KEY `idx_machines_year` (`year`),;\n"               +
-                                                 "KEY `idx_machines_model` (`model`),;\n"             +
-                                                 "KEY `idx_machines_ram` (`ram`),;\n"                 +
-                                                 "KEY `idx_machines_rom` (`rom`),;\n"                 +
-                                                 "KEY `idx_machines_vram` (`vram`),;\n"               +
-                                                 "KEY `idx_machines_colors` (`colors`),;\n"           +
-                                                 "KEY `idx_machines_res` (`res`),;\n"                 +
+        public static readonly string Machines = "CREATE TABLE `machines` (;\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n" +
+                                                 "`company` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`model` char(50) NOT NULL DEFAULT '',;\n" +
+                                                 "`ram` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`rom` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`vram` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`colors` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`res` char(10) NOT NULL DEFAULT '',;\n" +
+                                                 "`sound_synth` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`music_synth` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`sound_channels` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`music_channels` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`hdd2` int(11) DEFAULT NULL,;\n" + "`hdd3` int(11) DEFAULT NULL,;\n" +
+                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n" +
+                                                 "`disk2` int(11) DEFAULT NULL,;\n" +
+                                                 "`cap2` char(25) DEFAULT NULL,;\n" +
+                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n" + "PRIMARY KEY (`id`),;\n" +
+                                                 "KEY `idx_machines_company` (`company`),;\n" +
+                                                 "KEY `idx_machines_year` (`year`),;\n" +
+                                                 "KEY `idx_machines_model` (`model`),;\n" +
+                                                 "KEY `idx_machines_ram` (`ram`),;\n" +
+                                                 "KEY `idx_machines_rom` (`rom`),;\n" +
+                                                 "KEY `idx_machines_vram` (`vram`),;\n" +
+                                                 "KEY `idx_machines_colors` (`colors`),;\n" +
+                                                 "KEY `idx_machines_res` (`res`),;\n" +
                                                  "KEY `idx_machines_sound_synth` (`sound_synth`),;\n" +
                                                  "KEY `idx_machines_music_synth` (`music_synth`),;\n" +
-                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n"               +
-                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n"               +
-                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n"               +
-                                                 "KEY `idx_machines_disk1` (`disk1`),;\n"             +
-                                                 "KEY `idx_machines_disk2` (`disk2`),;\n"             +
-                                                 "KEY `idx_machines_cap1` (`cap1`),;\n"               +
-                                                 "KEY `idx_machines_cap2` (`cap2`),;\n"               +
+                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n" +
+                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n" +
+                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n" +
+                                                 "KEY `idx_machines_disk1` (`disk1`),;\n" +
+                                                 "KEY `idx_machines_disk2` (`disk2`),;\n" +
+                                                 "KEY `idx_machines_cap1` (`cap1`),;\n" +
+                                                 "KEY `idx_machines_cap2` (`cap2`),;\n" +
                                                  "KEY `idx_machines_type` (`type`));";
 
         public static readonly string DiskFormats = V15.DiskFormats;
@@ -103,12 +101,12 @@ namespace Marechai.Database.Schemas.Sql
         public static readonly string SoundSynths = V15.SoundSynths;
 
         public static readonly string MachinesForeignKeys =
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_company` (company) REFERENCES `companies` (`id`) ON UPDATE CASCADE;\n"            +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk1` (disk1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"             +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk2` (disk2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"             +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd1` (hdd1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd2` (hdd2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd3` (hdd3) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"               +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_company` (company) REFERENCES `companies` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk1` (disk1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk2` (disk2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd1` (hdd1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd2` (hdd2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd3` (hdd3) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
             "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_music_synth` (music_synth) REFERENCES `sound_synths` (`id`) ON UPDATE CASCADE;\n" +
             "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_sound_synth` (sound_synth) REFERENCES `sound_synths` (`id`) ON UPDATE CASCADE;";
 
@@ -130,13 +128,11 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string ProcessorsByMachine = V15.ProcessorsByMachine;
 
-        public static readonly string GpusByMachine =
-            "CREATE TABLE `gpus_by_machine` (\n"                                                                                                  +
-            "`gpu` INT NOT NULL, \n"                                                                                                              +
-            "`machine` INT NOT NULL,\n"                                                                                                           +
-            "KEY `idx_gpus_by_machine_gpus` (`gpu`),\n"                                                                                           +
-            "KEY `idx_gpus_by_machine_machine` (`machine`),\n"                                                                                    +
-            "CONSTRAINT `fk_gpus_by_machine_machine` FOREIGN KEY (`machine`) REFERENCES `machines` (`id`) ON UPDATE CASCADE ON DELETE CASCADE,\n" +
-            "CONSTRAINT `fk_gpus_by_machine_gpu` FOREIGN KEY (`gpu`) REFERENCES `gpus` (`id`) ON UPDATE CASCADE ON DELETE CASCADE);";
+        public static readonly string GpusByMachine = "CREATE TABLE `gpus_by_machine` (\n" + "`gpu` INT NOT NULL, \n" +
+                                                      "`machine` INT NOT NULL,\n" +
+                                                      "KEY `idx_gpus_by_machine_gpus` (`gpu`),\n" +
+                                                      "KEY `idx_gpus_by_machine_machine` (`machine`),\n" +
+                                                      "CONSTRAINT `fk_gpus_by_machine_machine` FOREIGN KEY (`machine`) REFERENCES `machines` (`id`) ON UPDATE CASCADE ON DELETE CASCADE,\n" +
+                                                      "CONSTRAINT `fk_gpus_by_machine_gpu` FOREIGN KEY (`gpu`) REFERENCES `gpus` (`id`) ON UPDATE CASCADE ON DELETE CASCADE);";
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Schemas/Sql/V17.cs b/Marechai.Database/Schemas/Sql/V17.cs
index f0d48c22..9d957aeb 100644
--- a/Marechai.Database/Schemas/Sql/V17.cs
+++ b/Marechai.Database/Schemas/Sql/V17.cs
@@ -40,40 +40,38 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V16.Companies;
 
-        public static readonly string Machines = "CREATE TABLE `machines` (;\n"               +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n"   +
+        public static readonly string Machines = "CREATE TABLE `machines` (;\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n" +
                                                  "`company` int(11) NOT NULL DEFAULT '0',;\n" +
-                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "`model` char(50) NOT NULL DEFAULT '',;\n"   +
-                                                 "`ram` int(11) NOT NULL DEFAULT '0',;\n"     +
-                                                 "`rom` int(11) NOT NULL DEFAULT '0',;\n"     +
-                                                 "`vram` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "`colors` int(11) NOT NULL DEFAULT '0',;\n"  +
-                                                 "`res` char(10) NOT NULL DEFAULT '',;\n"     +
-                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "`hdd2` int(11) DEFAULT NULL,;\n"            +
-                                                 "`hdd3` int(11) DEFAULT NULL,;\n"            +
-                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n"   +
-                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n"   +
-                                                 "`disk2` int(11) DEFAULT NULL,;\n"           +
-                                                 "`cap2` char(25) DEFAULT NULL,;\n"           +
-                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "PRIMARY KEY (`id`),;\n"                     +
+                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`model` char(50) NOT NULL DEFAULT '',;\n" +
+                                                 "`ram` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`rom` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`vram` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`colors` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`res` char(10) NOT NULL DEFAULT '',;\n" +
+                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`hdd2` int(11) DEFAULT NULL,;\n" + "`hdd3` int(11) DEFAULT NULL,;\n" +
+                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n" +
+                                                 "`disk2` int(11) DEFAULT NULL,;\n" +
+                                                 "`cap2` char(25) DEFAULT NULL,;\n" +
+                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n" + "PRIMARY KEY (`id`),;\n" +
                                                  "KEY `idx_machines_company` (`company`),;\n" +
-                                                 "KEY `idx_machines_year` (`year`),;\n"       +
-                                                 "KEY `idx_machines_model` (`model`),;\n"     +
-                                                 "KEY `idx_machines_ram` (`ram`),;\n"         +
-                                                 "KEY `idx_machines_rom` (`rom`),;\n"         +
-                                                 "KEY `idx_machines_vram` (`vram`),;\n"       +
-                                                 "KEY `idx_machines_colors` (`colors`),;\n"   +
-                                                 "KEY `idx_machines_res` (`res`),;\n"         +
-                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n"       +
-                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n"       +
-                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n"       +
-                                                 "KEY `idx_machines_disk1` (`disk1`),;\n"     +
-                                                 "KEY `idx_machines_disk2` (`disk2`),;\n"     +
-                                                 "KEY `idx_machines_cap1` (`cap1`),;\n"       +
-                                                 "KEY `idx_machines_cap2` (`cap2`),;\n"       +
+                                                 "KEY `idx_machines_year` (`year`),;\n" +
+                                                 "KEY `idx_machines_model` (`model`),;\n" +
+                                                 "KEY `idx_machines_ram` (`ram`),;\n" +
+                                                 "KEY `idx_machines_rom` (`rom`),;\n" +
+                                                 "KEY `idx_machines_vram` (`vram`),;\n" +
+                                                 "KEY `idx_machines_colors` (`colors`),;\n" +
+                                                 "KEY `idx_machines_res` (`res`),;\n" +
+                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n" +
+                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n" +
+                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n" +
+                                                 "KEY `idx_machines_disk1` (`disk1`),;\n" +
+                                                 "KEY `idx_machines_disk2` (`disk2`),;\n" +
+                                                 "KEY `idx_machines_cap1` (`cap1`),;\n" +
+                                                 "KEY `idx_machines_cap2` (`cap2`),;\n" +
                                                  "KEY `idx_machines_type` (`type`));";
 
         public static readonly string DiskFormats = V16.DiskFormats;
@@ -98,10 +96,10 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string MachinesForeignKeys =
             "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_company` (company) REFERENCES `companies` (`id`) ON UPDATE CASCADE;\n" +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk1` (disk1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"  +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk2` (disk2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"  +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd1` (hdd1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"    +
-            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd2` (hdd2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n"    +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk1` (disk1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_disk2` (disk2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd1` (hdd1) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
+            "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd2` (hdd2) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;\n" +
             "ALTER TABLE `machines` ADD FOREIGN KEY `fk_machines_hdd3` (hdd3) REFERENCES `disk_formats` (`id`) ON UPDATE CASCADE;";
 
         public static readonly string Iso3166Numeric = V16.Iso3166Numeric;
@@ -124,13 +122,11 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string GpusByMachine = V16.GpusByMachine;
 
-        public static readonly string SoundByMachine =
-            "CREATE TABLE `sound_by_machine` (\n"                                                                                                  +
-            "`sound_synth` INT NOT NULL, \n"                                                                                                       +
-            "`machine` INT NOT NULL,\n"                                                                                                            +
-            "KEY `idx_sound_by_machine_sound_synth` (`sound_synth`),\n"                                                                            +
-            "KEY `idx_sound_by_machine_machine` (`machine`),\n"                                                                                    +
-            "CONSTRAINT `fk_sound_by_machine_machine` FOREIGN KEY (`machine`) REFERENCES `machines` (`id`) ON UPDATE CASCADE ON DELETE CASCADE,\n" +
-            "CONSTRAINT `fk_sound_by_machine_sound_synth` FOREIGN KEY (`sound_synth`) REFERENCES `sound_synths` (`id`) ON UPDATE CASCADE ON DELETE CASCADE);";
+        public static readonly string SoundByMachine = "CREATE TABLE `sound_by_machine` (\n" +
+                                                       "`sound_synth` INT NOT NULL, \n" + "`machine` INT NOT NULL,\n" +
+                                                       "KEY `idx_sound_by_machine_sound_synth` (`sound_synth`),\n" +
+                                                       "KEY `idx_sound_by_machine_machine` (`machine`),\n" +
+                                                       "CONSTRAINT `fk_sound_by_machine_machine` FOREIGN KEY (`machine`) REFERENCES `machines` (`id`) ON UPDATE CASCADE ON DELETE CASCADE,\n" +
+                                                       "CONSTRAINT `fk_sound_by_machine_sound_synth` FOREIGN KEY (`sound_synth`) REFERENCES `sound_synths` (`id`) ON UPDATE CASCADE ON DELETE CASCADE);";
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Schemas/Sql/V18.cs b/Marechai.Database/Schemas/Sql/V18.cs
index 309b6f15..dddeeca2 100644
--- a/Marechai.Database/Schemas/Sql/V18.cs
+++ b/Marechai.Database/Schemas/Sql/V18.cs
@@ -40,34 +40,32 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V17.Companies;
 
-        public static readonly string Machines = "CREATE TABLE `machines` (;\n"               +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n"   +
+        public static readonly string Machines = "CREATE TABLE `machines` (;\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n" +
                                                  "`company` int(11) NOT NULL DEFAULT '0',;\n" +
-                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "`model` char(50) NOT NULL DEFAULT '',;\n"   +
-                                                 "`colors` int(11) NOT NULL DEFAULT '0',;\n"  +
-                                                 "`res` char(10) NOT NULL DEFAULT '',;\n"     +
-                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "`hdd2` int(11) DEFAULT NULL,;\n"            +
-                                                 "`hdd3` int(11) DEFAULT NULL,;\n"            +
-                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n"   +
-                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n"   +
-                                                 "`disk2` int(11) DEFAULT NULL,;\n"           +
-                                                 "`cap2` char(25) DEFAULT NULL,;\n"           +
-                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "PRIMARY KEY (`id`),;\n"                     +
+                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`model` char(50) NOT NULL DEFAULT '',;\n" +
+                                                 "`colors` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`res` char(10) NOT NULL DEFAULT '',;\n" +
+                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`hdd2` int(11) DEFAULT NULL,;\n" + "`hdd3` int(11) DEFAULT NULL,;\n" +
+                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n" +
+                                                 "`disk2` int(11) DEFAULT NULL,;\n" +
+                                                 "`cap2` char(25) DEFAULT NULL,;\n" +
+                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n" + "PRIMARY KEY (`id`),;\n" +
                                                  "KEY `idx_machines_company` (`company`),;\n" +
-                                                 "KEY `idx_machines_year` (`year`),;\n"       +
-                                                 "KEY `idx_machines_model` (`model`),;\n"     +
-                                                 "KEY `idx_machines_colors` (`colors`),;\n"   +
-                                                 "KEY `idx_machines_res` (`res`),;\n"         +
-                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n"       +
-                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n"       +
-                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n"       +
-                                                 "KEY `idx_machines_disk1` (`disk1`),;\n"     +
-                                                 "KEY `idx_machines_disk2` (`disk2`),;\n"     +
-                                                 "KEY `idx_machines_cap1` (`cap1`),;\n"       +
-                                                 "KEY `idx_machines_cap2` (`cap2`),;\n"       +
+                                                 "KEY `idx_machines_year` (`year`),;\n" +
+                                                 "KEY `idx_machines_model` (`model`),;\n" +
+                                                 "KEY `idx_machines_colors` (`colors`),;\n" +
+                                                 "KEY `idx_machines_res` (`res`),;\n" +
+                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n" +
+                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n" +
+                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n" +
+                                                 "KEY `idx_machines_disk1` (`disk1`),;\n" +
+                                                 "KEY `idx_machines_disk2` (`disk2`),;\n" +
+                                                 "KEY `idx_machines_cap1` (`cap1`),;\n" +
+                                                 "KEY `idx_machines_cap2` (`cap2`),;\n" +
                                                  "KEY `idx_machines_type` (`type`));";
 
         public static readonly string DiskFormats = V17.DiskFormats;
diff --git a/Marechai.Database/Schemas/Sql/V19.cs b/Marechai.Database/Schemas/Sql/V19.cs
index 494d9aa9..d8c2c320 100644
--- a/Marechai.Database/Schemas/Sql/V19.cs
+++ b/Marechai.Database/Schemas/Sql/V19.cs
@@ -40,30 +40,28 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V18.Companies;
 
-        public static readonly string Machines = "CREATE TABLE `machines` (;\n"               +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n"   +
+        public static readonly string Machines = "CREATE TABLE `machines` (;\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n" +
                                                  "`company` int(11) NOT NULL DEFAULT '0',;\n" +
-                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "`model` char(50) NOT NULL DEFAULT '',;\n"   +
-                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "`hdd2` int(11) DEFAULT NULL,;\n"            +
-                                                 "`hdd3` int(11) DEFAULT NULL,;\n"            +
-                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n"   +
-                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n"   +
-                                                 "`disk2` int(11) DEFAULT NULL,;\n"           +
-                                                 "`cap2` char(25) DEFAULT NULL,;\n"           +
-                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "PRIMARY KEY (`id`),;\n"                     +
+                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`model` char(50) NOT NULL DEFAULT '',;\n" +
+                                                 "`hdd1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`hdd2` int(11) DEFAULT NULL,;\n" + "`hdd3` int(11) DEFAULT NULL,;\n" +
+                                                 "`disk1` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`cap1` char(25) NOT NULL DEFAULT '0',;\n" +
+                                                 "`disk2` int(11) DEFAULT NULL,;\n" +
+                                                 "`cap2` char(25) DEFAULT NULL,;\n" +
+                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n" + "PRIMARY KEY (`id`),;\n" +
                                                  "KEY `idx_machines_company` (`company`),;\n" +
-                                                 "KEY `idx_machines_year` (`year`),;\n"       +
-                                                 "KEY `idx_machines_model` (`model`),;\n"     +
-                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n"       +
-                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n"       +
-                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n"       +
-                                                 "KEY `idx_machines_disk1` (`disk1`),;\n"     +
-                                                 "KEY `idx_machines_disk2` (`disk2`),;\n"     +
-                                                 "KEY `idx_machines_cap1` (`cap1`),;\n"       +
-                                                 "KEY `idx_machines_cap2` (`cap2`),;\n"       +
+                                                 "KEY `idx_machines_year` (`year`),;\n" +
+                                                 "KEY `idx_machines_model` (`model`),;\n" +
+                                                 "KEY `idx_machines_hdd1` (`hdd1`),;\n" +
+                                                 "KEY `idx_machines_hdd2` (`hdd2`),;\n" +
+                                                 "KEY `idx_machines_hdd3` (`hdd3`),;\n" +
+                                                 "KEY `idx_machines_disk1` (`disk1`),;\n" +
+                                                 "KEY `idx_machines_disk2` (`disk2`),;\n" +
+                                                 "KEY `idx_machines_cap1` (`cap1`),;\n" +
+                                                 "KEY `idx_machines_cap2` (`cap2`),;\n" +
                                                  "KEY `idx_machines_type` (`type`));";
 
         public static readonly string DiskFormats = V18.DiskFormats;
@@ -112,29 +110,26 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string MemoryByMachine = V18.MemoryByMachine;
 
-        public static readonly string Resolutions =
-            "CREATE TABLE `resolutions` (\n"                                               +
-            "`id` INT NOT NULL AUTO_INCREMENT,\n"                                          +
-            "`width` INT NOT NULL DEFAULT 0,\n"                                            +
-            "`height` INT NOT NULL DEFAULT 0,\n"                                           +
-            "`colors` BIGINT DEFAULT NULL,\n"                                              +
-            "`palette` BIGINT DEFAULT NULL,\n"                                             +
-            "`chars` BOOL NOT NULL DEFAULT 0,\n"                                           + "PRIMARY KEY (`id`),\n" +
-            "KEY `idx_resolutions_width` (`width`),\n"                                     +
-            "KEY `idx_resolutions_height` (`height`),\n"                                   +
-            "KEY `idx_resolutions_colors` (`colors`),\n"                                   +
-            "KEY `idx_resolutions_palette` (`palette`),\n"                                 +
-            "INDEX `idx_resolutions_resolution` (`width`,`height`),\n"                     +
-            "INDEX `idx_resolutions_resolution_with_color` (`width`,`height`,`colors`),\n" +
-            "INDEX `idx_resolutions_resolution_with_color_and_palette` (`width`,`height`,`colors`,`palette`));";
+        public static readonly string Resolutions = "CREATE TABLE `resolutions` (\n" +
+                                                    "`id` INT NOT NULL AUTO_INCREMENT,\n" +
+                                                    "`width` INT NOT NULL DEFAULT 0,\n" +
+                                                    "`height` INT NOT NULL DEFAULT 0,\n" +
+                                                    "`colors` BIGINT DEFAULT NULL,\n" +
+                                                    "`palette` BIGINT DEFAULT NULL,\n" +
+                                                    "`chars` BOOL NOT NULL DEFAULT 0,\n" + "PRIMARY KEY (`id`),\n" +
+                                                    "KEY `idx_resolutions_width` (`width`),\n" +
+                                                    "KEY `idx_resolutions_height` (`height`),\n" +
+                                                    "KEY `idx_resolutions_colors` (`colors`),\n" +
+                                                    "KEY `idx_resolutions_palette` (`palette`),\n" +
+                                                    "INDEX `idx_resolutions_resolution` (`width`,`height`),\n" +
+                                                    "INDEX `idx_resolutions_resolution_with_color` (`width`,`height`,`colors`),\n" +
+                                                    "INDEX `idx_resolutions_resolution_with_color_and_palette` (`width`,`height`,`colors`,`palette`));";
 
-        public static readonly string ResolutionsByGpu =
-            "CREATE TABLE `resolutions_by_gpu` (\n"                                                                                      +
-            "`gpu` INT NOT NULL,\n"                                                                                                      +
-            "`resolution` INT NOT NULL,\n"                                                                                               +
-            "KEY `idx_resolutions_by_gpu_gpu` (`gpu`),\n"                                                                                +
-            "KEY `idx_resolutions_by_gpu_resolution` (`resolution`),\n"                                                                  +
-            "CONSTRAINT `fk_resolutions_by_gpu_gpu` FOREIGN KEY (`gpu`) REFERENCES `gpus` (`id`) ON UPDATE CASCADE ON DELETE CASCADE,\n" +
-            "CONSTRAINT `fk_resolutions_by_gpu_resolution` FOREIGN KEY (`resolution`) REFERENCES `resolutions` (`id`) ON UPDATE CASCADE ON DELETE CASCADE);";
+        public static readonly string ResolutionsByGpu = "CREATE TABLE `resolutions_by_gpu` (\n" +
+                                                         "`gpu` INT NOT NULL,\n" + "`resolution` INT NOT NULL,\n" +
+                                                         "KEY `idx_resolutions_by_gpu_gpu` (`gpu`),\n" +
+                                                         "KEY `idx_resolutions_by_gpu_resolution` (`resolution`),\n" +
+                                                         "CONSTRAINT `fk_resolutions_by_gpu_gpu` FOREIGN KEY (`gpu`) REFERENCES `gpus` (`id`) ON UPDATE CASCADE ON DELETE CASCADE,\n" +
+                                                         "CONSTRAINT `fk_resolutions_by_gpu_resolution` FOREIGN KEY (`resolution`) REFERENCES `resolutions` (`id`) ON UPDATE CASCADE ON DELETE CASCADE);";
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Schemas/Sql/V20.cs b/Marechai.Database/Schemas/Sql/V20.cs
index 775b63a3..ea999957 100644
--- a/Marechai.Database/Schemas/Sql/V20.cs
+++ b/Marechai.Database/Schemas/Sql/V20.cs
@@ -40,16 +40,15 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V19.Companies;
 
-        public static readonly string Machines = "CREATE TABLE `machines` (;\n"               +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n"   +
+        public static readonly string Machines = "CREATE TABLE `machines` (;\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n" +
                                                  "`company` int(11) NOT NULL DEFAULT '0',;\n" +
-                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "`model` char(50) NOT NULL DEFAULT '',;\n"   +
-                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n"    +
-                                                 "PRIMARY KEY (`id`),;\n"                     +
+                                                 "`year` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`model` char(50) NOT NULL DEFAULT '',;\n" +
+                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n" + "PRIMARY KEY (`id`),;\n" +
                                                  "KEY `idx_machines_company` (`company`),;\n" +
-                                                 "KEY `idx_machines_year` (`year`),;\n"       +
-                                                 "KEY `idx_machines_model` (`model`),;\n"     +
+                                                 "KEY `idx_machines_year` (`year`),;\n" +
+                                                 "KEY `idx_machines_model` (`model`),;\n" +
                                                  "KEY `idx_machines_type` (`type`));";
 
         public static readonly string Forbidden = V19.Forbidden;
diff --git a/Marechai.Database/Schemas/Sql/V21.cs b/Marechai.Database/Schemas/Sql/V21.cs
index d33d26c7..2b1de20c 100644
--- a/Marechai.Database/Schemas/Sql/V21.cs
+++ b/Marechai.Database/Schemas/Sql/V21.cs
@@ -40,16 +40,15 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V20.Companies;
 
-        public static readonly string Machines = "CREATE TABLE `machines` (;\n"                     +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n"         +
-                                                 "`company` int(11) NOT NULL DEFAULT '0',;\n"       +
-                                                 "`introduced` DATETIME NULL,;\n"                   +
-                                                 "`model` char(50) NOT NULL DEFAULT '',;\n"         +
-                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n"          +
-                                                 "PRIMARY KEY (`id`),;\n"                           +
-                                                 "KEY `idx_machines_company` (`company`),;\n"       +
+        public static readonly string Machines = "CREATE TABLE `machines` (;\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,;\n" +
+                                                 "`company` int(11) NOT NULL DEFAULT '0',;\n" +
+                                                 "`introduced` DATETIME NULL,;\n" +
+                                                 "`model` char(50) NOT NULL DEFAULT '',;\n" +
+                                                 "`type` int(11) NOT NULL DEFAULT '0',;\n" + "PRIMARY KEY (`id`),;\n" +
+                                                 "KEY `idx_machines_company` (`company`),;\n" +
                                                  "KEY `idx_machines_introduced` (`introduced`),;\n" +
-                                                 "KEY `idx_machines_model` (`model`),;\n"           +
+                                                 "KEY `idx_machines_model` (`model`),;\n" +
                                                  "KEY `idx_machines_type` (`type`));";
 
         public static readonly string Forbidden = V20.Forbidden;
diff --git a/Marechai.Database/Schemas/Sql/V22.cs b/Marechai.Database/Schemas/Sql/V22.cs
index c4219025..52c35916 100644
--- a/Marechai.Database/Schemas/Sql/V22.cs
+++ b/Marechai.Database/Schemas/Sql/V22.cs
@@ -40,20 +40,19 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string Companies = V21.Companies;
 
-        public static readonly string Machines = "CREATE TABLE `machines` (\n"                     +
-                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,\n"         +
-                                                 "`company` int(11) NOT NULL DEFAULT '0',\n"       +
-                                                 "`name` varchar(255) NOT NULL,\n"                 +
-                                                 "`type` int(11) NOT NULL DEFAULT '0',\n"          +
-                                                 "`introduced` datetime DEFAULT NULL,\n"           +
-                                                 "`family` int(11) DEFAULT NULL,\n"                +
-                                                 "`model` varchar(50) DEFAULT NULL,\n"             +
-                                                 "PRIMARY KEY (`id`),\n"                           +
-                                                 "KEY `idx_machines_company` (`company`),\n"       +
-                                                 "KEY `idx_machines_type` (`type`),\n"             +
+        public static readonly string Machines = "CREATE TABLE `machines` (\n" +
+                                                 "`id` int(11) NOT NULL AUTO_INCREMENT,\n" +
+                                                 "`company` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`name` varchar(255) NOT NULL,\n" +
+                                                 "`type` int(11) NOT NULL DEFAULT '0',\n" +
+                                                 "`introduced` datetime DEFAULT NULL,\n" +
+                                                 "`family` int(11) DEFAULT NULL,\n" +
+                                                 "`model` varchar(50) DEFAULT NULL,\n" + "PRIMARY KEY (`id`),\n" +
+                                                 "KEY `idx_machines_company` (`company`),\n" +
+                                                 "KEY `idx_machines_type` (`type`),\n" +
                                                  "KEY `idx_machines_introduced` (`introduced`),\n" +
-                                                 "KEY `idx_machines_family` (`family`),\n"         +
-                                                 "KEY `idx_machines_name` (`name`),\n"             +
+                                                 "KEY `idx_machines_family` (`family`),\n" +
+                                                 "KEY `idx_machines_name` (`name`),\n" +
                                                  "KEY `idx_machines_model` (`model`));";
 
         public static readonly string Forbidden = V21.Forbidden;
@@ -108,13 +107,12 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string StorageByMachine = V21.StorageByMachine;
 
-        public static readonly string MachineFamilies = "CREATE TABLE `machine_families` (\n"               +
-                                                        "`id` INT NOT NULL AUTO_INCREMENT,\n"               +
-                                                        "`company` INT NOT NULL,\n"                         +
-                                                        "`name` VARCHAR(255) NOT NULL,\n"                   +
-                                                        "PRIMARY KEY (`id`),\n"                             +
+        public static readonly string MachineFamilies = "CREATE TABLE `machine_families` (\n" +
+                                                        "`id` INT NOT NULL AUTO_INCREMENT,\n" +
+                                                        "`company` INT NOT NULL,\n" +
+                                                        "`name` VARCHAR(255) NOT NULL,\n" + "PRIMARY KEY (`id`),\n" +
                                                         "KEY `idx_machine_families_company` (`company`),\n" +
-                                                        "KEY `idx_machine_families_name` (`name`),\n"       +
+                                                        "KEY `idx_machine_families_name` (`name`),\n" +
                                                         "CONSTRAINT `fk_machine_families_company` FOREIGN KEY (`company`) REFERENCES `companies` (`id`) ON UPDATE CASCADE ON DELETE CASCADE);";
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Schemas/Sql/V4.cs b/Marechai.Database/Schemas/Sql/V4.cs
index 3ecae578..a56ef978 100644
--- a/Marechai.Database/Schemas/Sql/V4.cs
+++ b/Marechai.Database/Schemas/Sql/V4.cs
@@ -29,13 +29,12 @@ namespace Marechai.Database.Schemas.Sql
     {
         public static readonly string Admins = V3.Admins + "\n" + "CREATE INDEX idx_admins_user ON admins (user);";
 
-        public static readonly string BrowserTests =
-            V3.BrowserTests                                                              + "\n" +
-            "CREATE INDEX idx_browser_tests_user_agent ON browser_tests (user_agent);\n" +
-            "CREATE INDEX idx_browser_tests_browser ON browser_tests (browser);\n"       +
-            "CREATE INDEX idx_browser_tests_version ON browser_tests (version);\n"       +
-            "CREATE INDEX idx_browser_tests_os ON browser_tests (os);\n"                 +
-            "CREATE INDEX idx_browser_tests_platform ON browser_tests (platform);";
+        public static readonly string BrowserTests = V3.BrowserTests + "\n" +
+                                                     "CREATE INDEX idx_browser_tests_user_agent ON browser_tests (user_agent);\n" +
+                                                     "CREATE INDEX idx_browser_tests_browser ON browser_tests (browser);\n" +
+                                                     "CREATE INDEX idx_browser_tests_version ON browser_tests (version);\n" +
+                                                     "CREATE INDEX idx_browser_tests_os ON browser_tests (os);\n" +
+                                                     "CREATE INDEX idx_browser_tests_platform ON browser_tests (platform);";
 
         public static readonly string MarechaiDb = @"CREATE TABLE `marechai_db` (
                                                 `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -48,113 +47,105 @@ namespace Marechai.Database.Schemas.Sql
         public static readonly string Companies =
             V3.Companies + "\n" + "CREATE INDEX idx_companies_name ON companies (name);";
 
-        public static readonly string Computers =
-            V3.Computers                                                           + "\n" +
-            "CREATE INDEX idx_computers_company ON computers (company);\n"         +
-            "CREATE INDEX idx_computers_year ON computers (year);\n"               +
-            "CREATE INDEX idx_computers_model ON computers (model);\n"             +
-            "CREATE INDEX idx_computers_cpu1 ON computers (cpu1);\n"               +
-            "CREATE INDEX idx_computers_cpu2 ON computers (cpu2);\n"               +
-            "CREATE INDEX idx_computers_mhz1 ON computers (mhz1);\n"               +
-            "CREATE INDEX idx_computers_mhz2 ON computers (mhz2);\n"               +
-            "CREATE INDEX idx_computers_bits ON computers (bits);\n"               +
-            "CREATE INDEX idx_computers_ram ON computers (ram);\n"                 +
-            "CREATE INDEX idx_computers_rom ON computers (rom);\n"                 +
-            "CREATE INDEX idx_computers_gpu ON computers (gpu);\n"                 +
-            "CREATE INDEX idx_computers_vram ON computers (vram);\n"               +
-            "CREATE INDEX idx_computers_colors ON computers (colors);\n"           +
-            "CREATE INDEX idx_computers_res ON computers (res);\n"                 +
-            "CREATE INDEX idx_computers_sound_synth ON computers (sound_synth);\n" +
-            "CREATE INDEX idx_computers_music_synth ON computers (music_synth);\n" +
-            "CREATE INDEX idx_computers_hdd1 ON computers (hdd1);\n"               +
-            "CREATE INDEX idx_computers_hdd2 ON computers (hdd2);\n"               +
-            "CREATE INDEX idx_computers_hdd3 ON computers (hdd3);\n"               +
-            "CREATE INDEX idx_computers_disk1 ON computers (disk1);\n"             +
-            "CREATE INDEX idx_computers_disk2 ON computers (disk2);\n"             +
-            "CREATE INDEX idx_computers_cap1 ON computers (cap1);\n"               +
-            "CREATE INDEX idx_computers_cap2 ON computers (cap2);";
+        public static readonly string Computers = V3.Computers + "\n" +
+                                                  "CREATE INDEX idx_computers_company ON computers (company);\n" +
+                                                  "CREATE INDEX idx_computers_year ON computers (year);\n" +
+                                                  "CREATE INDEX idx_computers_model ON computers (model);\n" +
+                                                  "CREATE INDEX idx_computers_cpu1 ON computers (cpu1);\n" +
+                                                  "CREATE INDEX idx_computers_cpu2 ON computers (cpu2);\n" +
+                                                  "CREATE INDEX idx_computers_mhz1 ON computers (mhz1);\n" +
+                                                  "CREATE INDEX idx_computers_mhz2 ON computers (mhz2);\n" +
+                                                  "CREATE INDEX idx_computers_bits ON computers (bits);\n" +
+                                                  "CREATE INDEX idx_computers_ram ON computers (ram);\n" +
+                                                  "CREATE INDEX idx_computers_rom ON computers (rom);\n" +
+                                                  "CREATE INDEX idx_computers_gpu ON computers (gpu);\n" +
+                                                  "CREATE INDEX idx_computers_vram ON computers (vram);\n" +
+                                                  "CREATE INDEX idx_computers_colors ON computers (colors);\n" +
+                                                  "CREATE INDEX idx_computers_res ON computers (res);\n" +
+                                                  "CREATE INDEX idx_computers_sound_synth ON computers (sound_synth);\n" +
+                                                  "CREATE INDEX idx_computers_music_synth ON computers (music_synth);\n" +
+                                                  "CREATE INDEX idx_computers_hdd1 ON computers (hdd1);\n" +
+                                                  "CREATE INDEX idx_computers_hdd2 ON computers (hdd2);\n" +
+                                                  "CREATE INDEX idx_computers_hdd3 ON computers (hdd3);\n" +
+                                                  "CREATE INDEX idx_computers_disk1 ON computers (disk1);\n" +
+                                                  "CREATE INDEX idx_computers_disk2 ON computers (disk2);\n" +
+                                                  "CREATE INDEX idx_computers_cap1 ON computers (cap1);\n" +
+                                                  "CREATE INDEX idx_computers_cap2 ON computers (cap2);";
 
-        public static readonly string Consoles = V3.Consoles                                                          +
-                                                 "\n"                                                                 +
-                                                 "CREATE INDEX idx_consoles_company ON consoles (company);\n"         +
-                                                 "CREATE INDEX idx_consoles_year ON consoles (year);\n"               +
-                                                 "CREATE INDEX idx_consoles_model ON consoles (model);\n"             +
-                                                 "CREATE INDEX idx_consoles_cpu1 ON consoles (cpu1);\n"               +
-                                                 "CREATE INDEX idx_consoles_cpu2 ON consoles (cpu2);\n"               +
-                                                 "CREATE INDEX idx_consoles_mhz1 ON consoles (mhz1);\n"               +
-                                                 "CREATE INDEX idx_consoles_mhz2 ON consoles (mhz2);\n"               +
-                                                 "CREATE INDEX idx_consoles_bits ON consoles (bits);\n"               +
-                                                 "CREATE INDEX idx_consoles_ram ON consoles (ram);\n"                 +
-                                                 "CREATE INDEX idx_consoles_rom ON consoles (rom);\n"                 +
-                                                 "CREATE INDEX idx_consoles_gpu ON consoles (gpu);\n"                 +
-                                                 "CREATE INDEX idx_consoles_vram ON consoles (vram);\n"               +
-                                                 "CREATE INDEX idx_consoles_colors ON consoles (colors);\n"           +
-                                                 "CREATE INDEX idx_consoles_res ON consoles (res);\n"                 +
+        public static readonly string Consoles = V3.Consoles + "\n" +
+                                                 "CREATE INDEX idx_consoles_company ON consoles (company);\n" +
+                                                 "CREATE INDEX idx_consoles_year ON consoles (year);\n" +
+                                                 "CREATE INDEX idx_consoles_model ON consoles (model);\n" +
+                                                 "CREATE INDEX idx_consoles_cpu1 ON consoles (cpu1);\n" +
+                                                 "CREATE INDEX idx_consoles_cpu2 ON consoles (cpu2);\n" +
+                                                 "CREATE INDEX idx_consoles_mhz1 ON consoles (mhz1);\n" +
+                                                 "CREATE INDEX idx_consoles_mhz2 ON consoles (mhz2);\n" +
+                                                 "CREATE INDEX idx_consoles_bits ON consoles (bits);\n" +
+                                                 "CREATE INDEX idx_consoles_ram ON consoles (ram);\n" +
+                                                 "CREATE INDEX idx_consoles_rom ON consoles (rom);\n" +
+                                                 "CREATE INDEX idx_consoles_gpu ON consoles (gpu);\n" +
+                                                 "CREATE INDEX idx_consoles_vram ON consoles (vram);\n" +
+                                                 "CREATE INDEX idx_consoles_colors ON consoles (colors);\n" +
+                                                 "CREATE INDEX idx_consoles_res ON consoles (res);\n" +
                                                  "CREATE INDEX idx_consoles_sound_synth ON consoles (sound_synth);\n" +
                                                  "CREATE INDEX idx_consoles_music_synth ON consoles (music_synth);\n" +
-                                                 "CREATE INDEX idx_consoles_palette ON consoles (palette);\n"         +
-                                                 "CREATE INDEX idx_consoles_format ON consoles (format);\n"           +
+                                                 "CREATE INDEX idx_consoles_palette ON consoles (palette);\n" +
+                                                 "CREATE INDEX idx_consoles_format ON consoles (format);\n" +
                                                  "CREATE INDEX idx_consoles_cap ON consoles (cap);";
 
         public static readonly string DiskFormats = V3.DiskFormats + "\n" +
                                                     "CREATE INDEX idx_disk_formats_description ON disk_formats (description);";
 
-        public static readonly string Forbidden = V3.Forbidden                                                   +
-                                                  "\n"                                                           +
+        public static readonly string Forbidden = V3.Forbidden + "\n" +
                                                   "CREATE INDEX idx_forbidden_browser ON forbidden (browser);\n" +
-                                                  "CREATE INDEX idx_forbidden_date ON forbidden (date);\n"       +
-                                                  "CREATE INDEX idx_forbidden_ip ON forbidden (ip);\n"           +
+                                                  "CREATE INDEX idx_forbidden_date ON forbidden (date);\n" +
+                                                  "CREATE INDEX idx_forbidden_ip ON forbidden (ip);\n" +
                                                   "CREATE INDEX idx_forbidden_referer ON forbidden (referer);";
 
         public static readonly string Gpus = V3.Gpus + "\n" + "CREATE INDEX idx_gpus_name ON gpus (name);";
 
-        public static readonly string Logs = V3.Logs                                            + "\n" +
-                                             "CREATE INDEX idx_log_browser ON log (browser);\n" +
-                                             "CREATE INDEX idx_log_date ON log (date);\n"       +
-                                             "CREATE INDEX idx_log_ip ON log (ip);\n"           +
+        public static readonly string Logs = V3.Logs + "\n" + "CREATE INDEX idx_log_browser ON log (browser);\n" +
+                                             "CREATE INDEX idx_log_date ON log (date);\n" +
+                                             "CREATE INDEX idx_log_ip ON log (ip);\n" +
                                              "CREATE INDEX idx_log_referer ON log (referer);";
 
-        public static readonly string MoneyDonations =
-            V3.MoneyDonations                                                          + "\n" +
-            "CREATE INDEX idx_money_donations_donator ON money_donations (donator);\n" +
-            "CREATE INDEX idx_money_donations_quantity ON money_donations (quantity);";
+        public static readonly string MoneyDonations = V3.MoneyDonations + "\n" +
+                                                       "CREATE INDEX idx_money_donations_donator ON money_donations (donator);\n" +
+                                                       "CREATE INDEX idx_money_donations_quantity ON money_donations (quantity);";
 
         public static readonly string MusicSynths =
             V3.MusicSynths + "\n" + "CREATE INDEX idx_music_synts_name ON music_synths (name);";
 
-        public static readonly string News = V3.News                                        + "\n" +
-                                             "CREATE INDEX idx_news_date ON news (date);\n" +
+        public static readonly string News = V3.News + "\n" + "CREATE INDEX idx_news_date ON news (date);\n" +
                                              "CREATE INDEX idx_news_type ON news (type);\n" +
                                              "CREATE INDEX idx_news_ip ON news (added_id);";
 
-        public static readonly string OwnedComputers =
-            V3.OwnedComputers                                                          + "\n" +
-            "CREATE INDEX idx_owned_computers_db_id ON owned_computers (db_id);\n"     +
-            "CREATE INDEX idx_owned_computers_date ON owned_computers (date);\n"       +
-            "CREATE INDEX idx_owned_computers_status ON owned_computers (status);\n"   +
-            "CREATE INDEX idx_owned_computers_trade ON owned_computers (trade);\n"     +
-            "CREATE INDEX idx_owned_computers_boxed ON owned_computers (boxed);\n"     +
-            "CREATE INDEX idx_owned_computers_manuals ON owned_computers (manuals);\n" +
-            "CREATE INDEX idx_owned_computers_cpu1 ON owned_computers (cpu1);\n"       +
-            "CREATE INDEX idx_owned_computers_cpu2 ON owned_computers (cpu2);\n"       +
-            "CREATE INDEX idx_owned_computers_mhz1 ON owned_computers (mhz1);\n"       +
-            "CREATE INDEX idx_owned_computers_mhz2 ON owned_computers (mhz2);\n"       +
-            "CREATE INDEX idx_owned_computers_ram ON owned_computers (ram);\n"         +
-            "CREATE INDEX idx_owned_computers_vram ON owned_computers (vram);\n"       +
-            "CREATE INDEX idx_owned_computers_rigid ON owned_computers (rigid);\n"     +
-            "CREATE INDEX idx_owned_computers_disk1 ON owned_computers (disk1);\n"     +
-            "CREATE INDEX idx_owned_computers_disk2 ON owned_computers (disk2);\n"     +
-            "CREATE INDEX idx_owned_computers_cap1 ON owned_computers (cap1);\n"       +
-            "CREATE INDEX idx_owned_computers_cap2 ON owned_computers (cap2);";
+        public static readonly string OwnedComputers = V3.OwnedComputers + "\n" +
+                                                       "CREATE INDEX idx_owned_computers_db_id ON owned_computers (db_id);\n" +
+                                                       "CREATE INDEX idx_owned_computers_date ON owned_computers (date);\n" +
+                                                       "CREATE INDEX idx_owned_computers_status ON owned_computers (status);\n" +
+                                                       "CREATE INDEX idx_owned_computers_trade ON owned_computers (trade);\n" +
+                                                       "CREATE INDEX idx_owned_computers_boxed ON owned_computers (boxed);\n" +
+                                                       "CREATE INDEX idx_owned_computers_manuals ON owned_computers (manuals);\n" +
+                                                       "CREATE INDEX idx_owned_computers_cpu1 ON owned_computers (cpu1);\n" +
+                                                       "CREATE INDEX idx_owned_computers_cpu2 ON owned_computers (cpu2);\n" +
+                                                       "CREATE INDEX idx_owned_computers_mhz1 ON owned_computers (mhz1);\n" +
+                                                       "CREATE INDEX idx_owned_computers_mhz2 ON owned_computers (mhz2);\n" +
+                                                       "CREATE INDEX idx_owned_computers_ram ON owned_computers (ram);\n" +
+                                                       "CREATE INDEX idx_owned_computers_vram ON owned_computers (vram);\n" +
+                                                       "CREATE INDEX idx_owned_computers_rigid ON owned_computers (rigid);\n" +
+                                                       "CREATE INDEX idx_owned_computers_disk1 ON owned_computers (disk1);\n" +
+                                                       "CREATE INDEX idx_owned_computers_disk2 ON owned_computers (disk2);\n" +
+                                                       "CREATE INDEX idx_owned_computers_cap1 ON owned_computers (cap1);\n" +
+                                                       "CREATE INDEX idx_owned_computers_cap2 ON owned_computers (cap2);";
 
-        public static readonly string OwnedConsoles =
-            V3.OwnedConsoles                                                        + "\n" +
-            "CREATE INDEX idx_owned_consoles_db_id ON owned_consoles (db_id);\n"    +
-            "CREATE INDEX idx_owned_consoles_date    ON owned_consoles (date);\n"   +
-            "CREATE INDEX idx_owned_consoles_status  ON owned_consoles (status);\n" +
-            "CREATE INDEX idx_owned_consoles_trade   ON owned_consoles (trade);\n"  +
-            "CREATE INDEX idx_owned_consoles_boxed   ON owned_consoles (boxed);\n"  +
-            "CREATE INDEX idx_owned_consoles_manuals ON owned_consoles (manuals);";
+        public static readonly string OwnedConsoles = V3.OwnedConsoles + "\n" +
+                                                      "CREATE INDEX idx_owned_consoles_db_id ON owned_consoles (db_id);\n" +
+                                                      "CREATE INDEX idx_owned_consoles_date    ON owned_consoles (date);\n" +
+                                                      "CREATE INDEX idx_owned_consoles_status  ON owned_consoles (status);\n" +
+                                                      "CREATE INDEX idx_owned_consoles_trade   ON owned_consoles (trade);\n" +
+                                                      "CREATE INDEX idx_owned_consoles_boxed   ON owned_consoles (boxed);\n" +
+                                                      "CREATE INDEX idx_owned_consoles_manuals ON owned_consoles (manuals);";
 
         public static readonly string Processors = @"CREATE TABLE IF NOT EXISTS `processors` (
                                                     `id` int(11) NOT NULL AUTO_INCREMENT,
diff --git a/Marechai.Database/Schemas/Sql/V5.cs b/Marechai.Database/Schemas/Sql/V5.cs
index 3f828e2c..ac27fba2 100644
--- a/Marechai.Database/Schemas/Sql/V5.cs
+++ b/Marechai.Database/Schemas/Sql/V5.cs
@@ -68,10 +68,10 @@ namespace Marechai.Database.Schemas.Sql
         public static readonly string SoundSynths = V4.SoundSynths;
 
         public static readonly string ComputersForeignKeys =
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_company (company) REFERENCES companies (id);\n"            +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu1 (cpu1) REFERENCES               processors (id);\n"   +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu2 (cpu2) REFERENCES               processors (id);\n"   +
-            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_gpu (gpu) REFERENCES                 gpus (id);\n"         +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_company (company) REFERENCES companies (id);\n" +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu1 (cpu1) REFERENCES               processors (id);\n" +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu2 (cpu2) REFERENCES               processors (id);\n" +
+            "ALTER TABLE computers ADD FOREIGN KEY fk_computers_gpu (gpu) REFERENCES                 gpus (id);\n" +
             "ALTER TABLE computers ADD FOREIGN KEY fk_computers_sound_synth (sound_synth) REFERENCES sound_synths (id);\n" +
             "ALTER TABLE computers ADD FOREIGN KEY fk_computers_music_synth (music_synth) REFERENCES music_synths (id);\n" +
             "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd1 (hdd1) REFERENCES               disk_formats (id);\n" +
@@ -81,10 +81,10 @@ namespace Marechai.Database.Schemas.Sql
             "ALTER TABLE computers ADD FOREIGN KEY fk_computers_disk2 (disk2) REFERENCES disk_formats (id);";
 
         public static readonly string ConsolesForeignKeys =
-            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_company (company) REFERENCES companies (id);\n"            +
-            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu1 (cpu1) REFERENCES               processors (id);\n"   +
-            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu2 (cpu2) REFERENCES               processors (id);\n"   +
-            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_gpu (gpu) REFERENCES                 gpus (id);\n"         +
+            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_company (company) REFERENCES companies (id);\n" +
+            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu1 (cpu1) REFERENCES               processors (id);\n" +
+            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu2 (cpu2) REFERENCES               processors (id);\n" +
+            "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_gpu (gpu) REFERENCES                 gpus (id);\n" +
             "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_sound_synth (sound_synth) REFERENCES sound_synths (id);\n" +
             "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_music_synth (music_synth) REFERENCES music_synths (id);\n" +
             "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_format (format) REFERENCES disk_formats (id);";
diff --git a/Marechai.Database/Schemas/Sql/V6.cs b/Marechai.Database/Schemas/Sql/V6.cs
index f3dd3704..d4c5c6d2 100644
--- a/Marechai.Database/Schemas/Sql/V6.cs
+++ b/Marechai.Database/Schemas/Sql/V6.cs
@@ -38,32 +38,31 @@ namespace Marechai.Database.Schemas.Sql
                                                    "PRIMARY KEY (`id`)\n"                            + ");\n" +
                                                    "INSERT INTO marechai_db (version) VALUES ('6');";
 
-        public static readonly string Companies = "CREATE TABLE `companies` (\n"                            +
-                                                  "`id` int(11)            NOT NULL AUTO_INCREMENT,\n"      +
-                                                  "`name` varchar(128) NOT NULL DEFAULT '',\n"              +
-                                                  "`founded` datetime          DEFAULT NULL,\n"             +
-                                                  "`website` varchar(255) DEFAULT NULL,\n"                  +
-                                                  "`twitter` varchar(45) DEFAULT NULL,\n"                   +
-                                                  "`facebook` varchar(45) DEFAULT NULL,\n"                  +
-                                                  "`sold` datetime DEFAULT NULL,\n"                         +
-                                                  "`sold_to` int(11)   DEFAULT NULL,\n"                     +
-                                                  "`address` varchar(80) DEFAULT NULL,\n"                   +
-                                                  "`city` varchar(80) DEFAULT NULL,\n"                      +
-                                                  "`province` varchar(80) DEFAULT NULL,\n"                  +
-                                                  "`postal_code` varchar(25) DEFAULT NULL,\n"               +
+        public static readonly string Companies = "CREATE TABLE `companies` (\n" +
+                                                  "`id` int(11)            NOT NULL AUTO_INCREMENT,\n" +
+                                                  "`name` varchar(128) NOT NULL DEFAULT '',\n" +
+                                                  "`founded` datetime          DEFAULT NULL,\n" +
+                                                  "`website` varchar(255) DEFAULT NULL,\n" +
+                                                  "`twitter` varchar(45) DEFAULT NULL,\n" +
+                                                  "`facebook` varchar(45) DEFAULT NULL,\n" +
+                                                  "`sold` datetime DEFAULT NULL,\n" +
+                                                  "`sold_to` int(11)   DEFAULT NULL,\n" +
+                                                  "`address` varchar(80) DEFAULT NULL,\n" +
+                                                  "`city` varchar(80) DEFAULT NULL,\n" +
+                                                  "`province` varchar(80) DEFAULT NULL,\n" +
+                                                  "`postal_code` varchar(25) DEFAULT NULL,\n" +
                                                   "`country` smallint(3) UNSIGNED ZEROFILL DEFAULT NULL,\n" +
-                                                  "PRIMARY KEY (`id`),\n"                                   +
-                                                  "KEY `idx_companies_name` (`name`),\n"                    +
-                                                  "KEY `idx_companies_founded` (`founded`),\n"              +
-                                                  "KEY `idx_companies_website` (`website`),\n"              +
-                                                  "KEY `idx_companies_twitter` (`twitter`),\n"              +
-                                                  "KEY `idx_companies_facebook` (`facebook`),\n"            +
-                                                  "KEY `idx_companies_sold` (`sold`),\n"                    +
-                                                  "KEY `idx_companies_sold_to` (`sold_to`),\n"              +
-                                                  "KEY `idx_companies_address` (`address`),\n"              +
-                                                  "KEY `idx_companies_city` (`city`),\n"                    +
-                                                  "KEY `idx_companies_province` (`province`),\n"            +
-                                                  "KEY `idx_companies_postal_code` (`postal_code`),\n"      +
+                                                  "PRIMARY KEY (`id`),\n" + "KEY `idx_companies_name` (`name`),\n" +
+                                                  "KEY `idx_companies_founded` (`founded`),\n" +
+                                                  "KEY `idx_companies_website` (`website`),\n" +
+                                                  "KEY `idx_companies_twitter` (`twitter`),\n" +
+                                                  "KEY `idx_companies_facebook` (`facebook`),\n" +
+                                                  "KEY `idx_companies_sold` (`sold`),\n" +
+                                                  "KEY `idx_companies_sold_to` (`sold_to`),\n" +
+                                                  "KEY `idx_companies_address` (`address`),\n" +
+                                                  "KEY `idx_companies_city` (`city`),\n" +
+                                                  "KEY `idx_companies_province` (`province`),\n" +
+                                                  "KEY `idx_companies_postal_code` (`postal_code`),\n" +
                                                   "KEY `idx_companies_country` (`country`));";
 
         public static readonly string Computers = V5.Computers;
@@ -96,73 +95,72 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string ConsolesForeignKeys = V5.ConsolesForeignKeys;
 
-        public static readonly string Iso3166Numeric = "CREATE TABLE `iso3166_1_numeric` (\n"           +
+        public static readonly string Iso3166Numeric = "CREATE TABLE `iso3166_1_numeric` (\n" +
                                                        "`id` SMALLINT(3) UNSIGNED ZEROFILL NOT NULL,\n" +
-                                                       "`name` VARCHAR(64) NOT NULL,\n"                 +
-                                                       "PRIMARY KEY (`id`),\n"                          +
+                                                       "`name` VARCHAR(64) NOT NULL,\n" + "PRIMARY KEY (`id`),\n" +
                                                        "INDEX `idx_name` (`name` ASC));";
 
         public static readonly string Iso3166NumericValues =
-            "INSERT INTO `iso3166_1_numeric` VALUES (004,'Afghanistan'),(248,'Åland Islands'),(008,'Albania'),"            +
-            "(012,'Algeria'),(016,'American Samoa'),(020,'Andorra'),(024,'Angola'),(660,'Anguilla'),(010,'Antarctica'),"   +
-            "(028,'Antigua and Barbuda'),(032,'Argentina'),(051,'Armenia'),(533,'Aruba'),(036,'Australia'),"               +
-            "(040,'Austria'),(031,'Azerbaijan'),(044,'Bahamas'),(048,'Bahrain'),(050,'Bangladesh'),(052,'Barbados'),"      +
-            "(112,'Belarus'),(056,'Belgium'),(084,'Belize'),(204,'Benin'),(060,'Bermuda'),(064,'Bhutan'),"                 +
-            "(862,'Bolivarian Republic of Venezuela'),(535,'Bonaire, Sint Eustatius and Saba'),"                           +
-            "(070,'Bosnia and Herzegovina'),(072,'Botswana'),(074,'Bouvet Island'),(076,'Brazil'),"                        +
-            "(080,'British Antarctic Territory'),(086,'British Indian Ocean Territory'),(092,'British Virgin Islands'),"   +
-            "(096,'Brunei Darussalam'),(100,'Bulgaria'),(854,'Burkina Faso'),(108,'Burundi'),(132,'Cabo Verde'),"          +
-            "(116,'Cambodia'),(120,'Cameroon'),(124,'Canada'),(128,'Canton and Enderbury Islands'),"                       +
-            "(136,'Cayman Islands'),(140,'Central African Republic'),(148,'Chad'),(830,'Channel Islands'),(152,'Chile'),"  +
-            "(156,'China'),(162,'Christmas Island'),(166,'Cocos (Keeling) Islands'),(170,'Colombia'),(174,'Comoros'),"     +
-            "(178,'Congo'),(184,'Cook Islands'),(188,'Costa Rica'),(384,'Côte d\\'Ivoire'),(191,'Croatia'),(192,'Cuba'),"  +
-            "(531,'Curaçao'),(196,'Cyprus'),(203,'Czechia'),(200,'Czechoslovakia'),"                                       +
-            "(408,'Democratic People\\'s Republic of Korea'),(180,'Democratic Republic of the Congo'),"                    +
-            "(720,'Democratic Yemen'),(208,'Denmark'),(262,'Djibouti'),(212,'Dominica'),(214,'Dominican Republic'),"       +
-            "(216,'Dronning Maud Land'),(218,'Ecuador'),(818,'Egypt'),(222,'El Salvador'),(226,'Equatorial Guinea'),"      +
-            "(232,'Eritrea'),(233,'Estonia'),(230,'Ethiopia'),(231,'Ethiopia'),(238,'Falkland Islands (Malvinas)'),"       +
-            "(234,'Faroe Islands'),(280,'Federal Republic of Germany'),(583,'Federated States of Micronesia'),"            +
-            "(242,'Fiji'),(246,'Finland'),(250,'France'),(249,'France, Metropolitan'),(254,'French Guiana'),"              +
-            "(258,'French Polynesia'),(260,'French Southern Territories'),(266,'Gabon'),(270,'Gambia'),"                   +
-            "(274,'Gaza Strip (Palestine)'),(268,'Georgia'),(278,'German Democratic Republic'),(276,'Germany'),"           +
-            "(288,'Ghana'),(292,'Gibraltar'),(300,'Greece'),(304,'Greenland'),(308,'Grenada'),(312,'Guadeloupe'),"         +
-            "(316,'Guam'),(320,'Guatemala'),(831,'Guernsey'),(324,'Guinea'),(624,'Guinea-Bissau'),(328,'Guyana'),"         +
-            "(332,'Haiti'),(334,'Heard Island and McDonald Islands'),(336,'Holy See'),(340,'Honduras'),"                   +
-            "(344,'Hong Kong'),(348,'Hungary'),(352,'Iceland'),(356,'India'),(360,'Indonesia'),(368,'Iraq'),"              +
-            "(372,'Ireland'),(364,'Islamic Republic of Iran'),(833,'Isle of Man'),(376,'Israel'),(380,'Italy'),"           +
-            "(388,'Jamaica'),(392,'Japan'),(832,'Jersey'),(396,'Johnston Island'),(400,'Jordan'),(398,'Kazakhstan'),"      +
+            "INSERT INTO `iso3166_1_numeric` VALUES (004,'Afghanistan'),(248,'Åland Islands'),(008,'Albania')," +
+            "(012,'Algeria'),(016,'American Samoa'),(020,'Andorra'),(024,'Angola'),(660,'Anguilla'),(010,'Antarctica')," +
+            "(028,'Antigua and Barbuda'),(032,'Argentina'),(051,'Armenia'),(533,'Aruba'),(036,'Australia')," +
+            "(040,'Austria'),(031,'Azerbaijan'),(044,'Bahamas'),(048,'Bahrain'),(050,'Bangladesh'),(052,'Barbados')," +
+            "(112,'Belarus'),(056,'Belgium'),(084,'Belize'),(204,'Benin'),(060,'Bermuda'),(064,'Bhutan')," +
+            "(862,'Bolivarian Republic of Venezuela'),(535,'Bonaire, Sint Eustatius and Saba')," +
+            "(070,'Bosnia and Herzegovina'),(072,'Botswana'),(074,'Bouvet Island'),(076,'Brazil')," +
+            "(080,'British Antarctic Territory'),(086,'British Indian Ocean Territory'),(092,'British Virgin Islands')," +
+            "(096,'Brunei Darussalam'),(100,'Bulgaria'),(854,'Burkina Faso'),(108,'Burundi'),(132,'Cabo Verde')," +
+            "(116,'Cambodia'),(120,'Cameroon'),(124,'Canada'),(128,'Canton and Enderbury Islands')," +
+            "(136,'Cayman Islands'),(140,'Central African Republic'),(148,'Chad'),(830,'Channel Islands'),(152,'Chile')," +
+            "(156,'China'),(162,'Christmas Island'),(166,'Cocos (Keeling) Islands'),(170,'Colombia'),(174,'Comoros')," +
+            "(178,'Congo'),(184,'Cook Islands'),(188,'Costa Rica'),(384,'Côte d\\'Ivoire'),(191,'Croatia'),(192,'Cuba')," +
+            "(531,'Curaçao'),(196,'Cyprus'),(203,'Czechia'),(200,'Czechoslovakia')," +
+            "(408,'Democratic People\\'s Republic of Korea'),(180,'Democratic Republic of the Congo')," +
+            "(720,'Democratic Yemen'),(208,'Denmark'),(262,'Djibouti'),(212,'Dominica'),(214,'Dominican Republic')," +
+            "(216,'Dronning Maud Land'),(218,'Ecuador'),(818,'Egypt'),(222,'El Salvador'),(226,'Equatorial Guinea')," +
+            "(232,'Eritrea'),(233,'Estonia'),(230,'Ethiopia'),(231,'Ethiopia'),(238,'Falkland Islands (Malvinas)')," +
+            "(234,'Faroe Islands'),(280,'Federal Republic of Germany'),(583,'Federated States of Micronesia')," +
+            "(242,'Fiji'),(246,'Finland'),(250,'France'),(249,'France, Metropolitan'),(254,'French Guiana')," +
+            "(258,'French Polynesia'),(260,'French Southern Territories'),(266,'Gabon'),(270,'Gambia')," +
+            "(274,'Gaza Strip (Palestine)'),(268,'Georgia'),(278,'German Democratic Republic'),(276,'Germany')," +
+            "(288,'Ghana'),(292,'Gibraltar'),(300,'Greece'),(304,'Greenland'),(308,'Grenada'),(312,'Guadeloupe')," +
+            "(316,'Guam'),(320,'Guatemala'),(831,'Guernsey'),(324,'Guinea'),(624,'Guinea-Bissau'),(328,'Guyana')," +
+            "(332,'Haiti'),(334,'Heard Island and McDonald Islands'),(336,'Holy See'),(340,'Honduras')," +
+            "(344,'Hong Kong'),(348,'Hungary'),(352,'Iceland'),(356,'India'),(360,'Indonesia'),(368,'Iraq')," +
+            "(372,'Ireland'),(364,'Islamic Republic of Iran'),(833,'Isle of Man'),(376,'Israel'),(380,'Italy')," +
+            "(388,'Jamaica'),(392,'Japan'),(832,'Jersey'),(396,'Johnston Island'),(400,'Jordan'),(398,'Kazakhstan')," +
             "(404,'Kenya'),(296,'Kiribati'),(414,'Kuwait'),(417,'Kyrgyzstan'),(418,'Lao People\\'s Democratic Republic')," +
-            "(428,'Latvia'),(422,'Lebanon'),(426,'Lesotho'),(430,'Liberia'),(434,'Libya'),(438,'Liechtenstein'),"          +
-            "(440,'Lithuania'),(442,'Luxembourg'),(446,'Macao'),(450,'Madagascar'),(454,'Malawi'),(458,'Malaysia'),"       +
-            "(462,'Maldives'),(466,'Mali'),(470,'Malta'),(584,'Marshall Islands'),(474,'Martinique'),(478,'Mauritania'),"  +
-            "(480,'Mauritius'),(175,'Mayotte'),(484,'Mexico'),(488,'Midway Islands'),(492,'Monaco'),(496,'Mongolia'),"     +
-            "(499,'Montenegro'),(500,'Montserrat'),(504,'Morocco'),(508,'Mozambique'),(104,'Myanmar'),(516,'Namibia'),"    +
-            "(520,'Nauru'),(524,'Nepal'),(528,'Netherlands'),(530,'Netherlands Antilles'),(532,'Netherlands Antilles'),"   +
-            "(536,'Neutral Zone'),(540,'New Caledonia'),(554,'New Zealand'),(558,'Nicaragua'),(562,'Niger'),"              +
-            "(566,'Nigeria'),(570,'Niue'),(574,'Norfolk Island'),(580,'Northern Mariana Islands'),(578,'Norway'),"         +
-            "(512,'Oman'),(586,'Pakistan'),(585,'Palau'),(590,'Panama'),(591,'Panama'),(594,'Panama Canal Zone'),"         +
-            "(598,'Papua New Guinea'),(600,'Paraguay'),(604,'Peru'),(608,'Philippines'),(612,'Pitcairn'),"                 +
-            "(068,'Plurinational State of Bolivia'),(616,'Poland'),(620,'Portugal'),(630,'Puerto Rico'),(634,'Qatar'),"    +
-            "(410,'Republic of Korea'),(498,'Republic of Moldova'),(714,'Republic of Viet-Nam'),(638,'Réunion'),"          +
-            "(642,'Romania'),(643,'Russian Federation'),(646,'Rwanda'),(650,'Ryukyu Islands'),(652,'Saint Barthélemy'),"   +
-            "(654,'Saint Helena, Ascension and Tristan da Cunha'),(659,'Saint Kitts and Nevis'),"                          +
-            "(658,'Saint Kitts-Nevis-Anguilla'),(662,'Saint Lucia'),(663,'Saint Martin'),"                                 +
-            "(666,'Saint Pierre and Miquelon'),(670,'Saint Vincent and the Grenadines'),(882,'Samoa'),"                    +
-            "(674,'San Marino'),(678,'Sao Tome and Principe'),(682,'Saudi Arabia'),(686,'Senegal'),(688,'Serbia'),"        +
-            "(891,'Serbia and Montenegro'),(690,'Seychelles'),(694,'Sierra Leone'),(698,'Sikkim'),(702,'Singapore'),"      +
-            "(534,'Sint Marteen'),(703,'Slovakia'),(705,'Slovenia'),(890,'Socialist Federal Republic of Yugoslavia'),"     +
-            "(090,'Solomon Islands'),(706,'Somalia'),(710,'South Africa'),"                                                +
-            "(239,'South Georgia and the South Sandwich Islands'),(728,'South Sudan'),(724,'Spain'),(144,'Sri Lanka'),"    +
-            "(275,'State of Palestine'),(729,'Sudan'),(736,'Sudan'),(740,'Suriname'),(744,'Svalbard and Jan Mayen'),"      +
-            "(748,'Swaziland'),(752,'Sweden'),(756,'Switzerland'),(760,'Syrian Arab Republic'),"                           +
-            "(158,'Taiwan, Province of China'),(762,'Tajikistan'),(764,'Thailand'),"                                       +
-            "(807,'The former Yugoslav Republic of Macedonia'),(626,'Timor-Leste'),(768,'Togo'),(772,'Tokelau'),"          +
-            "(776,'Tonga'),(780,'Trinidad and Tobago'),(582,'Trust Territory of the Pacific Islands'),(788,'Tunisia'),"    +
-            "(792,'Turkey'),(795,'Turkmenistan'),(796,'Turks and Caicos Islands'),(798,'Tuvalu'),"                         +
-            "(849,'U.S. Miscellaneous Pacific Islands'),(800,'Uganda'),(804,'Ukraine'),(784,'United Arab Emirates'),"      +
-            "(826,'United Kingdom'),(834,'United Republic of Tanzania'),(581,'United States Minor Outlying Islands'),"     +
-            "(840,'United States of America'),(858,'Uruguay'),(810,'USSR'),(860,'Uzbekistan'),(548,'Vanuatu'),"            +
-            "(704,'Viet-Nam'),(850,'Virgin Islands, U.S.'),(872,'Wake Island'),(876,'Wallis and Futuna'),"                 +
+            "(428,'Latvia'),(422,'Lebanon'),(426,'Lesotho'),(430,'Liberia'),(434,'Libya'),(438,'Liechtenstein')," +
+            "(440,'Lithuania'),(442,'Luxembourg'),(446,'Macao'),(450,'Madagascar'),(454,'Malawi'),(458,'Malaysia')," +
+            "(462,'Maldives'),(466,'Mali'),(470,'Malta'),(584,'Marshall Islands'),(474,'Martinique'),(478,'Mauritania')," +
+            "(480,'Mauritius'),(175,'Mayotte'),(484,'Mexico'),(488,'Midway Islands'),(492,'Monaco'),(496,'Mongolia')," +
+            "(499,'Montenegro'),(500,'Montserrat'),(504,'Morocco'),(508,'Mozambique'),(104,'Myanmar'),(516,'Namibia')," +
+            "(520,'Nauru'),(524,'Nepal'),(528,'Netherlands'),(530,'Netherlands Antilles'),(532,'Netherlands Antilles')," +
+            "(536,'Neutral Zone'),(540,'New Caledonia'),(554,'New Zealand'),(558,'Nicaragua'),(562,'Niger')," +
+            "(566,'Nigeria'),(570,'Niue'),(574,'Norfolk Island'),(580,'Northern Mariana Islands'),(578,'Norway')," +
+            "(512,'Oman'),(586,'Pakistan'),(585,'Palau'),(590,'Panama'),(591,'Panama'),(594,'Panama Canal Zone')," +
+            "(598,'Papua New Guinea'),(600,'Paraguay'),(604,'Peru'),(608,'Philippines'),(612,'Pitcairn')," +
+            "(068,'Plurinational State of Bolivia'),(616,'Poland'),(620,'Portugal'),(630,'Puerto Rico'),(634,'Qatar')," +
+            "(410,'Republic of Korea'),(498,'Republic of Moldova'),(714,'Republic of Viet-Nam'),(638,'Réunion')," +
+            "(642,'Romania'),(643,'Russian Federation'),(646,'Rwanda'),(650,'Ryukyu Islands'),(652,'Saint Barthélemy')," +
+            "(654,'Saint Helena, Ascension and Tristan da Cunha'),(659,'Saint Kitts and Nevis')," +
+            "(658,'Saint Kitts-Nevis-Anguilla'),(662,'Saint Lucia'),(663,'Saint Martin')," +
+            "(666,'Saint Pierre and Miquelon'),(670,'Saint Vincent and the Grenadines'),(882,'Samoa')," +
+            "(674,'San Marino'),(678,'Sao Tome and Principe'),(682,'Saudi Arabia'),(686,'Senegal'),(688,'Serbia')," +
+            "(891,'Serbia and Montenegro'),(690,'Seychelles'),(694,'Sierra Leone'),(698,'Sikkim'),(702,'Singapore')," +
+            "(534,'Sint Marteen'),(703,'Slovakia'),(705,'Slovenia'),(890,'Socialist Federal Republic of Yugoslavia')," +
+            "(090,'Solomon Islands'),(706,'Somalia'),(710,'South Africa')," +
+            "(239,'South Georgia and the South Sandwich Islands'),(728,'South Sudan'),(724,'Spain'),(144,'Sri Lanka')," +
+            "(275,'State of Palestine'),(729,'Sudan'),(736,'Sudan'),(740,'Suriname'),(744,'Svalbard and Jan Mayen')," +
+            "(748,'Swaziland'),(752,'Sweden'),(756,'Switzerland'),(760,'Syrian Arab Republic')," +
+            "(158,'Taiwan, Province of China'),(762,'Tajikistan'),(764,'Thailand')," +
+            "(807,'The former Yugoslav Republic of Macedonia'),(626,'Timor-Leste'),(768,'Togo'),(772,'Tokelau')," +
+            "(776,'Tonga'),(780,'Trinidad and Tobago'),(582,'Trust Territory of the Pacific Islands'),(788,'Tunisia')," +
+            "(792,'Turkey'),(795,'Turkmenistan'),(796,'Turks and Caicos Islands'),(798,'Tuvalu')," +
+            "(849,'U.S. Miscellaneous Pacific Islands'),(800,'Uganda'),(804,'Ukraine'),(784,'United Arab Emirates')," +
+            "(826,'United Kingdom'),(834,'United Republic of Tanzania'),(581,'United States Minor Outlying Islands')," +
+            "(840,'United States of America'),(858,'Uruguay'),(810,'USSR'),(860,'Uzbekistan'),(548,'Vanuatu')," +
+            "(704,'Viet-Nam'),(850,'Virgin Islands, U.S.'),(872,'Wake Island'),(876,'Wallis and Futuna')," +
             "(732,'Western Sahara'),(887,'Yemen'),(886,'Yemen Arab Republic'),(894,'Zambia'),(716,'Zimbabwe');";
 
         public static readonly string CompaniesForeignKeys =
diff --git a/Marechai.Database/Schemas/Sql/V7.cs b/Marechai.Database/Schemas/Sql/V7.cs
index 59d95904..c87cd0b6 100644
--- a/Marechai.Database/Schemas/Sql/V7.cs
+++ b/Marechai.Database/Schemas/Sql/V7.cs
@@ -38,34 +38,33 @@ namespace Marechai.Database.Schemas.Sql
                                                    "PRIMARY KEY (`id`)\n"                            + ");\n" +
                                                    "INSERT INTO marechai_db (version) VALUES ('7');";
 
-        public static readonly string Companies = "CREATE TABLE `companies` (\n"                            +
-                                                  "`id` int(11)            NOT NULL AUTO_INCREMENT,\n"      +
-                                                  "`name` varchar(128) NOT NULL DEFAULT '',\n"              +
-                                                  "`founded` datetime          DEFAULT NULL,\n"             +
-                                                  "`website` varchar(255) DEFAULT NULL,\n"                  +
-                                                  "`twitter` varchar(45) DEFAULT NULL,\n"                   +
-                                                  "`facebook` varchar(45) DEFAULT NULL,\n"                  +
-                                                  "`sold` datetime DEFAULT NULL,\n"                         +
-                                                  "`sold_to` int(11)   DEFAULT NULL,\n"                     +
-                                                  "`address` varchar(80) DEFAULT NULL,\n"                   +
-                                                  "`city` varchar(80) DEFAULT NULL,\n"                      +
-                                                  "`province` varchar(80) DEFAULT NULL,\n"                  +
-                                                  "`postal_code` varchar(25) DEFAULT NULL,\n"               +
+        public static readonly string Companies = "CREATE TABLE `companies` (\n" +
+                                                  "`id` int(11)            NOT NULL AUTO_INCREMENT,\n" +
+                                                  "`name` varchar(128) NOT NULL DEFAULT '',\n" +
+                                                  "`founded` datetime          DEFAULT NULL,\n" +
+                                                  "`website` varchar(255) DEFAULT NULL,\n" +
+                                                  "`twitter` varchar(45) DEFAULT NULL,\n" +
+                                                  "`facebook` varchar(45) DEFAULT NULL,\n" +
+                                                  "`sold` datetime DEFAULT NULL,\n" +
+                                                  "`sold_to` int(11)   DEFAULT NULL,\n" +
+                                                  "`address` varchar(80) DEFAULT NULL,\n" +
+                                                  "`city` varchar(80) DEFAULT NULL,\n" +
+                                                  "`province` varchar(80) DEFAULT NULL,\n" +
+                                                  "`postal_code` varchar(25) DEFAULT NULL,\n" +
                                                   "`country` smallint(3) UNSIGNED ZEROFILL DEFAULT NULL,\n" +
-                                                  "`status` int NOT NULL,\n"                                +
-                                                  "PRIMARY KEY (`id`),\n"                                   +
-                                                  "KEY `idx_companies_name` (`name`),\n"                    +
-                                                  "KEY `idx_companies_founded` (`founded`),\n"              +
-                                                  "KEY `idx_companies_website` (`website`),\n"              +
-                                                  "KEY `idx_companies_twitter` (`twitter`),\n"              +
-                                                  "KEY `idx_companies_facebook` (`facebook`),\n"            +
-                                                  "KEY `idx_companies_sold` (`sold`),\n"                    +
-                                                  "KEY `idx_companies_sold_to` (`sold_to`),\n"              +
-                                                  "KEY `idx_companies_address` (`address`),\n"              +
-                                                  "KEY `idx_companies_city` (`city`),\n"                    +
-                                                  "KEY `idx_companies_province` (`province`),\n"            +
-                                                  "KEY `idx_companies_postal_code` (`postal_code`),\n"      +
-                                                  "KEY `idx_companies_status` (`status`),\n"                +
+                                                  "`status` int NOT NULL,\n" + "PRIMARY KEY (`id`),\n" +
+                                                  "KEY `idx_companies_name` (`name`),\n" +
+                                                  "KEY `idx_companies_founded` (`founded`),\n" +
+                                                  "KEY `idx_companies_website` (`website`),\n" +
+                                                  "KEY `idx_companies_twitter` (`twitter`),\n" +
+                                                  "KEY `idx_companies_facebook` (`facebook`),\n" +
+                                                  "KEY `idx_companies_sold` (`sold`),\n" +
+                                                  "KEY `idx_companies_sold_to` (`sold_to`),\n" +
+                                                  "KEY `idx_companies_address` (`address`),\n" +
+                                                  "KEY `idx_companies_city` (`city`),\n" +
+                                                  "KEY `idx_companies_province` (`province`),\n" +
+                                                  "KEY `idx_companies_postal_code` (`postal_code`),\n" +
+                                                  "KEY `idx_companies_status` (`status`),\n" +
                                                   "KEY `idx_companies_country` (`country`));";
 
         public static readonly string Computers = V6.Computers;
diff --git a/Marechai.Database/Schemas/Sql/V8.cs b/Marechai.Database/Schemas/Sql/V8.cs
index 30a2c91f..0e21b195 100644
--- a/Marechai.Database/Schemas/Sql/V8.cs
+++ b/Marechai.Database/Schemas/Sql/V8.cs
@@ -76,17 +76,16 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string CompaniesForeignKeys = V7.CompaniesForeignKeys;
 
-        public static readonly string CompanyLogos = "CREATE TABLE IF NOT EXISTS `company_logos` (\n"   +
-                                                     "`id` INT NOT NULL AUTO_INCREMENT,\n"              +
-                                                     "`company_id` INT(11) NOT NULL,\n"                 +
-                                                     "`year` INT(4) DEFAULT NULL,\n"                    +
-                                                     "`logo_guid` CHAR(36) NOT NULL,\n"                 +
+        public static readonly string CompanyLogos = "CREATE TABLE IF NOT EXISTS `company_logos` (\n" +
+                                                     "`id` INT NOT NULL AUTO_INCREMENT,\n" +
+                                                     "`company_id` INT(11) NOT NULL,\n" +
+                                                     "`year` INT(4) DEFAULT NULL,\n" +
+                                                     "`logo_guid` CHAR(36) NOT NULL,\n" +
                                                      "PRIMARY KEY (`id`, `company_id`, `logo_guid`),\n" +
-                                                     "UNIQUE INDEX `idx_id` (`id` ASC),\n"              +
-                                                     "INDEX `idx_company_id` (`company_id` ASC),\n"     +
-                                                     "INDEX `idx_guid` (`logo_guid` ASC),\n"            +
-                                                     "CONSTRAINT `fk_company_logos_company1`\n"         +
-                                                     "FOREIGN KEY (`company_id`)\n"                     +
-                                                     "REFERENCES `companies` (`id`))";
+                                                     "UNIQUE INDEX `idx_id` (`id` ASC),\n" +
+                                                     "INDEX `idx_company_id` (`company_id` ASC),\n" +
+                                                     "INDEX `idx_guid` (`logo_guid` ASC),\n" +
+                                                     "CONSTRAINT `fk_company_logos_company1`\n" +
+                                                     "FOREIGN KEY (`company_id`)\n" + "REFERENCES `companies` (`id`))";
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Schemas/Sql/V9.cs b/Marechai.Database/Schemas/Sql/V9.cs
index b59883da..a8b40e9e 100644
--- a/Marechai.Database/Schemas/Sql/V9.cs
+++ b/Marechai.Database/Schemas/Sql/V9.cs
@@ -78,15 +78,13 @@ namespace Marechai.Database.Schemas.Sql
 
         public static readonly string CompanyLogos = V8.CompanyLogos;
 
-        public static readonly string CompanyDescriptions =
-            "CREATE TABLE `company_descriptions` (\n"                                                                           +
-            "`id` INT NOT NULL AUTO_INCREMENT,\n"                                                                               +
-            "`company_id` INT NOT NULL,\n"                                                                                      +
-            "`text` text,\n"                                                                                                    +
-            "PRIMARY KEY (`id`),\n"                                                                                             +
-            "INDEX `idx_company_id` (`company_id` ASC),\n"                                                                      +
-            "FULLTEXT KEY `idx_text` (`text`),\n"                                                                               +
-            "CONSTRAINT `fk_company_id` FOREIGN KEY (`id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE\n" +
-            ")";
+        public static readonly string CompanyDescriptions = "CREATE TABLE `company_descriptions` (\n" +
+                                                            "`id` INT NOT NULL AUTO_INCREMENT,\n" +
+                                                            "`company_id` INT NOT NULL,\n" + "`text` text,\n" +
+                                                            "PRIMARY KEY (`id`),\n" +
+                                                            "INDEX `idx_company_id` (`company_id` ASC),\n" +
+                                                            "FULLTEXT KEY `idx_text` (`text`),\n" +
+                                                            "CONSTRAINT `fk_company_id` FOREIGN KEY (`id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE\n" +
+                                                            ")";
     }
 }
\ No newline at end of file
diff --git a/Marechai.Database/Seeders/DocumentRoles.cs b/Marechai.Database/Seeders/DocumentRoles.cs
index 15c84a31..5a65478f 100644
--- a/Marechai.Database/Seeders/DocumentRoles.cs
+++ b/Marechai.Database/Seeders/DocumentRoles.cs
@@ -44,1087 +44,1629 @@ namespace Marechai.Database.Seeders
             {
                 new DocumentRole
                 {
-                    Id = "abr", Name = "Abridger", Enabled = true
+                    Id      = "abr",
+                    Name    = "Abridger",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "acp", Name = "Art copyist", Enabled = true
+                    Id      = "acp",
+                    Name    = "Art copyist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "act", Name = "Actor", Enabled = true
+                    Id      = "act",
+                    Name    = "Actor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "adi", Name = "Art director", Enabled = true
+                    Id      = "adi",
+                    Name    = "Art director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "adp", Name = "Adapter", Enabled = true
+                    Id      = "adp",
+                    Name    = "Adapter",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "aft", Name = "Author of afterword, colophon, etc.", Enabled = true
+                    Id      = "aft",
+                    Name    = "Author of afterword, colophon, etc.",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "anl", Name = "Analyst", Enabled = true
+                    Id      = "anl",
+                    Name    = "Analyst",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "anm", Name = "Animator", Enabled = true
+                    Id      = "anm",
+                    Name    = "Animator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ann", Name = "Annotator", Enabled = true
+                    Id      = "ann",
+                    Name    = "Annotator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ant", Name = "Bibliographic antecedent", Enabled = true
+                    Id      = "ant",
+                    Name    = "Bibliographic antecedent",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ape", Name = "Appellee", Enabled = true
+                    Id      = "ape",
+                    Name    = "Appellee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "apl", Name = "Appellant", Enabled = true
+                    Id      = "apl",
+                    Name    = "Appellant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "app", Name = "Applicant", Enabled = true
+                    Id      = "app",
+                    Name    = "Applicant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "aqt", Name = "Author in quotations or text abstracts", Enabled = true
+                    Id      = "aqt",
+                    Name    = "Author in quotations or text abstracts",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "arc", Name = "Architect", Enabled = true
+                    Id      = "arc",
+                    Name    = "Architect",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ard", Name = "Artistic director", Enabled = true
+                    Id      = "ard",
+                    Name    = "Artistic director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "arr", Name = "Arranger", Enabled = true
+                    Id      = "arr",
+                    Name    = "Arranger",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "art", Name = "Artist", Enabled = true
+                    Id      = "art",
+                    Name    = "Artist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "asg", Name = "Assignee", Enabled = true
+                    Id      = "asg",
+                    Name    = "Assignee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "asn", Name = "Associated name", Enabled = true
+                    Id      = "asn",
+                    Name    = "Associated name",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ato", Name = "Autographer", Enabled = true
+                    Id      = "ato",
+                    Name    = "Autographer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "att", Name = "Attributed name", Enabled = true
+                    Id      = "att",
+                    Name    = "Attributed name",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "auc", Name = "Auctioneer", Enabled = true
+                    Id      = "auc",
+                    Name    = "Auctioneer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "aud", Name = "Author of dialog", Enabled = true
+                    Id      = "aud",
+                    Name    = "Author of dialog",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "aui", Name = "Author of introduction, etc.", Enabled = true
+                    Id      = "aui",
+                    Name    = "Author of introduction, etc.",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "aus", Name = "Screenwriter", Enabled = true
+                    Id      = "aus",
+                    Name    = "Screenwriter",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "aut", Name = "Author", Enabled = true
+                    Id      = "aut",
+                    Name    = "Author",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "bdd", Name = "Binding designer", Enabled = true
+                    Id      = "bdd",
+                    Name    = "Binding designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "bjd", Name = "Bookjacket designer", Enabled = true
+                    Id      = "bjd",
+                    Name    = "Bookjacket designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "bkd", Name = "Book designer", Enabled = true
+                    Id      = "bkd",
+                    Name    = "Book designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "bkp", Name = "Book producer", Enabled = true
+                    Id      = "bkp",
+                    Name    = "Book producer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "blw", Name = "Blurb writer", Enabled = true
+                    Id      = "blw",
+                    Name    = "Blurb writer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "bnd", Name = "Binder", Enabled = true
+                    Id      = "bnd",
+                    Name    = "Binder",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "bpd", Name = "Bookplate designer", Enabled = true
+                    Id      = "bpd",
+                    Name    = "Bookplate designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "brd", Name = "Broadcaster", Enabled = true
+                    Id      = "brd",
+                    Name    = "Broadcaster",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "brl", Name = "Braille embosser", Enabled = true
+                    Id      = "brl",
+                    Name    = "Braille embosser",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "bsl", Name = "Bookseller", Enabled = true
+                    Id      = "bsl",
+                    Name    = "Bookseller",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cas", Name = "Caster", Enabled = true
+                    Id      = "cas",
+                    Name    = "Caster",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ccp", Name = "Conceptor", Enabled = true
+                    Id      = "ccp",
+                    Name    = "Conceptor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "chr", Name = "Choreographer", Enabled = true
+                    Id      = "chr",
+                    Name    = "Choreographer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "clb", Name = "Collaborator", Enabled = false
+                    Id      = "clb",
+                    Name    = "Collaborator",
+                    Enabled = false
                 },
                 new DocumentRole
                 {
-                    Id = "cli", Name = "Client", Enabled = true
+                    Id      = "cli",
+                    Name    = "Client",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cll", Name = "Calligrapher", Enabled = true
+                    Id      = "cll",
+                    Name    = "Calligrapher",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "clr", Name = "Colorist", Enabled = true
+                    Id      = "clr",
+                    Name    = "Colorist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "clt", Name = "Collotyper", Enabled = true
+                    Id      = "clt",
+                    Name    = "Collotyper",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cmm", Name = "Commentator", Enabled = true
+                    Id      = "cmm",
+                    Name    = "Commentator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cmp", Name = "Composer", Enabled = true
+                    Id      = "cmp",
+                    Name    = "Composer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cmt", Name = "Compositor", Enabled = true
+                    Id      = "cmt",
+                    Name    = "Compositor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cnd", Name = "Conductor", Enabled = true
+                    Id      = "cnd",
+                    Name    = "Conductor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cng", Name = "Cinematographer", Enabled = true
+                    Id      = "cng",
+                    Name    = "Cinematographer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cns", Name = "Censor", Enabled = true
+                    Id      = "cns",
+                    Name    = "Censor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "coe", Name = "Contestant-appellee", Enabled = true
+                    Id      = "coe",
+                    Name    = "Contestant-appellee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "col", Name = "Collector", Enabled = true
+                    Id      = "col",
+                    Name    = "Collector",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "com", Name = "Compiler", Enabled = true
+                    Id      = "com",
+                    Name    = "Compiler",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "con", Name = "Conservator", Enabled = true
+                    Id      = "con",
+                    Name    = "Conservator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cor", Name = "Collection registrar", Enabled = true
+                    Id      = "cor",
+                    Name    = "Collection registrar",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cos", Name = "Contestant", Enabled = true
+                    Id      = "cos",
+                    Name    = "Contestant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cot", Name = "Contestant-appellant", Enabled = true
+                    Id      = "cot",
+                    Name    = "Contestant-appellant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cou", Name = "Court governed", Enabled = true
+                    Id      = "cou",
+                    Name    = "Court governed",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cov", Name = "Cover designer", Enabled = true
+                    Id      = "cov",
+                    Name    = "Cover designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cpc", Name = "Copyright claimant", Enabled = true
+                    Id      = "cpc",
+                    Name    = "Copyright claimant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cpe", Name = "Complainant-appellee", Enabled = true
+                    Id      = "cpe",
+                    Name    = "Complainant-appellee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cph", Name = "Copyright holder", Enabled = true
+                    Id      = "cph",
+                    Name    = "Copyright holder",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cpl", Name = "Complainant", Enabled = true
+                    Id      = "cpl",
+                    Name    = "Complainant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cpt", Name = "Complainant-appellant", Enabled = true
+                    Id      = "cpt",
+                    Name    = "Complainant-appellant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cre", Name = "Creator", Enabled = true
+                    Id      = "cre",
+                    Name    = "Creator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "crp", Name = "Correspondent", Enabled = true
+                    Id      = "crp",
+                    Name    = "Correspondent",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "crr", Name = "Corrector", Enabled = true
+                    Id      = "crr",
+                    Name    = "Corrector",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "crt", Name = "Court reporter", Enabled = true
+                    Id      = "crt",
+                    Name    = "Court reporter",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "csl", Name = "Consultant", Enabled = true
+                    Id      = "csl",
+                    Name    = "Consultant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "csp", Name = "Consultant to a project", Enabled = true
+                    Id      = "csp",
+                    Name    = "Consultant to a project",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cst", Name = "Costume designer", Enabled = true
+                    Id      = "cst",
+                    Name    = "Costume designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ctb", Name = "Contributor", Enabled = true
+                    Id      = "ctb",
+                    Name    = "Contributor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cte", Name = "Contestee-appellee", Enabled = true
+                    Id      = "cte",
+                    Name    = "Contestee-appellee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ctg", Name = "Cartographer", Enabled = true
+                    Id      = "ctg",
+                    Name    = "Cartographer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ctr", Name = "Contractor", Enabled = true
+                    Id      = "ctr",
+                    Name    = "Contractor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cts", Name = "Contestee", Enabled = true
+                    Id      = "cts",
+                    Name    = "Contestee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ctt", Name = "Contestee-appellant", Enabled = true
+                    Id      = "ctt",
+                    Name    = "Contestee-appellant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cur", Name = "Curator", Enabled = true
+                    Id      = "cur",
+                    Name    = "Curator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "cwt", Name = "Commentator for written text", Enabled = true
+                    Id      = "cwt",
+                    Name    = "Commentator for written text",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dbp", Name = "Distribution place", Enabled = true
+                    Id      = "dbp",
+                    Name    = "Distribution place",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dfd", Name = "Defendant", Enabled = true
+                    Id      = "dfd",
+                    Name    = "Defendant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dfe", Name = "Defendant-appellee", Enabled = true
+                    Id      = "dfe",
+                    Name    = "Defendant-appellee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dft", Name = "Defendant-appellant", Enabled = true
+                    Id      = "dft",
+                    Name    = "Defendant-appellant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dgg", Name = "Degree granting institution", Enabled = true
+                    Id      = "dgg",
+                    Name    = "Degree granting institution",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dgs", Name = "Degree supervisor", Enabled = true
+                    Id      = "dgs",
+                    Name    = "Degree supervisor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dis", Name = "Dissertant", Enabled = true
+                    Id      = "dis",
+                    Name    = "Dissertant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dln", Name = "Delineator", Enabled = true
+                    Id      = "dln",
+                    Name    = "Delineator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dnc", Name = "Dancer", Enabled = true
+                    Id      = "dnc",
+                    Name    = "Dancer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dnr", Name = "Donor", Enabled = true
+                    Id      = "dnr",
+                    Name    = "Donor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dpc", Name = "Depicted", Enabled = true
+                    Id      = "dpc",
+                    Name    = "Depicted",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dpt", Name = "Depositor", Enabled = true
+                    Id      = "dpt",
+                    Name    = "Depositor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "drm", Name = "Draftsman", Enabled = true
+                    Id      = "drm",
+                    Name    = "Draftsman",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "drt", Name = "Director", Enabled = true
+                    Id      = "drt",
+                    Name    = "Director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dsr", Name = "Designer", Enabled = true
+                    Id      = "dsr",
+                    Name    = "Designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dst", Name = "Distributor", Enabled = true
+                    Id      = "dst",
+                    Name    = "Distributor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dtc", Name = "Data contributor", Enabled = true
+                    Id      = "dtc",
+                    Name    = "Data contributor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dte", Name = "Dedicatee", Enabled = true
+                    Id      = "dte",
+                    Name    = "Dedicatee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dtm", Name = "Data manager", Enabled = true
+                    Id      = "dtm",
+                    Name    = "Data manager",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dto", Name = "Dedicator", Enabled = true
+                    Id      = "dto",
+                    Name    = "Dedicator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "dub", Name = "Dubious author", Enabled = true
+                    Id      = "dub",
+                    Name    = "Dubious author",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "edc", Name = "Editor of compilation", Enabled = true
+                    Id      = "edc",
+                    Name    = "Editor of compilation",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "edm", Name = "Editor of moving image work", Enabled = true
+                    Id      = "edm",
+                    Name    = "Editor of moving image work",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "edt", Name = "Editor", Enabled = true
+                    Id      = "edt",
+                    Name    = "Editor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "egr", Name = "Engraver", Enabled = true
+                    Id      = "egr",
+                    Name    = "Engraver",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "elg", Name = "Electrician", Enabled = true
+                    Id      = "elg",
+                    Name    = "Electrician",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "elt", Name = "Electrotyper", Enabled = true
+                    Id      = "elt",
+                    Name    = "Electrotyper",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "eng", Name = "Engineer", Enabled = true
+                    Id      = "eng",
+                    Name    = "Engineer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "enj", Name = "Enacting jurisdiction", Enabled = true
+                    Id      = "enj",
+                    Name    = "Enacting jurisdiction",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "etr", Name = "Etcher", Enabled = true
+                    Id      = "etr",
+                    Name    = "Etcher",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "evp", Name = "Event place", Enabled = true
+                    Id      = "evp",
+                    Name    = "Event place",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "exp", Name = "Expert", Enabled = true
+                    Id      = "exp",
+                    Name    = "Expert",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "fac", Name = "Facsimilist", Enabled = true
+                    Id      = "fac",
+                    Name    = "Facsimilist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "fds", Name = "Film distributor", Enabled = true
+                    Id      = "fds",
+                    Name    = "Film distributor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "fld", Name = "Field director", Enabled = true
+                    Id      = "fld",
+                    Name    = "Field director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "flm", Name = "Film editor", Enabled = true
+                    Id      = "flm",
+                    Name    = "Film editor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "fmd", Name = "Film director", Enabled = true
+                    Id      = "fmd",
+                    Name    = "Film director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "fmk", Name = "Filmmaker", Enabled = true
+                    Id      = "fmk",
+                    Name    = "Filmmaker",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "fmo", Name = "Former owner", Enabled = true
+                    Id      = "fmo",
+                    Name    = "Former owner",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "fmp", Name = "Film producer", Enabled = true
+                    Id      = "fmp",
+                    Name    = "Film producer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "fnd", Name = "Funder", Enabled = true
+                    Id      = "fnd",
+                    Name    = "Funder",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "fpy", Name = "First party", Enabled = true
+                    Id      = "fpy",
+                    Name    = "First party",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "frg", Name = "Forger", Enabled = true
+                    Id      = "frg",
+                    Name    = "Forger",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "gis", Name = "Geographic information specialist", Enabled = true
+                    Id      = "gis",
+                    Name    = "Geographic information specialist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "grt", Name = "Graphic technician", Enabled = false
+                    Id      = "grt",
+                    Name    = "Graphic technician",
+                    Enabled = false
                 },
                 new DocumentRole
                 {
-                    Id = "his", Name = "Host institution", Enabled = true
+                    Id      = "his",
+                    Name    = "Host institution",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "hnr", Name = "Honoree", Enabled = true
+                    Id      = "hnr",
+                    Name    = "Honoree",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "hst", Name = "Host", Enabled = true
+                    Id      = "hst",
+                    Name    = "Host",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ill", Name = "Illustrator", Enabled = true
+                    Id      = "ill",
+                    Name    = "Illustrator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ilu", Name = "Illuminator", Enabled = true
+                    Id      = "ilu",
+                    Name    = "Illuminator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ins", Name = "Inscriber", Enabled = true
+                    Id      = "ins",
+                    Name    = "Inscriber",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "inv", Name = "Inventor", Enabled = true
+                    Id      = "inv",
+                    Name    = "Inventor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "isb", Name = "Issuing body", Enabled = true
+                    Id      = "isb",
+                    Name    = "Issuing body",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "itr", Name = "Instrumentalist", Enabled = true
+                    Id      = "itr",
+                    Name    = "Instrumentalist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ive", Name = "Interviewee", Enabled = true
+                    Id      = "ive",
+                    Name    = "Interviewee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ivr", Name = "Interviewer", Enabled = true
+                    Id      = "ivr",
+                    Name    = "Interviewer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "jud", Name = "Judge", Enabled = true
+                    Id      = "jud",
+                    Name    = "Judge",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "jug", Name = "Jurisdiction governed", Enabled = true
+                    Id      = "jug",
+                    Name    = "Jurisdiction governed",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lbr", Name = "Laboratory", Enabled = true
+                    Id      = "lbr",
+                    Name    = "Laboratory",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lbt", Name = "Librettist", Enabled = true
+                    Id      = "lbt",
+                    Name    = "Librettist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ldr", Name = "Laboratory director", Enabled = true
+                    Id      = "ldr",
+                    Name    = "Laboratory director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "led", Name = "Lead", Enabled = true
+                    Id      = "led",
+                    Name    = "Lead",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lee", Name = "Libelee-appellee", Enabled = true
+                    Id      = "lee",
+                    Name    = "Libelee-appellee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lel", Name = "Libelee", Enabled = true
+                    Id      = "lel",
+                    Name    = "Libelee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "len", Name = "Lender", Enabled = true
+                    Id      = "len",
+                    Name    = "Lender",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "let", Name = "Libelee-appellant", Enabled = true
+                    Id      = "let",
+                    Name    = "Libelee-appellant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lgd", Name = "Lighting designer", Enabled = true
+                    Id      = "lgd",
+                    Name    = "Lighting designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lie", Name = "Libelant-appellee", Enabled = true
+                    Id      = "lie",
+                    Name    = "Libelant-appellee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lil", Name = "Libelant", Enabled = true
+                    Id      = "lil",
+                    Name    = "Libelant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lit", Name = "Libelant-appellant", Enabled = true
+                    Id      = "lit",
+                    Name    = "Libelant-appellant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lsa", Name = "Landscape architect", Enabled = true
+                    Id      = "lsa",
+                    Name    = "Landscape architect",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lse", Name = "Licensee", Enabled = true
+                    Id      = "lse",
+                    Name    = "Licensee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lso", Name = "Licensor", Enabled = true
+                    Id      = "lso",
+                    Name    = "Licensor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ltg", Name = "Lithographer", Enabled = true
+                    Id      = "ltg",
+                    Name    = "Lithographer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "lyr", Name = "Lyricist", Enabled = true
+                    Id      = "lyr",
+                    Name    = "Lyricist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mcp", Name = "Music copyist", Enabled = true
+                    Id      = "mcp",
+                    Name    = "Music copyist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mdc", Name = "Metadata contact", Enabled = true
+                    Id      = "mdc",
+                    Name    = "Metadata contact",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "med", Name = "Medium", Enabled = true
+                    Id      = "med",
+                    Name    = "Medium",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mfp", Name = "Manufacture place", Enabled = true
+                    Id      = "mfp",
+                    Name    = "Manufacture place",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mfr", Name = "Manufacturer", Enabled = true
+                    Id      = "mfr",
+                    Name    = "Manufacturer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mod", Name = "Moderator", Enabled = true
+                    Id      = "mod",
+                    Name    = "Moderator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mon", Name = "Monitor", Enabled = true
+                    Id      = "mon",
+                    Name    = "Monitor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mrb", Name = "Marbler", Enabled = true
+                    Id      = "mrb",
+                    Name    = "Marbler",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mrk", Name = "Markup editor", Enabled = true
+                    Id      = "mrk",
+                    Name    = "Markup editor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "msd", Name = "Musical director", Enabled = true
+                    Id      = "msd",
+                    Name    = "Musical director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mte", Name = "Metal-engraver", Enabled = true
+                    Id      = "mte",
+                    Name    = "Metal-engraver",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mtk", Name = "Minute taker", Enabled = true
+                    Id      = "mtk",
+                    Name    = "Minute taker",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "mus", Name = "Musician", Enabled = true
+                    Id      = "mus",
+                    Name    = "Musician",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "nrt", Name = "Narrator", Enabled = true
+                    Id      = "nrt",
+                    Name    = "Narrator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "opn", Name = "Opponent", Enabled = true
+                    Id      = "opn",
+                    Name    = "Opponent",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "org", Name = "Originator", Enabled = true
+                    Id      = "org",
+                    Name    = "Originator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "orm", Name = "Organizer", Enabled = true
+                    Id      = "orm",
+                    Name    = "Organizer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "osp", Name = "Onscreen presenter", Enabled = true
+                    Id      = "osp",
+                    Name    = "Onscreen presenter",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "oth", Name = "Other", Enabled = true
+                    Id      = "oth",
+                    Name    = "Other",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "own", Name = "Owner", Enabled = true
+                    Id      = "own",
+                    Name    = "Owner",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pan", Name = "Panelist", Enabled = true
+                    Id      = "pan",
+                    Name    = "Panelist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pat", Name = "Patron", Enabled = true
+                    Id      = "pat",
+                    Name    = "Patron",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pbd", Name = "Publishing director", Enabled = true
+                    Id      = "pbd",
+                    Name    = "Publishing director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pbl", Name = "Publisher", Enabled = true
+                    Id      = "pbl",
+                    Name    = "Publisher",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pdr", Name = "Project director", Enabled = true
+                    Id      = "pdr",
+                    Name    = "Project director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pfr", Name = "Proofreader", Enabled = true
+                    Id      = "pfr",
+                    Name    = "Proofreader",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pht", Name = "Photographer", Enabled = true
+                    Id      = "pht",
+                    Name    = "Photographer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "plt", Name = "Platemaker", Enabled = true
+                    Id      = "plt",
+                    Name    = "Platemaker",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pma", Name = "Permitting agency", Enabled = true
+                    Id      = "pma",
+                    Name    = "Permitting agency",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pmn", Name = "Production manager", Enabled = true
+                    Id      = "pmn",
+                    Name    = "Production manager",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pop", Name = "Printer of plates", Enabled = true
+                    Id      = "pop",
+                    Name    = "Printer of plates",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ppm", Name = "Papermaker", Enabled = true
+                    Id      = "ppm",
+                    Name    = "Papermaker",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ppt", Name = "Puppeteer", Enabled = true
+                    Id      = "ppt",
+                    Name    = "Puppeteer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pra", Name = "Praeses", Enabled = true
+                    Id      = "pra",
+                    Name    = "Praeses",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "prc", Name = "Process contact", Enabled = true
+                    Id      = "prc",
+                    Name    = "Process contact",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "prd", Name = "Production personnel", Enabled = true
+                    Id      = "prd",
+                    Name    = "Production personnel",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pre", Name = "Presenter", Enabled = true
+                    Id      = "pre",
+                    Name    = "Presenter",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "prf", Name = "Performer", Enabled = true
+                    Id      = "prf",
+                    Name    = "Performer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "prg", Name = "Programmer", Enabled = true
+                    Id      = "prg",
+                    Name    = "Programmer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "prm", Name = "Printmaker", Enabled = true
+                    Id      = "prm",
+                    Name    = "Printmaker",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "prn", Name = "Production company", Enabled = true
+                    Id      = "prn",
+                    Name    = "Production company",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pro", Name = "Producer", Enabled = true
+                    Id      = "pro",
+                    Name    = "Producer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "prp", Name = "Production place", Enabled = true
+                    Id      = "prp",
+                    Name    = "Production place",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "prs", Name = "Production designer", Enabled = true
+                    Id      = "prs",
+                    Name    = "Production designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "prt", Name = "Printer", Enabled = true
+                    Id      = "prt",
+                    Name    = "Printer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "prv", Name = "Provider", Enabled = true
+                    Id      = "prv",
+                    Name    = "Provider",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pta", Name = "Patent applicant", Enabled = true
+                    Id      = "pta",
+                    Name    = "Patent applicant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pte", Name = "Plaintiff-appellee", Enabled = true
+                    Id      = "pte",
+                    Name    = "Plaintiff-appellee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ptf", Name = "Plaintiff", Enabled = true
+                    Id      = "ptf",
+                    Name    = "Plaintiff",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pth", Name = "Patent holder", Enabled = true
+                    Id      = "pth",
+                    Name    = "Patent holder",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ptt", Name = "Plaintiff-appellant", Enabled = true
+                    Id      = "ptt",
+                    Name    = "Plaintiff-appellant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "pup", Name = "Publication place", Enabled = true
+                    Id      = "pup",
+                    Name    = "Publication place",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rbr", Name = "Rubricator", Enabled = true
+                    Id      = "rbr",
+                    Name    = "Rubricator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rcd", Name = "Recordist", Enabled = true
+                    Id      = "rcd",
+                    Name    = "Recordist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rce", Name = "Recording engineer", Enabled = true
+                    Id      = "rce",
+                    Name    = "Recording engineer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rcp", Name = "Addressee", Enabled = true
+                    Id      = "rcp",
+                    Name    = "Addressee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rdd", Name = "Radio director", Enabled = true
+                    Id      = "rdd",
+                    Name    = "Radio director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "red", Name = "Redaktor", Enabled = true
+                    Id      = "red",
+                    Name    = "Redaktor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ren", Name = "Renderer", Enabled = true
+                    Id      = "ren",
+                    Name    = "Renderer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "res", Name = "Researcher", Enabled = true
+                    Id      = "res",
+                    Name    = "Researcher",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rev", Name = "Reviewer", Enabled = true
+                    Id      = "rev",
+                    Name    = "Reviewer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rpc", Name = "Radio producer", Enabled = true
+                    Id      = "rpc",
+                    Name    = "Radio producer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rps", Name = "Repository", Enabled = true
+                    Id      = "rps",
+                    Name    = "Repository",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rpt", Name = "Reporter", Enabled = true
+                    Id      = "rpt",
+                    Name    = "Reporter",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rpy", Name = "Responsible party", Enabled = true
+                    Id      = "rpy",
+                    Name    = "Responsible party",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rse", Name = "Respondent-appellee", Enabled = true
+                    Id      = "rse",
+                    Name    = "Respondent-appellee",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rsg", Name = "Restager", Enabled = true
+                    Id      = "rsg",
+                    Name    = "Restager",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rsp", Name = "Respondent", Enabled = true
+                    Id      = "rsp",
+                    Name    = "Respondent",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rsr", Name = "Restorationist", Enabled = true
+                    Id      = "rsr",
+                    Name    = "Restorationist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rst", Name = "Respondent-appellant", Enabled = true
+                    Id      = "rst",
+                    Name    = "Respondent-appellant",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rth", Name = "Research team head", Enabled = true
+                    Id      = "rth",
+                    Name    = "Research team head",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "rtm", Name = "Research team member", Enabled = true
+                    Id      = "rtm",
+                    Name    = "Research team member",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "sad", Name = "Scientific advisor", Enabled = true
+                    Id      = "sad",
+                    Name    = "Scientific advisor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "sce", Name = "Scenarist", Enabled = true
+                    Id      = "sce",
+                    Name    = "Scenarist",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "scl", Name = "Sculptor", Enabled = true
+                    Id      = "scl",
+                    Name    = "Sculptor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "scr", Name = "Scribe", Enabled = true
+                    Id      = "scr",
+                    Name    = "Scribe",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "sds", Name = "Sound designer", Enabled = true
+                    Id      = "sds",
+                    Name    = "Sound designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "sec", Name = "Secretary", Enabled = true
+                    Id      = "sec",
+                    Name    = "Secretary",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "sgd", Name = "Stage director", Enabled = true
+                    Id      = "sgd",
+                    Name    = "Stage director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "sgn", Name = "Signer", Enabled = true
+                    Id      = "sgn",
+                    Name    = "Signer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "sht", Name = "Supporting host", Enabled = true
+                    Id      = "sht",
+                    Name    = "Supporting host",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "sll", Name = "Seller", Enabled = true
+                    Id      = "sll",
+                    Name    = "Seller",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "sng", Name = "Singer", Enabled = true
+                    Id      = "sng",
+                    Name    = "Singer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "spk", Name = "Speaker", Enabled = true
+                    Id      = "spk",
+                    Name    = "Speaker",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "spn", Name = "Sponsor", Enabled = true
+                    Id      = "spn",
+                    Name    = "Sponsor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "spy", Name = "Second party", Enabled = true
+                    Id      = "spy",
+                    Name    = "Second party",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "srv", Name = "Surveyor", Enabled = true
+                    Id      = "srv",
+                    Name    = "Surveyor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "std", Name = "Set designer", Enabled = true
+                    Id      = "std",
+                    Name    = "Set designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "stg", Name = "Setting", Enabled = true
+                    Id      = "stg",
+                    Name    = "Setting",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "stl", Name = "Storyteller", Enabled = true
+                    Id      = "stl",
+                    Name    = "Storyteller",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "stm", Name = "Stage manager", Enabled = true
+                    Id      = "stm",
+                    Name    = "Stage manager",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "stn", Name = "Standards body", Enabled = true
+                    Id      = "stn",
+                    Name    = "Standards body",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "str", Name = "Stereotyper", Enabled = true
+                    Id      = "str",
+                    Name    = "Stereotyper",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "tcd", Name = "Technical director", Enabled = true
+                    Id      = "tcd",
+                    Name    = "Technical director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "tch", Name = "Teacher", Enabled = true
+                    Id      = "tch",
+                    Name    = "Teacher",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "ths", Name = "Thesis advisor", Enabled = true
+                    Id      = "ths",
+                    Name    = "Thesis advisor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "tld", Name = "Television director", Enabled = true
+                    Id      = "tld",
+                    Name    = "Television director",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "tlp", Name = "Television producer", Enabled = true
+                    Id      = "tlp",
+                    Name    = "Television producer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "trc", Name = "Transcriber", Enabled = true
+                    Id      = "trc",
+                    Name    = "Transcriber",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "trl", Name = "Translator", Enabled = true
+                    Id      = "trl",
+                    Name    = "Translator",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "tyd", Name = "Type designer", Enabled = true
+                    Id      = "tyd",
+                    Name    = "Type designer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "tyg", Name = "Typographer", Enabled = true
+                    Id      = "tyg",
+                    Name    = "Typographer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "uvp", Name = "University place", Enabled = true
+                    Id      = "uvp",
+                    Name    = "University place",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "vac", Name = "Voice actor", Enabled = true
+                    Id      = "vac",
+                    Name    = "Voice actor",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "vdg", Name = "Videographer", Enabled = true
+                    Id      = "vdg",
+                    Name    = "Videographer",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "voc", Name = "Vocalist", Enabled = false
+                    Id      = "voc",
+                    Name    = "Vocalist",
+                    Enabled = false
                 },
                 new DocumentRole
                 {
-                    Id = "wac", Name = "Writer of added commentary", Enabled = true
+                    Id      = "wac",
+                    Name    = "Writer of added commentary",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "wal", Name = "Writer of added lyrics", Enabled = true
+                    Id      = "wal",
+                    Name    = "Writer of added lyrics",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "wam", Name = "Writer of accompanying material", Enabled = true
+                    Id      = "wam",
+                    Name    = "Writer of accompanying material",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "wat", Name = "Writer of added text", Enabled = true
+                    Id      = "wat",
+                    Name    = "Writer of added text",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "wdc", Name = "Woodcutter", Enabled = true
+                    Id      = "wdc",
+                    Name    = "Woodcutter",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "wde", Name = "Wood engraver", Enabled = true
+                    Id      = "wde",
+                    Name    = "Wood engraver",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "win", Name = "Writer of introduction", Enabled = true
+                    Id      = "win",
+                    Name    = "Writer of introduction",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "wit", Name = "Witness", Enabled = true
+                    Id      = "wit",
+                    Name    = "Witness",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "wpr", Name = "Writer of preface", Enabled = true
+                    Id      = "wpr",
+                    Name    = "Writer of preface",
+                    Enabled = true
                 },
                 new DocumentRole
                 {
-                    Id = "wst", Name = "Writer of supplementary textual content", Enabled = true
+                    Id      = "wst",
+                    Name    = "Writer of supplementary textual content",
+                    Enabled = true
                 }
             })
             {
diff --git a/Marechai.Database/Seeders/Iso4217.cs b/Marechai.Database/Seeders/Iso4217.cs
index c40506af..219a884f 100644
--- a/Marechai.Database/Seeders/Iso4217.cs
+++ b/Marechai.Database/Seeders/Iso4217.cs
@@ -111,7 +111,9 @@ namespace Marechai.Database.Seeders
                 {
                     var newCode = new Models.Iso4217
                     {
-                        Code = currency.Code, Name = currency.Name, Numeric = currency.Number
+                        Code    = currency.Code,
+                        Name    = currency.Name,
+                        Numeric = currency.Number
                     };
 
                     if(byte.TryParse(currency.MinorUnits, out minorUnits))
@@ -170,7 +172,9 @@ namespace Marechai.Database.Seeders
                 {
                     var newCode = new Models.Iso4217
                     {
-                        Code = currency.Code, Name = currency.Name, Numeric = currency.Number
+                        Code    = currency.Code,
+                        Name    = currency.Name,
+                        Numeric = currency.Number
                     };
 
                     if(byte.TryParse(currency.MinorUnits, out minorUnits))
diff --git a/Marechai.Database/Seeders/Iso639.cs b/Marechai.Database/Seeders/Iso639.cs
index 0eeb5d88..7728c36e 100644
--- a/Marechai.Database/Seeders/Iso639.cs
+++ b/Marechai.Database/Seeders/Iso639.cs
@@ -99,8 +99,14 @@ namespace Marechai.Database.Seeders
 
                     codes.Add(new Models.Iso639
                     {
-                        Id    = pieces[0], Part2B = pieces[1], Part2T        = pieces[2], Part1   = pieces[3],
-                        Scope = pieces[4], Type   = pieces[5], ReferenceName = pieces[6], Comment = pieces[7]
+                        Id            = pieces[0],
+                        Part2B        = pieces[1],
+                        Part2T        = pieces[2],
+                        Part1         = pieces[3],
+                        Scope         = pieces[4],
+                        Type          = pieces[5],
+                        ReferenceName = pieces[6],
+                        Comment       = pieces[7]
                     });
 
                     line = sr.ReadLine();
diff --git a/Marechai.Database/Seeders/License.cs b/Marechai.Database/Seeders/License.cs
index 68cb714a..10968bb6 100644
--- a/Marechai.Database/Seeders/License.cs
+++ b/Marechai.Database/Seeders/License.cs
@@ -43,1990 +43,3417 @@ namespace Marechai.Database.Seeders
             {
                 new Models.License
                 {
-                    Id = 1, Name = "Fair use", FsfApproved = false, OsiApproved = false
+                    Id          = 1,
+                    Name        = "Fair use",
+                    FsfApproved = false,
+                    OsiApproved = false
                 },
                 new Models.License
                 {
-                    Id = 2, Name = "Advertisement use", FsfApproved = false, OsiApproved = false
+                    Id          = 2,
+                    Name        = "Advertisement use",
+                    FsfApproved = false,
+                    OsiApproved = false
                 },
                 new Models.License
                 {
-                    Id = 3, Name = "All rights reserved", FsfApproved = false, OsiApproved = false
+                    Id          = 3,
+                    Name        = "All rights reserved",
+                    FsfApproved = false,
+                    OsiApproved = false
                 },
                 new Models.License
                 {
-                    Id          = 4, Name    = "BSD Zero Clause License", SPDX = "0BSD", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/0BSD.html#licenseText"
+                    Id          = 4,
+                    Name        = "BSD Zero Clause License",
+                    SPDX        = "0BSD",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/0BSD.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 5, Name    = "Attribution Assurance License", SPDX = "AAL", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/AAL.html#licenseText"
+                    Id          = 5,
+                    Name        = "Attribution Assurance License",
+                    SPDX        = "AAL",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/AAL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 6, Name     = "Abstyles License", SPDX = "Abstyles", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Abstyles.html#licenseText"
+                    Id          = 6,
+                    Name        = "Abstyles License",
+                    SPDX        = "Abstyles",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Abstyles.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 7, Name = "Adobe Systems Incorporated Source Code License Agreement", SPDX = "Adobe-2006",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/Adobe-2006.html#licenseText"
+                    Id          = 7,
+                    Name        = "Adobe Systems Incorporated Source Code License Agreement",
+                    SPDX        = "Adobe-2006",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Adobe-2006.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 8, Name     = "Adobe Glyph List License", SPDX = "Adobe-Glyph", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Adobe-Glyph.html#licenseText"
+                    Id          = 8,
+                    Name        = "Adobe Glyph List License",
+                    SPDX        = "Adobe-Glyph",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Adobe-Glyph.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 9, Name     = "Amazon Digital Services License", SPDX = "ADSL", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/ADSL.html#licenseText"
+                    Id          = 9,
+                    Name        = "Amazon Digital Services License",
+                    SPDX        = "ADSL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/ADSL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 10, Name   = "Academic Free License v1.1", SPDX = "AFL-1.1", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/AFL-1.1.html#licenseText"
+                    Id          = 10,
+                    Name        = "Academic Free License v1.1",
+                    SPDX        = "AFL-1.1",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/AFL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 11, Name   = "Academic Free License v1.2", SPDX = "AFL-1.2", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/AFL-1.2.html#licenseText"
+                    Id          = 11,
+                    Name        = "Academic Free License v1.2",
+                    SPDX        = "AFL-1.2",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/AFL-1.2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 12, Name   = "Academic Free License v2.0", SPDX = "AFL-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/AFL-2.0.html#licenseText"
+                    Id          = 12,
+                    Name        = "Academic Free License v2.0",
+                    SPDX        = "AFL-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/AFL-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 13, Name   = "Academic Free License v2.1", SPDX = "AFL-2.1", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/AFL-2.1.html#licenseText"
+                    Id          = 13,
+                    Name        = "Academic Free License v2.1",
+                    SPDX        = "AFL-2.1",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/AFL-2.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 14, Name   = "Academic Free License v3.0", SPDX = "AFL-3.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/AFL-3.0.html#licenseText"
+                    Id          = 14,
+                    Name        = "Academic Free License v3.0",
+                    SPDX        = "AFL-3.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/AFL-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 15, Name    = "Afmparse License", SPDX = "Afmparse", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Afmparse.html#licenseText"
+                    Id          = 15,
+                    Name        = "Afmparse License",
+                    SPDX        = "Afmparse",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Afmparse.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 16, Name = "Affero General Public License v1.0 only", SPDX = "AGPL-1.0-only",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 16,
+                    Name        = "Affero General Public License v1.0 only",
+                    SPDX        = "AGPL-1.0-only",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/AGPL-1.0-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 17, Name = "Affero General Public License v1.0 or later", SPDX = "AGPL-1.0-or-later",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 17,
+                    Name        = "Affero General Public License v1.0 or later",
+                    SPDX        = "AGPL-1.0-or-later",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/AGPL-1.0-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 18, Name = "GNU Affero General Public License v3.0 only", SPDX = "AGPL-3.0-only",
-                    FsfApproved = true, OsiApproved = true,
+                    Id          = 18,
+                    Name        = "GNU Affero General Public License v3.0 only",
+                    SPDX        = "AGPL-3.0-only",
+                    FsfApproved = true,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/AGPL-3.0-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 19, Name = "GNU Affero General Public License v3.0 or later", SPDX = "AGPL-3.0-or-later",
-                    FsfApproved = true, OsiApproved = true,
-                    Link = "https://spdx.org/licenses/AGPL-3.0-or-later.html#licenseText"
+                    Id          = 19,
+                    Name        = "GNU Affero General Public License v3.0 or later",
+                    SPDX        = "AGPL-3.0-or-later",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/AGPL-3.0-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 20, Name    = "Aladdin Free Public License", SPDX = "Aladdin", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Aladdin.html#licenseText"
+                    Id          = 20,
+                    Name        = "Aladdin Free Public License",
+                    SPDX        = "Aladdin",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Aladdin.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 21, Name    = "AMD's plpa_map.c License", SPDX = "AMDPLPA", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/AMDPLPA.html#licenseText"
+                    Id          = 21,
+                    Name        = "AMD's plpa_map.c License",
+                    SPDX        = "AMDPLPA",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/AMDPLPA.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 22, Name    = "Apple MIT License", SPDX = "AML", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/AML.html#licenseText"
+                    Id          = 22,
+                    Name        = "Apple MIT License",
+                    SPDX        = "AML",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/AML.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 23, Name = "Academy of Motion Picture Arts and Sciences BSD", SPDX = "AMPAS",
-                    FsfApproved = false, OsiApproved = false, Link = "https://spdx.org/licenses/AMPAS.html#licenseText"
+                    Id          = 23,
+                    Name        = "Academy of Motion Picture Arts and Sciences BSD",
+                    SPDX        = "AMPAS",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/AMPAS.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 24, Name    = "ANTLR Software Rights Notice", SPDX = "ANTLR-PD", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/ANTLR-PD.html#licenseText"
+                    Id          = 24,
+                    Name        = "ANTLR Software Rights Notice",
+                    SPDX        = "ANTLR-PD",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/ANTLR-PD.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 25, Name    = "Apache License 1.0", SPDX = "Apache-1.0", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Apache-1.0.html#licenseText"
+                    Id          = 25,
+                    Name        = "Apache License 1.0",
+                    SPDX        = "Apache-1.0",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Apache-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 26, Name   = "Apache License 1.1", SPDX = "Apache-1.1", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Apache-1.1.html#licenseText"
+                    Id          = 26,
+                    Name        = "Apache License 1.1",
+                    SPDX        = "Apache-1.1",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Apache-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 27, Name   = "Apache License 2.0", SPDX = "Apache-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Apache-2.0.html#licenseText"
+                    Id          = 27,
+                    Name        = "Apache License 2.0",
+                    SPDX        = "Apache-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Apache-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 28, Name    = "Adobe Postscript AFM License", SPDX = "APAFML", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/APAFML.html#licenseText"
+                    Id          = 28,
+                    Name        = "Adobe Postscript AFM License",
+                    SPDX        = "APAFML",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/APAFML.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 29, Name   = "Adaptive Public License 1.0", SPDX = "APL-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/APL-1.0.html#licenseText"
+                    Id          = 29,
+                    Name        = "Adaptive Public License 1.0",
+                    SPDX        = "APL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/APL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 30, Name = "Apple Public Source License 1.0", SPDX = "APSL-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/APSL-1.0.html#licenseText"
+                    Id          = 30,
+                    Name        = "Apple Public Source License 1.0",
+                    SPDX        = "APSL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/APSL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 31, Name = "Apple Public Source License 1.1", SPDX = "APSL-1.1", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/APSL-1.1.html#licenseText"
+                    Id          = 31,
+                    Name        = "Apple Public Source License 1.1",
+                    SPDX        = "APSL-1.1",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/APSL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 32, Name = "Apple Public Source License 1.2", SPDX = "APSL-1.2", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/APSL-1.2.html#licenseText"
+                    Id          = 32,
+                    Name        = "Apple Public Source License 1.2",
+                    SPDX        = "APSL-1.2",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/APSL-1.2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 33, Name   = "Apple Public Source License 2.0", SPDX = "APSL-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/APSL-2.0.html#licenseText"
+                    Id          = 33,
+                    Name        = "Apple Public Source License 2.0",
+                    SPDX        = "APSL-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/APSL-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 34, Name   = "Artistic License 1.0", SPDX = "Artistic-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Artistic-1.0.html#licenseText"
+                    Id          = 34,
+                    Name        = "Artistic License 1.0",
+                    SPDX        = "Artistic-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Artistic-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 35, Name = "Artistic License 1.0 w/clause 8", SPDX = "Artistic-1.0-cl8", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Artistic-1.0-cl8.html#licenseText"
+                    Id          = 35,
+                    Name        = "Artistic License 1.0 w/clause 8",
+                    SPDX        = "Artistic-1.0-cl8",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Artistic-1.0-cl8.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 36, Name = "Artistic License 1.0 (Perl)", SPDX = "Artistic-1.0-Perl", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Artistic-1.0-Perl.html#licenseText"
+                    Id          = 36,
+                    Name        = "Artistic License 1.0 (Perl)",
+                    SPDX        = "Artistic-1.0-Perl",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Artistic-1.0-Perl.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 37, Name   = "Artistic License 2.0", SPDX = "Artistic-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Artistic-2.0.html#licenseText"
+                    Id          = 37,
+                    Name        = "Artistic License 2.0",
+                    SPDX        = "Artistic-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Artistic-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 38, Name    = "Bahyph License", SPDX = "Bahyph", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Bahyph.html#licenseText"
+                    Id          = 38,
+                    Name        = "Bahyph License",
+                    SPDX        = "Bahyph",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Bahyph.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 39, Name    = "Barr License", SPDX = "Barr", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Barr.html#licenseText"
+                    Id          = 39,
+                    Name        = "Barr License",
+                    SPDX        = "Barr",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Barr.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 40, Name    = "Beerware License", SPDX = "Beerware", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Beerware.html#licenseText"
+                    Id          = 40,
+                    Name        = "Beerware License",
+                    SPDX        = "Beerware",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Beerware.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 41, Name = "BitTorrent Open Source License v1.0", SPDX = "BitTorrent-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/BitTorrent-1.0.html#licenseText"
+                    Id          = 41,
+                    Name        = "BitTorrent Open Source License v1.0",
+                    SPDX        = "BitTorrent-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BitTorrent-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 42, Name = "BitTorrent Open Source License v1.1", SPDX = "BitTorrent-1.1", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/BitTorrent-1.1.html#licenseText"
+                    Id          = 42,
+                    Name        = "BitTorrent Open Source License v1.1",
+                    SPDX        = "BitTorrent-1.1",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BitTorrent-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 43, Name    = "Borceux license", SPDX = "Borceux", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Borceux.html#licenseText"
+                    Id          = 43,
+                    Name        = "Borceux license",
+                    SPDX        = "Borceux",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Borceux.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 44, Name    = "BSD 1-Clause License", SPDX = "BSD-1-Clause", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/BSD-1-Clause.html#licenseText"
+                    Id          = 44,
+                    Name        = "BSD 1-Clause License",
+                    SPDX        = "BSD-1-Clause",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-1-Clause.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 45, Name = "BSD 2-Clause \"Simplified\" License", SPDX = "BSD-2-Clause", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/BSD-2-Clause.html#licenseText"
+                    Id          = 45,
+                    Name        = "BSD 2-Clause \"Simplified\" License",
+                    SPDX        = "BSD-2-Clause",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/BSD-2-Clause.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 46, Name = "BSD 2-Clause FreeBSD License", SPDX = "BSD-2-Clause-FreeBSD", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/BSD-2-Clause-FreeBSD.html#licenseText"
+                    Id          = 46,
+                    Name        = "BSD 2-Clause FreeBSD License",
+                    SPDX        = "BSD-2-Clause-FreeBSD",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-2-Clause-FreeBSD.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 47, Name = "BSD 2-Clause NetBSD License", SPDX = "BSD-2-Clause-NetBSD", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/BSD-2-Clause-NetBSD.html#licenseText"
+                    Id          = 47,
+                    Name        = "BSD 2-Clause NetBSD License",
+                    SPDX        = "BSD-2-Clause-NetBSD",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-2-Clause-NetBSD.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 48, Name           = "BSD-2-Clause Plus Patent License", SPDX = "BSD-2-Clause-Patent",
-                    FsfApproved = false, OsiApproved = true,
+                    Id          = 48,
+                    Name        = "BSD-2-Clause Plus Patent License",
+                    SPDX        = "BSD-2-Clause-Patent",
+                    FsfApproved = false,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/BSD-2-Clause-Patent.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 49, Name = "BSD 3-Clause \"New\" or \"Revised\" License", SPDX = "BSD-3-Clause",
-                    FsfApproved = true, OsiApproved = true,
+                    Id          = 49,
+                    Name        = "BSD 3-Clause \"New\" or \"Revised\" License",
+                    SPDX        = "BSD-3-Clause",
+                    FsfApproved = true,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/BSD-3-Clause.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 50, Name = "BSD with attribution", SPDX = "BSD-3-Clause-Attribution", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/BSD-3-Clause-Attribution.html#licenseText"
+                    Id          = 50,
+                    Name        = "BSD with attribution",
+                    SPDX        = "BSD-3-Clause-Attribution",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-3-Clause-Attribution.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 51, Name = "BSD 3-Clause Clear License", SPDX = "BSD-3-Clause-Clear", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/BSD-3-Clause-Clear.html#licenseText"
+                    Id          = 51,
+                    Name        = "BSD 3-Clause Clear License",
+                    SPDX        = "BSD-3-Clause-Clear",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-3-Clause-Clear.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 52, Name = "Lawrence Berkeley National Labs BSD variant license", SPDX = "BSD-3-Clause-LBNL",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/BSD-3-Clause-LBNL.html#licenseText"
+                    Id          = 52,
+                    Name        = "Lawrence Berkeley National Labs BSD variant license",
+                    SPDX        = "BSD-3-Clause-LBNL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-3-Clause-LBNL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 53, Name = "BSD 3-Clause No Nuclear License", SPDX = "BSD-3-Clause-No-Nuclear-License",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/BSD-3-Clause-No-Nuclear-License.html#licenseText"
+                    Id          = 53,
+                    Name        = "BSD 3-Clause No Nuclear License",
+                    SPDX        = "BSD-3-Clause-No-Nuclear-License",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-3-Clause-No-Nuclear-License.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 54, Name                                            = "BSD 3-Clause No Nuclear License 2014",
-                    SPDX = "BSD-3-Clause-No-Nuclear-License-2014", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/BSD-3-Clause-No-Nuclear-License-2014.html#licenseText"
+                    Id          = 54,
+                    Name        = "BSD 3-Clause No Nuclear License 2014",
+                    SPDX        = "BSD-3-Clause-No-Nuclear-License-2014",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-3-Clause-No-Nuclear-License-2014.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 55, Name = "BSD 3-Clause No Nuclear Warranty", SPDX = "BSD-3-Clause-No-Nuclear-Warranty",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/BSD-3-Clause-No-Nuclear-Warranty.html#licenseText"
+                    Id          = 55,
+                    Name        = "BSD 3-Clause No Nuclear Warranty",
+                    SPDX        = "BSD-3-Clause-No-Nuclear-Warranty",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-3-Clause-No-Nuclear-Warranty.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 56, Name = "BSD 4-Clause \"Original\" or \"Old\" License", SPDX = "BSD-4-Clause",
-                    FsfApproved = true, OsiApproved = false,
+                    Id          = 56,
+                    Name        = "BSD 4-Clause \"Original\" or \"Old\" License",
+                    SPDX        = "BSD-4-Clause",
+                    FsfApproved = true,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/BSD-4-Clause.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 57, Name = "BSD-4-Clause (University of California-Specific)", SPDX = "BSD-4-Clause-UC",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/BSD-4-Clause-UC.html#licenseText"
+                    Id          = 57,
+                    Name        = "BSD-4-Clause (University of California-Specific)",
+                    SPDX        = "BSD-4-Clause-UC",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-4-Clause-UC.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 58, Name    = "BSD Protection License", SPDX = "BSD-Protection", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/BSD-Protection.html#licenseText"
+                    Id          = 58,
+                    Name        = "BSD Protection License",
+                    SPDX        = "BSD-Protection",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-Protection.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 59, Name = "BSD Source Code Attribution", SPDX = "BSD-Source-Code", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/BSD-Source-Code.html#licenseText"
+                    Id          = 59,
+                    Name        = "BSD Source Code Attribution",
+                    SPDX        = "BSD-Source-Code",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/BSD-Source-Code.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 60, Name   = "Boost Software License 1.0", SPDX = "BSL-1.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/BSL-1.0.html#licenseText"
+                    Id          = 60,
+                    Name        = "Boost Software License 1.0",
+                    SPDX        = "BSL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/BSL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 61, Name = "bzip2 and libbzip2 License v1.0.5", SPDX = "bzip2-1.0.5", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/bzip2-1.0.5.html#licenseText"
+                    Id          = 61,
+                    Name        = "bzip2 and libbzip2 License v1.0.5",
+                    SPDX        = "bzip2-1.0.5",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/bzip2-1.0.5.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 62, Name = "bzip2 and libbzip2 License v1.0.6", SPDX = "bzip2-1.0.6", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/bzip2-1.0.6.html#licenseText"
+                    Id          = 62,
+                    Name        = "bzip2 and libbzip2 License v1.0.6",
+                    SPDX        = "bzip2-1.0.6",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/bzip2-1.0.6.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 63, Name    = "Caldera License", SPDX = "Caldera", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Caldera.html#licenseText"
+                    Id          = 63,
+                    Name        = "Caldera License",
+                    SPDX        = "Caldera",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Caldera.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 64, Name = "Computer Associates Trusted Open Source License 1.1", SPDX = "CATOSL-1.1",
-                    FsfApproved = false, OsiApproved = true,
+                    Id          = 64,
+                    Name        = "Computer Associates Trusted Open Source License 1.1",
+                    SPDX        = "CATOSL-1.1",
+                    FsfApproved = false,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/CATOSL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 65, Name = "Creative Commons Attribution 1.0 Generic", SPDX = "CC-BY-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CC-BY-1.0.html#licenseText"
+                    Id          = 65,
+                    Name        = "Creative Commons Attribution 1.0 Generic",
+                    SPDX        = "CC-BY-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 66, Name = "Creative Commons Attribution 2.0 Generic", SPDX = "CC-BY-2.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CC-BY-2.0.html#licenseText"
+                    Id          = 66,
+                    Name        = "Creative Commons Attribution 2.0 Generic",
+                    SPDX        = "CC-BY-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 67, Name = "Creative Commons Attribution 2.5 Generic", SPDX = "CC-BY-2.5", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CC-BY-2.5.html#licenseText"
+                    Id          = 67,
+                    Name        = "Creative Commons Attribution 2.5 Generic",
+                    SPDX        = "CC-BY-2.5",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-2.5.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 68, Name           = "Creative Commons Attribution 3.0 Unported", SPDX = "CC-BY-3.0",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 68,
+                    Name        = "Creative Commons Attribution 3.0 Unported",
+                    SPDX        = "CC-BY-3.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/CC-BY-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 69, Name = "Creative Commons Attribution 4.0 International", SPDX = "CC-BY-4.0",
-                    FsfApproved = true, OsiApproved = false,
+                    Id          = 69,
+                    Name        = "Creative Commons Attribution 4.0 International",
+                    SPDX        = "CC-BY-4.0",
+                    FsfApproved = true,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/CC-BY-4.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 70, Name = "Creative Commons Attribution Non Commercial 1.0 Generic", SPDX = "CC-BY-NC-1.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-1.0.html#licenseText"
+                    Id          = 70,
+                    Name        = "Creative Commons Attribution Non Commercial 1.0 Generic",
+                    SPDX        = "CC-BY-NC-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 71, Name = "Creative Commons Attribution Non Commercial 2.0 Generic", SPDX = "CC-BY-NC-2.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-2.0.html#licenseText"
+                    Id          = 71,
+                    Name        = "Creative Commons Attribution Non Commercial 2.0 Generic",
+                    SPDX        = "CC-BY-NC-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 72, Name = "Creative Commons Attribution Non Commercial 2.5 Generic", SPDX = "CC-BY-NC-2.5",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-2.5.html#licenseText"
+                    Id          = 72,
+                    Name        = "Creative Commons Attribution Non Commercial 2.5 Generic",
+                    SPDX        = "CC-BY-NC-2.5",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-2.5.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 73, Name = "Creative Commons Attribution Non Commercial 3.0 Unported", SPDX = "CC-BY-NC-3.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-3.0.html#licenseText"
+                    Id          = 73,
+                    Name        = "Creative Commons Attribution Non Commercial 3.0 Unported",
+                    SPDX        = "CC-BY-NC-3.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 74, Name = "Creative Commons Attribution Non Commercial 4.0 International",
-                    SPDX = "CC-BY-NC-4.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-4.0.html#licenseText"
+                    Id          = 74,
+                    Name        = "Creative Commons Attribution Non Commercial 4.0 International",
+                    SPDX        = "CC-BY-NC-4.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-4.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 75, Name = "Creative Commons Attribution Non Commercial No Derivatives 1.0 Generic",
-                    SPDX = "CC-BY-NC-ND-1.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-ND-1.0.html#licenseText"
+                    Id          = 75,
+                    Name        = "Creative Commons Attribution Non Commercial No Derivatives 1.0 Generic",
+                    SPDX        = "CC-BY-NC-ND-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-ND-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 76, Name = "Creative Commons Attribution Non Commercial No Derivatives 2.0 Generic",
-                    SPDX = "CC-BY-NC-ND-2.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-ND-2.0.html#licenseText"
+                    Id          = 76,
+                    Name        = "Creative Commons Attribution Non Commercial No Derivatives 2.0 Generic",
+                    SPDX        = "CC-BY-NC-ND-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-ND-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 77, Name = "Creative Commons Attribution Non Commercial No Derivatives 2.5 Generic",
-                    SPDX = "CC-BY-NC-ND-2.5", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-ND-2.5.html#licenseText"
+                    Id          = 77,
+                    Name        = "Creative Commons Attribution Non Commercial No Derivatives 2.5 Generic",
+                    SPDX        = "CC-BY-NC-ND-2.5",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-ND-2.5.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 78, Name = "Creative Commons Attribution Non Commercial No Derivatives 3.0 Unported",
-                    SPDX = "CC-BY-NC-ND-3.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-ND-3.0.html#licenseText"
+                    Id          = 78,
+                    Name        = "Creative Commons Attribution Non Commercial No Derivatives 3.0 Unported",
+                    SPDX        = "CC-BY-NC-ND-3.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-ND-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 79, Name = "Creative Commons Attribution Non Commercial No Derivatives 4.0 International",
-                    SPDX = "CC-BY-NC-ND-4.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-ND-4.0.html#licenseText"
+                    Id          = 79,
+                    Name        = "Creative Commons Attribution Non Commercial No Derivatives 4.0 International",
+                    SPDX        = "CC-BY-NC-ND-4.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-ND-4.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 80, Name = "Creative Commons Attribution Non Commercial Share Alike 1.0 Generic",
-                    SPDX = "CC-BY-NC-SA-1.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-SA-1.0.html#licenseText"
+                    Id          = 80,
+                    Name        = "Creative Commons Attribution Non Commercial Share Alike 1.0 Generic",
+                    SPDX        = "CC-BY-NC-SA-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-SA-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 81, Name = "Creative Commons Attribution Non Commercial Share Alike 2.0 Generic",
-                    SPDX = "CC-BY-NC-SA-2.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-SA-2.0.html#licenseText"
+                    Id          = 81,
+                    Name        = "Creative Commons Attribution Non Commercial Share Alike 2.0 Generic",
+                    SPDX        = "CC-BY-NC-SA-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-SA-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 82, Name = "Creative Commons Attribution Non Commercial Share Alike 2.5 Generic",
-                    SPDX = "CC-BY-NC-SA-2.5", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-SA-2.5.html#licenseText"
+                    Id          = 82,
+                    Name        = "Creative Commons Attribution Non Commercial Share Alike 2.5 Generic",
+                    SPDX        = "CC-BY-NC-SA-2.5",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-SA-2.5.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 83, Name = "Creative Commons Attribution Non Commercial Share Alike 3.0 Unported",
-                    SPDX = "CC-BY-NC-SA-3.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-SA-3.0.html#licenseText"
+                    Id          = 83,
+                    Name        = "Creative Commons Attribution Non Commercial Share Alike 3.0 Unported",
+                    SPDX        = "CC-BY-NC-SA-3.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-SA-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 84, Name = "Creative Commons Attribution Non Commercial Share Alike 4.0 International",
-                    SPDX = "CC-BY-NC-SA-4.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-NC-SA-4.0.html#licenseText"
+                    Id          = 84,
+                    Name        = "Creative Commons Attribution Non Commercial Share Alike 4.0 International",
+                    SPDX        = "CC-BY-NC-SA-4.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-NC-SA-4.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 85, Name = "Creative Commons Attribution No Derivatives 1.0 Generic", SPDX = "CC-BY-ND-1.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-ND-1.0.html#licenseText"
+                    Id          = 85,
+                    Name        = "Creative Commons Attribution No Derivatives 1.0 Generic",
+                    SPDX        = "CC-BY-ND-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-ND-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 86, Name = "Creative Commons Attribution No Derivatives 2.0 Generic", SPDX = "CC-BY-ND-2.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-ND-2.0.html#licenseText"
+                    Id          = 86,
+                    Name        = "Creative Commons Attribution No Derivatives 2.0 Generic",
+                    SPDX        = "CC-BY-ND-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-ND-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 87, Name = "Creative Commons Attribution No Derivatives 2.5 Generic", SPDX = "CC-BY-ND-2.5",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-ND-2.5.html#licenseText"
+                    Id          = 87,
+                    Name        = "Creative Commons Attribution No Derivatives 2.5 Generic",
+                    SPDX        = "CC-BY-ND-2.5",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-ND-2.5.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 88, Name = "Creative Commons Attribution No Derivatives 3.0 Unported", SPDX = "CC-BY-ND-3.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-ND-3.0.html#licenseText"
+                    Id          = 88,
+                    Name        = "Creative Commons Attribution No Derivatives 3.0 Unported",
+                    SPDX        = "CC-BY-ND-3.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-ND-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 89, Name = "Creative Commons Attribution No Derivatives 4.0 International",
-                    SPDX = "CC-BY-ND-4.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-ND-4.0.html#licenseText"
+                    Id          = 89,
+                    Name        = "Creative Commons Attribution No Derivatives 4.0 International",
+                    SPDX        = "CC-BY-ND-4.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-ND-4.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 90, Name = "Creative Commons Attribution Share Alike 1.0 Generic", SPDX = "CC-BY-SA-1.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-SA-1.0.html#licenseText"
+                    Id          = 90,
+                    Name        = "Creative Commons Attribution Share Alike 1.0 Generic",
+                    SPDX        = "CC-BY-SA-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-SA-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 91, Name = "Creative Commons Attribution Share Alike 2.0 Generic", SPDX = "CC-BY-SA-2.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-SA-2.0.html#licenseText"
+                    Id          = 91,
+                    Name        = "Creative Commons Attribution Share Alike 2.0 Generic",
+                    SPDX        = "CC-BY-SA-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-SA-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 92, Name = "Creative Commons Attribution Share Alike 2.5 Generic", SPDX = "CC-BY-SA-2.5",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-SA-2.5.html#licenseText"
+                    Id          = 92,
+                    Name        = "Creative Commons Attribution Share Alike 2.5 Generic",
+                    SPDX        = "CC-BY-SA-2.5",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-SA-2.5.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 93, Name = "Creative Commons Attribution Share Alike 3.0 Unported", SPDX = "CC-BY-SA-3.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-SA-3.0.html#licenseText"
+                    Id          = 93,
+                    Name        = "Creative Commons Attribution Share Alike 3.0 Unported",
+                    SPDX        = "CC-BY-SA-3.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-SA-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 94, Name = "Creative Commons Attribution Share Alike 4.0 International", SPDX = "CC-BY-SA-4.0",
-                    FsfApproved = true, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CC-BY-SA-4.0.html#licenseText"
+                    Id          = 94,
+                    Name        = "Creative Commons Attribution Share Alike 4.0 International",
+                    SPDX        = "CC-BY-SA-4.0",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC-BY-SA-4.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 95, Name = "Creative Commons Zero v1.0 Universal", SPDX = "CC0-1.0", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CC0-1.0.html#licenseText"
+                    Id          = 95,
+                    Name        = "Creative Commons Zero v1.0 Universal",
+                    SPDX        = "CC0-1.0",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CC0-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 96, Name = "Common Development and Distribution License 1.0", SPDX = "CDDL-1.0",
-                    FsfApproved = true, OsiApproved = true, Link = "https://spdx.org/licenses/CDDL-1.0.html#licenseText"
+                    Id          = 96,
+                    Name        = "Common Development and Distribution License 1.0",
+                    SPDX        = "CDDL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/CDDL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 97, Name = "Common Development and Distribution License 1.1", SPDX = "CDDL-1.1",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 97,
+                    Name        = "Common Development and Distribution License 1.1",
+                    SPDX        = "CDDL-1.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/CDDL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 98, Name = "Community Data License Agreement Permissive 1.0", SPDX = "CDLA-Permissive-1.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CDLA-Permissive-1.0.html#licenseText"
+                    Id          = 98,
+                    Name        = "Community Data License Agreement Permissive 1.0",
+                    SPDX        = "CDLA-Permissive-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CDLA-Permissive-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 99, Name = "Community Data License Agreement Sharing 1.0", SPDX = "CDLA-Sharing-1.0",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 99,
+                    Name        = "Community Data License Agreement Sharing 1.0",
+                    SPDX        = "CDLA-Sharing-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/CDLA-Sharing-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 100, Name = "CeCILL Free Software License Agreement v1.0", SPDX = "CECILL-1.0",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 100,
+                    Name        = "CeCILL Free Software License Agreement v1.0",
+                    SPDX        = "CECILL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/CECILL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 101, Name = "CeCILL Free Software License Agreement v1.1", SPDX = "CECILL-1.1",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 101,
+                    Name        = "CeCILL Free Software License Agreement v1.1",
+                    SPDX        = "CECILL-1.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/CECILL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 102, Name = "CeCILL Free Software License Agreement v2.0", SPDX = "CECILL-2.0",
-                    FsfApproved = true, OsiApproved = false,
+                    Id          = 102,
+                    Name        = "CeCILL Free Software License Agreement v2.0",
+                    SPDX        = "CECILL-2.0",
+                    FsfApproved = true,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/CECILL-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 103, Name = "CeCILL Free Software License Agreement v2.1", SPDX = "CECILL-2.1",
-                    FsfApproved = false, OsiApproved = true,
+                    Id          = 103,
+                    Name        = "CeCILL Free Software License Agreement v2.1",
+                    SPDX        = "CECILL-2.1",
+                    FsfApproved = false,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/CECILL-2.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 104, Name = "CeCILL-B Free Software License Agreement", SPDX = "CECILL-B", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CECILL-B.html#licenseText"
+                    Id          = 104,
+                    Name        = "CeCILL-B Free Software License Agreement",
+                    SPDX        = "CECILL-B",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CECILL-B.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 105, Name = "CeCILL-C Free Software License Agreement", SPDX = "CECILL-C", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CECILL-C.html#licenseText"
+                    Id          = 105,
+                    Name        = "CeCILL-C Free Software License Agreement",
+                    SPDX        = "CECILL-C",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CECILL-C.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 106, Name = "CERN Open Hardware License v1.1", SPDX = "CERN-OHL-1.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CERN-OHL-1.1.html#licenseText"
+                    Id          = 106,
+                    Name        = "CERN Open Hardware License v1.1",
+                    SPDX        = "CERN-OHL-1.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CERN-OHL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 107, Name = "CERN Open Hardware Licence v1.2", SPDX = "CERN-OHL-1.2", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CERN-OHL-1.2.html#licenseText"
+                    Id          = 107,
+                    Name        = "CERN Open Hardware Licence v1.2",
+                    SPDX        = "CERN-OHL-1.2",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CERN-OHL-1.2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 108, Name   = "Clarified Artistic License", SPDX = "ClArtistic", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/ClArtistic.html#licenseText"
+                    Id          = 108,
+                    Name        = "Clarified Artistic License",
+                    SPDX        = "ClArtistic",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/ClArtistic.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 109, Name   = "CNRI Jython License", SPDX = "CNRI-Jython", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CNRI-Jython.html#licenseText"
+                    Id          = 109,
+                    Name        = "CNRI Jython License",
+                    SPDX        = "CNRI-Jython",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CNRI-Jython.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 110, Name  = "CNRI Python License", SPDX = "CNRI-Python", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/CNRI-Python.html#licenseText"
+                    Id          = 110,
+                    Name        = "CNRI Python License",
+                    SPDX        = "CNRI-Python",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/CNRI-Python.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 111, Name = "CNRI Python Open Source GPL Compatible License Agreement",
-                    SPDX = "CNRI-Python-GPL-Compatible", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CNRI-Python-GPL-Compatible.html#licenseText"
+                    Id          = 111,
+                    Name        = "CNRI Python Open Source GPL Compatible License Agreement",
+                    SPDX        = "CNRI-Python-GPL-Compatible",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CNRI-Python-GPL-Compatible.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 112, Name   = "Condor Public License v1.1", SPDX = "Condor-1.1", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Condor-1.1.html#licenseText"
+                    Id          = 112,
+                    Name        = "Condor Public License v1.1",
+                    SPDX        = "Condor-1.1",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Condor-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 113, Name = "copyleft-next 0.3.0", SPDX = "copyleft-next-0.3.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/copyleft-next-0.3.0.html#licenseText"
+                    Id          = 113,
+                    Name        = "copyleft-next 0.3.0",
+                    SPDX        = "copyleft-next-0.3.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/copyleft-next-0.3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 114, Name = "copyleft-next 0.3.1", SPDX = "copyleft-next-0.3.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/copyleft-next-0.3.1.html#licenseText"
+                    Id          = 114,
+                    Name        = "copyleft-next 0.3.1",
+                    SPDX        = "copyleft-next-0.3.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/copyleft-next-0.3.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 115, Name = "Common Public Attribution License 1.0", SPDX = "CPAL-1.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/CPAL-1.0.html#licenseText"
+                    Id          = 115,
+                    Name        = "Common Public Attribution License 1.0",
+                    SPDX        = "CPAL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/CPAL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 116, Name  = "Common Public License 1.0", SPDX = "CPL-1.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/CPL-1.0.html#licenseText"
+                    Id          = 116,
+                    Name        = "Common Public License 1.0",
+                    SPDX        = "CPL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/CPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 117, Name = "Code Project Open License 1.02", SPDX = "CPOL-1.02", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CPOL-1.02.html#licenseText"
+                    Id          = 117,
+                    Name        = "Code Project Open License 1.02",
+                    SPDX        = "CPOL-1.02",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CPOL-1.02.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 118, Name   = "Crossword License", SPDX = "Crossword", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Crossword.html#licenseText"
+                    Id          = 118,
+                    Name        = "Crossword License",
+                    SPDX        = "Crossword",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Crossword.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 119, Name   = "CrystalStacker License", SPDX = "CrystalStacker", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CrystalStacker.html#licenseText"
+                    Id          = 119,
+                    Name        = "CrystalStacker License",
+                    SPDX        = "CrystalStacker",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CrystalStacker.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 120, Name = "CUA Office Public License v1.0", SPDX = "CUA-OPL-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/CUA-OPL-1.0.html#licenseText"
+                    Id          = 120,
+                    Name        = "CUA Office Public License v1.0",
+                    SPDX        = "CUA-OPL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/CUA-OPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 121, Name   = "Cube License", SPDX = "Cube", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Cube.html#licenseText"
+                    Id          = 121,
+                    Name        = "Cube License",
+                    SPDX        = "Cube",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Cube.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 122, Name   = "curl License", SPDX = "curl", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/curl.html#licenseText"
+                    Id          = 122,
+                    Name        = "curl License",
+                    SPDX        = "curl",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/curl.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 123, Name = "Deutsche Freie Software Lizenz", SPDX = "D-FSL-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/D-FSL-1.0.html#licenseText"
+                    Id          = 123,
+                    Name        = "Deutsche Freie Software Lizenz",
+                    SPDX        = "D-FSL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/D-FSL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 124, Name   = "diffmark license", SPDX = "diffmark", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/diffmark.html#licenseText"
+                    Id          = 124,
+                    Name        = "diffmark license",
+                    SPDX        = "diffmark",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/diffmark.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 125, Name   = "DOC License", SPDX = "DOC", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/DOC.html#licenseText"
+                    Id          = 125,
+                    Name        = "DOC License",
+                    SPDX        = "DOC",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/DOC.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 126, Name   = "Dotseqn License", SPDX = "Dotseqn", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Dotseqn.html#licenseText"
+                    Id          = 126,
+                    Name        = "Dotseqn License",
+                    SPDX        = "Dotseqn",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Dotseqn.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 127, Name   = "DSDP License", SPDX = "DSDP", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/DSDP.html#licenseText"
+                    Id          = 127,
+                    Name        = "DSDP License",
+                    SPDX        = "DSDP",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/DSDP.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 128, Name   = "dvipdfm License", SPDX = "dvipdfm", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/dvipdfm.html#licenseText"
+                    Id          = 128,
+                    Name        = "dvipdfm License",
+                    SPDX        = "dvipdfm",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/dvipdfm.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 129, Name = "Educational Community License v1.0", SPDX = "ECL-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/ECL-1.0.html#licenseText"
+                    Id          = 129,
+                    Name        = "Educational Community License v1.0",
+                    SPDX        = "ECL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/ECL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 130, Name = "Educational Community License v2.0", SPDX = "ECL-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/ECL-2.0.html#licenseText"
+                    Id          = 130,
+                    Name        = "Educational Community License v2.0",
+                    SPDX        = "ECL-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/ECL-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 131, Name  = "Eiffel Forum License v1.0", SPDX = "EFL-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/EFL-1.0.html#licenseText"
+                    Id          = 131,
+                    Name        = "Eiffel Forum License v1.0",
+                    SPDX        = "EFL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/EFL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 132, Name  = "Eiffel Forum License v2.0", SPDX = "EFL-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/EFL-2.0.html#licenseText"
+                    Id          = 132,
+                    Name        = "Eiffel Forum License v2.0",
+                    SPDX        = "EFL-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/EFL-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 133, Name   = "eGenix.com Public License 1.1.0", SPDX = "eGenix", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/eGenix.html#licenseText"
+                    Id          = 133,
+                    Name        = "eGenix.com Public License 1.1.0",
+                    SPDX        = "eGenix",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/eGenix.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 134, Name  = "Entessa Public License v1.0", SPDX = "Entessa", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Entessa.html#licenseText"
+                    Id          = 134,
+                    Name        = "Entessa Public License v1.0",
+                    SPDX        = "Entessa",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Entessa.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 135, Name  = "Eclipse Public License 1.0", SPDX = "EPL-1.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/EPL-1.0.html#licenseText"
+                    Id          = 135,
+                    Name        = "Eclipse Public License 1.0",
+                    SPDX        = "EPL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/EPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 136, Name  = "Eclipse Public License 2.0", SPDX = "EPL-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/EPL-2.0.html#licenseText"
+                    Id          = 136,
+                    Name        = "Eclipse Public License 2.0",
+                    SPDX        = "EPL-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/EPL-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 137, Name   = "Erlang Public License v1.1", SPDX = "ErlPL-1.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/ErlPL-1.1.html#licenseText"
+                    Id          = 137,
+                    Name        = "Erlang Public License v1.1",
+                    SPDX        = "ErlPL-1.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/ErlPL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 138, Name  = "EU DataGrid Software License", SPDX = "EUDatagrid", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/EUDatagrid.html#licenseText"
+                    Id          = 138,
+                    Name        = "EU DataGrid Software License",
+                    SPDX        = "EUDatagrid",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/EUDatagrid.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 139, Name = "European Union Public License 1.0", SPDX = "EUPL-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/EUPL-1.0.html#licenseText"
+                    Id          = 139,
+                    Name        = "European Union Public License 1.0",
+                    SPDX        = "EUPL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/EUPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 140, Name = "European Union Public License 1.1", SPDX = "EUPL-1.1", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/EUPL-1.1.html#licenseText"
+                    Id          = 140,
+                    Name        = "European Union Public License 1.1",
+                    SPDX        = "EUPL-1.1",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/EUPL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 141, Name = "European Union Public License 1.2", SPDX = "EUPL-1.2", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/EUPL-1.2.html#licenseText"
+                    Id          = 141,
+                    Name        = "European Union Public License 1.2",
+                    SPDX        = "EUPL-1.2",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/EUPL-1.2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 142, Name   = "Eurosym License", SPDX = "Eurosym", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Eurosym.html#licenseText"
+                    Id          = 142,
+                    Name        = "Eurosym License",
+                    SPDX        = "Eurosym",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Eurosym.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 143, Name  = "Fair License", SPDX = "Fair", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Fair.html#licenseText"
+                    Id          = 143,
+                    Name        = "Fair License",
+                    SPDX        = "Fair",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Fair.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 144, Name = "Frameworx Open License 1.0", SPDX = "Frameworx-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Frameworx-1.0.html#licenseText"
+                    Id          = 144,
+                    Name        = "Frameworx Open License 1.0",
+                    SPDX        = "Frameworx-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Frameworx-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 145, Name = "FreeImage Public License v1.0", SPDX = "FreeImage", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/FreeImage.html#licenseText"
+                    Id          = 145,
+                    Name        = "FreeImage Public License v1.0",
+                    SPDX        = "FreeImage",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/FreeImage.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 146, Name   = "FSF All Permissive License", SPDX = "FSFAP", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/FSFAP.html#licenseText"
+                    Id          = 146,
+                    Name        = "FSF All Permissive License",
+                    SPDX        = "FSFAP",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/FSFAP.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 147, Name   = "FSF Unlimited License", SPDX = "FSFUL", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/FSFUL.html#licenseText"
+                    Id          = 147,
+                    Name        = "FSF Unlimited License",
+                    SPDX        = "FSFUL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/FSFUL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 148, Name = "FSF Unlimited License (with License Retention)", SPDX = "FSFULLR",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 148,
+                    Name        = "FSF Unlimited License (with License Retention)",
+                    SPDX        = "FSFULLR",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/FSFULLR.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 149, Name   = "Freetype Project License", SPDX = "FTL", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/FTL.html#licenseText"
+                    Id          = 149,
+                    Name        = "Freetype Project License",
+                    SPDX        = "FTL",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/FTL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 150, Name = "GNU Free Documentation License v1.1 only", SPDX = "GFDL-1.1-only",
-                    FsfApproved = true, OsiApproved = false,
+                    Id          = 150,
+                    Name        = "GNU Free Documentation License v1.1 only",
+                    SPDX        = "GFDL-1.1-only",
+                    FsfApproved = true,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/GFDL-1.1-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 151, Name = "GNU Free Documentation License v1.1 or later", SPDX = "GFDL-1.1-or-later",
-                    FsfApproved = true, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/GFDL-1.1-or-later.html#licenseText"
+                    Id          = 151,
+                    Name        = "GNU Free Documentation License v1.1 or later",
+                    SPDX        = "GFDL-1.1-or-later",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/GFDL-1.1-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 152, Name = "GNU Free Documentation License v1.2 only", SPDX = "GFDL-1.2-only",
-                    FsfApproved = true, OsiApproved = false,
+                    Id          = 152,
+                    Name        = "GNU Free Documentation License v1.2 only",
+                    SPDX        = "GFDL-1.2-only",
+                    FsfApproved = true,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/GFDL-1.2-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 153, Name = "GNU Free Documentation License v1.2 or later", SPDX = "GFDL-1.2-or-later",
-                    FsfApproved = true, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/GFDL-1.2-or-later.html#licenseText"
+                    Id          = 153,
+                    Name        = "GNU Free Documentation License v1.2 or later",
+                    SPDX        = "GFDL-1.2-or-later",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/GFDL-1.2-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 154, Name = "GNU Free Documentation License v1.3 only", SPDX = "GFDL-1.3-only",
-                    FsfApproved = true, OsiApproved = false,
+                    Id          = 154,
+                    Name        = "GNU Free Documentation License v1.3 only",
+                    SPDX        = "GFDL-1.3-only",
+                    FsfApproved = true,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/GFDL-1.3-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 155, Name = "GNU Free Documentation License v1.3 or later", SPDX = "GFDL-1.3-or-later",
-                    FsfApproved = true, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/GFDL-1.3-or-later.html#licenseText"
+                    Id          = 155,
+                    Name        = "GNU Free Documentation License v1.3 or later",
+                    SPDX        = "GFDL-1.3-or-later",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/GFDL-1.3-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 156, Name   = "Giftware License", SPDX = "Giftware", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Giftware.html#licenseText"
+                    Id          = 156,
+                    Name        = "Giftware License",
+                    SPDX        = "Giftware",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Giftware.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 157, Name   = "GL2PS License", SPDX = "GL2PS", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/GL2PS.html#licenseText"
+                    Id          = 157,
+                    Name        = "GL2PS License",
+                    SPDX        = "GL2PS",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/GL2PS.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 158, Name   = "3dfx Glide License", SPDX = "Glide", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Glide.html#licenseText"
+                    Id          = 158,
+                    Name        = "3dfx Glide License",
+                    SPDX        = "Glide",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Glide.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 159, Name   = "Glulxe License", SPDX = "Glulxe", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Glulxe.html#licenseText"
+                    Id          = 159,
+                    Name        = "Glulxe License",
+                    SPDX        = "Glulxe",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Glulxe.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 160, Name   = "gnuplot License", SPDX = "gnuplot", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/gnuplot.html#licenseText"
+                    Id          = 160,
+                    Name        = "gnuplot License",
+                    SPDX        = "gnuplot",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/gnuplot.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 161, Name = "GNU General Public License v1.0 only", SPDX = "GPL-1.0-only", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/GPL-1.0-only.html#licenseText"
+                    Id          = 161,
+                    Name        = "GNU General Public License v1.0 only",
+                    SPDX        = "GPL-1.0-only",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/GPL-1.0-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 162, Name = "GNU General Public License v1.0 or later", SPDX = "GPL-1.0-or-later",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 162,
+                    Name        = "GNU General Public License v1.0 or later",
+                    SPDX        = "GPL-1.0-or-later",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/GPL-1.0-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 163, Name = "GNU General Public License v2.0 only", SPDX = "GPL-2.0-only", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/GPL-2.0-only.html#licenseText"
+                    Id          = 163,
+                    Name        = "GNU General Public License v2.0 only",
+                    SPDX        = "GPL-2.0-only",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/GPL-2.0-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 164, Name = "GNU General Public License v2.0 or later", SPDX = "GPL-2.0-or-later",
-                    FsfApproved = true, OsiApproved = true,
+                    Id          = 164,
+                    Name        = "GNU General Public License v2.0 or later",
+                    SPDX        = "GPL-2.0-or-later",
+                    FsfApproved = true,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/GPL-2.0-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 165, Name = "GNU General Public License v3.0 only", SPDX = "GPL-3.0-only", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/GPL-3.0-only.html#licenseText"
+                    Id          = 165,
+                    Name        = "GNU General Public License v3.0 only",
+                    SPDX        = "GPL-3.0-only",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/GPL-3.0-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 166, Name = "GNU General Public License v3.0 or later", SPDX = "GPL-3.0-or-later",
-                    FsfApproved = true, OsiApproved = true,
+                    Id          = 166,
+                    Name        = "GNU General Public License v3.0 or later",
+                    SPDX        = "GPL-3.0-or-later",
+                    FsfApproved = true,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/GPL-3.0-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 167, Name   = "gSOAP Public License v1.3b", SPDX = "gSOAP-1.3b", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/gSOAP-1.3b.html#licenseText"
+                    Id          = 167,
+                    Name        = "gSOAP Public License v1.3b",
+                    SPDX        = "gSOAP-1.3b",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/gSOAP-1.3b.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 168, Name = "Haskell Language Report License", SPDX = "HaskellReport", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/HaskellReport.html#licenseText"
+                    Id          = 168,
+                    Name        = "Haskell Language Report License",
+                    SPDX        = "HaskellReport",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/HaskellReport.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 169, Name = "Historical Permission Notice and Disclaimer", SPDX = "HPND", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/HPND.html#licenseText"
+                    Id          = 169,
+                    Name        = "Historical Permission Notice and Disclaimer",
+                    SPDX        = "HPND",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/HPND.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 170, Name = "Historical Permission Notice and Disclaimer - sell variant",
-                    SPDX = "HPND-sell-variant", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/HPND-sell-variant.html#licenseText"
+                    Id          = 170,
+                    Name        = "Historical Permission Notice and Disclaimer - sell variant",
+                    SPDX        = "HPND-sell-variant",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/HPND-sell-variant.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 171, Name = "IBM PowerPC Initialization and Boot Software", SPDX = "IBM-pibs",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 171,
+                    Name        = "IBM PowerPC Initialization and Boot Software",
+                    SPDX        = "IBM-pibs",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/IBM-pibs.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 172, Name   = "ICU License", SPDX = "ICU", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/ICU.html#licenseText"
+                    Id          = 172,
+                    Name        = "ICU License",
+                    SPDX        = "ICU",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/ICU.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 173, Name   = "Independent JPEG Group License", SPDX = "IJG", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/IJG.html#licenseText"
+                    Id          = 173,
+                    Name        = "Independent JPEG Group License",
+                    SPDX        = "IJG",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/IJG.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 174, Name   = "ImageMagick License", SPDX = "ImageMagick", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/ImageMagick.html#licenseText"
+                    Id          = 174,
+                    Name        = "ImageMagick License",
+                    SPDX        = "ImageMagick",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/ImageMagick.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 175, Name = "iMatix Standard Function Library Agreement", SPDX = "iMatix", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/iMatix.html#licenseText"
+                    Id          = 175,
+                    Name        = "iMatix Standard Function Library Agreement",
+                    SPDX        = "iMatix",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/iMatix.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 176, Name   = "Imlib2 License", SPDX = "Imlib2", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Imlib2.html#licenseText"
+                    Id          = 176,
+                    Name        = "Imlib2 License",
+                    SPDX        = "Imlib2",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Imlib2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 177, Name   = "Info-ZIP License", SPDX = "Info-ZIP", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Info-ZIP.html#licenseText"
+                    Id          = 177,
+                    Name        = "Info-ZIP License",
+                    SPDX        = "Info-ZIP",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Info-ZIP.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 178, Name  = "Intel Open Source License", SPDX = "Intel", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Intel.html#licenseText"
+                    Id          = 178,
+                    Name        = "Intel Open Source License",
+                    SPDX        = "Intel",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Intel.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 179, Name = "Intel ACPI Software License Agreement", SPDX = "Intel-ACPI", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Intel-ACPI.html#licenseText"
+                    Id          = 179,
+                    Name        = "Intel ACPI Software License Agreement",
+                    SPDX        = "Intel-ACPI",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Intel-ACPI.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 180, Name = "Interbase Public License v1.0", SPDX = "Interbase-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Interbase-1.0.html#licenseText"
+                    Id          = 180,
+                    Name        = "Interbase Public License v1.0",
+                    SPDX        = "Interbase-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Interbase-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 181, Name  = "IPA Font License", SPDX = "IPA", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/IPA.html#licenseText"
+                    Id          = 181,
+                    Name        = "IPA Font License",
+                    SPDX        = "IPA",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/IPA.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 182, Name  = "IBM Public License v1.0", SPDX = "IPL-1.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/IPL-1.0.html#licenseText"
+                    Id          = 182,
+                    Name        = "IBM Public License v1.0",
+                    SPDX        = "IPL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/IPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 183, Name  = "ISC License", SPDX = "ISC", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/ISC.html#licenseText"
+                    Id          = 183,
+                    Name        = "ISC License",
+                    SPDX        = "ISC",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/ISC.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 184, Name   = "JasPer License", SPDX = "JasPer-2.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/JasPer-2.0.html#licenseText"
+                    Id          = 184,
+                    Name        = "JasPer License",
+                    SPDX        = "JasPer-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/JasPer-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 185, Name = "Japan Network Information Center License", SPDX = "JPNIC", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/JPNIC.html#licenseText"
+                    Id          = 185,
+                    Name        = "Japan Network Information Center License",
+                    SPDX        = "JPNIC",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/JPNIC.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 186, Name   = "JSON License", SPDX = "JSON", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/JSON.html#licenseText"
+                    Id          = 186,
+                    Name        = "JSON License",
+                    SPDX        = "JSON",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/JSON.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 187, Name   = "Licence Art Libre 1.2", SPDX = "LAL-1.2", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/LAL-1.2.html#licenseText"
+                    Id          = 187,
+                    Name        = "Licence Art Libre 1.2",
+                    SPDX        = "LAL-1.2",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/LAL-1.2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 188, Name   = "Licence Art Libre 1.3", SPDX = "LAL-1.3", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/LAL-1.3.html#licenseText"
+                    Id          = 188,
+                    Name        = "Licence Art Libre 1.3",
+                    SPDX        = "LAL-1.3",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/LAL-1.3.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 189, Name   = "Latex2e License", SPDX = "Latex2e", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Latex2e.html#licenseText"
+                    Id          = 189,
+                    Name        = "Latex2e License",
+                    SPDX        = "Latex2e",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Latex2e.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 190, Name   = "Leptonica License", SPDX = "Leptonica", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Leptonica.html#licenseText"
+                    Id          = 190,
+                    Name        = "Leptonica License",
+                    SPDX        = "Leptonica",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Leptonica.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 191, Name = "GNU Library General Public License v2 only", SPDX = "LGPL-2.0-only",
-                    FsfApproved = false, OsiApproved = true,
+                    Id          = 191,
+                    Name        = "GNU Library General Public License v2 only",
+                    SPDX        = "LGPL-2.0-only",
+                    FsfApproved = false,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/LGPL-2.0-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 192, Name = "GNU Library General Public License v2 or later", SPDX = "LGPL-2.0-or-later",
-                    FsfApproved = false, OsiApproved = true,
-                    Link = "https://spdx.org/licenses/LGPL-2.0-or-later.html#licenseText"
+                    Id          = 192,
+                    Name        = "GNU Library General Public License v2 or later",
+                    SPDX        = "LGPL-2.0-or-later",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/LGPL-2.0-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 193, Name = "GNU Lesser General Public License v2.1 only", SPDX = "LGPL-2.1-only",
-                    FsfApproved = true, OsiApproved = true,
+                    Id          = 193,
+                    Name        = "GNU Lesser General Public License v2.1 only",
+                    SPDX        = "LGPL-2.1-only",
+                    FsfApproved = true,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/LGPL-2.1-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 194, Name = "GNU Lesser General Public License v2.1 or later", SPDX = "LGPL-2.1-or-later",
-                    FsfApproved = true, OsiApproved = true,
-                    Link = "https://spdx.org/licenses/LGPL-2.1-or-later.html#licenseText"
+                    Id          = 194,
+                    Name        = "GNU Lesser General Public License v2.1 or later",
+                    SPDX        = "LGPL-2.1-or-later",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/LGPL-2.1-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 195, Name = "GNU Lesser General Public License v3.0 only", SPDX = "LGPL-3.0-only",
-                    FsfApproved = true, OsiApproved = true,
+                    Id          = 195,
+                    Name        = "GNU Lesser General Public License v3.0 only",
+                    SPDX        = "LGPL-3.0-only",
+                    FsfApproved = true,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/LGPL-3.0-only.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 196, Name = "GNU Lesser General Public License v3.0 or later", SPDX = "LGPL-3.0-or-later",
-                    FsfApproved = true, OsiApproved = true,
-                    Link = "https://spdx.org/licenses/LGPL-3.0-or-later.html#licenseText"
+                    Id          = 196,
+                    Name        = "GNU Lesser General Public License v3.0 or later",
+                    SPDX        = "LGPL-3.0-or-later",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/LGPL-3.0-or-later.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 197, Name = "Lesser General Public License For Linguistic Resources", SPDX = "LGPLLR",
-                    FsfApproved = false, OsiApproved = false, Link = "https://spdx.org/licenses/LGPLLR.html#licenseText"
+                    Id          = 197,
+                    Name        = "Lesser General Public License For Linguistic Resources",
+                    SPDX        = "LGPLLR",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/LGPLLR.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 198, Name   = "libpng License", SPDX = "Libpng", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Libpng.html#licenseText"
+                    Id          = 198,
+                    Name        = "libpng License",
+                    SPDX        = "Libpng",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Libpng.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 199, Name = "PNG Reference Library version 2", SPDX = "libpng-2.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/libpng-2.0.html#licenseText"
+                    Id          = 199,
+                    Name        = "PNG Reference Library version 2",
+                    SPDX        = "libpng-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/libpng-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 200, Name   = "libtiff License", SPDX = "libtiff", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/libtiff.html#licenseText"
+                    Id          = 200,
+                    Name        = "libtiff License",
+                    SPDX        = "libtiff",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/libtiff.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 201, Name = "Licence Libre du Québec – Permissive version 1.1", SPDX = "LiLiQ-P-1.1",
-                    FsfApproved = false, OsiApproved = true,
+                    Id          = 201,
+                    Name        = "Licence Libre du Québec – Permissive version 1.1",
+                    SPDX        = "LiLiQ-P-1.1",
+                    FsfApproved = false,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/LiLiQ-P-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 202, Name = "Licence Libre du Québec – Réciprocité version 1.1", SPDX = "LiLiQ-R-1.1",
-                    FsfApproved = false, OsiApproved = true,
+                    Id          = 202,
+                    Name        = "Licence Libre du Québec – Réciprocité version 1.1",
+                    SPDX        = "LiLiQ-R-1.1",
+                    FsfApproved = false,
+                    OsiApproved = true,
                     Link        = "https://spdx.org/licenses/LiLiQ-R-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 203, Name                      = "Licence Libre du Québec – Réciprocité forte version 1.1",
-                    SPDX = "LiLiQ-Rplus-1.1", FsfApproved = false, OsiApproved = true,
-                    Link = "https://spdx.org/licenses/LiLiQ-Rplus-1.1.html#licenseText"
+                    Id          = 203,
+                    Name        = "Licence Libre du Québec – Réciprocité forte version 1.1",
+                    SPDX        = "LiLiQ-Rplus-1.1",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/LiLiQ-Rplus-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 204, Name = "Linux Kernel Variant of OpenIB.org license", SPDX = "Linux-OpenIB",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 204,
+                    Name        = "Linux Kernel Variant of OpenIB.org license",
+                    SPDX        = "Linux-OpenIB",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/Linux-OpenIB.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 205, Name = "Lucent Public License Version 1.0", SPDX = "LPL-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/LPL-1.0.html#licenseText"
+                    Id          = 205,
+                    Name        = "Lucent Public License Version 1.0",
+                    SPDX        = "LPL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/LPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 206, Name  = "Lucent Public License v1.02", SPDX = "LPL-1.02", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/LPL-1.02.html#licenseText"
+                    Id          = 206,
+                    Name        = "Lucent Public License v1.02",
+                    SPDX        = "LPL-1.02",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/LPL-1.02.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 207, Name = "LaTeX Project Public License v1.0", SPDX = "LPPL-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/LPPL-1.0.html#licenseText"
+                    Id          = 207,
+                    Name        = "LaTeX Project Public License v1.0",
+                    SPDX        = "LPPL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/LPPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 208, Name = "LaTeX Project Public License v1.1", SPDX = "LPPL-1.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/LPPL-1.1.html#licenseText"
+                    Id          = 208,
+                    Name        = "LaTeX Project Public License v1.1",
+                    SPDX        = "LPPL-1.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/LPPL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 209, Name = "LaTeX Project Public License v1.2", SPDX = "LPPL-1.2", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/LPPL-1.2.html#licenseText"
+                    Id          = 209,
+                    Name        = "LaTeX Project Public License v1.2",
+                    SPDX        = "LPPL-1.2",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/LPPL-1.2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 210, Name = "LaTeX Project Public License v1.3a", SPDX = "LPPL-1.3a", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/LPPL-1.3a.html#licenseText"
+                    Id          = 210,
+                    Name        = "LaTeX Project Public License v1.3a",
+                    SPDX        = "LPPL-1.3a",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/LPPL-1.3a.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 211, Name = "LaTeX Project Public License v1.3c", SPDX = "LPPL-1.3c", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/LPPL-1.3c.html#licenseText"
+                    Id          = 211,
+                    Name        = "LaTeX Project Public License v1.3c",
+                    SPDX        = "LPPL-1.3c",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/LPPL-1.3c.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 212, Name   = "MakeIndex License", SPDX = "MakeIndex", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/MakeIndex.html#licenseText"
+                    Id          = 212,
+                    Name        = "MakeIndex License",
+                    SPDX        = "MakeIndex",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/MakeIndex.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 213, Name  = "MirOS License", SPDX = "MirOS", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/MirOS.html#licenseText"
+                    Id          = 213,
+                    Name        = "MirOS License",
+                    SPDX        = "MirOS",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/MirOS.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 214, Name  = "MIT License", SPDX = "MIT", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/MIT.html#licenseText"
+                    Id          = 214,
+                    Name        = "MIT License",
+                    SPDX        = "MIT",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/MIT.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 215, Name  = "MIT No Attribution", SPDX = "MIT-0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/MIT-0.html#licenseText"
+                    Id          = 215,
+                    Name        = "MIT No Attribution",
+                    SPDX        = "MIT-0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/MIT-0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 216, Name = "Enlightenment License (e16)", SPDX = "MIT-advertising", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/MIT-advertising.html#licenseText"
+                    Id          = 216,
+                    Name        = "Enlightenment License (e16)",
+                    SPDX        = "MIT-advertising",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/MIT-advertising.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 217, Name   = "CMU License", SPDX = "MIT-CMU", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/MIT-CMU.html#licenseText"
+                    Id          = 217,
+                    Name        = "CMU License",
+                    SPDX        = "MIT-CMU",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/MIT-CMU.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 218, Name   = "enna License", SPDX = "MIT-enna", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/MIT-enna.html#licenseText"
+                    Id          = 218,
+                    Name        = "enna License",
+                    SPDX        = "MIT-enna",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/MIT-enna.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 219, Name   = "feh License", SPDX = "MIT-feh", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/MIT-feh.html#licenseText"
+                    Id          = 219,
+                    Name        = "feh License",
+                    SPDX        = "MIT-feh",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/MIT-feh.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 220, Name   = "MIT +no-false-attribs license", SPDX = "MITNFA", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/MITNFA.html#licenseText"
+                    Id          = 220,
+                    Name        = "MIT +no-false-attribs license",
+                    SPDX        = "MITNFA",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/MITNFA.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 221, Name  = "Motosoto License", SPDX = "Motosoto", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Motosoto.html#licenseText"
+                    Id          = 221,
+                    Name        = "Motosoto License",
+                    SPDX        = "Motosoto",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Motosoto.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 222, Name   = "mpich2 License", SPDX = "mpich2", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/mpich2.html#licenseText"
+                    Id          = 222,
+                    Name        = "mpich2 License",
+                    SPDX        = "mpich2",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/mpich2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 223, Name  = "Mozilla Public License 1.0", SPDX = "MPL-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/MPL-1.0.html#licenseText"
+                    Id          = 223,
+                    Name        = "Mozilla Public License 1.0",
+                    SPDX        = "MPL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/MPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 224, Name  = "Mozilla Public License 1.1", SPDX = "MPL-1.1", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/MPL-1.1.html#licenseText"
+                    Id          = 224,
+                    Name        = "Mozilla Public License 1.1",
+                    SPDX        = "MPL-1.1",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/MPL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 225, Name  = "Mozilla Public License 2.0", SPDX = "MPL-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/MPL-2.0.html#licenseText"
+                    Id          = 225,
+                    Name        = "Mozilla Public License 2.0",
+                    SPDX        = "MPL-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/MPL-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 226, Name = "Mozilla Public License 2.0 (no copyleft exception)",
-                    SPDX = "MPL-2.0-no-copyleft-exception", FsfApproved = false, OsiApproved = true,
-                    Link = "https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.html#licenseText"
+                    Id          = 226,
+                    Name        = "Mozilla Public License 2.0 (no copyleft exception)",
+                    SPDX        = "MPL-2.0-no-copyleft-exception",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 227, Name  = "Microsoft Public License", SPDX = "MS-PL", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/MS-PL.html#licenseText"
+                    Id          = 227,
+                    Name        = "Microsoft Public License",
+                    SPDX        = "MS-PL",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/MS-PL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 228, Name  = "Microsoft Reciprocal License", SPDX = "MS-RL", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/MS-RL.html#licenseText"
+                    Id          = 228,
+                    Name        = "Microsoft Reciprocal License",
+                    SPDX        = "MS-RL",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/MS-RL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 229, Name   = "Matrix Template Library License", SPDX = "MTLL", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/MTLL.html#licenseText"
+                    Id          = 229,
+                    Name        = "Matrix Template Library License",
+                    SPDX        = "MTLL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/MTLL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 230, Name  = "Multics License", SPDX = "Multics", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Multics.html#licenseText"
+                    Id          = 230,
+                    Name        = "Multics License",
+                    SPDX        = "Multics",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Multics.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 231, Name   = "Mup License", SPDX = "Mup", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Mup.html#licenseText"
+                    Id          = 231,
+                    Name        = "Mup License",
+                    SPDX        = "Mup",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Mup.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 232, Name  = "NASA Open Source Agreement 1.3", SPDX = "NASA-1.3", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/NASA-1.3.html#licenseText"
+                    Id          = 232,
+                    Name        = "NASA Open Source Agreement 1.3",
+                    SPDX        = "NASA-1.3",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/NASA-1.3.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 233, Name  = "Naumen Public License", SPDX = "Naumen", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Naumen.html#licenseText"
+                    Id          = 233,
+                    Name        = "Naumen Public License",
+                    SPDX        = "Naumen",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Naumen.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 234, Name   = "Net Boolean Public License v1", SPDX = "NBPL-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/NBPL-1.0.html#licenseText"
+                    Id          = 234,
+                    Name        = "Net Boolean Public License v1",
+                    SPDX        = "NBPL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/NBPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 235, Name         = "University of Illinois/NCSA Open Source License", SPDX = "NCSA",
-                    FsfApproved = true, OsiApproved = true, Link = "https://spdx.org/licenses/NCSA.html#licenseText"
+                    Id          = 235,
+                    Name        = "University of Illinois/NCSA Open Source License",
+                    SPDX        = "NCSA",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/NCSA.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 236, Name   = "Net-SNMP License", SPDX = "Net-SNMP", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Net-SNMP.html#licenseText"
+                    Id          = 236,
+                    Name        = "Net-SNMP License",
+                    SPDX        = "Net-SNMP",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Net-SNMP.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 237, Name   = "NetCDF license", SPDX = "NetCDF", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/NetCDF.html#licenseText"
+                    Id          = 237,
+                    Name        = "NetCDF license",
+                    SPDX        = "NetCDF",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/NetCDF.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 238, Name   = "Newsletr License", SPDX = "Newsletr", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Newsletr.html#licenseText"
+                    Id          = 238,
+                    Name        = "Newsletr License",
+                    SPDX        = "Newsletr",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Newsletr.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 239, Name  = "Nethack General Public License", SPDX = "NGPL", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/NGPL.html#licenseText"
+                    Id          = 239,
+                    Name        = "Nethack General Public License",
+                    SPDX        = "NGPL",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/NGPL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 240, Name          = "Norwegian Licence for Open Government Data", SPDX = "NLOD-1.0",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 240,
+                    Name        = "Norwegian Licence for Open Government Data",
+                    SPDX        = "NLOD-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/NLOD-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 241, Name   = "No Limit Public License", SPDX = "NLPL", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/NLPL.html#licenseText"
+                    Id          = 241,
+                    Name        = "No Limit Public License",
+                    SPDX        = "NLPL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/NLPL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 242, Name  = "Nokia Open Source License", SPDX = "Nokia", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Nokia.html#licenseText"
+                    Id          = 242,
+                    Name        = "Nokia Open Source License",
+                    SPDX        = "Nokia",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Nokia.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 243, Name   = "Netizen Open Source License", SPDX = "NOSL", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/NOSL.html#licenseText"
+                    Id          = 243,
+                    Name        = "Netizen Open Source License",
+                    SPDX        = "NOSL",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/NOSL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 244, Name   = "Noweb License", SPDX = "Noweb", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Noweb.html#licenseText"
+                    Id          = 244,
+                    Name        = "Noweb License",
+                    SPDX        = "Noweb",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Noweb.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 245, Name   = "Netscape Public License v1.0", SPDX = "NPL-1.0", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/NPL-1.0.html#licenseText"
+                    Id          = 245,
+                    Name        = "Netscape Public License v1.0",
+                    SPDX        = "NPL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/NPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 246, Name   = "Netscape Public License v1.1", SPDX = "NPL-1.1", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/NPL-1.1.html#licenseText"
+                    Id          = 246,
+                    Name        = "Netscape Public License v1.1",
+                    SPDX        = "NPL-1.1",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/NPL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 247, Name = "Non-Profit Open Software License 3.0", SPDX = "NPOSL-3.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/NPOSL-3.0.html#licenseText"
+                    Id          = 247,
+                    Name        = "Non-Profit Open Software License 3.0",
+                    SPDX        = "NPOSL-3.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/NPOSL-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 248, Name   = "NRL License", SPDX = "NRL", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/NRL.html#licenseText"
+                    Id          = 248,
+                    Name        = "NRL License",
+                    SPDX        = "NRL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/NRL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 249, Name  = "NTP License", SPDX = "NTP", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/NTP.html#licenseText"
+                    Id          = 249,
+                    Name        = "NTP License",
+                    SPDX        = "NTP",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/NTP.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 250, Name = "Open CASCADE Technology Public License", SPDX = "OCCT-PL", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OCCT-PL.html#licenseText"
+                    Id          = 250,
+                    Name        = "Open CASCADE Technology Public License",
+                    SPDX        = "OCCT-PL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OCCT-PL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 251, Name = "OCLC Research Public License 2.0", SPDX = "OCLC-2.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/OCLC-2.0.html#licenseText"
+                    Id          = 251,
+                    Name        = "OCLC Research Public License 2.0",
+                    SPDX        = "OCLC-2.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/OCLC-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 252, Name   = "ODC Open Database License v1.0", SPDX = "ODbL-1.0", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/ODbL-1.0.html#licenseText"
+                    Id          = 252,
+                    Name        = "ODC Open Database License v1.0",
+                    SPDX        = "ODbL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/ODbL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 253, Name = "Open Data Commons Attribution License v1.0", SPDX = "ODC-By-1.0",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 253,
+                    Name        = "Open Data Commons Attribution License v1.0",
+                    SPDX        = "ODC-By-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/ODC-By-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 254, Name   = "SIL Open Font License 1.0", SPDX = "OFL-1.0", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OFL-1.0.html#licenseText"
+                    Id          = 254,
+                    Name        = "SIL Open Font License 1.0",
+                    SPDX        = "OFL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OFL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 255, Name  = "SIL Open Font License 1.1", SPDX = "OFL-1.1", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/OFL-1.1.html#licenseText"
+                    Id          = 255,
+                    Name        = "SIL Open Font License 1.1",
+                    SPDX        = "OFL-1.1",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/OFL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 256, Name = "Open Government Licence v1.0", SPDX = "OGL-UK-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OGL-UK-1.0.html#licenseText"
+                    Id          = 256,
+                    Name        = "Open Government Licence v1.0",
+                    SPDX        = "OGL-UK-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OGL-UK-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 257, Name = "Open Government Licence v2.0", SPDX = "OGL-UK-2.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OGL-UK-2.0.html#licenseText"
+                    Id          = 257,
+                    Name        = "Open Government Licence v2.0",
+                    SPDX        = "OGL-UK-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OGL-UK-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 258, Name = "Open Government Licence v3.0", SPDX = "OGL-UK-3.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OGL-UK-3.0.html#licenseText"
+                    Id          = 258,
+                    Name        = "Open Government Licence v3.0",
+                    SPDX        = "OGL-UK-3.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OGL-UK-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 259, Name  = "Open Group Test Suite License", SPDX = "OGTSL", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/OGTSL.html#licenseText"
+                    Id          = 259,
+                    Name        = "Open Group Test Suite License",
+                    SPDX        = "OGTSL",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/OGTSL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 260, Name = "Open LDAP Public License v1.1", SPDX = "OLDAP-1.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-1.1.html#licenseText"
+                    Id          = 260,
+                    Name        = "Open LDAP Public License v1.1",
+                    SPDX        = "OLDAP-1.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 261, Name = "Open LDAP Public License v1.2", SPDX = "OLDAP-1.2", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-1.2.html#licenseText"
+                    Id          = 261,
+                    Name        = "Open LDAP Public License v1.2",
+                    SPDX        = "OLDAP-1.2",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-1.2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 262, Name = "Open LDAP Public License v1.3", SPDX = "OLDAP-1.3", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-1.3.html#licenseText"
+                    Id          = 262,
+                    Name        = "Open LDAP Public License v1.3",
+                    SPDX        = "OLDAP-1.3",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-1.3.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 263, Name = "Open LDAP Public License v1.4", SPDX = "OLDAP-1.4", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-1.4.html#licenseText"
+                    Id          = 263,
+                    Name        = "Open LDAP Public License v1.4",
+                    SPDX        = "OLDAP-1.4",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-1.4.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 264, Name = "Open LDAP Public License v2.0 (or possibly 2.0A and 2.0B)", SPDX = "OLDAP-2.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/OLDAP-2.0.html#licenseText"
+                    Id          = 264,
+                    Name        = "Open LDAP Public License v2.0 (or possibly 2.0A and 2.0B)",
+                    SPDX        = "OLDAP-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 265, Name = "Open LDAP Public License v2.0.1", SPDX = "OLDAP-2.0.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.0.1.html#licenseText"
+                    Id          = 265,
+                    Name        = "Open LDAP Public License v2.0.1",
+                    SPDX        = "OLDAP-2.0.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.0.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 266, Name = "Open LDAP Public License v2.1", SPDX = "OLDAP-2.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.1.html#licenseText"
+                    Id          = 266,
+                    Name        = "Open LDAP Public License v2.1",
+                    SPDX        = "OLDAP-2.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 267, Name = "Open LDAP Public License v2.2", SPDX = "OLDAP-2.2", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.2.html#licenseText"
+                    Id          = 267,
+                    Name        = "Open LDAP Public License v2.2",
+                    SPDX        = "OLDAP-2.2",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 268, Name = "Open LDAP Public License v2.2.1", SPDX = "OLDAP-2.2.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.2.1.html#licenseText"
+                    Id          = 268,
+                    Name        = "Open LDAP Public License v2.2.1",
+                    SPDX        = "OLDAP-2.2.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.2.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 269, Name = "Open LDAP Public License 2.2.2", SPDX = "OLDAP-2.2.2", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.2.2.html#licenseText"
+                    Id          = 269,
+                    Name        = "Open LDAP Public License 2.2.2",
+                    SPDX        = "OLDAP-2.2.2",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.2.2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 270, Name   = "Open LDAP Public License v2.3", SPDX = "OLDAP-2.3", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.3.html#licenseText"
+                    Id          = 270,
+                    Name        = "Open LDAP Public License v2.3",
+                    SPDX        = "OLDAP-2.3",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.3.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 271, Name = "Open LDAP Public License v2.4", SPDX = "OLDAP-2.4", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.4.html#licenseText"
+                    Id          = 271,
+                    Name        = "Open LDAP Public License v2.4",
+                    SPDX        = "OLDAP-2.4",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.4.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 272, Name = "Open LDAP Public License v2.5", SPDX = "OLDAP-2.5", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.5.html#licenseText"
+                    Id          = 272,
+                    Name        = "Open LDAP Public License v2.5",
+                    SPDX        = "OLDAP-2.5",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.5.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 273, Name = "Open LDAP Public License v2.6", SPDX = "OLDAP-2.6", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.6.html#licenseText"
+                    Id          = 273,
+                    Name        = "Open LDAP Public License v2.6",
+                    SPDX        = "OLDAP-2.6",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.6.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 274, Name   = "Open LDAP Public License v2.7", SPDX = "OLDAP-2.7", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.7.html#licenseText"
+                    Id          = 274,
+                    Name        = "Open LDAP Public License v2.7",
+                    SPDX        = "OLDAP-2.7",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.7.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 275, Name = "Open LDAP Public License v2.8", SPDX = "OLDAP-2.8", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OLDAP-2.8.html#licenseText"
+                    Id          = 275,
+                    Name        = "Open LDAP Public License v2.8",
+                    SPDX        = "OLDAP-2.8",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OLDAP-2.8.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 276, Name   = "Open Market License", SPDX = "OML", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OML.html#licenseText"
+                    Id          = 276,
+                    Name        = "Open Market License",
+                    SPDX        = "OML",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OML.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 277, Name   = "OpenSSL License", SPDX = "OpenSSL", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OpenSSL.html#licenseText"
+                    Id          = 277,
+                    Name        = "OpenSSL License",
+                    SPDX        = "OpenSSL",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OpenSSL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 278, Name   = "Open Public License v1.0", SPDX = "OPL-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OPL-1.0.html#licenseText"
+                    Id          = 278,
+                    Name        = "Open Public License v1.0",
+                    SPDX        = "OPL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 279, Name = "OSET Public License version 2.1", SPDX = "OSET-PL-2.1", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/OSET-PL-2.1.html#licenseText"
+                    Id          = 279,
+                    Name        = "OSET Public License version 2.1",
+                    SPDX        = "OSET-PL-2.1",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/OSET-PL-2.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 280, Name  = "Open Software License 1.0", SPDX = "OSL-1.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/OSL-1.0.html#licenseText"
+                    Id          = 280,
+                    Name        = "Open Software License 1.0",
+                    SPDX        = "OSL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/OSL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 281, Name   = "Open Software License 1.1", SPDX = "OSL-1.1", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OSL-1.1.html#licenseText"
+                    Id          = 281,
+                    Name        = "Open Software License 1.1",
+                    SPDX        = "OSL-1.1",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OSL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 282, Name  = "Open Software License 2.0", SPDX = "OSL-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/OSL-2.0.html#licenseText"
+                    Id          = 282,
+                    Name        = "Open Software License 2.0",
+                    SPDX        = "OSL-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/OSL-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 283, Name  = "Open Software License 2.1", SPDX = "OSL-2.1", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/OSL-2.1.html#licenseText"
+                    Id          = 283,
+                    Name        = "Open Software License 2.1",
+                    SPDX        = "OSL-2.1",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/OSL-2.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 284, Name  = "Open Software License 3.0", SPDX = "OSL-3.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/OSL-3.0.html#licenseText"
+                    Id          = 284,
+                    Name        = "Open Software License 3.0",
+                    SPDX        = "OSL-3.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/OSL-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 285, Name          = "ODC Public Domain Dedication & License 1.0", SPDX = "PDDL-1.0",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 285,
+                    Name        = "ODC Public Domain Dedication & License 1.0",
+                    SPDX        = "PDDL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/PDDL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 286, Name  = "PHP License v3.0", SPDX = "PHP-3.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/PHP-3.0.html#licenseText"
+                    Id          = 286,
+                    Name        = "PHP License v3.0",
+                    SPDX        = "PHP-3.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/PHP-3.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 287, Name   = "PHP License v3.01", SPDX = "PHP-3.01", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/PHP-3.01.html#licenseText"
+                    Id          = 287,
+                    Name        = "PHP License v3.01",
+                    SPDX        = "PHP-3.01",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/PHP-3.01.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 288, Name   = "Plexus Classworlds License", SPDX = "Plexus", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Plexus.html#licenseText"
+                    Id          = 288,
+                    Name        = "Plexus Classworlds License",
+                    SPDX        = "Plexus",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Plexus.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 289, Name  = "PostgreSQL License", SPDX = "PostgreSQL", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/PostgreSQL.html#licenseText"
+                    Id          = 289,
+                    Name        = "PostgreSQL License",
+                    SPDX        = "PostgreSQL",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/PostgreSQL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 290, Name   = "psfrag License", SPDX = "psfrag", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/psfrag.html#licenseText"
+                    Id          = 290,
+                    Name        = "psfrag License",
+                    SPDX        = "psfrag",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/psfrag.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 291, Name   = "psutils License", SPDX = "psutils", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/psutils.html#licenseText"
+                    Id          = 291,
+                    Name        = "psutils License",
+                    SPDX        = "psutils",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/psutils.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 292, Name  = "Python License 2.0", SPDX = "Python-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Python-2.0.html#licenseText"
+                    Id          = 292,
+                    Name        = "Python License 2.0",
+                    SPDX        = "Python-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Python-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 293, Name   = "Qhull License", SPDX = "Qhull", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Qhull.html#licenseText"
+                    Id          = 293,
+                    Name        = "Qhull License",
+                    SPDX        = "Qhull",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Qhull.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 294, Name  = "Q Public License 1.0", SPDX = "QPL-1.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/QPL-1.0.html#licenseText"
+                    Id          = 294,
+                    Name        = "Q Public License 1.0",
+                    SPDX        = "QPL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/QPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 295, Name   = "Rdisc License", SPDX = "Rdisc", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Rdisc.html#licenseText"
+                    Id          = 295,
+                    Name        = "Rdisc License",
+                    SPDX        = "Rdisc",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Rdisc.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 296, Name = "Red Hat eCos Public License v1.1", SPDX = "RHeCos-1.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/RHeCos-1.1.html#licenseText"
+                    Id          = 296,
+                    Name        = "Red Hat eCos Public License v1.1",
+                    SPDX        = "RHeCos-1.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/RHeCos-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 297, Name  = "Reciprocal Public License 1.1", SPDX = "RPL-1.1", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/RPL-1.1.html#licenseText"
+                    Id          = 297,
+                    Name        = "Reciprocal Public License 1.1",
+                    SPDX        = "RPL-1.1",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/RPL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 298, Name  = "Reciprocal Public License 1.5", SPDX = "RPL-1.5", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/RPL-1.5.html#licenseText"
+                    Id          = 298,
+                    Name        = "Reciprocal Public License 1.5",
+                    SPDX        = "RPL-1.5",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/RPL-1.5.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 299, Name = "RealNetworks Public Source License v1.0", SPDX = "RPSL-1.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/RPSL-1.0.html#licenseText"
+                    Id          = 299,
+                    Name        = "RealNetworks Public Source License v1.0",
+                    SPDX        = "RPSL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/RPSL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 300, Name   = "RSA Message-Digest License", SPDX = "RSA-MD", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/RSA-MD.html#licenseText"
+                    Id          = 300,
+                    Name        = "RSA Message-Digest License",
+                    SPDX        = "RSA-MD",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/RSA-MD.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 301, Name  = "Ricoh Source Code Public License", SPDX = "RSCPL", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/RSCPL.html#licenseText"
+                    Id          = 301,
+                    Name        = "Ricoh Source Code Public License",
+                    SPDX        = "RSCPL",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/RSCPL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 302, Name   = "Ruby License", SPDX = "Ruby", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Ruby.html#licenseText"
+                    Id          = 302,
+                    Name        = "Ruby License",
+                    SPDX        = "Ruby",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Ruby.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 303, Name   = "Sax Public Domain Notice", SPDX = "SAX-PD", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SAX-PD.html#licenseText"
+                    Id          = 303,
+                    Name        = "Sax Public Domain Notice",
+                    SPDX        = "SAX-PD",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SAX-PD.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 304, Name   = "Saxpath License", SPDX = "Saxpath", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Saxpath.html#licenseText"
+                    Id          = 304,
+                    Name        = "Saxpath License",
+                    SPDX        = "Saxpath",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Saxpath.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 305, Name   = "SCEA Shared Source License", SPDX = "SCEA", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SCEA.html#licenseText"
+                    Id          = 305,
+                    Name        = "SCEA Shared Source License",
+                    SPDX        = "SCEA",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SCEA.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 306, Name   = "Sendmail License", SPDX = "Sendmail", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Sendmail.html#licenseText"
+                    Id          = 306,
+                    Name        = "Sendmail License",
+                    SPDX        = "Sendmail",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Sendmail.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 307, Name   = "Sendmail License 8.23", SPDX = "Sendmail-8.23", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Sendmail-8.23.html#licenseText"
+                    Id          = 307,
+                    Name        = "Sendmail License 8.23",
+                    SPDX        = "Sendmail-8.23",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Sendmail-8.23.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 308, Name = "SGI Free Software License B v1.0", SPDX = "SGI-B-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SGI-B-1.0.html#licenseText"
+                    Id          = 308,
+                    Name        = "SGI Free Software License B v1.0",
+                    SPDX        = "SGI-B-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SGI-B-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 309, Name = "SGI Free Software License B v1.1", SPDX = "SGI-B-1.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SGI-B-1.1.html#licenseText"
+                    Id          = 309,
+                    Name        = "SGI Free Software License B v1.1",
+                    SPDX        = "SGI-B-1.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SGI-B-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 310, Name = "SGI Free Software License B v2.0", SPDX = "SGI-B-2.0", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SGI-B-2.0.html#licenseText"
+                    Id          = 310,
+                    Name        = "SGI Free Software License B v2.0",
+                    SPDX        = "SGI-B-2.0",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SGI-B-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 311, Name  = "Simple Public License 2.0", SPDX = "SimPL-2.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/SimPL-2.0.html#licenseText"
+                    Id          = 311,
+                    Name        = "Simple Public License 2.0",
+                    SPDX        = "SimPL-2.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/SimPL-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 312, Name = "Sun Industry Standards Source License v1.1", SPDX = "SISSL", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/SISSL.html#licenseText"
+                    Id          = 312,
+                    Name        = "Sun Industry Standards Source License v1.1",
+                    SPDX        = "SISSL",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/SISSL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 313, Name          = "Sun Industry Standards Source License v1.2", SPDX = "SISSL-1.2",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 313,
+                    Name        = "Sun Industry Standards Source License v1.2",
+                    SPDX        = "SISSL-1.2",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/SISSL-1.2.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 314, Name  = "Sleepycat License", SPDX = "Sleepycat", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Sleepycat.html#licenseText"
+                    Id          = 314,
+                    Name        = "Sleepycat License",
+                    SPDX        = "Sleepycat",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Sleepycat.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 315, Name   = "Standard ML of New Jersey License", SPDX = "SMLNJ", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SMLNJ.html#licenseText"
+                    Id          = 315,
+                    Name        = "Standard ML of New Jersey License",
+                    SPDX        = "SMLNJ",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SMLNJ.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 316, Name = "Secure Messaging Protocol Public License", SPDX = "SMPPL", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SMPPL.html#licenseText"
+                    Id          = 316,
+                    Name        = "Secure Messaging Protocol Public License",
+                    SPDX        = "SMPPL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SMPPL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 317, Name   = "SNIA Public License 1.1", SPDX = "SNIA", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SNIA.html#licenseText"
+                    Id          = 317,
+                    Name        = "SNIA Public License 1.1",
+                    SPDX        = "SNIA",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SNIA.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 318, Name   = "Spencer License 86", SPDX = "Spencer-86", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Spencer-86.html#licenseText"
+                    Id          = 318,
+                    Name        = "Spencer License 86",
+                    SPDX        = "Spencer-86",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Spencer-86.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 319, Name   = "Spencer License 94", SPDX = "Spencer-94", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Spencer-94.html#licenseText"
+                    Id          = 319,
+                    Name        = "Spencer License 94",
+                    SPDX        = "Spencer-94",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Spencer-94.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 320, Name   = "Spencer License 99", SPDX = "Spencer-99", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Spencer-99.html#licenseText"
+                    Id          = 320,
+                    Name        = "Spencer License 99",
+                    SPDX        = "Spencer-99",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Spencer-99.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 321, Name  = "Sun Public License v1.0", SPDX = "SPL-1.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/SPL-1.0.html#licenseText"
+                    Id          = 321,
+                    Name        = "Sun Public License v1.0",
+                    SPDX        = "SPL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/SPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 322, Name = "SugarCRM Public License v1.1.3", SPDX = "SugarCRM-1.1.3", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SugarCRM-1.1.3.html#licenseText"
+                    Id          = 322,
+                    Name        = "SugarCRM Public License v1.1.3",
+                    SPDX        = "SugarCRM-1.1.3",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SugarCRM-1.1.3.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 323, Name = "Scheme Widget Library (SWL) Software License Agreement", SPDX = "SWL",
-                    FsfApproved = false, OsiApproved = false, Link = "https://spdx.org/licenses/SWL.html#licenseText"
+                    Id          = 323,
+                    Name        = "Scheme Widget Library (SWL) Software License Agreement",
+                    SPDX        = "SWL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SWL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 324, Name = "TAPR Open Hardware License v1.0", SPDX = "TAPR-OHL-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/TAPR-OHL-1.0.html#licenseText"
+                    Id          = 324,
+                    Name        = "TAPR Open Hardware License v1.0",
+                    SPDX        = "TAPR-OHL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/TAPR-OHL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 325, Name   = "TCL/TK License", SPDX = "TCL", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/TCL.html#licenseText"
+                    Id          = 325,
+                    Name        = "TCL/TK License",
+                    SPDX        = "TCL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/TCL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 326, Name   = "TCP Wrappers License", SPDX = "TCP-wrappers", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/TCP-wrappers.html#licenseText"
+                    Id          = 326,
+                    Name        = "TCP Wrappers License",
+                    SPDX        = "TCP-wrappers",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/TCP-wrappers.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 327, Name   = "TMate Open Source License", SPDX = "TMate", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/TMate.html#licenseText"
+                    Id          = 327,
+                    Name        = "TMate Open Source License",
+                    SPDX        = "TMate",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/TMate.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 328, Name = "TORQUE v2.5+ Software License v1.1", SPDX = "TORQUE-1.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/TORQUE-1.1.html#licenseText"
+                    Id          = 328,
+                    Name        = "TORQUE v2.5+ Software License v1.1",
+                    SPDX        = "TORQUE-1.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/TORQUE-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 329, Name   = "Trusster Open Source License", SPDX = "TOSL", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/TOSL.html#licenseText"
+                    Id          = 329,
+                    Name        = "Trusster Open Source License",
+                    SPDX        = "TOSL",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/TOSL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 330, Name = "Technische Universitaet Berlin License 1.0", SPDX = "TU-Berlin-1.0",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 330,
+                    Name        = "Technische Universitaet Berlin License 1.0",
+                    SPDX        = "TU-Berlin-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/TU-Berlin-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 331, Name = "Technische Universitaet Berlin License 2.0", SPDX = "TU-Berlin-2.0",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 331,
+                    Name        = "Technische Universitaet Berlin License 2.0",
+                    SPDX        = "TU-Berlin-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/TU-Berlin-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 332, Name = "Unicode License Agreement - Data Files and Software (2015)",
-                    SPDX = "Unicode-DFS-2015", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/Unicode-DFS-2015.html#licenseText"
+                    Id          = 332,
+                    Name        = "Unicode License Agreement - Data Files and Software (2015)",
+                    SPDX        = "Unicode-DFS-2015",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Unicode-DFS-2015.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id   = 333, Name = "Unicode License Agreement - Data Files and Software (2016)",
-                    SPDX = "Unicode-DFS-2016", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/Unicode-DFS-2016.html#licenseText"
+                    Id          = 333,
+                    Name        = "Unicode License Agreement - Data Files and Software (2016)",
+                    SPDX        = "Unicode-DFS-2016",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Unicode-DFS-2016.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 334, Name   = "Unicode Terms of Use", SPDX = "Unicode-TOU", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Unicode-TOU.html#licenseText"
+                    Id          = 334,
+                    Name        = "Unicode Terms of Use",
+                    SPDX        = "Unicode-TOU",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Unicode-TOU.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 335, Name   = "The Unlicense", SPDX = "Unlicense", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Unlicense.html#licenseText"
+                    Id          = 335,
+                    Name        = "The Unlicense",
+                    SPDX        = "Unlicense",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Unlicense.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 336, Name = "Universal Permissive License v1.0", SPDX = "UPL-1.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/UPL-1.0.html#licenseText"
+                    Id          = 336,
+                    Name        = "Universal Permissive License v1.0",
+                    SPDX        = "UPL-1.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/UPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 337, Name   = "Vim License", SPDX = "Vim", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Vim.html#licenseText"
+                    Id          = 337,
+                    Name        = "Vim License",
+                    SPDX        = "Vim",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Vim.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 338, Name = "VOSTROM Public License for Open Source", SPDX = "VOSTROM", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/VOSTROM.html#licenseText"
+                    Id          = 338,
+                    Name        = "VOSTROM Public License for Open Source",
+                    SPDX        = "VOSTROM",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/VOSTROM.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 339, Name  = "Vovida Software License v1.0", SPDX = "VSL-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/VSL-1.0.html#licenseText"
+                    Id          = 339,
+                    Name        = "Vovida Software License v1.0",
+                    SPDX        = "VSL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/VSL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 340, Name = "W3C Software Notice and License (2002-12-31)", SPDX = "W3C", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/W3C.html#licenseText"
+                    Id          = 340,
+                    Name        = "W3C Software Notice and License (2002-12-31)",
+                    SPDX        = "W3C",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/W3C.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 341, Name = "W3C Software Notice and License (1998-07-20)", SPDX = "W3C-19980720",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 341,
+                    Name        = "W3C Software Notice and License (1998-07-20)",
+                    SPDX        = "W3C-19980720",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/W3C-19980720.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 342, Name = "W3C Software Notice and Document License (2015-05-13)", SPDX = "W3C-20150513",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/W3C-20150513.html#licenseText"
+                    Id          = 342,
+                    Name        = "W3C Software Notice and Document License (2015-05-13)",
+                    SPDX        = "W3C-20150513",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/W3C-20150513.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 343, Name = "Sybase Open Watcom Public License 1.0", SPDX = "Watcom-1.0", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Watcom-1.0.html#licenseText"
+                    Id          = 343,
+                    Name        = "Sybase Open Watcom Public License 1.0",
+                    SPDX        = "Watcom-1.0",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Watcom-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 344, Name   = "Wsuipa License", SPDX = "Wsuipa", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Wsuipa.html#licenseText"
+                    Id          = 344,
+                    Name        = "Wsuipa License",
+                    SPDX        = "Wsuipa",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Wsuipa.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id = 345, Name = "Do What The F*ck You Want To Public License", SPDX = "WTFPL", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/WTFPL.html#licenseText"
+                    Id          = 345,
+                    Name        = "Do What The F*ck You Want To Public License",
+                    SPDX        = "WTFPL",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/WTFPL.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 346, Name   = "X11 License", SPDX = "X11", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/X11.html#licenseText"
+                    Id          = 346,
+                    Name        = "X11 License",
+                    SPDX        = "X11",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/X11.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 347, Name   = "Xerox License", SPDX = "Xerox", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Xerox.html#licenseText"
+                    Id          = 347,
+                    Name        = "Xerox License",
+                    SPDX        = "Xerox",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Xerox.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 348, Name   = "XFree86 License 1.1", SPDX = "XFree86-1.1", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/XFree86-1.1.html#licenseText"
+                    Id          = 348,
+                    Name        = "XFree86 License 1.1",
+                    SPDX        = "XFree86-1.1",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/XFree86-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 349, Name   = "xinetd License", SPDX = "xinetd", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/xinetd.html#licenseText"
+                    Id          = 349,
+                    Name        = "xinetd License",
+                    SPDX        = "xinetd",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/xinetd.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 350, Name  = "X.Net License", SPDX = "Xnet", FsfApproved = false,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Xnet.html#licenseText"
+                    Id          = 350,
+                    Name        = "X.Net License",
+                    SPDX        = "Xnet",
+                    FsfApproved = false,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Xnet.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 351, Name   = "XPP License", SPDX = "xpp", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/xpp.html#licenseText"
+                    Id          = 351,
+                    Name        = "XPP License",
+                    SPDX        = "xpp",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/xpp.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 352, Name   = "XSkat License", SPDX = "XSkat", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/XSkat.html#licenseText"
+                    Id          = 352,
+                    Name        = "XSkat License",
+                    SPDX        = "XSkat",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/XSkat.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 353, Name   = "Yahoo! Public License v1.0", SPDX = "YPL-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/YPL-1.0.html#licenseText"
+                    Id          = 353,
+                    Name        = "Yahoo! Public License v1.0",
+                    SPDX        = "YPL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/YPL-1.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 354, Name   = "Yahoo! Public License v1.1", SPDX = "YPL-1.1", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/YPL-1.1.html#licenseText"
+                    Id          = 354,
+                    Name        = "Yahoo! Public License v1.1",
+                    SPDX        = "YPL-1.1",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/YPL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 355, Name   = "Zed License", SPDX = "Zed", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Zed.html#licenseText"
+                    Id          = 355,
+                    Name        = "Zed License",
+                    SPDX        = "Zed",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Zed.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 356, Name   = "Zend License v2.0", SPDX = "Zend-2.0", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Zend-2.0.html#licenseText"
+                    Id          = 356,
+                    Name        = "Zend License v2.0",
+                    SPDX        = "Zend-2.0",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Zend-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 357, Name   = "Zimbra Public License v1.3", SPDX = "Zimbra-1.3", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Zimbra-1.3.html#licenseText"
+                    Id          = 357,
+                    Name        = "Zimbra Public License v1.3",
+                    SPDX        = "Zimbra-1.3",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Zimbra-1.3.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 358, Name   = "Zimbra Public License v1.4", SPDX = "Zimbra-1.4", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Zimbra-1.4.html#licenseText"
+                    Id          = 358,
+                    Name        = "Zimbra Public License v1.4",
+                    SPDX        = "Zimbra-1.4",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Zimbra-1.4.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 359, Name  = "zlib License", SPDX = "Zlib", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/Zlib.html#licenseText"
+                    Id          = 359,
+                    Name        = "zlib License",
+                    SPDX        = "Zlib",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/Zlib.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 360, Name = "zlib/libpng License with Acknowledgement", SPDX = "zlib-acknowledgement",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 360,
+                    Name        = "zlib/libpng License with Acknowledgement",
+                    SPDX        = "zlib-acknowledgement",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/zlib-acknowledgement.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 361, Name   = "Zope Public License 1.1", SPDX = "ZPL-1.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/ZPL-1.1.html#licenseText"
+                    Id          = 361,
+                    Name        = "Zope Public License 1.1",
+                    SPDX        = "ZPL-1.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/ZPL-1.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 362, Name  = "Zope Public License 2.0", SPDX = "ZPL-2.0", FsfApproved = true,
-                    OsiApproved = true, Link = "https://spdx.org/licenses/ZPL-2.0.html#licenseText"
+                    Id          = 362,
+                    Name        = "Zope Public License 2.0",
+                    SPDX        = "ZPL-2.0",
+                    FsfApproved = true,
+                    OsiApproved = true,
+                    Link        = "https://spdx.org/licenses/ZPL-2.0.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 363, Name   = "Zope Public License 2.1", SPDX = "ZPL-2.1", FsfApproved = true,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/ZPL-2.1.html#licenseText"
+                    Id          = 363,
+                    Name        = "Zope Public License 2.1",
+                    SPDX        = "ZPL-2.1",
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/ZPL-2.1.html#licenseText"
                 },
                 new Models.License
                 {
-                    Id          = 364, Name   = "Public domain", SPDX = null, FsfApproved = true,
-                    OsiApproved = false, Link = null
+                    Id          = 364,
+                    Name        = "Public domain",
+                    SPDX        = null,
+                    FsfApproved = true,
+                    OsiApproved = false,
+                    Link        = null
                 },
                 new Models.License
                 {
-                    Id = 365, Name = "Cryptographic Autonomy License 1.0", SPDX = "CAL-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/CAL-1.0.html"
+                    Id          = 365,
+                    Name        = "Cryptographic Autonomy License 1.0",
+                    SPDX        = "CAL-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CAL-1.0.html"
                 },
                 new Models.License
                 {
-                    Id   = 366, Name = "Cryptographic Autonomy License 1.0 (Combined Work Exception)",
-                    SPDX = "CAL-1.0-Combined-Work-Exception", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CAL-1.0-Combined-Work-Exception.html"
+                    Id          = 366,
+                    Name        = "Cryptographic Autonomy License 1.0 (Combined Work Exception)",
+                    SPDX        = "CAL-1.0-Combined-Work-Exception",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CAL-1.0-Combined-Work-Exception.html"
                 },
                 new Models.License
                 {
-                    Id = 367, Name = "CERN Open Hardware Licence Version 2 - Permissive", SPDX = "CERN-OHL-P-2.0",
-                    FsfApproved = false, OsiApproved = false, Link = "https://spdx.org/licenses/CERN-OHL-P-2.0.html"
+                    Id          = 367,
+                    Name        = "CERN Open Hardware Licence Version 2 - Permissive",
+                    SPDX        = "CERN-OHL-P-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CERN-OHL-P-2.0.html"
                 },
                 new Models.License
                 {
-                    Id   = 368, Name                     = "CERN Open Hardware Licence Version 2 - Strongly Reciprocal",
-                    SPDX = "CERN-OHL-S-2.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CERN-OHL-S-2.0.html"
+                    Id          = 368,
+                    Name        = "CERN Open Hardware Licence Version 2 - Strongly Reciprocal",
+                    SPDX        = "CERN-OHL-S-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CERN-OHL-S-2.0.html"
                 },
                 new Models.License
                 {
-                    Id   = 369, Name                     = "CERN Open Hardware Licence Version 2 - Weakly Reciprocal",
-                    SPDX = "CERN-OHL-W-2.0", FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/CERN-OHL-W-2.0.html"
+                    Id          = 369,
+                    Name        = "CERN Open Hardware Licence Version 2 - Weakly Reciprocal",
+                    SPDX        = "CERN-OHL-W-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/CERN-OHL-W-2.0.html"
                 },
                 new Models.License
                 {
-                    Id          = 370, Name = "Hippocratic License 2.1", SPDX = "Hippocratic-2.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Hippocratic-2.1.html"
+                    Id          = 370,
+                    Name        = "Hippocratic License 2.1",
+                    SPDX        = "Hippocratic-2.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Hippocratic-2.1.html"
                 },
                 new Models.License
                 {
-                    Id          = 371, Name = "LGPL-3.0 Linking Exception", SPDX = "LGPL-3.0-linking-exception",
-                    FsfApproved = false, OsiApproved = false,
+                    Id          = 371,
+                    Name        = "LGPL-3.0 Linking Exception",
+                    SPDX        = "LGPL-3.0-linking-exception",
+                    FsfApproved = false,
+                    OsiApproved = false,
                     Link        = "https://spdx.org/licenses/LGPL-3.0-linking-exception.html"
                 },
                 new Models.License
                 {
-                    Id          = 372, Name = "Mulan Permissive Software License, Version 2", SPDX = "MulanPSL-2.0",
-                    FsfApproved = false, OsiApproved = false, Link = "https://spdx.org/licenses/MulanPSL-2.0.html"
+                    Id          = 372,
+                    Name        = "Mulan Permissive Software License, Version 2",
+                    SPDX        = "MulanPSL-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/MulanPSL-2.0.html"
                 },
                 new Models.License
                 {
-                    Id = 373, Name = "Non-Commercial Government Licence", SPDX = "NCGL-UK-2.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/NCGL-UK-2.0.html"
+                    Id          = 373,
+                    Name        = "Non-Commercial Government Licence",
+                    SPDX        = "NCGL-UK-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/NCGL-UK-2.0.html"
                 },
                 new Models.License
                 {
-                    Id = 374, Name = "Open Use of Data Agreement v1.0", SPDX = "O-UDA-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/O-UDA-1.0.html"
+                    Id          = 374,
+                    Name        = "Open Use of Data Agreement v1.0",
+                    SPDX        = "O-UDA-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/O-UDA-1.0.html"
                 },
                 new Models.License
                 {
-                    Id = 375, Name = "OGC Software License, Version 1.0", SPDX = "OGC-1.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/OGC-1.0.html"
+                    Id          = 375,
+                    Name        = "OGC Software License, Version 1.0",
+                    SPDX        = "OGC-1.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/OGC-1.0.html"
                 },
                 new Models.License
                 {
-                    Id = 376, Name = "The Parity Public License 7.0.0", SPDX = "Parity-7.0.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/Parity-7.0.0.html"
+                    Id          = 376,
+                    Name        = "The Parity Public License 7.0.0",
+                    SPDX        = "Parity-7.0.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/Parity-7.0.0.html"
                 },
                 new Models.License
                 {
-                    Id = 377, Name = "PolyForm Noncommercial License 1.0.0", SPDX = "PolyForm-Noncommercial-1.0.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/PolyForm-Noncommercial-1.0.0.html"
+                    Id          = 377,
+                    Name        = "PolyForm Noncommercial License 1.0.0",
+                    SPDX        = "PolyForm-Noncommercial-1.0.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/PolyForm-Noncommercial-1.0.0.html"
                 },
                 new Models.License
                 {
-                    Id = 378, Name = "PolyForm Small Business License 1.0.0", SPDX = "PolyForm-Small-Business-1.0.0",
-                    FsfApproved = false, OsiApproved = false,
-                    Link = "https://spdx.org/licenses/PolyForm-Small-Business-1.0.0.html"
+                    Id          = 378,
+                    Name        = "PolyForm Small Business License 1.0.0",
+                    SPDX        = "PolyForm-Small-Business-1.0.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/PolyForm-Small-Business-1.0.0.html"
                 },
                 new Models.License
                 {
-                    Id          = 379, Name = "Solderpad Hardware License v2.0", SPDX = "SHL-2.0", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SHL-2.0.html"
+                    Id          = 379,
+                    Name        = "Solderpad Hardware License v2.0",
+                    SPDX        = "SHL-2.0",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SHL-2.0.html"
                 },
                 new Models.License
                 {
-                    Id          = 380, Name = "Solderpad Hardware License v2.1", SPDX = "SHL-2.1", FsfApproved = false,
-                    OsiApproved = false, Link = "https://spdx.org/licenses/SHL-2.1.html"
+                    Id          = 380,
+                    Name        = "Solderpad Hardware License v2.1",
+                    SPDX        = "SHL-2.1",
+                    FsfApproved = false,
+                    OsiApproved = false,
+                    Link        = "https://spdx.org/licenses/SHL-2.1.html"
                 }
             })
             {
diff --git a/Marechai.Database/Seeders/Roles.cs b/Marechai.Database/Seeders/Roles.cs
index a6e5549a..0f45becc 100644
--- a/Marechai.Database/Seeders/Roles.cs
+++ b/Marechai.Database/Seeders/Roles.cs
@@ -37,7 +37,8 @@ namespace Marechai.Database.Seeders
         {
             var roles = configuration.GetSection("MarechaiRoles").GetChildren().Select(x => new
             {
-                Name = x.GetValue<string>("Name"), Description = x.GetValue<string>("Description")
+                Name        = x.GetValue<string>("Name"),
+                Description = x.GetValue<string>("Description")
             }).ToList();
 
             if(roles.Count == 0)
diff --git a/Marechai.Database/Seeders/Users.cs b/Marechai.Database/Seeders/Users.cs
index 49d213ac..e6f95ffb 100644
--- a/Marechai.Database/Seeders/Users.cs
+++ b/Marechai.Database/Seeders/Users.cs
@@ -67,7 +67,9 @@ namespace Marechai.Database.Seeders
             {
                 uberAdmin = new ApplicationUser
                 {
-                    UserName = "claunia", Email = "claunia@claunia.com", EmailConfirmed = true
+                    UserName       = "claunia",
+                    Email          = "claunia@claunia.com",
+                    EmailConfirmed = true
                 };
 
                 byte[] newPass = new byte[8];
diff --git a/Marechai/Areas/Identity/IdentityHostingStartup.cs b/Marechai/Areas/Identity/IdentityHostingStartup.cs
index c67369a8..2f6b57ee 100644
--- a/Marechai/Areas/Identity/IdentityHostingStartup.cs
+++ b/Marechai/Areas/Identity/IdentityHostingStartup.cs
@@ -7,6 +7,6 @@ namespace Marechai.Areas.Identity
 {
     public class IdentityHostingStartup : IHostingStartup
     {
-        public void Configure(IWebHostBuilder builder) => builder.ConfigureServices((context, services) => { });
+        public void Configure(IWebHostBuilder builder) => builder.ConfigureServices((context, services) => {});
     }
 }
\ No newline at end of file
diff --git a/Marechai/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
index 3060a696..f4b13636 100644
--- a/Marechai/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
@@ -4,6 +4,6 @@ namespace Marechai.Areas.Identity.Pages.Account
 {
     public class AccessDeniedModel : PageModel
     {
-        public void OnGet() { }
+        public void OnGet() {}
     }
 }
\ No newline at end of file
diff --git a/Marechai/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
index 61b52d27..f899b211 100644
--- a/Marechai/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
@@ -139,7 +139,8 @@ namespace Marechai.Areas.Identity.Pages.Account
             {
                 var user = new ApplicationUser
                 {
-                    UserName = Input.Email, Email = Input.Email
+                    UserName = Input.Email,
+                    Email    = Input.Email
                 };
 
                 IdentityResult result = await _userManager.CreateAsync(user);
@@ -158,7 +159,9 @@ namespace Marechai.Areas.Identity.Pages.Account
 
                         string callbackUrl = Url.Page("/Account/ConfirmEmail", null, new
                         {
-                            area = "Identity", userId, code
+                            area = "Identity",
+                            userId,
+                            code
                         }, Request.Scheme);
 
                         await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
diff --git a/Marechai/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
index 0e810a21..af605b57 100644
--- a/Marechai/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
@@ -47,7 +47,8 @@ namespace Marechai.Areas.Identity.Pages.Account
 
                 string callbackUrl = Url.Page("/Account/ResetPassword", null, new
                 {
-                    area = "Identity", code
+                    area = "Identity",
+                    code
                 }, Request.Scheme);
 
                 await _emailSender.SendEmailAsync(Input.Email, "Reset Password",
diff --git a/Marechai/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
index 7d7f0bb7..59d780dd 100644
--- a/Marechai/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
@@ -6,6 +6,6 @@ namespace Marechai.Areas.Identity.Pages.Account
     [AllowAnonymous]
     public class ForgotPasswordConfirmation : PageModel
     {
-        public void OnGet() { }
+        public void OnGet() {}
     }
 }
\ No newline at end of file
diff --git a/Marechai/Areas/Identity/Pages/Account/Lockout.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/Lockout.cshtml.cs
index bb48d8cb..e6dc2718 100644
--- a/Marechai/Areas/Identity/Pages/Account/Lockout.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/Lockout.cshtml.cs
@@ -6,6 +6,6 @@ namespace Marechai.Areas.Identity.Pages.Account
     [AllowAnonymous]
     public class LockoutModel : PageModel
     {
-        public void OnGet() { }
+        public void OnGet() {}
     }
 }
\ No newline at end of file
diff --git a/Marechai/Areas/Identity/Pages/Account/Login.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/Login.cshtml.cs
index c737208a..2bfac00e 100644
--- a/Marechai/Areas/Identity/Pages/Account/Login.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/Login.cshtml.cs
@@ -77,7 +77,8 @@ namespace Marechai.Areas.Identity.Pages.Account
                 {
                     return RedirectToPage("./LoginWith2fa", new
                     {
-                        ReturnUrl = returnUrl, Input.RememberMe
+                        ReturnUrl = returnUrl,
+                        Input.RememberMe
                     });
                 }
 
diff --git a/Marechai/Areas/Identity/Pages/Account/Logout.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/Logout.cshtml.cs
index a3a90852..0896d6ea 100644
--- a/Marechai/Areas/Identity/Pages/Account/Logout.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/Logout.cshtml.cs
@@ -20,7 +20,7 @@ namespace Marechai.Areas.Identity.Pages.Account
             _logger        = logger;
         }
 
-        public void OnGet() { }
+        public void OnGet() {}
 
         public async Task<IActionResult> OnPost(string returnUrl = null)
         {
diff --git a/Marechai/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs
index c8cc2c77..b0336df5 100644
--- a/Marechai/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs
@@ -39,11 +39,8 @@ namespace Marechai.Areas.Identity.Pages.Account.Manage
             // Only include personal data for download
             Dictionary<string, string> personalData = new Dictionary<string, string>();
 
-            IEnumerable<PropertyInfo> personalDataProps = typeof(ApplicationUser).
-                                                          GetProperties().
-                                                          Where(prop =>
-                                                                    Attribute.IsDefined(prop,
-                                                                                        typeof(PersonalDataAttribute)));
+            IEnumerable<PropertyInfo> personalDataProps = typeof(ApplicationUser).GetProperties().
+                Where(prop => Attribute.IsDefined(prop, typeof(PersonalDataAttribute)));
 
             foreach(PropertyInfo p in personalDataProps)
             {
diff --git a/Marechai/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs
index cfae9c22..ea7603ed 100644
--- a/Marechai/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs
@@ -89,7 +89,9 @@ namespace Marechai.Areas.Identity.Pages.Account.Manage
 
                 string callbackUrl = Url.Page("/Account/ConfirmEmailChange", null, new
                 {
-                    userId, email = Input.NewEmail, code
+                    userId,
+                    email = Input.NewEmail,
+                    code
                 }, Request.Scheme);
 
                 await _emailSender.SendEmailAsync(Input.NewEmail, "Confirm your email",
@@ -128,7 +130,9 @@ namespace Marechai.Areas.Identity.Pages.Account.Manage
 
             string callbackUrl = Url.Page("/Account/ConfirmEmail", null, new
             {
-                area = "Identity", userId, code
+                area = "Identity",
+                userId,
+                code
             }, Request.Scheme);
 
             await _emailSender.SendEmailAsync(email, "Confirm your email",
diff --git a/Marechai/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
index d046fa3e..25d4d392 100644
--- a/Marechai/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
@@ -9,8 +9,8 @@ namespace Marechai.Areas.Identity.Pages.Account.Manage
 {
     public class ResetAuthenticatorModel : PageModel
     {
-        readonly SignInManager<ApplicationUser>   _signInManager;
         readonly ILogger<ResetAuthenticatorModel> _logger;
+        readonly SignInManager<ApplicationUser>   _signInManager;
         readonly UserManager<ApplicationUser>     _userManager;
 
         public ResetAuthenticatorModel(UserManager<ApplicationUser> userManager,
diff --git a/Marechai/Areas/Identity/Pages/Account/Register.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/Register.cshtml.cs
index 96ab57a0..ef26169a 100644
--- a/Marechai/Areas/Identity/Pages/Account/Register.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/Register.cshtml.cs
@@ -55,7 +55,8 @@ namespace Marechai.Areas.Identity.Pages.Account
             {
                 var user = new ApplicationUser
                 {
-                    UserName = Input.Email, Email = Input.Email
+                    UserName = Input.Email,
+                    Email    = Input.Email
                 };
 
                 IdentityResult result = await _userManager.CreateAsync(user, Input.Password);
@@ -69,7 +70,10 @@ namespace Marechai.Areas.Identity.Pages.Account
 
                     string callbackUrl = Url.Page("/Account/ConfirmEmail", null, new
                     {
-                        area = "Identity", userId = user.Id, code, returnUrl
+                        area   = "Identity",
+                        userId = user.Id,
+                        code,
+                        returnUrl
                     }, Request.Scheme);
 
                     await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
@@ -79,7 +83,8 @@ namespace Marechai.Areas.Identity.Pages.Account
                     {
                         return RedirectToPage("RegisterConfirmation", new
                         {
-                            email = Input.Email, returnUrl
+                            email = Input.Email,
+                            returnUrl
                         });
                     }
 
diff --git a/Marechai/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs
index 713a278c..829c7bbf 100644
--- a/Marechai/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs
@@ -55,7 +55,10 @@ namespace Marechai.Areas.Identity.Pages.Account
 
                 EmailConfirmationUrl = Url.Page("/Account/ConfirmEmail", null, new
                 {
-                    area = "Identity", userId, code, returnUrl
+                    area = "Identity",
+                    userId,
+                    code,
+                    returnUrl
                 }, Request.Scheme);
             }
 
diff --git a/Marechai/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs
index 5a4a9daf..1bb08de4 100644
--- a/Marechai/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs
@@ -27,7 +27,7 @@ namespace Marechai.Areas.Identity.Pages.Account
         [BindProperty]
         public InputModel Input { get; set; }
 
-        public void OnGet() { }
+        public void OnGet() {}
 
         public async Task<IActionResult> OnPostAsync()
         {
@@ -51,7 +51,8 @@ namespace Marechai.Areas.Identity.Pages.Account
 
             string callbackUrl = Url.Page("/Account/ConfirmEmail", null, new
             {
-                userId, code
+                userId,
+                code
             }, Request.Scheme);
 
             await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
diff --git a/Marechai/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs b/Marechai/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
index 80177c09..2aabcddc 100644
--- a/Marechai/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
+++ b/Marechai/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
@@ -6,6 +6,6 @@ namespace Marechai.Areas.Identity.Pages.Account
     [AllowAnonymous]
     public class ResetPasswordConfirmationModel : PageModel
     {
-        public void OnGet() { }
+        public void OnGet() {}
     }
 }
\ No newline at end of file
diff --git a/Marechai/Helpers/ImageMagick.cs b/Marechai/Helpers/ImageMagick.cs
index 9f1b3fe5..936b65ee 100644
--- a/Marechai/Helpers/ImageMagick.cs
+++ b/Marechai/Helpers/ImageMagick.cs
@@ -31,131 +31,131 @@ namespace Marechai.Helpers
         {
             switch(format)
             {
-                case"3FR":    return".3fr";
-                case"AAI":    return".aai";
-                case"AI":     return".ai";
-                case"ARW":    return".arw";
-                case"AVS":    return".avs";
-                case"BIE":    return".jbg";
-                case"BMP":    return".bmp";
-                case"BMP2":   return".bmp";
-                case"BMP3":   return".bmp";
-                case"CR2":    return".cr2";
-                case"CR3":    return".cr3";
-                case"CRW":    return".crw";
-                case"CUR":    return".cur";
-                case"CUT":    return".cut";
-                case"DCM":    return".dcm";
-                case"DCR":    return".dcr";
-                case"DCRAW":  return".dng";
-                case"DCX":    return".dcx";
-                case"DDS":    return".dds";
-                case"DNG":    return".dng";
-                case"DPX":    return".dpx";
-                case"DXT1":   return".dds";
-                case"DXT5":   return".dds";
-                case"EPDF":   return".pdf";
-                case"EPI":    return".epi";
-                case"EPS":    return".eps";
-                case"EPS2":   return".eps";
-                case"EPS3":   return".eps";
-                case"EPSF":   return".eps";
-                case"EPSI":   return".epi";
-                case"ERF":    return".erf";
-                case"EXR":    return".exr";
-                case"GIF":    return".gif";
-                case"GIF87":  return".gif";
-                case"GROUP4": return".tif";
-                case"HDR":    return".hdr";
-                case"HEIC":   return".heic";
-                case"ICB":    return".tga";
-                case"ICO":    return".ico";
-                case"ICON":   return".ico";
-                case"J2C":    return".jp2";
-                case"J2K":    return".jp2";
-                case"JBG":    return".jbg";
-                case"JBIG":   return".jbg";
-                case"JNG":    return".jng";
-                case"JP2":    return".jp2";
-                case"JPC":    return".jp2";
-                case"JPE":    return".jpg";
-                case"JPEG":   return".jpg";
-                case"JPG":    return".jpg";
-                case"K25":    return".k25";
-                case"KDC":    return".kdc";
-                case"MIFF":   return".miff";
-                case"MNG":    return".mng";
-                case"MRW":    return".mrw";
-                case"NEF":    return".nef";
-                case"NRW":    return".nrw";
-                case"ORF":    return".orf";
-                case"PALM":   return".palm";
-                case"PBM":    return".pbm";
-                case"PCD":    return".pcd";
-                case"PCDS":   return".pcd";
-                case"PCL":    return".pcl";
-                case"PCT":    return".pct";
-                case"PCX":    return".pcx";
-                case"PDB":    return".pdb";
-                case"PDF":    return".pdf";
-                case"PDFA":   return".pdf";
-                case"PEF":    return".pef";
-                case"PFM":    return".pfm";
-                case"PGM":    return".pgm";
-                case"PGX":    return".jp2";
-                case"PICON":  return".xpm";
-                case"PICT":   return".pct";
-                case"PNG":    return".png";
-                case"PNG00":  return".png";
-                case"PNG24":  return".png";
-                case"PNG32":  return".png";
-                case"PNG48":  return".png";
-                case"PNG64":  return".png";
-                case"PNG8":   return".png";
-                case"PNM":    return".pnm";
-                case"PPM":    return".ppm";
-                case"PS":     return".ps";
-                case"PS2":    return".ps";
-                case"PS3":    return".ps";
-                case"PSB":    return".psd";
-                case"PSD":    return".psd";
-                case"PTIF":   return".tif";
-                case"RAF":    return".raf";
-                case"RAS":    return".ras";
-                case"RAW":    return".dng";
-                case"RLA":    return".rla";
-                case"RMF":    return".rmf";
-                case"RW2":    return".rw2";
-                case"SCR":    return".scr";
-                case"SGI":    return".sgi";
-                case"SR2":    return".sr2";
-                case"SRF":    return".srf";
-                case"SUN":    return".ras";
-                case"SVG":    return".svg";
-                case"SVGZ":   return".svgz";
-                case"TGA":    return".tga";
-                case"TIFF":   return".tif";
-                case"TIFF64": return".tif";
-                case"TIM":    return".tim";
-                case"TIM2":   return".tm2";
-                case"TM2":    return".tm2";
-                case"VIFF":   return".viff";
-                case"VST":    return".vst";
-                case"WBMP":   return".wbmp";
-                case"WEBP":   return".webp";
-                case"WMF":    return".wmf";
-                case"WMZ":    return".wmf";
-                case"WPG":    return".wpg";
-                case"X":      return".x";
-                case"X3F":    return".x3f";
-                case"XBM":    return".xbm";
-                case"XC":     return".xc";
-                case"XCF":    return".xcf";
-                case"XPM":    return".xpm";
-                case"XPS":    return".xps";
-                case"XV":     return".xv";
-                case"XWD":    return".xwd";
-                default:      return null;
+                case "3FR":    return ".3fr";
+                case "AAI":    return ".aai";
+                case "AI":     return ".ai";
+                case "ARW":    return ".arw";
+                case "AVS":    return ".avs";
+                case "BIE":    return ".jbg";
+                case "BMP":    return ".bmp";
+                case "BMP2":   return ".bmp";
+                case "BMP3":   return ".bmp";
+                case "CR2":    return ".cr2";
+                case "CR3":    return ".cr3";
+                case "CRW":    return ".crw";
+                case "CUR":    return ".cur";
+                case "CUT":    return ".cut";
+                case "DCM":    return ".dcm";
+                case "DCR":    return ".dcr";
+                case "DCRAW":  return ".dng";
+                case "DCX":    return ".dcx";
+                case "DDS":    return ".dds";
+                case "DNG":    return ".dng";
+                case "DPX":    return ".dpx";
+                case "DXT1":   return ".dds";
+                case "DXT5":   return ".dds";
+                case "EPDF":   return ".pdf";
+                case "EPI":    return ".epi";
+                case "EPS":    return ".eps";
+                case "EPS2":   return ".eps";
+                case "EPS3":   return ".eps";
+                case "EPSF":   return ".eps";
+                case "EPSI":   return ".epi";
+                case "ERF":    return ".erf";
+                case "EXR":    return ".exr";
+                case "GIF":    return ".gif";
+                case "GIF87":  return ".gif";
+                case "GROUP4": return ".tif";
+                case "HDR":    return ".hdr";
+                case "HEIC":   return ".heic";
+                case "ICB":    return ".tga";
+                case "ICO":    return ".ico";
+                case "ICON":   return ".ico";
+                case "J2C":    return ".jp2";
+                case "J2K":    return ".jp2";
+                case "JBG":    return ".jbg";
+                case "JBIG":   return ".jbg";
+                case "JNG":    return ".jng";
+                case "JP2":    return ".jp2";
+                case "JPC":    return ".jp2";
+                case "JPE":    return ".jpg";
+                case "JPEG":   return ".jpg";
+                case "JPG":    return ".jpg";
+                case "K25":    return ".k25";
+                case "KDC":    return ".kdc";
+                case "MIFF":   return ".miff";
+                case "MNG":    return ".mng";
+                case "MRW":    return ".mrw";
+                case "NEF":    return ".nef";
+                case "NRW":    return ".nrw";
+                case "ORF":    return ".orf";
+                case "PALM":   return ".palm";
+                case "PBM":    return ".pbm";
+                case "PCD":    return ".pcd";
+                case "PCDS":   return ".pcd";
+                case "PCL":    return ".pcl";
+                case "PCT":    return ".pct";
+                case "PCX":    return ".pcx";
+                case "PDB":    return ".pdb";
+                case "PDF":    return ".pdf";
+                case "PDFA":   return ".pdf";
+                case "PEF":    return ".pef";
+                case "PFM":    return ".pfm";
+                case "PGM":    return ".pgm";
+                case "PGX":    return ".jp2";
+                case "PICON":  return ".xpm";
+                case "PICT":   return ".pct";
+                case "PNG":    return ".png";
+                case "PNG00":  return ".png";
+                case "PNG24":  return ".png";
+                case "PNG32":  return ".png";
+                case "PNG48":  return ".png";
+                case "PNG64":  return ".png";
+                case "PNG8":   return ".png";
+                case "PNM":    return ".pnm";
+                case "PPM":    return ".ppm";
+                case "PS":     return ".ps";
+                case "PS2":    return ".ps";
+                case "PS3":    return ".ps";
+                case "PSB":    return ".psd";
+                case "PSD":    return ".psd";
+                case "PTIF":   return ".tif";
+                case "RAF":    return ".raf";
+                case "RAS":    return ".ras";
+                case "RAW":    return ".dng";
+                case "RLA":    return ".rla";
+                case "RMF":    return ".rmf";
+                case "RW2":    return ".rw2";
+                case "SCR":    return ".scr";
+                case "SGI":    return ".sgi";
+                case "SR2":    return ".sr2";
+                case "SRF":    return ".srf";
+                case "SUN":    return ".ras";
+                case "SVG":    return ".svg";
+                case "SVGZ":   return ".svgz";
+                case "TGA":    return ".tga";
+                case "TIFF":   return ".tif";
+                case "TIFF64": return ".tif";
+                case "TIM":    return ".tim";
+                case "TIM2":   return ".tm2";
+                case "TM2":    return ".tm2";
+                case "VIFF":   return ".viff";
+                case "VST":    return ".vst";
+                case "WBMP":   return ".wbmp";
+                case "WEBP":   return ".webp";
+                case "WMF":    return ".wmf";
+                case "WMZ":    return ".wmf";
+                case "WPG":    return ".wpg";
+                case "X":      return ".x";
+                case "X3F":    return ".x3f";
+                case "XBM":    return ".xbm";
+                case "XC":     return ".xc";
+                case "XCF":    return ".xcf";
+                case "XPM":    return ".xpm";
+                case "XPS":    return ".xps";
+                case "XV":     return ".xv";
+                case "XWD":    return ".xwd";
+                default:       return null;
             }
         }
     }
diff --git a/Marechai/Helpers/Photos.cs b/Marechai/Helpers/Photos.cs
index 9c93a259..99d1d20d 100644
--- a/Marechai/Helpers/Photos.cs
+++ b/Marechai/Helpers/Photos.cs
@@ -107,7 +107,7 @@ namespace Marechai.Helpers
 
             switch(resolution)
             {
-                case"hd":
+                case "hd":
                     if(thumbnail)
                     {
                         width  = 256;
@@ -120,7 +120,7 @@ namespace Marechai.Helpers
                     }
 
                     break;
-                case"1440p":
+                case "1440p":
                     if(thumbnail)
                     {
                         width  = 384;
@@ -133,7 +133,7 @@ namespace Marechai.Helpers
                     }
 
                     break;
-                case"4k":
+                case "4k":
                     if(thumbnail)
                     {
                         width  = 512;
@@ -154,26 +154,26 @@ namespace Marechai.Helpers
 
             switch(outputFormat)
             {
-                case"jpeg":
+                case "jpeg":
                     outputPath = Path.Combine(outputPath, $"{id}.jpg");
 
                     return ConvertUsingImageMagick(originalPath, outputPath, width, height);
-                case"jp2k":
+                case "jp2k":
                     outputPath = Path.Combine(outputPath, $"{id}.jp2");
 
                     return ConvertUsingImageMagick(originalPath, outputPath, width, height);
 
-                case"webp":
+                case "webp":
                     outputPath = Path.Combine(outputPath, $"{id}.webp");
 
                     return ConvertUsingImageMagick(originalPath, outputPath, width, height);
 
-                case"heif":
+                case "heif":
                     outputPath = Path.Combine(outputPath, $"{id}.heic");
 
                     return ConvertUsingImageMagick(originalPath, outputPath, width, height);
 
-                case"avif":
+                case "avif":
                     outputPath = Path.Combine(outputPath, $"{id}.avif");
 
                     tmpPath = Path.GetTempFileName();
@@ -205,10 +205,16 @@ namespace Marechai.Helpers
             {
                 StartInfo =
                 {
-                    FileName               = "convert", CreateNoWindow = true, RedirectStandardError = true,
-                    RedirectStandardOutput = true, ArgumentList =
+                    FileName               = "convert",
+                    CreateNoWindow         = true,
+                    RedirectStandardError  = true,
+                    RedirectStandardOutput = true,
+                    ArgumentList =
                     {
-                        "-resize", $"{width}x{height}", "-strip", originalPath,
+                        "-resize",
+                        $"{width}x{height}",
+                        "-strip",
+                        originalPath,
                         outputPath
                     }
                 }
@@ -234,10 +240,16 @@ namespace Marechai.Helpers
             {
                 StartInfo =
                 {
-                    FileName               = "avifenc", CreateNoWindow = true, RedirectStandardError = true,
-                    RedirectStandardOutput = true, ArgumentList =
+                    FileName               = "avifenc",
+                    CreateNoWindow         = true,
+                    RedirectStandardError  = true,
+                    RedirectStandardOutput = true,
+                    ArgumentList =
                     {
-                        "-j", "4", originalPath, outputPath
+                        "-j",
+                        "4",
+                        originalPath,
+                        outputPath
                     }
                 }
             };
@@ -261,12 +273,12 @@ namespace Marechai.Helpers
             List<Task> pool = new List<Task>
             {
                 new Task(() => FinishedRenderingJpeg4kThumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                sourceFormat, "JPEG", "4k", true))),
+                                                                                    sourceFormat, "JPEG", "4k", true))),
                 new Task(() => FinishedRenderingJpeg1440Thumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                  sourceFormat, "JPEG", "1440p",
-                                                                                  true))),
+                                                                              sourceFormat, "JPEG", "1440p",
+                                                                              true))),
                 new Task(() => FinishedRenderingJpegHdThumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                sourceFormat, "JPEG", "hd", true))),
+                                                                                    sourceFormat, "JPEG", "hd", true))),
                 new Task(() => FinishedRenderingJpeg4k?.Invoke(Convert(webRootPath, id, originalFilePath, sourceFormat,
                                                                        "JPEG", "4k", false))),
                 new Task(() => FinishedRenderingJpeg1440?.Invoke(Convert(webRootPath, id, originalFilePath,
@@ -274,12 +286,12 @@ namespace Marechai.Helpers
                 new Task(() => FinishedRenderingJpegHd?.Invoke(Convert(webRootPath, id, originalFilePath, sourceFormat,
                                                                        "JPEG", "hd", false))),
                 new Task(() => FinishedRenderingJp2k4kThumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                sourceFormat, "JP2K", "4k", true))),
+                                                                                    sourceFormat, "JP2K", "4k", true))),
                 new Task(() => FinishedRenderingJp2k1440Thumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                  sourceFormat, "JP2K", "1440p",
-                                                                                  true))),
+                                                                              sourceFormat, "JP2K", "1440p",
+                                                                              true))),
                 new Task(() => FinishedRenderingJp2kHdThumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                sourceFormat, "JP2K", "hd", true))),
+                                                                                    sourceFormat, "JP2K", "hd", true))),
                 new Task(() => FinishedRenderingJp2k4k?.Invoke(Convert(webRootPath, id, originalFilePath, sourceFormat,
                                                                        "JP2K", "4k", false))),
                 new Task(() => FinishedRenderingJp2k1440?.Invoke(Convert(webRootPath, id, originalFilePath,
@@ -287,12 +299,12 @@ namespace Marechai.Helpers
                 new Task(() => FinishedRenderingJp2kHd?.Invoke(Convert(webRootPath, id, originalFilePath, sourceFormat,
                                                                        "JP2K", "hd", false))),
                 new Task(() => FinishedRenderingWebp4kThumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                sourceFormat, "WEBP", "4k", true))),
+                                                                                    sourceFormat, "WEBP", "4k", true))),
                 new Task(() => FinishedRenderingWebp1440Thumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                  sourceFormat, "WEBP", "1440p",
-                                                                                  true))),
+                                                                              sourceFormat, "WEBP", "1440p",
+                                                                              true))),
                 new Task(() => FinishedRenderingWebpHdThumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                sourceFormat, "WEBP", "hd", true))),
+                                                                                    sourceFormat, "WEBP", "hd", true))),
                 new Task(() => FinishedRenderingWebp4k?.Invoke(Convert(webRootPath, id, originalFilePath, sourceFormat,
                                                                        "WEBP", "4k", false))),
                 new Task(() => FinishedRenderingWebp1440?.Invoke(Convert(webRootPath, id, originalFilePath,
@@ -300,12 +312,12 @@ namespace Marechai.Helpers
                 new Task(() => FinishedRenderingWebpHd?.Invoke(Convert(webRootPath, id, originalFilePath, sourceFormat,
                                                                        "WEBP", "hd", false))),
                 new Task(() => FinishedRenderingHeif4kThumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                sourceFormat, "HEIF", "4k", true))),
+                                                                                    sourceFormat, "HEIF", "4k", true))),
                 new Task(() => FinishedRenderingHeif1440Thumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                  sourceFormat, "HEIF", "1440p",
-                                                                                  true))),
+                                                                              sourceFormat, "HEIF", "1440p",
+                                                                              true))),
                 new Task(() => FinishedRenderingHeifHdThumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                sourceFormat, "HEIF", "hd", true))),
+                                                                                    sourceFormat, "HEIF", "hd", true))),
                 new Task(() => FinishedRenderingHeif4k?.Invoke(Convert(webRootPath, id, originalFilePath, sourceFormat,
                                                                        "HEIF", "4k", false))),
                 new Task(() => FinishedRenderingHeif1440?.Invoke(Convert(webRootPath, id, originalFilePath,
@@ -313,12 +325,12 @@ namespace Marechai.Helpers
                 new Task(() => FinishedRenderingHeifHd?.Invoke(Convert(webRootPath, id, originalFilePath, sourceFormat,
                                                                        "HEIF", "hd", false))),
                 new Task(() => FinishedRenderingAvif4kThumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                sourceFormat, "AVIF", "4k", true))),
+                                                                                    sourceFormat, "AVIF", "4k", true))),
                 new Task(() => FinishedRenderingAvif1440Thumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                  sourceFormat, "AVIF", "1440p",
-                                                                                  true))),
+                                                                              sourceFormat, "AVIF", "1440p",
+                                                                              true))),
                 new Task(() => FinishedRenderingAvifHdThumbnail?.Invoke(Convert(webRootPath, id, originalFilePath,
-                                                                                sourceFormat, "AVIF", "hd", true))),
+                                                                                    sourceFormat, "AVIF", "hd", true))),
                 new Task(() => FinishedRenderingAvif4k?.Invoke(Convert(webRootPath, id, originalFilePath, sourceFormat,
                                                                        "AVIF", "4k", false))),
                 new Task(() => FinishedRenderingAvif1440?.Invoke(Convert(webRootPath, id, originalFilePath,
diff --git a/Marechai/Helpers/SvgRender.cs b/Marechai/Helpers/SvgRender.cs
index 1551e471..01746ed8 100644
--- a/Marechai/Helpers/SvgRender.cs
+++ b/Marechai/Helpers/SvgRender.cs
@@ -57,7 +57,7 @@ namespace Marechai.Helpers
 
                     switch(format)
                     {
-                        case"webp":
+                        case "webp":
                             skFormat = SKEncodedImageFormat.Webp;
 
                             break;
@@ -128,7 +128,9 @@ namespace Marechai.Helpers
                 {
                     context.CompanyLogos.Add(new CompanyLogo
                     {
-                        CompanyId = companyId, Year = year, Guid = guid
+                        CompanyId = companyId,
+                        Year      = year,
+                        Guid      = guid
                     });
 
                     context.SaveChanges();
@@ -160,7 +162,7 @@ namespace Marechai.Helpers
 
                         switch(format)
                         {
-                            case"webp":
+                            case "webp":
                                 skFormat = SKEncodedImageFormat.Webp;
 
                                 break;
@@ -247,7 +249,7 @@ namespace Marechai.Helpers
 
                     switch(format)
                     {
-                        case"webp":
+                        case "webp":
                             skFormat = SKEncodedImageFormat.Webp;
 
                             break;
diff --git a/Marechai/Interop/DetectOS.cs b/Marechai/Interop/DetectOS.cs
index 78077463..525fd8ec 100644
--- a/Marechai/Interop/DetectOS.cs
+++ b/Marechai/Interop/DetectOS.cs
@@ -66,7 +66,7 @@ namespace DiscImageChef.Interop
         {
             if((int)Environment.OSVersion.Platform < 4 ||
                (int)Environment.OSVersion.Platform == 5)
-                return(PlatformID)(int)Environment.OSVersion.Platform;
+                return (PlatformID)(int)Environment.OSVersion.Platform;
 
             int error = uname(out utsname unixname);
 
@@ -76,7 +76,7 @@ namespace DiscImageChef.Interop
             switch(unixname.sysname)
             {
                 // TODO: Differentiate Linux, Android, Tizen
-                case"Linux":
+                case "Linux":
                 {
                 #if __ANDROID__
                         return PlatformID.Android;
@@ -84,7 +84,7 @@ namespace DiscImageChef.Interop
                     return PlatformID.Linux;
                 #endif
                 }
-                case"Darwin":
+                case "Darwin":
                 {
                     int osxError;
 
@@ -123,29 +123,29 @@ namespace DiscImageChef.Interop
 
                     return PlatformID.MacOSX;
                 }
-                case"GNU": return PlatformID.Hurd;
-                case"FreeBSD":
-                case"GNU/kFreeBSD": return PlatformID.FreeBSD;
-                case"DragonFly": return PlatformID.DragonFly;
-                case"Haiku":     return PlatformID.Haiku;
-                case"HP-UX":     return PlatformID.HPUX;
-                case"AIX":       return PlatformID.AIX;
-                case"OS400":     return PlatformID.OS400;
-                case"IRIX":
-                case"IRIX64": return PlatformID.IRIX;
-                case"Minix":          return PlatformID.Minix;
-                case"NetBSD":         return PlatformID.NetBSD;
-                case"NONSTOP_KERNEL": return PlatformID.NonStop;
-                case"OpenBSD":        return PlatformID.OpenBSD;
-                case"QNX":            return PlatformID.QNX;
-                case"SINIX-Y":        return PlatformID.SINIX;
-                case"SunOS":          return PlatformID.Solaris;
-                case"OSF1":           return PlatformID.Tru64;
-                case"ULTRIX":         return PlatformID.Ultrix;
-                case"SCO_SV":         return PlatformID.OpenServer;
-                case"UnixWare":       return PlatformID.UnixWare;
-                case"Interix":
-                case"UWIN-W7": return PlatformID.Win32NT;
+                case "GNU": return PlatformID.Hurd;
+                case "FreeBSD":
+                case "GNU/kFreeBSD": return PlatformID.FreeBSD;
+                case "DragonFly": return PlatformID.DragonFly;
+                case "Haiku":     return PlatformID.Haiku;
+                case "HP-UX":     return PlatformID.HPUX;
+                case "AIX":       return PlatformID.AIX;
+                case "OS400":     return PlatformID.OS400;
+                case "IRIX":
+                case "IRIX64": return PlatformID.IRIX;
+                case "Minix":          return PlatformID.Minix;
+                case "NetBSD":         return PlatformID.NetBSD;
+                case "NONSTOP_KERNEL": return PlatformID.NonStop;
+                case "OpenBSD":        return PlatformID.OpenBSD;
+                case "QNX":            return PlatformID.QNX;
+                case "SINIX-Y":        return PlatformID.SINIX;
+                case "SunOS":          return PlatformID.Solaris;
+                case "OSF1":           return PlatformID.Tru64;
+                case "ULTRIX":         return PlatformID.Ultrix;
+                case "SCO_SV":         return PlatformID.OpenServer;
+                case "UnixWare":       return PlatformID.UnixWare;
+                case "Interix":
+                case "UWIN-W7": return PlatformID.Win32NT;
                 default:
                 {
                     if(unixname.sysname.StartsWith("CYGWIN_NT", StringComparison.Ordinal)  ||
@@ -169,12 +169,12 @@ namespace DiscImageChef.Interop
             {
                 case PlatformID.MacOSX:
                     if(Environment.OSVersion.Version.Major != 1)
-                        return$"10.{Environment.OSVersion.Version.Major - 4}.{Environment.OSVersion.Version.Minor}";
+                        return $"10.{Environment.OSVersion.Version.Major - 4}.{Environment.OSVersion.Version.Minor}";
 
                     switch(Environment.OSVersion.Version.Minor)
                     {
-                        case 3: return"10.0";
-                        case 4: return"10.1";
+                        case 3: return "10.0";
+                        case 4: return "10.1";
                     }
 
                     goto default;
@@ -199,107 +199,107 @@ namespace DiscImageChef.Interop
         {
             switch(id)
             {
-                case PlatformID.AIX:       return"AIX";
-                case PlatformID.Android:   return"Android";
-                case PlatformID.DragonFly: return"DragonFly BSD";
-                case PlatformID.FreeBSD:   return"FreeBSD";
-                case PlatformID.Haiku:     return"Haiku";
-                case PlatformID.HPUX:      return"HP/UX";
-                case PlatformID.Hurd:      return"Hurd";
-                case PlatformID.iOS:       return"iOS";
-                case PlatformID.IRIX:      return"IRIX";
-                case PlatformID.Linux:     return"Linux";
+                case PlatformID.AIX:       return "AIX";
+                case PlatformID.Android:   return "Android";
+                case PlatformID.DragonFly: return "DragonFly BSD";
+                case PlatformID.FreeBSD:   return "FreeBSD";
+                case PlatformID.Haiku:     return "Haiku";
+                case PlatformID.HPUX:      return "HP/UX";
+                case PlatformID.Hurd:      return "Hurd";
+                case PlatformID.iOS:       return "iOS";
+                case PlatformID.IRIX:      return "IRIX";
+                case PlatformID.Linux:     return "Linux";
                 case PlatformID.MacOSX:
                     if(string.IsNullOrEmpty(version))
-                        return"macOS";
+                        return "macOS";
 
                     string[] pieces = version.Split('.');
 
                     if(pieces.Length < 2 ||
                        !int.TryParse(pieces[1], out int minor))
-                        return"macOS";
+                        return "macOS";
 
                     if(minor >= 12)
-                        return"macOS";
+                        return "macOS";
 
                     if(minor >= 8)
-                        return"OS X";
+                        return "OS X";
 
-                    return"Mac OS X";
+                    return "Mac OS X";
 
-                case PlatformID.Minix:        return"MINIX";
-                case PlatformID.NetBSD:       return"NetBSD";
-                case PlatformID.NonStop:      return"NonStop OS";
-                case PlatformID.OpenBSD:      return"OpenBSD";
-                case PlatformID.OpenServer:   return"SCO OpenServer";
-                case PlatformID.OS400:        return"OS/400";
-                case PlatformID.PlayStation3: return"Sony CellOS";
-                case PlatformID.PlayStation4: return"Sony Orbis OS";
-                case PlatformID.QNX:          return"QNX";
-                case PlatformID.SINIX:        return"SINIX";
-                case PlatformID.Solaris:      return"Sun Solaris";
-                case PlatformID.Tizen:        return"Samsung Tizen";
-                case PlatformID.Tru64:        return"Tru64 UNIX";
-                case PlatformID.Ultrix:       return"Ultrix";
-                case PlatformID.Unix:         return"UNIX";
-                case PlatformID.UnixWare:     return"SCO UnixWare";
-                case PlatformID.Wii:          return"Nintendo Wii";
-                case PlatformID.WiiU:         return"Nintendo Wii U";
+                case PlatformID.Minix:        return "MINIX";
+                case PlatformID.NetBSD:       return "NetBSD";
+                case PlatformID.NonStop:      return "NonStop OS";
+                case PlatformID.OpenBSD:      return "OpenBSD";
+                case PlatformID.OpenServer:   return "SCO OpenServer";
+                case PlatformID.OS400:        return "OS/400";
+                case PlatformID.PlayStation3: return "Sony CellOS";
+                case PlatformID.PlayStation4: return "Sony Orbis OS";
+                case PlatformID.QNX:          return "QNX";
+                case PlatformID.SINIX:        return "SINIX";
+                case PlatformID.Solaris:      return "Sun Solaris";
+                case PlatformID.Tizen:        return "Samsung Tizen";
+                case PlatformID.Tru64:        return "Tru64 UNIX";
+                case PlatformID.Ultrix:       return "Ultrix";
+                case PlatformID.Unix:         return "UNIX";
+                case PlatformID.UnixWare:     return "SCO UnixWare";
+                case PlatformID.Wii:          return "Nintendo Wii";
+                case PlatformID.WiiU:         return "Nintendo Wii U";
                 case PlatformID.Win32NT:
                     if(string.IsNullOrEmpty(version))
-                        return"Windows NT/2000/XP/Vista/7/10";
+                        return "Windows NT/2000/XP/Vista/7/10";
 
                     if(version.StartsWith("3.", StringComparison.Ordinal) ||
                        version.StartsWith("4.", StringComparison.Ordinal))
-                        return"Windows NT";
+                        return "Windows NT";
 
                     if(version.StartsWith("5.0", StringComparison.Ordinal))
-                        return"Windows 2000";
+                        return "Windows 2000";
 
                     if(version.StartsWith("5.1", StringComparison.Ordinal))
-                        return"Windows XP";
+                        return "Windows XP";
 
                     if(version.StartsWith("5.2", StringComparison.Ordinal))
-                        return"Windows 2003";
+                        return "Windows 2003";
 
                     if(version.StartsWith("6.0", StringComparison.Ordinal))
-                        return"Windows Vista";
+                        return "Windows Vista";
 
                     if(version.StartsWith("6.1", StringComparison.Ordinal))
-                        return"Windows 7";
+                        return "Windows 7";
 
                     if(version.StartsWith("6.2", StringComparison.Ordinal))
-                        return"Windows 8";
+                        return "Windows 8";
 
                     if(version.StartsWith("6.3", StringComparison.Ordinal))
-                        return"Windows 8.1";
+                        return "Windows 8.1";
 
                     if(version.StartsWith("10.0", StringComparison.Ordinal))
-                        return"Windows 10";
+                        return "Windows 10";
 
-                    return"Windows NT/2000/XP/Vista/7/10";
-                case PlatformID.Win32S: return"Windows 3.x with win32s";
+                    return "Windows NT/2000/XP/Vista/7/10";
+                case PlatformID.Win32S: return "Windows 3.x with win32s";
                 case PlatformID.Win32Windows:
                     if(string.IsNullOrEmpty(version))
-                        return"Windows 9x/Me";
+                        return "Windows 9x/Me";
 
                     if(version.StartsWith("4.0", StringComparison.Ordinal))
-                        return"Windows 95";
+                        return "Windows 95";
 
                     if(version.StartsWith("4.10.2222", StringComparison.Ordinal))
-                        return"Windows 98 SE";
+                        return "Windows 98 SE";
 
                     if(version.StartsWith("4.1", StringComparison.Ordinal))
-                        return"Windows 98";
+                        return "Windows 98";
 
                     if(version.StartsWith("4.9", StringComparison.Ordinal))
-                        return"Windows Me";
+                        return "Windows Me";
 
-                    return"Windows 9x/Me";
-                case PlatformID.WinCE:        return"Windows CE/Mobile";
-                case PlatformID.WindowsPhone: return"Windows Phone";
-                case PlatformID.Xbox:         return"Xbox OS";
-                case PlatformID.zOS:          return"z/OS";
+                    return "Windows 9x/Me";
+                case PlatformID.WinCE:        return "Windows CE/Mobile";
+                case PlatformID.WindowsPhone: return "Windows Phone";
+                case PlatformID.Xbox:         return "Xbox OS";
+                case PlatformID.zOS:          return "z/OS";
                 default:                      return id.ToString();
             }
         }
diff --git a/Marechai/Interop/Version.cs b/Marechai/Interop/Version.cs
index 30effb1c..5d14ef64 100644
--- a/Marechai/Interop/Version.cs
+++ b/Marechai/Interop/Version.cs
@@ -75,7 +75,7 @@ namespace DiscImageChef.Interop
                                               GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static);
 
             if(monoDisplayName != null)
-                return(string)monoDisplayName.Invoke(null, null);
+                return (string)monoDisplayName.Invoke(null, null);
 
             return null;
         }
diff --git a/Marechai/Pages/Admin/Details/CreateMachinePhoto.razor.cs b/Marechai/Pages/Admin/Details/CreateMachinePhoto.razor.cs
index b0c2f289..b844b8bb 100644
--- a/Marechai/Pages/Admin/Details/CreateMachinePhoto.razor.cs
+++ b/Marechai/Pages/Admin/Details/CreateMachinePhoto.razor.cs
@@ -134,7 +134,9 @@ namespace Marechai.Pages.Admin.Details
             {
                 StartInfo =
                 {
-                    FileName               = "exiftool", CreateNoWindow = true, RedirectStandardError = true,
+                    FileName               = "exiftool",
+                    CreateNoWindow         = true,
+                    RedirectStandardError  = true,
                     RedirectStandardOutput = true
                 }
             };
@@ -143,7 +145,9 @@ namespace Marechai.Pages.Admin.Details
             {
                 StartInfo =
                 {
-                    FileName               = "identify", CreateNoWindow = true, RedirectStandardError = true,
+                    FileName               = "identify",
+                    CreateNoWindow         = true,
+                    RedirectStandardError  = true,
                     RedirectStandardOutput = true
                 }
             };
@@ -152,7 +156,9 @@ namespace Marechai.Pages.Admin.Details
             {
                 StartInfo =
                 {
-                    FileName               = "convert", CreateNoWindow = true, RedirectStandardError = true,
+                    FileName               = "convert",
+                    CreateNoWindow         = true,
+                    RedirectStandardError  = true,
                     RedirectStandardOutput = true
                 }
             };
@@ -256,8 +262,11 @@ namespace Marechai.Pages.Admin.Details
             {
                 StartInfo =
                 {
-                    FileName               = "identify", CreateNoWindow = true, RedirectStandardError = true,
-                    RedirectStandardOutput = true, ArgumentList =
+                    FileName               = "identify",
+                    CreateNoWindow         = true,
+                    RedirectStandardError  = true,
+                    RedirectStandardOutput = true,
+                    ArgumentList =
                     {
                         tmpPath
                     }
@@ -311,9 +320,13 @@ namespace Marechai.Pages.Admin.Details
 
             _model = new MachinePhotoViewModel
             {
-                UserId = (await UserManager.GetUserAsync(_authState.User)).Id, MachineId = MachineId,
-                Id     = Guid.NewGuid(), OriginalExtension = extension, UploadDate = DateTime.UtcNow,
-                Source = _unknownSource ? null : _sourceUrl, LicenseId = _licenseId
+                UserId            = (await UserManager.GetUserAsync(_authState.User)).Id,
+                MachineId         = MachineId,
+                Id                = Guid.NewGuid(),
+                OriginalExtension = extension,
+                UploadDate        = DateTime.UtcNow,
+                Source            = _unknownSource ? null : _sourceUrl,
+                LicenseId         = _licenseId
             };
 
             try
@@ -322,10 +335,15 @@ namespace Marechai.Pages.Admin.Details
                 {
                     StartInfo =
                     {
-                        FileName               = "exiftool", CreateNoWindow = true, RedirectStandardError = true,
-                        RedirectStandardOutput = true, ArgumentList =
+                        FileName               = "exiftool",
+                        CreateNoWindow         = true,
+                        RedirectStandardError  = true,
+                        RedirectStandardOutput = true,
+                        ArgumentList =
                         {
-                            "-n", "-json", tmpPath
+                            "-n",
+                            "-json",
+                            tmpPath
                         }
                     }
                 };
diff --git a/Marechai/Pages/Admin/Details/MachinePhoto.razor.cs b/Marechai/Pages/Admin/Details/MachinePhoto.razor.cs
index 73a4b808..ad0cce44 100644
--- a/Marechai/Pages/Admin/Details/MachinePhoto.razor.cs
+++ b/Marechai/Pages/Admin/Details/MachinePhoto.razor.cs
@@ -91,7 +91,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.ColorSpace is null)
                     return 0;
 
-                return(ushort)_model.ColorSpace;
+                return (ushort)_model.ColorSpace;
             }
             set => _model.ColorSpace = (ColorSpace)value;
         }
@@ -103,7 +103,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.Contrast is null)
                     return 0;
 
-                return(ushort)_model.Contrast;
+                return (ushort)_model.Contrast;
             }
             set => _model.Contrast = (Contrast)value;
         }
@@ -115,7 +115,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.ExposureMethod is null)
                     return 0;
 
-                return(ushort)_model.ExposureMethod;
+                return (ushort)_model.ExposureMethod;
             }
             set => _model.ExposureMethod = (ExposureMode)value;
         }
@@ -127,7 +127,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.ExposureProgram is null)
                     return 0;
 
-                return(ushort)_model.ExposureProgram;
+                return (ushort)_model.ExposureProgram;
             }
             set => _model.ExposureProgram = (ExposureProgram)value;
         }
@@ -139,7 +139,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.Flash is null)
                     return 0;
 
-                return(ushort)_model.Flash;
+                return (ushort)_model.Flash;
             }
             set => _model.Flash = (Flash)value;
         }
@@ -151,7 +151,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.LightSource is null)
                     return 0;
 
-                return(ushort)_model.LightSource;
+                return (ushort)_model.LightSource;
             }
             set => _model.LightSource = (LightSource)value;
         }
@@ -163,7 +163,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.MeteringMode is null)
                     return 0;
 
-                return(ushort)_model.MeteringMode;
+                return (ushort)_model.MeteringMode;
             }
             set => _model.MeteringMode = (MeteringMode)value;
         }
@@ -175,7 +175,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.ResolutionUnit is null)
                     return 0;
 
-                return(ushort)_model.ResolutionUnit;
+                return (ushort)_model.ResolutionUnit;
             }
             set => _model.ResolutionUnit = (ResolutionUnit)value;
         }
@@ -187,7 +187,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.Orientation is null)
                     return 0;
 
-                return(ushort)_model.Orientation;
+                return (ushort)_model.Orientation;
             }
             set => _model.Orientation = (Orientation)value;
         }
@@ -199,7 +199,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.Saturation is null)
                     return 0;
 
-                return(ushort)_model.Saturation;
+                return (ushort)_model.Saturation;
             }
             set => _model.Saturation = (Saturation)value;
         }
@@ -211,7 +211,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.SceneCaptureType is null)
                     return 0;
 
-                return(ushort)_model.SceneCaptureType;
+                return (ushort)_model.SceneCaptureType;
             }
             set => _model.SceneCaptureType = (SceneCaptureType)value;
         }
@@ -223,7 +223,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.SensingMethod is null)
                     return 0;
 
-                return(ushort)_model.SensingMethod;
+                return (ushort)_model.SensingMethod;
             }
             set => _model.SensingMethod = (SensingMethod)value;
         }
@@ -235,7 +235,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.Sharpness is null)
                     return 0;
 
-                return(ushort)_model.Sharpness;
+                return (ushort)_model.Sharpness;
             }
             set => _model.Sharpness = (Sharpness)value;
         }
@@ -247,7 +247,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.SubjectDistanceRange is null)
                     return 0;
 
-                return(ushort)_model.SubjectDistanceRange;
+                return (ushort)_model.SubjectDistanceRange;
             }
             set => _model.SubjectDistanceRange = (SubjectDistanceRange)value;
         }
@@ -259,7 +259,7 @@ namespace Marechai.Pages.Admin.Details
                 if(_model.WhiteBalance is null)
                     return 0;
 
-                return(ushort)_model.WhiteBalance;
+                return (ushort)_model.WhiteBalance;
             }
             set => _model.WhiteBalance = (WhiteBalance)value;
         }
diff --git a/Marechai/Pages/_Host.cshtml.cs b/Marechai/Pages/_Host.cshtml.cs
index f086a642..a013fe57 100644
--- a/Marechai/Pages/_Host.cshtml.cs
+++ b/Marechai/Pages/_Host.cshtml.cs
@@ -34,8 +34,8 @@ namespace Marechai.Pages
         public void OnGet() => HttpContext.Response.Cookies.Append(CookieRequestCultureProvider.DefaultCookieName,
                                                                    CookieRequestCultureProvider.
                                                                        MakeCookieValue(new
-                                                                                           RequestCulture(CultureInfo.CurrentCulture,
-                                                                                                          CultureInfo.
-                                                                                                              CurrentUICulture)));
+                                                                           RequestCulture(CultureInfo.CurrentCulture,
+                                                                               CultureInfo.
+                                                                                   CurrentUICulture)));
     }
 }
\ No newline at end of file
diff --git a/Marechai/Services/AdminService.cs b/Marechai/Services/AdminService.cs
index b0ab959a..3139e3df 100644
--- a/Marechai/Services/AdminService.cs
+++ b/Marechai/Services/AdminService.cs
@@ -25,5 +25,5 @@
 
 namespace Marechai.Services
 {
-    public class AdminService { }
+    public class AdminService {}
 }
\ No newline at end of file
diff --git a/Marechai/Services/BrowserTestsService.cs b/Marechai/Services/BrowserTestsService.cs
index 5be36c5f..b86d3219 100644
--- a/Marechai/Services/BrowserTestsService.cs
+++ b/Marechai/Services/BrowserTestsService.cs
@@ -37,9 +37,9 @@ namespace Marechai.Services
 
         public BrowserTestsService(MarechaiContext context) => _context = context;
 
-        public Task<List<BrowserTest>> GetAsync() => _context.
-                                                     BrowserTests.OrderBy(b => b.Browser).ThenBy(b => b.Version).
-                                                     ThenBy(b => b.Os).ThenBy(b => b.Platform).ThenBy(b => b.UserAgent).
-                                                     ToListAsync();
+        public Task<List<BrowserTest>> GetAsync() => _context.BrowserTests.OrderBy(b => b.Browser).
+                                                              ThenBy(b => b.Version).ThenBy(b => b.Os).
+                                                              ThenBy(b => b.Platform).ThenBy(b => b.UserAgent).
+                                                              ToListAsync();
     }
 }
\ No newline at end of file
diff --git a/Marechai/Services/CompaniesService.cs b/Marechai/Services/CompaniesService.cs
index 800eb613..ef774bab 100644
--- a/Marechai/Services/CompaniesService.cs
+++ b/Marechai/Services/CompaniesService.cs
@@ -50,10 +50,9 @@ namespace Marechai.Services
                                                                       Select(c => new CompanyViewModel
                                                                       {
                                                                           Id = c.Id,
-                                                                          LastLogo = c.
-                                                                                     Logos.
-                                                                                     OrderByDescending(l => l.Year).
-                                                                                     FirstOrDefault().Guid,
+                                                                          LastLogo = c.Logos.
+                                                                              OrderByDescending(l => l.Year).
+                                                                              FirstOrDefault().Guid,
                                                                           Name                = c.Name,
                                                                           Founded             = c.Founded,
                                                                           Sold                = c.Sold,
@@ -79,11 +78,9 @@ namespace Marechai.Services
                                                                                Select(c => new CompanyViewModel
                                                                                {
                                                                                    Id = c.Id,
-                                                                                   LastLogo = c.
-                                                                                              Logos.
-                                                                                              OrderByDescending(l => l.
-                                                                                                                    Year).
-                                                                                              FirstOrDefault().Guid,
+                                                                                   LastLogo = c.Logos.
+                                                                                       OrderByDescending(l => l.Year).
+                                                                                       FirstOrDefault().Guid,
                                                                                    Name       = c.Name,
                                                                                    Founded    = c.Founded,
                                                                                    Sold       = c.Sold,
@@ -189,42 +186,23 @@ namespace Marechai.Services
         public async Task<string> GetCountryNameAsync(int id) =>
             (await _context.Iso31661Numeric.FirstOrDefaultAsync(c => c.Id == id))?.Name;
 
-        public Task<List<CompanyViewModel>> GetCompaniesByCountryAsync(int countryId) => _context.
-                                                                                         Companies.
-                                                                                         Include(c => c.Logos).
-                                                                                         Where(c => c.CountryId ==
-                                                                                                    countryId).
-                                                                                         OrderBy(c => c.Name).
-                                                                                         Select(c =>
-                                                                                                    new CompanyViewModel
-                                                                                                    {
-                                                                                                        Id = c.Id,
-                                                                                                        LastLogo = c.
-                                                                                                                   Logos.
-                                                                                                                   OrderByDescending(l =>
-                                                                                                                                         l.
-                                                                                                                                             Year).
-                                                                                                                   FirstOrDefault().
-                                                                                                                   Guid,
-                                                                                                        Name = c.Name
-                                                                                                    }).ToListAsync();
+        public Task<List<CompanyViewModel>> GetCompaniesByCountryAsync(int countryId) => _context.Companies.
+            Include(c => c.Logos).Where(c => c.CountryId == countryId).OrderBy(c => c.Name).
+            Select(c => new CompanyViewModel
+            {
+                Id       = c.Id,
+                LastLogo = c.Logos.OrderByDescending(l => l.Year).FirstOrDefault().Guid,
+                Name     = c.Name
+            }).ToListAsync();
 
-        public Task<List<CompanyViewModel>> GetCompaniesByLetterAsync(char id) => _context.
-                                                                                  Companies.Include(c => c.Logos).
-                                                                                  Where(c => EF.Functions.Like(c.Name,
-                                                                                                               $"{id}%")).
-                                                                                  OrderBy(c => c.Name).
-                                                                                  Select(c => new CompanyViewModel
-                                                                                  {
-                                                                                      Id = c.Id,
-                                                                                      LastLogo = c.
-                                                                                                 Logos.
-                                                                                                 OrderByDescending(l =>
-                                                                                                                       l.
-                                                                                                                           Year).
-                                                                                                 FirstOrDefault().Guid,
-                                                                                      Name = c.Name
-                                                                                  }).ToListAsync();
+        public Task<List<CompanyViewModel>> GetCompaniesByLetterAsync(char id) => _context.Companies.
+            Include(c => c.Logos).Where(c => EF.Functions.Like(c.Name, $"{id}%")).OrderBy(c => c.Name).
+            Select(c => new CompanyViewModel
+            {
+                Id       = c.Id,
+                LastLogo = c.Logos.OrderByDescending(l => l.Year).FirstOrDefault().Guid,
+                Name     = c.Name
+            }).ToListAsync();
 
         public async Task DeleteAsync(int id, string userId)
         {
@@ -239,25 +217,13 @@ namespace Marechai.Services
         }
 
         public async Task<CompanyDescriptionViewModel> GetDescriptionAsync(int id) => await _context.
-                                                                                            CompanyDescriptions.
-                                                                                            Where(d => d.CompanyId ==
-                                                                                                       id).
-                                                                                            Select(d =>
-                                                                                                       new
-                                                                                                           CompanyDescriptionViewModel
-                                                                                                           {
-                                                                                                               Id =
-                                                                                                                   d.Id,
-                                                                                                               CompanyId
-                                                                                                                   = d.
-                                                                                                                       CompanyId,
-                                                                                                               Html = d.
-                                                                                                                   Html,
-                                                                                                               Markdown
-                                                                                                                   = d.
-                                                                                                                       Text
-                                                                                                           }).
-                                                                                            FirstOrDefaultAsync();
+            CompanyDescriptions.Where(d => d.CompanyId == id).Select(d => new CompanyDescriptionViewModel
+            {
+                Id        = d.Id,
+                CompanyId = d.CompanyId,
+                Html      = d.Html,
+                Markdown  = d.Text
+            }).FirstOrDefaultAsync();
 
         public async Task<int> CreateOrUpdateDescriptionAsync(int id, CompanyDescriptionViewModel description,
                                                               string userId)
diff --git a/Marechai/Services/CompanyLogosService.cs b/Marechai/Services/CompanyLogosService.cs
index 09c200ca..2def3b36 100644
--- a/Marechai/Services/CompanyLogosService.cs
+++ b/Marechai/Services/CompanyLogosService.cs
@@ -115,7 +115,9 @@ namespace Marechai.Services
         {
             var logo = new CompanyLogo
             {
-                Guid = guid, Year = year, CompanyId = companyId
+                Guid      = guid,
+                Year      = year,
+                CompanyId = companyId
             };
 
             await _context.CompanyLogos.AddAsync(logo);
diff --git a/Marechai/Services/ComputersService.cs b/Marechai/Services/ComputersService.cs
index cb0ee8aa..b8cb75cd 100644
--- a/Marechai/Services/ComputersService.cs
+++ b/Marechai/Services/ComputersService.cs
@@ -42,24 +42,26 @@ namespace Marechai.Services
         public async Task<int> GetComputersCountAsync() =>
             await _context.Machines.CountAsync(c => c.Type == MachineType.Computer);
 
-        public Task<int> GetMinimumYearAsync() => _context.
-                                                  Machines.Where(t => t.Type == MachineType.Computer &&
+        public Task<int> GetMinimumYearAsync() => _context.Machines.
+                                                           Where(t => t.Type == MachineType.Computer &&
                                                                       t.Introduced.HasValue          &&
                                                                       t.Introduced.Value.Year > 1000).
-                                                  MinAsync(t => t.Introduced.Value.Year);
+                                                           MinAsync(t => t.Introduced.Value.Year);
 
-        public Task<int> GetMaximumYearAsync() => _context.
-                                                  Machines.Where(t => t.Type == MachineType.Computer &&
+        public Task<int> GetMaximumYearAsync() => _context.Machines.
+                                                           Where(t => t.Type == MachineType.Computer &&
                                                                       t.Introduced.HasValue          &&
                                                                       t.Introduced.Value.Year > 1000).
-                                                  MaxAsync(t => t.Introduced.Value.Year);
+                                                           MaxAsync(t => t.Introduced.Value.Year);
 
         public async Task<List<MachineViewModel>> GetComputersByLetterAsync(char c) =>
             await _context.Machines.Include(m => m.Company).
                            Where(m => m.Type == MachineType.Computer && EF.Functions.Like(m.Name, $"{c}%")).
                            OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new MachineViewModel
                            {
-                               Id = m.Id, Name = m.Name, Company = m.Company.Name
+                               Id      = m.Id,
+                               Name    = m.Name,
+                               Company = m.Company.Name
                            }).ToListAsync();
 
         public async Task<List<MachineViewModel>> GetComputersByYearAsync(int year) =>
@@ -68,14 +70,18 @@ namespace Marechai.Services
                                       m.Introduced.Value.Year == year).OrderBy(m => m.Company.Name).ThenBy(m => m.Name).
                            Select(m => new MachineViewModel
                            {
-                               Id = m.Id, Name = m.Name, Company = m.Company.Name
+                               Id      = m.Id,
+                               Name    = m.Name,
+                               Company = m.Company.Name
                            }).ToListAsync();
 
         public async Task<List<MachineViewModel>> GetComputersAsync() =>
             await _context.Machines.Include(m => m.Company).Where(m => m.Type == MachineType.Computer).
                            OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new MachineViewModel
                            {
-                               Id = m.Id, Name = m.Name, Company = m.Company.Name
+                               Id      = m.Id,
+                               Name    = m.Name,
+                               Company = m.Company.Name
                            }).ToListAsync();
     }
 }
\ No newline at end of file
diff --git a/Marechai/Services/ConsolesService.cs b/Marechai/Services/ConsolesService.cs
index aaba0a06..4914eb0c 100644
--- a/Marechai/Services/ConsolesService.cs
+++ b/Marechai/Services/ConsolesService.cs
@@ -42,24 +42,26 @@ namespace Marechai.Services
         public async Task<int> GetConsolesCountAsync() =>
             await _context.Machines.CountAsync(c => c.Type == MachineType.Console);
 
-        public Task<int> GetMinimumYearAsync() => _context.
-                                                  Machines.Where(t => t.Type == MachineType.Console &&
+        public Task<int> GetMinimumYearAsync() => _context.Machines.
+                                                           Where(t => t.Type == MachineType.Console &&
                                                                       t.Introduced.HasValue         &&
                                                                       t.Introduced.Value.Year > 1000).
-                                                  MinAsync(t => t.Introduced.Value.Year);
+                                                           MinAsync(t => t.Introduced.Value.Year);
 
-        public Task<int> GetMaximumYearAsync() => _context.
-                                                  Machines.Where(t => t.Type == MachineType.Console &&
+        public Task<int> GetMaximumYearAsync() => _context.Machines.
+                                                           Where(t => t.Type == MachineType.Console &&
                                                                       t.Introduced.HasValue         &&
                                                                       t.Introduced.Value.Year > 1000).
-                                                  MaxAsync(t => t.Introduced.Value.Year);
+                                                           MaxAsync(t => t.Introduced.Value.Year);
 
         public async Task<List<MachineViewModel>> GetConsolesByLetterAsync(char c) =>
             await _context.Machines.Include(m => m.Company).
                            Where(m => m.Type == MachineType.Console && EF.Functions.Like(m.Name, $"{c}%")).
                            OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new MachineViewModel
                            {
-                               Id = m.Id, Name = m.Name, Company = m.Company.Name
+                               Id      = m.Id,
+                               Name    = m.Name,
+                               Company = m.Company.Name
                            }).ToListAsync();
 
         public async Task<List<MachineViewModel>> GetConsolesByYearAsync(int year) =>
@@ -68,14 +70,18 @@ namespace Marechai.Services
                                       m.Introduced.Value.Year == year).OrderBy(m => m.Company.Name).ThenBy(m => m.Name).
                            Select(m => new MachineViewModel
                            {
-                               Id = m.Id, Name = m.Name, Company = m.Company.Name
+                               Id      = m.Id,
+                               Name    = m.Name,
+                               Company = m.Company.Name
                            }).ToListAsync();
 
         public async Task<List<MachineViewModel>> GetConsolesAsync() =>
             await _context.Machines.Include(m => m.Company).Where(m => m.Type == MachineType.Console).
                            OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new MachineViewModel
                            {
-                               Id = m.Id, Name = m.Name, Company = m.Company.Name
+                               Id      = m.Id,
+                               Name    = m.Name,
+                               Company = m.Company.Name
                            }).ToListAsync();
     }
 }
\ No newline at end of file
diff --git a/Marechai/Services/DocumentCompaniesService.cs b/Marechai/Services/DocumentCompaniesService.cs
index 52ec28b6..b4864275 100644
--- a/Marechai/Services/DocumentCompaniesService.cs
+++ b/Marechai/Services/DocumentCompaniesService.cs
@@ -42,7 +42,8 @@ namespace Marechai.Services
                                                                               DocumentCompanies.OrderBy(c => c.Name).
                                                                               Select(d => new DocumentCompanyViewModel
                                                                               {
-                                                                                  Id        = d.Id, Name = d.Name,
+                                                                                  Id        = d.Id,
+                                                                                  Name      = d.Name,
                                                                                   Company   = d.Company.Name,
                                                                                   CompanyId = d.CompanyId
                                                                               }).ToListAsync();
@@ -50,7 +51,9 @@ namespace Marechai.Services
         public async Task<DocumentCompanyViewModel> GetAsync(int id) =>
             await _context.DocumentCompanies.Where(d => d.Id == id).Select(d => new DocumentCompanyViewModel
             {
-                Id = d.Id, Name = d.Name, CompanyId = d.CompanyId
+                Id        = d.Id,
+                Name      = d.Name,
+                CompanyId = d.CompanyId
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(DocumentCompanyViewModel viewModel, string userId)
@@ -70,7 +73,8 @@ namespace Marechai.Services
         {
             var model = new DocumentCompany
             {
-                CompanyId = viewModel.CompanyId, Name = viewModel.Name
+                CompanyId = viewModel.CompanyId,
+                Name      = viewModel.Name
             };
 
             await _context.DocumentCompanies.AddAsync(model);
diff --git a/Marechai/Services/DocumentPeopleService.cs b/Marechai/Services/DocumentPeopleService.cs
index bc436d84..18ea5efb 100644
--- a/Marechai/Services/DocumentPeopleService.cs
+++ b/Marechai/Services/DocumentPeopleService.cs
@@ -44,7 +44,8 @@ namespace Marechai.Services
                                                                              ThenBy(d => d.Surname).
                                                                              Select(d => new DocumentPersonViewModel
                                                                              {
-                                                                                 Id       = d.Id, Name = d.FullName,
+                                                                                 Id       = d.Id,
+                                                                                 Name     = d.FullName,
                                                                                  Person   = d.Person.FullName,
                                                                                  PersonId = d.PersonId
                                                                              }).ToListAsync();
@@ -52,8 +53,12 @@ namespace Marechai.Services
         public async Task<DocumentPersonViewModel> GetAsync(int id) =>
             await _context.DocumentPeople.Where(p => p.Id == id).Select(d => new DocumentPersonViewModel
             {
-                Id          = d.Id, Alias             = d.Alias, Name = d.Name, Surname = d.Surname,
-                DisplayName = d.DisplayName, PersonId = d.PersonId
+                Id          = d.Id,
+                Alias       = d.Alias,
+                Name        = d.Name,
+                Surname     = d.Surname,
+                DisplayName = d.DisplayName,
+                PersonId    = d.PersonId
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(DocumentPersonViewModel viewModel, string userId)
@@ -76,8 +81,11 @@ namespace Marechai.Services
         {
             var model = new DocumentPerson
             {
-                Alias       = viewModel.Alias, Name           = viewModel.Name, Surname = viewModel.Surname,
-                DisplayName = viewModel.DisplayName, PersonId = viewModel.PersonId
+                Alias       = viewModel.Alias,
+                Name        = viewModel.Name,
+                Surname     = viewModel.Surname,
+                DisplayName = viewModel.DisplayName,
+                PersonId    = viewModel.PersonId
             };
 
             await _context.AddAsync(model);
diff --git a/Marechai/Services/GpusByMachineService.cs b/Marechai/Services/GpusByMachineService.cs
index a954f9d8..b7e34bc8 100644
--- a/Marechai/Services/GpusByMachineService.cs
+++ b/Marechai/Services/GpusByMachineService.cs
@@ -41,8 +41,11 @@ namespace Marechai.Services
         public async Task<List<GpuByMachineViewModel>> GetByMachine(int machineId) =>
             await _context.GpusByMachine.Where(g => g.MachineId == machineId).Select(g => new GpuByMachineViewModel
             {
-                Id        = g.Id, Name = g.Gpu.Name, CompanyName = g.Gpu.Company.Name, GpuId = g.GpuId,
-                MachineId = g.MachineId
+                Id          = g.Id,
+                Name        = g.Gpu.Name,
+                CompanyName = g.Gpu.Company.Name,
+                GpuId       = g.GpuId,
+                MachineId   = g.MachineId
             }).OrderBy(g => g.CompanyName).ThenBy(g => g.Name).ToListAsync();
 
         public async Task DeleteAsync(long id, string userId)
@@ -61,7 +64,8 @@ namespace Marechai.Services
         {
             var item = new GpusByMachine
             {
-                GpuId = gpuId, MachineId = machineId
+                GpuId     = gpuId,
+                MachineId = machineId
             };
 
             await _context.GpusByMachine.AddAsync(item);
diff --git a/Marechai/Services/GpusService.cs b/Marechai/Services/GpusService.cs
index dfb1698a..bb2f0081 100644
--- a/Marechai/Services/GpusService.cs
+++ b/Marechai/Services/GpusService.cs
@@ -42,26 +42,43 @@ namespace Marechai.Services
             await _context.Gpus.OrderBy(g => g.Company.Name).ThenBy(g => g.Name).ThenBy(g => g.Introduced).
                            Select(g => new GpuViewModel
                            {
-                               Id = g.Id, Company = g.Company.Name, Introduced = g.Introduced, ModelCode = g.ModelCode,
-                               Name = g.Name
+                               Id         = g.Id,
+                               Company    = g.Company.Name,
+                               Introduced = g.Introduced,
+                               ModelCode  = g.ModelCode,
+                               Name       = g.Name
                            }).ToListAsync();
 
         public async Task<List<GpuViewModel>> GetByMachineAsync(int machineId) =>
             await _context.GpusByMachine.Where(g => g.MachineId == machineId).Select(g => g.Gpu).
                            OrderBy(g => g.Company.Name).ThenBy(g => g.Name).Select(g => new GpuViewModel
                            {
-                               Id          = g.Id, Name = g.Name, Company = g.Company.Name, CompanyId = g.Company.Id,
-                               ModelCode   = g.ModelCode, Introduced = g.Introduced, Package = g.Package,
-                               Process     = g.Process, ProcessNm = g.ProcessNm, DieSize = g.DieSize,
+                               Id          = g.Id,
+                               Name        = g.Name,
+                               Company     = g.Company.Name,
+                               CompanyId   = g.Company.Id,
+                               ModelCode   = g.ModelCode,
+                               Introduced  = g.Introduced,
+                               Package     = g.Package,
+                               Process     = g.Process,
+                               ProcessNm   = g.ProcessNm,
+                               DieSize     = g.DieSize,
                                Transistors = g.Transistors
                            }).ToListAsync();
 
         public async Task<GpuViewModel> GetAsync(int id) =>
             await _context.Gpus.Where(g => g.Id == id).Select(g => new GpuViewModel
             {
-                Id         = g.Id, Name             = g.Name, CompanyId  = g.Company.Id, ModelCode = g.ModelCode,
-                Introduced = g.Introduced, Package  = g.Package, Process = g.Process, ProcessNm    = g.ProcessNm,
-                DieSize    = g.DieSize, Transistors = g.Transistors
+                Id          = g.Id,
+                Name        = g.Name,
+                CompanyId   = g.Company.Id,
+                ModelCode   = g.ModelCode,
+                Introduced  = g.Introduced,
+                Package     = g.Package,
+                Process     = g.Process,
+                ProcessNm   = g.ProcessNm,
+                DieSize     = g.DieSize,
+                Transistors = g.Transistors
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(GpuViewModel viewModel, string userId)
@@ -88,9 +105,15 @@ namespace Marechai.Services
         {
             var model = new Gpu
             {
-                Name       = viewModel.Name, CompanyId     = viewModel.CompanyId, ModelCode = viewModel.ModelCode,
-                Introduced = viewModel.Introduced, Package = viewModel.Package, Process     = viewModel.Process,
-                ProcessNm  = viewModel.ProcessNm, DieSize  = viewModel.DieSize, Transistors = viewModel.Transistors
+                Name        = viewModel.Name,
+                CompanyId   = viewModel.CompanyId,
+                ModelCode   = viewModel.ModelCode,
+                Introduced  = viewModel.Introduced,
+                Package     = viewModel.Package,
+                Process     = viewModel.Process,
+                ProcessNm   = viewModel.ProcessNm,
+                DieSize     = viewModel.DieSize,
+                Transistors = viewModel.Transistors
             };
 
             await _context.Gpus.AddAsync(model);
diff --git a/Marechai/Services/InstructionSetExtensionsByProcessorService.cs b/Marechai/Services/InstructionSetExtensionsByProcessorService.cs
index 1b3ad2ac..9922249b 100644
--- a/Marechai/Services/InstructionSetExtensionsByProcessorService.cs
+++ b/Marechai/Services/InstructionSetExtensionsByProcessorService.cs
@@ -42,8 +42,11 @@ namespace Marechai.Services
             await _context.InstructionSetExtensionsByProcessor.Where(e => e.ProcessorId == processorId).
                            Select(e => new InstructionSetExtensionByProcessorViewModel
                            {
-                               Id          = e.Id, Extension = e.Extension.Extension, Processor = e.Processor.Name,
-                               ProcessorId = e.ProcessorId, ExtensionId = e.ExtensionId
+                               Id          = e.Id,
+                               Extension   = e.Extension.Extension,
+                               Processor   = e.Processor.Name,
+                               ProcessorId = e.ProcessorId,
+                               ExtensionId = e.ExtensionId
                            }).OrderBy(e => e.Extension).ToListAsync();
 
         public async Task DeleteAsync(int id, string userId)
@@ -62,7 +65,8 @@ namespace Marechai.Services
         {
             var item = new InstructionSetExtensionsByProcessor
             {
-                ProcessorId = processorId, ExtensionId = extensionId
+                ProcessorId = processorId,
+                ExtensionId = extensionId
             };
 
             await _context.InstructionSetExtensionsByProcessor.AddAsync(item);
diff --git a/Marechai/Services/InstructionSetExtensionsService.cs b/Marechai/Services/InstructionSetExtensionsService.cs
index 5360a0ef..299cda24 100644
--- a/Marechai/Services/InstructionSetExtensionsService.cs
+++ b/Marechai/Services/InstructionSetExtensionsService.cs
@@ -41,13 +41,15 @@ namespace Marechai.Services
         public async Task<List<InstructionSetExtension>> GetAsync() =>
             await _context.InstructionSetExtensions.OrderBy(e => e.Extension).Select(e => new InstructionSetExtension
             {
-                Extension = e.Extension, Id = e.Id
+                Extension = e.Extension,
+                Id        = e.Id
             }).ToListAsync();
 
         public async Task<InstructionSetExtension> GetAsync(int id) =>
             await _context.InstructionSetExtensions.Where(e => e.Id == id).Select(e => new InstructionSetExtension
             {
-                Extension = e.Extension, Id = e.Id
+                Extension = e.Extension,
+                Id        = e.Id
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(InstructionSetExtension viewModel, string userId)
diff --git a/Marechai/Services/InstructionSetsService.cs b/Marechai/Services/InstructionSetsService.cs
index 67c74eac..b98af2d9 100644
--- a/Marechai/Services/InstructionSetsService.cs
+++ b/Marechai/Services/InstructionSetsService.cs
@@ -41,13 +41,15 @@ namespace Marechai.Services
         public async Task<List<InstructionSet>> GetAsync() =>
             await _context.InstructionSets.OrderBy(e => e.Name).Select(e => new InstructionSet
             {
-                Name = e.Name, Id = e.Id
+                Name = e.Name,
+                Id   = e.Id
             }).ToListAsync();
 
         public async Task<InstructionSet> GetAsync(int id) =>
             await _context.InstructionSets.Where(e => e.Id == id).Select(e => new InstructionSet
             {
-                Name = e.Name, Id = e.Id
+                Name = e.Name,
+                Id   = e.Id
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(InstructionSet viewModel, string userId)
diff --git a/Marechai/Services/LicensesService.cs b/Marechai/Services/LicensesService.cs
index 7bb41fe9..c14e20aa 100644
--- a/Marechai/Services/LicensesService.cs
+++ b/Marechai/Services/LicensesService.cs
@@ -40,15 +40,24 @@ namespace Marechai.Services
         public async Task<List<License>> GetAsync() =>
             await _context.Licenses.OrderBy(l => l.Name).Select(l => new License
             {
-                FsfApproved = l.FsfApproved, Id   = l.Id, Link = l.Link, Name = l.Name,
-                OsiApproved = l.OsiApproved, SPDX = l.SPDX
+                FsfApproved = l.FsfApproved,
+                Id          = l.Id,
+                Link        = l.Link,
+                Name        = l.Name,
+                OsiApproved = l.OsiApproved,
+                SPDX        = l.SPDX
             }).ToListAsync();
 
         public async Task<License> GetAsync(int id) =>
             await _context.Licenses.Where(l => l.Id == id).Select(l => new License
             {
-                FsfApproved = l.FsfApproved, Id   = l.Id, Link   = l.Link, Name = l.Name,
-                OsiApproved = l.OsiApproved, SPDX = l.SPDX, Text = l.Text
+                FsfApproved = l.FsfApproved,
+                Id          = l.Id,
+                Link        = l.Link,
+                Name        = l.Name,
+                OsiApproved = l.OsiApproved,
+                SPDX        = l.SPDX,
+                Text        = l.Text
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(License viewModel, string userId)
@@ -72,8 +81,12 @@ namespace Marechai.Services
         {
             var model = new License
             {
-                FsfApproved = viewModel.FsfApproved, Link = viewModel.Link, Name = viewModel.Name,
-                OsiApproved = viewModel.OsiApproved, SPDX = viewModel.SPDX, Text = viewModel.Text
+                FsfApproved = viewModel.FsfApproved,
+                Link        = viewModel.Link,
+                Name        = viewModel.Name,
+                OsiApproved = viewModel.OsiApproved,
+                SPDX        = viewModel.SPDX,
+                Text        = viewModel.Text
             };
 
             await _context.Licenses.AddAsync(model);
diff --git a/Marechai/Services/MachineFamiliesService.cs b/Marechai/Services/MachineFamiliesService.cs
index f3f4dab0..a19fb435 100644
--- a/Marechai/Services/MachineFamiliesService.cs
+++ b/Marechai/Services/MachineFamiliesService.cs
@@ -42,13 +42,17 @@ namespace Marechai.Services
             await _context.MachineFamilies.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).
                            Select(m => new MachineFamilyViewModel
                            {
-                               Id = m.Id, Company = m.Company.Name, Name = m.Name
+                               Id      = m.Id,
+                               Company = m.Company.Name,
+                               Name    = m.Name
                            }).OrderBy(m => m.Name).ToListAsync();
 
         public async Task<MachineFamilyViewModel> GetAsync(int id) =>
             await _context.MachineFamilies.Where(f => f.Id == id).Select(m => new MachineFamilyViewModel
             {
-                Id = m.Id, CompanyId = m.CompanyId, Name = m.Name
+                Id        = m.Id,
+                CompanyId = m.CompanyId,
+                Name      = m.Name
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(MachineFamilyViewModel viewModel, string userId)
@@ -68,7 +72,8 @@ namespace Marechai.Services
         {
             var model = new MachineFamily
             {
-                Name = viewModel.Name, CompanyId = viewModel.CompanyId
+                Name      = viewModel.Name,
+                CompanyId = viewModel.CompanyId
             };
 
             await _context.MachineFamilies.AddAsync(model);
diff --git a/Marechai/Services/MachinePhotosService.cs b/Marechai/Services/MachinePhotosService.cs
index 48698a38..3477978c 100644
--- a/Marechai/Services/MachinePhotosService.cs
+++ b/Marechai/Services/MachinePhotosService.cs
@@ -46,20 +46,48 @@ namespace Marechai.Services
         public async Task<MachinePhotoViewModel> GetAsync(Guid id) =>
             await _context.MachinePhotos.Where(p => p.Id == id).Select(p => new MachinePhotoViewModel
             {
-                Aperture = p.Aperture, Author = p.Author, CameraManufacturer = p.CameraManufacturer,
-                CameraModel = p.CameraModel, ColorSpace = p.ColorSpace, Comments = p.Comments, Contrast = p.Contrast,
-                CreationDate = p.CreationDate, DigitalZoomRatio = p.DigitalZoomRatio, ExifVersion = p.ExifVersion,
-                ExposureTime = p.ExposureTime, ExposureMethod = p.ExposureMethod, ExposureProgram = p.ExposureProgram,
-                Flash = p.Flash, Focal = p.Focal, FocalLength = p.FocalLength,
-                FocalLengthEquivalent = p.FocalLengthEquivalent, HorizontalResolution = p.HorizontalResolution,
-                Id = p.Id, IsoRating = p.IsoRating, Lens = p.Lens, LicenseId = p.LicenseId,
-                LicenseName = p.License.Name, LightSource = p.LightSource, MachineCompanyName = p.Machine.Company.Name,
-                MachineId = p.MachineId, MachineName = p.Machine.Name, MeteringMode = p.MeteringMode,
-                ResolutionUnit = p.ResolutionUnit, Orientation = p.Orientation, Saturation = p.Saturation,
-                SceneCaptureType = p.SceneCaptureType, SensingMethod = p.SensingMethod, Sharpness = p.Sharpness,
-                SoftwareUsed = p.SoftwareUsed, Source = p.Source, SubjectDistanceRange = p.SubjectDistanceRange,
-                UploadDate = p.UploadDate, UserId = p.UserId, VerticalResolution = p.VerticalResolution,
-                WhiteBalance = p.WhiteBalance, OriginalExtension = p.OriginalExtension
+                Aperture              = p.Aperture,
+                Author                = p.Author,
+                CameraManufacturer    = p.CameraManufacturer,
+                CameraModel           = p.CameraModel,
+                ColorSpace            = p.ColorSpace,
+                Comments              = p.Comments,
+                Contrast              = p.Contrast,
+                CreationDate          = p.CreationDate,
+                DigitalZoomRatio      = p.DigitalZoomRatio,
+                ExifVersion           = p.ExifVersion,
+                ExposureTime          = p.ExposureTime,
+                ExposureMethod        = p.ExposureMethod,
+                ExposureProgram       = p.ExposureProgram,
+                Flash                 = p.Flash,
+                Focal                 = p.Focal,
+                FocalLength           = p.FocalLength,
+                FocalLengthEquivalent = p.FocalLengthEquivalent,
+                HorizontalResolution  = p.HorizontalResolution,
+                Id                    = p.Id,
+                IsoRating             = p.IsoRating,
+                Lens                  = p.Lens,
+                LicenseId             = p.LicenseId,
+                LicenseName           = p.License.Name,
+                LightSource           = p.LightSource,
+                MachineCompanyName    = p.Machine.Company.Name,
+                MachineId             = p.MachineId,
+                MachineName           = p.Machine.Name,
+                MeteringMode          = p.MeteringMode,
+                ResolutionUnit        = p.ResolutionUnit,
+                Orientation           = p.Orientation,
+                Saturation            = p.Saturation,
+                SceneCaptureType      = p.SceneCaptureType,
+                SensingMethod         = p.SensingMethod,
+                Sharpness             = p.Sharpness,
+                SoftwareUsed          = p.SoftwareUsed,
+                Source                = p.Source,
+                SubjectDistanceRange  = p.SubjectDistanceRange,
+                UploadDate            = p.UploadDate,
+                UserId                = p.UserId,
+                VerticalResolution    = p.VerticalResolution,
+                WhiteBalance          = p.WhiteBalance,
+                OriginalExtension     = p.OriginalExtension
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(MachinePhotoViewModel viewModel, string userId)
@@ -111,24 +139,45 @@ namespace Marechai.Services
         {
             var model = new MachinePhoto
             {
-                Aperture = viewModel.Aperture, Author = viewModel.Author,
-                CameraManufacturer = viewModel.CameraManufacturer, CameraModel = viewModel.CameraModel,
-                ColorSpace = viewModel.ColorSpace, Comments = viewModel.Comments, Contrast = viewModel.Contrast,
-                CreationDate = viewModel.CreationDate, DigitalZoomRatio = viewModel.DigitalZoomRatio,
-                ExifVersion = viewModel.ExifVersion, ExposureTime = viewModel.ExposureTime,
-                ExposureMethod = viewModel.ExposureMethod, ExposureProgram = viewModel.ExposureProgram,
-                Flash = viewModel.Flash, Focal = viewModel.Focal, FocalLength = viewModel.FocalLength,
+                Aperture              = viewModel.Aperture,
+                Author                = viewModel.Author,
+                CameraManufacturer    = viewModel.CameraManufacturer,
+                CameraModel           = viewModel.CameraModel,
+                ColorSpace            = viewModel.ColorSpace,
+                Comments              = viewModel.Comments,
+                Contrast              = viewModel.Contrast,
+                CreationDate          = viewModel.CreationDate,
+                DigitalZoomRatio      = viewModel.DigitalZoomRatio,
+                ExifVersion           = viewModel.ExifVersion,
+                ExposureTime          = viewModel.ExposureTime,
+                ExposureMethod        = viewModel.ExposureMethod,
+                ExposureProgram       = viewModel.ExposureProgram,
+                Flash                 = viewModel.Flash,
+                Focal                 = viewModel.Focal,
+                FocalLength           = viewModel.FocalLength,
                 FocalLengthEquivalent = viewModel.FocalLengthEquivalent,
-                HorizontalResolution = viewModel.HorizontalResolution, Id = viewModel.Id,
-                IsoRating = viewModel.IsoRating, Lens = viewModel.Lens, LicenseId = viewModel.LicenseId,
-                LightSource = viewModel.LightSource, MachineId = viewModel.MachineId,
-                MeteringMode = viewModel.MeteringMode, ResolutionUnit = viewModel.ResolutionUnit,
-                Orientation = viewModel.Orientation, Saturation = viewModel.Saturation,
-                SceneCaptureType = viewModel.SceneCaptureType, SensingMethod = viewModel.SensingMethod,
-                Sharpness = viewModel.Sharpness, SoftwareUsed = viewModel.SoftwareUsed, Source = viewModel.Source,
-                SubjectDistanceRange = viewModel.SubjectDistanceRange, UploadDate = viewModel.UploadDate,
-                UserId = viewModel.UserId, VerticalResolution = viewModel.VerticalResolution,
-                WhiteBalance = viewModel.WhiteBalance, OriginalExtension = viewModel.OriginalExtension
+                HorizontalResolution  = viewModel.HorizontalResolution,
+                Id                    = viewModel.Id,
+                IsoRating             = viewModel.IsoRating,
+                Lens                  = viewModel.Lens,
+                LicenseId             = viewModel.LicenseId,
+                LightSource           = viewModel.LightSource,
+                MachineId             = viewModel.MachineId,
+                MeteringMode          = viewModel.MeteringMode,
+                ResolutionUnit        = viewModel.ResolutionUnit,
+                Orientation           = viewModel.Orientation,
+                Saturation            = viewModel.Saturation,
+                SceneCaptureType      = viewModel.SceneCaptureType,
+                SensingMethod         = viewModel.SensingMethod,
+                Sharpness             = viewModel.Sharpness,
+                SoftwareUsed          = viewModel.SoftwareUsed,
+                Source                = viewModel.Source,
+                SubjectDistanceRange  = viewModel.SubjectDistanceRange,
+                UploadDate            = viewModel.UploadDate,
+                UserId                = viewModel.UserId,
+                VerticalResolution    = viewModel.VerticalResolution,
+                WhiteBalance          = viewModel.WhiteBalance,
+                OriginalExtension     = viewModel.OriginalExtension
             };
 
             await _context.MachinePhotos.AddAsync(model);
diff --git a/Marechai/Services/MachinesService.cs b/Marechai/Services/MachinesService.cs
index 5cd69c20..f042a5f0 100644
--- a/Marechai/Services/MachinesService.cs
+++ b/Marechai/Services/MachinesService.cs
@@ -58,18 +58,26 @@ namespace Marechai.Services
             await _context.Machines.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).ThenBy(m => m.Family.Name).
                            Select(m => new MachineViewModel
                            {
-                               Id         = m.Id, Company      = m.Company.Name, Name = m.Name, Model = m.Model,
-                               Introduced = m.Introduced, Type = m.Type, Family       = m.Family.Name
+                               Id         = m.Id,
+                               Company    = m.Company.Name,
+                               Name       = m.Name,
+                               Model      = m.Model,
+                               Introduced = m.Introduced,
+                               Type       = m.Type,
+                               Family     = m.Family.Name
                            }).ToListAsync();
 
         public async Task<MachineViewModel> GetAsync(int id) => await _context.Machines.Where(m => m.Id == id).
                                                                                Select(m => new MachineViewModel
                                                                                {
-                                                                                   Id = m.Id, Company = m.Company.Name,
-                                                                                   CompanyId = m.CompanyId,
-                                                                                   Name = m.Name, Model = m.Model,
+                                                                                   Id         = m.Id,
+                                                                                   Company    = m.Company.Name,
+                                                                                   CompanyId  = m.CompanyId,
+                                                                                   Name       = m.Name,
+                                                                                   Model      = m.Model,
                                                                                    Introduced = m.Introduced,
-                                                                                   Type = m.Type, FamilyId = m.FamilyId
+                                                                                   Type       = m.Type,
+                                                                                   FamilyId   = m.FamilyId
                                                                                }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(MachineViewModel viewModel, string userId)
@@ -88,7 +96,8 @@ namespace Marechai.Services
 
             var news = new News
             {
-                AddedId = model.Id, Date = DateTime.UtcNow
+                AddedId = model.Id,
+                Date    = DateTime.UtcNow
             };
 
             switch(model.Type)
@@ -117,8 +126,12 @@ namespace Marechai.Services
         {
             var model = new Machine
             {
-                CompanyId  = viewModel.CompanyId, Name  = viewModel.Name, Model    = viewModel.Model,
-                Introduced = viewModel.Introduced, Type = viewModel.Type, FamilyId = viewModel.FamilyId
+                CompanyId  = viewModel.CompanyId,
+                Name       = viewModel.Name,
+                Model      = viewModel.Model,
+                Introduced = viewModel.Introduced,
+                Type       = viewModel.Type,
+                FamilyId   = viewModel.FamilyId
             };
 
             await _context.Machines.AddAsync(model);
@@ -126,7 +139,8 @@ namespace Marechai.Services
 
             var news = new News
             {
-                AddedId = model.Id, Date = DateTime.UtcNow
+                AddedId = model.Id,
+                Date    = DateTime.UtcNow
             };
 
             switch(model.Type)
@@ -163,8 +177,11 @@ namespace Marechai.Services
 
             var model = new MachineViewModel
             {
-                Introduced = machine.Introduced, Name = machine.Name, CompanyId = machine.CompanyId,
-                Model      = machine.Model, Type = machine.Type
+                Introduced = machine.Introduced,
+                Name       = machine.Name,
+                CompanyId  = machine.CompanyId,
+                Model      = machine.Model,
+                Type       = machine.Type
             };
 
             Company company = await _context.Companies.FindAsync(model.CompanyId);
@@ -197,7 +214,10 @@ namespace Marechai.Services
             model.Memory = await _context.MemoryByMachine.Where(m => m.MachineId == machine.Id).
                                           Select(m => new MemoryViewModel
                                           {
-                                              Type = m.Type, Usage = m.Usage, Size = m.Size, Speed = m.Speed
+                                              Type  = m.Type,
+                                              Usage = m.Usage,
+                                              Size  = m.Size,
+                                              Speed = m.Speed
                                           }).ToListAsync();
 
             model.Processors = await _processorsService.GetByMachineAsync(machine.Id);
@@ -207,7 +227,9 @@ namespace Marechai.Services
             model.Storage = await _context.StorageByMachine.Where(s => s.MachineId == machine.Id).
                                            Select(s => new StorageViewModel
                                            {
-                                               Type = s.Type, Interface = s.Interface, Capacity = s.Capacity
+                                               Type      = s.Type,
+                                               Interface = s.Interface,
+                                               Capacity  = s.Capacity
                                            }).ToListAsync();
 
             return model;
diff --git a/Marechai/Services/MemoriesByMachineService.cs b/Marechai/Services/MemoriesByMachineService.cs
index 498fccff..065a1b8b 100644
--- a/Marechai/Services/MemoriesByMachineService.cs
+++ b/Marechai/Services/MemoriesByMachineService.cs
@@ -42,8 +42,12 @@ namespace Marechai.Services
         public async Task<List<MemoryByMachineViewModel>> GetByMachine(int machineId) =>
             await _context.MemoryByMachine.Where(m => m.MachineId == machineId).Select(m => new MemoryByMachineViewModel
             {
-                Id    = m.Id, Type         = m.Type, Usage = m.Usage, Size = m.Size,
-                Speed = m.Speed, MachineId = m.MachineId
+                Id        = m.Id,
+                Type      = m.Type,
+                Usage     = m.Usage,
+                Size      = m.Size,
+                Speed     = m.Speed,
+                MachineId = m.MachineId
             }).OrderBy(m => m.Type).ThenBy(m => m.Usage).ThenBy(m => m.Size).ThenBy(m => m.Speed).ToListAsync();
 
         public async Task DeleteAsync(long id, string userId)
@@ -63,7 +67,10 @@ namespace Marechai.Services
         {
             var item = new MemoryByMachine
             {
-                MachineId = machineId, Type = type, Usage = usage, Size = size,
+                MachineId = machineId,
+                Type      = type,
+                Usage     = usage,
+                Size      = size,
                 Speed     = speed
             };
 
diff --git a/Marechai/Services/NewsService.cs b/Marechai/Services/NewsService.cs
index 810c95d5..ac40215d 100644
--- a/Marechai/Services/NewsService.cs
+++ b/Marechai/Services/NewsService.cs
@@ -48,8 +48,10 @@ namespace Marechai.Services
         public async Task<List<NewsViewModel>> GetAsync() => await _context.News.OrderByDescending(n => n.Date).
                                                                             Select(n => new NewsViewModel
                                                                             {
-                                                                                Id   = n.Id, Timestamp    = n.Date,
-                                                                                Type = n.Type, AffectedId = n.AddedId
+                                                                                Id         = n.Id,
+                                                                                Timestamp  = n.Date,
+                                                                                Type       = n.Type,
+                                                                                AffectedId = n.AddedId
                                                                             }).ToListAsync();
 
         public List<NewsViewModel> GetNews()
diff --git a/Marechai/Services/PeopleService.cs b/Marechai/Services/PeopleService.cs
index b141bc23..033693c9 100644
--- a/Marechai/Services/PeopleService.cs
+++ b/Marechai/Services/PeopleService.cs
@@ -42,18 +42,35 @@ namespace Marechai.Services
             await _context.People.OrderBy(p => p.DisplayName).ThenBy(p => p.Alias).ThenBy(p => p.Name).
                            ThenBy(p => p.Surname).Select(p => new PersonViewModel
                            {
-                               Id = p.Id, Name = p.Name, Surname = p.Surname, CountryOfBirth = p.CountryOfBirth.Name,
-                               BirthDate = p.BirthDate, DeathDate = p.DeathDate, Webpage = p.Webpage,
-                               Twitter = p.Twitter, Facebook = p.Facebook, Photo = p.Photo, Alias = p.Alias,
-                               DisplayName = p.DisplayName
+                               Id             = p.Id,
+                               Name           = p.Name,
+                               Surname        = p.Surname,
+                               CountryOfBirth = p.CountryOfBirth.Name,
+                               BirthDate      = p.BirthDate,
+                               DeathDate      = p.DeathDate,
+                               Webpage        = p.Webpage,
+                               Twitter        = p.Twitter,
+                               Facebook       = p.Facebook,
+                               Photo          = p.Photo,
+                               Alias          = p.Alias,
+                               DisplayName    = p.DisplayName
                            }).ToListAsync();
 
         public async Task<PersonViewModel> GetAsync(int id) =>
             await _context.People.Where(p => p.Id == id).Select(p => new PersonViewModel
             {
-                Id        = p.Id, Name             = p.Name, Surname = p.Surname, CountryOfBirthId = p.CountryOfBirthId,
-                BirthDate = p.BirthDate, DeathDate = p.DeathDate, Webpage = p.Webpage, Twitter = p.Twitter,
-                Facebook  = p.Facebook, Photo      = p.Photo, Alias = p.Alias, DisplayName = p.DisplayName
+                Id               = p.Id,
+                Name             = p.Name,
+                Surname          = p.Surname,
+                CountryOfBirthId = p.CountryOfBirthId,
+                BirthDate        = p.BirthDate,
+                DeathDate        = p.DeathDate,
+                Webpage          = p.Webpage,
+                Twitter          = p.Twitter,
+                Facebook         = p.Facebook,
+                Photo            = p.Photo,
+                Alias            = p.Alias,
+                DisplayName      = p.DisplayName
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(PersonViewModel viewModel, string userId)
@@ -82,10 +99,17 @@ namespace Marechai.Services
         {
             var model = new Person
             {
-                Name      = viewModel.Name, Surname = viewModel.Surname, CountryOfBirthId = viewModel.CountryOfBirthId,
-                BirthDate = viewModel.BirthDate, DeathDate = viewModel.DeathDate, Webpage = viewModel.Webpage,
-                Twitter   = viewModel.Twitter, Facebook = viewModel.Facebook, Photo = viewModel.Photo,
-                Alias     = viewModel.Alias, DisplayName = viewModel.DisplayName
+                Name             = viewModel.Name,
+                Surname          = viewModel.Surname,
+                CountryOfBirthId = viewModel.CountryOfBirthId,
+                BirthDate        = viewModel.BirthDate,
+                DeathDate        = viewModel.DeathDate,
+                Webpage          = viewModel.Webpage,
+                Twitter          = viewModel.Twitter,
+                Facebook         = viewModel.Facebook,
+                Photo            = viewModel.Photo,
+                Alias            = viewModel.Alias,
+                DisplayName      = viewModel.DisplayName
             };
 
             await _context.People.AddAsync(model);
diff --git a/Marechai/Services/ProcessorsByMachineService.cs b/Marechai/Services/ProcessorsByMachineService.cs
index 3a6d3e0d..9cfadcc6 100644
--- a/Marechai/Services/ProcessorsByMachineService.cs
+++ b/Marechai/Services/ProcessorsByMachineService.cs
@@ -42,8 +42,12 @@ namespace Marechai.Services
             await _context.ProcessorsByMachine.Where(p => p.MachineId == machineId).
                            Select(p => new ProcessorByMachineViewModel
                            {
-                               Id          = p.Id, Name = p.Processor.Name, CompanyName = p.Processor.Company.Name,
-                               ProcessorId = p.ProcessorId, MachineId = p.MachineId, Speed = p.Speed
+                               Id          = p.Id,
+                               Name        = p.Processor.Name,
+                               CompanyName = p.Processor.Company.Name,
+                               ProcessorId = p.ProcessorId,
+                               MachineId   = p.MachineId,
+                               Speed       = p.Speed
                            }).OrderBy(p => p.CompanyName).ThenBy(p => p.Name).ToListAsync();
 
         public async Task DeleteAsync(long id, string userId)
@@ -62,7 +66,9 @@ namespace Marechai.Services
         {
             var item = new ProcessorsByMachine
             {
-                ProcessorId = processorId, MachineId = machineId, Speed = speed
+                ProcessorId = processorId,
+                MachineId   = machineId,
+                Speed       = speed
             };
 
             await _context.ProcessorsByMachine.AddAsync(item);
diff --git a/Marechai/Services/ProcessorsService.cs b/Marechai/Services/ProcessorsService.cs
index d7f7c901..2200ea13 100644
--- a/Marechai/Services/ProcessorsService.cs
+++ b/Marechai/Services/ProcessorsService.cs
@@ -41,29 +41,66 @@ namespace Marechai.Services
         public async Task<List<ProcessorViewModel>> GetAsync() =>
             await _context.Processors.Select(p => new ProcessorViewModel
             {
-                Name = p.Name, CompanyName = p.Company.Name, CompanyId = p.Company.Id, ModelCode = p.ModelCode,
-                Introduced = p.Introduced, Speed = p.Speed, Package = p.Package, Gprs = p.Gprs,
-                GprSize = p.GprSize, Fprs = p.Fprs, FprSize = p.FprSize, Cores = p.Cores,
-                ThreadsPerCore = p.ThreadsPerCore, Process = p.Process, ProcessNm = p.ProcessNm, DieSize = p.DieSize,
-                Transistors = p.Transistors, DataBus = p.DataBus, AddrBus = p.AddrBus, SimdRegisters = p.SimdRegisters,
-                SimdSize = p.SimdSize, L1Instruction = p.L1Instruction, L1Data = p.L1Data, L2 = p.L2,
-                L3 = p.L3, InstructionSet = p.InstructionSet.Name, Id = p.Id,
+                Name                     = p.Name,
+                CompanyName              = p.Company.Name,
+                CompanyId                = p.Company.Id,
+                ModelCode                = p.ModelCode,
+                Introduced               = p.Introduced,
+                Speed                    = p.Speed,
+                Package                  = p.Package,
+                Gprs                     = p.Gprs,
+                GprSize                  = p.GprSize,
+                Fprs                     = p.Fprs,
+                FprSize                  = p.FprSize,
+                Cores                    = p.Cores,
+                ThreadsPerCore           = p.ThreadsPerCore,
+                Process                  = p.Process,
+                ProcessNm                = p.ProcessNm,
+                DieSize                  = p.DieSize,
+                Transistors              = p.Transistors,
+                DataBus                  = p.DataBus,
+                AddrBus                  = p.AddrBus,
+                SimdRegisters            = p.SimdRegisters,
+                SimdSize                 = p.SimdSize,
+                L1Instruction            = p.L1Instruction,
+                L1Data                   = p.L1Data,
+                L2                       = p.L2,
+                L3                       = p.L3,
+                InstructionSet           = p.InstructionSet.Name,
+                Id                       = p.Id,
                 InstructionSetExtensions = p.InstructionSetExtensions.Select(e => e.Extension.Extension).ToList()
             }).OrderBy(p => p.CompanyName).ThenBy(p => p.Name).ToListAsync();
 
         public async Task<List<ProcessorViewModel>> GetByMachineAsync(int machineId) =>
             await _context.ProcessorsByMachine.Where(p => p.MachineId == machineId).Select(p => new ProcessorViewModel
             {
-                Name = p.Processor.Name, CompanyName = p.Processor.Company.Name, CompanyId = p.Processor.Company.Id,
-                ModelCode = p.Processor.ModelCode, Introduced = p.Processor.Introduced, Speed = p.Speed,
-                Package = p.Processor.Package, Gprs = p.Processor.Gprs, GprSize = p.Processor.GprSize,
-                Fprs = p.Processor.Fprs, FprSize = p.Processor.FprSize, Cores = p.Processor.Cores,
-                ThreadsPerCore = p.Processor.ThreadsPerCore, Process = p.Processor.Process,
-                ProcessNm = p.Processor.ProcessNm, DieSize = p.Processor.DieSize, Transistors = p.Processor.Transistors,
-                DataBus = p.Processor.DataBus, AddrBus = p.Processor.AddrBus, SimdRegisters = p.Processor.SimdRegisters,
-                SimdSize = p.Processor.SimdSize, L1Instruction = p.Processor.L1Instruction, L1Data = p.Processor.L1Data,
-                L2 = p.Processor.L2, L3 = p.Processor.L3, InstructionSet = p.Processor.InstructionSet.Name,
-                Id = p.Processor.Id,
+                Name           = p.Processor.Name,
+                CompanyName    = p.Processor.Company.Name,
+                CompanyId      = p.Processor.Company.Id,
+                ModelCode      = p.Processor.ModelCode,
+                Introduced     = p.Processor.Introduced,
+                Speed          = p.Speed,
+                Package        = p.Processor.Package,
+                Gprs           = p.Processor.Gprs,
+                GprSize        = p.Processor.GprSize,
+                Fprs           = p.Processor.Fprs,
+                FprSize        = p.Processor.FprSize,
+                Cores          = p.Processor.Cores,
+                ThreadsPerCore = p.Processor.ThreadsPerCore,
+                Process        = p.Processor.Process,
+                ProcessNm      = p.Processor.ProcessNm,
+                DieSize        = p.Processor.DieSize,
+                Transistors    = p.Processor.Transistors,
+                DataBus        = p.Processor.DataBus,
+                AddrBus        = p.Processor.AddrBus,
+                SimdRegisters  = p.Processor.SimdRegisters,
+                SimdSize       = p.Processor.SimdSize,
+                L1Instruction  = p.Processor.L1Instruction,
+                L1Data         = p.Processor.L1Data,
+                L2             = p.Processor.L2,
+                L3             = p.Processor.L3,
+                InstructionSet = p.Processor.InstructionSet.Name,
+                Id             = p.Processor.Id,
                 InstructionSetExtensions =
                     p.Processor.InstructionSetExtensions.Select(e => e.Extension.Extension).ToList()
             }).OrderBy(p => p.CompanyName).ThenBy(p => p.Name).ToListAsync();
@@ -71,13 +108,33 @@ namespace Marechai.Services
         public async Task<ProcessorViewModel> GetAsync(int id) =>
             await _context.Processors.Where(p => p.Id == id).Select(p => new ProcessorViewModel
             {
-                Name = p.Name, CompanyName = p.Company.Name, CompanyId = p.Company.Id, ModelCode = p.ModelCode,
-                Introduced = p.Introduced, Speed = p.Speed, Package = p.Package, Gprs = p.Gprs,
-                GprSize = p.GprSize, Fprs = p.Fprs, FprSize = p.FprSize, Cores = p.Cores,
-                ThreadsPerCore = p.ThreadsPerCore, Process = p.Process, ProcessNm = p.ProcessNm, DieSize = p.DieSize,
-                Transistors = p.Transistors, DataBus = p.DataBus, AddrBus = p.AddrBus, SimdRegisters = p.SimdRegisters,
-                SimdSize = p.SimdSize, L1Instruction = p.L1Instruction, L1Data = p.L1Data, L2 = p.L2,
-                L3 = p.L3, InstructionSet = p.InstructionSet.Name, InstructionSetId = p.InstructionSetId
+                Name             = p.Name,
+                CompanyName      = p.Company.Name,
+                CompanyId        = p.Company.Id,
+                ModelCode        = p.ModelCode,
+                Introduced       = p.Introduced,
+                Speed            = p.Speed,
+                Package          = p.Package,
+                Gprs             = p.Gprs,
+                GprSize          = p.GprSize,
+                Fprs             = p.Fprs,
+                FprSize          = p.FprSize,
+                Cores            = p.Cores,
+                ThreadsPerCore   = p.ThreadsPerCore,
+                Process          = p.Process,
+                ProcessNm        = p.ProcessNm,
+                DieSize          = p.DieSize,
+                Transistors      = p.Transistors,
+                DataBus          = p.DataBus,
+                AddrBus          = p.AddrBus,
+                SimdRegisters    = p.SimdRegisters,
+                SimdSize         = p.SimdSize,
+                L1Instruction    = p.L1Instruction,
+                L1Data           = p.L1Data,
+                L2               = p.L2,
+                L3               = p.L3,
+                InstructionSet   = p.InstructionSet.Name,
+                InstructionSetId = p.InstructionSetId
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(ProcessorViewModel viewModel, string userId)
@@ -120,15 +177,31 @@ namespace Marechai.Services
         {
             var model = new Processor
             {
-                AddrBus = viewModel.AddrBus, CompanyId = viewModel.CompanyId, Cores = viewModel.Cores,
-                DataBus = viewModel.DataBus, DieSize = viewModel.DieSize, Fprs = viewModel.Fprs,
-                FprSize = viewModel.FprSize, Gprs = viewModel.Gprs, GprSize = viewModel.GprSize,
-                InstructionSetId = viewModel.InstructionSetId, Introduced = viewModel.Introduced,
-                L1Data = viewModel.L1Data, L1Instruction = viewModel.L1Instruction, L2 = viewModel.L2,
-                L3 = viewModel.L3, ModelCode = viewModel.ModelCode, Name = viewModel.Name, Package = viewModel.Package,
-                Process = viewModel.Process, ProcessNm = viewModel.ProcessNm, SimdRegisters = viewModel.SimdRegisters,
-                SimdSize = viewModel.SimdSize, Speed = viewModel.Speed, ThreadsPerCore = viewModel.ThreadsPerCore,
-                Transistors = viewModel.Transistors
+                AddrBus          = viewModel.AddrBus,
+                CompanyId        = viewModel.CompanyId,
+                Cores            = viewModel.Cores,
+                DataBus          = viewModel.DataBus,
+                DieSize          = viewModel.DieSize,
+                Fprs             = viewModel.Fprs,
+                FprSize          = viewModel.FprSize,
+                Gprs             = viewModel.Gprs,
+                GprSize          = viewModel.GprSize,
+                InstructionSetId = viewModel.InstructionSetId,
+                Introduced       = viewModel.Introduced,
+                L1Data           = viewModel.L1Data,
+                L1Instruction    = viewModel.L1Instruction,
+                L2               = viewModel.L2,
+                L3               = viewModel.L3,
+                ModelCode        = viewModel.ModelCode,
+                Name             = viewModel.Name,
+                Package          = viewModel.Package,
+                Process          = viewModel.Process,
+                ProcessNm        = viewModel.ProcessNm,
+                SimdRegisters    = viewModel.SimdRegisters,
+                SimdSize         = viewModel.SimdSize,
+                Speed            = viewModel.Speed,
+                ThreadsPerCore   = viewModel.ThreadsPerCore,
+                Transistors      = viewModel.Transistors
             };
 
             await _context.Processors.AddAsync(model);
diff --git a/Marechai/Services/ResolutionsByGpuService.cs b/Marechai/Services/ResolutionsByGpuService.cs
index 804c147e..d10ce194 100644
--- a/Marechai/Services/ResolutionsByGpuService.cs
+++ b/Marechai/Services/ResolutionsByGpuService.cs
@@ -42,11 +42,17 @@ namespace Marechai.Services
             (await _context.ResolutionsByGpu.Where(r => r.ResolutionId == resolutionId).
                             Select(r => new ResolutionByGpuViewModel
                             {
-                                Id = r.Id, GpuId = r.GpuId, Resolution = new ResolutionViewModel
+                                Id    = r.Id,
+                                GpuId = r.GpuId,
+                                Resolution = new ResolutionViewModel
                                 {
-                                    Id     = r.Resolution.Id, Width = r.Resolution.Width, Height = r.Resolution.Height,
-                                    Colors = r.Resolution.Colors, Palette = r.Resolution.Palette,
-                                    Chars  = r.Resolution.Chars, Grayscale = r.Resolution.Grayscale
+                                    Id        = r.Resolution.Id,
+                                    Width     = r.Resolution.Width,
+                                    Height    = r.Resolution.Height,
+                                    Colors    = r.Resolution.Colors,
+                                    Palette   = r.Resolution.Palette,
+                                    Chars     = r.Resolution.Chars,
+                                    Grayscale = r.Resolution.Grayscale
                                 },
                                 ResolutionId = r.ResolutionId
                             }).ToListAsync()).OrderBy(r => r.Resolution.Width).ThenBy(r => r.Resolution.Height).
@@ -70,7 +76,8 @@ namespace Marechai.Services
         {
             var item = new ResolutionsByGpu
             {
-                GpuId = gpuId, ResolutionId = resolutionId
+                GpuId        = gpuId,
+                ResolutionId = resolutionId
             };
 
             await _context.ResolutionsByGpu.AddAsync(item);
diff --git a/Marechai/Services/ResolutionsByScreenService.cs b/Marechai/Services/ResolutionsByScreenService.cs
index 1fc558ea..91530b8f 100644
--- a/Marechai/Services/ResolutionsByScreenService.cs
+++ b/Marechai/Services/ResolutionsByScreenService.cs
@@ -42,11 +42,17 @@ namespace Marechai.Services
             (await _context.ResolutionsByScreen.Where(r => r.ResolutionId == resolutionId).
                             Select(r => new ResolutionByScreenViewModel
                             {
-                                Id = r.Id, ScreenId = r.ScreenId, Resolution = new ResolutionViewModel
+                                Id       = r.Id,
+                                ScreenId = r.ScreenId,
+                                Resolution = new ResolutionViewModel
                                 {
-                                    Id     = r.Resolution.Id, Width = r.Resolution.Width, Height = r.Resolution.Height,
-                                    Colors = r.Resolution.Colors, Palette = r.Resolution.Palette,
-                                    Chars  = r.Resolution.Chars, Grayscale = r.Resolution.Grayscale
+                                    Id        = r.Resolution.Id,
+                                    Width     = r.Resolution.Width,
+                                    Height    = r.Resolution.Height,
+                                    Colors    = r.Resolution.Colors,
+                                    Palette   = r.Resolution.Palette,
+                                    Chars     = r.Resolution.Chars,
+                                    Grayscale = r.Resolution.Grayscale
                                 },
                                 ResolutionId = r.ResolutionId
                             }).ToListAsync()).OrderBy(r => r.Resolution.Width).ThenBy(r => r.Resolution.Height).
@@ -70,7 +76,8 @@ namespace Marechai.Services
         {
             var item = new ResolutionsByScreen
             {
-                ScreenId = screenId, ResolutionId = resolutionId
+                ScreenId     = screenId,
+                ResolutionId = resolutionId
             };
 
             await _context.ResolutionsByScreen.AddAsync(item);
diff --git a/Marechai/Services/ResolutionsService.cs b/Marechai/Services/ResolutionsService.cs
index 2b7e056f..b9396bf7 100644
--- a/Marechai/Services/ResolutionsService.cs
+++ b/Marechai/Services/ResolutionsService.cs
@@ -41,16 +41,26 @@ namespace Marechai.Services
         public async Task<List<ResolutionViewModel>> GetAsync() =>
             await _context.Resolutions.Select(r => new ResolutionViewModel
                            {
-                               Id      = r.Id, Width      = r.Width, Height    = r.Height, Colors = r.Colors,
-                               Palette = r.Palette, Chars = r.Chars, Grayscale = r.Grayscale
+                               Id        = r.Id,
+                               Width     = r.Width,
+                               Height    = r.Height,
+                               Colors    = r.Colors,
+                               Palette   = r.Palette,
+                               Chars     = r.Chars,
+                               Grayscale = r.Grayscale
                            }).OrderBy(r => r.Width).ThenBy(r => r.Height).ThenBy(r => r.Chars).ThenBy(r => r.Grayscale).
                            ThenBy(r => r.Colors).ThenBy(r => r.Palette).ToListAsync();
 
         public async Task<ResolutionViewModel> GetAsync(int id) =>
             await _context.Resolutions.Where(r => r.Id == id).Select(r => new ResolutionViewModel
             {
-                Id      = r.Id, Width      = r.Width, Height    = r.Height, Colors = r.Colors,
-                Palette = r.Palette, Chars = r.Chars, Grayscale = r.Grayscale
+                Id        = r.Id,
+                Width     = r.Width,
+                Height    = r.Height,
+                Colors    = r.Colors,
+                Palette   = r.Palette,
+                Chars     = r.Chars,
+                Grayscale = r.Grayscale
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(ResolutionViewModel viewModel, string userId)
@@ -74,8 +84,12 @@ namespace Marechai.Services
         {
             var model = new Resolution
             {
-                Chars  = viewModel.Chars, Colors   = viewModel.Colors, Grayscale = viewModel.Grayscale,
-                Height = viewModel.Height, Palette = viewModel.Palette, Width    = viewModel.Width
+                Chars     = viewModel.Chars,
+                Colors    = viewModel.Colors,
+                Grayscale = viewModel.Grayscale,
+                Height    = viewModel.Height,
+                Palette   = viewModel.Palette,
+                Width     = viewModel.Width
             };
 
             await _context.Resolutions.AddAsync(model);
diff --git a/Marechai/Services/ScreensByMachineService.cs b/Marechai/Services/ScreensByMachineService.cs
index c70f2ea1..7130ce3a 100644
--- a/Marechai/Services/ScreensByMachineService.cs
+++ b/Marechai/Services/ScreensByMachineService.cs
@@ -42,20 +42,27 @@ namespace Marechai.Services
             await _context.ScreensByMachine.Where(s => s.MachineId == machineId).
                            Select(s => new ScreenByMachineViewModel
                            {
-                               Id = s.Id, ScreenId = s.ScreenId, MachineId = s.MachineId, Screen = new ScreenViewModel
+                               Id        = s.Id,
+                               ScreenId  = s.ScreenId,
+                               MachineId = s.MachineId,
+                               Screen = new ScreenViewModel
                                {
-                                   Diagonal = s.Screen.Diagonal, EffectiveColors = s.Screen.EffectiveColors,
-                                   Height   = s.Screen.Height, Id                = s.Screen.Id, NativeResolution =
-                                       new ResolutionViewModel
-                                       {
-                                           Chars = s.Screen.NativeResolution.Chars,
-                                           Colors = s.Screen.NativeResolution.Colors,
-                                           Grayscale = s.Screen.NativeResolution.Grayscale,
-                                           Height = s.Screen.NativeResolution.Height, Id = s.Screen.NativeResolutionId,
-                                           Palette = s.Screen.NativeResolution.Palette,
-                                           Width = s.Screen.NativeResolution.Width
-                                       },
-                                   NativeResolutionId = s.Screen.NativeResolutionId, Type = s.Screen.Type,
+                                   Diagonal        = s.Screen.Diagonal,
+                                   EffectiveColors = s.Screen.EffectiveColors,
+                                   Height          = s.Screen.Height,
+                                   Id              = s.Screen.Id,
+                                   NativeResolution = new ResolutionViewModel
+                                   {
+                                       Chars     = s.Screen.NativeResolution.Chars,
+                                       Colors    = s.Screen.NativeResolution.Colors,
+                                       Grayscale = s.Screen.NativeResolution.Grayscale,
+                                       Height    = s.Screen.NativeResolution.Height,
+                                       Id        = s.Screen.NativeResolutionId,
+                                       Palette   = s.Screen.NativeResolution.Palette,
+                                       Width     = s.Screen.NativeResolution.Width
+                                   },
+                                   NativeResolutionId = s.Screen.NativeResolutionId,
+                                   Type               = s.Screen.Type,
                                    Width              = s.Screen.Width
                                }
                            }).ToListAsync();
@@ -79,7 +86,8 @@ namespace Marechai.Services
 
             var item = new ScreensByMachine
             {
-                ScreenId = screenId, MachineId = machineId
+                ScreenId  = screenId,
+                MachineId = machineId
             };
 
             await _context.ScreensByMachine.AddAsync(item);
diff --git a/Marechai/Services/ScreensService.cs b/Marechai/Services/ScreensService.cs
index ea959737..9e08364a 100644
--- a/Marechai/Services/ScreensService.cs
+++ b/Marechai/Services/ScreensService.cs
@@ -40,10 +40,12 @@ namespace Marechai.Services
 
         public async Task<List<ScreenViewModel>> GetAsync() => (await _context.Screens.Select(s => new ScreenViewModel
                                                                    {
-                                                                       Diagonal = s.Diagonal,
-                                                                       EffectiveColors = s.EffectiveColors,
-                                                                       Height = s.Height, Id = s.Id, Type = s.Type,
-                                                                       Width = s.Width,
+                                                                       Diagonal           = s.Diagonal,
+                                                                       EffectiveColors    = s.EffectiveColors,
+                                                                       Height             = s.Height,
+                                                                       Id                 = s.Id,
+                                                                       Type               = s.Type,
+                                                                       Width              = s.Width,
                                                                        NativeResolutionId = s.NativeResolutionId,
                                                                        NativeResolution = new ResolutionViewModel
                                                                        {
@@ -56,23 +58,29 @@ namespace Marechai.Services
                                                                            Width     = s.NativeResolution.Width
                                                                        }
                                                                    }).ToListAsync()).OrderBy(s => s.Diagonal).
-                                                                                     ThenBy(s => s.EffectiveColors).
-                                                                                     ThenBy(s => s.NativeResolution.
-                                                                                                   ToString()).
-                                                                                     ThenBy(s => s.Type).
-                                                                                     ThenBy(s => s.Size).ToList();
+            ThenBy(s => s.EffectiveColors).ThenBy(s => s.NativeResolution.ToString()).ThenBy(s => s.Type).
+            ThenBy(s => s.Size).ToList();
 
         public async Task<ScreenViewModel> GetAsync(int id) =>
             await _context.Screens.Where(s => s.Id == id).Select(s => new ScreenViewModel
             {
-                Diagonal = s.Diagonal, EffectiveColors = s.EffectiveColors, Height = s.Height, Id = s.Id,
+                Diagonal        = s.Diagonal,
+                EffectiveColors = s.EffectiveColors,
+                Height          = s.Height,
+                Id              = s.Id,
                 NativeResolution = new ResolutionViewModel
                 {
-                    Chars = s.NativeResolution.Chars, Colors = s.NativeResolution.Colors,
-                    Grayscale = s.NativeResolution.Grayscale, Height = s.NativeResolution.Height,
-                    Id = s.NativeResolution.Id, Palette = s.NativeResolution.Palette, Width = s.NativeResolution.Width
+                    Chars     = s.NativeResolution.Chars,
+                    Colors    = s.NativeResolution.Colors,
+                    Grayscale = s.NativeResolution.Grayscale,
+                    Height    = s.NativeResolution.Height,
+                    Id        = s.NativeResolution.Id,
+                    Palette   = s.NativeResolution.Palette,
+                    Width     = s.NativeResolution.Width
                 },
-                NativeResolutionId = s.NativeResolutionId, Type = s.Type, Width = s.Width
+                NativeResolutionId = s.NativeResolutionId,
+                Type               = s.Type,
+                Width              = s.Width
             }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(ScreenViewModel viewModel, string userId)
@@ -101,8 +109,12 @@ namespace Marechai.Services
         {
             var model = new Screen
             {
-                Diagonal = viewModel.Diagonal, EffectiveColors = viewModel.EffectiveColors, Height = viewModel.Height,
-                NativeResolutionId = viewModel.NativeResolutionId, Type = viewModel.Type, Width = viewModel.Width
+                Diagonal           = viewModel.Diagonal,
+                EffectiveColors    = viewModel.EffectiveColors,
+                Height             = viewModel.Height,
+                NativeResolutionId = viewModel.NativeResolutionId,
+                Type               = viewModel.Type,
+                Width              = viewModel.Width
             };
 
             await _context.Screens.AddAsync(model);
diff --git a/Marechai/Services/SoundSynthsByMachineService.cs b/Marechai/Services/SoundSynthsByMachineService.cs
index 0faa62e9..24e4906c 100644
--- a/Marechai/Services/SoundSynthsByMachineService.cs
+++ b/Marechai/Services/SoundSynthsByMachineService.cs
@@ -42,8 +42,11 @@ namespace Marechai.Services
             await _context.SoundByMachine.Where(g => g.MachineId == machineId).
                            Select(g => new SoundSynthByMachineViewModel
                            {
-                               Id           = g.Id, Name = g.SoundSynth.Name, CompanyName = g.SoundSynth.Company.Name,
-                               SoundSynthId = g.SoundSynthId, MachineId = g.MachineId
+                               Id           = g.Id,
+                               Name         = g.SoundSynth.Name,
+                               CompanyName  = g.SoundSynth.Company.Name,
+                               SoundSynthId = g.SoundSynthId,
+                               MachineId    = g.MachineId
                            }).OrderBy(g => g.CompanyName).ThenBy(g => g.Name).ToListAsync();
 
         public async Task DeleteAsync(long id, string userId)
@@ -62,7 +65,8 @@ namespace Marechai.Services
         {
             var item = new SoundByMachine
             {
-                SoundSynthId = soundSynthId, MachineId = machineId
+                SoundSynthId = soundSynthId,
+                MachineId    = machineId
             };
 
             await _context.SoundByMachine.AddAsync(item);
diff --git a/Marechai/Services/SoundSynthsService.cs b/Marechai/Services/SoundSynthsService.cs
index 0873ab06..53bc9f9e 100644
--- a/Marechai/Services/SoundSynthsService.cs
+++ b/Marechai/Services/SoundSynthsService.cs
@@ -42,10 +42,18 @@ namespace Marechai.Services
             await _context.SoundSynths.OrderBy(s => s.Company.Name).ThenBy(s => s.Name).ThenBy(s => s.ModelCode).
                            Select(s => new SoundSynthViewModel
                            {
-                               Id         = s.Id, Name = s.Name, CompanyId = s.Company.Id, CompanyName = s.Company.Name,
-                               ModelCode  = s.ModelCode, Introduced = s.Introduced, Voices = s.Voices,
-                               Frequency  = s.Frequency, Depth = s.Depth, SquareWave = s.SquareWave,
-                               WhiteNoise = s.WhiteNoise, Type = s.Type
+                               Id          = s.Id,
+                               Name        = s.Name,
+                               CompanyId   = s.Company.Id,
+                               CompanyName = s.Company.Name,
+                               ModelCode   = s.ModelCode,
+                               Introduced  = s.Introduced,
+                               Voices      = s.Voices,
+                               Frequency   = s.Frequency,
+                               Depth       = s.Depth,
+                               SquareWave  = s.SquareWave,
+                               WhiteNoise  = s.WhiteNoise,
+                               Type        = s.Type
                            }).ToListAsync();
 
         public async Task<List<SoundSynthViewModel>> GetByMachineAsync(int machineId) =>
@@ -53,27 +61,36 @@ namespace Marechai.Services
                            OrderBy(s => s.Company.Name).ThenBy(s => s.Name).ThenBy(s => s.ModelCode).
                            Select(s => new SoundSynthViewModel
                            {
-                               Id         = s.Id, Name = s.Name, CompanyId = s.Company.Id, CompanyName = s.Company.Name,
-                               ModelCode  = s.ModelCode, Introduced = s.Introduced, Voices = s.Voices,
-                               Frequency  = s.Frequency, Depth = s.Depth, SquareWave = s.SquareWave,
-                               WhiteNoise = s.WhiteNoise, Type = s.Type
+                               Id          = s.Id,
+                               Name        = s.Name,
+                               CompanyId   = s.Company.Id,
+                               CompanyName = s.Company.Name,
+                               ModelCode   = s.ModelCode,
+                               Introduced  = s.Introduced,
+                               Voices      = s.Voices,
+                               Frequency   = s.Frequency,
+                               Depth       = s.Depth,
+                               SquareWave  = s.SquareWave,
+                               WhiteNoise  = s.WhiteNoise,
+                               Type        = s.Type
                            }).ToListAsync();
 
         public async Task<SoundSynthViewModel> GetAsync(int id) => await _context.SoundSynths.Where(s => s.Id == id).
-                                                                                  Select(s => new SoundSynthViewModel
-                                                                                  {
-                                                                                      Id          = s.Id, Name = s.Name,
-                                                                                      CompanyId   = s.Company.Id,
-                                                                                      CompanyName = s.Company.Name,
-                                                                                      ModelCode   = s.ModelCode,
-                                                                                      Introduced  = s.Introduced,
-                                                                                      Voices      = s.Voices,
-                                                                                      Frequency   = s.Frequency,
-                                                                                      Depth       = s.Depth,
-                                                                                      SquareWave  = s.SquareWave,
-                                                                                      WhiteNoise  = s.WhiteNoise,
-                                                                                      Type        = s.Type
-                                                                                  }).FirstOrDefaultAsync();
+                                                                       Select(s => new SoundSynthViewModel
+                                                                       {
+                                                                           Id          = s.Id,
+                                                                           Name        = s.Name,
+                                                                           CompanyId   = s.Company.Id,
+                                                                           CompanyName = s.Company.Name,
+                                                                           ModelCode   = s.ModelCode,
+                                                                           Introduced  = s.Introduced,
+                                                                           Voices      = s.Voices,
+                                                                           Frequency   = s.Frequency,
+                                                                           Depth       = s.Depth,
+                                                                           SquareWave  = s.SquareWave,
+                                                                           WhiteNoise  = s.WhiteNoise,
+                                                                           Type        = s.Type
+                                                                       }).FirstOrDefaultAsync();
 
         public async Task UpdateAsync(SoundSynthViewModel viewModel, string userId)
         {
@@ -100,9 +117,15 @@ namespace Marechai.Services
         {
             var model = new SoundSynth
             {
-                Depth      = viewModel.Depth, Frequency     = viewModel.Frequency, Introduced = viewModel.Introduced,
-                Name       = viewModel.Name, Type           = viewModel.Type, Voices          = viewModel.Voices,
-                CompanyId  = viewModel.CompanyId, ModelCode = viewModel.ModelCode, SquareWave = viewModel.SquareWave,
+                Depth      = viewModel.Depth,
+                Frequency  = viewModel.Frequency,
+                Introduced = viewModel.Introduced,
+                Name       = viewModel.Name,
+                Type       = viewModel.Type,
+                Voices     = viewModel.Voices,
+                CompanyId  = viewModel.CompanyId,
+                ModelCode  = viewModel.ModelCode,
+                SquareWave = viewModel.SquareWave,
                 WhiteNoise = viewModel.WhiteNoise
             };
 
diff --git a/Marechai/Services/StorageByMachineService.cs b/Marechai/Services/StorageByMachineService.cs
index e6db29bb..757990a5 100644
--- a/Marechai/Services/StorageByMachineService.cs
+++ b/Marechai/Services/StorageByMachineService.cs
@@ -43,7 +43,10 @@ namespace Marechai.Services
             await _context.StorageByMachine.Where(s => s.MachineId == machineId).
                            Select(s => new StorageByMachineViewModel
                            {
-                               Id        = s.Id, Type = s.Type, Interface = s.Interface, Capacity = s.Capacity,
+                               Id        = s.Id,
+                               Type      = s.Type,
+                               Interface = s.Interface,
+                               Capacity  = s.Capacity,
                                MachineId = s.MachineId
                            }).OrderBy(s => s.Type).ThenBy(s => s.Interface).ThenBy(s => s.Capacity).ToListAsync();
 
@@ -64,7 +67,10 @@ namespace Marechai.Services
         {
             var item = new StorageByMachine
             {
-                MachineId = machineId, Type = type, Interface = @interface, Capacity = capacity
+                MachineId = machineId,
+                Type      = type,
+                Interface = @interface,
+                Capacity  = capacity
             };
 
             await _context.StorageByMachine.AddAsync(item);
diff --git a/Marechai/ViewModels/CompanyViewModel.cs b/Marechai/ViewModels/CompanyViewModel.cs
index 27d9ba24..04d5bd90 100644
--- a/Marechai/ViewModels/CompanyViewModel.cs
+++ b/Marechai/ViewModels/CompanyViewModel.cs
@@ -30,26 +30,26 @@ namespace Marechai.ViewModels
 {
     public class CompanyViewModel : BaseViewModel<int>
     {
-        public string        Name       { get; set; }
-        public DateTime?     Founded    { get; set; }
-        public string        Website    { get; set; }
-        public string        Twitter    { get; set; }
-        public string        Facebook   { get; set; }
-        public DateTime?     Sold       { get; set; }
-        public int?          SoldToId   { get; set; }
-        public string        Address    { get; set; }
-        public string        City       { get; set; }
-        public string        Province   { get; set; }
-        public string        PostalCode { get; set; }
-        public short?        CountryId  { get; set; }
-        public CompanyStatus Status     { get; set; }
-        public Guid?         LastLogo   { get; set; }
-        public string        SoldTo     { get; set; }
-        public string        Country    { get; set; }
-        public bool FoundedDayIsUnknown   { get; set; }
-        public bool FoundedMonthIsUnknown { get; set; }
-        public bool SoldDayIsUnknown      { get; set; }
-        public bool SoldMonthIsUnknown    { get; set; }
+        public string        Name                  { get; set; }
+        public DateTime?     Founded               { get; set; }
+        public string        Website               { get; set; }
+        public string        Twitter               { get; set; }
+        public string        Facebook              { get; set; }
+        public DateTime?     Sold                  { get; set; }
+        public int?          SoldToId              { get; set; }
+        public string        Address               { get; set; }
+        public string        City                  { get; set; }
+        public string        Province              { get; set; }
+        public string        PostalCode            { get; set; }
+        public short?        CountryId             { get; set; }
+        public CompanyStatus Status                { get; set; }
+        public Guid?         LastLogo              { get; set; }
+        public string        SoldTo                { get; set; }
+        public string        Country               { get; set; }
+        public bool          FoundedDayIsUnknown   { get; set; }
+        public bool          FoundedMonthIsUnknown { get; set; }
+        public bool          SoldDayIsUnknown      { get; set; }
+        public bool          SoldMonthIsUnknown    { get; set; }
 
         public string SoldView => Status != CompanyStatus.Active && Status != CompanyStatus.Unknown
                                       ? Sold?.ToShortDateString() ?? "Unknown"
diff --git a/Marechai/ViewModels/NewsViewModel.cs b/Marechai/ViewModels/NewsViewModel.cs
index 812ec53a..83c91dea 100644
--- a/Marechai/ViewModels/NewsViewModel.cs
+++ b/Marechai/ViewModels/NewsViewModel.cs
@@ -30,7 +30,7 @@ namespace Marechai.ViewModels
 {
     public sealed class NewsViewModel : BaseViewModel<int>
     {
-        public NewsViewModel() { }
+        public NewsViewModel() {}
 
         public NewsViewModel(int affectedId, string text, DateTime timestamp, string controller, string itemName)
         {
diff --git a/Marechai/ViewModels/ResolutionViewModel.cs b/Marechai/ViewModels/ResolutionViewModel.cs
index 9a807c98..d81187f3 100644
--- a/Marechai/ViewModels/ResolutionViewModel.cs
+++ b/Marechai/ViewModels/ResolutionViewModel.cs
@@ -41,7 +41,7 @@ namespace Marechai.ViewModels
             if(Chars)
             {
                 if(Colors == null)
-                    return$"{Width}x{Height} characters";
+                    return $"{Width}x{Height} characters";
 
                 if(Palette != null &&
                    Colors  != Palette)
@@ -53,7 +53,7 @@ namespace Marechai.ViewModels
             }
 
             if(Colors == null)
-                return$"{Width}x{Height} pixels";
+                return $"{Width}x{Height} pixels";
 
             if(Palette != null &&
                Colors  != Palette)
diff --git a/Marechai/ViewModels/ScreenViewModel.cs b/Marechai/ViewModels/ScreenViewModel.cs
index 532276f3..62da80ff 100644
--- a/Marechai/ViewModels/ScreenViewModel.cs
+++ b/Marechai/ViewModels/ScreenViewModel.cs
@@ -43,9 +43,9 @@ namespace Marechai.ViewModels
             {
                 if(Width  != null &&
                    Height != null)
-                    return$"{Width}x{Height} mm";
+                    return $"{Width}x{Height} mm";
 
-                return"Unknown";
+                return "Unknown";
             }
         }
     }