diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
index abcf9a76..5a2d8167 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
@@ -56,7 +56,7 @@
                             <DataGridTextColumn Header="{x:Static p:Resources.textNationality}" Binding="{Binding CrewMemberNationality, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textCrewFunctionOnBoard}" Binding="{Binding CrewMemberDuty, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textPlaceOfBirth}" Binding="{Binding CrewMemberPlaceOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding CrewMemberDateOfBirth, Mode=TwoWay, StringFormat=\{0:dd.MM.yy\}}" IsReadOnly="True" Width="0.1*" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding CrewMemberDateOfBirth, Mode=TwoWay, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocType}" Binding="{Binding CrewMemberIdentityDocumentTypeDisplay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocNumber}" Binding="{Binding CrewMemberIdentityDocumentId, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textVisaNumber}" Binding="{Binding CrewMemberVisaNumber, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
@@ -79,7 +79,7 @@
                             <DataGridTextColumn Header="{x:Static p:Resources.textPortOfDisembarkation}" Binding="{Binding PassengerPortOfDisembarkation}" IsReadOnly="True" Width="0.1*" />
                             <DataGridCheckBoxColumn Header="{x:Static p:Resources.textTransitPassenger}" Binding="{Binding PassengerInTransit}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textPlaceOfBirth}" Binding="{Binding PassengerPlaceOfBirth}" IsReadOnly="True" Width="0.1*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding PassengerDateOfBirth, StringFormat=\{0:dd.MM.yy\}}" IsReadOnly="True" Width="0.1*" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding PassengerDateOfBirth, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocType}" Binding="{Binding PassengerIdentityDocumentTypeDisplay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocNumber}" Binding="{Binding PassengerIdentityDocumentId}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textVisaNumber}" Binding="{Binding PassengerVisaNumber}" IsReadOnly="True" Width="0.1*" />
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
index c02f49e1..b5ce9ea7 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
@@ -46,7 +46,18 @@ namespace ENI2.DetailViewControls
             this.RegisterTextboxChange(this.textBoxPlannedOperations, Message.NotificationClass.PRE72H);
             this.RegisterTextboxChange(this.textBoxPlannedWorks, Message.NotificationClass.PRE72H);
             this.RegisterDatePickerChange(this.datePickerLastExpandedInspection, Message.NotificationClass.PRE72H);
-            this.RegisterIntegerUpDownChange(this.integerUpDownPlannedPeriodOfStay, Message.NotificationClass.PRE72H);            
+            this.RegisterIntegerUpDownChange(this.integerUpDownPlannedPeriodOfStay, Message.NotificationClass.PRE72H);
+            this.checkBoxTanker.Checked += CheckBoxTanker_Checked;
+            this.checkBoxTanker.Unchecked += CheckBoxTanker_Checked;
+        }
+
+        private void CheckBoxTanker_Checked(object sender, RoutedEventArgs e)
+        {
+            bool isTanker = this.checkBoxTanker.IsChecked ?? false;
+            this.doubleUpDownVolumeOfCargo.IsEnabled = isTanker;
+            this.comboBoxTankerHullConfig.IsEnabled = isTanker;
+            this.comboBoxConditionCargoBallastTanks.IsEnabled = isTanker;
+            this.textBoxNatureOfCargo.IsEnabled = isTanker;
         }
 
         public override void Initialize()
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml
index 8198fd60..a7583f1d 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml
@@ -49,21 +49,21 @@
                 <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="3" Content="{x:Static p:Resources.textInmarsatCallNumber}" Margin="0,0,10,0" />
 
                 <TextBox Name="textBoxVesselName" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Text="{Binding ShipName}" Margin="2" VerticalAlignment="Center"/>
-                <TextBox Name="textBoxCallsign" Grid.Column="4" Grid.Row="1" Text="{Binding CallSign}" Margin="2" VerticalAlignment="Center" />
                 <ComboBox Name="comboBoxVesselType" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" SelectedValue="{Binding ShipType}" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
+                <TextBox Name="textBoxCallsign" Grid.Column="4" Grid.Row="1" Text="{Binding CallSign}" Margin="2" VerticalAlignment="Center" />
                 <ComboBox Name="comboBoxTransportMode" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2" Margin="2" SelectedValue="{Binding TransportMode}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
                 <ComboBox Name="comboBoxFlag" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="2" SelectedValue="{Binding Flag}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
+                <enictrl:LocodeControl x:Name="locodePortOfRegistry" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2" LocodeValue="{Binding PortOfRegistry}" />
+                
                 <xctk:IntegerUpDown Name="integerUpDownGrossTonnage" Grid.Column="1" Grid.Row="4" Margin="2" Value="{Binding GrossTonnage}" ShowButtonSpinner="False"/>
                 <Label Content="t" Grid.Column="2" Grid.Row="4" />
                 <xctk:DoubleUpDown Name="doubleUpDownLength" Grid.Column="1" Grid.Row="5" Margin="2" Value="{Binding LengthOverall_MTR}" ShowButtonSpinner="False" />
                 <Label Content="m" Grid.Column="2" Grid.Row="5" />
-                <TextBox Name="textBoxMMSI" Grid.Column="1" Grid.Row="6" Margin="2" Text="{Binding MMSINumber}" VerticalAlignment="Center"/>
-                <enictrl:LocodeControl x:Name="locodePortOfRegistry" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2" LocodeValue="{Binding PortOfRegistry}" />
                 <xctk:DoubleUpDown Name="doubleUpDownBeam" Grid.Column="4" Grid.Row="5" Margin="2" Value="{Binding Beam_MTR}" ShowButtonSpinner="False" />
                 <Label Content="m" Grid.Column="5" Grid.Row="5" />
+                <TextBox Name="textBoxMMSI" Grid.Column="1" Grid.Row="6" Margin="2" Text="{Binding MMSINumber}" VerticalAlignment="Center"/>
                 <TextBox Name="textBoxInmarsatCallNumber" Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="6" VerticalAlignment="Center" Margin="2" Text="{Binding InmarsatCallNumber}" />
 
-
             </Grid>
             <GroupBox Name="groupBoxISMCompany" Header="{x:Static p:Resources.textISMCompany}" Grid.Row="1">
                 <Grid>
@@ -90,11 +90,11 @@
                     <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="3" Content="{x:Static p:Resources.textCity}" Margin="0,0,10,0" />
 
                     <TextBox VerticalAlignment="Center" Name="textBoxCompanyName" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyName}" MaxLength="100" />
+                    <TextBox VerticalAlignment="Center" Name="textBoxCompanyId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyId}" MaxLength="100" />
                     <TextBox VerticalAlignment="Center" Name="textBoxStreetNumber" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyStreetAndNumber}" MaxLength="100" />
+                    <TextBox VerticalAlignment="Center" Name="textBoxCity" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCity}" MaxLength="100" />
                     <TextBox VerticalAlignment="Center" Name="textBoxPostalCode" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="1" Margin="2" Text="{Binding ISMCompanyPostalCode}" MaxLength="24" />
                     <TextBox VerticalAlignment="Center" Name="textBoxCountry" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCountry}" MaxLength="100" />
-                    <TextBox VerticalAlignment="Center" Name="textBoxCompanyId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyId}" MaxLength="100" />
-                    <TextBox VerticalAlignment="Center" Name="textBoxCity" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCity}" MaxLength="100" />
 
                 </Grid>
             </GroupBox>
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index a7e259f6..265159b2 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -35,7 +35,7 @@
     <MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationRevision>3</ApplicationRevision>
     <ApplicationVersion>3.6.12.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
index 82867287..524d3280 100644
--- a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
+++ b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
@@ -307,6 +307,7 @@ namespace ENI2
                     if (closedDialog.Core.PoC.Equals("ZZNOK"))
                         closedDialog.Core.IsTransit = true;
 
+                    closedDialog.Core.Incoming = true;
                     closedDialog.Core.DefaultReportingPartyId = this.userEntity.Id;
                     DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(closedDialog.Core);
 
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index f0da644b..3d4d135d 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/HIS-NORD/Transmitter-Tool/client.log b/nsw/HIS-NORD/Transmitter-Tool/client.log
index a4d4beb6..2446525f 100644
--- a/nsw/HIS-NORD/Transmitter-Tool/client.log
+++ b/nsw/HIS-NORD/Transmitter-Tool/client.log
@@ -228,3 +228,19 @@
 17.06.2017  10:14:59  Client started
  -----------------------------
 17.06.2017  10:15:00  wrong Version of XML file
+ -----------------------------
+13.08.2017  09:39:02  Client started
+ -----------------------------
+13.08.2017  09:39:03  wrong Version of XML file
+13.08.2017  09:39:04  wrong Version of XML file
+13.08.2017  09:39:04  wrong Version of XML file
+13.08.2017  09:39:04  wrong Version of XML file
+13.08.2017  09:39:05  wrong Version of XML file
+13.08.2017  09:39:05  wrong Version of XML file
+13.08.2017  09:39:05  wrong Version of XML file
+13.08.2017  09:39:05  wrong Version of XML file
+13.08.2017  09:39:06  wrong Version of XML file
+13.08.2017  09:39:06  wrong Version of XML file
+13.08.2017  09:39:07  wrong Version of XML file
+13.08.2017  09:39:07  wrong Version of XML file
+13.08.2017  09:39:07  wrong Version of XML file
diff --git a/nsw/Source/bsmd.dbh/Request.cs b/nsw/Source/bsmd.dbh/Request.cs
index aa293cee..9ce69f04 100644
--- a/nsw/Source/bsmd.dbh/Request.cs
+++ b/nsw/Source/bsmd.dbh/Request.cs
@@ -831,7 +831,7 @@ namespace bsmd.dbh
                             choiceTypes2.Add(ItemsChoiceType2.ValidSanitaryControlExemptionOrCertificateOnBoard);
                             mdhItems.Add(mdh.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false ? RootSECValidISSCOnBoard.Y : RootSECValidISSCOnBoard.N);
 
-                            if (mdh.DateOfIssue.HasValue && !mdh.PlaceOfIssue.IsNullOrEmpty())
+                            if (mdh.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false)
                             {
                                 choiceTypes2.Add(ItemsChoiceType2.ValidSanitaryControlExemptionOrCertificate);
                                 RootMDHValidSanitaryControlExemptionOrCertificate cert = new RootMDHValidSanitaryControlExemptionOrCertificate();
diff --git a/nsw/Source/bsmd.hisnord/NSWResponse.cs b/nsw/Source/bsmd.hisnord/NSWResponse.cs
index bbb52da2..20571277 100644
--- a/nsw/Source/bsmd.hisnord/NSWResponse.cs
+++ b/nsw/Source/bsmd.hisnord/NSWResponse.cs
@@ -41,7 +41,27 @@ namespace bsmd.hisnord
             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";
-
+            XNamespace secNS = "http://api.national-single-window.de/sec";
+            XNamespace statNS = "http://api.national-single-window.de/stat";
+            XNamespace noa_nodNS = "http://api.national-single-window.de/noanod";
+            XNamespace ataNS = "http://api.national-single-window.de/ata";
+            XNamespace atdNS = "http://api.national-single-window.de/atd";
+            XNamespace pobaNS = "http://api.national-single-window.de/poba";
+            XNamespace pobdNS = "http://api.national-single-window.de/pobd";
+            XNamespace nameNS = "http://api.national-single-window.de/name";
+            XNamespace tiefaNS = "http://api.national-single-window.de/tiefa";
+            XNamespace tiefdNS = "http://api.national-single-window.de/tiefd";
+            XNamespace bkraNS = "http://api.national-single-window.de/bkra";
+            XNamespace bkrdNS = "http://api.national-single-window.de/bkrd";
+            XNamespace infoNS = "http://api.national-single-window.de/info";
+            XNamespace servNS = "http://api.national-single-window.de/serv";
+            XNamespace pre72hNS = "http://api.national-single-window.de/pre72h";
+            XNamespace wasNS = "http://api.national-single-window.de/was";
+            XNamespace crewNS = "http://api.national-single-window.de/crew";
+            XNamespace pasNS = "http://api.national-single-window.de/pas";
+            XNamespace bpolNS = "http://api.national-single-window.de/bpol";
+            XNamespace towaNS = "http://api.national-single-window.de/towa";
+            XNamespace towdNS = "http://api.national-single-window.de/towa";
 
             XName idName = "ConveyanceCode";
             var elem = xml.Descendants(idName);
@@ -91,6 +111,69 @@ namespace bsmd.hisnord
                     case Message.NotificationClass.AGNT:
                         lookupName = agntNS + "AGNTResponse";
                         break;
+                    case Message.NotificationClass.SEC:
+                        lookupName = secNS + "SECResponse";
+                        break;
+                    case Message.NotificationClass.STAT:
+                        lookupName = statNS + "STATResponse";
+                        break;
+                    case Message.NotificationClass.NOA_NOD:
+                        lookupName = noa_nodNS + "NOA_NODResponse";
+                        break;
+                    case Message.NotificationClass.ATA:
+                        lookupName = ataNS + "ATAResponse";
+                        break;
+                    case Message.NotificationClass.ATD:
+                        lookupName = atdNS + "ATDResponse";
+                        break;
+                    case Message.NotificationClass.POBA:
+                        lookupName = pobaNS + "POBAResponse";
+                        break;
+                    case Message.NotificationClass.POBD:
+                        lookupName = pobdNS + "POBDResponse";
+                        break;
+                    case Message.NotificationClass.NAME:
+                        lookupName = nameNS + "NAMEResponse";
+                        break;
+                    case Message.NotificationClass.TIEFA:
+                        lookupName = tiefaNS + "TIEFAResponse";
+                        break;
+                    case Message.NotificationClass.TIEFD:
+                        lookupName = tiefdNS + "TIEFDResponse";
+                        break;
+                    case Message.NotificationClass.BKRA:
+                        lookupName = bkraNS + "BKRAResponse";
+                        break;
+                    case Message.NotificationClass.BKRD:
+                        lookupName = bkrdNS + "BKRDResponse";
+                        break;
+                    case Message.NotificationClass.INFO:
+                        lookupName = infoNS + "INFOResponse";
+                        break;
+                    case Message.NotificationClass.SERV:
+                        lookupName = servNS + "SERVResponse";
+                        break;
+                    case Message.NotificationClass.PRE72H:
+                        lookupName = pre72hNS + "PRE72HResponse";
+                        break;
+                    case Message.NotificationClass.WAS:
+                        lookupName = wasNS + "WASResponse";
+                        break;
+                    case Message.NotificationClass.CREW:
+                        lookupName = crewNS + "CREWResponse";
+                        break;
+                    case Message.NotificationClass.PAS:
+                        lookupName = pasNS + "PASResponse";
+                        break;
+                    case Message.NotificationClass.BPOL:
+                        lookupName = bpolNS + "BPOLResponse";
+                        break;
+                    case Message.NotificationClass.TOWA:
+                        lookupName = towaNS + "TOWAResponse";
+                        break;
+                    case Message.NotificationClass.TOWD:
+                        lookupName = towdNS + "TOWDResponse";
+                        break;
                     default:
                         lookupName = "dontmatchmeplease";
                         break;
diff --git a/nsw/Source/bsmd.hisnord/Request.cs b/nsw/Source/bsmd.hisnord/Request.cs
index 3737f152..20c7e01b 100644
--- a/nsw/Source/bsmd.hisnord/Request.cs
+++ b/nsw/Source/bsmd.hisnord/Request.cs
@@ -22,6 +22,7 @@ namespace bsmd.hisnord
         private static ILog _log = LogManager.GetLogger(typeof(Request));
         private static Dictionary<Guid, ReportingParty> _reportingPartyDict = null;
         private static Dictionary<MessageCore, string> coreFilenameDict = new Dictionary<MessageCore, string>();
+        private static Dictionary<Message.NotificationClass, Message> noteMessageDict = new Dictionary<Message.NotificationClass, Message>();
 
         internal static Dictionary<Guid, ReportingParty> ReportingPartyDict
         {
@@ -73,11 +74,45 @@ namespace bsmd.hisnord
             }
         }
 
+        /// <summary>
+        /// Passende Nachricht (unter bestimmten Voraussetzungen) aus dem Sende-Dict holen (aber nur wenn sie wirklich
+        /// in die Nachricht serialisiert werden darf)
+        /// </summary>        
+        private static Message GetSendMessage(Message.NotificationClass notificationClass)
+        {
+            Message result = null;      
+
+            if (noteMessageDict.ContainsKey(notificationClass))
+            {
+                if (noteMessageDict[notificationClass].InternalStatus == Message.BSMDStatus.TOSEND)
+                {
+                    if (!XtraSendLogic.ShouldSendMessage(noteMessageDict[notificationClass]))
+                    {
+                        _log.DebugFormat("skipping {0}", noteMessageDict[notificationClass].MessageNotificationClassDisplay);
+                        noteMessageDict[notificationClass].InternalStatus = Message.BSMDStatus.SUSPENDED;
+                        DBManager.Instance.Save(noteMessageDict[notificationClass]);                        
+                    }
+                    else
+                    {
+                        _log.DebugFormat("preparing {0}", noteMessageDict[notificationClass].MessageNotificationClassDisplay);
+                        noteMessageDict[notificationClass].InternalStatus = Message.BSMDStatus.SENT;
+                        result = noteMessageDict[notificationClass];
+                    }
+                    DBManager.Instance.Save(noteMessageDict[notificationClass]);                  
+                }
+            }
+            return result;
+        }
+
         public static bool CreateSendFile(MessageCore core, List<Message> messages, bool useTest)
         {
             bool retval = true;
-            
-            messages.Sort();
+
+
+            // dieses Dict wird benötigt, da die Meldeklassen in der richtigen Reihenfolge hinzugefügt werden müssen
+            Request.noteMessageDict.Clear();            
+            foreach (Message message in messages)
+                noteMessageDict[message.MessageNotificationClass] = message;
 
             try
             {
@@ -92,16 +127,16 @@ namespace bsmd.hisnord
                 _nsw.conveyance.owner_sender = new broker_owner();
 
                 ReportingParty rp = null;
-                if(messages[0].MessageCore.DefaultReportingPartyId.HasValue && Request.ReportingPartyDict.ContainsKey(messages[0].MessageCore.DefaultReportingPartyId.Value))
-                    rp = Request.ReportingPartyDict[messages[0].MessageCore.DefaultReportingPartyId.Value];
+                if(core.DefaultReportingPartyId.HasValue && Request.ReportingPartyDict.ContainsKey(core.DefaultReportingPartyId.Value))
+                    rp = Request.ReportingPartyDict[core.DefaultReportingPartyId.Value];
                 if(rp == null)
                 {
-                    _log.ErrorFormat("Cannot find reporting party for core {0}", messages[0].MessageCore.Id);
+                    _log.ErrorFormat("Cannot find reporting party for core {0}", core.Id);
                     return false;
                 }
 
                 _nsw.conveyance.owner_sender.name_short = @"BSMD";
-                _nsw.conveyance.owner_sender.name_long = @"BSMD";// rp.Name; // messages[0].MessageCore.Customer.Name;
+                _nsw.conveyance.owner_sender.name_long = @"BSMD";// rp.Name; // core.Customer.Name;
 
                 _nsw.conveyance.owner_sender.address = new addresstype();
 
@@ -117,35 +152,35 @@ namespace bsmd.hisnord
                 _nsw.conveyance.owner_sender.contact.phone = rp.Phone;
                 _nsw.conveyance.owner_sender.contact.fax = rp.Fax;
 
-                _nsw.document_reference = messages[0].MessageCore.Id.Value.ToString();
+                _nsw.document_reference = core.Id.Value.ToString();
 
-                if (!messages[0].MessageCore.VisitId.IsNullOrEmpty())
+                if (!core.VisitId.IsNullOrEmpty())
                 {
                     _nsw.conveyance.Items = new string[1];
                     _nsw.conveyance.ItemsElementName = new ItemsChoiceType[1];
-                    _nsw.conveyance.Items[0] = messages[0].MessageCore.VisitId;
+                    _nsw.conveyance.Items[0] = core.VisitId;
                     _nsw.conveyance.ItemsElementName[0] = ItemsChoiceType.VisitId;
                 }
-                else if (!messages[0].MessageCore.TransitId.IsNullOrEmpty())
+                else if (!core.TransitId.IsNullOrEmpty())
                 {
                     _nsw.conveyance.Items = new string[1];
                     _nsw.conveyance.ItemsElementName = new ItemsChoiceType[1];
-                    _nsw.conveyance.Items[0] = messages[0].MessageCore.TransitId;
+                    _nsw.conveyance.Items[0] = core.TransitId;
                     _nsw.conveyance.ItemsElementName[0] = ItemsChoiceType.TransitId;
                 }
                 else // liegt noch nichts vor, Id muss beantragt werden
                 {
                     _nsw.conveyance.Items = new object[5];
                     _nsw.conveyance.ItemsElementName = new ItemsChoiceType[5];
-                    _nsw.conveyance.Items[0] = messages[0].MessageCore.Shipname;
+                    _nsw.conveyance.Items[0] = core.Shipname;
                     _nsw.conveyance.ItemsElementName[0] = ItemsChoiceType.name;
-                    _nsw.conveyance.Items[1] = messages[0].MessageCore.Id.ToString();
+                    _nsw.conveyance.Items[1] = core.Id.ToString();
                     _nsw.conveyance.ItemsElementName[1] = ItemsChoiceType.code;
-                    _nsw.conveyance.Items[2] = messages[0].MessageCore.IMO.IsNullOrEmpty() ? messages[0].MessageCore.ENI : messages[0].MessageCore.IMO;
-                    _nsw.conveyance.ItemsElementName[2] = messages[0].MessageCore.IMO.IsNullOrEmpty() ? ItemsChoiceType.ENINumber : ItemsChoiceType.IMONumber;
-                    _nsw.conveyance.Items[3] = messages[0].MessageCore.PoC;
+                    _nsw.conveyance.Items[2] = core.IMO.IsNullOrEmpty() ? core.ENI : core.IMO;
+                    _nsw.conveyance.ItemsElementName[2] = core.IMO.IsNullOrEmpty() ? ItemsChoiceType.ENINumber : ItemsChoiceType.IMONumber;
+                    _nsw.conveyance.Items[3] = core.PoC;
                     _nsw.conveyance.ItemsElementName[3] = ItemsChoiceType.PortOfCall;
-                    _nsw.conveyance.Items[4] = messages[0].MessageCore.IsTransit ? messages[0].MessageCore.ETAKielCanal : messages[0].MessageCore.ETA; // TODO Datum konvertieren?
+                    _nsw.conveyance.Items[4] = core.IsTransit ? core.ETAKielCanal : core.ETA; // TODO Datum konvertieren?
                     _nsw.conveyance.ItemsElementName[4] = ItemsChoiceType.ETAPortOfCall;
                 }
 
@@ -157,10 +192,9 @@ namespace bsmd.hisnord
 
                 // wir wissen noch nicht wieviele es werden, von daher erstmal eine Liste!
                 List<Items1ChoiceType> items1ChoiceType = new List<Items1ChoiceType>();
-                List<object> items1 = new List<object>();
+                List<object> items1 = new List<object>();                
 
-
-                if (messages[0].MessageCore.Cancelled ?? false)
+                if (core.Cancelled ?? false)
                 {
                     // nur das "STORNO" Element hinzufügen
                     items1ChoiceType.Add(Items1ChoiceType.STORNO);
@@ -170,1266 +204,1339 @@ namespace bsmd.hisnord
                 else
                 {
 
-                    foreach (Message message in messages)
+                    Message message = null;
+
+                    if(!core.IsTransit)
                     {
+                        message = GetSendMessage(Message.NotificationClass.VISIT);
+                        if (message != null)
 
-                        if (!XtraSendLogic.ShouldSendMessage(message)) continue;
+                            visitTransitHeader = message;
+                    }
+                    else
+                    {
+                        message = GetSendMessage(Message.NotificationClass.TRANSIT);
+                        if (message != null)
 
-                        switch (message.MessageNotificationClass)
+                            visitTransitHeader = message;
+                    }
+
+                    #region STAT
+                    message = GetSendMessage(Message.NotificationClass.STAT);
+                    if (message != null)
+                    {
+                        if (message.Reset)
                         {
-                            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)
-                                {
-                                    items1ChoiceType.Add(Items1ChoiceType.RESET_AGNT);
-                                    items1.Add(ytype.Y);
-                                }
-                                else
-                                {
-                                    if (message.Elements.Count > 0)
-                                    {
-                                        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);
-                                    }
-                                }
-                                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)
-                                    {
-                                        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++)
-                                        {
-                                            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);
-                                    }
-                                }
-                                break;
-                            case Message.NotificationClass.BKRD:
-                                if (message.Reset)
-                                {
-                                    items1ChoiceType.Add(Items1ChoiceType.RESET_BKRD);
-                                    items1.Add(ytype.Y);
-                                }
-                                else
-                                {
-                                    if (message.Elements.Count > 0)
-                                    {
-                                        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);
-                                    }
-                                }
-                                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)
-                                    {
-                                        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())
-                                        {
-                                            hn_bpol.PortOfItinerary = new portofitinery[bpol.PortOfItineraries.Count];
-                                            for (int i = 0; i < bpol.PortOfItineraries.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;
-                                            }
-                                        }
-
-                                        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)
-                                    {
-                                        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);
-                                    }
-                                }
-                                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)
-                                            {
-                                                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++)
-                                                {
-                                                    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);
-                                                }
-                                            }
-
-                                            portofcalls pocs = new portofcalls();
-                                            pocs.PortOfCallLast30Days = new portofcallmdh[mdh.PortOfCallLast30Days.Count];
-
-                                            for (int j = 0; j < mdh.PortOfCallLast30Days.Count; j++)
-                                            {
-                                                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;
-                                                    }
-                                                }
-                                            }
-
-                                            mdh_items.Add(pocs);
-                                            mdh_types.Add(ItemsChoiceType5.PortsOfCallLast30Days);
-                                        }
-
-                                        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())
-                                                {
-                                                    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);
-                                        }
-                                        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);
-                                            }
-
-                                            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
-
+                            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);
+                            }
                         }
                     }
+                    #endregion
+
+                    #region NOA_NOD
+                    message = GetSendMessage(Message.NotificationClass.NOA_NOD);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region ATA/ATD
+
+                    message = GetSendMessage(Message.NotificationClass.ATA);
+
+                    if (message != null)
+                    {
+                        if (message.Reset)
+                        {
+                            items1ChoiceType.Add(Items1ChoiceType.RESET_ATA);
+                            items1.Add(ytype.Y);
+                        }
+                        else
+                        {
+                            if (message.Elements.Count > 0)
+                            {
+                                ATA ata = message.Elements[0] as ATA;
+                                items1ChoiceType.Add(Items1ChoiceType.ATA);
+                                items1.Add(ata.ATAPortOfCall);
+                            }
+                        }
+                    }
+
+                    message = GetSendMessage(Message.NotificationClass.ATD);
+
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+
+                    #endregion                    
+
+                    #region POBA
+                    message = GetSendMessage(Message.NotificationClass.POBA);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region POBD
+                    message = GetSendMessage(Message.NotificationClass.POBD);
+                    if (message != null)
+                    {
+                        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.POBD);
+                                items1.Add(hn_pobd);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region NAME
+                    message = GetSendMessage(Message.NotificationClass.NAME);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region TIEFA
+                    message = GetSendMessage(Message.NotificationClass.TIEFA);
+                    if (message != null)
+                    {
+                        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);
+                                }
+                            }
+                        }
+                    }
+
+                    message = GetSendMessage(Message.NotificationClass.TIEFD);
+                    if (message != null)
+                    {
+                        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);
+                                }
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region INFO
+                    message = GetSendMessage(Message.NotificationClass.INFO);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region BKRA/BKRD
+
+                    message = GetSendMessage(Message.NotificationClass.BKRA);
+
+                    if (message != null) {
+                        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++)
+                                {
+                                    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);
+                            }
+                        }
+
+                    }
+
+                    message = GetSendMessage(Message.NotificationClass.BKRD);
+                    if (message != null) {
+                        if (message.Reset)
+                        {
+                            items1ChoiceType.Add(Items1ChoiceType.RESET_BKRD);
+                            items1.Add(ytype.Y);
+                        }
+                        else
+                        {
+                            if (message.Elements.Count > 0)
+                            {
+                                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);
+                            }
+                        }
+                    }
+
+                    #endregion
+
+                    #region HAZ
+
+                    message = GetSendMessage(Message.NotificationClass.HAZA);
+                    if (message != null)
+                    {
+                        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)
+                                    {
+                                        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);
+                            }
+                        }
+                    }
+
+                    message = GetSendMessage(Message.NotificationClass.HAZD);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region LADG
+                    message = GetSendMessage(Message.NotificationClass.LADG);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region SERV
+                    message = GetSendMessage(Message.NotificationClass.SERV);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+                    #endregion                                        
+
+                    #region PRE72H
+                    message = GetSendMessage(Message.NotificationClass.PRE72H);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region SEC
+                    message = GetSendMessage(Message.NotificationClass.SEC);
+                    if (message != null)
+                    {
+                        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.CSOLastName);
+                                    secItems.Add(sec.CSOLastName);
+                                    secItemNames.Add(ItemsChoiceType4.CSOFirstName);
+                                    secItems.Add(sec.CSOFirstName);                                    
+                                    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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region MDH
+                    message = GetSendMessage(Message.NotificationClass.MDH);
+                    if (message != null)
+                    {
+                        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);
+
+                                    if (mdh.NonAccidentalDeathsDuringVoyage ?? false)
+                                    {
+                                        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);
+
+                                    if (mdh.NumberOfIllPersonsHigherThanExpected ?? false)
+                                    {
+                                        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++)
+                                        {
+                                            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;
+                                        certificate.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);
+                                        }
+                                    }
+
+                                    portofcalls pocs = new portofcalls();
+                                    pocs.PortOfCallLast30Days = new portofcallmdh[mdh.PortOfCallLast30Days.Count];
+
+                                    for (int j = 0; j < mdh.PortOfCallLast30Days.Count; j++)
+                                    {
+                                        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;
+                                            }
+                                        }
+                                    }
+
+                                    mdh_items.Add(pocs);
+                                    mdh_types.Add(ItemsChoiceType5.PortsOfCallLast30Days);
+                                }
+
+                                hn_mdh.Items = mdh_items.ToArray();
+                                hn_mdh.ItemsElementName = mdh_types.ToArray();
+
+                                items1.Add(hn_mdh);
+                                items1ChoiceType.Add(Items1ChoiceType.MDH);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region WAS
+                    message = GetSendMessage(Message.NotificationClass.WAS);
+                    if (message != null)
+                    {
+                        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);
+                                }
+                                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);
+                                    }
+
+                                    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();
+                                }
+                            }
+                        }
+                    }
+
+                    #endregion
+
+                    #region BPOL
+                    message = GetSendMessage(Message.NotificationClass.BPOL);
+                    if (message != null)
+                    {
+                        if (message.Reset)
+                        {
+                            items1ChoiceType.Add(Items1ChoiceType.RESET_BPOL);
+                            items1.Add(ytype.Y);
+                        }
+                        else
+                        {
+                            if (message.Elements.Count > 0)
+                            {
+                                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())
+                                {
+                                    hn_bpol.PortOfItinerary = new portofitinery[bpol.PortOfItineraries.Count];
+                                    for (int i = 0; i < bpol.PortOfItineraries.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;
+                                    }
+                                }
+
+                                items1ChoiceType.Add(Items1ChoiceType.BPOL);
+                                items1.Add(hn_bpol);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region PAS
+                    message = GetSendMessage(Message.NotificationClass.PAS);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region CREW
+                    message = GetSendMessage(Message.NotificationClass.CREW);
+                    if (message != null) {
+                        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++)
+                                {
+                                    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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region TOWA/TOWD
+                    message = GetSendMessage(Message.NotificationClass.TOWA);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+
+                    message = GetSendMessage(Message.NotificationClass.TOWD);
+                    if (message != null)
+                    {
+                        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);
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region AGNT
+
+                    message = GetSendMessage(Message.NotificationClass.AGNT);
+
+                    if (message != null)
+                    {
+                        if (message.Reset)
+                        {
+                            items1ChoiceType.Add(Items1ChoiceType.RESET_AGNT);
+                            items1.Add(ytype.Y);
+                        }
+                        else
+                        {
+                            if (message.Elements.Count > 0)
+                            {
+                                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);
+                            }
+                        }
+                    }
+
+                    #endregion
+
                 }
 
+                _nsw.conveyance.Items1 = items1.ToArray();
+                _nsw.conveyance.Items1ElementName = items1ChoiceType.ToArray();
+
                 #endregion
 
                 #region serialize and save message
 
-                string filename = string.Format("BSMD_{0}-{1}.xml", DateTime.Now.ToString("yyyyMMddHHmmss"), messages[0].MessageCore.Id.Value);
+                string filename = string.Format("BSMD_{0}-{1}.xml", DateTime.Now.ToString("yyyyMMddHHmmss"), core.Id.Value);
                 _log.InfoFormat("saving {0} to output directory", filename);
                 
                 string filePath = Path.Combine(Properties.Settings.Default.OutputDir, filename);
@@ -1445,7 +1552,7 @@ namespace bsmd.hisnord
             }
             catch (Exception ex)
             {
-                _log.ErrorFormat("Error sending message via hisnord: {0}", ex.Message);
+                _log.ErrorFormat("Error sending message via hisnord: {0}", ex);
                 retval = false;
             }