diff --git a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineDto.cs b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineDto.cs
index cdb4d75..0fd22f5 100644
--- a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineDto.cs
+++ b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineDto.cs
@@ -35,7 +35,7 @@ namespace SytelineSaAppEfDataModel.Dtos
         public string UpdatedBy { get; set; }
         public DateTime CreateDate { get; set; }
         public byte InWorkflow { get; set; }
-        public string BoxType { get; set; }
+        public string? BoxType { get; set; }
         public string? Address { get; set; }
         public string? FinalDestination { get; set; }
         public int? QtyPerBox { get; set; }
diff --git a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineItemDto.cs b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineItemDto.cs
index 9978071..4cc46d8 100644
--- a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineItemDto.cs
+++ b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineItemDto.cs
@@ -106,7 +106,7 @@ namespace SytelineSaAppEfDataModel.Dtos
         public string? DestinationPoint { get; set; }
         public string NewStatus { get; set; }
         public string PalletCode { get; set; }
-        public string PalletNumber { get; set; }
+        public string? PalletNumber { get; set; }
         
         public string DocumentType { get; set; }
         public string TranslatedStatus => TranslateStatus(Status);
diff --git a/SytelineSaAppEfDataModel/Dtos/ItemDto.cs b/SytelineSaAppEfDataModel/Dtos/ItemDto.cs
index 1f85a17..8402956 100644
--- a/SytelineSaAppEfDataModel/Dtos/ItemDto.cs
+++ b/SytelineSaAppEfDataModel/Dtos/ItemDto.cs
@@ -6,7 +6,7 @@ public class ItemDto : DtoBase
     public string Description { get; set; }
     public decimal? QtyAllocjob { get; set; }
     public string UM { get; set; }
-    public int LeadTime { get; set; }
+    public short LeadTime { get; set; }
     public decimal? LotSize { get; set; }
     public decimal? QtyUsedYtd { get; set; }
     public decimal? QtyMfgYtd { get; set; }
@@ -20,13 +20,13 @@ public class ItemDto : DtoBase
     public decimal? LstUCost { get; set; }
     public decimal? AvgUCost { get; set; }
     public string Job { get; set; }
-    public int? Suffix { get; set; }
+    public short? Suffix { get; set; }
     public bool Stocked { get; set; }
     public string MatlType { get; set; }
     public string FamilyCode { get; set; }
-    public int? LowLevel { get; set; }
+    public byte? LowLevel { get; set; }
     public DateTime? LastInv { get; set; }
-    public int? DaysSupply { get; set; }
+    public short? DaysSupply { get; set; }
     public decimal? OrderMin { get; set; }
     public decimal? OrderMult { get; set; }
     public string PlanCode { get; set; }
@@ -36,8 +36,8 @@ public class ItemDto : DtoBase
     public string Revision { get; set; }
     public bool PhantomFlag { get; set; }
     public bool PlanFlag { get; set; }
-    public int PaperTime { get; set; }
-    public int DockTime { get; set; }
+    public short PaperTime { get; set; }
+    public short DockTime { get; set; }
     public decimal? AsmSetup { get; set; }
     public decimal? AsmRun { get; set; }
     public decimal? AsmMatl { get; set; }
@@ -64,9 +64,9 @@ public class ItemDto : DtoBase
     public string Charfld4 { get; set; }
     public decimal? CurUCost { get; set; }
     public string FeatType { get; set; }
-    public int? VarLead { get; set; }
+    public decimal? VarLead { get; set; }
     public string FeatStr { get; set; }
-    public int? NextConfig { get; set; }
+    public short? NextConfig { get; set; }
     public string FeatTempl { get; set; }
     public bool Backflush { get; set; }
     public string Charfld1 { get; set; }
@@ -78,6 +78,7 @@ public class ItemDto : DtoBase
     public bool Logifld { get; set; }
     public DateTime? Datefld { get; set; }
     public bool TrackEcn { get; set; }
+
     public string CommCode { get; set; }
     public string Origin { get; set; }
     public decimal? UnitMatCost { get; set; }
@@ -92,10 +93,10 @@ public class ItemDto : DtoBase
     public string TaxCode2 { get; set; }
     public string BflushLoc { get; set; }
     public bool Reservable { get; set; }
-    public int? ShelfLife { get; set; }
+    public short? ShelfLife { get; set; }
     public string LotPrefix { get; set; }
     public string SerialPrefix { get; set; }
-    public int? SerialLength { get; set; }
+    public byte? SerialLength { get; set; }
     public string IssueBy { get; set; }
     public bool SerialTracked { get; set; }
     public bool LotTracked { get; set; }
@@ -117,7 +118,7 @@ public class ItemDto : DtoBase
     public decimal? AvgOutCost { get; set; }
     public string ProdType { get; set; }
     public decimal? RatePerDay { get; set; }
-    public int? MpsPlanFence { get; set; }
+    public short? MpsPlanFence { get; set; }
     public bool PassReq { get; set; }
     public bool LotGenExp { get; set; }
     public string SupplySite { get; set; }
@@ -127,16 +128,16 @@ public class ItemDto : DtoBase
     public DateTime? ChgDate { get; set; }
     public string ReasonCode { get; set; }
     public string SupplyWhse { get; set; }
-    public int? DuePeriod { get; set; }
+    public short? DuePeriod { get; set; }
     public decimal? OrderMax { get; set; }
     public bool MrpPart { get; set; }
     public bool InfinitePart { get; set; }
     public bool NoteExistsFlag { get; set; }
     public DateTime RecordDate { get; set; }
     public Guid RowPointer { get; set; }
-    public int? SupplyToleranceHrs { get; set; }
-    public int ExpLeadTime { get; set; }
-    public int? VarExpLead { get; set; }
+    public decimal? SupplyToleranceHrs { get; set; }
+    public short ExpLeadTime { get; set; }
+    public decimal? VarExpLead { get; set; }
     public string Buyer { get; set; }
     public bool OrderConfigurable { get; set; }
     public bool JobConfigurable { get; set; }
@@ -151,8 +152,8 @@ public class ItemDto : DtoBase
     public DateTime CreateDate { get; set; }
     public bool InWorkflow { get; set; }
     public bool MfgSupplySwitchingActive { get; set; }
-    public int? TimeFenceRule { get; set; }
-    public decimal? TimeFenceValue { get; set; }
+    public short? TimeFenceRule { get; set; }
+    public double? TimeFenceValue { get; set; }
     public DateTime? EarliestPlannedPoReceipt { get; set; }
     public bool UseReorderPoint { get; set; }
     public decimal? ReorderPoint { get; set; }
@@ -162,7 +163,7 @@ public class ItemDto : DtoBase
     public decimal? CurInsuranceCost { get; set; }
     public decimal? CurLocFrtCost { get; set; }
     public bool TaxFreeMatl { get; set; }
-    public int? TaxFreeDays { get; set; }
+    public short? TaxFreeDays { get; set; }
     public decimal? SafetyStockPercent { get; set; }
     public string TariffClassification { get; set; }
     public DateTime Lowdate { get; set; }
@@ -173,15 +174,15 @@ public class ItemDto : DtoBase
     public bool IncludeInNetChangePlanning { get; set; }
     public bool Kit { get; set; }
     public bool PrintKitComponents { get; set; }
-    public int? SafetyStockRule { get; set; }
+    public short? SafetyStockRule { get; set; }
     public bool ShowInDropDownList { get; set; }
     public bool ControlledByExternalIcs { get; set; }
     public decimal? InventoryUclTolerance { get; set; }
     public decimal? InventoryLclTolerance { get; set; }
     public string SeparationAttribute { get; set; }
-    public decimal? BatchReleaseAttribute1 { get; set; }
-    public decimal? BatchReleaseAttribute2 { get; set; }
-    public decimal? BatchReleaseAttribute3 { get; set; }
+    public double? BatchReleaseAttribute1 { get; set; }
+    public double? BatchReleaseAttribute2 { get; set; }
+    public double? BatchReleaseAttribute3 { get; set; }
     public byte[] Picture { get; set; }
     public bool ActiveForCustomerPortal { get; set; }
     public bool Featured { get; set; }
@@ -213,7 +214,7 @@ public class ItemDto : DtoBase
     public string BoxId { get; set; }
     public decimal? ItemLength { get; set; }
     public decimal? ItemFi { get; set; }
-    public int? BoxItemsCnt { get; set; }
+    public decimal? BoxItemsCnt { get; set; }
     public string Klient { get; set; }
     public string Uf_FKR_FA_RodzajPozycji { get; set; }
     public string Uf_Nr_Klienta { get; set; }
diff --git a/SytelineSaAppEfDataModel/Entities/Item.cs b/SytelineSaAppEfDataModel/Entities/Item.cs
index 4705498..c01deca 100644
--- a/SytelineSaAppEfDataModel/Entities/Item.cs
+++ b/SytelineSaAppEfDataModel/Entities/Item.cs
@@ -6,7 +6,7 @@ public class Item
     public string Description { get; set; }
     public decimal? QtyAllocjob { get; set; }
     public string UM { get; set; }
-    public int LeadTime { get; set; }
+    public short LeadTime { get; set; }
     public decimal? LotSize { get; set; }
     public decimal? QtyUsedYtd { get; set; }
     public decimal? QtyMfgYtd { get; set; }
@@ -20,13 +20,13 @@ public class Item
     public decimal? LstUCost { get; set; }
     public decimal? AvgUCost { get; set; }
     public string Job { get; set; }
-    public int? Suffix { get; set; }
+    public short? Suffix { get; set; }
     public bool Stocked { get; set; }
     public string MatlType { get; set; }
     public string FamilyCode { get; set; }
-    public int? LowLevel { get; set; }
+    public byte? LowLevel { get; set; }
     public DateTime? LastInv { get; set; }
-    public int? DaysSupply { get; set; }
+    public short? DaysSupply { get; set; }
     public decimal? OrderMin { get; set; }
     public decimal? OrderMult { get; set; }
     public string PlanCode { get; set; }
@@ -36,8 +36,8 @@ public class Item
     public string Revision { get; set; }
     public bool PhantomFlag { get; set; }
     public bool PlanFlag { get; set; }
-    public int PaperTime { get; set; }
-    public int DockTime { get; set; }
+    public short PaperTime { get; set; }
+    public short DockTime { get; set; }
     public decimal? AsmSetup { get; set; }
     public decimal? AsmRun { get; set; }
     public decimal? AsmMatl { get; set; }
@@ -64,9 +64,9 @@ public class Item
     public string Charfld4 { get; set; }
     public decimal? CurUCost { get; set; }
     public string FeatType { get; set; }
-    public int? VarLead { get; set; }
+    public decimal? VarLead { get; set; }
     public string FeatStr { get; set; }
-    public int? NextConfig { get; set; }
+    public short? NextConfig { get; set; }
     public string FeatTempl { get; set; }
     public bool Backflush { get; set; }
     public string Charfld1 { get; set; }
@@ -78,6 +78,7 @@ public class Item
     public bool Logifld { get; set; }
     public DateTime? Datefld { get; set; }
     public bool TrackEcn { get; set; }
+
     public string CommCode { get; set; }
     public string Origin { get; set; }
     public decimal? UnitMatCost { get; set; }
@@ -92,10 +93,10 @@ public class Item
     public string TaxCode2 { get; set; }
     public string BflushLoc { get; set; }
     public bool Reservable { get; set; }
-    public int? ShelfLife { get; set; }
+    public short? ShelfLife { get; set; }
     public string LotPrefix { get; set; }
     public string SerialPrefix { get; set; }
-    public int? SerialLength { get; set; }
+    public byte? SerialLength { get; set; }
     public string IssueBy { get; set; }
     public bool SerialTracked { get; set; }
     public bool LotTracked { get; set; }
@@ -117,7 +118,7 @@ public class Item
     public decimal? AvgOutCost { get; set; }
     public string ProdType { get; set; }
     public decimal? RatePerDay { get; set; }
-    public int? MpsPlanFence { get; set; }
+    public short? MpsPlanFence { get; set; }
     public bool PassReq { get; set; }
     public bool LotGenExp { get; set; }
     public string SupplySite { get; set; }
@@ -127,16 +128,16 @@ public class Item
     public DateTime? ChgDate { get; set; }
     public string ReasonCode { get; set; }
     public string SupplyWhse { get; set; }
-    public int? DuePeriod { get; set; }
+    public short? DuePeriod { get; set; }
     public decimal? OrderMax { get; set; }
     public bool MrpPart { get; set; }
     public bool InfinitePart { get; set; }
     public bool NoteExistsFlag { get; set; }
     public DateTime RecordDate { get; set; }
     public Guid RowPointer { get; set; }
-    public int? SupplyToleranceHrs { get; set; }
-    public int ExpLeadTime { get; set; }
-    public int? VarExpLead { get; set; }
+    public decimal? SupplyToleranceHrs { get; set; }
+    public short ExpLeadTime { get; set; }
+    public decimal? VarExpLead { get; set; }
     public string Buyer { get; set; }
     public bool OrderConfigurable { get; set; }
     public bool JobConfigurable { get; set; }
@@ -151,8 +152,8 @@ public class Item
     public DateTime CreateDate { get; set; }
     public bool InWorkflow { get; set; }
     public bool MfgSupplySwitchingActive { get; set; }
-    public int? TimeFenceRule { get; set; }
-    public decimal? TimeFenceValue { get; set; }
+    public short? TimeFenceRule { get; set; }
+    public double? TimeFenceValue { get; set; }
     public DateTime? EarliestPlannedPoReceipt { get; set; }
     public bool UseReorderPoint { get; set; }
     public decimal? ReorderPoint { get; set; }
@@ -162,7 +163,7 @@ public class Item
     public decimal? CurInsuranceCost { get; set; }
     public decimal? CurLocFrtCost { get; set; }
     public bool TaxFreeMatl { get; set; }
-    public int? TaxFreeDays { get; set; }
+    public short? TaxFreeDays { get; set; }
     public decimal? SafetyStockPercent { get; set; }
     public string TariffClassification { get; set; }
     public DateTime Lowdate { get; set; }
@@ -173,15 +174,15 @@ public class Item
     public bool IncludeInNetChangePlanning { get; set; }
     public bool Kit { get; set; }
     public bool PrintKitComponents { get; set; }
-    public int? SafetyStockRule { get; set; }
+    public short? SafetyStockRule { get; set; }
     public bool ShowInDropDownList { get; set; }
     public bool ControlledByExternalIcs { get; set; }
     public decimal? InventoryUclTolerance { get; set; }
     public decimal? InventoryLclTolerance { get; set; }
     public string SeparationAttribute { get; set; }
-    public decimal? BatchReleaseAttribute1 { get; set; }
-    public decimal? BatchReleaseAttribute2 { get; set; }
-    public decimal? BatchReleaseAttribute3 { get; set; }
+    public double? BatchReleaseAttribute1 { get; set; }
+    public double? BatchReleaseAttribute2 { get; set; }
+    public double? BatchReleaseAttribute3 { get; set; }
     public byte[] Picture { get; set; }
     public bool ActiveForCustomerPortal { get; set; }
     public bool Featured { get; set; }
@@ -213,7 +214,7 @@ public class Item
     public string BoxId { get; set; }
     public decimal? ItemLength { get; set; }
     public decimal? ItemFi { get; set; }
-    public int? BoxItemsCnt { get; set; }
+    public decimal? BoxItemsCnt { get; set; }
     public string Klient { get; set; }
     public string Uf_FKR_FA_RodzajPozycji { get; set; }
     public string Uf_Nr_Klienta { get; set; }