diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI2/DetailViewControls/OverViewDetailControl.xaml
index 9817e9bf..eb097996 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml
@@ -75,7 +75,7 @@
                 <Label HorizontalAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textTicketNo}" Margin="0,0,10,0" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="3" Content="{x:Static p:Resources.textCreated}" Margin="0,0,10,0" />
                 <Label Name="labelCreated" Grid.Column="4" Grid.Row="4" Margin="2, 0, 0, 0" />
-                    <Button Name="buttonFormblattNeu" Grid.Column="5" Grid.Row="7" Margin="2" Click="buttonFormblattNeu_Click" >
+                    <Button Name="buttonFormblattNeu" Grid.Column="4" Grid.Row="7" Margin="2" Click="buttonFormblattNeu_Click" >
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Text="Formblatt neu"></TextBlock>
                             <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
@@ -122,13 +122,14 @@
                         <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
                     </StackPanel>
                 </Button>
+                <!--
                 <Button Grid.Column="4" Grid.Row="7" Margin="2" Name="buttonExcelExport" Click="buttonExcelExport_Click">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Text="{x:Static p:Resources.textExcelExport}"></TextBlock>
                         <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
                     </StackPanel>
                 </Button>
-
+                -->
                 <StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="4" Visibility="Hidden" Name="stackPanelLock">
                     <Image Source="../Resources/lock.png" Margin="0,0,5,0" Height="24" />
                     <TextBlock Name="textBlockLockUserName" VerticalAlignment="Center" />
diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index d622f76d..1bb1ba98 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -67,13 +67,10 @@ namespace ENI2.DetailViewControls
             if (this.Messages == null) return;
             if (this.Core == null) return;
 
-            if(DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsAdmin)
-            {
-                this.textBoxENI.IsReadOnly = false;
-                this.textBoxIMO.IsReadOnly = false;
-                this.locodePoC.IsEnabled = true;
-                this.textBoxDisplayId.IsReadOnly = false;                
-            }
+            this.textBoxENI.IsReadOnly = false;
+            this.textBoxIMO.IsReadOnly = false;
+            this.locodePoC.IsEnabled = true;
+            this.textBoxDisplayId.IsReadOnly = false;            
 
             this.textBoxENI.DataContext = this.Core;
             this.textBoxIMO.DataContext = this.Core;
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 698302ff..bd2694e5 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ENI2</RootNamespace>
     <AssemblyName>ENI2</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>7.0.4.0</ApplicationVersion>
+    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationVersion>7.1.0.3</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -82,9 +82,7 @@
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-  </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
     <ManifestCertificateThumbprint>9B5725EAD90F2E06094631407417EB2554E88941</ManifestCertificateThumbprint>
   </PropertyGroup>
@@ -165,7 +163,7 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.115.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\lib\net451\System.Data.SQLite.dll</HintPath>
+      <HintPath>packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\lib\net46\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
@@ -236,6 +234,7 @@
     <Compile Include="EditControls\EditWasteReceivedDialog.xaml.cs">
       <DependentUpon>EditWasteReceivedDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Excel\DakosyUtil.cs" />
     <Compile Include="Excel\ExcelBase.cs" />
     <Compile Include="Excel\ExcelManager.cs" />
     <Compile Include="Excel\ExcelReader.cs" />
@@ -948,16 +947,16 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <PropertyGroup>
+    <PostBuildEvent>"C:\Program Files (x86)\Windows Kits\10\bin\x64\signtool" sign /f $(ProjectDir)\..\misc\codesigning.pfx /p t5bj2dk9ifdIWBPhPra4U $(TargetPath)</PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+    <Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
   </Target>
-  <PropertyGroup>
-    <PostBuildEvent>"C:\Program Files (x86)\Windows Kits\10\bin\x64\signtool" sign /f $(ProjectDir)\..\misc\codesigning.pfx /p t5bj2dk9ifdIWBPhPra4U $(TargetPath)</PostBuildEvent>
-  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs
new file mode 100644
index 00000000..bb3c68cd
--- /dev/null
+++ b/ENI2/Excel/DakosyUtil.cs
@@ -0,0 +1,1415 @@
+// Copyright (c) 2022 - schick Informatik
+// Description: Helper class to read data from "Dakosy"-Style Excel Sheets
+//
+
+using System;
+using System.Collections.Generic;
+
+using bsmd.database;
+
+namespace ENI2.Excel
+{
+    internal static class DakosyUtil
+    {        
+
+        internal static bool ProcessSheet(ExcelReader reader, out string readMessage, MessageCore messageCore, List<Message.NotificationClass> notificationClasses)
+        {
+            bool result = true;
+            readMessage = "";
+
+            // Test if an Id is found in the sheet. If so, it has to match the id of the current core
+            string visitTransitId = reader.ReadCellAsText("main", "C12");
+            if (visitTransitId != null)
+            {
+                MessageCore aMessageCore = null;
+                if (bsmd.database.Util.IsVisitId(visitTransitId))
+                {
+                    aMessageCore = DBManager.Instance.GetMessageCoreByVisitId(visitTransitId);
+                }
+                else if (bsmd.database.Util.IsTransitId(visitTransitId))
+                {
+                    aMessageCore = DBManager.Instance.GetMessageCoreByTransitId(visitTransitId);
+                }
+
+                if ((aMessageCore == null) || (aMessageCore.Id.Value != messageCore.Id.Value))
+                {
+                    readMessage = "Id not matching in import sheet";
+                    return false;
+                }
+            }            
+
+            // load messages if already present
+            List<Message> messages = DBManager.Instance.GetMessagesForCore(messageCore, DBManager.MessageLoad.ALL);
+            messages.Sort();
+
+            // now parse all data into the message classes            
+            try
+            {
+
+                foreach (Message message in messages)
+                {
+                    if ((message.MessageNotificationClass == Message.NotificationClass.AGNT) && notificationClasses.Contains(Message.NotificationClass.AGNT))
+                    { if (ScanAGNT(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.ATA) && notificationClasses.Contains(Message.NotificationClass.ATA))
+                    { if (ScanATA(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.ATD) && notificationClasses.Contains(Message.NotificationClass.ATD))
+                    { if (ScanATD(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.BKRA) && notificationClasses.Contains(Message.NotificationClass.BKRA))
+                    { if (ScanBKRA(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.BKRD) && notificationClasses.Contains(Message.NotificationClass.BKRD))
+                    { if (ScanBKRD(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.BPOL) && notificationClasses.Contains(Message.NotificationClass.BPOL))
+                    { if (ScanBPOL(message, reader)) ExcelReader.SaveMessage(message); }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.CREW) && notificationClasses.Contains(Message.NotificationClass.CREW))
+                    { if (ScanCREW(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.CREWD) && notificationClasses.Contains(Message.NotificationClass.CREWD))
+                    { if (ScanCREWD(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.HAZA) && notificationClasses.Contains(Message.NotificationClass.HAZA))
+                    { if (ScanHAZA(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.HAZD) && notificationClasses.Contains(Message.NotificationClass.HAZD))
+                    { if (ScanHAZD(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.INFO) && notificationClasses.Contains(Message.NotificationClass.INFO))
+                    { if (ScanINFO(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.LADG) && notificationClasses.Contains(Message.NotificationClass.LADG))
+                    { if (ScanLADG(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.MDH) && notificationClasses.Contains(Message.NotificationClass.MDH))
+                    { if (ScanMDH(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.NAME) && notificationClasses.Contains(Message.NotificationClass.NAME))
+                    { if (ScanNAME(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD))
+                    { if (ScanNOA_NOD(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.PAS) && notificationClasses.Contains(Message.NotificationClass.PAS))
+                    { if (ScanPAS(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD))
+                    { if (ScanPASD(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.POBA) && notificationClasses.Contains(Message.NotificationClass.POBA))
+                    { if (ScanPOBA(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.POBD) && notificationClasses.Contains(Message.NotificationClass.POBD))
+                    { if (ScanPOBD(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.PRE72H) && notificationClasses.Contains(Message.NotificationClass.PRE72H))
+                    { if (ScanPRE72H(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.SEC) && notificationClasses.Contains(Message.NotificationClass.SEC))
+                    { if (ScanSEC(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.SERV) && notificationClasses.Contains(Message.NotificationClass.SERV))
+                    { if (ScanSERV(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.STAT) && notificationClasses.Contains(Message.NotificationClass.STAT))
+                    { if (ScanSTAT(message, messageCore, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.STO) && notificationClasses.Contains(Message.NotificationClass.STO))
+                    { if (ScanSTO(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.TIEFA) && notificationClasses.Contains(Message.NotificationClass.TIEFA))
+                    { if (ScanTIEFA(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.TIEFD) && notificationClasses.Contains(Message.NotificationClass.TIEFD))
+                    { if (ScanTIEFD(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.TOWA) && notificationClasses.Contains(Message.NotificationClass.TOWA))
+                    { if (ScanTOWA(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.TOWD) && notificationClasses.Contains(Message.NotificationClass.TOWD))
+                    { if (ScanTOWD(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.WAS) && notificationClasses.Contains(Message.NotificationClass.WAS))
+                    { if (ScanWAS(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    if ((message.MessageNotificationClass == Message.NotificationClass.WAS_RCPT) && notificationClasses.Contains(Message.NotificationClass.WAS_RCPT))
+                    { if (ScanWAS_RCPT(message, reader)) ExcelReader.SaveMessage(message); continue; }
+
+                }
+
+                DBManager.Instance.Save(messageCore);            // muss das eigentlich sein?
+            }
+            catch (Exception ex)
+            {
+                readMessage = ex.Message;
+                result = false;
+            }
+
+            return result;
+        }
+
+        #region WAS_RCPT
+
+        private static bool ScanWAS_RCPT(Message was_rcptMessage, ExcelReader reader)
+        {
+            bool result = false;
+
+            for (int i = 0; i < 20; i++)
+            {
+                string idNumber = reader.ReadCellAsText("waste delivery receipt", string.Format("B{0}", i + 9));
+                if (idNumber.IsNullOrEmpty()) continue;
+                if (!(was_rcptMessage.GetSublistElementWithIdentifier(i.ToString()) is WAS_RCPT wasr))
+                {
+                    wasr = new WAS_RCPT();
+                    wasr.Identifier = i.ToString();
+                    wasr.MessageHeader = was_rcptMessage;
+                    was_rcptMessage.Elements.Add(wasr);
+                }
+                wasr.IdentificationNumber = idNumber;
+                wasr.PortReceptionFacilityName = reader.ReadCellAsText("waste delivery receipt", string.Format("C{0}", i + 9));
+                wasr.PortReceptionFacilityProviderName = reader.ReadCellAsText("waste delivery receipt", string.Format("D{0}", i + 9));
+                wasr.WasteDeliveryDateFrom = reader.ReadCellAsDateTime("waste delivery receipt", string.Format("E{0}", i + 9));
+                wasr.WasteDeliveryDateTo = reader.ReadCellAsDateTime("waste delivery receipt", string.Format("F{0}", i + 9));
+
+                // now for the love of god this ist so stupid but I have no better way
+                ReadWasteReceived(wasr, "101", string.Format("G{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "102", string.Format("H{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "103", string.Format("I{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "104", string.Format("J{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "105", string.Format("K{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "201", string.Format("L{0}", i + 9), string.Format("M{0}", i + 9) , reader);
+                ReadWasteReceived(wasr, "202", string.Format("N{0}", i + 9), string.Format("O{0}", i + 9), reader);
+                ReadWasteReceived(wasr, "203", string.Format("P{0}", i + 9), string.Format("Q{0}", i + 9), reader);
+                ReadWasteReceived(wasr, "204", string.Format("R{0}", i + 9), string.Format("S{0}", i + 9), reader);
+                ReadWasteReceived(wasr, "401", string.Format("T{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "501", string.Format("U{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "502", string.Format("V{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "503", string.Format("W{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "504", string.Format("X{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "505", string.Format("Y{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "506", string.Format("Z{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "507", string.Format("AA{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "508", string.Format("AB{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "509", string.Format("AC{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "510", string.Format("AD{0}", i + 9), string.Format("AE{0}", i + 9), reader);
+                ReadWasteReceived(wasr, "511", string.Format("AF{0}", i + 9), string.Format("AG{0}", i + 9), reader);
+                ReadWasteReceived(wasr, "601", string.Format("AH{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "602", string.Format("AI{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "991", string.Format("AJ{0}", i + 9), null, reader);
+                ReadWasteReceived(wasr, "999", string.Format("AK{0}", i + 9), string.Format("AL{0}", i + 9), reader);
+
+                ReadTreatmentFacility(wasr, string.Format("AM{0}", i + 9), reader);
+                ReadTreatmentFacility(wasr, string.Format("AN{0}", i + 9), reader);
+                ReadTreatmentFacility(wasr, string.Format("AO{0}", i + 9), reader);
+
+                result = true;
+            }
+
+            return result;
+        }
+
+        private static void ReadWasteReceived(WAS_RCPT was_rcpt, string wasteCode, string amountCell, string descriptionCell, ExcelReader reader)
+        {
+            double? amount = reader.ReadCellAsDecimal("waste delivery receipt", amountCell);
+            if (amount.HasValue)
+            {
+                WasteReceived wr = new WasteReceived();
+                wr.Identifier = (was_rcpt.WasteReceived.Count + 1).ToString();
+                wr.WAS_RCPT = was_rcpt;
+                was_rcpt.WasteReceived.Add(wr);
+                wr.WasteCode = wasteCode;
+                wr.AmountWasteReceived_MTQ = amount;
+                if(!descriptionCell.IsNullOrEmpty())
+                {
+                    wr.WasteDescription = reader.ReadCellAsText("waste delivery receipt", descriptionCell);
+                }
+            }
+        }
+
+        private static void ReadTreatmentFacility(WAS_RCPT was_rcpt, string facCell, ExcelReader reader)
+        {
+            string tfpText = reader.ReadCellAsText("waste delivery receipt", facCell);
+            if(!tfpText.IsNullOrEmpty())
+            {
+                TreatmentFacilityProvider tfp = new TreatmentFacilityProvider();
+                tfp.Identifier = (was_rcpt.TreatmentFacilityProvider.Count + 1).ToString();
+                tfp.WAS_RCPT = was_rcpt;
+                tfp.TreatmentFacilityProviderName = tfpText;
+                was_rcpt.TreatmentFacilityProvider.Add(tfp);
+            }
+        }
+
+        #endregion
+
+        #region WAS
+
+        private static bool ScanWAS(Message wasMessage, ExcelReader reader)
+        {
+
+            if (wasMessage.Elements.Count == 0)
+            {
+                WAS newWAS = new WAS();
+                newWAS.MessageHeader = wasMessage;
+                wasMessage.Elements.Add(newWAS);
+            }
+            WAS was = wasMessage.Elements[0] as WAS;
+            was.WasteDisposalValidExemption = reader.ReadCellAsBool("waste", "C8");
+            was.ConfirmationOfCorrectness = true;
+            was.ConfirmationOfSufficiency = true;
+
+            if(!(was.WasteDisposalValidExemption ?? false))
+            {
+                was.LastWasteDisposalPort = reader.ReadCellAsText("waste", "C10");
+                was.LastWasteDisposalDate = reader.ReadCellAsDateTime("waste", "C11");
+                was.NextWasteDisposalPort = reader.ReadCellAsText("waste", "C12");
+
+                
+                for (int i = 1; i <= 25; i++)
+                {
+                    if (!(was.GetSublistElementWithIdentifier(i.ToString()) is Waste waste))
+                    {
+                        waste = new Waste();
+                        waste.Identifier = i.ToString();
+                        waste.WAS = was;
+                        was.Waste.Add(waste);
+                    }
+                    waste.WasteType = (int?)reader.ReadCellAsDecimal("waste", string.Format("C{0}", i + 18));
+                    waste.WasteDescription = reader.ReadCellAsText("waste", string.Format("D{0}", i + 18));
+                    waste.WasteDisposalAmount_MTQ = reader.ReadCellAsDecimal("waste", string.Format("E{0}", i + 18));
+                    waste.WasteCapacity_MTQ = reader.ReadCellAsDecimal("waste", string.Format("F{0}", i + 18));
+                    waste.WasteAmountRetained_MTQ = reader.ReadCellAsDecimal("waste", string.Format("G{0}", i + 18));
+                    waste.WasteDisposalPort = reader.ReadCellAsText("waste", string.Format("H{0}", i + 18));
+                    waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadCellAsDecimal("waste", string.Format("I{0}", i + 18));
+                }
+
+                was.WasteDisposalServiceProvider.Clear();
+                for (int i = 1; i < 1000; i++)
+                {
+                    string wsdpName = reader.ReadCellAsText("waste", string.Format("B{0}", i + 45));
+                    if (wsdpName.IsNullOrEmpty()) break;
+                    WasteDisposalServiceProvider wdsp = new WasteDisposalServiceProvider();
+                    wdsp.Identifier = i.ToString();
+                    wdsp.WAS = was;
+                    was.WasteDisposalServiceProvider.Add(wdsp);
+                    wdsp.WasteDisposalServiceProviderName = wsdpName;
+                }
+
+            }
+            
+            return true;
+        }
+
+        #endregion
+
+        #region TOWD
+
+        private static bool ScanTOWD(Message towdMessage, ExcelReader reader)
+        {
+
+            bool result = false;
+
+            for (int i = 1; i < 10000; i++)
+            {
+                string towdName = reader.ReadCellAsText("towage on departure", string.Format("B{0}", 10 + i));
+                if (towdName.IsNullOrEmpty()) break;
+                if (!(towdMessage.GetSublistElementWithIdentifier(i.ToString()) is TOWD towd))
+                {
+                    towd = new TOWD();
+                    towd.MessageHeader = towdMessage;
+                    towd.Identifier = i.ToString();
+                    towdMessage.Elements.Add(towd);
+                }
+                towd.TowageOnDepartureName = towdName;
+                towd.TowageOnDepartureFlag = reader.ReadCellAsText("towage on departure", string.Format("C{0}", 10 + i));
+                towd.TowageOnDepartureOperatorCompanyName = reader.ReadCellAsText("towage on departure", string.Format("D{0}", 10 + i));
+                towd.TowageOnDepartureOperatorStreetNameAndNumber = reader.ReadCellAsText("towage on departure", string.Format("E{0}", 10 + i));
+                towd.TowageOnDepartureOperatorPostalCode = reader.ReadCellAsText("towage on departure", string.Format("F{0}", 10 + i));
+                towd.TowageOnDepartureOperatorCity = reader.ReadCellAsText("towage on departure", string.Format("G{0}", 10 + i));
+                towd.TowageOnDepartureOperatorCountry = reader.ReadCellAsText("towage on departure", string.Format("H{0}", 10 + i));
+                towd.TowageOnDepartureOperatorPhone = reader.ReadCellAsText("towage on departure", string.Format("J{0}", 10 + i));
+                towd.TowageOnDepartureOperatorEmail = reader.ReadCellAsText("towage on departure", string.Format("K{0}", 10 + i));
+                towd.TowageOnDepartureDraught_DMT = reader.ReadCellAsDecimal("towage on departure", string.Format("L{0}", 10 + i));
+                towd.TowageOnDepartureLengthOverall_MTR = reader.ReadCellAsDecimal("towage on departure", string.Format("M{0}", 10 + i));                                
+                towd.TowageOnDepartureBeam_MTR = reader.ReadCellAsDecimal("towage on departure", string.Format("N{0}", 10 + i));
+                towd.TowageOnDepartureRemarks = reader.ReadCellAsText("towage on departure", string.Format("O{0}", 10 + i));
+
+                result = true;
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region TOWA
+
+        private static bool ScanTOWA(Message towaMessage, ExcelReader reader)
+        {
+            bool result = false;
+
+            for (int i = 1; i < 10000; i++)
+            {
+                string towaName = reader.ReadCellAsText("towage on arrival", string.Format("B{0}", 10 + i));
+                if (towaName.IsNullOrEmpty()) break;
+                if (!(towaMessage.GetSublistElementWithIdentifier(i.ToString()) is TOWA towa))
+                {
+                    towa = new TOWA();
+                    towa.MessageHeader = towaMessage;
+                    towa.Identifier = i.ToString();
+                    towaMessage.Elements.Add(towa);
+                }
+                towa.TowageOnArrivalName = towaName;
+                towa.TowageOnArrivalFlag = reader.ReadCellAsText("towage on arrival", string.Format("C{0}", 10 + i));
+                towa.TowageOnArrivalOperatorCompanyName = reader.ReadCellAsText("towage on arrival", string.Format("D{0}", 10 + i));
+                towa.TowageOnArrivalOperatorStreetNameAndNumber = reader.ReadCellAsText("towage on arrival", string.Format("E{0}", 10 + i));
+                towa.TowageOnArrivalOperatorPostalCode = reader.ReadCellAsText("towage on arrival", string.Format("F{0}", 10 + i));
+                towa.TowageOnArrivalOperatorCity = reader.ReadCellAsText("towage on arrival", string.Format("G{0}", 10 + i));
+                towa.TowageOnArrivalOperatorCountry = reader.ReadCellAsText("towage on arrival", string.Format("H{0}", 10 + i));
+                towa.TowageOnArrivalOperatorPhone = reader.ReadCellAsText("towage on arrival", string.Format("J{0}", 10 + i));
+                towa.TowageOnArrivalOperatorEmail = reader.ReadCellAsText("towage on arrival", string.Format("K{0}", 10 + i));
+                towa.TowageOnArrivalGrossTonnage = (int?) reader.ReadCellAsDecimal("towage on arrival", string.Format("L{0}", 10 + i));
+                towa.TowageOnArrivalLengthOverall_MTR = reader.ReadCellAsDecimal("towage on arrival", string.Format("M{0}", 10 + i));
+                towa.TowageOnArrivalBeam_MTR = reader.ReadCellAsDecimal("towage on arrival", string.Format("N{0}", 10 + i));
+                towa.TowageOnArrivalPurposeOfCall = reader.ReadCellAsText("towage on arrival", string.Format("O{0}", 10 + i));
+                towa.TowageOnArrivalDraught_DMT = reader.ReadCellAsDecimal("towage on arrival", string.Format("P{0}", 10 + i));
+                towa.TowageOnArrivalRemarks = reader.ReadCellAsText("towage on arrival", string.Format("Q{0}", 10 + i));
+
+                result = true;
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region TIEFD
+
+        private static bool ScanTIEFD(Message tiefdMessage, ExcelReader reader)
+        {
+            if (tiefdMessage.Elements.Count == 0)
+            {
+                TIEFD newTIEFD = new TIEFD();
+                newTIEFD.MessageHeader = tiefdMessage;
+                tiefdMessage.Elements.Add(newTIEFD);
+            }
+            TIEFD tiefd = tiefdMessage.Elements[0] as TIEFD;
+            tiefd.DraughtUponDeparture_DMT = reader.ReadCellAsDecimal("traffic message on departure", "C14");
+            return tiefd.DraughtUponDeparture_DMT.HasValue;
+        }
+
+        #endregion
+
+        #region TIEFA
+
+        private static bool ScanTIEFA(Message tiefaMessage, ExcelReader reader)
+        {
+            if (tiefaMessage.Elements.Count == 0)
+            {
+                TIEFA newTIEFA = new TIEFA();
+                newTIEFA.MessageHeader = tiefaMessage;
+                tiefaMessage.Elements.Add(newTIEFA);
+            }
+            TIEFA tiefa = tiefaMessage.Elements[0] as TIEFA;
+            tiefa.DraughtUponArrival_DMT = reader.ReadCellAsDecimal("traffic message on arrival", "C14");
+            return tiefa.DraughtUponArrival_DMT.HasValue;
+        }
+
+        #endregion
+
+        #region STO
+
+        private static bool ScanSTO(Message message, ExcelReader reader)
+        {
+            return false; // not reported on dakosy sheet
+        }
+
+        #endregion
+
+        #region STAT
+
+        private static bool ScanSTAT(Message statMessage, MessageCore core, ExcelReader reader)
+        {
+            if (statMessage.Elements.Count == 0)
+            {
+                STAT newSTAT = new STAT();
+                newSTAT.MessageHeader = statMessage;
+                statMessage.Elements.Add(newSTAT);
+            }
+            STAT stat = statMessage.Elements[0] as STAT;
+            stat.ShipName = reader.ReadCellAsText("ship", "C8");
+            stat.CallSign = reader.ReadCellAsText("ship", "C9");
+            core.IMO = reader.ReadCellAsText("ship", "C10");
+            core.ENI = reader.ReadCellAsText("ship", "C11");
+            core.PoC = reader.ReadCellAsText("port message", "C8");
+            DBManager.Instance.Save(core);
+            stat.MMSINumber = reader.ReadCellAsText("ship", "C12");
+            stat.Flag = reader.ReadCellAsText("ship", "C13");
+            stat.LengthOverall_MTR = reader.ReadCellAsDecimal("ship", "C14");
+            stat.Beam_MTR = reader.ReadCellAsDecimal("ship", "C15");
+            stat.GrossTonnage = (int?) reader.ReadCellAsDecimal("ship", "C16");
+            stat.PortOfRegistry = reader.ReadCellAsText("ship", "C17");
+            stat.InmarsatCallNumber = string.Format("{0} {1} {2} {3} {4}",
+                reader.ReadCellAsText("ship", "C18"),
+                reader.ReadCellAsText("ship", "C19"),
+                reader.ReadCellAsText("ship", "C20"),
+                reader.ReadCellAsText("ship", "C21"),
+                reader.ReadCellAsText("ship", "C22")
+                ).Trim();
+            stat.ShipType = reader.ReadCellAsText("ship", "C23");
+            stat.TransportMode = reader.ReadCellAsText("ship", "C24");
+            
+            stat.ISMCompanyName = reader.ReadCellAsText("ship", "C26");
+            stat.ISMCompanyId = reader.ReadCellAsText("ship", "C27");
+            string street = reader.ReadCellAsText("ship", "C28");
+            string number = reader.ReadCellAsText("ship", "C29");
+            stat.ISMCompanyStreetAndNumber = string.Format("{0} {1}", street, number).Trim();
+            stat.ISMCompanyPostalCode = reader.ReadCellAsText("ship", "C30");
+            stat.ISMCompanyCity = reader.ReadCellAsText("ship", "C31");
+            stat.ISMCompanyCountry = reader.ReadCellAsText("ship", "C32");
+
+            return true;
+        }
+
+        #endregion
+
+        #region SERV
+
+        private static bool ScanSERV(Message servMessage, ExcelReader reader)
+        {
+            bool result = false;
+
+            for(int i=0;i<10000;i++)
+            {
+                string serviceName = reader.ReadCellAsText("port message", string.Format("B{0}", i + 50));
+                string serviceBeneficiary = reader.ReadCellAsText("port message", string.Format("C{0}", i + 50));
+                string serviceInvoiceRecipient = reader.ReadCellAsText("port message", string.Format("D{0}", i + 50));
+                if (serviceName.IsNullOrEmpty() && serviceBeneficiary.IsNullOrEmpty()) break;
+
+                if (!(servMessage.GetSublistElementWithIdentifier((i + 1).ToString()) is SERV serv))
+                {
+                    serv = new SERV();
+                    serv.MessageHeader = servMessage;
+                    serv.Identifier = (i + 1).ToString();
+                    servMessage.Elements.Add(serv);
+                }
+                serv.ServiceName = serviceName;
+                serv.ServiceBeneficiary = serviceBeneficiary;
+                serv.ServiceInvoiceRecipient = serviceInvoiceRecipient;
+                result = true;
+            }
+           
+            return result;
+        }
+
+        #endregion
+
+        #region SEC
+
+        private static bool ScanSEC(Message secMessage, ExcelReader reader)
+        {
+            if (secMessage.Elements.Count == 0)
+            {
+                SEC newSEC = new SEC();
+                newSEC.MessageHeader = secMessage;
+                secMessage.Elements.Add(newSEC);
+            }
+            SEC sec = secMessage.Elements[0] as SEC;
+            sec.CurrentShipSecurityLevel = (byte?)reader.ReadCellAsDecimal("security", "D7");
+            sec.SECSimplification = reader.ReadCellAsBool("security", "D9");
+
+            sec.KielCanalPassagePlanned = reader.ReadCellAsBool("security", "I7") ?? false;
+            if(sec.KielCanalPassagePlanned ?? false)
+            {
+                DateTime? incoming = reader.ReadCellAsDateTime("security", "I9");
+                if (incoming.HasValue)
+                    sec.KielCanalPassagePlannedIncomming = new DateTime(incoming.Value.Year, incoming.Value.Month, incoming.Value.Day, 11, 11, 0).ToUniversalTime();
+
+                DateTime? outgoing = reader.ReadCellAsDateTime("security", "I12");
+                if(outgoing.HasValue)
+                sec.KielCanalPassagePlannedOutgoing = new DateTime(outgoing.Value.Year, outgoing.Value.Month, outgoing.Value.Day, 11, 11, 0).ToUniversalTime();
+            }
+
+            if(sec.SECSimplification ?? false)
+            {
+                sec.PortOfCallWhereCompleteSECNotified = reader.ReadCellAsText("security", "D10")?.Substring(0, 5);
+            } 
+            else
+            {
+                sec.CSOLastName = reader.ReadCellAsText("security", "D12");
+                sec.CSOFirstName = reader.ReadCellAsText("security", "D13");
+                sec.CSOPhone = reader.ReadCellAsText("security", "D14");
+                sec.CSOFax = reader.ReadCellAsText("security", "D15");
+                sec.CSOEMail = reader.ReadCellAsText("security", "D16");
+                sec.ValidISSCOnBoard = reader.ReadCellAsBool("security", "D17");
+                sec.ReasonsForNoValidISSC = reader.ReadCellAsText("security", "D18");
+                string isscType = reader.ReadCellAsText("security", "D19");
+                if(!isscType.IsNullOrEmpty())
+                {
+                    if (isscType.Equals("full", StringComparison.OrdinalIgnoreCase)) sec.ISSCType = 0;
+                    if (isscType.Equals("interim", StringComparison.OrdinalIgnoreCase)) sec.ISSCType = 1;
+                }
+                string issuerType = reader.ReadCellAsText("security", "D20");
+                if(!issuerType.IsNullOrEmpty())
+                {
+                    if (issuerType.Equals("ADMINISTRATION", StringComparison.OrdinalIgnoreCase)) sec.ISSCIssuerType = 0;
+                    if (issuerType.Equals("RSO", StringComparison.OrdinalIgnoreCase)) sec.ISSCIssuerType = 1;
+                }
+                sec.ISSCIssuerName = reader.ReadCellAsText("security", "D21");
+                sec.ISSCDateOfExpiration = reader.ReadCellAsDateTime("security", "D22");
+                sec.ApprovedSecurityPlanOnBoard = reader.ReadCellAsBool("security", "D23");
+                sec.PortFacilityOfArrival = reader.ReadCellAsText("security", "D24");
+                string generalDoC = reader.ReadCellAsText("security", "D25");
+                if(!generalDoC.IsNullOrEmpty())
+                {
+                    if(generalDoC.Equals("container", StringComparison.OrdinalIgnoreCase)) sec.GeneralDescriptionOfCargo = 0;
+                    if (generalDoC.Equals("vehicles", StringComparison.OrdinalIgnoreCase)) sec.GeneralDescriptionOfCargo = 1;
+                    if (generalDoC.Equals("conventional_general_cargo", StringComparison.OrdinalIgnoreCase)) sec.GeneralDescriptionOfCargo = 2;
+                    if (generalDoC.Equals("dry_cargo_in_bulk", StringComparison.OrdinalIgnoreCase)) sec.GeneralDescriptionOfCargo = 3;
+                    if (generalDoC.Equals("liquid_cargo_in_bulk", StringComparison.OrdinalIgnoreCase)) sec.GeneralDescriptionOfCargo = 4;
+                    if (generalDoC.Equals("empty", StringComparison.OrdinalIgnoreCase)) sec.GeneralDescriptionOfCargo = 5;
+                }
+
+                for (int i = 1; i <= 10; i++)
+                {
+                    if (!(sec.GetPortFacilityWithIdentifier(i.ToString()) is LastTenPortFacilitiesCalled l10fc))
+                    {
+                        l10fc = new LastTenPortFacilitiesCalled();
+                        l10fc.Identifier = i.ToString();
+                        l10fc.SEC = sec;
+                        sec.LastTenPortFacilitesCalled.Add(l10fc);
+                    }
+
+                    l10fc.PortFacilityPortName = reader.ReadCellAsText("security", String.Format("B{0}", i + 30));
+                    l10fc.PortFacilityPortCountry = reader.ReadCellAsText("security", String.Format("C{0}", i + 30));
+                    l10fc.PortFacilityPortLoCode = reader.ReadCellAsText("security", String.Format("D{0}", i + 30));
+                    l10fc.PortFacilityDateOfArrival = reader.ReadCellAsDateTime("security", String.Format("E{0}", i + 30));
+                    l10fc.PortFacilityDateOfDeparture = reader.ReadCellAsDateTime("security", String.Format("F{0}", i + 30));
+                    l10fc.PortFacilityShipSecurityLevel = (byte?) reader.ReadCellAsDecimal("security", String.Format("G{0}", i + 30));
+                    l10fc.PortFacilitySecurityMattersToReport = reader.ReadCellAsText("security", String.Format("H{0}", i + 30));
+                    l10fc.PortFacilityGISISCode = reader.ReadCellAsText("security", String.Format("I{0}", i + 30));
+                    l10fc.PortFacilityGISISCodeLocode = reader.ReadCellAsText("security", String.Format("J{0}", i + 30));
+
+                    // keinen "leeren" Hafen anlegen, wenn der Eintrag leer war (trifft anscheinend bei Neubauten zu, siehe E-Mail Christin vom 20./22.6.17
+                    if (l10fc.PortFacilityPortName.IsNullOrEmpty() && l10fc.PortFacilityPortLoCode.IsNullOrEmpty() && l10fc.PortFacilityPortCountry.IsNullOrEmpty())
+                        sec.LastTenPortFacilitesCalled.Remove(l10fc);
+                }
+
+                for (int i = 1; i <= 10; i++)
+                {
+                    if (!(sec.GetShipToShipWithIdentifier(i.ToString()) is ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2sActivity))
+                    {
+                        s2sActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
+                        s2sActivity.Identifier = i.ToString();
+                        s2sActivity.SEC = sec;
+                        sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(s2sActivity);
+                    }
+
+                    s2sActivity.ShipToShipActivityLocationName = reader.ReadCellAsText("security", string.Format("B{0}", i + 45));
+                    s2sActivity.ShipToShipActivityLocationLoCode = reader.ReadCellAsText("security", string.Format("C{0}", i + 45));
+                    s2sActivity.ShipToShipActivityLocationCoordinatesLatitude = (int?) reader.ReadCellAsDecimal("security", string.Format("D{0}", i + 45));
+                    s2sActivity.ShipToShipActivityLocationCoordinatesLongitude = (int?) reader.ReadCellAsDecimal("security", string.Format("E{0}", i + 45));
+                    s2sActivity.ShipToShipActivityDateFrom = reader.ReadCellAsDateTime("security", string.Format("F{0}", i + 45));
+                    s2sActivity.ShipToShipActivityDateTo = reader.ReadCellAsDateTime("security", string.Format("G{0}", i + 45));
+                    s2sActivity.ShipToShipActivityTypeCode = (int?) reader.ReadCellAsDecimal("security", string.Format("H{0}", i + 45));
+                    s2sActivity.ShipToShipActivitySecurityMattersToReport = reader.ReadCellAsText("security", string.Format("I{0}", i + 45));
+
+                    if (s2sActivity.ShipToShipActivityLocationName.IsNullOrEmpty() && s2sActivity.ShipToShipActivityLocationLoCode.IsNullOrEmpty() &&
+                        !(s2sActivity.ShipToShipActivityLocationCoordinatesLatitude.HasValue && s2sActivity.ShipToShipActivityLocationCoordinatesLongitude.HasValue))
+                        sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Remove(s2sActivity);
+                }
+
+            }
+
+            return true;
+        }
+
+        #endregion
+
+        #region PRE72H
+
+        private static bool ScanPRE72H(Message pre72hMessage, ExcelReader reader)
+        {
+            if (pre72hMessage.Elements.Count == 0)
+            {
+                PRE72H newPRE72H = new PRE72H();
+                newPRE72H.MessageHeader = pre72hMessage;
+                pre72hMessage.Elements.Add(newPRE72H);
+            }
+            PRE72H pre72h = pre72hMessage.Elements[0] as PRE72H;
+
+            pre72h.Tanker = reader.ReadCellAsBool("port state control", "C8");
+            if(pre72h.Tanker ?? false)
+            {
+                string hull = reader.ReadCellAsText("port state control", "C10");
+                if (hull.Equals("single_hull", StringComparison.OrdinalIgnoreCase))
+                    pre72h.TankerHullConfiguration = 0;
+                if (hull.Equals("single_hull_with_sbt", StringComparison.OrdinalIgnoreCase))
+                    pre72h.TankerHullConfiguration = 1;
+                if (hull.Equals("double_hull", StringComparison.OrdinalIgnoreCase))
+                    pre72h.TankerHullConfiguration = 2;
+
+                string condition = reader.ReadCellAsText("port state control", "C11");
+                if (condition.Equals("full", StringComparison.OrdinalIgnoreCase))
+                    pre72h.ConditionCargoBallastTanks = 0;
+                if (condition.Equals("empty", StringComparison.OrdinalIgnoreCase))
+                    pre72h.ConditionCargoBallastTanks = 1;
+                if (condition.Equals("inerted", StringComparison.OrdinalIgnoreCase))
+                    pre72h.ConditionCargoBallastTanks = 2;
+
+                pre72h.NatureOfCargo = reader.ReadCellAsText("port state control", "C12");
+                pre72h.VolumeOfCargo = reader.ReadCellAsDecimal("port state control", "C13");
+            }
+
+            pre72h.PlannedOperations = reader.ReadTextFromDropdown("port state control", "C14");
+            pre72h.PlannedWorks = reader.ReadCellAsText("port state control", "C15");
+            pre72h.DateOfLastExpandedInspection = reader.ReadCellAsDateTime("port state control", "C16");
+            pre72h.PlannedPeriodOfStay_HUR = reader.ReadCellAsDecimal("port state control", "C17");
+
+            return true;
+        }
+
+        #endregion
+
+        #region POBD
+
+        private static bool ScanPOBD(Message pobdMessage, ExcelReader reader)
+        {
+            if (pobdMessage.Elements.Count == 0)
+            {
+                POBD newPOBD = new POBD();
+                newPOBD.MessageHeader = pobdMessage;
+                pobdMessage.Elements.Add(newPOBD);
+            }
+
+            POBD pobd = pobdMessage.Elements[0] as POBD;
+            pobd.TotalPersonsOnBoardUponDeparture = (int?)reader.ReadCellAsDecimal("traffic message on departure", "C8");
+            pobd.TotalCrewMembersOnBoardUponDeparture = (int?)reader.ReadCellAsDecimal("traffic message on departure", "C9");
+            pobd.TotalPassengersOnBoardUponDeparture = (int?)reader.ReadCellAsDecimal("traffic message on departure", "C10");
+            pobd.TotalStowawaysOnBoardUponDeparture = (int?)reader.ReadCellAsDecimal("traffic message on departure", "C11");
+
+            return true;
+        }
+
+        #endregion
+
+        #region POBA
+
+        private static bool ScanPOBA(Message pobaMessage, ExcelReader reader)
+        {
+            if (pobaMessage.Elements.Count == 0)
+            {
+                POBA newPOBA = new POBA();
+                newPOBA.MessageHeader = pobaMessage;
+                pobaMessage.Elements.Add(newPOBA);
+            }
+
+            POBA poba = pobaMessage.Elements[0] as POBA;
+            poba.TotalPersonsOnBoardUponArrival = (int?) reader.ReadCellAsDecimal("traffic message on arrival", "C8");
+            poba.TotalCrewMembersOnBoardUponArrival = (int?) reader.ReadCellAsDecimal("traffic message on arrival", "C9");
+            poba.TotalPassengersOnBoardUponArrival = (int?) reader.ReadCellAsDecimal("traffic message on arrival", "C10");
+            poba.TotalStowawaysOnBoardUponArrival = (int?) reader.ReadCellAsDecimal("traffic message on arrival", "C11");
+
+            return true;
+        }
+
+        #endregion
+
+        #region PASD
+
+        private static bool ScanPASD(Message pasdMessage, ExcelReader reader)
+        {
+            bool result = false;
+            for (int i = 0; i < 1000; i++)
+            {
+                string lastName = reader.ReadCellAsText("passenger departure", string.Format("B{0}", i + 16));
+                if (lastName.IsNullOrEmpty()) break;
+
+                if (!(pasdMessage.GetSublistElementWithIdentifier((i + 1).ToString()) is PAS pas))
+                {
+                    pas = new PASD();
+                    pas.Identifier = (i + 1).ToString();
+                    pas.MessageHeader = pasdMessage;
+                    pasdMessage.Elements.Add(pas);
+                }
+
+                pas.NotificationSchengen = reader.ReadCellAsBool("passenger departure", "C10");
+                pas.NotificationPAX = reader.ReadCellAsBool("passenger departure", "C11");
+
+                pas.PassengerLastName = lastName;
+                pas.PassengerFirstName = reader.ReadCellAsText("passenger departure", string.Format("C{0}", i + 16));
+                pas.PassengerPlaceOfBirth = reader.ReadCellAsText("passenger departure", string.Format("D{0}", i + 16));
+                pas.PassengerCountryOfBirth = reader.ReadCellAsText("passenger departure", string.Format("E{0}", i + 16));
+                pas.PassengerDateOfBirth = reader.ReadCellAsDateTime("passenger departure", string.Format("F{0}", i + 16));
+                pas.PassengerGender = ParseGender(reader.ReadCellAsText("passenger departure", string.Format("G{0}", i + 16)));
+                pas.PassengerNationality = reader.ReadCellAsText("passenger departure", string.Format("H{0}", i + 16));
+                pas.PassengerIdentityDocumentIssuingState = reader.ReadCellAsText("passenger departure", string.Format("O{0}", i + 16));
+                pas.PassengerIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("passenger departure", string.Format("P{0}", i + 16));
+
+                if (pas.NotificationPAX ?? false)
+                {
+                    pas.EmergencyCare = reader.ReadCellAsText("passenger departure", string.Format("Q{0}", i + 16));
+                    pas.EmergencyContactNumber = reader.ReadCellAsText("passenger departure", string.Format("R{0}", i + 16));
+                }
+
+                if (pas.NotificationSchengen ?? false)
+                {
+                    pas.PassengerIdentityDocumentType = ParseDocumentType(reader.ReadCellAsText("passenger departure", string.Format("I{0}", i + 16)));
+                    pas.PassengerIdentityDocumentId = reader.ReadCellAsText("passenger departure", string.Format("J{0}", i + 16));
+                    pas.PassengerVisaNumber = reader.ReadCellAsText("passenger departure", string.Format("K{0}", i + 16));
+                    pas.PassengerPortOfEmbarkation = reader.ReadCellAsText("passenger departure", string.Format("L{0}", i + 16));
+                    pas.PassengerPortOfDisembarkation = reader.ReadCellAsText("passenger departure", string.Format("M{0}", i + 16));
+                    pas.PassengerInTransit = reader.ReadCellAsBool("passenger departure", string.Format("N{0}", i + 16));
+                }
+
+                result = true;
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region PAS
+
+        private static bool ScanPAS(Message pasMessage, ExcelReader reader)
+        {
+            bool result = false;
+            for (int i = 0; i < 1000; i++)
+            {
+                string lastName = reader.ReadCellAsText("passenger arrival", string.Format("B{0}", i + 16));
+                if (lastName.IsNullOrEmpty()) break;
+
+                if (!(pasMessage.GetSublistElementWithIdentifier((i + 1).ToString()) is PAS pas))
+                {
+                    pas = new PAS();
+                    pas.Identifier = (i + 1).ToString();
+                    pas.MessageHeader = pasMessage;
+                    pasMessage.Elements.Add(pas);
+                }
+
+                pas.NotificationSchengen = reader.ReadCellAsBool("passenger arrival", "C10");
+                pas.NotificationPAX = reader.ReadCellAsBool("passenger arrival", "C11");
+
+                pas.PassengerLastName = lastName;
+                pas.PassengerFirstName = reader.ReadCellAsText("passenger arrival", string.Format("C{0}", i + 16));
+                pas.PassengerPlaceOfBirth = reader.ReadCellAsText("passenger arrival", string.Format("D{0}", i + 16));
+                pas.PassengerCountryOfBirth = reader.ReadCellAsText("passenger arrival", string.Format("E{0}", i + 16));
+                pas.PassengerDateOfBirth = reader.ReadCellAsDateTime("passenger arrival", string.Format("F{0}", i + 16));
+                pas.PassengerGender = ParseGender(reader.ReadCellAsText("passenger arrival", string.Format("G{0}", i + 16)));
+                pas.PassengerNationality = reader.ReadCellAsText("passenger arrival", string.Format("H{0}", i + 16));
+                pas.PassengerIdentityDocumentIssuingState = reader.ReadCellAsText("passenger arrival", string.Format("O{0}", i + 16));
+                pas.PassengerIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("passenger arrival", string.Format("P{0}", i + 16));
+
+                //if(pas.NotificationPAX ?? false)
+                //{
+                    pas.EmergencyCare = reader.ReadCellAsText("passenger arrival", string.Format("Q{0}", i + 16));
+                    pas.EmergencyContactNumber = reader.ReadCellAsText("passenger arrival", string.Format("R{0}", i + 16));
+                //}
+
+                //if(pas.NotificationSchengen ?? false)
+                //{
+                    pas.PassengerIdentityDocumentType = ParseDocumentType(reader.ReadCellAsText("passenger arrival", string.Format("I{0}", i + 16)));
+                    pas.PassengerIdentityDocumentId = reader.ReadCellAsText("passenger arrival", string.Format("J{0}", i + 16));
+                    pas.PassengerVisaNumber = reader.ReadCellAsText("passenger arrival", string.Format("K{0}", i + 16));
+                    pas.PassengerPortOfEmbarkation = reader.ReadCellAsText("passenger arrival", string.Format("L{0}", i + 16));
+                    pas.PassengerPortOfDisembarkation = reader.ReadCellAsText("passenger arrival", string.Format("M{0}", i + 16));
+                    pas.PassengerInTransit = reader.ReadCellAsBool("passenger arrival", string.Format("N{0}", i + 16));
+                //}
+
+                result = true;
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region NOA_NOD
+
+        private static bool ScanNOA_NOD(Message noa_nodMessage, ExcelReader reader)
+        {
+            if (noa_nodMessage.Elements.Count == 0)
+            {
+                NOA_NOD newNAME = new NOA_NOD();
+                newNAME.MessageHeader = noa_nodMessage;
+                noa_nodMessage.Elements.Add(newNAME);
+            }
+
+            NOA_NOD noa_nod = noa_nodMessage.Elements[0] as NOA_NOD;
+            noa_nod.ETAToPortOfCall = reader.ReadCellAsDateTime("port message", "C26");
+            noa_nod.ETDFromPortOfCall = reader.ReadCellAsDateTime("port message", "C27");
+            // read call purposes
+            for (int i = 0; i < 9; i++)
+            {
+                int? callPurposeCode = (int?) reader.ReadCellAsDecimal("port message", string.Format("B{0}", 29 + i));
+                string callPurposeDescription = reader.ReadCellAsText("port message", string.Format("C{0}", 29 + i));
+
+                if (callPurposeCode.HasValue)
+                {
+                    if (!(noa_nod.GetSublistElementWithIdentifier(i.ToString()) is CallPurpose callPurpose))
+                    {
+                        callPurpose = new CallPurpose();
+                        callPurpose.NOA_NOD = noa_nod;
+                        callPurpose.Identifier = i.ToString();
+                        noa_nod.CallPurposes.Add(callPurpose);
+                    }
+                    callPurpose.CallPurposeCode = callPurposeCode.Value;
+                    callPurpose.CallPurposeDescription = callPurposeDescription;
+                }
+            }
+            noa_nod.ETAToKielCanal = reader.ReadCellAsDateTime("port message", "C39");
+            noa_nod.ETDFromKielCanal = reader.ReadCellAsDateTime("port message", "C40");
+
+            noa_nod.LastPort = reader.ReadCellAsText("port message", "C42");
+            noa_nod.ETDFromLastPort = reader.ReadCellAsDateTime("port message", "C43");
+            noa_nod.NextPort = reader.ReadCellAsText("port message", "C44");
+            noa_nod.ETAToNextPort = reader.ReadCellAsDateTime("port message", "C45");
+
+            return true;
+        }
+
+        #endregion
+
+        #region NAME
+
+        private static bool ScanNAME(Message nameMessage, ExcelReader reader)
+        {
+            if (nameMessage.Elements.Count == 0)
+            {
+                NAME newNAME = new NAME();
+                newNAME.MessageHeader = nameMessage;
+                nameMessage.Elements.Add(newNAME);
+            }
+            NAME name = nameMessage.Elements[0] as NAME;
+            name.NameOfMaster = reader.ReadCellAsText("port message", "C11");
+            if (name.NameOfMaster.IsNullOrEmpty() && name.IsNew)
+                return false;
+            return true;
+        }
+
+        #endregion
+
+        #region MDH
+
+        private static bool ScanMDH(Message mdhMessage, ExcelReader reader)
+        {
+            if (mdhMessage.Elements.Count == 0)
+            {
+                MDH newMDH = new MDH();
+                newMDH.MessageHeader = mdhMessage;
+                mdhMessage.Elements.Add(newMDH);
+            }
+            MDH mdh = mdhMessage.Elements[0] as MDH;
+            mdh.MDHSimplification = reader.ReadCellAsBool("health", "D8");
+            if(mdh.MDHSimplification ?? false)
+            {
+                mdh.PortOfCallWhereCompleteMDHNotified = reader.ReadCellAsText("health", "D9");
+            }
+            else
+            {
+
+                // general fields
+
+                mdh.NonAccidentalDeathsDuringVoyage = reader.ReadCellAsBool("health", "D11");
+                if (mdh.NonAccidentalDeathsDuringVoyage ?? false)
+                    mdh.NonAccidentalDeathsDuringVoyageCount = (int?)reader.ReadCellAsDecimal("health", "D12");
+                mdh.SuspisionInfectiousNature = reader.ReadCellAsBool("health", "D13");
+                mdh.NumberOfIllPersonsHigherThanExpected = reader.ReadCellAsBool("health", "D14");
+                if (mdh.NumberOfIllPersonsHigherThanExpected ?? false)
+                    mdh.NumberOfIllPersons = (int?)reader.ReadCellAsDecimal("health", "D15");
+                mdh.SickPersonsOnBoard = reader.ReadCellAsBool("health", "D16");
+                mdh.MedicalConsulted = reader.ReadCellAsBool("health", "D17");
+                mdh.AwareOfFurtherInfections = reader.ReadCellAsBool("health", "D18");
+                mdh.SickAnimalOrPetOnBoard = reader.ReadCellAsBool("health", "D20");
+                mdh.ValidSanitaryControlExemptionOrCertificateOnBoard = reader.ReadCellAsBool("health", "D22");
+                if(mdh.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false)
+                {
+                    mdh.PlaceOfIssue = reader.ReadCellAsText("health", "D23");
+                    mdh.DateOfIssue = reader.ReadCellAsDateTime("health", "D24");
+                }
+                mdh.SanitaryControlReinspectionRequired = reader.ReadCellAsBool("health", "D25");
+
+                // sanitary measures
+                mdh.SanitaryMeasuresApplied = reader.ReadCellAsBool("health", "J8");
+                if (mdh.SanitaryMeasuresApplied ?? false)
+                {
+                    for (int i = 1; i <= 10; i++)
+                    {
+                        if (!(mdh.GetSanitaryMeasuresDetailWithIdentifier(i.ToString()) is SanitaryMeasuresDetail snd))
+                        {
+                            snd = new SanitaryMeasuresDetail();
+                            snd.Identifier = i.ToString();
+                            snd.MDH = mdh;
+                            mdh.SanitaryMeasuresDetails.Add(snd);
+                        }
+                        snd.SanitaryMeasuresType = reader.ReadCellAsText("health", string.Format("H{0}", i + 9));
+                        if (snd.SanitaryMeasuresType.IsNullOrEmpty())
+                        {
+                            mdh.SanitaryMeasuresDetails.Remove(snd);
+                            continue;
+                        }
+                        snd.SanitaryMeasuresLocation = reader.ReadCellAsText("health", string.Format("I{0}", i + 9));
+                        snd.SanitaryMeasuresDate = reader.ReadCellAsDateTime("health", string.Format("J{0}", i + 9));                        
+                    }
+                }
+
+                // stowaways
+                mdh.StowawaysDetected = reader.ReadCellAsBool("health", "I22");
+                if (mdh.StowawaysDetected ?? false)
+                {
+                    for (int i = 1; i <= 10; i++)
+                    {
+                        string stowawayLocation = reader.ReadCellAsText("health", string.Format("H{0}", i + 23));
+                        if(!stowawayLocation.IsNullOrEmpty())
+                        {
+                            if(!(mdh.GetStowawaysJoiningLocationWithIdentifier(i.ToString()) is StowawaysJoiningLocation sjl))
+                            {
+                                sjl = new StowawaysJoiningLocation();
+                                sjl.Identifier = i.ToString();
+                                sjl.MDH = mdh;
+                                mdh.StowawaysJoiningLocations.Add(sjl);
+                            }
+                            sjl.StowawayJoiningLocation = stowawayLocation;
+                        }
+                    }
+                }
+
+                // infected area
+                mdh.InfectedAreaVisited = reader.ReadCellAsBool("health", "L22");
+                if (mdh.InfectedAreaVisited ?? false)
+                {
+                    for (int i = 1; i <= 10; i++)
+                    {
+                        string iaPort = reader.ReadCellAsText("health", string.Format("K{0}", i + 23));
+                        if(!iaPort.IsNullOrEmpty())
+                        {
+                            if(!(mdh.GetInfectedAreaWithIdentifier(i.ToString()) is InfectedArea ia))
+                            {
+                                ia = new InfectedArea();
+                                ia.Identifier = i.ToString();
+                                ia.MDH = mdh;
+                                mdh.InfectedAreas.Add(ia);
+                            }
+                            ia.InfectedAreaPort = iaPort;
+                            ia.InfectedAreaDate = reader.ReadCellAsDateTime("health", string.Format("L{0}", i + 23));
+                        }
+                    }
+                }
+
+
+
+                // PoC last 30 days
+                // this crazy logic is necessary to interpret the double tables in the dakosy sheet
+
+                // collect all crew members
+                Dictionary<string, List<string>> crewmembers = new Dictionary<string, List<string>>();
+                for (int i = 1; i <= 1000; i++)
+                {
+                    string posRef = reader.ReadCellAsText("health", string.Format("G{0}", i + 45));
+                    if(posRef.IsNullOrEmpty())
+                        posRef = reader.ReadCellAsText("health", string.Format("H{0}", i + 45));
+                    if (posRef.IsNullOrEmpty()) break; // we are done with this loop
+                    string crewMember = reader.ReadCellAsText("health", string.Format("I{0}", i + 45));
+                    if (!crewMember.IsNullOrEmpty())
+                    {
+                        if(!crewmembers.ContainsKey(posRef))
+                            crewmembers.Add(posRef, new List<string>());
+                        crewmembers[posRef].Add(crewMember);
+                    }
+                }
+
+                for (int i = 1; i <= 1000; i++)
+                {
+                    string posRef = reader.ReadCellAsText("health", string.Format("B{0}", i + 45));
+                    string locode = reader.ReadCellAsText("health", string.Format("C{0}", i + 45));
+                    if (locode.IsNullOrEmpty()) break;
+                    if (!(mdh.GetSublistElementWithIdentifier((i + 1).ToString()) is PortOfCallLast30Days poc30d))
+                    {
+                        poc30d = new PortOfCallLast30Days();
+                        poc30d.Identifier = (i + 1).ToString();
+                        poc30d.MDH = mdh;
+                        mdh.PortOfCallLast30Days.Add(poc30d);
+                    }
+                    poc30d.PortOfCallLast30DaysLocode = locode;
+                    poc30d.PortOfCallLast30DaysDateOfDeparture = reader.ReadCellAsDateTime("health", string.Format("D{0}", i + 45));
+                    poc30d.PortOfCallLast30DaysCrewMembersJoined = reader.ReadCellAsBool("health", string.Format("E{0}", i + 45));
+                    poc30d.CrewJoinedShip.Clear();
+                    List<string> crewJoined = new List<string>();
+                    if (crewmembers.ContainsKey(posRef)) {
+                        crewJoined = crewmembers[posRef];
+                    }
+                    else if (crewmembers.ContainsKey(locode))
+                    {
+                        crewJoined = crewmembers[locode];
+                    }
+                    for(int j = 0; j < crewJoined.Count; j++)
+                    {
+                        PortOfCallLast30DaysCrewJoinedShip p = new PortOfCallLast30DaysCrewJoinedShip();
+                        p.PortOfCallLast30Days = poc30d;
+                        p.Identifier = (j + 1).ToString();
+                        poc30d.CrewJoinedShip.Add(p);
+                        p.PortOfCallLast30DaysCrewJoinedShipName = crewJoined[j];
+                    }
+                }
+            }
+            
+            return true;
+        }
+
+        #endregion
+
+        #region LADG
+
+        private static bool ScanLADG(Message ladgMessage, ExcelReader reader)
+        {
+            bool result = false;
+
+            for (int i = 0; i < 10000; i++)
+            {
+                string operation = reader.ReadCellAsText("cargo", string.Format("B{0}", i + 9));
+                byte? ladgOperation = null;
+                if (operation.Equals("LOAD", StringComparison.OrdinalIgnoreCase)) ladgOperation = 0;
+                if (operation.Equals("DISCHARGE", StringComparison.OrdinalIgnoreCase)) ladgOperation = 1;
+                if (operation.Equals("TRANSIT", StringComparison.OrdinalIgnoreCase)) ladgOperation = 2;
+                if (!ladgOperation.HasValue) break;
+
+                if (!(ladgMessage.GetSublistElementWithIdentifier((i + 1).ToString()) is LADG ladg))
+                {
+                    ladg = new LADG();
+                    ladg.MessageHeader = ladgMessage;
+                    ladg.Identifier = (i + 1).ToString();
+                    ladgMessage.Elements.Add(ladg);
+                }
+                ladg.CargoHandlingType = ladgOperation;
+                ladg.CargoLACode = (int?) reader.ReadCellAsDecimal("cargo", string.Format("C{0}", i + 9));
+                ladg.CargoCodeNST = reader.ReadCellAsText("cargo", string.Format("D{0}", i + 9))?.Substring(0, 2);
+                ladg.CargoCodeNST_3 = reader.ReadCellAsText("cargo", string.Format("E{0}", i + 9));
+                ladg.CargoNumberOfItems = (int?)reader.ReadCellAsDecimal("cargo", string.Format("F{0}", i + 9));
+                ladg.CargoGrossQuantity_TNE = reader.ReadCellAsDecimal("cargo", string.Format("G{0}", i + 9));
+                ladg.PortOfLoading = reader.ReadCellAsText("cargo", string.Format("H{0}", i + 9));
+                ladg.PortOfDischarge = reader.ReadCellAsText("cargo", string.Format("I{0}", i + 9));
+
+                result = true;
+            }
+
+            return result;
+        }
+
+        #endregion
+
+        #region INFO
+
+        private static bool ScanINFO(Message infoMessage, ExcelReader reader)
+        {
+            if (infoMessage.Elements.Count == 0)
+            {
+                INFO newINFO = new INFO();
+                newINFO.MessageHeader = infoMessage;
+                infoMessage.Elements.Add(newINFO);
+            }
+
+            INFO info = infoMessage.Elements[0] as INFO;
+            string shippingArea = reader.ReadCellAsText("port message", "C14");
+            if (shippingArea.Equals("NORTH_BALTIC_SEA", StringComparison.OrdinalIgnoreCase)) info.ShippingArea = 0;
+            if (shippingArea.Equals("EUROPE", StringComparison.OrdinalIgnoreCase)) info.ShippingArea = 1;
+            if (shippingArea.Equals("OVERSEAS", StringComparison.OrdinalIgnoreCase)) info.ShippingArea = 2;
+            info.RequestedPositionInPortOfCall = reader.ReadCellAsText("port message", "C15");
+            info.SpecialRequirementsOfShipAtBerth = reader.ReadCellAsText("port message", "C16");
+            info.ConstructionCharacteristicsOfShip = reader.ReadCellAsText("port message", "C17");
+            info.BowThrusterPower = reader.ReadCellAsText("port message", "C18");
+            info.SternThrusterPower = reader.ReadCellAsText("port message", "C19");
+            info.FumigatedBulkCargoBool = reader.ReadCellAsBool("port message", "C20");
+            info.DeplacementSummerDraught_TNE = reader.ReadCellAsDecimal("port message", "C21");
+            string portArea = reader.ReadCellAsText("port message", "C22")?.Trim().ToUpper();
+            if (!portArea.IsNullOrEmpty() && DBManager.Instance.GetPortAreaDict().ContainsKey(portArea))
+                info.PortArea = portArea;
+            else
+                info.PortArea = "";            
+
+            return true;
+        }
+
+        #endregion
+
+        #region HAZA / HAZD
+
+        private static bool ScanHAZD(Message message, ExcelReader reader)
+        {
+            return false; // not reported on Dakosy sheet
+        }
+
+        private static bool ScanHAZA(Message message, ExcelReader reader)
+        {
+            return false; // not reported on Dakosy sheet
+        }
+
+        #endregion
+
+        #region CREWD
+
+        private static bool ScanCREWD(Message crewMessage, ExcelReader reader)
+        {
+            bool result = false;
+            for (int i = 0; i < 1000; i++)
+            {
+                string lastName = reader.ReadCellAsText("crew departure", string.Format("B{0}", i + 15));
+                if (lastName.IsNullOrEmpty()) break;
+
+                if (!(crewMessage.GetSublistElementWithIdentifier((i + 1).ToString()) is CREW crew))
+                {
+                    crew = new CREWD();
+                    crew.Identifier = (i + 1).ToString();
+                    crew.MessageHeader = crewMessage;
+                    crewMessage.Elements.Add(crew);
+                }
+
+                crew.NotificationSchengen = reader.ReadCellAsBool("crew departure", "C10");
+                crew.NotificationPAX = reader.ReadCellAsBool("crew departure", "C11");
+
+                crew.CrewMemberLastName = lastName;
+                crew.CrewMemberFirstName = reader.ReadCellAsText("crew departure", string.Format("C{0}", i + 15));
+                crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText("crew departure", string.Format("D{0}", i + 15));
+                crew.CrewMemberCountryOfBirth = reader.ReadCellAsText("crew departure", string.Format("E{0}", i + 15));
+                crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime("crew departure", string.Format("F{0}", i + 15));
+                string gender = reader.ReadCellAsText("crew departure", string.Format("G{0}", i + 15));
+                crew.CrewMemberGender = ParseGender(gender);
+                crew.CrewMemberNationality = reader.ReadCellAsText("crew departure", string.Format("H{0}", i + 15));
+
+                if (crew.NotificationSchengen ?? false)
+                {
+                    string idDocType = reader.ReadCellAsText("crew departure", string.Format("I{0}", i + 15));
+                    crew.CrewMemberIdentityDocumentType = ParseDocumentType(idDocType);
+                    crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText("crew departure", string.Format("J{0}", i + 15));
+                    crew.CrewMemberVisaNumber = reader.ReadCellAsText("crew departure", string.Format("K{0}", i + 15));
+                    crew.CrewMemberIdentityDocumentIssuingState = reader.ReadCellAsText("crew departure", string.Format("M{0}", i + 15));
+                    crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("crew departure", string.Format("N{0}", i + 15));
+                }
+
+                crew.CrewMemberDuty = reader.ReadCellAsText("crew departure", string.Format("L{0}", i + 15));
+
+                result = true;
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region CREW
+
+        private static bool ScanCREW(Message crewMessage, ExcelReader reader)
+        {
+            bool result = false;
+            for (int i = 0; i < 1000; i++)
+            {
+                string lastName = reader.ReadCellAsText("crew arrival", string.Format("B{0}", i + 15));
+                if (lastName.IsNullOrEmpty()) break;
+
+                if (!(crewMessage.GetSublistElementWithIdentifier((i + 1).ToString()) is CREW crew))
+                {
+                    crew = new CREW();
+                    crew.Identifier = (i + 1).ToString();
+                    crew.MessageHeader = crewMessage;
+                    crewMessage.Elements.Add(crew);
+                }
+
+                crew.NotificationSchengen = reader.ReadCellAsBool("crew arrival", "C10");
+                crew.NotificationPAX = reader.ReadCellAsBool("crew arrival", "C11");
+
+                crew.CrewMemberLastName = lastName;
+                crew.CrewMemberFirstName = reader.ReadCellAsText("crew arrival", string.Format("C{0}", i + 15));
+                crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText("crew arrival", string.Format("D{0}", i + 15));
+                crew.CrewMemberCountryOfBirth = reader.ReadCellAsText("crew arrival", string.Format("E{0}", i + 15));
+                crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime("crew arrival", string.Format("F{0}", i + 15));
+                string gender = reader.ReadCellAsText("crew arrival", string.Format("G{0}", i + 15));
+                crew.CrewMemberGender = ParseGender(gender);
+                crew.CrewMemberNationality = reader.ReadCellAsText("crew arrival", string.Format("H{0}", i + 15));
+
+                //if(crew.NotificationSchengen ?? false)
+                //{
+                    string idDocType = reader.ReadCellAsText("crew arrival", string.Format("I{0}", i + 15));
+                    crew.CrewMemberIdentityDocumentType = ParseDocumentType(idDocType);
+                    crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText("crew arrival", string.Format("J{0}", i + 15));
+                    crew.CrewMemberVisaNumber = reader.ReadCellAsText("crew arrival", string.Format("K{0}", i + 15));
+                    crew.CrewMemberIdentityDocumentIssuingState = reader.ReadCellAsText("crew arrival", string.Format("M{0}", i + 15));
+                    crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("crew arrival", string.Format("N{0}", i + 15));
+                //}
+
+                crew.CrewMemberDuty = reader.ReadCellAsText("crew arrival", string.Format("L{0}", i + 15));
+
+                result = true;
+            }
+            return result;
+        }
+
+        private static byte? ParseGender(string gender)
+        {
+            byte? result = null;
+            if(!gender.IsNullOrEmpty())
+            {
+                if (gender.Equals("male", StringComparison.OrdinalIgnoreCase)) result = 1;
+                if (gender.Equals("female", StringComparison.OrdinalIgnoreCase)) result = 2;
+                if (gender.Equals("not_applicable", StringComparison.OrdinalIgnoreCase)) result = 9;
+                if (gender.Equals("not_known", StringComparison.OrdinalIgnoreCase)) result = 0;
+                if (gender.Equals("other", StringComparison.OrdinalIgnoreCase)) result = 9;
+            }
+            return result;
+        }
+
+        private static byte? ParseDocumentType(string docType)
+        {
+            byte? result = null;
+            if(!docType.IsNullOrEmpty())
+            {
+                if (docType.Equals("identity_card", StringComparison.OrdinalIgnoreCase)) result = 0;
+                if (docType.Equals("passport", StringComparison.OrdinalIgnoreCase)) result = 1;
+                if (docType.Equals("muster_book", StringComparison.OrdinalIgnoreCase)) result = 2;
+                if (docType.Equals("picture_id", StringComparison.OrdinalIgnoreCase)) result = 3;
+                if (docType.Equals("residental_permit", StringComparison.OrdinalIgnoreCase)) result = 4;
+                if (docType.Equals("other_legal_identity_document", StringComparison.OrdinalIgnoreCase)) result = 5;
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region BPOL
+
+        private static bool ScanBPOL(Message bpolMessage, ExcelReader reader)
+        {
+            if (bpolMessage.Elements.Count == 0)
+            {
+                BPOL newBPOL = new BPOL();
+                newBPOL.MessageHeader = bpolMessage;
+                bpolMessage.Elements.Add(newBPOL);
+            }
+            BPOL bpol = bpolMessage.Elements[0] as BPOL;
+            bpol.StowawaysOnBoard = reader.ReadCellAsBool("stowaways", "C8");
+            if(bpol.StowawaysOnBoard ?? false)
+            {
+                for (int i = 1; i < 1000; i++)
+                {
+                    string port = reader.ReadCellAsText("stowaways", string.Format("B{0}", i + 10));
+                    if(!port.IsNullOrEmpty())
+                    {
+                        if (!(bpol.GetSublistElementWithIdentifier(i.ToString()) is PortOfItinerary poi))
+                        {
+                            poi = new PortOfItinerary();
+                            poi.Identifier = i.ToString();
+                            poi.BPOL = bpol;
+                            bpol.PortOfItineraries.Add(poi);
+                        }
+                        if (Locode.LocodeDB.LocationNameFromLocode(port) != null)
+                        {
+                            poi.PortOfItineraryLocode = port;
+                        } else
+                        {
+                            poi.PortOfItineraryName = port;
+                        }
+                        poi.PortOfItineraryETA = reader.ReadCellAsDateTime("stowaways", string.Format("C{0}", i + 10));
+                    }
+                }
+            }            
+            return bpol.StowawaysOnBoard.HasValue;
+        }
+
+        #endregion
+
+        #region BKRD
+
+        private static bool ScanBKRD(Message brkdMessage, ExcelReader reader)
+        {
+            bool result = false;
+
+            for (int i = 0; i < 10000; i++)
+            {
+                string fuelType = reader.ReadCellAsText("traffic message on departure", string.Format("B{0}", i + 28));
+                double? quantity = reader.ReadCellAsDecimal("traffic message on departure", string.Format("C{0}", i + 28));
+                if (fuelType.IsNullOrEmpty()) break;
+
+                if (!(brkdMessage.GetSublistElementWithIdentifier((i + 1).ToString()) is BRKD brkd))
+                {
+                    brkd = new BRKD();
+                    brkd.MessageHeader = brkdMessage;
+                    brkd.Identifier = (i + 1).ToString();
+                    brkdMessage.Elements.Add(brkd);
+                }
+                brkd.BunkerFuelType = fuelType;
+                brkd.BunkerFuelQuantity_TNE = quantity;
+
+                result = true;
+            }
+
+            return result;
+        }
+
+        #endregion
+
+        #region BKRA
+
+        private static bool ScanBKRA(Message bkraMessage, ExcelReader reader)
+        {
+            bool result = false;
+
+            for (int i = 0; i < 10000; i++)
+            {
+                string fuelType = reader.ReadCellAsText("traffic message on arrival", string.Format("B{0}", i + 28));
+                double? quantity = reader.ReadCellAsDecimal("traffic message on arrival", string.Format("C{0}", i + 28));                
+                if (fuelType.IsNullOrEmpty()) break;
+
+                if (!(bkraMessage.GetSublistElementWithIdentifier((i + 1).ToString()) is BRKA brka))
+                {
+                    brka = new BRKA();
+                    brka.MessageHeader = bkraMessage;
+                    brka.Identifier = (i + 1).ToString();
+                    bkraMessage.Elements.Add(brka);
+                }
+                brka.BunkerFuelType = fuelType;
+                brka.BunkerFuelQuantity_TNE = quantity;
+                
+                result = true;
+            }
+
+            return result;
+        }
+
+        #endregion
+
+        #region ATD
+
+        private static bool ScanATD(Message atdMessage, ExcelReader reader)
+        {
+            if (atdMessage.Elements.Count == 0)
+            {
+                ATD newATD = new ATD();
+                newATD.MessageHeader = atdMessage;
+                atdMessage.Elements.Add(newATD);
+            }
+            ATD atd = atdMessage.Elements[0] as ATD;
+            atd.ATDPortOfCall = reader.ReadCellAsDateTime("traffic message on departure", "C20");
+            return atd.ATDPortOfCall.HasValue;
+        }
+
+        #endregion
+
+        #region ATA
+
+        private static bool ScanATA(Message ataMessage, ExcelReader reader)
+        {
+            if (ataMessage.Elements.Count == 0)
+            {
+                ATA newATA = new ATA();
+                newATA.MessageHeader = ataMessage;
+                ataMessage.Elements.Add(newATA);
+            }
+            ATA ata = ataMessage.Elements[0] as ATA;
+            ata.ATAPortOfCall = reader.ReadCellAsDateTime("traffic message on arrival", "C20");
+            return ata.ATAPortOfCall.HasValue;
+        }
+
+        #endregion
+
+        #region AGNT
+
+        private static bool ScanAGNT(Message agntMessage, ExcelReader reader)
+        {
+            if (agntMessage.Elements.Count == 0)
+            {
+                AGNT newAgnt = new AGNT();
+                newAgnt.MessageHeader = agntMessage;
+                agntMessage.Elements.Add(newAgnt);
+            }
+
+            AGNT agnt = agntMessage.Elements[0] as AGNT;
+            agnt.AgentCompanyName = reader.ReadCellAsText("main", "C32");
+            agnt.AgentCity = reader.ReadCellAsText("main", "C36");
+            agnt.AgentCountry = reader.ReadCellAsText("main", "C37");
+            agnt.AgentEMail = reader.ReadCellAsText("main", "C42");
+            agnt.AgentFax = reader.ReadCellAsText("main", "C41");
+            agnt.AgentFirstName = reader.ReadCellAsText("main", "C39");
+            agnt.AgentLastName = reader.ReadCellAsText("main", "C38");
+            agnt.AgentPhone = reader.ReadCellAsText("main", "C40");
+            agnt.AgentPostalCode = reader.ReadCellAsText("main", "C35");
+            string street = reader.ReadCellAsText("main", "C33") ?? "";
+            string number = reader.ReadCellAsText("main", "C34") ?? "";
+            agnt.AgentStreetAndNumber = string.Format("{0} {1}", street, number);
+
+            if (agnt.AgentLastName.IsNullOrEmpty()) agnt.AgentLastName = "-";
+
+            // wird nicht mehr entfernt, egal welche Felder gelesen werden
+            return true;
+        }
+
+        #endregion
+
+    }
+}
diff --git a/ENI2/Excel/ExcelManager.cs b/ENI2/Excel/ExcelManager.cs
index 8efa3931..14ae76b3 100644
--- a/ENI2/Excel/ExcelManager.cs
+++ b/ENI2/Excel/ExcelManager.cs
@@ -10,40 +10,61 @@ using System.IO;
 namespace ENI2.Excel
 {
     public class ExcelManager
-    {        
+    {
         private readonly ILog _log = LogManager.GetLogger(typeof(ExcelManager));
 
         public ExcelManager()
         {
-            Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);            
+            Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
         }
 
         public bool Import(string filePath, MessageCore core, List<Message.NotificationClass> classes, out string readMessage)
         {
             bool result = false;
+            readMessage = "";
             try
             {
                 using (ExcelReader reader = new ExcelReader(filePath))
-                {                    
-                    ImportHeader importHeader = new ImportHeader
+                {
+                    switch (reader.SheetType)
                     {
-                        ImportDate = DateTime.Now
-                    };
-                    result = ExcelUtil.ProcessSheet(reader, out readMessage, core, classes); // actual import
-                    if (result)
-                    {
-                        importHeader.MessageCoreId = core.Id.Value;
-                        importHeader.Filename = Path.GetFileName(filePath);
-                        ReportingParty thisUser = ReportingParty.CurrentReportingParty;
-                        importHeader.SenderEmail = thisUser.EMail;
-                        importHeader.ReportingPartyId = thisUser.Id;
+                        case ExcelReader.SheetTypeEnum.BSMD:
+                            {
 
-                        DBManager.Instance.Save(importHeader);
-                        // Saving plaintext data (ImportHeader + ImportValues) for each reading
-                        List<ImportValue> valueList = importHeader.CreateUpdateList(reader.ImportValues);
-                        // Bulk save recommended here..
-                        ImportValue.BulkSave(valueList);
-                    }                    
+                                ImportHeader importHeader = new ImportHeader
+                                {
+                                    ImportDate = DateTime.Now
+                                };
+
+                                result = ExcelUtil.ProcessSheet(reader, out readMessage, core, classes); // actual import
+                                if (result)
+                                {
+                                    importHeader.MessageCoreId = core.Id.Value;
+                                    importHeader.Filename = Path.GetFileName(filePath);
+                                    ReportingParty thisUser = ReportingParty.CurrentReportingParty;
+                                    importHeader.SenderEmail = thisUser.EMail;
+                                    importHeader.ReportingPartyId = thisUser.Id;
+
+                                    DBManager.Instance.Save(importHeader);
+                                    // Saving plaintext data (ImportHeader + ImportValues) for each reading
+                                    List<ImportValue> valueList = importHeader.CreateUpdateList(reader.ImportValues);
+                                    // Bulk save recommended here..
+                                    ImportValue.BulkSave(valueList);
+                                }
+                                break;
+                            }
+                        case ExcelReader.SheetTypeEnum.DAKOSY:
+                            {
+                                result = DakosyUtil.ProcessSheet(reader, out readMessage, core, classes);
+                                // at this point do not save import data values
+                                break;
+                            }
+                        default:
+                            {
+                                _log.WarnFormat("Unknown excel sheet type {0}", reader.SheetType);
+                                break;
+                            }
+                    }
                 }
             }
             catch (Exception ex)
@@ -51,8 +72,8 @@ namespace ENI2.Excel
                 readMessage = ex.Message;
                 _log.Error(ex);
             }
-            return result; 
-        }              
+            return result;
+        }
 
         internal void Export(string fileName, MessageCore core, List<Message> messages, out string resultMessage, bool isRefSheet)
         {
diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs
index 81d065f0..ef59ed1e 100644
--- a/ENI2/Excel/ExcelReader.cs
+++ b/ENI2/Excel/ExcelReader.cs
@@ -22,18 +22,38 @@ using bsmd.database;
 namespace ENI2.Excel
 {
     internal class ExcelReader : ExcelBase
-    {
+    {        
+
         internal enum ReadState { NONE, OK, WARN, FAIL };
 
+        internal enum SheetTypeEnum { BSMD, DAKOSY };
+
+        private readonly SheetTypeEnum _sheetType = SheetTypeEnum.BSMD;
+
         internal Dictionary<string, string> ImportValues { get; } = new Dictionary<string, string>();
 
         public ExcelReader(string filePath) : base(filePath)
-        {            
-            
+        {
             this._workBook = _excelWorkbooks.Open(filePath, 0, true, 5, "", "", false, XlPlatform.xlWindows, "", false, false, 0, false, false, false);
-
             this.InitNameFields();
-        }                       
+
+            // Determine if this is a Dakosy or BSMD Sheet
+            _sheetType = (_nameDict.Count > 10) ? SheetTypeEnum.BSMD : SheetTypeEnum.DAKOSY;
+        }
+
+        public SheetTypeEnum SheetType { get { return _sheetType; } }
+
+        internal static void SaveMessage(Message message)
+        {
+            message.CreatedBy = "EXCEL";
+            if (message.MessageNotificationClass == Message.NotificationClass.STO)
+                message.InternalStatus = Message.BSMDStatus.PREPARE;
+            else
+                message.InternalStatus = Message.BSMDStatus.EXCEL;
+            message.UnsentMessageWarningShown = false;
+            DBManager.Instance.Save(message);
+            message.SaveElements();
+        }
 
         internal string ReadText(string lookup)
         {
@@ -71,7 +91,7 @@ namespace ENI2.Excel
         }
 
         internal string ReadLoCode(string lookup)
-        {            
+        {
             string val = this.ReadText(lookup);
             if (!val.IsNullOrEmpty())
             {
@@ -537,6 +557,116 @@ namespace ENI2.Excel
                 return true;
 
             return false;
-        }       
+        }
+
+        #region Dakosy-specific functions
+
+        internal string ReadCellAsText(string sheetName, string range)
+        {
+            try
+            {
+                Worksheet workSheet = (Worksheet) _workBook.Worksheets[sheetName];
+                string result = workSheet.Range[range].Text.ToString();
+                if (!result.IsNullOrEmpty())
+                    result = result.Trim();
+                return result;
+            }
+            catch(Exception e)
+            {
+                _log.Warn(e.Message);
+            }
+            return null;
+        }
+
+        // TODO THIS IS NOT WORKING
+        internal string ReadTextFromDropdown(string sheetName, string range)
+        {
+            try
+            {
+                Worksheet workSheet = (Worksheet)_workBook.Worksheets[sheetName];
+                Range aRange = workSheet.Range[range];
+                if (aRange != null)
+                {
+                    
+                }
+            }
+            catch (Exception e)
+            {
+                _log.Warn(e.Message);
+            }
+            return null;
+        }
+
+        internal bool? ReadCellAsBool(string sheetName, string range)
+        {
+            string boolString = ReadCellAsText(sheetName, range);
+            if (!boolString.IsNullOrEmpty())
+            {
+                if (boolString.Equals("TRUE", StringComparison.OrdinalIgnoreCase)) return true;
+                if (boolString.Equals("FALSE", StringComparison.OrdinalIgnoreCase)) return false;
+                if (boolString.Equals("YES", StringComparison.OrdinalIgnoreCase)) return true;
+                if (boolString.Equals("NO", StringComparison.OrdinalIgnoreCase)) return false;
+                return null;
+            }
+            else return null;
+        }
+
+        internal double? ReadCellAsDecimal(string sheetName, string range)
+        {
+            try
+            {
+                double? result = null;
+                Worksheet workSheet = (Worksheet)_workBook.Worksheets[sheetName];
+                var val = workSheet.Range[range].Value;
+                if (val is double) result = val;
+                if (val is string)
+                {
+                    if (double.TryParse(val, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite,
+                        CultureInfo.InvariantCulture, out double tmpDouble))
+                        result = tmpDouble;
+                    if (result == null)
+                    {
+                        if (double.TryParse(val, out tmpDouble)) // current language style (==GER, mit , statt .)
+                            result = tmpDouble;
+                    }
+                }
+
+                if ((result == null) && (val != null))
+                {
+                    double tmpDouble2 = val[1, 1];
+                    result = tmpDouble2;
+                }
+                return result;
+            }
+            catch (Exception e)
+            {
+                _log.Warn(e.Message);
+            }
+            return null;
+        }
+
+        internal DateTime? ReadCellAsDateTime(string sheetName, string range)
+        {
+            string dateString = ReadCellAsText(sheetName, range);
+            if (dateString != null)
+            {
+                CultureInfo provider = CultureInfo.InvariantCulture;                
+                const string dateTimeFormat = "yyyy/MM/dd HH:mm";
+                if (DateTime.TryParseExact(dateString, dateTimeFormat, provider, DateTimeStyles.None, out DateTime tmpDate))
+                    return tmpDate.ToUniversalTime();
+                const string dateFormat = "yyyy/MM/dd";
+                if (DateTime.TryParseExact(dateString, dateFormat, provider, DateTimeStyles.None, out DateTime tmpDate2))
+                    return tmpDate2;
+                const string dateFormat2 = "dd.MM.yyyy";
+                if (DateTime.TryParseExact(dateString, dateFormat2, provider, DateTimeStyles.None, out DateTime tmpDate3))
+                    return tmpDate3;
+                return null;
+            }
+            else return null;
+        }
+
+
+        #endregion
+
     }
 }
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index a681508c..b91baaeb 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -49,65 +49,65 @@ namespace ENI2.Excel
                 foreach (Message message in messages)
                 {
                     if ((message.MessageNotificationClass == Message.NotificationClass.AGNT) && notificationClasses.Contains(Message.NotificationClass.AGNT))
-                    { if (ScanAGNT(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanAGNT(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.ATA) && notificationClasses.Contains(Message.NotificationClass.ATA))
-                    { if (ScanATA(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanATA(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.ATD) && notificationClasses.Contains(Message.NotificationClass.ATD))
-                    { if (ScanATD(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanATD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.BKRA) && notificationClasses.Contains(Message.NotificationClass.BKRA))
-                    { if (ScanBKRA(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanBKRA(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.BKRD) && notificationClasses.Contains(Message.NotificationClass.BKRD))
-                    { if (ScanBKRD(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanBKRD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.BPOL) && notificationClasses.Contains(Message.NotificationClass.BPOL))
-                    { if (ScanBPOL(message, messages, messageCore, reader)) SaveMessage(message); }
+                    { if (ScanBPOL(message, messages, messageCore, reader)) ExcelReader.SaveMessage(message); }
                     if ((message.MessageNotificationClass == Message.NotificationClass.CREW) && notificationClasses.Contains(Message.NotificationClass.CREW))
-                    { if (ScanCREW(message, reader, isOldVersion)) SaveMessage(message); continue; }
+                    { if (ScanCREW(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.CREWD) && notificationClasses.Contains(Message.NotificationClass.CREWD))
-                    { if (ScanCREWD(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanCREWD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.HAZA) && notificationClasses.Contains(Message.NotificationClass.HAZA))
-                    { if (ScanHAZA(message, reader, isOldVersion)) SaveMessage(message); continue; }
+                    { if (ScanHAZA(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.HAZD) && notificationClasses.Contains(Message.NotificationClass.HAZD))
-                    { if (ScanHAZD(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanHAZD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.INFO) && notificationClasses.Contains(Message.NotificationClass.INFO))
-                    { if (ScanINFO(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanINFO(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.LADG) && notificationClasses.Contains(Message.NotificationClass.LADG))
-                    { if (ScanLADG(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanLADG(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.MDH) && notificationClasses.Contains(Message.NotificationClass.MDH))
-                    { if (ScanMDH(message, messages, messageCore, reader)) SaveMessage(message); continue; }
+                    { if (ScanMDH(message, messages, messageCore, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.NAME) && notificationClasses.Contains(Message.NotificationClass.NAME))
-                    { if (ScanNAME(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanNAME(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD))
-                    { if (ScanNOA_NOD(message, messageCore, reader)) SaveMessage(message); continue; }
+                    { if (ScanNOA_NOD(message, messageCore, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.PAS) && notificationClasses.Contains(Message.NotificationClass.PAS))
-                    { if (ScanPAS(message, reader, isOldVersion)) SaveMessage(message); continue; }
+                    { if (ScanPAS(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD))
-                    { if (ScanPASD(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanPASD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.POBA) && notificationClasses.Contains(Message.NotificationClass.POBA))
-                    { if (ScanPOBA(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanPOBA(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.POBD) && notificationClasses.Contains(Message.NotificationClass.POBD))
-                    { if (ScanPOBD(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanPOBD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.PRE72H) && notificationClasses.Contains(Message.NotificationClass.PRE72H))
-                    { if (ScanPRE72H(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanPRE72H(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.SEC) && notificationClasses.Contains(Message.NotificationClass.SEC))
-                    { if (ScanSEC(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanSEC(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.SERV) && notificationClasses.Contains(Message.NotificationClass.SERV))
-                    { if (ScanSERV(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanSERV(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.STAT) && notificationClasses.Contains(Message.NotificationClass.STAT))
-                    { if (ScanSTAT(message, messageCore, messages, reader)) SaveMessage(message); continue; }
+                    { if (ScanSTAT(message, messageCore, messages, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.STO) && notificationClasses.Contains(Message.NotificationClass.STO))
-                    { if (ScanSTO(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanSTO(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.TIEFA) && notificationClasses.Contains(Message.NotificationClass.TIEFA))
-                    { if (ScanTIEFA(message, reader, isOldVersion)) SaveMessage(message); continue; }
+                    { if (ScanTIEFA(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.TIEFD) && notificationClasses.Contains(Message.NotificationClass.TIEFD))
-                    { if (ScanTIEFD(message, reader, isOldVersion)) SaveMessage(message); continue; }
+                    { if (ScanTIEFD(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.TOWA) && notificationClasses.Contains(Message.NotificationClass.TOWA))
-                    { if (ScanTOWA(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanTOWA(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.TOWD) && notificationClasses.Contains(Message.NotificationClass.TOWD))
-                    { if (ScanTOWD(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanTOWD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.WAS) && notificationClasses.Contains(Message.NotificationClass.WAS))
-                    { if (ScanWAS(message, reader, isOldVersion)) SaveMessage(message); continue; }
+                    { if (ScanWAS(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; }
                     if((message.MessageNotificationClass == Message.NotificationClass.WAS_RCPT) && notificationClasses.Contains(Message.NotificationClass.WAS_RCPT))
-                    { if (ScanWAS_RCPT(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanWAS_RCPT(message, reader)) ExcelReader.SaveMessage(message); continue; }
 
                 }
 
@@ -120,19 +120,7 @@ namespace ENI2.Excel
             }
 
             return result;
-        }
-
-        internal static void SaveMessage(Message message)
-        {
-            message.CreatedBy = "EXCEL";
-            if (message.MessageNotificationClass == Message.NotificationClass.STO)
-                message.InternalStatus = Message.BSMDStatus.PREPARE;
-            else
-                message.InternalStatus = Message.BSMDStatus.EXCEL;
-            message.UnsentMessageWarningShown = false;
-            DBManager.Instance.Save(message);
-            message.SaveElements();
-        }
+        }        
 
         #region ATA
 
@@ -971,7 +959,7 @@ namespace ENI2.Excel
                     {
                         PRE72H pre72h = preMessage.Elements[0] as PRE72H;
                         pre72h.Tanker = stat.IsTanker;
-                        SaveMessage(preMessage);
+                        ExcelReader.SaveMessage(preMessage);
                     }
                 }
             }
diff --git a/ENI2/Properties/Settings.Designer.cs b/ENI2/Properties/Settings.Designer.cs
index 4dcacde5..ce92588e 100644
--- a/ENI2/Properties/Settings.Designer.cs
+++ b/ENI2/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace ENI2.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/ENI2/packages.config b/ENI2/packages.config
index a32c8ba4..8168394a 100644
--- a/ENI2/packages.config
+++ b/ENI2/packages.config
@@ -4,10 +4,10 @@ Sample license text.
 -->
 <packages>
   <package id="ExcelDataReader" version="3.6.0" targetFramework="net452" />
-  <package id="Extended.Wpf.Toolkit" version="4.3.0" targetFramework="net452" />
-  <package id="log4net" version="2.0.14" targetFramework="net452" />
+  <package id="Extended.Wpf.Toolkit" version="4.3.0" targetFramework="net48" />
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net452" />
   <package id="PDFsharp-MigraDoc-gdi" version="1.50.5147" targetFramework="net452" />
-  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.115.0" targetFramework="net452" />
-  <package id="System.Data.SQLite.Core" version="1.0.115.0" targetFramework="net452" />
+  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.115.0" targetFramework="net48" />
+  <package id="System.Data.SQLite.Core" version="1.0.115.0" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/SendNSWMessageService/App.config b/SendNSWMessageService/App.config
index 3b6ac0f4..2690fe06 100644
--- a/SendNSWMessageService/App.config
+++ b/SendNSWMessageService/App.config
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,Log4net"/>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="SendNSWMessageService.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="SendNSWMessageService.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <log4net>
     <root>
-      <level value="DEBUG" />
-      <appender-ref ref="LogFileAppender" />
+      <level value="DEBUG"/>
+      <appender-ref ref="LogFileAppender"/>
     </root>
-    <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender" >
-      <param name="File" value="log-NSWMessageService.txt" />
-      <param name="AppendToFile" value="true" />
-      <rollingStyle value="Size" />
-      <maxSizeRollBackups value="10" />
-      <maximumFileSize value="10MB" />
-      <staticLogFileName value="true" />
+    <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="File" value="log-NSWMessageService.txt"/>
+      <param name="AppendToFile" value="true"/>
+      <rollingStyle value="Size"/>
+      <maxSizeRollBackups value="10"/>
+      <maximumFileSize value="10MB"/>
+      <staticLogFileName value="true"/>
       <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="%date [%thread] %-5level [%logger] - %message%newline" />
+        <param name="ConversionPattern" value="%date [%thread] %-5level [%logger] - %message%newline"/>
       </layout>
     </appender>
   </log4net>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <userSettings>
     <SendNSWMessageService.Properties.Settings>
@@ -36,4 +36,4 @@
       </setting>
     </SendNSWMessageService.Properties.Settings>
   </userSettings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/SendNSWMessageService/Properties/Settings.Designer.cs b/SendNSWMessageService/Properties/Settings.Designer.cs
index 72ce9f8a..3bab8059 100644
--- a/SendNSWMessageService/Properties/Settings.Designer.cs
+++ b/SendNSWMessageService/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace SendNSWMessageService.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/SendNSWMessageService/SendNSWMessageService.csproj b/SendNSWMessageService/SendNSWMessageService.csproj
index 6aa2e852..00464ad5 100644
--- a/SendNSWMessageService/SendNSWMessageService.csproj
+++ b/SendNSWMessageService/SendNSWMessageService.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SendNSWMessageService</RootNamespace>
     <AssemblyName>SendNSWMessageService</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -39,8 +40,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/SendNSWMessageService/packages.config b/SendNSWMessageService/packages.config
index 518cdea0..e788d34b 100644
--- a/SendNSWMessageService/packages.config
+++ b/SendNSWMessageService/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.13" targetFramework="net45" />
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.LockingService/Properties/Settings.Designer.cs b/bsmd.LockingService/Properties/Settings.Designer.cs
index 51020cde..fb989587 100644
--- a/bsmd.LockingService/Properties/Settings.Designer.cs
+++ b/bsmd.LockingService/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace bsmd.LockingService.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/bsmd.LockingService/Web.config b/bsmd.LockingService/Web.config
index 74568f2f..1bdabf1f 100644
--- a/bsmd.LockingService/Web.config
+++ b/bsmd.LockingService/Web.config
@@ -1,22 +1,29 @@
 <?xml version="1.0"?>
 <configuration>
-
   <configSections>
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="bsmd.LockingService.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="bsmd.LockingService.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <appSettings>
-    <add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
+    <add key="aspnet:UseTaskFriendlySynchronizationContext" value="true"/>
   </appSettings>
+  <!--
+    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
+
+    The following attributes can be set on the <httpRuntime> tag.
+      <system.Web>
+        <httpRuntime targetFramework="4.8" />
+      </system.Web>
+  -->
   <system.web>
-    <compilation debug="true" targetFramework="4.5.2" />
+    <compilation debug="true" targetFramework="4.8"/>
     <httpRuntime targetFramework="4.5.2"/>
   </system.web>
   <system.serviceModel>
     <bindings>
       <webHttpBinding>
-        <binding name="crossDomain" crossDomainScriptAccessEnabled="true" />
+        <binding name="crossDomain" crossDomainScriptAccessEnabled="true"/>
       </webHttpBinding>
     </bindings>
     <behaviors>
@@ -30,9 +37,9 @@
       </serviceBehaviors>
     </behaviors>
     <protocolMapping>
-        <add binding="basicHttpsBinding" scheme="https" />
-    </protocolMapping>    
-    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" />
+      <add binding="basicHttpsBinding" scheme="https"/>
+    </protocolMapping>
+    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
   </system.serviceModel>
   <system.webServer>
     <modules runAllManagedModulesForAllRequests="true"/>
@@ -45,14 +52,14 @@
   <!-- einkommentieren für Fiddler Debug -->
   <system.net>
     <defaultProxy>
-      <proxy bypassonlocal="False" usesystemdefault="True" proxyaddress="http://127.0.0.1:8888" />
+      <proxy bypassonlocal="False" usesystemdefault="True" proxyaddress="http://127.0.0.1:8888"/>
     </defaultProxy>
   </system.net>
   <applicationSettings>
     <bsmd.LockingService.Properties.Settings>
       <setting name="TransmitterRoot" serializeAs="String">
-        <value>E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool</value>>
+        <value>E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool</value>&gt;
       </setting>
     </bsmd.LockingService.Properties.Settings>
   </applicationSettings>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git a/bsmd.LockingService/bsmd.LockingService.csproj b/bsmd.LockingService/bsmd.LockingService.csproj
index be0e82c9..500d1cbb 100644
--- a/bsmd.LockingService/bsmd.LockingService.csproj
+++ b/bsmd.LockingService/bsmd.LockingService.csproj
@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>bsmd.LockingService</RootNamespace>
     <AssemblyName>bsmd.LockingService</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <WcfConfigValidationEnabled>True</WcfConfigValidationEnabled>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <UseIISExpress>true</UseIISExpress>
@@ -23,6 +23,7 @@
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
     <Use64BitIISExpress />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,17 +46,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\ENI2\packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\ENI2\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.EnterpriseServices" />
diff --git a/bsmd.LockingService/packages.config b/bsmd.LockingService/packages.config
index 73640c8c..e788d34b 100644
--- a/bsmd.LockingService/packages.config
+++ b/bsmd.LockingService/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.13" targetFramework="net452" />
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.dakosy/Properties/Settings.Designer.cs b/bsmd.dakosy/Properties/Settings.Designer.cs
index e1db6ca5..369f7dcb 100644
--- a/bsmd.dakosy/Properties/Settings.Designer.cs
+++ b/bsmd.dakosy/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace bsmd.dakosy.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/bsmd.dakosy/app.config b/bsmd.dakosy/app.config
index 98b617e2..d8150312 100644
--- a/bsmd.dakosy/app.config
+++ b/bsmd.dakosy/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="bsmd.dakosy.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="bsmd.dakosy.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <userSettings>
@@ -39,4 +39,4 @@
             </setting>
         </bsmd.dakosy.Properties.Settings>
     </userSettings>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/bsmd.dakosy/bsmd.dakosy.csproj b/bsmd.dakosy/bsmd.dakosy.csproj
index ec83c10e..d6c86e61 100644
--- a/bsmd.dakosy/bsmd.dakosy.csproj
+++ b/bsmd.dakosy/bsmd.dakosy.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>bsmd.dakosy</RootNamespace>
     <AssemblyName>bsmd.dakosy</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.dakosy/packages.config b/bsmd.dakosy/packages.config
index 518cdea0..e788d34b 100644
--- a/bsmd.dakosy/packages.config
+++ b/bsmd.dakosy/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.13" targetFramework="net45" />
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.database/DBManager.cs b/bsmd.database/DBManager.cs
index c3494875..94603d3c 100644
--- a/bsmd.database/DBManager.cs
+++ b/bsmd.database/DBManager.cs
@@ -1437,11 +1437,11 @@ namespace bsmd.database
             if (core == null) return;
             using (SqlCommand cmd = new SqlCommand())
             {
-                cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28";
+                cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND ((MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28) OR MessageHeader.NotificationClass > 30)";
                 cmd.Parameters.AddWithValue("@ID", core.Id);
                 int total = this.PerformReadIntQuery(cmd) ?? 0;
 
-                cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND  MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28"; // compare "CONFIRMED"
+                cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND ((MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28) OR MessageHeader.NotificationClass > 30)"; // compare "CONFIRMED"
                 int sent = this.PerformReadIntQuery(cmd) ?? 0;
 
                 core.NumberSentDisplay = string.Format("{0}/{1}", sent, total);
diff --git a/bsmd.database/MDH.cs b/bsmd.database/MDH.cs
index d4b673ba..86c9acbd 100644
--- a/bsmd.database/MDH.cs
+++ b/bsmd.database/MDH.cs
@@ -599,7 +599,7 @@ namespace bsmd.database
                 if ((this.SanitaryMeasuresApplied ?? false) && this.SanitaryMeasuresDetails.IsNullOrEmpty())                    
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V763, "Sanitary measure details missing", null, this.Title, null, this.Tablename));
 
-                if ((this.StowawaysDetected ?? false) && this.StowawaysJoiningLocation.IsNullOrEmpty())
+                if ((this.StowawaysDetected ?? false) && this.StowawaysJoiningLocationText.IsNullOrEmpty())
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V764, "Stowaways joining location missing", null, this.Title, null, this.Tablename));
 
                 if ((this.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false) &&
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 31465940..6960ac23 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.0.4")]
+[assembly: AssemblyInformationalVersion("7.1.0")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2022 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index c9d04243..24ff1bf8 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.0.4.*")]
+[assembly: AssemblyVersion("7.1.0.*")]
 
diff --git a/bsmd.database/RuleEngine.cs b/bsmd.database/RuleEngine.cs
index 67d8efd0..7cdea26d 100644
--- a/bsmd.database/RuleEngine.cs
+++ b/bsmd.database/RuleEngine.cs
@@ -204,7 +204,7 @@ namespace bsmd.database
                 if (Attribute.IsDefined(property, typeof(MaxLengthAttribute)))
                 {
                     MaxLengthAttribute mla = Attribute.GetCustomAttribute(property, typeof(MaxLengthAttribute)) as MaxLengthAttribute;
-                    bool isStandardML = ((mla.MaxLength == 99) || (mla.MaxLength == 100));
+                    bool isStandardML = (mla.MaxLength == 99) || (mla.MaxLength == 100);
                     if((value.Length >= 90) && ((mla.MaxLength == value.Length) || isStandardML))
                     {
                         // put out a warning this might be truncated
@@ -427,7 +427,7 @@ namespace bsmd.database
                 // individuelle Fehler nach Nachrichtenklasse prüfen
                 derivedEntity.MessageCore = aMessage.MessageCore; // some instance we need info from core (NOA / Transit)
                 if ((derivedEntity is LADG) && aMessage.MessageCore.IsTransit) continue; // kein error reporting für LADG bei Transit (CH, 1.2.16)
-                if ((derivedEntity is SEC) && aMessage.MessageCore.IsSmallShip) continue; // keine SEC Validierung für kleine Schiffe (CH, 1.11.18)                
+                // if ((derivedEntity is SEC) && aMessage.MessageCore.IsSmallShip) continue; // keine SEC Validierung für kleine Schiffe (CH, 1.11.18) // Ausnahme wieder entfernt 18.5.22               
                 RuleEngine.ValidateProperties(derivedEntity, errors, violations);
                 derivedEntity.Validate(errors, violations);
             }
@@ -453,7 +453,7 @@ namespace bsmd.database
                 // individuelle Fehler nach Nachrichtenklasse prüfen
                 derivedEntity.MessageCore = entity.MessageCore; // some instance we need info from core (NOA / Transit)
                 if ((derivedEntity is LADG) && entity.MessageCore.IsTransit) continue; // kein error reporting für LADG bei Transit (CH, 1.2.16)
-                if ((derivedEntity is SEC) && entity.MessageCore.IsSmallShip) continue; // keine STAT Validierung für kleine Schiffe (CH, 1.11.18)
+                // if ((derivedEntity is SEC) && entity.MessageCore.IsSmallShip) continue; // keine STAT Validierung für kleine Schiffe (CH, 1.11.18) // Ausnahme wieder entfernt 18.5.22               
                 ValidateProperties(derivedEntity, errors, violations);
                 derivedEntity.Validate(errors, violations);
             }
diff --git a/bsmd.database/bsmd.database.csproj b/bsmd.database/bsmd.database.csproj
index f1a5aef8..e12dc2b7 100644
--- a/bsmd.database/bsmd.database.csproj
+++ b/bsmd.database/bsmd.database.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>bsmd.database</RootNamespace>
     <AssemblyName>bsmd.database</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -82,8 +83,8 @@
     <CodeAnalysisRuleSet>..\code.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\ENI2\packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\ENI2\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\ENI2\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
diff --git a/bsmd.database/packages.config b/bsmd.database/packages.config
index 8c723140..c16deb5a 100644
--- a/bsmd.database/packages.config
+++ b/bsmd.database/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.13" targetFramework="net45" />
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.dbh/Properties/Settings.Designer.cs b/bsmd.dbh/Properties/Settings.Designer.cs
index 6f7a9b5d..d6126fbb 100644
--- a/bsmd.dbh/Properties/Settings.Designer.cs
+++ b/bsmd.dbh/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace bsmd.dbh.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/bsmd.dbh/Web References/DBHWebReference/Reference.cs b/bsmd.dbh/Web References/DBHWebReference/Reference.cs
index 2121fbdc..9bb39ab1 100644
--- a/bsmd.dbh/Web References/DBHWebReference/Reference.cs	
+++ b/bsmd.dbh/Web References/DBHWebReference/Reference.cs	
@@ -23,7 +23,7 @@ namespace bsmd.dbh.DBHWebReference {
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Web.Services.WebServiceBindingAttribute(Name="Dbh_Osis_Answ_Ws", Namespace="http://www.openuri.org/")]
@@ -144,7 +144,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.openuri.org/")]
     public enum RootVersion {
@@ -155,7 +155,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.openuri.org/")]
     public enum RootType {
@@ -177,7 +177,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -226,7 +226,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
     public enum ItemChoiceType1 {
@@ -239,7 +239,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -356,7 +356,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum FlashpointInfoType {
@@ -372,7 +372,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -526,7 +526,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum IMOHazardClassType {
@@ -543,7 +543,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum RootSECValidISSCOnBoard {
@@ -556,7 +556,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -673,7 +673,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -852,7 +852,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum PollutionCategoryType {
@@ -871,7 +871,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum HazardType {
@@ -888,7 +888,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1445,7 +1445,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum PackingGroupType {
@@ -1461,7 +1461,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
     public enum ItemsChoiceType4 {
@@ -1480,7 +1480,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1634,7 +1634,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.openuri.org/")]
     public enum ReportingPartyRPType {
@@ -1662,7 +1662,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1723,7 +1723,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
     public enum ItemChoiceType {
@@ -1736,7 +1736,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
     public enum ItemChoiceType2 {
@@ -1755,7 +1755,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1896,7 +1896,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1929,7 +1929,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1962,7 +1962,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1996,7 +1996,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2029,7 +2029,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2063,7 +2063,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2096,7 +2096,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2142,7 +2142,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2175,7 +2175,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2209,7 +2209,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2390,7 +2390,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum Gender {
@@ -2406,7 +2406,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum IdDocType {
@@ -2431,7 +2431,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2484,7 +2484,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2558,7 +2558,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum INFClassType {
@@ -2574,7 +2574,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
     public enum ItemsChoiceType5 {
@@ -2596,7 +2596,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2649,7 +2649,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2723,7 +2723,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
     public enum ItemsChoiceType6 {
@@ -2745,7 +2745,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2887,7 +2887,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum ShippingArea {
@@ -2903,7 +2903,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.openuri.org/")]
     public enum RootINFOFumigatedBulkCargo {
@@ -2916,7 +2916,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2950,7 +2950,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3081,7 +3081,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum HandlingType {
@@ -3094,7 +3094,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3163,7 +3163,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3197,7 +3197,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3219,7 +3219,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3277,7 +3277,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3299,7 +3299,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3345,7 +3345,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3379,7 +3379,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
     public enum ItemsChoiceType2 {
@@ -3449,7 +3449,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3482,7 +3482,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3583,7 +3583,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3616,7 +3616,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
     public enum ItemsChoiceType {
@@ -3638,7 +3638,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3672,7 +3672,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3877,7 +3877,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3946,7 +3946,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4015,7 +4015,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4122,7 +4122,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4192,7 +4192,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum HullConfiguration {
@@ -4208,7 +4208,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum TankCondition {
@@ -4224,7 +4224,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4246,7 +4246,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4336,7 +4336,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4381,7 +4381,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum CargoDescription {
@@ -4406,7 +4406,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum ISSCIssuerType {
@@ -4419,7 +4419,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum ISSCType {
@@ -4432,7 +4432,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4551,7 +4551,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4622,7 +4622,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4667,7 +4667,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4700,7 +4700,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
     public enum ItemsChoiceType1 {
@@ -4761,7 +4761,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4795,7 +4795,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4840,7 +4840,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5006,7 +5006,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.openuri.org/")]
     public enum RootSTATTransportMode {
@@ -5021,7 +5021,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5102,7 +5102,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5135,7 +5135,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5168,7 +5168,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5202,7 +5202,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5319,7 +5319,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5424,7 +5424,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5458,7 +5458,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5577,7 +5577,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5682,7 +5682,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5737,7 +5737,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5794,7 +5794,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5827,7 +5827,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5884,7 +5884,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
     public enum DisposalType {
@@ -5900,7 +5900,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
     public enum ItemsChoiceType3 {
@@ -5928,7 +5928,7 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5961,11 +5961,11 @@ namespace bsmd.dbh.DBHWebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
     public delegate void RootCompletedEventHandler(object sender, RootCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class RootCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
diff --git a/bsmd.dbh/app.config b/bsmd.dbh/app.config
index 9eca8c13..9d617084 100644
--- a/bsmd.dbh/app.config
+++ b/bsmd.dbh/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="bsmd.dbh.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="bsmd.dbh.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <userSettings>
@@ -15,4 +15,4 @@
             </setting>
         </bsmd.dbh.Properties.Settings>
     </userSettings>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/bsmd.dbh/bsmd.dbh.csproj b/bsmd.dbh/bsmd.dbh.csproj
index ac301775..513cc2c5 100644
--- a/bsmd.dbh/bsmd.dbh.csproj
+++ b/bsmd.dbh/bsmd.dbh.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>bsmd.dbh</RootNamespace>
     <AssemblyName>bsmd.dbh</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.dbh/packages.config b/bsmd.dbh/packages.config
index 518cdea0..e788d34b 100644
--- a/bsmd.dbh/packages.config
+++ b/bsmd.dbh/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.13" targetFramework="net45" />
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.hisnord/Properties/Settings.Designer.cs b/bsmd.hisnord/Properties/Settings.Designer.cs
index 28170550..2ec53193 100644
--- a/bsmd.hisnord/Properties/Settings.Designer.cs
+++ b/bsmd.hisnord/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace bsmd.hisnord.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/bsmd.hisnord/Request.cs b/bsmd.hisnord/Request.cs
index 843eaa00..9bf1c726 100644
--- a/bsmd.hisnord/Request.cs
+++ b/bsmd.hisnord/Request.cs
@@ -705,7 +705,8 @@ namespace bsmd.hisnord
                                     if (ladg.CargoLACode.HasValue)
                                         lu.CargoLACode = ladg.CargoLACode.Value.ToString();
                                     lu.CargoCodeNST = ladg.CargoCodeNST;
-                                    lu.CargoCodeNST_3 = ladg.CargoCodeNST_3;
+                                    if(!ladg.CargoCodeNST_3.IsNullOrEmpty())
+                                        lu.CargoCodeNST_3 = ladg.CargoCodeNST_3;
                                     if ((ladg.CargoNumberOfItems ?? 0) > 0)
                                         lu.CargoNumberOfItems = ladg.CargoNumberOfItems.Value.ToString();
                                     if (ladg.CargoGrossQuantity_TNE.HasValue)
diff --git a/bsmd.hisnord/app.config b/bsmd.hisnord/app.config
index 63ead48a..f67cb3d6 100644
--- a/bsmd.hisnord/app.config
+++ b/bsmd.hisnord/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="bsmd.hisnord.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="bsmd.hisnord.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <userSettings>
@@ -33,4 +33,4 @@
             </setting>
         </bsmd.hisnord.Properties.Settings>
     </userSettings>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/bsmd.hisnord/bsmd.hisnord.csproj b/bsmd.hisnord/bsmd.hisnord.csproj
index 0f7b99a1..a61b8cb5 100644
--- a/bsmd.hisnord/bsmd.hisnord.csproj
+++ b/bsmd.hisnord/bsmd.hisnord.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>bsmd.hisnord</RootNamespace>
     <AssemblyName>bsmd.hisnord</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.hisnord/packages.config b/bsmd.hisnord/packages.config
index 518cdea0..e788d34b 100644
--- a/bsmd.hisnord/packages.config
+++ b/bsmd.hisnord/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.13" targetFramework="net45" />
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.status/Properties/Settings.Designer.cs b/bsmd.status/Properties/Settings.Designer.cs
index 2165f2d3..eb584212 100644
--- a/bsmd.status/Properties/Settings.Designer.cs
+++ b/bsmd.status/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace bsmd.status.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/bsmd.status/app.config b/bsmd.status/app.config
index 4b07c601..f0d24aed 100644
--- a/bsmd.status/app.config
+++ b/bsmd.status/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Sample license text.
 -->
 <configuration>
     <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="bsmd.status.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="bsmd.status.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <applicationSettings>
@@ -24,4 +24,4 @@ Sample license text.
             </setting>
         </bsmd.status.Properties.Settings>
     </applicationSettings>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/bsmd.status/bsmd.status.csproj b/bsmd.status/bsmd.status.csproj
index 923bb180..d999c9aa 100644
--- a/bsmd.status/bsmd.status.csproj
+++ b/bsmd.status/bsmd.status.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>bsmd.status</RootNamespace>
     <AssemblyName>bsmd.status</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.status/packages.config b/bsmd.status/packages.config
index 518cdea0..e788d34b 100644
--- a/bsmd.status/packages.config
+++ b/bsmd.status/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.13" targetFramework="net45" />
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
 </packages>
\ No newline at end of file