diff --git a/Elwig/Models/Dtos/AreaComUnderDeliveyData.cs b/Elwig/Models/Dtos/AreaComUnderDeliveyData.cs
index 7214b92..b5c832b 100644
--- a/Elwig/Models/Dtos/AreaComUnderDeliveyData.cs
+++ b/Elwig/Models/Dtos/AreaComUnderDeliveyData.cs
@@ -83,17 +83,17 @@ namespace Elwig.Models.Dtos {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("family_name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
         [Column("given_name")]
-        public string GivenName { get; set; }
+        public required string GivenName { get; set; }
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
         [Column("plz")]
         public int Plz { get; set; }
         [Column("ort")]
-        public string Locality { get; set; }
+        public required string Locality { get; set; }
         [Column("bucket")]
-        public string VtrgId { get; set; }
+        public required string VtrgId { get; set; }
         [Column("area")]
         public int Area { get; set; }
         [Column("min_kg")]
diff --git a/Elwig/Models/Dtos/CreditNoteData.cs b/Elwig/Models/Dtos/CreditNoteData.cs
index 814a437..5e4a663 100644
--- a/Elwig/Models/Dtos/CreditNoteData.cs
+++ b/Elwig/Models/Dtos/CreditNoteData.cs
@@ -48,7 +48,7 @@ namespace Elwig.Models.Dtos {
         }
 
         private static async Task<IEnumerable<CreditNoteRowSingle>> FromDbSet(DbSet<CreditNoteRowSingle> table, int year, int avnr) {
-            return await table.FromSql($"""
+            return await table.FromSqlRaw($"""
                 SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address, m.iban, c.tgnr, s.year, s.precision,
                        p.amount - p.net_amount AS surcharge,
                        c.net_amount, c.prev_net_amount, c.vat, c.vat_amount, c.gross_amount, c.modifiers, c.prev_modifiers, c.amount,
@@ -133,15 +133,15 @@ namespace Elwig.Models.Dtos {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("family_name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
         [Column("given_name")]
-        public string GivenName { get; set; }
+        public required string GivenName { get; set; }
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
         [Column("plz")]
         public int Plz { get; set; }
         [Column("ort")]
-        public string LocalityFull { get; set; }
+        public required string LocalityFull { get; set; }
         [NotMapped]
         public string Locality => LocalityFull.Split(",")[0];
         [Column("iban")]
@@ -151,7 +151,7 @@ namespace Elwig.Models.Dtos {
         [Column("precision")]
         public byte Precision { get; set; }
         [Column("tgnr")]
-        public string TgNr { get; set; }
+        public required string TgNr { get; set; }
         [Column("surcharge")]
         public long? Surcharge { get; set; }
         [Column("net_amount")]
diff --git a/Elwig/Models/Dtos/CreditNoteDeliveryData.cs b/Elwig/Models/Dtos/CreditNoteDeliveryData.cs
index 05e7c36..b5435d4 100644
--- a/Elwig/Models/Dtos/CreditNoteDeliveryData.cs
+++ b/Elwig/Models/Dtos/CreditNoteDeliveryData.cs
@@ -125,7 +125,7 @@ namespace Elwig.Models.Dtos {
         [Column("did")]
         public int DId { get; set; }
         [Column("lsnr")]
-        public string LsNr { get; set; }
+        public required string LsNr { get; set; }
         [Column("dpnr")]
         public int DPNr { get; set; }
         [Column("weight")]
@@ -135,9 +135,9 @@ namespace Elwig.Models.Dtos {
         [Column("bktnr")]
         public int BktNr { get; set; }
         [Column("sortid")]
-        public string SortId { get; set; }
+        public required string SortId { get; set; }
         [Column("discr")]
-        public string Discr { get; set; }
+        public required string Discr { get; set; }
         [Column("value")]
         public int Value { get; set; }
         [Column("price")]
@@ -149,13 +149,13 @@ namespace Elwig.Models.Dtos {
         [Column("total_amount")]
         public long? TotalAmount { get; set; }
         [Column("variety")]
-        public string Variety { get; set; }
+        public required string Variety { get; set; }
         [Column("attribute")]
         public string? Attribute { get; set; }
         [Column("cultivation")]
         public string? Cultivation { get; set; }
         [Column("quality_level")]
-        public string QualityLevel { get; set; }
+        public required string QualityLevel { get; set; }
         [Column("oe")]
         public double Oe { get; set; }
         [Column("kmw")]
diff --git a/Elwig/Models/Dtos/DataTable.cs b/Elwig/Models/Dtos/DataTable.cs
index 28fb595..9637cfe 100644
--- a/Elwig/Models/Dtos/DataTable.cs
+++ b/Elwig/Models/Dtos/DataTable.cs
@@ -36,7 +36,7 @@ namespace Elwig.Models.Dtos {
                 var elType = type?.GetElementType();
                 return type != null && type.IsValueType && type.Name.StartsWith("ValueTuple") ? type.GetFields().Select(f => f.FieldType) :
                        type != null && elType != null && type.IsArray && elType.IsValueType && elType.Name.StartsWith("ValueTuple") ? elType.GetFields().Select(f => f.FieldType) :
-                       new Type?[] { type };
+                       [type];
             }).ToList();
             ColumnSpans = ColumnTypes.Select(type => {
                 var elType = type?.GetElementType();
@@ -44,7 +44,7 @@ namespace Elwig.Models.Dtos {
                        type != null && elType != null && type.IsArray && elType.IsValueType && elType.Name.StartsWith("ValueTuple") ? elType.GetFields().Length : 1;
             }).ToList();
             ColumnWidths = colNames.Select(c => c.Item4).ToList();
-            ColumnUnits = colNames.Select(c => c.Item3?.Split("|").Select(p => p.Length == 0 ? null : p).ToArray() ?? Array.Empty<string?>()).ToList();
+            ColumnUnits = colNames.Select(c => c.Item3?.Split("|").Select(p => p.Length == 0 ? null : p).ToArray() ?? []).ToList();
         }
 
         public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?)>? colNames = null) :
diff --git a/Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs b/Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs
index 9d562e3..1c1ab46 100644
--- a/Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs
+++ b/Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs
@@ -99,17 +99,17 @@ namespace Elwig.Models.Dtos {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("family_name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
         [Column("given_name")]
-        public string GivenName { get; set; }
+        public required string GivenName { get; set; }
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
         [Column("plz")]
         public int Plz { get; set; }
         [Column("ort")]
-        public string Locality { get; set; }
+        public required string Locality { get; set; }
         [Column("bucket")]
-        public string VtrgId { get; set; }
+        public required string VtrgId { get; set; }
         [Column("area")]
         public int Area { get; set; }
         [Column("weight")]
diff --git a/Elwig/Models/Dtos/OverUnderDeliveryData.cs b/Elwig/Models/Dtos/OverUnderDeliveryData.cs
index be643eb..7e5f975 100644
--- a/Elwig/Models/Dtos/OverUnderDeliveryData.cs
+++ b/Elwig/Models/Dtos/OverUnderDeliveryData.cs
@@ -49,15 +49,15 @@ namespace Elwig.Models.Dtos {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("family_name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
         [Column("given_name")]
-        public string GivenName { get; set; }
+        public required string GivenName { get; set; }
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
         [Column("plz")]
         public int Plz { get; set; }
         [Column("ort")]
-        public string LocalityFull { get; set; }
+        public required string LocalityFull { get; set; }
         [NotMapped]
         public string Locality => LocalityFull.Split(",")[0];
         [Column("business_shares")]