diff --git a/ENI-2/ENI2/ENI2/App.xaml.cs b/ENI-2/ENI2/ENI2/App.xaml.cs
index 26a25a8d..2da2e53a 100644
--- a/ENI-2/ENI2/ENI2/App.xaml.cs
+++ b/ENI-2/ENI2/ENI2/App.xaml.cs
@@ -69,6 +69,7 @@ namespace ENI2
             STAT.VesselTypeDict = LocalizedLookup.getVesselTypes();
             STAT.TransportModeDict = LocalizedLookup.getTransportModes();
             HAZ.PackageTypes = LocalizedLookup.getPackageTypes();
+            LADG.LACodes = LocalizedLookup.getLACodes();
 
             // Connect to locking service (if enabled)
 
diff --git a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs
index 8b432708..77272fdd 100644
--- a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs
+++ b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs
@@ -84,8 +84,12 @@ namespace ENI2.Controls
         {
             ComboBox cmb = sender as ComboBox;
             if (cmb == null) return;
+            if (cmb.ItemsSource == null) return;
+
             CollectionView itemsViewOriginal = (CollectionView)CollectionViewSource.GetDefaultView(cmb.ItemsSource);
 
+            bool ignoreSelect = ((e.Key == System.Windows.Input.Key.Back) || (e.Key == System.Windows.Input.Key.Delete));
+
             itemsViewOriginal.Filter = ((o) =>
             {
                 bool result = false;
@@ -98,7 +102,10 @@ namespace ENI2.Controls
                     if(o is System.Collections.Generic.KeyValuePair<string, string>) 
                         if(((System.Collections.Generic.KeyValuePair<string, string>)o).Value.StartsWith(cmb.Text, StringComparison.OrdinalIgnoreCase))
                             result = true;
-                    if(o is string)
+                    if(o is System.Collections.Generic.KeyValuePair<int, string>) 
+                        if (((System.Collections.Generic.KeyValuePair<int, string>)o).Value.StartsWith(cmb.Text, StringComparison.OrdinalIgnoreCase))
+                            result = true;
+                    if (o is string)
                         if (((string)o).Contains(cmb.Text, StringComparison.OrdinalIgnoreCase)) result = true;
                 }
                 //System.Diagnostics.Trace.WriteLine(string.Format("{0} - {1} - {2}", o, cmb.Text, result));
@@ -108,7 +115,7 @@ namespace ENI2.Controls
             //System.Diagnostics.Trace.WriteLine("---");
             itemsViewOriginal.Refresh();
 
-            if (itemsViewOriginal.Count == 1)
+            if (!ignoreSelect && (itemsViewOriginal.Count == 1))
             {
                 // Treffer: Select?
                 cmb.SelectedItem = itemsViewOriginal.GetItemAt(0);
diff --git a/ENI-2/ENI2/ENI2/DetailBaseControl.cs b/ENI-2/ENI2/ENI2/DetailBaseControl.cs
index 6b526bd6..8f01d457 100644
--- a/ENI-2/ENI2/ENI2/DetailBaseControl.cs
+++ b/ENI-2/ENI2/ENI2/DetailBaseControl.cs
@@ -215,12 +215,17 @@ namespace ENI2
 
         #region combobox content filtering
 
+
         protected void ComboBox_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
         {
+
             ComboBox cmb = sender as ComboBox;
             if (cmb == null) return;
-            CollectionView itemsViewOriginal = (CollectionView)CollectionViewSource.GetDefaultView(cmb.ItemsSource);
 
+            bool ignoreSelect = ((e.Key == System.Windows.Input.Key.Back) || (e.Key == System.Windows.Input.Key.Delete));
+
+            CollectionView itemsViewOriginal = (CollectionView)CollectionViewSource.GetDefaultView(cmb.ItemsSource);
+            System.Diagnostics.Trace.WriteLine(cmb.Text);
             itemsViewOriginal.Filter = ((o) =>
             {
                 bool result = false;
@@ -236,13 +241,13 @@ namespace ENI2
                 {
                     if (((System.Collections.Generic.KeyValuePair<string, string>)o).Value.StartsWith(cmb.Text, StringComparison.OrdinalIgnoreCase))
                         result = true;
-                }                
+                }
                 return result;
             });
-            
-            itemsViewOriginal.Refresh();
 
-            if(itemsViewOriginal.Count == 1)
+            itemsViewOriginal.Refresh();
+            
+            if (!ignoreSelect && (itemsViewOriginal.Count == 1))
             {
                 // Treffer: Select?
                 cmb.SelectedItem = itemsViewOriginal.GetItemAt(0);
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
index 2f36900f..cd28019a 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
@@ -80,7 +80,7 @@
                     <TextBlock Name="textBlockLockUserName" VerticalAlignment="Center" />
                 </StackPanel>
 
-                <Button IsEnabled="False" Name="buttonStorno" Grid.Column="1" Grid.Row="6" Margin="2" Click="buttonStorno_Click" Content="{x:Static p:Resources.textCancelDeclaration}"/>
+                <Button IsEnabled="True" Name="buttonStorno" Grid.Column="1" Grid.Row="6" Margin="2" Click="buttonStorno_Click" Content="{x:Static p:Resources.textCancelDeclaration}"/>
                 <Button IsEnabled="False" Name="buttonCopy" Grid.Column="2" Grid.Row="6" Margin="2" Click="buttonCopy_Click" Content="{x:Static p:Resources.textCopyData}"/>
                 <Button IsEnabled="False" Name="buttonSendPDF" Grid.Column="3" Grid.Row="6" Margin="2" Click="buttonSendPDF_Click" Content="{x:Static p:Resources.textCreatePDF}"/>
                 <Button Name="buttonQueryHIS" Grid.Column="4" Grid.Row="6" Margin="2" Click="buttonQueryHIS_Click" Content="{x:Static p:Resources.textQueryHIS}"/>
@@ -98,7 +98,7 @@
 
                 <!-- Data Grid -->
                 <DataGrid Grid.Row="8" Grid.ColumnSpan="6" Margin="0,8,0,0" x:Name="dataGridMessages" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" CanUserAddRows="False"
-                  SelectionMode="Single" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_MouseDoubleClick" PreviewKeyDown="dataGrid_PreviewKeyDown">
+                  SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_MouseDoubleClick" PreviewKeyDown="dataGrid_PreviewKeyDown">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Header=" " Width="SizeToCells" IsReadOnly="True">
                             <DataGridTemplateColumn.CellTemplate>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index d1c2eee6..8a3f9a68 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -191,13 +191,23 @@ namespace ENI2.DetailViewControls
 
             #region Context-Menu Meldeklassen
 
+            // wenn man das mal aufwendig "schön" machen will (die Items enabled abh. vom Zustand der Meldeklasse) sollte man
+            // Command Bindings verwenden. Hier ist das erklärt: https://docs.microsoft.com/en-us/dotnet/framework/wpf/advanced/commanding-overview#code-snippet-2
+
             this.dataGridMessages.ContextMenu = new ContextMenu();
             MenuItem sendItem = new MenuItem();
             sendItem.Header = Properties.Resources.textSendToNSW;
             sendItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/mail_forward.png")) };
+            //sendItem.Command = 
             sendItem.Click += new RoutedEventHandler(this.contextSendMessage);
             this.dataGridMessages.ContextMenu.Items.Add(sendItem);
 
+            MenuItem resetItem = new MenuItem();
+            resetItem.Header = Properties.Resources.textReset;
+            resetItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/mail_delete.png")) };
+            resetItem.Click += new RoutedEventHandler(this.contextResetMessage);       
+            this.dataGridMessages.ContextMenu.Items.Add(resetItem);
+
             #endregion
 
             #region init ATA
@@ -346,12 +356,47 @@ namespace ENI2.DetailViewControls
 
         private void contextSendMessage(object sender, RoutedEventArgs e)
         {
-            MessageBox.Show("not yet..");
+            //MessageBox.Show("not yet..");
+            MessageBoxResult result = MessageBox.Show(Properties.Resources.textConfirmSend, Properties.Resources.textConfirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result == MessageBoxResult.Yes)
+            {
+                foreach (Message selectedMessage in this.dataGridMessages.SelectedItems)
+                {
+                    selectedMessage.InternalStatus = Message.BSMDStatus.TOSEND;
+                    DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage);
+                }
+
+                // komplette Anmeldung auf "zu versenden" stellen
+                this.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core);
+            }
+        }
+
+        private void contextResetMessage(object sender, RoutedEventArgs e)
+        {
+            MessageBoxResult result = MessageBox.Show(Properties.Resources.textConfirmReset, Properties.Resources.textConfirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result == MessageBoxResult.Yes)
+            {
+                foreach (Message selectedMessage in this.dataGridMessages.SelectedItems)
+                {
+                    selectedMessage.Reset = true;
+                    DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage);
+                }
+
+                // komplette Anmeldung auf "zu versenden" stellen
+                this.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core);
+            }
         }
 
         private void buttonStorno_Click(object sender, RoutedEventArgs e)
         {
-
+            MessageBoxResult result = MessageBox.Show(Properties.Resources.textConfirmCancel, Properties.Resources.textConfirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result == MessageBoxResult.Yes)
+            {
+                this.Core.Cancelled = true;
+                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core);
+            }
         }
 
         private void buttonCopy_Click(object sender, RoutedEventArgs e)
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
index 4f3d7254..392834f9 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
@@ -124,13 +124,19 @@ namespace ENI2.DetailViewControls
                     _noa_nod.CallPurposes.Add(ecpd.CallPurpose);
                 this.dataGridCallPurposes.Items.Refresh();
                 ecpd.CallPurpose = new CallPurpose();
+                ecpd.CallPurpose.NOA_NOD = this._noa_nod;
+                this.SublistElementChanged(Message.NotificationClass.NOA_NOD);
             };
             ecpd.CallPurpose = new CallPurpose();
+            ecpd.CallPurpose.NOA_NOD = this._noa_nod;
+
             if(ecpd.ShowDialog() ?? false)
             {
                 if(!_noa_nod.CallPurposes.Contains(ecpd.CallPurpose))
                     _noa_nod.CallPurposes.Add(ecpd.CallPurpose);
                 this.dataGridCallPurposes.Items.Refresh();
+                // signal up
+                this.SublistElementChanged(Message.NotificationClass.NOA_NOD);
             }
         }
 
@@ -150,6 +156,8 @@ namespace ENI2.DetailViewControls
                     _noa_nod.CallPurposes.Add(ecpd.CallPurpose);
                 this.dataGridCallPurposes.Items.Refresh();
                 ecpd.CallPurpose = new CallPurpose();
+                ecpd.CallPurpose.NOA_NOD = this._noa_nod;
+                this.SublistElementChanged(Message.NotificationClass.NOA_NOD);
             };
             if (ecpd.ShowDialog() ?? false)
             {
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 0b078e67..8d817977 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>3.6.9.%2a</ApplicationVersion>
+    <ApplicationVersion>3.6.10.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -550,6 +550,7 @@
     <None Include="Resources\mail_new.png" />
     <Resource Include="Resources\document_view.png" />
     <Resource Include="Resources\mail_forward.png" />
+    <Resource Include="Resources\mail_delete.png" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml
index a3a11bb1..c40ccdb6 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml
@@ -36,10 +36,10 @@ Copyright (c) 2017 schick Informatik
         <Label Name="labelPortOfDischarge" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textCargoPortOfDischarge}" />
         <Label Name="labelCodeNST3" Grid.Row="1" Grid.Column="2" Content="{x:Static p:Resources.textCargoCodeNST3}" />
 
-        <ComboBox Grid.Row="0" Grid.Column="1" Name="comboBoxHandlingType" Margin="2" />
-        <ComboBox Grid.Row="0" Grid.Column="3" Name="comboBoxLACodes" Margin="2" />
-        <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxNSTCode" Margin="2" />
-        <ComboBox Grid.Row="1" Grid.Column="3" Name="comboBoxNST3Code" Margin="2" />
+        <ComboBox Grid.Row="0" Grid.Column="1" Name="comboBoxHandlingType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
+        <ComboBox Grid.Row="0" Grid.Column="3" Name="comboBoxLACodes" Margin="2" IsEditable="True" SelectedValuePath="Key" DisplayMemberPath="Value" StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
+        <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxNSTCode" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
+        <ComboBox Grid.Row="1" Grid.Column="3" Name="comboBoxNST3Code" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
         <xctk:IntegerUpDown Grid.Row="2" Grid.Column="1" Name="integerUpDownNumberOfItems" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" />
         <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownGrossQuantity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1"/>
         <enictrl:LocodeControl Grid.Column="1" Grid.Row="4" Width="Auto" x:Name="locodeControl_PortOfLoading" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml.cs
index a97be92f..a65ed2e5 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditLADGDialog.xaml.cs
@@ -3,9 +3,11 @@
 //
 
 using System.Windows;
+using System.Collections.Generic;
 
 using bsmd.database;
 using ENI2.Controls;
+using System.Collections.ObjectModel;
 
 namespace ENI2.EditControls
 {
@@ -28,7 +30,7 @@ namespace ENI2.EditControls
             Loaded += EditLADGDialog_Loaded;
         }
 
-        public LADG LADG { get; set; }
+        public LADG LADG { get; set; }                        
 
         #region event handler
 
@@ -37,18 +39,21 @@ namespace ENI2.EditControls
             this.OKClicked += EditLADGDialog_OKClicked;
 
             this.comboBoxHandlingType.ItemsSource = handlingTypeList;
-            this.comboBoxLACodes.ItemsSource = LaCodes;
+            this.comboBoxHandlingType.KeyUp += ComboBox_KeyUp;
+            this.comboBoxLACodes.ItemsSource = LocalizedLookup.getLACodes();
+            this.comboBoxLACodes.KeyUp += ComboBox_KeyUp;
 
             if (this.LADG.CargoHandlingType.HasValue)
                 this.comboBoxHandlingType.SelectedIndex = this.LADG.CargoHandlingType.Value;
+            
             this.integerUpDownNumberOfItems.Value = this.LADG.CargoNumberOfItems;
             this.doubleUpDownGrossQuantity.Value = this.LADG.CargoGrossQuantity_TNE;
             this.locodeControl_PortOfLoading.LocodeValue = this.LADG.PortOfLoading;
             this.locodeControl_PortOfDischarge.LocodeValue = this.LADG.PortOfDischarge;
-            this.comboBoxLACodes.SelectedItem = LACodeEntryForCode(this.LADG.CargoLACode);
-
-
+            this.comboBoxLACodes.SelectedValue = this.LADG.CargoLACode;
+            this.comboBoxLACodes.KeyUp += ComboBox_KeyUp;
 
+            this.comboBoxNST3Code.KeyUp += ComboBox_KeyUp;
         }
 
         private void EditLADGDialog_OKClicked()
@@ -58,58 +63,10 @@ namespace ENI2.EditControls
             this.LADG.CargoGrossQuantity_TNE = this.doubleUpDownGrossQuantity.Value;
             this.LADG.PortOfLoading = this.locodeControl_PortOfLoading.LocodeValue;
             this.LADG.PortOfDischarge = this.locodeControl_PortOfDischarge.LocodeValue;
-            this.LADG.CargoLACode = (this.comboBoxLACodes.SelectedIndex < 0) ? null : (int?) ((LACodeEntry)this.comboBoxLACodes.SelectedValue).Code;
+            this.LADG.CargoLACode = (this.comboBoxLACodes.SelectedIndex < 0) ? null : (int?) (this.comboBoxLACodes.SelectedValue);
         }
 
-        #endregion
-
-        #region class LACodeEntry
-
-        private static LACodeEntry[] LaCodes =
-        {
-            new LACodeEntry(10, "unverpacktes Flüssiggut"),
-            new LACodeEntry(20, "unverpacktes Schüttgut"),
-            new LACodeEntry(30, "unverpacktes oder konventionell verpacktes Stückgut (Stückgut nicht in Containern >= 20 Fuß und nicht auf Ro-Ro-Einheiten)"),
-            new LACodeEntry(31, "Kfz als Handelsgüter"),
-            new LACodeEntry(32, "lebende Tiere als Handelsgüter"),
-            new LACodeEntry(41, "20-Fuß-Container"),
-            new LACodeEntry(42, "40-Fuß-Container"),
-            new LACodeEntry(43, "Container zwischen 20 und 40 Fuß"),
-            new LACodeEntry(44, "Container größer als 40 Fuß"),
-            new LACodeEntry(51, "Straßengüterfahrzeuge einschl. deren Anhänger"),
-            new LACodeEntry(52, "Pkw einschl. deren Anhänger, Krafträder"),
-            new LACodeEntry(53, "Omnibusse"),
-            new LACodeEntry(61, "Anhänger / Sattelauflieger für Straßengüterfahrzeuge"),
-            new LACodeEntry(62, "Sonstige Anhänger von Straßenfahrzeugen (ohne Zugmaschine) und nicht selbstfahrende Straßenfahrzeuge"),
-            new LACodeEntry(63, "Rolltrailer (Anhänger für die Güterbeförderung auf See"),
-            new LACodeEntry(64, "Trägerschiffsleichter"),
-            new LACodeEntry(65, "Wechselbrücken / -behälter"),
-            new LACodeEntry(66, "Eisenbahngüterwagen"),
-            new LACodeEntry(67, "Reisezugwagen und Triebwagen")
-        };
-
-        private static LACodeEntry LACodeEntryForCode(int? code)
-        {
-            if (!code.HasValue) return null;
-            for (int i = 0; i < LaCodes.Length; i++)
-                if (LaCodes[i].Code == code) return LaCodes[i];
-            return null;
-        }
-
-        public class LACodeEntry
-        {
-            public int Code;
-            public string Description;
-
-            public LACodeEntry(int code, string description) { Code = code;  Description = description; }
-
-            public override string ToString()
-            {
-                return string.Format("{0} - {1}", this.Code, this.Description);
-            }            
-        }
-
-        #endregion
+        #endregion       
 
     }
 }
diff --git a/ENI-2/ENI2/ENI2/LocalizedLookup.cs b/ENI-2/ENI2/ENI2/LocalizedLookup.cs
index d4094861..cb9e2d85 100644
--- a/ENI-2/ENI2/ENI2/LocalizedLookup.cs
+++ b/ENI-2/ENI2/ENI2/LocalizedLookup.cs
@@ -135,5 +135,24 @@ namespace ENI2
             return result;
         }
 
+        public static Dictionary<int, string> getLACodes()
+        {
+            Dictionary<int, string> result = new Dictionary<int, string>();
+            string query = string.Format("SELECT Code, Description FROM LATypes ORDER BY Code");
+            SQLiteCommand cmd = new SQLiteCommand(query, _con);
+            IDataReader reader = cmd.ExecuteReader();
+            while (reader.Read())
+            {
+                int? code = null;
+                string name = null;
+                if (!reader.IsDBNull(0)) code = reader.GetInt32(0);
+                if (!reader.IsDBNull(1)) name = reader.GetString(1);
+                if ((code != null) && (name != null))
+                    result[(int) code] = string.Format("{0} {1}", code, name);
+            }
+            reader.Close();
+            return result;
+        }
+
     }
 }
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
index 7ac4bf51..76cb5a43 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
@@ -390,6 +390,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap mail_delete {
+            get {
+                object obj = ResourceManager.GetObject("mail_delete", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -968,6 +978,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Confirmation.
+        /// </summary>
+        public static string textConfirm {
+            get {
+                return ResourceManager.GetString("textConfirm", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Confirmation.
         /// </summary>
@@ -977,6 +996,33 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Cancel this declaration?.
+        /// </summary>
+        public static string textConfirmCancel {
+            get {
+                return ResourceManager.GetString("textConfirmCancel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Reset messages?.
+        /// </summary>
+        public static string textConfirmReset {
+            get {
+                return ResourceManager.GetString("textConfirmReset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Send messages?.
+        /// </summary>
+        public static string textConfirmSend {
+            get {
+                return ResourceManager.GetString("textConfirmSend", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Construction characteristics.
         /// </summary>
@@ -2939,6 +2985,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Reset.
+        /// </summary>
+        public static string textReset {
+            get {
+                return ResourceManager.GetString("textReset", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to ResidencePermit.
         /// </summary>
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.resx b/ENI-2/ENI2/ENI2/Properties/Resources.resx
index 7fcf2ce4..7a350f19 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.resx
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.resx
@@ -1354,4 +1354,22 @@
   <data name="textArchived" xml:space="preserve">
     <value>Archived</value>
   </data>
+  <data name="textReset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="mail_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mail_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="textConfirm" xml:space="preserve">
+    <value>Confirmation</value>
+  </data>
+  <data name="textConfirmReset" xml:space="preserve">
+    <value>Reset messages?</value>
+  </data>
+  <data name="textConfirmSend" xml:space="preserve">
+    <value>Send messages?</value>
+  </data>
+  <data name="textConfirmCancel" xml:space="preserve">
+    <value>Cancel this declaration?</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI-2/ENI2/ENI2/Resources/mail_delete.png b/ENI-2/ENI2/ENI2/Resources/mail_delete.png
new file mode 100644
index 00000000..5bc44ee6
Binary files /dev/null and b/ENI-2/ENI2/ENI2/Resources/mail_delete.png differ
diff --git a/ENI-2/ENI2/ENI2/Util/GlobalStructures.cs b/ENI-2/ENI2/ENI2/Util/GlobalStructures.cs
index 52bdc4a2..62cde696 100644
--- a/ENI-2/ENI2/ENI2/Util/GlobalStructures.cs
+++ b/ENI-2/ENI2/ENI2/Util/GlobalStructures.cs
@@ -4,9 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ENI2.Util
 {
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index a572b02f..5fba1d56 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/SQL/SystemError.sql b/nsw/Source/SQL/SystemError.sql
new file mode 100644
index 00000000..c4c92fa7
--- /dev/null
+++ b/nsw/Source/SQL/SystemError.sql
@@ -0,0 +1,15 @@
+CREATE TABLE [dbo].[SystemError] (
+    [Id]               UNIQUEIDENTIFIER DEFAULT (newid()) NOT NULL,
+    [ErrorAt]          DATETIME         NULL,
+    [MeldeType]        NVARCHAR (50)    NULL,
+    [ReferenceId]      NVARCHAR (50)    NULL,
+    [ProcessStatus]    INT              NULL,
+    [ImportFilename]   NVARCHAR (255)   NULL,
+    [ErrorCode]        INT              NULL,
+    [ErrorMessage]     NVARCHAR (255)   NULL,
+    [ErrorDescription] NVARCHAR (255)   NULL,
+    [MessageCoreId]    UNIQUEIDENTIFIER NULL,
+    [Status]           TINYINT          NULL,
+    PRIMARY KEY CLUSTERED ([Id] ASC)
+);
+
diff --git a/nsw/Source/SendNSWMessageService/NSWSendService.cs b/nsw/Source/SendNSWMessageService/NSWSendService.cs
index 19619c9e..801e75b7 100644
--- a/nsw/Source/SendNSWMessageService/NSWSendService.cs
+++ b/nsw/Source/SendNSWMessageService/NSWSendService.cs
@@ -110,6 +110,8 @@ namespace SendNSWMessageService
                     else
                     {
 
+                        #region DBH / Dakosy Logik
+
                         List<Message> toSendMessageList = new List<Message>();
 
                         if ((core.IsTransit && core.TransitId.IsNullOrEmpty()) ||
@@ -259,6 +261,8 @@ namespace SendNSWMessageService
                         }
                         DBManager.Instance.Save(core);
 
+                        #endregion
+
                     }
                 }
 
@@ -269,11 +273,7 @@ namespace SendNSWMessageService
                     core.QueryNSWStatus = false; // reset flag
                     Status aStatus = new Status(core);
                     aStatus.PerformQuery();
-                }
-
-                // Auf erhaltene Visit-Ids prüfen (HIS-NORD)
-                // TODO
-                // bsmd.hisnord.Response.ReadAnswers();
+                }                
 
                 DBManager.Instance.Disconnect();
 
diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index 761869f7..c1dee9f1 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -438,12 +438,13 @@ namespace bsmd.ExcelReadService
                     continue;
                 }
 
-                IMDGPosition imdgPosition = haza.GetIMDGPositionWithIdentifier(i.ToString());
+                string posIdent = string.Format("IMDG-{0}", i);
+                IMDGPosition imdgPosition = haza.GetIMDGPositionWithIdentifier(posIdent);
                 if(imdgPosition == null)
                 {
                     imdgPosition = new IMDGPosition();
                     imdgPosition.HAZ = haza;
-                    imdgPosition.Identifier = i.ToString();
+                    imdgPosition.Identifier = posIdent;
                     haza.IMDGPositions.Add(imdgPosition);
                 }
 
@@ -497,11 +498,12 @@ namespace bsmd.ExcelReadService
                     continue;
                 }
 
-                IBCPosition ibcPosition = haza.GetIBCPositionWithIdentifier(i.ToString());
+                string posIdent = string.Format("IBC-{0}", i);
+                IBCPosition ibcPosition = haza.GetIBCPositionWithIdentifier(posIdent);
                 if(ibcPosition == null)
                 {
                     ibcPosition = new IBCPosition();
-                    ibcPosition.Identifier = i.ToString();
+                    ibcPosition.Identifier = posIdent;
                     ibcPosition.HAZ = haza;
                     haza.IBCPositions.Add(ibcPosition);
                 }
@@ -547,11 +549,12 @@ namespace bsmd.ExcelReadService
                     continue;
                 }
 
-                IGCPosition igcPosition = haza.GetIGCPositionWithIdentifier(i.ToString());
+                string posIdent = string.Format("IGC-{0}", i);
+                IGCPosition igcPosition = haza.GetIGCPositionWithIdentifier(posIdent);
                 if(igcPosition == null)
                 {
                     igcPosition = new IGCPosition();
-                    igcPosition.Identifier = i.ToString();
+                    igcPosition.Identifier = posIdent;
                     igcPosition.HAZ = haza;
                     haza.IGCPositions.Add(igcPosition);
                 }
@@ -586,11 +589,12 @@ namespace bsmd.ExcelReadService
                     continue;
                 }
 
-                IMSBCPosition imsbcPosition = haza.GetIMSBCPositionWithIdentifier(i.ToString());
+                string posIdent = string.Format("IMSBC-{0}", i);
+                IMSBCPosition imsbcPosition = haza.GetIMSBCPositionWithIdentifier(posIdent);
                 if(imsbcPosition == null)
                 {
                     imsbcPosition = new IMSBCPosition();
-                    imsbcPosition.Identifier = i.ToString();
+                    imsbcPosition.Identifier = posIdent;
                     imsbcPosition.HAZ = haza;
                     haza.IMSBCPositions.Add(imsbcPosition);
                 }
@@ -626,11 +630,12 @@ namespace bsmd.ExcelReadService
                     continue;
                 }
 
-                MARPOL_Annex_I_Position marpolPosition = haza.GetMARPOLPositionWithIdentifier(i.ToString());
+                string posIdent = string.Format("MARPOL-{0}", i);
+                MARPOL_Annex_I_Position marpolPosition = haza.GetMARPOLPositionWithIdentifier(posIdent);
                 if(marpolPosition == null)
                 {
                     marpolPosition = new MARPOL_Annex_I_Position();
-                    marpolPosition.Identifier = i.ToString();
+                    marpolPosition.Identifier = posIdent;
                     marpolPosition.HAZ = haza;
                     haza.MARPOLPositions.Add(marpolPosition);
                 }
@@ -737,12 +742,13 @@ namespace bsmd.ExcelReadService
                     continue;
                 }
 
-                IMDGPosition imdgPosition = hazd.GetIMDGPositionWithIdentifier(i.ToString());
+                string posIdent = string.Format("IMDG-{0}", i);
+                IMDGPosition imdgPosition = hazd.GetIMDGPositionWithIdentifier(posIdent);
                 if (imdgPosition == null)
                 {
                     imdgPosition = new IMDGPosition();
                     imdgPosition.HAZ = hazd;
-                    imdgPosition.Identifier = i.ToString();
+                    imdgPosition.Identifier = posIdent;
                     hazd.IMDGPositions.Add(imdgPosition);
                 }
 
@@ -796,11 +802,12 @@ namespace bsmd.ExcelReadService
                     continue;
                 }
 
-                IBCPosition ibcPosition = hazd.GetIBCPositionWithIdentifier(i.ToString());
+                string posIdent = string.Format("IBC-{0}", i);
+                IBCPosition ibcPosition = hazd.GetIBCPositionWithIdentifier(posIdent);
                 if (ibcPosition == null)
                 {
                     ibcPosition = new IBCPosition();
-                    ibcPosition.Identifier = i.ToString();
+                    ibcPosition.Identifier = posIdent;
                     ibcPosition.HAZ = hazd;
                     hazd.IBCPositions.Add(ibcPosition);
                 }
@@ -846,11 +853,12 @@ namespace bsmd.ExcelReadService
                     continue;
                 }
 
-                IGCPosition igcPosition = hazd.GetIGCPositionWithIdentifier(i.ToString());
+                string posIdent = string.Format("IGC-{0}", i);
+                IGCPosition igcPosition = hazd.GetIGCPositionWithIdentifier(posIdent);
                 if (igcPosition == null)
                 {
                     igcPosition = new IGCPosition();
-                    igcPosition.Identifier = i.ToString();
+                    igcPosition.Identifier = posIdent;
                     igcPosition.HAZ = hazd;
                     hazd.IGCPositions.Add(igcPosition);
                 }
@@ -885,11 +893,12 @@ namespace bsmd.ExcelReadService
                     continue;
                 }
 
-                IMSBCPosition imsbcPosition = hazd.GetIMSBCPositionWithIdentifier(i.ToString());
+                string posIdent = string.Format("IMSBC-{0}", i);
+                IMSBCPosition imsbcPosition = hazd.GetIMSBCPositionWithIdentifier(posIdent);
                 if (imsbcPosition == null)
                 {
                     imsbcPosition = new IMSBCPosition();
-                    imsbcPosition.Identifier = i.ToString();
+                    imsbcPosition.Identifier = posIdent;
                     imsbcPosition.HAZ = hazd;
                     hazd.IMSBCPositions.Add(imsbcPosition);
                 }
@@ -925,11 +934,12 @@ namespace bsmd.ExcelReadService
                     continue;
                 }
 
-                MARPOL_Annex_I_Position marpolPosition = hazd.GetMARPOLPositionWithIdentifier(i.ToString());
+                string posIdent = string.Format("MARPOL-{0}", i);
+                MARPOL_Annex_I_Position marpolPosition = hazd.GetMARPOLPositionWithIdentifier(posIdent);
                 if (marpolPosition == null)
                 {
                     marpolPosition = new MARPOL_Annex_I_Position();
-                    marpolPosition.Identifier = i.ToString();
+                    marpolPosition.Identifier = posIdent;
                     marpolPosition.HAZ = hazd;
                     hazd.MARPOLPositions.Add(marpolPosition);
                 }
diff --git a/nsw/Source/bsmd.database/LADG.cs b/nsw/Source/bsmd.database/LADG.cs
index a9d61e5a..ea2a50b0 100644
--- a/nsw/Source/bsmd.database/LADG.cs
+++ b/nsw/Source/bsmd.database/LADG.cs
@@ -102,13 +102,7 @@ namespace bsmd.database
 
         public string Identifier { get; set; }
 
-        public static Lazy<Dictionary<int, string>> LACodes
-        {
-            get
-            {                
-                return laCodes;
-            }
-        }
+        public static Dictionary<int, string> LACodes { get; set; }        
 
         public static Dictionary<int, string> CargoHandlingDict
         {
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index ed492798..4dd9058f 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("3.6.9")]
+[assembly: AssemblyInformationalVersion("3.6.10")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2017 Informatikbüro Daniel Schick. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index bd94f032..1d6f582d 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.6.9.*")]
+[assembly: AssemblyVersion("3.6.10.*")]
 
diff --git a/nsw/Source/bsmd.database/SystemError.cs b/nsw/Source/bsmd.database/SystemError.cs
new file mode 100644
index 00000000..9989fd02
--- /dev/null
+++ b/nsw/Source/bsmd.database/SystemError.cs
@@ -0,0 +1,194 @@
+// Copyright (c) 2015-2017 schick Informatik
+// Description: Speicherobjekt für HIS-Nord Fehlermeldungen
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Xml;
+using System.IO;
+using System.Xml.Linq;
+using log4net;
+
+namespace bsmd.database
+{
+
+    /// <summary>
+    /// Diese Klasse bildet den Verbindungsfehler der HIS-Nord Schnittstelle ab. Damit ist ein Fehler der dazwischenliegenden
+    /// Kommunikationsschnittstelle gemeint, der Fehler wird nicht im NSW produziert
+    /// </summary>
+    public class SystemError : DatabaseEntity
+    {
+        private static ILog _log = LogManager.GetLogger(typeof(SystemError));
+
+        public SystemError()
+        {
+            this.tablename = "[dbo].[SystemError]";
+        }
+
+        #region Enums
+
+        public enum SystemErrorStatus
+        {
+            NEW,
+            ACKNOWLEDGED
+        };
+
+        #endregion
+
+        #region Properties
+
+        public DateTime? ErrorAt { get; set; }
+
+        public string Meldetype { get; set; }
+
+        public string ReferenceId { get; set; }
+
+        public int ProcessStatus { get; set; }
+
+        public string ImportFilename { get; set; }
+
+        public int ErrorCode { get; set; }
+
+        public string ErrorMessage { get; set; }
+
+        public string ErrorDescription { get; set; }
+        
+        public SystemErrorStatus Status { get; set; }     
+        
+        public Guid MessageCoreId { get; set; }
+
+        public DateTime? SendDate { get; set; }
+
+        #endregion
+
+        #region DatabaseEntity implementation
+
+        public override List<DatabaseEntity> LoadList(IDataReader reader)
+        {
+            List<DatabaseEntity> result = new List<DatabaseEntity>();
+            while (reader.Read())
+            {
+                SystemError se = new SystemError();
+                se.id = reader.GetGuid(0);
+
+                if (!reader.IsDBNull(1)) se.ErrorAt = reader.GetDateTime(1);
+                if (!reader.IsDBNull(2)) se.Meldetype = reader.GetString(2);
+                if (!reader.IsDBNull(3)) se.ReferenceId = reader.GetString(3);
+                if (!reader.IsDBNull(4)) se.ProcessStatus = reader.GetInt32(4);
+                if (!reader.IsDBNull(5)) se.ImportFilename = reader.GetString(5);
+                if (!reader.IsDBNull(6)) se.ErrorCode = reader.GetInt32(6);
+                if (!reader.IsDBNull(7)) se.ErrorMessage = reader.GetString(7);
+                if (!reader.IsDBNull(8)) se.ErrorDescription = reader.GetString(8);
+                if (!reader.IsDBNull(9)) se.MessageCoreId = reader.GetGuid(9);
+                if (!reader.IsDBNull(10)) se.Status = (SystemError.SystemErrorStatus) Enum.ToObject(typeof(SystemError.SystemErrorStatus), reader.GetByte(10));
+
+                result.Add(se);
+            }
+            reader.Close();
+            return result;
+        }
+
+        public override void PrepareLoadCommand(IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
+        {
+            string query = string.Format("SELECT Id, ErrorAt, MeldeType, ReferenceId, ProcessStatus, ImportFilename, ErrorCode, ErrorMessage, ErrorDescription, MessageCoreId, Status FROM {0} ", this.Tablename);
+
+            switch (filter)
+            {
+                case Message.LoadFilter.BY_CORE:
+                    query += "WHERE MessageCoreId = @COREID";
+                    ((SqlCommand)cmd).Parameters.AddWithValue("@COREID", criteria[0]);
+                    break;
+                case Message.LoadFilter.ALL:
+                default:
+                    break;
+            }
+
+            cmd.CommandText = query;
+        }
+
+        public override void PrepareSave(IDbCommand cmd)
+        {
+            SqlCommand scmd = cmd as SqlCommand;
+
+            scmd.Parameters.AddWithValue("@EAT", this.ErrorAt);
+            scmd.Parameters.AddWithValue("@MT", this.Meldetype);
+            scmd.Parameters.AddWithValue("@REFID", this.ReferenceId);
+            scmd.Parameters.AddWithValue("@PS", this.ProcessStatus);
+            scmd.Parameters.AddWithValue("@IF", this.ImportFilename);
+            scmd.Parameters.AddWithValue("@EC", this.ErrorCode);
+            scmd.Parameters.AddWithValue("@EM", this.ErrorMessage);
+            scmd.Parameters.AddWithValue("@ED", this.ErrorDescription);
+            scmd.Parameters.AddWithValue("@MCID", this.MessageCoreId);
+            scmd.Parameters.AddWithValue("@STATUS", (byte)this.Status);
+
+            if (this.IsNew)
+            {
+                scmd.CommandText = string.Format("INSERT INTO {0} (ErrorAt, MeldeType, ReferenceId, ProcessStatus, ImportFilename, ErrorCode, ErrorMessage, ErrorDescription, MessageCoreId, Status) " +
+                    "VALUES (@EAT, @MT, @REFID, @PS, @IF, @EC, @EM, @ED, @MCID, @STATUS)", this.Tablename);
+            }
+            else
+            {
+                scmd.Parameters.AddWithValue("@ID", this.Id);
+                scmd.CommandText = string.Format("UPDATE {0} SET ErrorAt = @EAT, MeldeType = @MT, ReferenceId = @REFID, ProcessStatus = @PS, ImportFilename = @IF, " +
+                    "ErrorCode = @EC, ErrorMessage = @EM, ErrorDescription = @ED, MessageCoreId = @MCID, Status = @STATUS WHERE Id = @ID", this.Tablename);
+            }
+        }
+
+        #endregion
+
+        #region public static methods
+
+        public static SystemError createFromXml(XElement xml)
+        {
+            SystemError systemError = new SystemError();
+            try
+            {
+                if (xml.Descendants("ErrorAt").Count() > 0)
+                {
+                    systemError.ErrorAt = DateTime.Parse(xml.Descendants("ErrorAt").First().Value);
+                }
+
+                systemError.Meldetype = xml.Descendants("Meldetype").First()?.Value;
+                systemError.ReferenceId = xml.Descendants("ReferenceId").First()?.Value;
+                if (xml.Descendants("ProcessStatus").Count() > 0)
+                {
+                    systemError.ProcessStatus = Int32.Parse(xml.Descendants("ProcessStatus").FirstOrDefault().Value);
+                }
+
+                systemError.ImportFilename = xml.Descendants("ImportFilename").First()?.Value;
+
+                if (!systemError.ImportFilename.IsNullOrEmpty())
+                {
+                    systemError.ImportFilename = Path.GetFileNameWithoutExtension(systemError.ImportFilename);
+                    int ind = systemError.ImportFilename.IndexOf('-');
+                    Guid aGuid;
+                    if (Guid.TryParse(systemError.ImportFilename.Substring(ind + 1), out aGuid))
+                        systemError.MessageCoreId = aGuid;
+                    DateTime aDate;
+                    if (DateTime.TryParse(systemError.ImportFilename.Substring(0, ind), out aDate))
+                        systemError.SendDate = aDate;
+                }
+
+
+                if (xml.Descendants("ErrorCode").Count() > 0)
+                {
+                    systemError.ErrorCode = Int32.Parse(xml.Descendants("ErrorCode").First().Value);
+                }
+
+                systemError.ErrorMessage = xml.Descendants("ErrorMessage").First()?.Value;
+                systemError.ErrorDescription = xml.Descendants("ErrorDescription").First()?.Value;
+            }
+            catch(Exception ex)
+            {
+                _log.WarnFormat("Error parsing system error: {0} ERROR-XML: {1}", ex.ToString(), xml.ToString());
+            }
+
+            return systemError;
+        }
+
+        #endregion
+
+    }
+}
diff --git a/nsw/Source/bsmd.database/bsmd.database.csproj b/nsw/Source/bsmd.database/bsmd.database.csproj
index 9860e281..65116ac4 100644
--- a/nsw/Source/bsmd.database/bsmd.database.csproj
+++ b/nsw/Source/bsmd.database/bsmd.database.csproj
@@ -114,6 +114,7 @@
     <Compile Include="STO.cs" />
     <Compile Include="StowawaysJoiningLocation.cs" />
     <Compile Include="SubsidiaryRisks.cs" />
+    <Compile Include="SystemError.cs" />
     <Compile Include="TIEFA.cs" />
     <Compile Include="TIEFD.cs" />
     <Compile Include="TOWA.cs" />
diff --git a/nsw/Source/bsmd.email/BSMDMail.cs b/nsw/Source/bsmd.email/BSMDMail.cs
index 811fdd4e..cec09d94 100644
--- a/nsw/Source/bsmd.email/BSMDMail.cs
+++ b/nsw/Source/bsmd.email/BSMDMail.cs
@@ -81,8 +81,7 @@ namespace bsmd.email
             message.IsBodyHtml = false;
             message.Body = "see attachment";
 
-            // wenn recipient leer ist, geht es an die Recipientliste
-            // wenn nicht, an den Recipient + die Admin-Email
+            // wenn recipient leer ist, geht es an die Recipientliste            
 
             if ((recipient == null) || (recipient.Length == 0))
             {
@@ -94,7 +93,12 @@ namespace bsmd.email
             else
             {
                 message.To.Add(recipient);
-                message.CC.Add(Properties.Settings.Default.AdminEmail);
+                // message.CC.Add(Properties.Settings.Default.AdminEmail);
+                foreach (string extraRecipient in Properties.Settings.Default.Recipient)
+                {
+                    if(!extraRecipient.Equals(recipient, StringComparison.OrdinalIgnoreCase))
+                        message.CC.Add(extraRecipient);
+                }
             }
 
 
diff --git a/nsw/Source/bsmd.email/bsmd.email.csproj b/nsw/Source/bsmd.email/bsmd.email.csproj
index 8d903bdf..ac9251c8 100644
--- a/nsw/Source/bsmd.email/bsmd.email.csproj
+++ b/nsw/Source/bsmd.email/bsmd.email.csproj
@@ -81,6 +81,7 @@
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/nsw/Source/bsmd.hisnord/NSWResponse.cs b/nsw/Source/bsmd.hisnord/NSWResponse.cs
index 0ec8b284..22b9bec1 100644
--- a/nsw/Source/bsmd.hisnord/NSWResponse.cs
+++ b/nsw/Source/bsmd.hisnord/NSWResponse.cs
@@ -1,21 +1,192 @@
-using System;
+// Copyright (c) 2015-2017 schick Informatik
+// Description: Hilfsklasse zur Bearbeitung der Antworten / HIS-Nord
+
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Xml;
 using System.Xml.Linq;
+using bsmd.database;
+using log4net;
 
 namespace bsmd.hisnord
 {
 
     public class NSWResponse
     {
+        private string _clientRequestId;
+        private DateTime _receiveAt;
+        private string _notificationId;
+        private string _status;
+        private string _visitId;
+        private string _transitId;
+        private Message.NotificationClass _notificationClass;
+
+        private List<MessageViolation> _violations = new List<MessageViolation>();
+        private List<MessageError> _errors = new List<MessageError>();
+
+        private Guid _messageCoreId;
+        private ILog _log = LogManager.GetLogger(typeof(NSWResponse));
+
         public NSWResponse(XElement xml)
         {
+            XNamespace ns1 = "http://api.national-single-window.de/visitIdRequest";
+            XNamespace ns6 = "http://api.national-single-window.de/receipt";
+            //XNamespace ns15 = "http://api.national-single-window.de/statusForClientRequestId";
+            XNamespace soap = "http://schemas.xmlsoap.org/soap/envelope/";
+            XNamespace ns15 = "http://api.national-single-window.de/visitIdResponse";
+            XNamespace ladgNS = "http://api.national-single-window.de/ladg";
+            XNamespace hazaNS = "http://api.national-single-window.de/haza";
+            XNamespace hazdNS = "http://api.national-single-window.de/hazd";
+            XNamespace mdhNS = "http://api.national-single-window.de/mdh";
+            XNamespace agntNS = "http://api.national-single-window.de/agnt";
+            XNamespace vioNS = "http://api.national-single-window.de/violation";
+            XNamespace errNS = "http://api.national-single-window.de/error";
 
+            // detect response type
+
+            foreach (Message.NotificationClass messageClassType in Enum.GetValues(typeof(Message.NotificationClass)))
+            {                             
+                XName lookupName = "";
+
+                switch (messageClassType)
+                {
+                    // we won't get answers for these message types
+                    case Message.NotificationClass.STO: continue;
+                    case Message.NotificationClass.CREWD: continue;
+                    case Message.NotificationClass.PASD: continue;
+
+                    case Message.NotificationClass.VISIT:                        
+                        lookupName = ns15 + "VisitIdResponse";
+                        break;
+                    case Message.NotificationClass.TRANSIT:
+                        lookupName = ns15 + "VisitIdResponse";
+                        break;
+                    case Message.NotificationClass.LADG:
+                        lookupName = ladgNS + "LADGResponse";
+                        break;
+                    case Message.NotificationClass.HAZA:
+                        lookupName = hazaNS + "HAZAResponse";
+                        break;
+                    case Message.NotificationClass.HAZD:
+                        lookupName = hazdNS + "HAZDResponse";
+                        break;
+                    case Message.NotificationClass.MDH:
+                        lookupName = mdhNS + "MDHResponse";
+                        break;
+                    case Message.NotificationClass.AGNT:
+                        lookupName = agntNS + "AGNTResponse";
+                        break;
+                    default:
+                        lookupName = "dontmatchmeplease";
+                        break;
+                }                                
+
+                if(xml.Descendants(lookupName).Count() > 0)
+                {
+
+                    _notificationClass = messageClassType;
+
+                    // match found
+                    XName xname = ns6 + "ClientRequestId";
+                    var elem = xml.Descendants(xname);
+                    if(elem.Count() > 0)
+                    {
+                        _clientRequestId = elem.First()?.Value;
+                        if (!Guid.TryParse(_clientRequestId, out this._messageCoreId))
+                        {
+                            throw new ApplicationException(string.Format("cannot parse client request id to guid: {0}", _clientRequestId));
+                        }
+                    }
+
+                    xname = ns6 + "ReceivedAt";
+                    elem = xml.Descendants(xname);
+                    if(elem.Count() > 0)
+                    {
+                        DateTime.TryParse(elem.First()?.Value, out _receiveAt);
+                    }
+
+                    xname = ns6 + "NotificationId";
+                    elem = xml.Descendants(xname);
+                    if (elem.Count() > 0)
+                        _notificationId = elem.First()?.Value;
+
+                    xname = ns6 + "Status";
+                    elem = xml.Descendants(xname);
+                    if(elem.Count() > 0)
+                    {
+                        _status = elem.First()?.Value;
+                    }
+
+                    xname = ns6 + "VisitId";
+                    elem = xml.Descendants(xname);
+                    if(elem.Count() > 0)
+                    {
+                        _visitId = elem.First()?.Value;
+                    }
+
+                    xname = ns6 + "TransitId";
+                    elem = xml.Descendants(xname);
+                    if (elem.Count() > 0)
+                    {
+                        _transitId = elem.First()?.Value;
+                    }
+
+
+                    // check for violations -------------------------------------------
+                    xname = ns6 + "Violation";
+                    XName vCodeName = vioNS + "ViolationCode";
+                    XName vTextName = vioNS + "ViolationText";
+                    elem = xml.Descendants(xname);
+                    foreach(XElement anElem in elem)
+                    {
+                        MessageViolation mv = new MessageViolation();
+                        int vCode = -1;
+                        if (!Int32.TryParse(anElem.Element(vCodeName).Value, out vCode))
+                            _log.WarnFormat("cannot convert violation code to int: {0}", anElem.Element(vCodeName).Value);
+                        else
+                            mv.ViolationCode = vCode;
+                        mv.ViolationText = anElem.Element(vTextName).Value;
+                        _violations.Add(mv);
+                    }
+
+                    // check for errors ----------------------------------------------
+                    xname = ns6 + "Error";
+                    XName eCodeName = errNS + "ErrorCode";
+                    XName eTextName = errNS + "ErrorText";
+                    elem = xml.Descendants(xname);
+                    foreach (XElement anElem in elem)
+                    {
+                        MessageError me = new MessageError();
+                        int eCode = -1;
+                        if (!Int32.TryParse(anElem.Element(eCodeName).Value, out eCode))
+                            _log.WarnFormat("cannot convert error code to int: {0}", anElem.Element(eCodeName).Value);
+                        else
+                            me.ErrorCode = eCode;
+                        me.ErrorText = anElem.Element(eTextName).Value;
+                        _errors.Add(me);
+                    }
+
+                    break;
+                }
+            }            
         }
 
         #region Properties
 
+        public string ClientRequestId { get { return _clientRequestId; } }
 
+        public DateTime? ReceiveAt { get { return _receiveAt; } }
+
+        public string NotificationId { get { return _notificationId; } }
+
+        public string Status { get { return this._status; } }
+
+        public List<MessageViolation> Violations { get { return _violations; } }
+
+        public List<MessageError> Errors { get { return _errors; } }
+
+        public Message.NotificationClass NotificationClass { get { return this._notificationClass; } }
+       
         #endregion
 
     }
diff --git a/nsw/Source/bsmd.hisnord/Request.cs b/nsw/Source/bsmd.hisnord/Request.cs
index f60417d1..d5028618 100644
--- a/nsw/Source/bsmd.hisnord/Request.cs
+++ b/nsw/Source/bsmd.hisnord/Request.cs
@@ -119,1256 +119,1269 @@ namespace bsmd.hisnord
                 List<Items1ChoiceType> items1ChoiceType = new List<Items1ChoiceType>();
                 List<object> items1 = new List<object>();
 
-                foreach (Message message in messages)
+
+                if (messages[0].MessageCore.Cancelled ?? false)
+                {
+                    // nur das "STORNO" Element hinzufügen
+                    items1ChoiceType.Add(Items1ChoiceType.STORNO);
+                    items1.Add(ytype.Y);
+                }
+
+                else
                 {
 
-                    if (!XtraSendLogic.ShouldSendMessage(message)) continue;
-
-                    switch (message.MessageNotificationClass)
+                    foreach (Message message in messages)
                     {
-                        case Message.NotificationClass.VISIT:
-                            if (!messages[0].MessageCore.IsTransit) visitTransitHeader = message;
-                            break;
-                        case Message.NotificationClass.TRANSIT:
-                            if (messages[0].MessageCore.IsTransit) visitTransitHeader = message;
-                            break;
 
-                        #region AGNT
+                        if (!XtraSendLogic.ShouldSendMessage(message)) continue;
 
-                        case Message.NotificationClass.AGNT:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_AGNT);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                        switch (message.MessageNotificationClass)
+                        {
+                            case Message.NotificationClass.VISIT:
+                                if (!messages[0].MessageCore.IsTransit) visitTransitHeader = message;
+                                break;
+                            case Message.NotificationClass.TRANSIT:
+                                if (messages[0].MessageCore.IsTransit) visitTransitHeader = message;
+                                break;
+
+                            #region AGNT
+
+                            case Message.NotificationClass.AGNT:
+                                if (message.Reset)
                                 {
-                                    AGNT agnt = message.Elements[0] as AGNT;
-                                    global::agnt hn_agnt = new global::agnt();
-                                    hn_agnt.AgentCity = agnt.AgentCity;
-                                    hn_agnt.AgentCompanyName = agnt.AgentCompanyName;
-                                    hn_agnt.AgentCountry = agnt.AgentCountry;
-                                    hn_agnt.AgentEMail = agnt.AgentEMail;
-                                    hn_agnt.AgentFax = agnt.AgentFax;
-                                    hn_agnt.AgentFirstName = agnt.AgentFirstName;
-                                    hn_agnt.AgentLastName = agnt.AgentLastName;
-                                    hn_agnt.AgentPhone = agnt.AgentPhone;
-                                    hn_agnt.AgentPostalCode = agnt.AgentPostalCode;
-                                    hn_agnt.AgentStreetAndNumber = agnt.AgentStreetAndNumber;
-                                    items1ChoiceType.Add(Items1ChoiceType.AGNT);
-                                    items1.Add(hn_agnt);
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_AGNT);
+                                    items1.Add(ytype.Y);
                                 }
-                            }
-                            break;
-
-                        #endregion
-
-                        #region ATA/ATD
-                        case Message.NotificationClass.ATA:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_ATA);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                                else
                                 {
-                                    ATA ata = message.Elements[0] as ATA;
-                                    items1ChoiceType.Add(Items1ChoiceType.ATA);
-                                    items1.Add(ata.ATAPortOfCall);
-                                }
-                            }
-                            break;
-                        case Message.NotificationClass.ATD:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_ATD);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    ATD atd = message.Elements[0] as ATD;
-                                    items1ChoiceType.Add(Items1ChoiceType.ATD);
-                                    items1.Add(atd.ATDPortOfCall);
-                                }
-                            }
-                            break;
-                        #endregion
-
-                        #region BKRA/BKRD
-                        case Message.NotificationClass.BKRA:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_BKRA);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    global::bkra hn_bkra = new bkra();
-                                    hn_bkra.BunkerFuelArrival = new bunkerfuel[message.Elements.Count];
-                                    for (int i = 0; i < message.Elements.Count; i++)
+                                    if (message.Elements.Count > 0)
                                     {
-                                        BRKA brka = message.Elements[i] as BRKA;
-                                        hn_bkra.BunkerFuelArrival[i] = new bunkerfuel();
-                                        hn_bkra.BunkerFuelArrival[i].BunkerFuelType = brka.BunkerFuelType;
-                                        hn_bkra.BunkerFuelArrival[i].BunkerFuelQuantity_TNE = (float)brka.BunkerFuelQuantity_TNE;
+                                        AGNT agnt = message.Elements[0] as AGNT;
+                                        global::agnt hn_agnt = new global::agnt();
+                                        hn_agnt.AgentCity = agnt.AgentCity;
+                                        hn_agnt.AgentCompanyName = agnt.AgentCompanyName;
+                                        hn_agnt.AgentCountry = agnt.AgentCountry;
+                                        hn_agnt.AgentEMail = agnt.AgentEMail;
+                                        hn_agnt.AgentFax = agnt.AgentFax;
+                                        hn_agnt.AgentFirstName = agnt.AgentFirstName;
+                                        hn_agnt.AgentLastName = agnt.AgentLastName;
+                                        hn_agnt.AgentPhone = agnt.AgentPhone;
+                                        hn_agnt.AgentPostalCode = agnt.AgentPostalCode;
+                                        hn_agnt.AgentStreetAndNumber = agnt.AgentStreetAndNumber;
+                                        items1ChoiceType.Add(Items1ChoiceType.AGNT);
+                                        items1.Add(hn_agnt);
                                     }
-                                    items1ChoiceType.Add(Items1ChoiceType.BKRA);
-                                    items1.Add(hn_bkra);
                                 }
-                            }
-                            break;
-                        case Message.NotificationClass.BKRD:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_BKRD);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                                break;
+
+                            #endregion
+
+                            #region ATA/ATD
+                            case Message.NotificationClass.ATA:
+                                if (message.Reset)
                                 {
-                                    global::bkrd hn_bkrd = new bkrd();
-                                    hn_bkrd.BunkerFuelDeparture = new bunkerfuel[message.Elements.Count];
-                                    for (int i = 0; i < message.Elements.Count; i++)
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_ATA);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
                                     {
-                                        BRKD brkd = message.Elements[i] as BRKD;
-                                        hn_bkrd.BunkerFuelDeparture[i] = new bunkerfuel();
-                                        hn_bkrd.BunkerFuelDeparture[i].BunkerFuelType = brkd.BunkerFuelType;
-                                        hn_bkrd.BunkerFuelDeparture[i].BunkerFuelQuantity_TNE = (float)brkd.BunkerFuelQuantity_TNE;
+                                        ATA ata = message.Elements[0] as ATA;
+                                        items1ChoiceType.Add(Items1ChoiceType.ATA);
+                                        items1.Add(ata.ATAPortOfCall);
                                     }
-                                    items1ChoiceType.Add(Items1ChoiceType.BKRD);
-                                    items1.Add(hn_bkrd);
                                 }
-                            }
-                            break;
-                        #endregion
-
-                        #region BPOL
-                        case Message.NotificationClass.BPOL:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_BPOL);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                                break;
+                            case Message.NotificationClass.ATD:
+                                if (message.Reset)
                                 {
-                                    BPOL bpol = message.Elements[0] as BPOL;
-                                    global::bpol hn_bpol = new global::bpol();
-
-                                    hn_bpol.StowawayOnBoard = (bpol.StowawaysOnBoard ?? false) ? yorntype.Y : yorntype.N;
-
-                                    if (!bpol.PortOfItineraries.IsNullOrEmpty())
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_ATD);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
                                     {
-                                        hn_bpol.PortOfItinerary = new portofitinery[bpol.PortOfItineraries.Count];
-                                        for (int i = 0; i < bpol.PortOfItineraries.Count; i++)
+                                        ATD atd = message.Elements[0] as ATD;
+                                        items1ChoiceType.Add(Items1ChoiceType.ATD);
+                                        items1.Add(atd.ATDPortOfCall);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region BKRA/BKRD
+                            case Message.NotificationClass.BKRA:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_BKRA);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        global::bkra hn_bkra = new bkra();
+                                        hn_bkra.BunkerFuelArrival = new bunkerfuel[message.Elements.Count];
+                                        for (int i = 0; i < message.Elements.Count; i++)
                                         {
-                                            hn_bpol.PortOfItinerary[i] = new portofitinery();
-                                            hn_bpol.PortOfItinerary[i].PortOfItineryName = bpol.PortOfItineraries[i].PortOfItineraryName;
-                                            if (bpol.PortOfItineraries[i].PortOfItineraryETA.HasValue)
-                                                hn_bpol.PortOfItinerary[i].PortOfItineryETA = bpol.PortOfItineraries[i].PortOfItineraryETA.Value;
+                                            BRKA brka = message.Elements[i] as BRKA;
+                                            hn_bkra.BunkerFuelArrival[i] = new bunkerfuel();
+                                            hn_bkra.BunkerFuelArrival[i].BunkerFuelType = brka.BunkerFuelType;
+                                            hn_bkra.BunkerFuelArrival[i].BunkerFuelQuantity_TNE = (float)brka.BunkerFuelQuantity_TNE;
                                         }
+                                        items1ChoiceType.Add(Items1ChoiceType.BKRA);
+                                        items1.Add(hn_bkra);
                                     }
-
-                                    items1ChoiceType.Add(Items1ChoiceType.BPOL);
-                                    items1.Add(hn_bpol);
                                 }
-                            }
-                            break;
-                        #endregion
-
-                        #region CREW
-                        case Message.NotificationClass.CREW:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_CREW);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                                break;
+                            case Message.NotificationClass.BKRD:
+                                if (message.Reset)
                                 {
-                                    global::crew hn_crew = new crew();
-                                    hn_crew.CrewMember = new crewmember[message.Elements.Count];
-                                    for (int i = 0; i < message.Elements.Count; i++)
-                                    {
-                                        CREW crew = message.Elements[i] as CREW;
-                                        hn_crew.CrewMember[i] = new crewmember();
-                                        if (crew.CrewMemberDateOfBirth.HasValue)
-                                            hn_crew.CrewMember[i].CrewMemberDateOfBirth = crew.CrewMemberDateOfBirth.Value;
-                                        hn_crew.CrewMember[i].CrewMemberDuty = crew.CrewMemberDuty;
-                                        hn_crew.CrewMember[i].CrewMemberFirstName = crew.CrewMemberFirstName;
-                                        if (crew.CrewMemberGender.HasValue)
-                                            hn_crew.CrewMember[i].CrewMemberGender = (gendertype)crew.CrewMemberGender.Value;
-                                        hn_crew.CrewMember[i].CrewMemberGenderSpecified = crew.CrewMemberGender.HasValue;
-                                        hn_crew.CrewMember[i].CrewMemberIdentityDocumentId = crew.CrewMemberIdentityDocumentId;
-                                        if (crew.CrewMemberIdentityDocumentType.HasValue)
-                                            hn_crew.CrewMember[i].CrewMemberIdentityDocumentType = (documenttype)crew.CrewMemberIdentityDocumentType.Value;
-                                        hn_crew.CrewMember[i].CrewMemberLastName = crew.CrewMemberLastName;
-                                        hn_crew.CrewMember[i].CrewMemberNationality = crew.CrewMemberNationality;
-                                        hn_crew.CrewMember[i].CrewMemberPlaceOfBirth = crew.CrewMemberPlaceOfBirth;
-                                        hn_crew.CrewMember[i].CrewMemberVisaNumber = crew.CrewMemberVisaNumber.IsNullOrEmpty() ? "-" : crew.CrewMemberVisaNumber;
-                                    }
-
-                                    items1ChoiceType.Add(Items1ChoiceType.CREW);
-                                    items1.Add(hn_crew);
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_BKRD);
+                                    items1.Add(ytype.Y);
                                 }
-                            }
-                            break;
-                        #endregion
-
-                        #region HAZ
-
-                        case Message.NotificationClass.HAZA:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_HAZA);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                                else
                                 {
-                                    HAZ haz = message.Elements[0] as HAZ;
-                                    global::haza hn_haza = new haza();
-
-                                    if (haz.NoDPGOnBoardOnArrival ?? false)
+                                    if (message.Elements.Count > 0)
                                     {
-                                        hn_haza.Items = new object[1];
-                                        hn_haza.ItemsElementName = new ItemsChoiceType1[1];
-                                        hn_haza.Items[0] = ytype.Y;
-                                        hn_haza.ItemsElementName[0] = ItemsChoiceType1.NoDPGOnBoardOnArrival;
+                                        global::bkrd hn_bkrd = new bkrd();
+                                        hn_bkrd.BunkerFuelDeparture = new bunkerfuel[message.Elements.Count];
+                                        for (int i = 0; i < message.Elements.Count; i++)
+                                        {
+                                            BRKD brkd = message.Elements[i] as BRKD;
+                                            hn_bkrd.BunkerFuelDeparture[i] = new bunkerfuel();
+                                            hn_bkrd.BunkerFuelDeparture[i].BunkerFuelType = brkd.BunkerFuelType;
+                                            hn_bkrd.BunkerFuelDeparture[i].BunkerFuelQuantity_TNE = (float)brkd.BunkerFuelQuantity_TNE;
+                                        }
+                                        items1ChoiceType.Add(Items1ChoiceType.BKRD);
+                                        items1.Add(hn_bkrd);
                                     }
-                                    else
-                                    {
-                                        List<object> hn_haza_items = new List<object>();
-                                        List<ItemsChoiceType1> hn_haza_itemsChoiceType1 = new List<ItemsChoiceType1>();
-
-                                        if (haz.DPGManifestOnBoardOnArrival.HasValue)
-                                        {
-                                            hn_haza_items.Add(haz.DPGManifestOnBoardOnArrival.Value ? yorntype.Y : yorntype.N);
-                                            hn_haza_itemsChoiceType1.Add(ItemsChoiceType1.DPGManifestOnBoardOnArrival);
-                                        }
-
-                                        if (haz.INFShipClass.HasValue)
-                                        {
-                                            infclasstype infclass = (infclasstype)haz.INFShipClass.Value; // ich hoffe diese casts passen immer :\
-                                            hn_haza_items.Add(infclass);
-                                            hn_haza_itemsChoiceType1.Add(ItemsChoiceType1.INFShipClass);
-                                        }
-
-                                        if (haz.MOUBaltic ?? false)
-                                        {
-                                            hn_haza_items.Add(ytype.Y);
-                                            hn_haza_itemsChoiceType1.Add(ItemsChoiceType1.MOUBaltic);
-                                        }
-
-                                        dglist hn_dgList = new dglist();
-
-                                        SetHAZPositions(hn_dgList, haz);
-
-                                        hn_haza_items.Add(hn_dgList);
-                                        hn_haza_itemsChoiceType1.Add(ItemsChoiceType1.DPGOnArrival);
-
-                                        hn_haza.Items = hn_haza_items.ToArray();
-                                        hn_haza.ItemsElementName = hn_haza_itemsChoiceType1.ToArray();
-                                    }
-
-                                    items1ChoiceType.Add(Items1ChoiceType.HAZA);
-                                    items1.Add(hn_haza);
                                 }
-                            }
-                            break;
-                        case Message.NotificationClass.HAZD:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_HAZD);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                                break;
+                            #endregion
+
+                            #region BPOL
+                            case Message.NotificationClass.BPOL:
+                                if (message.Reset)
                                 {
-                                    HAZ haz = message.Elements[0] as HAZ;
-                                    global::hazd hn_hazd = new hazd();
-
-                                    if (haz.NoDPGOnBoardOnArrival ?? false)
-                                    {
-                                        hn_hazd.Items = new object[1];
-                                        hn_hazd.ItemsElementName = new ItemsChoiceType2[1];
-                                        hn_hazd.Items[0] = ytype.Y;
-                                        hn_hazd.ItemsElementName[0] = ItemsChoiceType2.NoDPGOnBoardOnDeparture;
-                                    }
-                                    else
-                                    {
-                                        List<object> hn_hazd_items = new List<object>();
-                                        List<ItemsChoiceType2> hn_hazd_itemsChoiceType2 = new List<ItemsChoiceType2>();
-
-                                        if (haz.DPGManifestOnBoardOnArrival.HasValue)
-                                        {
-                                            hn_hazd_items.Add(haz.DPGManifestOnBoardOnArrival.Value ? yorntype.Y : yorntype.N);
-                                            hn_hazd_itemsChoiceType2.Add(ItemsChoiceType2.DPGManifestOnBoardOnDeparture);
-                                        }
-
-                                        if (haz.INFShipClass.HasValue)
-                                        {
-                                            infclasstype infclass = (infclasstype)haz.INFShipClass.Value; // ich hoffe diese casts passen immer :\
-                                            hn_hazd_items.Add(infclass);
-                                            hn_hazd_itemsChoiceType2.Add(ItemsChoiceType2.INFShipClass);
-                                        }
-
-                                        if (haz.MOUBaltic ?? false)
-                                        {
-                                            hn_hazd_items.Add(ytype.Y);
-                                            hn_hazd_itemsChoiceType2.Add(ItemsChoiceType2.MOUBaltic);
-                                        }
-
-                                        dglist hn_dgList = new dglist();
-
-                                        SetHAZPositions(hn_dgList, haz);
-
-                                        hn_hazd_items.Add(hn_dgList);
-                                        hn_hazd_itemsChoiceType2.Add(ItemsChoiceType2.DPGOnDeparture);
-
-                                        hn_hazd.Items = hn_hazd_items.ToArray();
-                                        hn_hazd.ItemsElementName = hn_hazd_itemsChoiceType2.ToArray();
-                                    }
-
-                                    items1ChoiceType.Add(Items1ChoiceType.HAZD);
-                                    items1.Add(hn_hazd);
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_BPOL);
+                                    items1.Add(ytype.Y);
                                 }
-                            }
-                            break;
-                        #endregion
-
-                        #region INFO
-                        case Message.NotificationClass.INFO:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_INFO);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                                else
                                 {
-                                    INFO info = message.Elements[0] as INFO;
-                                    global::info hn_info = new global::info();
-
-                                    if (info.ShippingArea.HasValue)
-                                        hn_info.ShippingArea = (shippingareatype)info.ShippingArea.Value;
-                                    hn_info.PortArea = info.PortArea;
-                                    hn_info.RequestedPositionInPortOfCall = info.RequestedPositionInPortOfCall;
-                                    hn_info.SpecialRequirementsOfShipAtBerth = info.SpecialRequirementsOfShipAtBerth;
-                                    hn_info.ConstructionCharacteristicsOfShip = info.ConstructionCharacteristicsOfShip;
-                                    hn_info.BowThrusterPower = info.BowThrusterPower;
-                                    hn_info.SternThrusterPower = info.SternThrusterPower;
-                                    if (info.FumigatedBulkCargo.HasValue)
-                                        hn_info.FumigatedBulkCargo = (info.FumigatedBulkCargo.Value == 1) ? yorntype.Y : yorntype.N;
-                                    else
-                                        hn_info.FumigatedBulkCargo = yorntype.N;
-
-                                    hn_info.DeadWeightSummer_TNESpecified = info.DeplacementSummerDraught_TNE.HasValue;
-                                    if (hn_info.DeadWeightSummer_TNESpecified)
-                                        hn_info.DeadWeightSummer_TNE = (float)info.DeplacementSummerDraught_TNE.Value;
-
-                                    items1ChoiceType.Add(Items1ChoiceType.INFO);
-                                    items1.Add(hn_info);
-                                }
-                            }
-                            break;
-                        #endregion
-
-                        #region LADG
-                        case Message.NotificationClass.LADG:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_LADG);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    global::generalcargo hn_generalcargo = new generalcargo();
-                                    hn_generalcargo.Cargo = new loadunit[message.Elements.Count];
-
-                                    for (int i = 0; i < message.Elements.Count; i++)
+                                    if (message.Elements.Count > 0)
                                     {
-                                        LADG ladg = message.Elements[i] as LADG;
-                                        loadunit lu = new loadunit();
+                                        BPOL bpol = message.Elements[0] as BPOL;
+                                        global::bpol hn_bpol = new global::bpol();
 
-                                        if (ladg.CargoHandlingType.HasValue)
-                                            lu.CargoHandlingType = (handlingcodetype)ladg.CargoHandlingType.Value;
-                                        lu.CargoCodeNST = ladg.CargoCodeNST;
-                                        lu.CargoCodeNST_3 = ladg.CargoCodeNST_3;
-                                        if ((ladg.CargoNumberOfItems ?? 0) > 0)
-                                            lu.CargoNumberOfItems = ladg.CargoNumberOfItems.Value.ToString();
-                                        if (ladg.CargoGrossQuantity_TNE.HasValue)
-                                            lu.CargoGrossQuantity_TNE = (float)ladg.CargoGrossQuantity_TNE.Value;
-                                        lu.CargoPortOfLoading = ladg.PortOfLoading;
-                                        lu.CargoPortOfDischarge = ladg.PortOfDischarge;
+                                        hn_bpol.StowawayOnBoard = (bpol.StowawaysOnBoard ?? false) ? yorntype.Y : yorntype.N;
 
-                                        hn_generalcargo.Cargo[i] = lu;
-                                    }
-
-                                    items1ChoiceType.Add(Items1ChoiceType.LADG);
-                                    items1.Add(hn_generalcargo);
-                                }
-                            }
-                            break;
-                        #endregion
-
-                        #region MDH
-                        case Message.NotificationClass.MDH:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_MDH);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    MDH mdh = message.Elements[0] as MDH;
-                                    global::mdh hn_mdh = new global::mdh();
-
-                                    List<object> mdh_items = new List<object>();
-                                    List<ItemsChoiceType5> mdh_types = new List<ItemsChoiceType5>();
-
-                                    if (mdh.MDHSimplification.HasValue && mdh.MDHSimplification.Value)
-                                    {
-                                        mdh_items.Add(ytype.Y);
-                                        mdh_types.Add(ItemsChoiceType5.MDHSimplification);
-                                        mdh_items.Add(mdh.PortOfCallWhereCompleteMDHNotified);
-                                        mdh_types.Add(ItemsChoiceType5.PortOfCallWhereCompleteMDHNotified);                                        
-                                    }
-                                    else
-                                    {
-                                        mdh_items.Add((mdh.NonAccidentalDeathsDuringVoyage ?? false) ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.NonAccidentialDeathsDuringVoyage);
-
-                                        mdh_items.Add(mdh.NonAccidentalDeathsDuringVoyageCount ?? 0);
-                                        mdh_types.Add(ItemsChoiceType5.NonAccidentialDeathsDuringVoyageCount);
-
-                                        mdh_items.Add((mdh.SuspisionInfectiousNature ?? false) ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.SuspisionInfectiousNature);
-
-                                        mdh_items.Add((mdh.NumberOfIllPersonsHigherThanExpected ?? false) ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.NumberOfIllPersonsHigherThanExpected);
-
-                                        mdh_items.Add(mdh.NumberOfIllPersons ?? 0);
-                                        mdh_types.Add(ItemsChoiceType5.NumberOfIllPersons);
-
-                                        mdh_items.Add((mdh.SickPersonsOnBoard ?? false) ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.SickPersonsOnBoard);
-
-                                        mdh_items.Add((mdh.MedicalConsulted ?? false) ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.MedicalConsulted);
-
-                                        mdh_items.Add((mdh.AwareOfFurtherInfections ?? false) ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.AwareOfConditionsForFurtherInfections);
-
-                                        bool sanitaryMeasuresApplied = mdh.SanitaryMeasuresApplied ?? false;
-                                        mdh_items.Add(sanitaryMeasuresApplied ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.SanitaryMeasuresApplied);
-
-                                        if (sanitaryMeasuresApplied)
+                                        if (!bpol.PortOfItineraries.IsNullOrEmpty())
                                         {
-                                            sanitarydetail[] sanitaryDetails = new sanitarydetail[mdh.SanitaryMeasuresDetails.Count];
-                                            for (int j = 0; j < mdh.SanitaryMeasuresDetails.Count; j++)
+                                            hn_bpol.PortOfItinerary = new portofitinery[bpol.PortOfItineraries.Count];
+                                            for (int i = 0; i < bpol.PortOfItineraries.Count; i++)
                                             {
-                                                SanitaryMeasuresDetail detail = mdh.SanitaryMeasuresDetails[j];
-                                                sanitaryDetails[j] = new sanitarydetail();
-                                                if (detail.SanitaryMeasuresDate.HasValue)
-                                                    sanitaryDetails[j].SanitaryMeasuresDate = detail.SanitaryMeasuresDate.Value;
-                                                sanitaryDetails[j].SanitaryMeasuresLocation = detail.SanitaryMeasuresLocation;
-                                                sanitaryDetails[j].SanitaryMeasuresType = detail.SanitaryMeasuresType;
-                                            }
-                                            mdh_items.Add(sanitaryDetails);
-                                            mdh_types.Add(ItemsChoiceType5.SanitaryMeasuresDetails);
-                                        }
-
-                                        mdh_items.Add((mdh.StowawaysDetected ?? false) ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.StowawaysDetected);
-
-                                        foreach (StowawaysJoiningLocation joininglocation in mdh.StowawaysJoiningLocations)
-                                        {
-                                            mdh_items.Add(joininglocation.StowawayJoiningLocation);
-                                            mdh_types.Add(ItemsChoiceType5.StowawaysJoiningLocation);
-                                        }
-
-                                        mdh_items.Add((mdh.SickAnimalOrPetOnBoard ?? false) ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.SickAnimalOrPetOnBoard);
-
-                                        mdh_items.Add((mdh.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false) ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.ValidSanitaryControlExemptionOrCertificateOnBoard);
-
-                                        if(mdh.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false)
-                                        {
-                                            sanitarycertificate certificate = new sanitarycertificate();
-                                            if (mdh.DateOfIssue.HasValue)
-                                                certificate.DateOfIssue = mdh.DateOfIssue.Value;
-                                            mdh.PlaceOfIssue = mdh.PlaceOfIssue;
-                                            mdh_items.Add(certificate);
-                                            mdh_types.Add(ItemsChoiceType5.ValidSanitaryControlExemptionOrCertificate);
-                                        }
-
-                                        mdh_items.Add((mdh.SanitaryControlReinspectionRequired ?? false) ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.SanitaryControlReinspectionRequired);
-
-                                        bool infectedAreaVisited = mdh.InfectedAreaVisited ?? false;
-                                        mdh_items.Add(infectedAreaVisited ? yorntype.Y : yorntype.N);
-                                        mdh_types.Add(ItemsChoiceType5.InfectedAreaVisited);
-
-                                        if (infectedAreaVisited)
-                                        {
-                                            foreach (InfectedArea infectedArea in mdh.InfectedAreas)
-                                            {
-                                                infectedarea ia = new infectedarea();
-                                                if (infectedArea.InfectedAreaDate.HasValue)
-                                                    ia.InfectedAreaDate = infectedArea.InfectedAreaDate.Value;
-                                                ia.InfectedAreaPort = infectedArea.InfectedAreaPort;
-
-                                                mdh_items.Add(ia);
-                                                mdh_types.Add(ItemsChoiceType5.InfectedArea);
+                                                hn_bpol.PortOfItinerary[i] = new portofitinery();
+                                                hn_bpol.PortOfItinerary[i].PortOfItineryName = bpol.PortOfItineraries[i].PortOfItineraryName;
+                                                if (bpol.PortOfItineraries[i].PortOfItineraryETA.HasValue)
+                                                    hn_bpol.PortOfItinerary[i].PortOfItineryETA = bpol.PortOfItineraries[i].PortOfItineraryETA.Value;
                                             }
                                         }
 
-                                        portofcalls pocs = new portofcalls();
-                                        pocs.PortOfCallLast30Days = new portofcallmdh[mdh.PortOfCallLast30Days.Count];
+                                        items1ChoiceType.Add(Items1ChoiceType.BPOL);
+                                        items1.Add(hn_bpol);
+                                    }
+                                }
+                                break;
+                            #endregion
 
-                                        for(int j = 0;j < mdh.PortOfCallLast30Days.Count;j++)
+                            #region CREW
+                            case Message.NotificationClass.CREW:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_CREW);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        global::crew hn_crew = new crew();
+                                        hn_crew.CrewMember = new crewmember[message.Elements.Count];
+                                        for (int i = 0; i < message.Elements.Count; i++)
                                         {
-                                            pocs.PortOfCallLast30Days[j] = new portofcallmdh();
-                                            pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysLocode = mdh.PortOfCallLast30Days[j].PortOfCallLast30DaysLocode;
-                                            if(mdh.PortOfCallLast30Days[j].PortOfCallLast30DaysDateOfDeparture.HasValue)
-                                                pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysDateOfDeparture = mdh.PortOfCallLast30Days[j].PortOfCallLast30DaysDateOfDeparture.Value;
-                                            pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysCrewMembersJoined = (mdh.PortOfCallLast30Days[j].PortOfCallLast30DaysCrewMembersJoined ?? false) ? yorntype.Y : yorntype.N;
-                                            if (mdh.PortOfCallLast30Days[j].CrewJoinedShip.Count > 0)
+                                            CREW crew = message.Elements[i] as CREW;
+                                            hn_crew.CrewMember[i] = new crewmember();
+                                            if (crew.CrewMemberDateOfBirth.HasValue)
+                                                hn_crew.CrewMember[i].CrewMemberDateOfBirth = crew.CrewMemberDateOfBirth.Value;
+                                            hn_crew.CrewMember[i].CrewMemberDuty = crew.CrewMemberDuty;
+                                            hn_crew.CrewMember[i].CrewMemberFirstName = crew.CrewMemberFirstName;
+                                            if (crew.CrewMemberGender.HasValue)
+                                                hn_crew.CrewMember[i].CrewMemberGender = (gendertype)crew.CrewMemberGender.Value;
+                                            hn_crew.CrewMember[i].CrewMemberGenderSpecified = crew.CrewMemberGender.HasValue;
+                                            hn_crew.CrewMember[i].CrewMemberIdentityDocumentId = crew.CrewMemberIdentityDocumentId;
+                                            if (crew.CrewMemberIdentityDocumentType.HasValue)
+                                                hn_crew.CrewMember[i].CrewMemberIdentityDocumentType = (documenttype)crew.CrewMemberIdentityDocumentType.Value;
+                                            hn_crew.CrewMember[i].CrewMemberLastName = crew.CrewMemberLastName;
+                                            hn_crew.CrewMember[i].CrewMemberNationality = crew.CrewMemberNationality;
+                                            hn_crew.CrewMember[i].CrewMemberPlaceOfBirth = crew.CrewMemberPlaceOfBirth;
+                                            hn_crew.CrewMember[i].CrewMemberVisaNumber = crew.CrewMemberVisaNumber.IsNullOrEmpty() ? "-" : crew.CrewMemberVisaNumber;
+                                        }
+
+                                        items1ChoiceType.Add(Items1ChoiceType.CREW);
+                                        items1.Add(hn_crew);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region HAZ
+
+                            case Message.NotificationClass.HAZA:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_HAZA);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        HAZ haz = message.Elements[0] as HAZ;
+                                        global::haza hn_haza = new haza();
+
+                                        if (haz.NoDPGOnBoardOnArrival ?? false)
+                                        {
+                                            hn_haza.Items = new object[1];
+                                            hn_haza.ItemsElementName = new ItemsChoiceType1[1];
+                                            hn_haza.Items[0] = ytype.Y;
+                                            hn_haza.ItemsElementName[0] = ItemsChoiceType1.NoDPGOnBoardOnArrival;
+                                        }
+                                        else
+                                        {
+                                            List<object> hn_haza_items = new List<object>();
+                                            List<ItemsChoiceType1> hn_haza_itemsChoiceType1 = new List<ItemsChoiceType1>();
+
+                                            if (haz.DPGManifestOnBoardOnArrival.HasValue)
                                             {
-                                                pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysCrewJoinedShip = new string[mdh.PortOfCallLast30Days[j].CrewJoinedShip.Count];
-                                                for (int k = 0; k < mdh.PortOfCallLast30Days[j].CrewJoinedShip.Count; k++)
+                                                hn_haza_items.Add(haz.DPGManifestOnBoardOnArrival.Value ? yorntype.Y : yorntype.N);
+                                                hn_haza_itemsChoiceType1.Add(ItemsChoiceType1.DPGManifestOnBoardOnArrival);
+                                            }
+
+                                            if (haz.INFShipClass.HasValue)
+                                            {
+                                                infclasstype infclass = (infclasstype)haz.INFShipClass.Value; // ich hoffe diese casts passen immer :\
+                                                hn_haza_items.Add(infclass);
+                                                hn_haza_itemsChoiceType1.Add(ItemsChoiceType1.INFShipClass);
+                                            }
+
+                                            if (haz.MOUBaltic ?? false)
+                                            {
+                                                hn_haza_items.Add(ytype.Y);
+                                                hn_haza_itemsChoiceType1.Add(ItemsChoiceType1.MOUBaltic);
+                                            }
+
+                                            dglist hn_dgList = new dglist();
+
+                                            SetHAZPositions(hn_dgList, haz);
+
+                                            hn_haza_items.Add(hn_dgList);
+                                            hn_haza_itemsChoiceType1.Add(ItemsChoiceType1.DPGOnArrival);
+
+                                            hn_haza.Items = hn_haza_items.ToArray();
+                                            hn_haza.ItemsElementName = hn_haza_itemsChoiceType1.ToArray();
+                                        }
+
+                                        items1ChoiceType.Add(Items1ChoiceType.HAZA);
+                                        items1.Add(hn_haza);
+                                    }
+                                }
+                                break;
+                            case Message.NotificationClass.HAZD:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_HAZD);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        HAZ haz = message.Elements[0] as HAZ;
+                                        global::hazd hn_hazd = new hazd();
+
+                                        if (haz.NoDPGOnBoardOnArrival ?? false)
+                                        {
+                                            hn_hazd.Items = new object[1];
+                                            hn_hazd.ItemsElementName = new ItemsChoiceType2[1];
+                                            hn_hazd.Items[0] = ytype.Y;
+                                            hn_hazd.ItemsElementName[0] = ItemsChoiceType2.NoDPGOnBoardOnDeparture;
+                                        }
+                                        else
+                                        {
+                                            List<object> hn_hazd_items = new List<object>();
+                                            List<ItemsChoiceType2> hn_hazd_itemsChoiceType2 = new List<ItemsChoiceType2>();
+
+                                            if (haz.DPGManifestOnBoardOnArrival.HasValue)
+                                            {
+                                                hn_hazd_items.Add(haz.DPGManifestOnBoardOnArrival.Value ? yorntype.Y : yorntype.N);
+                                                hn_hazd_itemsChoiceType2.Add(ItemsChoiceType2.DPGManifestOnBoardOnDeparture);
+                                            }
+
+                                            if (haz.INFShipClass.HasValue)
+                                            {
+                                                infclasstype infclass = (infclasstype)haz.INFShipClass.Value; // ich hoffe diese casts passen immer :\
+                                                hn_hazd_items.Add(infclass);
+                                                hn_hazd_itemsChoiceType2.Add(ItemsChoiceType2.INFShipClass);
+                                            }
+
+                                            if (haz.MOUBaltic ?? false)
+                                            {
+                                                hn_hazd_items.Add(ytype.Y);
+                                                hn_hazd_itemsChoiceType2.Add(ItemsChoiceType2.MOUBaltic);
+                                            }
+
+                                            dglist hn_dgList = new dglist();
+
+                                            SetHAZPositions(hn_dgList, haz);
+
+                                            hn_hazd_items.Add(hn_dgList);
+                                            hn_hazd_itemsChoiceType2.Add(ItemsChoiceType2.DPGOnDeparture);
+
+                                            hn_hazd.Items = hn_hazd_items.ToArray();
+                                            hn_hazd.ItemsElementName = hn_hazd_itemsChoiceType2.ToArray();
+                                        }
+
+                                        items1ChoiceType.Add(Items1ChoiceType.HAZD);
+                                        items1.Add(hn_hazd);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region INFO
+                            case Message.NotificationClass.INFO:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_INFO);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        INFO info = message.Elements[0] as INFO;
+                                        global::info hn_info = new global::info();
+
+                                        if (info.ShippingArea.HasValue)
+                                            hn_info.ShippingArea = (shippingareatype)info.ShippingArea.Value;
+                                        hn_info.PortArea = info.PortArea;
+                                        hn_info.RequestedPositionInPortOfCall = info.RequestedPositionInPortOfCall;
+                                        hn_info.SpecialRequirementsOfShipAtBerth = info.SpecialRequirementsOfShipAtBerth;
+                                        hn_info.ConstructionCharacteristicsOfShip = info.ConstructionCharacteristicsOfShip;
+                                        hn_info.BowThrusterPower = info.BowThrusterPower;
+                                        hn_info.SternThrusterPower = info.SternThrusterPower;
+                                        if (info.FumigatedBulkCargo.HasValue)
+                                            hn_info.FumigatedBulkCargo = (info.FumigatedBulkCargo.Value == 1) ? yorntype.Y : yorntype.N;
+                                        else
+                                            hn_info.FumigatedBulkCargo = yorntype.N;
+
+                                        hn_info.DeadWeightSummer_TNESpecified = info.DeplacementSummerDraught_TNE.HasValue;
+                                        if (hn_info.DeadWeightSummer_TNESpecified)
+                                            hn_info.DeadWeightSummer_TNE = (float)info.DeplacementSummerDraught_TNE.Value;
+
+                                        items1ChoiceType.Add(Items1ChoiceType.INFO);
+                                        items1.Add(hn_info);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region LADG
+                            case Message.NotificationClass.LADG:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_LADG);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        global::generalcargo hn_generalcargo = new generalcargo();
+                                        hn_generalcargo.Cargo = new loadunit[message.Elements.Count];
+
+                                        for (int i = 0; i < message.Elements.Count; i++)
+                                        {
+                                            LADG ladg = message.Elements[i] as LADG;
+                                            loadunit lu = new loadunit();
+
+                                            if (ladg.CargoHandlingType.HasValue)
+                                                lu.CargoHandlingType = (handlingcodetype)ladg.CargoHandlingType.Value;
+                                            lu.CargoCodeNST = ladg.CargoCodeNST;
+                                            lu.CargoCodeNST_3 = ladg.CargoCodeNST_3;
+                                            if ((ladg.CargoNumberOfItems ?? 0) > 0)
+                                                lu.CargoNumberOfItems = ladg.CargoNumberOfItems.Value.ToString();
+                                            if (ladg.CargoGrossQuantity_TNE.HasValue)
+                                                lu.CargoGrossQuantity_TNE = (float)ladg.CargoGrossQuantity_TNE.Value;
+                                            lu.CargoPortOfLoading = ladg.PortOfLoading;
+                                            lu.CargoPortOfDischarge = ladg.PortOfDischarge;
+
+                                            hn_generalcargo.Cargo[i] = lu;
+                                        }
+
+                                        items1ChoiceType.Add(Items1ChoiceType.LADG);
+                                        items1.Add(hn_generalcargo);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region MDH
+                            case Message.NotificationClass.MDH:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_MDH);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        MDH mdh = message.Elements[0] as MDH;
+                                        global::mdh hn_mdh = new global::mdh();
+
+                                        List<object> mdh_items = new List<object>();
+                                        List<ItemsChoiceType5> mdh_types = new List<ItemsChoiceType5>();
+
+                                        if (mdh.MDHSimplification.HasValue && mdh.MDHSimplification.Value)
+                                        {
+                                            mdh_items.Add(ytype.Y);
+                                            mdh_types.Add(ItemsChoiceType5.MDHSimplification);
+                                            mdh_items.Add(mdh.PortOfCallWhereCompleteMDHNotified);
+                                            mdh_types.Add(ItemsChoiceType5.PortOfCallWhereCompleteMDHNotified);
+                                        }
+                                        else
+                                        {
+                                            mdh_items.Add((mdh.NonAccidentalDeathsDuringVoyage ?? false) ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.NonAccidentialDeathsDuringVoyage);
+
+                                            mdh_items.Add(mdh.NonAccidentalDeathsDuringVoyageCount ?? 0);
+                                            mdh_types.Add(ItemsChoiceType5.NonAccidentialDeathsDuringVoyageCount);
+
+                                            mdh_items.Add((mdh.SuspisionInfectiousNature ?? false) ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.SuspisionInfectiousNature);
+
+                                            mdh_items.Add((mdh.NumberOfIllPersonsHigherThanExpected ?? false) ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.NumberOfIllPersonsHigherThanExpected);
+
+                                            mdh_items.Add(mdh.NumberOfIllPersons ?? 0);
+                                            mdh_types.Add(ItemsChoiceType5.NumberOfIllPersons);
+
+                                            mdh_items.Add((mdh.SickPersonsOnBoard ?? false) ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.SickPersonsOnBoard);
+
+                                            mdh_items.Add((mdh.MedicalConsulted ?? false) ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.MedicalConsulted);
+
+                                            mdh_items.Add((mdh.AwareOfFurtherInfections ?? false) ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.AwareOfConditionsForFurtherInfections);
+
+                                            bool sanitaryMeasuresApplied = mdh.SanitaryMeasuresApplied ?? false;
+                                            mdh_items.Add(sanitaryMeasuresApplied ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.SanitaryMeasuresApplied);
+
+                                            if (sanitaryMeasuresApplied)
+                                            {
+                                                sanitarydetail[] sanitaryDetails = new sanitarydetail[mdh.SanitaryMeasuresDetails.Count];
+                                                for (int j = 0; j < mdh.SanitaryMeasuresDetails.Count; j++)
                                                 {
-                                                    pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysCrewJoinedShip[k] = mdh.PortOfCallLast30Days[j].CrewJoinedShip[k].PortOfCallLast30DaysCrewJoinedShipName;
+                                                    SanitaryMeasuresDetail detail = mdh.SanitaryMeasuresDetails[j];
+                                                    sanitaryDetails[j] = new sanitarydetail();
+                                                    if (detail.SanitaryMeasuresDate.HasValue)
+                                                        sanitaryDetails[j].SanitaryMeasuresDate = detail.SanitaryMeasuresDate.Value;
+                                                    sanitaryDetails[j].SanitaryMeasuresLocation = detail.SanitaryMeasuresLocation;
+                                                    sanitaryDetails[j].SanitaryMeasuresType = detail.SanitaryMeasuresType;
+                                                }
+                                                mdh_items.Add(sanitaryDetails);
+                                                mdh_types.Add(ItemsChoiceType5.SanitaryMeasuresDetails);
+                                            }
+
+                                            mdh_items.Add((mdh.StowawaysDetected ?? false) ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.StowawaysDetected);
+
+                                            foreach (StowawaysJoiningLocation joininglocation in mdh.StowawaysJoiningLocations)
+                                            {
+                                                mdh_items.Add(joininglocation.StowawayJoiningLocation);
+                                                mdh_types.Add(ItemsChoiceType5.StowawaysJoiningLocation);
+                                            }
+
+                                            mdh_items.Add((mdh.SickAnimalOrPetOnBoard ?? false) ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.SickAnimalOrPetOnBoard);
+
+                                            mdh_items.Add((mdh.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false) ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.ValidSanitaryControlExemptionOrCertificateOnBoard);
+
+                                            if (mdh.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false)
+                                            {
+                                                sanitarycertificate certificate = new sanitarycertificate();
+                                                if (mdh.DateOfIssue.HasValue)
+                                                    certificate.DateOfIssue = mdh.DateOfIssue.Value;
+                                                mdh.PlaceOfIssue = mdh.PlaceOfIssue;
+                                                mdh_items.Add(certificate);
+                                                mdh_types.Add(ItemsChoiceType5.ValidSanitaryControlExemptionOrCertificate);
+                                            }
+
+                                            mdh_items.Add((mdh.SanitaryControlReinspectionRequired ?? false) ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.SanitaryControlReinspectionRequired);
+
+                                            bool infectedAreaVisited = mdh.InfectedAreaVisited ?? false;
+                                            mdh_items.Add(infectedAreaVisited ? yorntype.Y : yorntype.N);
+                                            mdh_types.Add(ItemsChoiceType5.InfectedAreaVisited);
+
+                                            if (infectedAreaVisited)
+                                            {
+                                                foreach (InfectedArea infectedArea in mdh.InfectedAreas)
+                                                {
+                                                    infectedarea ia = new infectedarea();
+                                                    if (infectedArea.InfectedAreaDate.HasValue)
+                                                        ia.InfectedAreaDate = infectedArea.InfectedAreaDate.Value;
+                                                    ia.InfectedAreaPort = infectedArea.InfectedAreaPort;
+
+                                                    mdh_items.Add(ia);
+                                                    mdh_types.Add(ItemsChoiceType5.InfectedArea);
                                                 }
                                             }
-                                        }
 
-                                        mdh_items.Add(pocs);
-                                        mdh_types.Add(ItemsChoiceType5.PortsOfCallLast30Days);                                        
-                                    }
+                                            portofcalls pocs = new portofcalls();
+                                            pocs.PortOfCallLast30Days = new portofcallmdh[mdh.PortOfCallLast30Days.Count];
 
-                                    hn_mdh.Items = mdh_items.ToArray();
-                                    hn_mdh.ItemsElementName = mdh_types.ToArray();
-
-                                    items1.Add(hn_mdh);
-                                    items1ChoiceType.Add(Items1ChoiceType.MDH);
-                                }
-                            }
-                            break;
-                        #endregion
-
-                        #region NAME
-                        case Message.NotificationClass.NAME:
-                            if(message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_NameOfMaster);
-                                items1.Add(ytype.Y);
-                            } else
-                            {
-                                if(message.Elements.Count > 0)
-                                {
-                                    NAME name = message.Elements[0] as NAME;
-                                    items1ChoiceType.Add(Items1ChoiceType.NameOfMaster);
-                                    items1.Add(name.NameOfMaster);
-                                }
-                            }                                                       
-                            break;
-                        #endregion
-
-                        #region NOA_NOD
-                        case Message.NotificationClass.NOA_NOD:
-                            if(message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_NOANOD);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if(message.Elements.Count > 0)
-                                {
-                                    NOA_NOD noa_nod = message.Elements[0] as NOA_NOD;
-                                    noanod hn_noanod = new noanod();
-
-                                    if(message.MessageCore.IsTransit)
-                                    {
-                                        if (noa_nod.ETAToKielCanal.HasValue)
-                                            hn_noanod.ETAToPortOfCall = noa_nod.ETAToKielCanal.Value;
-                                        if (noa_nod.ETDFromKielCanal.HasValue)
-                                            hn_noanod.ETDFromPortOfCall = noa_nod.ETDFromKielCanal.Value;
-                                    }
-                                    else
-                                    {
-                                        if (noa_nod.ETAToPortOfCall.HasValue)
-                                            hn_noanod.ETAToPortOfCall = noa_nod.ETAToPortOfCall.Value;
-                                        if (noa_nod.ETDFromPortOfCall.HasValue)
-                                            hn_noanod.ETDFromPortOfCall = noa_nod.ETDFromPortOfCall.Value;
-                                        hn_noanod.CallPurposes = new callpurpose[noa_nod.CallPurposes.Count];
-                                        for(int i=0;i<noa_nod.CallPurposes.Count;i++)
-                                        {
-                                            hn_noanod.CallPurposes[i] = new callpurpose();
-                                            hn_noanod.CallPurposes[i].CallPurposeCode = noa_nod.CallPurposes[i].CallPurposeCode.ToString();
-                                            hn_noanod.CallPurposes[i].CallPurposeDescription = noa_nod.CallPurposes[i].CallPurposeDescription;
-                                        }
-                                    }
-
-                                    hn_noanod.LastPort = noa_nod.LastPort;
-                                    hn_noanod.ETDFromLastPortSpecified = noa_nod.ETDFromLastPort.HasValue;
-                                    if (hn_noanod.ETDFromLastPortSpecified)
-                                        hn_noanod.ETDFromLastPort = noa_nod.ETDFromLastPort.Value;
-                                    hn_noanod.NextPort = noa_nod.NextPort;
-                                    hn_noanod.ETAToNextPortSpecified = noa_nod.ETAToNextPort.HasValue;
-                                    if (hn_noanod.ETAToNextPortSpecified)
-                                        hn_noanod.ETAToNextPort = noa_nod.ETAToNextPort.Value;
-
-                                    items1ChoiceType.Add(Items1ChoiceType.NOANOD);
-                                    items1.Add(hn_noanod);
-                                }
-                            }                            
-
-                            break;
-                        #endregion
-
-                        #region PAS
-                        case Message.NotificationClass.PAS:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_PAS);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-
-                                    global::pas hn_pas = new pas();
-                                    hn_pas.Passenger = new passenger[message.Elements.Count];
-                                    
-                                    for (int i = 0; i < message.Elements.Count; i++)
-                                    {
-                                        PAS pas = message.Elements[i] as PAS;
-
-                                        hn_pas.Passenger[i] = new passenger();
-                                        if (pas.PassengerDateOfBirth.HasValue)
-                                            hn_pas.Passenger[i].PassengerDateOfBirth = pas.PassengerDateOfBirth.Value;
-                                        hn_pas.Passenger[i].PassengerFirstName = pas.PassengerFirstName;
-                                        if (pas.PassengerGender.HasValue)
-                                            hn_pas.Passenger[i].PassengerGender = (gendertype)pas.PassengerGender.Value;
-                                        hn_pas.Passenger[i].PassengerGenderSpecified = pas.PassengerGender.HasValue;
-                                        hn_pas.Passenger[i].PassengerIdentityDocumentId = pas.PassengerIdentityDocumentId;
-                                        if (pas.PassengerIdentityDocumentType.HasValue)
-                                            hn_pas.Passenger[i].PassengerIdentityDocumentType = (documenttype)pas.PassengerIdentityDocumentType.Value;
-                                        if (pas.PassengerInTransit.HasValue)
-                                            hn_pas.Passenger[i].PassengerInTransit = pas.PassengerInTransit.Value ? yorntype.Y : yorntype.N;
-                                        hn_pas.Passenger[i].PassengerLastName = pas.PassengerLastName;
-                                        hn_pas.Passenger[i].PassengerNationality = pas.PassengerNationality;
-                                        hn_pas.Passenger[i].PassengerPlaceOfBirth = pas.PassengerPlaceOfBirth;
-                                        hn_pas.Passenger[i].PassengerPortOfDisembarkation = pas.PassengerPortOfDisembarkation;
-                                        hn_pas.Passenger[i].PassengerPortOfEmbarkation = pas.PassengerPortOfEmbarkation;
-                                        hn_pas.Passenger[i].PassengerVisaNumber = pas.PassengerVisaNumber;
-                                    }
-
-                                    items1ChoiceType.Add(Items1ChoiceType.PAS);
-                                    items1.Add(hn_pas);
-                                }
-                            }
-                            break;
-                        #endregion
-
-                        #region POBA
-                        case Message.NotificationClass.POBA:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_POBA);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    POBA poba = message.Elements[0] as POBA;
-                                    global::poba hn_poba = new global::poba();
-                                    if (poba.TotalCrewMembersOnBoardUponArrival.HasValue)
-                                        hn_poba.TotalCrewMembersOnBoardUponArrival = poba.TotalCrewMembersOnBoardUponArrival.Value.ToString();
-                                    if (poba.TotalPassengersOnBoardUponArrival.HasValue)
-                                        hn_poba.TotalPassengersOnBoardUponArrival = poba.TotalPassengersOnBoardUponArrival.Value.ToString();
-                                    if (poba.TotalPersonsOnBoardUponArrival.HasValue)
-                                        hn_poba.TotalPersonsOnBoardUponArrival = poba.TotalPersonsOnBoardUponArrival.Value.ToString();
-                                    if (poba.TotalStowawaysOnBoardUponArrival.HasValue)
-                                        hn_poba.TotalStowawaysOnBoardUponArrival = poba.TotalStowawaysOnBoardUponArrival.Value.ToString();
-
-                                    items1ChoiceType.Add(Items1ChoiceType.POBA);
-                                    items1.Add(hn_poba);
-                                }
-                            }
-                            break;
-                        #endregion
-
-                        #region POBD
-                        case Message.NotificationClass.POBD:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_POBD);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    POBD pobd = message.Elements[0] as POBD;
-                                    global::pobd hn_pobd = new global::pobd();
-                                    if (pobd.TotalCrewMembersOnBoardUponDeparture.HasValue)
-                                        hn_pobd.TotalCrewMembersOnBoardUponDeparture = pobd.TotalCrewMembersOnBoardUponDeparture.Value.ToString();
-                                    if (pobd.TotalPassengersOnBoardUponDeparture.HasValue)
-                                        hn_pobd.TotalPassengersOnBoardUponDeparture = pobd.TotalPassengersOnBoardUponDeparture.Value.ToString();
-                                    if (pobd.TotalPersonsOnBoardUponDeparture.HasValue)
-                                        hn_pobd.TotalPersonsOnBoardUponDeparture = pobd.TotalPersonsOnBoardUponDeparture.Value.ToString();
-                                    if (pobd.TotalStowawaysOnBoardUponDeparture.HasValue)
-                                        hn_pobd.TotalStowawaysOnBoardUponDeparture = pobd.TotalStowawaysOnBoardUponDeparture.Value.ToString();
-
-                                    items1ChoiceType.Add(Items1ChoiceType.POBA);
-                                    items1.Add(hn_pobd);
-                                }
-                            }
-                            break;
-                        #endregion
-
-                        #region PRE72H
-                        case Message.NotificationClass.PRE72H:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_PRE72H);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    PRE72H pre72h = message.Elements[0] as PRE72H;
-                                    global::pre72 hn_pre72 = new pre72();
-                                    if (pre72h.DateOfLastExpandedInspection.HasValue)
-                                        hn_pre72.DateOfLastExpandedInspection = pre72h.DateOfLastExpandedInspection.Value;
-                                    hn_pre72.PlannedOperations = pre72h.PlannedOperations;
-                                    if (pre72h.PlannedPeriodOfStay_HUR.HasValue)
-                                        hn_pre72.PlannedPeriodOfStay_HUR = (float)pre72h.PlannedPeriodOfStay_HUR.Value;
-                                    hn_pre72.PlannedWorks = pre72h.PlannedWorks;
-
-                                    hn_pre72.Tanker = (pre72h.Tanker ?? false) ? yorntype.Y : yorntype.N;
-
-                                    if (pre72h.Tanker ?? false)
-                                    {
-                                        hn_pre72.TankerDetails = new tankerdetails();
-                                        if (pre72h.ConditionCargoBallastTanks.HasValue)
-                                            hn_pre72.TankerDetails.ConditionCargoBallastTanks = (cargoconditiontype)pre72h.ConditionCargoBallastTanks.Value;
-                                        hn_pre72.TankerDetails.NatureOfCargo = pre72h.NatureOfCargo;
-                                        if (pre72h.TankerHullConfiguration.HasValue)
-                                            hn_pre72.TankerDetails.TankerHullConfiguration = (hullconfigtype)pre72h.TankerHullConfiguration.Value;
-                                        if (pre72h.VolumeOfCargo.HasValue)
-                                            hn_pre72.TankerDetails.VolumeOfCargo_TNE = (float)pre72h.VolumeOfCargo.Value;
-                                        hn_pre72.TankerDetails.VolumeOfCargo_TNESpecified = pre72h.VolumeOfCargo.HasValue;
-                                    }
-                                    else
-                                    {
-                                        hn_pre72.TankerDetails = null;
-                                    }
-
-                                    items1ChoiceType.Add(Items1ChoiceType.PRE72H);
-                                    items1.Add(hn_pre72);
-                                }
-                            }
-                            break;
-                        #endregion
-
-                        #region SEC
-                        case Message.NotificationClass.SEC:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_SEC);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    SEC sec = message.Elements[0] as SEC;
-                                    global::sec _sec = new global::sec();
-
-                                    if (sec.KielCanalPassagePlanned ?? false)
-                                    {
-                                        _sec.KielCanalPassage = new KielCanalPassage();
-                                        _sec.KielCanalPassage.KielCanalPassagePlanned = ytype.Y;
-                                        _sec.KielCanalPassage.KielCanalPassagePlannedIncomingSpecified = sec.KielCanalPassagePlannedIncomming.HasValue;
-                                        if (_sec.KielCanalPassage.KielCanalPassagePlannedIncomingSpecified)
-                                            _sec.KielCanalPassage.KielCanalPassagePlannedIncoming = sec.KielCanalPassagePlannedIncomming.Value;
-                                        _sec.KielCanalPassage.KielCanalPassagePlannedOutgoingSpecified = sec.KielCanalPassagePlannedOutgoing.HasValue;
-                                        if (_sec.KielCanalPassage.KielCanalPassagePlannedOutgoingSpecified)
-                                            _sec.KielCanalPassage.KielCanalPassagePlannedOutgoing = sec.KielCanalPassagePlannedOutgoing.Value;
-                                    }
-
-                                    if (sec.CurrentShipSecurityLevel.HasValue)
-                                        _sec.CurrentShipSecurityLevel = (posint13type)sec.CurrentShipSecurityLevel.Value;
-
-                                    List<object> secItems = new List<object>();
-                                    List<ItemsChoiceType4> secItemNames = new List<ItemsChoiceType4>();
-
-                                    if (sec.SECSimplification ?? false)
-                                    {
-                                        secItemNames.Add(ItemsChoiceType4.SECSimplification);
-                                        secItems.Add(ytype.Y);
-                                        secItemNames.Add(ItemsChoiceType4.PortOfCallWhereCompleteSECNotified);
-                                        secItems.Add(sec.PortOfCallWhereCompleteSECNotified);
-                                    }
-                                    else
-                                    {
-                                        secItemNames.Add(ItemsChoiceType4.CSOFirstName);
-                                        secItems.Add(sec.CSOFirstName);
-                                        secItemNames.Add(ItemsChoiceType4.CSOLastName);
-                                        secItems.Add(sec.CSOLastName);
-                                        secItemNames.Add(ItemsChoiceType4.CSOPhone);
-                                        secItems.Add(sec.CSOPhone);
-                                        secItemNames.Add(ItemsChoiceType4.CSOFax);
-                                        secItems.Add(sec.CSOFax);
-                                        secItemNames.Add(ItemsChoiceType4.CSOEMail);
-                                        secItems.Add(sec.CSOEMail);
-                                        secItemNames.Add(ItemsChoiceType4.ValidISSCOnBoard);
-                                        secItems.Add((sec.ValidISSCOnBoard ?? false) ? yorntype.Y : yorntype.N);
-                                        secItemNames.Add(ItemsChoiceType4.ReasonsForNoValidISSC);
-                                        secItems.Add(sec.ReasonsForNoValidISSC);
-                                        if (sec.ISSCType.HasValue)
-                                        {
-                                            secItemNames.Add(ItemsChoiceType4.ISSCType);
-                                            secItems.Add((issctype)sec.ISSCType.Value);
-                                        }
-                                        if (sec.ISSCIssuerType.HasValue)
-                                        {
-                                            secItemNames.Add(ItemsChoiceType4.ISSCIssuerType);
-                                            secItems.Add((isscissuertype)sec.ISSCIssuerType.Value);
-                                        }
-                                        secItemNames.Add(ItemsChoiceType4.ISSCIssuerName);
-                                        secItems.Add(sec.ISSCIssuerName);
-                                        if (sec.ISSCDateOfExpiration.HasValue)
-                                        {
-                                            secItemNames.Add(ItemsChoiceType4.ISSCDateOfExpiration);
-                                            secItems.Add(sec.ISSCDateOfExpiration.Value);
-                                        }
-                                        if (sec.ApprovedSecurityPlanOnBoard.HasValue)
-                                        {
-                                            secItemNames.Add(ItemsChoiceType4.ApprovedSecurityPlanOnBoard);
-                                            secItems.Add(sec.ApprovedSecurityPlanOnBoard.Value ? yorntype.Y : yorntype.N);
-                                        }
-                                        secItemNames.Add(ItemsChoiceType4.PortFacilityOfArrival);
-                                        secItems.Add(sec.PortFacilityOfArrival);
-                                        if (sec.GeneralDescriptionOfCargo.HasValue)
-                                        {
-                                            secItemNames.Add(ItemsChoiceType4.GeneralDescriptionOfCargo);
-                                            secItems.Add((cargodescriptiontype)sec.GeneralDescriptionOfCargo.Value);
-                                        }
-
-                                        foreach (LastTenPortFacilitiesCalled l10Called in sec.LastTenPortFacilitesCalled)
-                                        {
-                                            last10port hn_last10port = new last10port();
-                                            hn_last10port.PortFacilityPortName = l10Called.PortFacilityPortName;
-                                            hn_last10port.PortFacilityPortCountry = l10Called.PortFacilityPortCountry;
-                                            hn_last10port.PortFacilityPortLoCode = l10Called.PortFacilityPortLoCode;
-                                            if (l10Called.PortFacilityDateOfArrival.HasValue)
-                                                hn_last10port.PortFacilityDateOfArrival = l10Called.PortFacilityDateOfArrival.Value;
-                                            if (l10Called.PortFacilityDateOfDeparture.HasValue)
-                                                hn_last10port.PortFacilityDateOfDeparture = l10Called.PortFacilityDateOfDeparture.Value;
-                                            if (l10Called.PortFacilityShipSecurityLevel.HasValue)
-                                                hn_last10port.PortFacilityShipSecurityLevel = (posint13type)l10Called.PortFacilityShipSecurityLevel.Value;
-                                            hn_last10port.PortFacilitySecurityMattersToReport = l10Called.PortFacilitySecurityMattersToReport;
-                                            hn_last10port.PortFacilityGISISCode = l10Called.PortFacilityGISISCode;
-
-                                            secItemNames.Add(ItemsChoiceType4.LastTenPortFacilitiesCalled);
-                                            secItems.Add(hn_last10port);
-                                        }
-
-                                        foreach (ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2s in sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)
-                                        {
-                                            lastactivity hn_lastactivity = new lastactivity();
-
-                                            hn_lastactivity.ShipToShipActivityLocation = new location();
-                                            List<object> locationItems = new List<object>();
-                                            List<ItemsChoiceType3> locationItemNames = new List<ItemsChoiceType3>();
-
-                                            if (!s2s.ShipToShipActivityLocationName.IsNullOrEmpty())
+                                            for (int j = 0; j < mdh.PortOfCallLast30Days.Count; j++)
                                             {
-                                                locationItems.Add(s2s.ShipToShipActivityLocationName);
-                                                locationItemNames.Add(ItemsChoiceType3.ShipToShipActivityLocationName);
-                                            }
-                                            if (!s2s.ShipToShipActivityLocationLoCode.IsNullOrEmpty())
-                                            {
-                                                locationItems.Add(s2s.ShipToShipActivityLocationLoCode);
-                                                locationItemNames.Add(ItemsChoiceType3.ShipToShipActivityLocationLoCode);
-                                            }
-                                            if (s2s.ShipToShipActivityLocationCoordinatesLatitude.HasValue && s2s.ShipToShipActivityLocationCoordinatesLongitude.HasValue)
-                                            {
-                                                coordinates coords = new coordinates();
-                                                coords.ShipToShipActivityLocationCoordinatesLatitude = s2s.ShipToShipActivityLocationCoordinatesLatitude.Value.ToString();
-                                                coords.ShipToShipActivityLocationCoordinatesLongitude = s2s.ShipToShipActivityLocationCoordinatesLongitude.Value.ToString();
-                                                locationItems.Add(coords);
-                                                locationItemNames.Add(ItemsChoiceType3.ShipToShipActivityLocationCoordinates);
+                                                pocs.PortOfCallLast30Days[j] = new portofcallmdh();
+                                                pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysLocode = mdh.PortOfCallLast30Days[j].PortOfCallLast30DaysLocode;
+                                                if (mdh.PortOfCallLast30Days[j].PortOfCallLast30DaysDateOfDeparture.HasValue)
+                                                    pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysDateOfDeparture = mdh.PortOfCallLast30Days[j].PortOfCallLast30DaysDateOfDeparture.Value;
+                                                pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysCrewMembersJoined = (mdh.PortOfCallLast30Days[j].PortOfCallLast30DaysCrewMembersJoined ?? false) ? yorntype.Y : yorntype.N;
+                                                if (mdh.PortOfCallLast30Days[j].CrewJoinedShip.Count > 0)
+                                                {
+                                                    pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysCrewJoinedShip = new string[mdh.PortOfCallLast30Days[j].CrewJoinedShip.Count];
+                                                    for (int k = 0; k < mdh.PortOfCallLast30Days[j].CrewJoinedShip.Count; k++)
+                                                    {
+                                                        pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysCrewJoinedShip[k] = mdh.PortOfCallLast30Days[j].CrewJoinedShip[k].PortOfCallLast30DaysCrewJoinedShipName;
+                                                    }
+                                                }
                                             }
 
-                                            hn_lastactivity.ShipToShipActivityLocation.Items = locationItems.ToArray();
-                                            hn_lastactivity.ShipToShipActivityLocation.ItemsElementName = locationItemNames.ToArray();
-
-                                            if (s2s.ShipToShipActivityDateFrom.HasValue)
-                                                hn_lastactivity.ShipToShipActivityDateFrom = s2s.ShipToShipActivityDateFrom.Value;
-                                            if (s2s.ShipToShipActivityDateTo.HasValue)
-                                                hn_lastactivity.ShipToShipActivityDateTo = s2s.ShipToShipActivityDateTo.Value;
-
-                                            int edifact8025;
-                                            if (Int32.TryParse(s2s.ShipToShipActivityType, out edifact8025) && (edifact8025 > 0) && (edifact8025 < 24))
-                                                hn_lastactivity.ShipToShipActivityType = edifact8025.ToString();
-
-                                            hn_lastactivity.ShipToShipActivitySecurityMattersToReportOf = s2s.ShipToShipActivitySecurityMattersToReport;
-
-                                            secItemNames.Add(ItemsChoiceType4.ShipToShipActivities);
-                                            secItems.Add(hn_lastactivity);
-
+                                            mdh_items.Add(pocs);
+                                            mdh_types.Add(ItemsChoiceType5.PortsOfCallLast30Days);
                                         }
-                                    }
 
-                                    _sec.Items = secItems.ToArray();
-                                    _sec.ItemsElementName = secItemNames.ToArray();
+                                        hn_mdh.Items = mdh_items.ToArray();
+                                        hn_mdh.ItemsElementName = mdh_types.ToArray();
 
-                                    items1ChoiceType.Add(Items1ChoiceType.SEC);
-                                    items1.Add(_sec);
-                                }                                                           
-                            }
-                            break;
-                        #endregion
-
-                        #region SERV
-                        case Message.NotificationClass.SERV:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_SERV);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    global::serv hn_serv = new serv();
-                                    hn_serv.Service = new service[message.Elements.Count];
-                                    
-                                    for (int i = 0; i < message.Elements.Count; i++)
-                                    {
-                                        SERV serv = message.Elements[i] as SERV;
-                                        hn_serv.Service[i] = new service();
-                                        hn_serv.Service[i].ServiceBeneficiary = serv.ServiceBeneficiary;
-                                        hn_serv.Service[i].ServiceName = serv.ServiceName;
-                                        hn_serv.Service[i].ServiceInvoiceRecipient = serv.ServiceInvoiceRecipient;
-                                    }
-
-                                    items1ChoiceType.Add(Items1ChoiceType.SERV);
-                                    items1.Add(hn_serv);
-                                }
-                            }
-                            break;
-                        #endregion
-
-                        #region STAT
-                        case Message.NotificationClass.STAT:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_STAT);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    STAT stat = message.Elements[0] as STAT;
-                                    vesseltype hn_stat = new vesseltype();
-
-                                    if (stat.Beam_MTR.HasValue)
-                                        hn_stat.Beam_MTR = (float)stat.Beam_MTR.Value;
-                                    hn_stat.CallSign = stat.CallSign;
-                                    hn_stat.Flag = stat.Flag;
-                                    if (stat.GrossTonnage.HasValue)
-                                        hn_stat.GrossTonnage = stat.GrossTonnage.Value.ToString();
-                                    hn_stat.InmarsatCallNumber = stat.InmarsatCallNumber;
-                                    hn_stat.ISMCompany = new ismcompany();
-                                    hn_stat.ISMCompany.ISMCompanyCity = stat.ISMCompanyCity;
-                                    hn_stat.ISMCompany.ISMCompanyCountry = stat.ISMCompanyCountry;
-                                    hn_stat.ISMCompany.ISMCompanyId = stat.ISMCompanyId;
-                                    hn_stat.ISMCompany.ISMCompanyName = stat.ISMCompanyName;
-                                    hn_stat.ISMCompany.ISMCompanyPostalCode = stat.ISMCompanyPostalCode;
-                                    hn_stat.ISMCompany.ISMCompanyStreetAndNumber = stat.ISMCompanyStreetAndNumber;
-                                    if (stat.LengthOverall_MTR.HasValue)
-                                        hn_stat.LengthOverall_MTR = (float)stat.LengthOverall_MTR.Value;
-                                    hn_stat.MMSINumber = stat.MMSINumber;
-                                    hn_stat.PortOfRegistry = stat.PortOfRegistry;
-                                    hn_stat.ShipName = stat.ShipName;
-                                    hn_stat.TransportMode = stat.TransportMode;
-                                    hn_stat.ShipType = stat.ShipType;
-
-                                    items1ChoiceType.Add(Items1ChoiceType.STAT);
-                                    items1.Add(hn_stat);
-                                }
-                            }
-                            break;
-                        #endregion
-
-                        #region TIEFA
-                        case Message.NotificationClass.TIEFA:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_TIEFA);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    TIEFA tiefa = message.Elements[0] as TIEFA;
-                                    
-                                    if (tiefa.DraughtUponArrival_DMT.HasValue)
-                                    {
-                                        items1ChoiceType.Add(Items1ChoiceType.TIEFA);
-                                        items1.Add((float)tiefa.DraughtUponArrival_DMT.Value);
-                                    }                                                                         
-                                }
-                            }
-                            break;
-                        case Message.NotificationClass.TIEFD:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_TIEFD);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
-                                {
-                                    TIEFD tiefd = message.Elements[0] as TIEFD;
-
-                                    if (tiefd.DraughtUponDeparture_DMT.HasValue)
-                                    {
-                                        items1ChoiceType.Add(Items1ChoiceType.TIEFD);
-                                        items1.Add((float)tiefd.DraughtUponDeparture_DMT.Value);
+                                        items1.Add(hn_mdh);
+                                        items1ChoiceType.Add(Items1ChoiceType.MDH);
                                     }
                                 }
-                            }
-                            break;
-                        #endregion
+                                break;
+                            #endregion
 
-                        #region TOWA/TOWD
-                        case Message.NotificationClass.TOWA:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_TOWA);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                            #region NAME
+                            case Message.NotificationClass.NAME:
+                                if (message.Reset)
                                 {
-                                    global::towa hn_towa = new towa();
-                                    hn_towa.TowageOnArrival = new arrival[message.Elements.Count];                                            
-                                    
-                                    for (int i = 0; i < message.Elements.Count; i++)
-                                    {
-                                        TOWA towa = message.Elements[0] as TOWA;
-
-                                        arrival hn_arrival = new arrival();
-                                        hn_towa.TowageOnArrival[i] = hn_arrival;
-                                                                                                                        
-                                        if (towa.TowageOnArrivalBeam_MTR.HasValue)
-                                            hn_arrival.TowageOnArrivalBeam_MTR = (float)towa.TowageOnArrivalBeam_MTR.Value;
-                                        if (towa.TowageOnArrivalDraught_DMT.HasValue)
-                                            hn_arrival.TowageOnArrivalDraught_DMT = (float)towa.TowageOnArrivalDraught_DMT.Value;
-                                        hn_arrival.TowageOnArrivalFlag = towa.TowageOnArrivalFlag;
-                                        if (towa.TowageOnArrivalGrossTonnage.HasValue)
-                                            hn_arrival.TowageOnArrivalGrossTonnage = towa.TowageOnArrivalGrossTonnage.Value.ToString();
-                                        if (towa.TowageOnArrivalLengthOverall_MTR.HasValue)
-                                            hn_arrival.TowageOnArrivalLengthOverall_MTR = (float)towa.TowageOnArrivalLengthOverall_MTR.Value;
-                                        hn_arrival.TowageOnArrivalName = towa.TowageOnArrivalName;
-                                        hn_arrival.TowageOnArrivalOperator = new arrivaloperator();
-                                        hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorCity = towa.TowageOnArrivalOperatorCity;
-                                        hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorCountry = towa.TowageOnArrivalOperatorCountry;
-                                        hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorPostalCode = towa.TowageOnArrivalOperatorPostalCode;
-                                        hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorStreetAndNumber = towa.TowageOnArrivalOperatorStreetNameAndNumber;
-                                        hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorFax = towa.TowageOnArrivalOperatorFax;
-                                        hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorPhone = towa.TowageOnArrivalOperatorPhone;
-                                        hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorEMail = towa.TowageOnArrivalOperatorEmail;
-                                        hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorCompanyName = towa.TowageOnArrivalOperatorCompanyName;
-                                        hn_arrival.TowageOnArrivalPurposeOfCall = towa.TowageOnArrivalPurposeOfCall;                                        
-                                        hn_arrival.TowageOnArrivalRemarks = towa.TowageOnArrivalRemarks;
-                                    }
-
-                                    items1ChoiceType.Add(Items1ChoiceType.TOWA);
-                                    items1.Add(hn_towa);
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_NameOfMaster);
+                                    items1.Add(ytype.Y);
                                 }
-                            }
-                            break;
-                        case Message.NotificationClass.TOWD:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_TOWD);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                                else
                                 {
-                                    global::towd hn_towd = new towd();
-                                    hn_towd.TowageOnDeparture = new departure[message.Elements.Count];
-                                    
-                                    for (int i = 0; i < message.Elements.Count; i++)
+                                    if (message.Elements.Count > 0)
                                     {
-                                        departure hn_departure = new departure();
-                                        hn_towd.TowageOnDeparture[i] = hn_departure;                                        
-                                        TOWD towd = message.Elements[0] as TOWD;
-
-                                        hn_departure.TowageOnDepartureBeam_MTRSpecified = towd.TowageOnDepartureBeam_MTR.HasValue;
-                                        if(hn_departure.TowageOnDepartureBeam_MTRSpecified)
-                                            hn_departure.TowageOnDepartureBeam_MTR = (float)towd.TowageOnDepartureBeam_MTR.Value;
-                                        if (towd.TowageOnDepartureDraught_DMT.HasValue)
-                                            hn_departure.TowageOnDepartureDraught_DMT = (float)towd.TowageOnDepartureDraught_DMT.Value;
-                                        hn_departure.TowageOnDepartureFlag = towd.TowageOnDepartureFlag;
-                                        hn_departure.TowageOnDepartureName = towd.TowageOnDepartureName;
-                                        hn_departure.TowageOnDepartureOperator = new departureoperator();
-
-                                        hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorCity = towd.TowageOnDepartureOperatorCity;
-                                        hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorCountry = towd.TowageOnDepartureOperatorCountry;
-                                        hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorPostalCode = towd.TowageOnDepartureOperatorPostalCode;
-                                        hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorStreetAndNumber = towd.TowageOnDepartureOperatorStreetNameAndNumber;
-                                        hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorFax = towd.TowageOnDepartureOperatorFax;
-                                        hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorPhone = towd.TowageOnDepartureOperatorPhone;
-                                        hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorEMail = towd.TowageOnDepartureOperatorEmail;
-                                        hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorCompanyName = towd.TowageOnDepartureOperatorCompanyName;
-
-                                        hn_departure.TowageOnDepartureLengthOverall_MTRSpecified = towd.TowageOnDepartureLengthOverall_MTR.HasValue;
-                                        if (hn_departure.TowageOnDepartureLengthOverall_MTRSpecified)
-                                            hn_departure.TowageOnDepartureLengthOverall_MTR = (float)towd.TowageOnDepartureLengthOverall_MTR.Value;
-                                        hn_departure.TowageOnDepartureRemarks = towd.TowageOnDepartureRemarks;
+                                        NAME name = message.Elements[0] as NAME;
+                                        items1ChoiceType.Add(Items1ChoiceType.NameOfMaster);
+                                        items1.Add(name.NameOfMaster);
                                     }
-
-                                    items1ChoiceType.Add(Items1ChoiceType.TOWD);
-                                    items1.Add(hn_towd);
                                 }
-                            }
-                            break;
-                        #endregion
+                                break;
+                            #endregion
 
-                        #region WAS
-                        case Message.NotificationClass.WAS:
-                            if (message.Reset)
-                            {
-                                items1ChoiceType.Add(Items1ChoiceType.RESET_WAS);
-                                items1.Add(ytype.Y);
-                            }
-                            else
-                            {
-                                if (message.Elements.Count > 0)
+                            #region NOA_NOD
+                            case Message.NotificationClass.NOA_NOD:
+                                if (message.Reset)
                                 {
-                                    WAS was = message.Elements[0] as WAS;
-                                    global::was hn_was = new global::was();
-
-                                    List<object> was_items = new List<object>();
-                                    List<ItemsChoiceType6> was_item_names = new List<ItemsChoiceType6>();
-
-                                    if (was.WasteDisposalValidExemption ?? false)
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_NOANOD);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
                                     {
-                                        was_item_names.Add(ItemsChoiceType6.WasteDisposalValidExemption);
-                                        was_items.Add(ytype.Y);                                        
-                                    }
-                                    else
-                                    {
-                                        was_items.Add(was.LastWasteDisposalPort);
-                                        was_item_names.Add(ItemsChoiceType6.LastWasteDisposalPort);
-                                        if(was.LastWasteDisposalDate.HasValue)
+                                        NOA_NOD noa_nod = message.Elements[0] as NOA_NOD;
+                                        noanod hn_noanod = new noanod();
+
+                                        if (message.MessageCore.IsTransit)
                                         {
-                                            was_items.Add(was.LastWasteDisposalDate.Value);
-                                            was_item_names.Add(ItemsChoiceType6.LastWasteDisposalDate);
+                                            if (noa_nod.ETAToKielCanal.HasValue)
+                                                hn_noanod.ETAToPortOfCall = noa_nod.ETAToKielCanal.Value;
+                                            if (noa_nod.ETDFromKielCanal.HasValue)
+                                                hn_noanod.ETDFromPortOfCall = noa_nod.ETDFromKielCanal.Value;
                                         }
-                                        for (int i = 0; i < was.WasteDisposalServiceProvider.Count; i++)
+                                        else
                                         {
-                                            was_items.Add(was.WasteDisposalServiceProvider[i].WasteDisposalServiceProviderName);
-                                            was_item_names.Add(ItemsChoiceType6.WasteDisposalServiceProviderName);
-                                        }
-                                        if (was.WasteDisposalDelivery.HasValue)
-                                        {
-                                            was_items.Add((wastedeliverytype)was.WasteDisposalDelivery);
-                                            was_item_names.Add(ItemsChoiceType6.WasteDisposalDelivery);
-                                        }
-                                        
-                                        if (was.Waste.Count > 0)
-                                        {                                                                                       
-                                            for (int i = 0; i < was.Waste.Count; i++)
+                                            if (noa_nod.ETAToPortOfCall.HasValue)
+                                                hn_noanod.ETAToPortOfCall = noa_nod.ETAToPortOfCall.Value;
+                                            if (noa_nod.ETDFromPortOfCall.HasValue)
+                                                hn_noanod.ETDFromPortOfCall = noa_nod.ETDFromPortOfCall.Value;
+                                            hn_noanod.CallPurposes = new callpurpose[noa_nod.CallPurposes.Count];
+                                            for (int i = 0; i < noa_nod.CallPurposes.Count; i++)
                                             {
-                                                waste hn_waste = new waste();
-                                                Waste waste = was.Waste[i];
-
-                                                if(waste.WasteDisposalAmount_MTQ.HasValue)
-                                                    hn_waste.WasteDisposalAmount_MTQ = (float) waste.WasteDisposalAmount_MTQ.Value;
-                                                if(waste.WasteDisposedAtLastPort_MTQ.HasValue)
-                                                    hn_waste.WasteDisposedAtLastPort_MTQ = (float)waste.WasteDisposedAtLastPort_MTQ.Value;
-
-                                                hn_waste.WasteType = new wastetyp();
-                                                if(waste.WasteType.HasValue)
-                                                    hn_waste.WasteType.WasteCode = waste.WasteType.Value.ToString();
-                                                hn_waste.WasteType.WasteDescription = waste.WasteDescription;
-
-
-                                                hn_waste.WasteDetails = new wastedetails();
-                                                hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified = waste.WasteAmountGeneratedTillNextPort_MTQ.HasValue;
-                                                if (hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified)
-                                                    hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQ = (float) waste.WasteAmountGeneratedTillNextPort_MTQ.Value;
-
-                                                hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified = waste.WasteAmountRetained_MTQ.HasValue;
-                                                if (hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified)
-                                                    hn_waste.WasteDetails.WasteAmountRetained_MTQ = (float)waste.WasteAmountRetained_MTQ.Value;
-
-                                                hn_waste.WasteDetails.WasteCapacity_MTQSpecified = waste.WasteCapacity_MTQ.HasValue;
-                                                if (hn_waste.WasteDetails.WasteCapacity_MTQSpecified)
-                                                    hn_waste.WasteDetails.WasteCapacity_MTQ = (float)waste.WasteCapacity_MTQ.Value;
-
-                                                hn_waste.WasteDetails.WasteDisposalPort = waste.WasteDisposalPort;                                                                                                
-
-                                                was_items.Add(hn_waste);
-                                                was_item_names.Add(ItemsChoiceType6.Waste);
-                                            }                                            
+                                                hn_noanod.CallPurposes[i] = new callpurpose();
+                                                hn_noanod.CallPurposes[i].CallPurposeCode = noa_nod.CallPurposes[i].CallPurposeCode.ToString();
+                                                hn_noanod.CallPurposes[i].CallPurposeDescription = noa_nod.CallPurposes[i].CallPurposeDescription;
+                                            }
                                         }
 
-                                        if(was.ConfirmationOfCorrectness ?? false)
+                                        hn_noanod.LastPort = noa_nod.LastPort;
+                                        hn_noanod.ETDFromLastPortSpecified = noa_nod.ETDFromLastPort.HasValue;
+                                        if (hn_noanod.ETDFromLastPortSpecified)
+                                            hn_noanod.ETDFromLastPort = noa_nod.ETDFromLastPort.Value;
+                                        hn_noanod.NextPort = noa_nod.NextPort;
+                                        hn_noanod.ETAToNextPortSpecified = noa_nod.ETAToNextPort.HasValue;
+                                        if (hn_noanod.ETAToNextPortSpecified)
+                                            hn_noanod.ETAToNextPort = noa_nod.ETAToNextPort.Value;
+
+                                        items1ChoiceType.Add(Items1ChoiceType.NOANOD);
+                                        items1.Add(hn_noanod);
+                                    }
+                                }
+
+                                break;
+                            #endregion
+
+                            #region PAS
+                            case Message.NotificationClass.PAS:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_PAS);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+
+                                        global::pas hn_pas = new pas();
+                                        hn_pas.Passenger = new passenger[message.Elements.Count];
+
+                                        for (int i = 0; i < message.Elements.Count; i++)
                                         {
+                                            PAS pas = message.Elements[i] as PAS;
+
+                                            hn_pas.Passenger[i] = new passenger();
+                                            if (pas.PassengerDateOfBirth.HasValue)
+                                                hn_pas.Passenger[i].PassengerDateOfBirth = pas.PassengerDateOfBirth.Value;
+                                            hn_pas.Passenger[i].PassengerFirstName = pas.PassengerFirstName;
+                                            if (pas.PassengerGender.HasValue)
+                                                hn_pas.Passenger[i].PassengerGender = (gendertype)pas.PassengerGender.Value;
+                                            hn_pas.Passenger[i].PassengerGenderSpecified = pas.PassengerGender.HasValue;
+                                            hn_pas.Passenger[i].PassengerIdentityDocumentId = pas.PassengerIdentityDocumentId;
+                                            if (pas.PassengerIdentityDocumentType.HasValue)
+                                                hn_pas.Passenger[i].PassengerIdentityDocumentType = (documenttype)pas.PassengerIdentityDocumentType.Value;
+                                            if (pas.PassengerInTransit.HasValue)
+                                                hn_pas.Passenger[i].PassengerInTransit = pas.PassengerInTransit.Value ? yorntype.Y : yorntype.N;
+                                            hn_pas.Passenger[i].PassengerLastName = pas.PassengerLastName;
+                                            hn_pas.Passenger[i].PassengerNationality = pas.PassengerNationality;
+                                            hn_pas.Passenger[i].PassengerPlaceOfBirth = pas.PassengerPlaceOfBirth;
+                                            hn_pas.Passenger[i].PassengerPortOfDisembarkation = pas.PassengerPortOfDisembarkation;
+                                            hn_pas.Passenger[i].PassengerPortOfEmbarkation = pas.PassengerPortOfEmbarkation;
+                                            hn_pas.Passenger[i].PassengerVisaNumber = pas.PassengerVisaNumber;
+                                        }
+
+                                        items1ChoiceType.Add(Items1ChoiceType.PAS);
+                                        items1.Add(hn_pas);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region POBA
+                            case Message.NotificationClass.POBA:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_POBA);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        POBA poba = message.Elements[0] as POBA;
+                                        global::poba hn_poba = new global::poba();
+                                        if (poba.TotalCrewMembersOnBoardUponArrival.HasValue)
+                                            hn_poba.TotalCrewMembersOnBoardUponArrival = poba.TotalCrewMembersOnBoardUponArrival.Value.ToString();
+                                        if (poba.TotalPassengersOnBoardUponArrival.HasValue)
+                                            hn_poba.TotalPassengersOnBoardUponArrival = poba.TotalPassengersOnBoardUponArrival.Value.ToString();
+                                        if (poba.TotalPersonsOnBoardUponArrival.HasValue)
+                                            hn_poba.TotalPersonsOnBoardUponArrival = poba.TotalPersonsOnBoardUponArrival.Value.ToString();
+                                        if (poba.TotalStowawaysOnBoardUponArrival.HasValue)
+                                            hn_poba.TotalStowawaysOnBoardUponArrival = poba.TotalStowawaysOnBoardUponArrival.Value.ToString();
+
+                                        items1ChoiceType.Add(Items1ChoiceType.POBA);
+                                        items1.Add(hn_poba);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region POBD
+                            case Message.NotificationClass.POBD:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_POBD);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        POBD pobd = message.Elements[0] as POBD;
+                                        global::pobd hn_pobd = new global::pobd();
+                                        if (pobd.TotalCrewMembersOnBoardUponDeparture.HasValue)
+                                            hn_pobd.TotalCrewMembersOnBoardUponDeparture = pobd.TotalCrewMembersOnBoardUponDeparture.Value.ToString();
+                                        if (pobd.TotalPassengersOnBoardUponDeparture.HasValue)
+                                            hn_pobd.TotalPassengersOnBoardUponDeparture = pobd.TotalPassengersOnBoardUponDeparture.Value.ToString();
+                                        if (pobd.TotalPersonsOnBoardUponDeparture.HasValue)
+                                            hn_pobd.TotalPersonsOnBoardUponDeparture = pobd.TotalPersonsOnBoardUponDeparture.Value.ToString();
+                                        if (pobd.TotalStowawaysOnBoardUponDeparture.HasValue)
+                                            hn_pobd.TotalStowawaysOnBoardUponDeparture = pobd.TotalStowawaysOnBoardUponDeparture.Value.ToString();
+
+                                        items1ChoiceType.Add(Items1ChoiceType.POBA);
+                                        items1.Add(hn_pobd);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region PRE72H
+                            case Message.NotificationClass.PRE72H:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_PRE72H);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        PRE72H pre72h = message.Elements[0] as PRE72H;
+                                        global::pre72 hn_pre72 = new pre72();
+                                        if (pre72h.DateOfLastExpandedInspection.HasValue)
+                                            hn_pre72.DateOfLastExpandedInspection = pre72h.DateOfLastExpandedInspection.Value;
+                                        hn_pre72.PlannedOperations = pre72h.PlannedOperations;
+                                        if (pre72h.PlannedPeriodOfStay_HUR.HasValue)
+                                            hn_pre72.PlannedPeriodOfStay_HUR = (float)pre72h.PlannedPeriodOfStay_HUR.Value;
+                                        hn_pre72.PlannedWorks = pre72h.PlannedWorks;
+
+                                        hn_pre72.Tanker = (pre72h.Tanker ?? false) ? yorntype.Y : yorntype.N;
+
+                                        if (pre72h.Tanker ?? false)
+                                        {
+                                            hn_pre72.TankerDetails = new tankerdetails();
+                                            if (pre72h.ConditionCargoBallastTanks.HasValue)
+                                                hn_pre72.TankerDetails.ConditionCargoBallastTanks = (cargoconditiontype)pre72h.ConditionCargoBallastTanks.Value;
+                                            hn_pre72.TankerDetails.NatureOfCargo = pre72h.NatureOfCargo;
+                                            if (pre72h.TankerHullConfiguration.HasValue)
+                                                hn_pre72.TankerDetails.TankerHullConfiguration = (hullconfigtype)pre72h.TankerHullConfiguration.Value;
+                                            if (pre72h.VolumeOfCargo.HasValue)
+                                                hn_pre72.TankerDetails.VolumeOfCargo_TNE = (float)pre72h.VolumeOfCargo.Value;
+                                            hn_pre72.TankerDetails.VolumeOfCargo_TNESpecified = pre72h.VolumeOfCargo.HasValue;
+                                        }
+                                        else
+                                        {
+                                            hn_pre72.TankerDetails = null;
+                                        }
+
+                                        items1ChoiceType.Add(Items1ChoiceType.PRE72H);
+                                        items1.Add(hn_pre72);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region SEC
+                            case Message.NotificationClass.SEC:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_SEC);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        SEC sec = message.Elements[0] as SEC;
+                                        global::sec _sec = new global::sec();
+
+                                        if (sec.KielCanalPassagePlanned ?? false)
+                                        {
+                                            _sec.KielCanalPassage = new KielCanalPassage();
+                                            _sec.KielCanalPassage.KielCanalPassagePlanned = ytype.Y;
+                                            _sec.KielCanalPassage.KielCanalPassagePlannedIncomingSpecified = sec.KielCanalPassagePlannedIncomming.HasValue;
+                                            if (_sec.KielCanalPassage.KielCanalPassagePlannedIncomingSpecified)
+                                                _sec.KielCanalPassage.KielCanalPassagePlannedIncoming = sec.KielCanalPassagePlannedIncomming.Value;
+                                            _sec.KielCanalPassage.KielCanalPassagePlannedOutgoingSpecified = sec.KielCanalPassagePlannedOutgoing.HasValue;
+                                            if (_sec.KielCanalPassage.KielCanalPassagePlannedOutgoingSpecified)
+                                                _sec.KielCanalPassage.KielCanalPassagePlannedOutgoing = sec.KielCanalPassagePlannedOutgoing.Value;
+                                        }
+
+                                        if (sec.CurrentShipSecurityLevel.HasValue)
+                                            _sec.CurrentShipSecurityLevel = (posint13type)sec.CurrentShipSecurityLevel.Value;
+
+                                        List<object> secItems = new List<object>();
+                                        List<ItemsChoiceType4> secItemNames = new List<ItemsChoiceType4>();
+
+                                        if (sec.SECSimplification ?? false)
+                                        {
+                                            secItemNames.Add(ItemsChoiceType4.SECSimplification);
+                                            secItems.Add(ytype.Y);
+                                            secItemNames.Add(ItemsChoiceType4.PortOfCallWhereCompleteSECNotified);
+                                            secItems.Add(sec.PortOfCallWhereCompleteSECNotified);
+                                        }
+                                        else
+                                        {
+                                            secItemNames.Add(ItemsChoiceType4.CSOFirstName);
+                                            secItems.Add(sec.CSOFirstName);
+                                            secItemNames.Add(ItemsChoiceType4.CSOLastName);
+                                            secItems.Add(sec.CSOLastName);
+                                            secItemNames.Add(ItemsChoiceType4.CSOPhone);
+                                            secItems.Add(sec.CSOPhone);
+                                            secItemNames.Add(ItemsChoiceType4.CSOFax);
+                                            secItems.Add(sec.CSOFax);
+                                            secItemNames.Add(ItemsChoiceType4.CSOEMail);
+                                            secItems.Add(sec.CSOEMail);
+                                            secItemNames.Add(ItemsChoiceType4.ValidISSCOnBoard);
+                                            secItems.Add((sec.ValidISSCOnBoard ?? false) ? yorntype.Y : yorntype.N);
+                                            secItemNames.Add(ItemsChoiceType4.ReasonsForNoValidISSC);
+                                            secItems.Add(sec.ReasonsForNoValidISSC);
+                                            if (sec.ISSCType.HasValue)
+                                            {
+                                                secItemNames.Add(ItemsChoiceType4.ISSCType);
+                                                secItems.Add((issctype)sec.ISSCType.Value);
+                                            }
+                                            if (sec.ISSCIssuerType.HasValue)
+                                            {
+                                                secItemNames.Add(ItemsChoiceType4.ISSCIssuerType);
+                                                secItems.Add((isscissuertype)sec.ISSCIssuerType.Value);
+                                            }
+                                            secItemNames.Add(ItemsChoiceType4.ISSCIssuerName);
+                                            secItems.Add(sec.ISSCIssuerName);
+                                            if (sec.ISSCDateOfExpiration.HasValue)
+                                            {
+                                                secItemNames.Add(ItemsChoiceType4.ISSCDateOfExpiration);
+                                                secItems.Add(sec.ISSCDateOfExpiration.Value);
+                                            }
+                                            if (sec.ApprovedSecurityPlanOnBoard.HasValue)
+                                            {
+                                                secItemNames.Add(ItemsChoiceType4.ApprovedSecurityPlanOnBoard);
+                                                secItems.Add(sec.ApprovedSecurityPlanOnBoard.Value ? yorntype.Y : yorntype.N);
+                                            }
+                                            secItemNames.Add(ItemsChoiceType4.PortFacilityOfArrival);
+                                            secItems.Add(sec.PortFacilityOfArrival);
+                                            if (sec.GeneralDescriptionOfCargo.HasValue)
+                                            {
+                                                secItemNames.Add(ItemsChoiceType4.GeneralDescriptionOfCargo);
+                                                secItems.Add((cargodescriptiontype)sec.GeneralDescriptionOfCargo.Value);
+                                            }
+
+                                            foreach (LastTenPortFacilitiesCalled l10Called in sec.LastTenPortFacilitesCalled)
+                                            {
+                                                last10port hn_last10port = new last10port();
+                                                hn_last10port.PortFacilityPortName = l10Called.PortFacilityPortName;
+                                                hn_last10port.PortFacilityPortCountry = l10Called.PortFacilityPortCountry;
+                                                hn_last10port.PortFacilityPortLoCode = l10Called.PortFacilityPortLoCode;
+                                                if (l10Called.PortFacilityDateOfArrival.HasValue)
+                                                    hn_last10port.PortFacilityDateOfArrival = l10Called.PortFacilityDateOfArrival.Value;
+                                                if (l10Called.PortFacilityDateOfDeparture.HasValue)
+                                                    hn_last10port.PortFacilityDateOfDeparture = l10Called.PortFacilityDateOfDeparture.Value;
+                                                if (l10Called.PortFacilityShipSecurityLevel.HasValue)
+                                                    hn_last10port.PortFacilityShipSecurityLevel = (posint13type)l10Called.PortFacilityShipSecurityLevel.Value;
+                                                hn_last10port.PortFacilitySecurityMattersToReport = l10Called.PortFacilitySecurityMattersToReport;
+                                                hn_last10port.PortFacilityGISISCode = l10Called.PortFacilityGISISCode;
+
+                                                secItemNames.Add(ItemsChoiceType4.LastTenPortFacilitiesCalled);
+                                                secItems.Add(hn_last10port);
+                                            }
+
+                                            foreach (ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2s in sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)
+                                            {
+                                                lastactivity hn_lastactivity = new lastactivity();
+
+                                                hn_lastactivity.ShipToShipActivityLocation = new location();
+                                                List<object> locationItems = new List<object>();
+                                                List<ItemsChoiceType3> locationItemNames = new List<ItemsChoiceType3>();
+
+                                                if (!s2s.ShipToShipActivityLocationName.IsNullOrEmpty())
+                                                {
+                                                    locationItems.Add(s2s.ShipToShipActivityLocationName);
+                                                    locationItemNames.Add(ItemsChoiceType3.ShipToShipActivityLocationName);
+                                                }
+                                                if (!s2s.ShipToShipActivityLocationLoCode.IsNullOrEmpty())
+                                                {
+                                                    locationItems.Add(s2s.ShipToShipActivityLocationLoCode);
+                                                    locationItemNames.Add(ItemsChoiceType3.ShipToShipActivityLocationLoCode);
+                                                }
+                                                if (s2s.ShipToShipActivityLocationCoordinatesLatitude.HasValue && s2s.ShipToShipActivityLocationCoordinatesLongitude.HasValue)
+                                                {
+                                                    coordinates coords = new coordinates();
+                                                    coords.ShipToShipActivityLocationCoordinatesLatitude = s2s.ShipToShipActivityLocationCoordinatesLatitude.Value.ToString();
+                                                    coords.ShipToShipActivityLocationCoordinatesLongitude = s2s.ShipToShipActivityLocationCoordinatesLongitude.Value.ToString();
+                                                    locationItems.Add(coords);
+                                                    locationItemNames.Add(ItemsChoiceType3.ShipToShipActivityLocationCoordinates);
+                                                }
+
+                                                hn_lastactivity.ShipToShipActivityLocation.Items = locationItems.ToArray();
+                                                hn_lastactivity.ShipToShipActivityLocation.ItemsElementName = locationItemNames.ToArray();
+
+                                                if (s2s.ShipToShipActivityDateFrom.HasValue)
+                                                    hn_lastactivity.ShipToShipActivityDateFrom = s2s.ShipToShipActivityDateFrom.Value;
+                                                if (s2s.ShipToShipActivityDateTo.HasValue)
+                                                    hn_lastactivity.ShipToShipActivityDateTo = s2s.ShipToShipActivityDateTo.Value;
+
+                                                int edifact8025;
+                                                if (Int32.TryParse(s2s.ShipToShipActivityType, out edifact8025) && (edifact8025 > 0) && (edifact8025 < 24))
+                                                    hn_lastactivity.ShipToShipActivityType = edifact8025.ToString();
+
+                                                hn_lastactivity.ShipToShipActivitySecurityMattersToReportOf = s2s.ShipToShipActivitySecurityMattersToReport;
+
+                                                secItemNames.Add(ItemsChoiceType4.ShipToShipActivities);
+                                                secItems.Add(hn_lastactivity);
+
+                                            }
+                                        }
+
+                                        _sec.Items = secItems.ToArray();
+                                        _sec.ItemsElementName = secItemNames.ToArray();
+
+                                        items1ChoiceType.Add(Items1ChoiceType.SEC);
+                                        items1.Add(_sec);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region SERV
+                            case Message.NotificationClass.SERV:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_SERV);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        global::serv hn_serv = new serv();
+                                        hn_serv.Service = new service[message.Elements.Count];
+
+                                        for (int i = 0; i < message.Elements.Count; i++)
+                                        {
+                                            SERV serv = message.Elements[i] as SERV;
+                                            hn_serv.Service[i] = new service();
+                                            hn_serv.Service[i].ServiceBeneficiary = serv.ServiceBeneficiary;
+                                            hn_serv.Service[i].ServiceName = serv.ServiceName;
+                                            hn_serv.Service[i].ServiceInvoiceRecipient = serv.ServiceInvoiceRecipient;
+                                        }
+
+                                        items1ChoiceType.Add(Items1ChoiceType.SERV);
+                                        items1.Add(hn_serv);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region STAT
+                            case Message.NotificationClass.STAT:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_STAT);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        STAT stat = message.Elements[0] as STAT;
+                                        vesseltype hn_stat = new vesseltype();
+
+                                        if (stat.Beam_MTR.HasValue)
+                                            hn_stat.Beam_MTR = (float)stat.Beam_MTR.Value;
+                                        hn_stat.CallSign = stat.CallSign;
+                                        hn_stat.Flag = stat.Flag;
+                                        if (stat.GrossTonnage.HasValue)
+                                            hn_stat.GrossTonnage = stat.GrossTonnage.Value.ToString();
+                                        hn_stat.InmarsatCallNumber = stat.InmarsatCallNumber;
+                                        hn_stat.ISMCompany = new ismcompany();
+                                        hn_stat.ISMCompany.ISMCompanyCity = stat.ISMCompanyCity;
+                                        hn_stat.ISMCompany.ISMCompanyCountry = stat.ISMCompanyCountry;
+                                        hn_stat.ISMCompany.ISMCompanyId = stat.ISMCompanyId;
+                                        hn_stat.ISMCompany.ISMCompanyName = stat.ISMCompanyName;
+                                        hn_stat.ISMCompany.ISMCompanyPostalCode = stat.ISMCompanyPostalCode;
+                                        hn_stat.ISMCompany.ISMCompanyStreetAndNumber = stat.ISMCompanyStreetAndNumber;
+                                        if (stat.LengthOverall_MTR.HasValue)
+                                            hn_stat.LengthOverall_MTR = (float)stat.LengthOverall_MTR.Value;
+                                        hn_stat.MMSINumber = stat.MMSINumber;
+                                        hn_stat.PortOfRegistry = stat.PortOfRegistry;
+                                        hn_stat.ShipName = stat.ShipName;
+                                        hn_stat.TransportMode = stat.TransportMode;
+                                        hn_stat.ShipType = stat.ShipType;
+
+                                        items1ChoiceType.Add(Items1ChoiceType.STAT);
+                                        items1.Add(hn_stat);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region TIEFA
+                            case Message.NotificationClass.TIEFA:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_TIEFA);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        TIEFA tiefa = message.Elements[0] as TIEFA;
+
+                                        if (tiefa.DraughtUponArrival_DMT.HasValue)
+                                        {
+                                            items1ChoiceType.Add(Items1ChoiceType.TIEFA);
+                                            items1.Add((float)tiefa.DraughtUponArrival_DMT.Value);
+                                        }
+                                    }
+                                }
+                                break;
+                            case Message.NotificationClass.TIEFD:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_TIEFD);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        TIEFD tiefd = message.Elements[0] as TIEFD;
+
+                                        if (tiefd.DraughtUponDeparture_DMT.HasValue)
+                                        {
+                                            items1ChoiceType.Add(Items1ChoiceType.TIEFD);
+                                            items1.Add((float)tiefd.DraughtUponDeparture_DMT.Value);
+                                        }
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region TOWA/TOWD
+                            case Message.NotificationClass.TOWA:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_TOWA);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        global::towa hn_towa = new towa();
+                                        hn_towa.TowageOnArrival = new arrival[message.Elements.Count];
+
+                                        for (int i = 0; i < message.Elements.Count; i++)
+                                        {
+                                            TOWA towa = message.Elements[0] as TOWA;
+
+                                            arrival hn_arrival = new arrival();
+                                            hn_towa.TowageOnArrival[i] = hn_arrival;
+
+                                            if (towa.TowageOnArrivalBeam_MTR.HasValue)
+                                                hn_arrival.TowageOnArrivalBeam_MTR = (float)towa.TowageOnArrivalBeam_MTR.Value;
+                                            if (towa.TowageOnArrivalDraught_DMT.HasValue)
+                                                hn_arrival.TowageOnArrivalDraught_DMT = (float)towa.TowageOnArrivalDraught_DMT.Value;
+                                            hn_arrival.TowageOnArrivalFlag = towa.TowageOnArrivalFlag;
+                                            if (towa.TowageOnArrivalGrossTonnage.HasValue)
+                                                hn_arrival.TowageOnArrivalGrossTonnage = towa.TowageOnArrivalGrossTonnage.Value.ToString();
+                                            if (towa.TowageOnArrivalLengthOverall_MTR.HasValue)
+                                                hn_arrival.TowageOnArrivalLengthOverall_MTR = (float)towa.TowageOnArrivalLengthOverall_MTR.Value;
+                                            hn_arrival.TowageOnArrivalName = towa.TowageOnArrivalName;
+                                            hn_arrival.TowageOnArrivalOperator = new arrivaloperator();
+                                            hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorCity = towa.TowageOnArrivalOperatorCity;
+                                            hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorCountry = towa.TowageOnArrivalOperatorCountry;
+                                            hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorPostalCode = towa.TowageOnArrivalOperatorPostalCode;
+                                            hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorStreetAndNumber = towa.TowageOnArrivalOperatorStreetNameAndNumber;
+                                            hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorFax = towa.TowageOnArrivalOperatorFax;
+                                            hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorPhone = towa.TowageOnArrivalOperatorPhone;
+                                            hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorEMail = towa.TowageOnArrivalOperatorEmail;
+                                            hn_arrival.TowageOnArrivalOperator.TowageOnArrivalOperatorCompanyName = towa.TowageOnArrivalOperatorCompanyName;
+                                            hn_arrival.TowageOnArrivalPurposeOfCall = towa.TowageOnArrivalPurposeOfCall;
+                                            hn_arrival.TowageOnArrivalRemarks = towa.TowageOnArrivalRemarks;
+                                        }
+
+                                        items1ChoiceType.Add(Items1ChoiceType.TOWA);
+                                        items1.Add(hn_towa);
+                                    }
+                                }
+                                break;
+                            case Message.NotificationClass.TOWD:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_TOWD);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        global::towd hn_towd = new towd();
+                                        hn_towd.TowageOnDeparture = new departure[message.Elements.Count];
+
+                                        for (int i = 0; i < message.Elements.Count; i++)
+                                        {
+                                            departure hn_departure = new departure();
+                                            hn_towd.TowageOnDeparture[i] = hn_departure;
+                                            TOWD towd = message.Elements[0] as TOWD;
+
+                                            hn_departure.TowageOnDepartureBeam_MTRSpecified = towd.TowageOnDepartureBeam_MTR.HasValue;
+                                            if (hn_departure.TowageOnDepartureBeam_MTRSpecified)
+                                                hn_departure.TowageOnDepartureBeam_MTR = (float)towd.TowageOnDepartureBeam_MTR.Value;
+                                            if (towd.TowageOnDepartureDraught_DMT.HasValue)
+                                                hn_departure.TowageOnDepartureDraught_DMT = (float)towd.TowageOnDepartureDraught_DMT.Value;
+                                            hn_departure.TowageOnDepartureFlag = towd.TowageOnDepartureFlag;
+                                            hn_departure.TowageOnDepartureName = towd.TowageOnDepartureName;
+                                            hn_departure.TowageOnDepartureOperator = new departureoperator();
+
+                                            hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorCity = towd.TowageOnDepartureOperatorCity;
+                                            hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorCountry = towd.TowageOnDepartureOperatorCountry;
+                                            hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorPostalCode = towd.TowageOnDepartureOperatorPostalCode;
+                                            hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorStreetAndNumber = towd.TowageOnDepartureOperatorStreetNameAndNumber;
+                                            hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorFax = towd.TowageOnDepartureOperatorFax;
+                                            hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorPhone = towd.TowageOnDepartureOperatorPhone;
+                                            hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorEMail = towd.TowageOnDepartureOperatorEmail;
+                                            hn_departure.TowageOnDepartureOperator.TowageOnDepartureOperatorCompanyName = towd.TowageOnDepartureOperatorCompanyName;
+
+                                            hn_departure.TowageOnDepartureLengthOverall_MTRSpecified = towd.TowageOnDepartureLengthOverall_MTR.HasValue;
+                                            if (hn_departure.TowageOnDepartureLengthOverall_MTRSpecified)
+                                                hn_departure.TowageOnDepartureLengthOverall_MTR = (float)towd.TowageOnDepartureLengthOverall_MTR.Value;
+                                            hn_departure.TowageOnDepartureRemarks = towd.TowageOnDepartureRemarks;
+                                        }
+
+                                        items1ChoiceType.Add(Items1ChoiceType.TOWD);
+                                        items1.Add(hn_towd);
+                                    }
+                                }
+                                break;
+                            #endregion
+
+                            #region WAS
+                            case Message.NotificationClass.WAS:
+                                if (message.Reset)
+                                {
+                                    items1ChoiceType.Add(Items1ChoiceType.RESET_WAS);
+                                    items1.Add(ytype.Y);
+                                }
+                                else
+                                {
+                                    if (message.Elements.Count > 0)
+                                    {
+                                        WAS was = message.Elements[0] as WAS;
+                                        global::was hn_was = new global::was();
+
+                                        List<object> was_items = new List<object>();
+                                        List<ItemsChoiceType6> was_item_names = new List<ItemsChoiceType6>();
+
+                                        if (was.WasteDisposalValidExemption ?? false)
+                                        {
+                                            was_item_names.Add(ItemsChoiceType6.WasteDisposalValidExemption);
                                             was_items.Add(ytype.Y);
-                                            was_item_names.Add(ItemsChoiceType6.ConfirmationOfCorrectnessAndSufficiency);
                                         }
+                                        else
+                                        {
+                                            was_items.Add(was.LastWasteDisposalPort);
+                                            was_item_names.Add(ItemsChoiceType6.LastWasteDisposalPort);
+                                            if (was.LastWasteDisposalDate.HasValue)
+                                            {
+                                                was_items.Add(was.LastWasteDisposalDate.Value);
+                                                was_item_names.Add(ItemsChoiceType6.LastWasteDisposalDate);
+                                            }
+                                            for (int i = 0; i < was.WasteDisposalServiceProvider.Count; i++)
+                                            {
+                                                was_items.Add(was.WasteDisposalServiceProvider[i].WasteDisposalServiceProviderName);
+                                                was_item_names.Add(ItemsChoiceType6.WasteDisposalServiceProviderName);
+                                            }
+                                            if (was.WasteDisposalDelivery.HasValue)
+                                            {
+                                                was_items.Add((wastedeliverytype)was.WasteDisposalDelivery);
+                                                was_item_names.Add(ItemsChoiceType6.WasteDisposalDelivery);
+                                            }
 
-                                        hn_was.Items = was_items.ToArray();
-                                        hn_was.ItemsElementName = was_item_names.ToArray();
+                                            if (was.Waste.Count > 0)
+                                            {
+                                                for (int i = 0; i < was.Waste.Count; i++)
+                                                {
+                                                    waste hn_waste = new waste();
+                                                    Waste waste = was.Waste[i];
+
+                                                    if (waste.WasteDisposalAmount_MTQ.HasValue)
+                                                        hn_waste.WasteDisposalAmount_MTQ = (float)waste.WasteDisposalAmount_MTQ.Value;
+                                                    if (waste.WasteDisposedAtLastPort_MTQ.HasValue)
+                                                        hn_waste.WasteDisposedAtLastPort_MTQ = (float)waste.WasteDisposedAtLastPort_MTQ.Value;
+
+                                                    hn_waste.WasteType = new wastetyp();
+                                                    if (waste.WasteType.HasValue)
+                                                        hn_waste.WasteType.WasteCode = waste.WasteType.Value.ToString();
+                                                    hn_waste.WasteType.WasteDescription = waste.WasteDescription;
+
+
+                                                    hn_waste.WasteDetails = new wastedetails();
+                                                    hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified = waste.WasteAmountGeneratedTillNextPort_MTQ.HasValue;
+                                                    if (hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified)
+                                                        hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQ = (float)waste.WasteAmountGeneratedTillNextPort_MTQ.Value;
+
+                                                    hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified = waste.WasteAmountRetained_MTQ.HasValue;
+                                                    if (hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified)
+                                                        hn_waste.WasteDetails.WasteAmountRetained_MTQ = (float)waste.WasteAmountRetained_MTQ.Value;
+
+                                                    hn_waste.WasteDetails.WasteCapacity_MTQSpecified = waste.WasteCapacity_MTQ.HasValue;
+                                                    if (hn_waste.WasteDetails.WasteCapacity_MTQSpecified)
+                                                        hn_waste.WasteDetails.WasteCapacity_MTQ = (float)waste.WasteCapacity_MTQ.Value;
+
+                                                    hn_waste.WasteDetails.WasteDisposalPort = waste.WasteDisposalPort;
+
+                                                    was_items.Add(hn_waste);
+                                                    was_item_names.Add(ItemsChoiceType6.Waste);
+                                                }
+                                            }
+
+                                            if (was.ConfirmationOfCorrectness ?? false)
+                                            {
+                                                was_items.Add(ytype.Y);
+                                                was_item_names.Add(ItemsChoiceType6.ConfirmationOfCorrectnessAndSufficiency);
+                                            }
+
+                                            hn_was.Items = was_items.ToArray();
+                                            hn_was.ItemsElementName = was_item_names.ToArray();
+                                        }
                                     }
                                 }
-                            }
-                            break;
-                        #endregion
+                                break;
+                                #endregion
 
+                        }
                     }
                 }
 
diff --git a/nsw/Source/bsmd.hisnord/Response.cs b/nsw/Source/bsmd.hisnord/Response.cs
index 0a994c80..ed737e1d 100644
--- a/nsw/Source/bsmd.hisnord/Response.cs
+++ b/nsw/Source/bsmd.hisnord/Response.cs
@@ -1,12 +1,10 @@
-using bsmd.database;
+// Copyright (c) 2015-2017 schick Informatik
+// Description: Bearbeitung von Antworten (dateibasiert..)
+
+using bsmd.database;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using log4net;
 using System.Xml.Linq;
 
@@ -44,8 +42,8 @@ namespace bsmd.hisnord
                     }
                     else
                     {
-                        int timestampMilliSecs;
-                        if (!Int32.TryParse(fileNameElems[fileNameElems.Length - 2], out timestampMilliSecs))
+                        long timestampMilliSecs;
+                        if (!Int64.TryParse(fileNameElems[fileNameElems.Length - 2], out timestampMilliSecs))
                         {
                             _log.WarnFormat("ANSWER file {0}.xml has no readable timestamp", bareFileName);
                             isOK = false;
@@ -70,13 +68,24 @@ namespace bsmd.hisnord
                                 XNamespace soap = "http://schemas.xmlsoap.org/soap/envelope/";
                                 XNamespace ns15 = "http://api.national-single-window.de/visitIdResponse";
 
-                                if(xml.Descendants("SystemError").Count() > 0)
+                                if (xml.Name == "SystemError")
                                 {
                                     // Fehlernachricht
-                                    SystemError systemError = new SystemError(xml);
-
-                                    // Speichern
-
+                                    SystemError systemError = SystemError.createFromXml(xml);
+                                    if (systemError != null)
+                                    {
+                                        MessageCore aCore = DBManager.Instance.GetMessageCoreById(systemError.MessageCoreId);
+                                        if (aCore != null)
+                                        {
+                                            _log.InfoFormat("SystemError received for Core [{0}], IMO {1} ETA {2}: {3}", aCore.Id, aCore.IMO, aCore.ETADisplay, systemError.ErrorMessage);
+                                        }
+                                        else
+                                        {
+                                            _log.WarnFormat("SystemError received for unknown core {0}: {1}", systemError.MessageCoreId, systemError.ErrorMessage);
+                                        }
+                                        // trotzdem immer speichern
+                                        DBManager.Instance.Save(systemError);
+                                    }
                                 }
                                 else
                                 {
@@ -84,48 +93,59 @@ namespace bsmd.hisnord
                                     NSWResponse nswResponse = new NSWResponse(xml);
 
                                     // Rückmeldung auswerten
-
-
-                                }
-
-                                
-                                /*
-                                if (visitIdResponse != null)
-                                {
-                                    _log.InfoFormat("HIS-NORD: Visit-ID {0} delivered for Core {1}", visitIdResponse.VisitId, visitIdResponse.ClientRequestId);
-                                    // update MessageCore
-                                    if (visitIdResponse.ClientRequestId != null)
+                                    Guid coreId;
+                                    if (Guid.TryParse(nswResponse.ClientRequestId, out coreId))
                                     {
-                                        Guid messageCoreId;
-                                        if (Guid.TryParse(visitIdResponse.ClientRequestId, out messageCoreId))
+                                        MessageCore core = DBManager.Instance.GetMessageCoreById(coreId);
+                                        List<Message> messages = DBManager.Instance.GetMessagesForCore(core, DBManager.MessageLoad.ALL);
+
+                                        // now find the message that was meant..
+                                        foreach(Message aMessage in messages)
                                         {
-                                            MessageCore answerCore = DBManager.Instance.GetMessageCoreById(messageCoreId);
-                                            if (answerCore == null)
+                                            if(aMessage.MessageNotificationClass == nswResponse.NotificationClass)
                                             {
-                                                _log.WarnFormat("HIS-NORD: Core not found for notification id {0}", visitIdResponse.NotificationId);
+
+                                                if (nswResponse.Status != null)
+                                                {
+                                                    bool isAccepted = (nswResponse.Status == "ACCEPTED");
+                                                    aMessage.Status = isAccepted ? Message.MessageStatus.ACCEPTED : Message.MessageStatus.REJECTED;
+                                                    aMessage.InternalStatus = isAccepted ? Message.BSMDStatus.CONFIRMED : Message.BSMDStatus.ERROR;
+                                                }
+
+                                                #region Error / Violation handling
+
+                                                foreach (MessageError existingError in aMessage.ErrorList)
+                                                    DBManager.Instance.Delete(existingError);
+
+                                                foreach (MessageViolation existingViolation in aMessage.ViolationList)
+                                                    DBManager.Instance.Delete(existingViolation);
+
+                                                foreach(MessageError messageError in nswResponse.Errors)
+                                                {
+                                                    messageError.MessageHeaderId = aMessage.Id.Value;
+                                                    messageError.MessageHeader = aMessage;
+                                                    DBManager.Instance.Save(messageError);
+                                                }
+
+                                                foreach(MessageViolation messageViolation in nswResponse.Violations)
+                                                {
+                                                    messageViolation.MessageHeaderId = aMessage.Id.Value;
+                                                    messageViolation.MessageHeader = aMessage;
+                                                    DBManager.Instance.Save(messageViolation);
+                                                }
+
+                                                #endregion
+
                                             }
-                                            else
-                                            {
-                                                if (!answerCore.IsTransit)
-                                                    answerCore.VisitId = visitIdResponse.VisitId;
-                                                else
-                                                    answerCore.TransitId = visitIdResponse.VisitId;
-                                                answerCore.BSMDStatusInternal = MessageCore.BSMDStatus.RESPONDED;
-                                                DBManager.Instance.Save(answerCore);
-                                            }
-                                        }
-                                        else
-                                        {
-                                            _log.WarnFormat("{0} ANSWER parsed, but MessageCoreId is no Guid: {1}",
-                                                Path.GetFileName(answerFile), visitIdResponse.ClientRequestId);
-                                        }
+                                        }                                        
+
                                     }
                                     else
                                     {
-                                        _log.WarnFormat("Client request id is null in {0}", answerFile);
+                                        _log.ErrorFormat("received response for unknown core {0}", nswResponse.ClientRequestId);
+                                        isOK = false;
                                     }
-                                }
-                                */
+                                }                                                              
                             }
                             catch(Exception ex)
                             {
@@ -143,6 +163,7 @@ namespace bsmd.hisnord
                 }
                 else
                 {
+                    // save in separate folder (to look at it later?)
                     File.Move(answerFile, Path.Combine(Properties.Settings.Default.AnswerCorruptDir, Path.GetFileName(answerFile)));
                 }
             }
diff --git a/nsw/Source/bsmd.hisnord/SystemError.cs b/nsw/Source/bsmd.hisnord/SystemError.cs
deleted file mode 100644
index 56ee4c5a..00000000
--- a/nsw/Source/bsmd.hisnord/SystemError.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Linq;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace bsmd.hisnord
-{
-    public class SystemError
-    {
-        private DateTime? _errorAt;
-        private string _meldeTyp;
-        private string _referenceId;
-        private int _processStatus;
-        private string _importFileName;
-        private int _errorCode;
-        private string _errorMessage;
-        private string _errorDescription;
-
-        public SystemError(XElement xml)
-        {
-            if(xml.Descendants("ErrorAt").Count() > 0)
-            {
-                _errorAt = DateTime.Parse(xml.Descendants("ErrorAt").First().Value);
-            }
-
-            _meldeTyp = xml.Descendants("MeldeType").First()?.Value;
-            _referenceId = xml.Descendants("ReferenceId").First()?.Value;
-            if(xml.Descendants("ProcessStatus").Count() > 0)
-            {
-                _processStatus = Int32.Parse(xml.Descendants("ProcessStatus").First().Value);
-            }
-
-            _importFileName = xml.Descendants("ImportFilename").First()?.Value;
-            if(xml.Descendants("ErrorCode").Count() > 0)
-            {
-                _errorCode = Int32.Parse(xml.Descendants("ErrorCode").First().Value);
-            }
-            _errorMessage = xml.Descendants("ErrorMessage").First()?.Value;
-            _errorDescription = xml.Descendants("ErrorDescription").First()?.Value;
-        }
-
-        #region Properties
-
-        public DateTime? ErrorAt { get { return _errorAt; } }
-
-        public string MeldeTyp { get { return _meldeTyp; } }
-
-        public string ReferenceId { get { return _referenceId; } }
-
-        public int ProcessStatus { get { return _processStatus; } }
-
-        public string ImportFileName { get { return _importFileName; } }
-
-        public int ErrorCode { get { return _errorCode; } }
-
-        public string ErrorMessage { get { return _errorMessage; } }
-
-        public string ErrorDescription { get { return _errorDescription; } }
-
-        #endregion
-
-    }
-
-}
diff --git a/nsw/Source/bsmd.hisnord/bsmd.hisnord.csproj b/nsw/Source/bsmd.hisnord/bsmd.hisnord.csproj
index 6bc5eca7..b6030315 100644
--- a/nsw/Source/bsmd.hisnord/bsmd.hisnord.csproj
+++ b/nsw/Source/bsmd.hisnord/bsmd.hisnord.csproj
@@ -59,7 +59,7 @@
       <Link>Properties\AssemblyProjectKeyInfo.cs</Link>
     </Compile>
     <Compile Include="his-nord.cs" />
-    <Compile Include="nsw_response.cs" />
+    <Compile Include="NSWResponse.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -68,7 +68,6 @@
     </Compile>
     <Compile Include="Request.cs" />
     <Compile Include="Response.cs" />
-    <Compile Include="SystemError.cs" />
     <Compile Include="TransitId.cs" />
     <Compile Include="transmitter.cs" />
     <Compile Include="VisitId.cs" />
diff --git a/nsw/Source/misc/db.sqlite b/nsw/Source/misc/db.sqlite
index c8ea0dbe..f1980115 100644
Binary files a/nsw/Source/misc/db.sqlite and b/nsw/Source/misc/db.sqlite differ