From b8c99f2ec65a941c386bd90a67edce46a71010e1 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 4 Oct 2017 17:53:44 +0000
Subject: [PATCH] =?UTF-8?q?3.7.3=20Zwischenstand=20-=20einiges=20an=20?=
 =?UTF-8?q?=C3=84nderungen=20durch=20Korrekturen=20f=C3=BCr=20Christin=20/?=
 =?UTF-8?q?=20Schnittstelle=20/=20Excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ENI2/Controls/ConditionGroupControl.xaml  |   7 +
 .../Controls/ValidationConditionControl.xaml  |  16 +-
 .../ValidationConditionControl.xaml.cs        |  22 ++-
 ENI-2/ENI2/ENI2/DetailBaseControl.cs          |  14 +-
 ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs     |  51 ++++++-
 .../ArrivalNotificationDetailControl.xaml.cs  |   7 +-
 .../BorderPoliceDetailControl.xaml.cs         |  26 +++-
 .../DangerousGoodsDetailControl.xaml          |   2 +-
 .../DangerousGoodsDetailControl.xaml.cs       |  10 ++
 ...DepartureNotificationDetailControl.xaml.cs |   6 +
 ...aritimeHealthDeclarationDetailControl.xaml |  21 ++-
 ...timeHealthDeclarationDetailControl.xaml.cs |  28 +++-
 .../OverViewDetailControl.xaml.cs             |  15 +-
 .../PortCallDetailControl.xaml.cs             |  11 +-
 .../PortNotificationDetailControl.xaml.cs     |  20 ++-
 .../SecurityDetailControl.xaml                |   4 +-
 .../SecurityDetailControl.xaml.cs             |  10 ++
 .../ShipDataDetailControl.xaml                |  24 +--
 .../TowageDetailControl.xaml                  |   1 -
 .../TowageDetailControl.xaml.cs               |  34 ++++-
 .../WasteDetailControl.xaml                   |   2 +-
 .../WasteDetailControl.xaml.cs                |   5 +
 ENI-2/ENI2/ENI2/ENI2.csproj                   |   2 +-
 .../ENI2/EditControls/NewWithIdDialog.xaml    |   6 +-
 .../ENI2/EditControls/NewWithIdDialog.xaml.cs |  15 ++
 .../ENI2/EditControls/SystemErrorDialog.xaml  |  19 ++-
 .../ENI2/ENI2/EditControls/VisitIdDialog.xaml |   5 +-
 .../ENI2/EditControls/VisitIdDialog.xaml.cs   |  17 +++
 ENI-2/ENI2/ENI2/MainWindow.xaml.cs            |   7 +-
 .../ENI2/Properties/Resources.Designer.cs     |  18 +++
 ENI-2/ENI2/ENI2/Properties/Resources.resx     |   6 +
 Stundensheet.xlsx                             | Bin 34564 -> 34629 bytes
 .../SendNSWMessageService/NSWSendService.cs   |  11 +-
 .../bsmd.ExcelReadService/ExcelReader.cs      |   4 +-
 nsw/Source/bsmd.ExcelReadService/Util.cs      |  29 ++--
 nsw/Source/bsmd.dakosy/Request.cs             | 128 ++++++++--------
 nsw/Source/bsmd.database/BKRA.cs              |   2 +-
 nsw/Source/bsmd.database/BPOL.cs              |   4 +-
 nsw/Source/bsmd.database/BRKD.cs              |   2 +-
 nsw/Source/bsmd.database/CREW.cs              |   2 +-
 nsw/Source/bsmd.database/CallPurpose.cs       |   2 +-
 nsw/Source/bsmd.database/DBManager.cs         |  19 +++
 nsw/Source/bsmd.database/DatabaseEntity.cs    |  31 +++-
 nsw/Source/bsmd.database/HAZ.cs               |  20 +--
 nsw/Source/bsmd.database/InfectedArea.cs      |   2 +-
 nsw/Source/bsmd.database/LADG.cs              |   3 +-
 .../LastTenPortFacilitiesCalled.cs            |   4 +-
 nsw/Source/bsmd.database/MDH.cs               |  19 +--
 nsw/Source/bsmd.database/NOA_NOD.cs           |   4 +-
 nsw/Source/bsmd.database/PAS.cs               |   2 +-
 .../bsmd.database/PortOfCallLast30Days.cs     |   2 +-
 .../PortOfCallLast30DaysCrewJoinedShip.cs     |   2 +-
 nsw/Source/bsmd.database/PortOfItinerary.cs   |   2 +-
 .../Properties/AssemblyProductInfo.cs         |   2 +-
 .../Properties/AssemblyProjectInfo.cs         |   2 +-
 nsw/Source/bsmd.database/SEC.cs               |   9 +-
 nsw/Source/bsmd.database/SERV.cs              |   4 +-
 nsw/Source/bsmd.database/STO.cs               |   2 +-
 .../bsmd.database/SanitaryMeasuresDetail.cs   |   2 +-
 ...vitiesDuringLastTenPortFacilitiesCalled.cs |   2 +-
 .../bsmd.database/StowawaysJoiningLocation.cs |   2 +-
 nsw/Source/bsmd.database/SubsidiaryRisks.cs   |   2 +-
 nsw/Source/bsmd.database/TOWA.cs              |   2 +-
 nsw/Source/bsmd.database/TOWD.cs              |   2 +-
 .../bsmd.database/ValidationCondition.cs      |  12 +-
 nsw/Source/bsmd.database/WAS.cs               |   5 +-
 nsw/Source/bsmd.database/Waste.cs             |   4 +-
 nsw/Source/bsmd.dbh/Request.cs                | 101 +++++++------
 nsw/Source/bsmd.hisnord/NSWResponse.cs        | 143 +++++++++---------
 .../Properties/Settings.Designer.cs           |  26 +++-
 .../bsmd.hisnord/Properties/Settings.settings |   8 +-
 nsw/Source/bsmd.hisnord/Request.cs            |  71 +++++----
 nsw/Source/bsmd.hisnord/Response.cs           |  21 ++-
 nsw/Source/bsmd.hisnord/app.config            |   8 +-
 nsw/Source/bsmd.hisnord/transmitter.cs        |  12 +-
 75 files changed, 774 insertions(+), 393 deletions(-)

diff --git a/ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml b/ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml
index 9c57870e..546da35e 100644
--- a/ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml
+++ b/ENI-2/ENI2/ENI2/Controls/ConditionGroupControl.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:ENI2.Controls"
+             xmlns:p="clr-namespace:ENI2.Properties"
              xmlns:db="clr-namespace:bsmd.database;assembly=bsmd.database"
              xmlns:util="clr-namespace:ENI2.Util"
              mc:Ignorable="d" 
@@ -15,9 +16,15 @@
             <RowDefinition Height="32" />
             <RowDefinition Height="32" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.3*" />
+            <ColumnDefinition Width="0.7*" />
+        </Grid.ColumnDefinitions>
         <RadioButton Grid.Row="0" Name="radioButtonOR" VerticalContentAlignment="Center" Content="OR" Margin="2" IsChecked="{Binding GroupOperator, Converter={util:EnumToBooleanConverter}, ConverterParameter={x:Static db:ConditionGroup+GroupOperatorEnum.OR}}"/>
         <RadioButton Grid.Row="1" Name="radioButtonAND" VerticalContentAlignment="Center" Content="AND" Margin="2" IsChecked="{Binding GroupOperator, Converter={util:EnumToBooleanConverter}, ConverterParameter={x:Static db:ConditionGroup+GroupOperatorEnum.AND}}"/>
         <RadioButton Grid.Row="2" Name="radioButtonNOT" VerticalContentAlignment="Center" Content="NOT" Margin="2" IsChecked="{Binding GroupOperator, Converter={util:EnumToBooleanConverter}, ConverterParameter={x:Static db:ConditionGroup+GroupOperatorEnum.NOT}}"/>
         <RadioButton Grid.Row="3" Name="radioButtonXOR" VerticalContentAlignment="Center" Content="XOR" Margin="2" IsChecked="{Binding GroupOperator, Converter={util:EnumToBooleanConverter}, ConverterParameter={x:Static db:ConditionGroup+GroupOperatorEnum.XOR}}"/>
+        <Label Grid.Row="0" Grid.Column="1" Content="{x:Static p:Resources.textFailureMessage}" VerticalContentAlignment="Center" />
+        <TextBox Name="textBoxFailureMessage" Grid.Row="1" Grid.Column="1" Grid.RowSpan="3" Margin="2" Text="{Binding ErrorMessage}"/>
     </Grid>
 </UserControl>
diff --git a/ENI-2/ENI2/ENI2/Controls/ValidationConditionControl.xaml b/ENI-2/ENI2/ENI2/Controls/ValidationConditionControl.xaml
index d87fea8b..56669c63 100644
--- a/ENI-2/ENI2/ENI2/Controls/ValidationConditionControl.xaml
+++ b/ENI-2/ENI2/ENI2/Controls/ValidationConditionControl.xaml
@@ -11,9 +11,8 @@
              d:DesignHeight="150" d:DesignWidth="300">
     <Grid Name="gridContent">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.5*" />
-            <ColumnDefinition Width="0.25*" />
             <ColumnDefinition Width="0.25*" />
+            <ColumnDefinition Width="0.75*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="32" />
@@ -22,13 +21,10 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textFieldName}" VerticalContentAlignment="Center"/>
-        <Label Grid.Row="0" Grid.Column="1" Content="{x:Static p:Resources.textOperator}" VerticalContentAlignment="Center"/>
-        <Label Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textValue}" VerticalContentAlignment="Center"/>
-        <ComboBox Name="comboBoxFieldName" Grid.Row="1" Grid.Column="0" Margin="2" SelectedValuePath="FullName" SelectedValue="{Binding FieldName}" />
-        <ComboBox Name="comboBoxOperator" Grid.Row="1" Grid.Column="1" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" SelectedValue="{Binding ConditionOperator}"/>
-        <TextBox Name="textBoxValue" Grid.Row="1" Grid.Column="2" Margin="2" Text="{Binding Value}" VerticalContentAlignment="Center" />
-        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textFailureMessage}" VerticalContentAlignment="Center" />
-        <TextBox Name="textBoxFailureMessage" Grid.Row="2" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="2" Margin="2" Text="{Binding ErrorMessage}"/>
-
+        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textOperator}" VerticalContentAlignment="Center"/>
+        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textValue}" VerticalContentAlignment="Center"/>
+        <ComboBox Name="comboBoxFieldName" Grid.Row="0" Grid.Column="1" Margin="2" SelectedValuePath="FullName" SelectedValue="{Binding FieldName}" />
+        <ComboBox Name="comboBoxOperator" Grid.Row="1" Grid.Column="1" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" SelectedValue="{Binding ConditionOperator}" SelectionChanged="comboBoxOperator_SelectionChanged" />
+        <TextBox Name="textBoxValue" Grid.Row="2" Grid.Column="2" Margin="2" Text="{Binding Value}" VerticalContentAlignment="Center" />
     </Grid>
 </UserControl>
diff --git a/ENI-2/ENI2/ENI2/Controls/ValidationConditionControl.xaml.cs b/ENI-2/ENI2/ENI2/Controls/ValidationConditionControl.xaml.cs
index 69245bca..2a06f849 100644
--- a/ENI-2/ENI2/ENI2/Controls/ValidationConditionControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/Controls/ValidationConditionControl.xaml.cs
@@ -2,20 +2,8 @@
 // Description: Plugin Control für eine Validierungsbedingung
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 using bsmd.database;
 
@@ -46,5 +34,15 @@ namespace ENI2.Controls
             set { this.gridContent.DataContext = value; this._validationCondition = value; }
         }
 
+        private void comboBoxOperator_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ValidationCondition.ConditionOperatorEnum selectedVal = (ValidationCondition.ConditionOperatorEnum)this.comboBoxOperator.SelectedValue;
+            bool isUnary = false;
+            if ((selectedVal == ValidationCondition.ConditionOperatorEnum.NOT_NULL) ||
+                (selectedVal == ValidationCondition.ConditionOperatorEnum.NULL))
+                isUnary = true;
+            this.textBoxValue.IsEnabled = !isUnary;
+            if (isUnary) this.textBoxValue.Clear();
+        }
     }
 }
diff --git a/ENI-2/ENI2/ENI2/DetailBaseControl.cs b/ENI-2/ENI2/ENI2/DetailBaseControl.cs
index d1ac9dc1..9a0485cc 100644
--- a/ENI-2/ENI2/ENI2/DetailBaseControl.cs
+++ b/ENI-2/ENI2/ENI2/DetailBaseControl.cs
@@ -66,6 +66,11 @@ namespace ENI2
         /// </summary>
         public event Action RequestValidate;
 
+        /// <summary>
+        /// Damit kann signalisiert werden, dass die Anmeldung readonly wird (z.B. bei Storno)
+        /// </summary>
+        public event Action RequestDisable;
+
         /// <summary>
         /// Eine in der Detailansicht enthaltene Meldeklasse hat sich geändert
         /// </summary>
@@ -94,9 +99,7 @@ namespace ENI2
         /// <summary>
         /// particular messages that are edited on this page
         /// </summary>
-        public List<Message> ControlMessages { get { return this._controlMessages; } }
-
-        public Guid UserId { get; set; } // TODO: Ersetzen mit der User-Entity
+        public List<Message> ControlMessages { get { return this._controlMessages; } }        
 
         public bool LockedByOtherUser { get; set; }
 
@@ -143,6 +146,11 @@ namespace ENI2
             this.RequestValidate?.Invoke();
         }
 
+        protected virtual void OnRequestDisable()
+        {
+            this.RequestDisable?.Invoke();
+        }
+
         protected virtual void OnControlCacheReset(string messageGroupName)
         {
             this.ResetControlCache?.Invoke(messageGroupName);
diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
index 631b2753..7a63b4d3 100644
--- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
@@ -134,12 +134,13 @@ namespace ENI2
                     detailControl.NotificationClassChanged += DetailControl_NotificationClassChanged;
                     detailControl.ResetControlCache += DetailControl_ResetControlCache;
                     detailControl.RequestValidate += DetailControl_RequestValidate;
+                    detailControl.RequestDisable += DetailControl_RequestDisable;
 
                     detailControl.Initialize();
                     detailControl.IsEnabled = !this.LockedByOtherUser;
 
                     if (!detailControl.IsEnabled && (detailControl is OverViewDetailControl) && !(_core.Cancelled ?? false))
-                        ((OverViewDetailControl)detailControl).ShowLockedBy(this.LockedBy);
+                        ((OverViewDetailControl)detailControl).ShowLockedBy(this.LockedBy);                    
 
                     controlCache.Add(mg.MessageGroupName, detailControl);
                     this.buttonSave.Visibility = Visibility.Hidden;
@@ -165,7 +166,19 @@ namespace ENI2
 
                 detailView.Children.Add(controlCache[mg.MessageGroupName]);
             }
-        }        
+        }
+
+        private void DetailControl_RequestDisable()
+        {
+            this.LockedByOtherUser = true; // fake flag
+
+            // clear existing controls            
+            this.detailView.Children.Clear();
+            this.controlCache.Clear();
+
+            // return to "new" overview
+            Dispatcher.BeginInvoke((Action)(() => this.listBoxMessages_SelectionChanged(this, null)));
+        }
 
         private void DetailControl_ResetControlCache(string messageGroupName)
         {
@@ -206,8 +219,10 @@ namespace ENI2
                     ((message.InternalStatus == Message.BSMDStatus.CONFIRMED) || (message.InternalStatus == Message.BSMDStatus.VIOLATION)))
                     message.InternalStatus = Message.BSMDStatus.UPDATED;
                 string userName = "?";
-                if (this.LockedBy != null)
-                    userName = this.LockedBy.Logon;                
+                if(App.UserId.HasValue && DBManager.Instance.GetReportingPartyDict().ContainsKey(App.UserId.Value))
+                {
+                    userName = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].Logon;
+                }                
                 message.ChangedBy = string.Format("{0} at {1}", userName, DateTime.Now);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(message);
                 message.SaveElements();
@@ -319,16 +334,40 @@ namespace ENI2
                 this._vViolations.AddRange(violations);
             }
 
-
             foreach (MessageError me in this._vErrors)
             {
                 this.highlightService.HighlightError(me, this.GetContainerForMessageGroupName(me.MessageGroupName));
             }
             foreach (MessageViolation mv in this._vViolations)
             {
-
                 this.highlightService.HighlightViolation(mv, this.GetContainerForMessageGroupName(mv.MessageGroupName));
             }
+
+            // "neue" regelbasierte Validierung: Hier werden die einzelnen Regeln geprüft.
+            List<bsmd.database.ValidationRule> validationRules = DBManager.Instance.GetValidationRules();
+            foreach (bsmd.database.ValidationRule validationRule in validationRules) {
+                if (!validationRule.IsActive ?? false) continue;
+                // Regel auspacken
+                ConditionGroup cg = ValidationCondition.LoadFromString(validationRule.Rule);
+
+
+                // außer der Nachricht müssten noch die "gescheiterten" Felder zurückgeliefert werden, damit ein Highlighting stattfinden kann!
+
+                List<ValidationField> failedFieldList = new List<ValidationField>();
+
+                string resultMessage = string.Empty;
+                if (cg != null) {
+                    if (ValidationCondition.CheckConditions(this.Core, this._messages, cg, failedFieldList, out resultMessage) ?? false)
+                    {
+                        // Regel hat zugeschlagen -> reporting
+                        Trace.WriteLine(string.Format("Rule {0} resulted in {1}", validationRule.Name, resultMessage));
+                    } else
+                    {
+                        Trace.WriteLine(string.Format("Rule {0} passed", validationRule.Name));
+                    }
+                }
+            }
+
         }
 
         #endregion
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs
index 7042f662..f99f88a4 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs
@@ -143,6 +143,7 @@ namespace ENI2.DetailViewControls
         private void DataGridBKRA_CreateRequested()
         {
             BRKA brka = new BRKA();
+            brka.Identifier = BRKA.GetNewIdentifier(this._bkraMessage.Elements);
             EditBKRDialog ebd = new EditBKRDialog();
             ebd.BRKA = brka;
             ebd.IsDeparture = false;
@@ -154,6 +155,7 @@ namespace ENI2.DetailViewControls
                 ebd.BRKA.MessageHeader = _bkraMessage;
                 this.dataGridBKRA.Items.Refresh();
                 ebd.BRKA = new BRKA();
+                ebd.BRKA.Identifier = BRKA.GetNewIdentifier(this._bkraMessage.Elements);
                 this.SublistElementChanged(Message.NotificationClass.BKRA);
             };
 
@@ -173,7 +175,9 @@ namespace ENI2.DetailViewControls
             {
                 // are you sure dialog is in base class
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(brka);
-                this._bkraMessage.Elements.Remove(brka);                
+                this._bkraMessage.Elements.Remove(brka);
+                DatabaseEntity.ResetIdentifiers(this._bkraMessage.Elements);
+                this.SublistElementChanged(Message.NotificationClass.BKRA);
                 this.dataGridBKRA.Items.Refresh();
             }
         }
@@ -193,6 +197,7 @@ namespace ENI2.DetailViewControls
                     _bkraMessage.Elements.Add(eld.BRKA);
                     this.dataGridBKRA.Items.Refresh();
                     eld.BRKA = new BRKA();
+                    eld.BRKA.Identifier = BRKA.GetNewIdentifier(this._bkraMessage.Elements);
                     eld.BRKA.MessageHeader = _bkraMessage;
                     this.SublistElementChanged(Message.NotificationClass.BKRA);
                 };
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
index e07efd70..6f1f4d94 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
@@ -155,6 +155,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _bpol.PortOfItineraries.Remove(poi);
                 DBManager.Instance.Delete(poi);
+                DatabaseEntity.ResetIdentifiers(_bpol.PortOfItineraries);
+                this.SublistElementChanged(Message.NotificationClass.BPOL);
                 this.dataGridPortOfItinerary.Items.Refresh();
             }
         }
@@ -197,6 +199,7 @@ namespace ENI2.DetailViewControls
         private void DataGridPassengerList_CreateRequested()
         {
             PAS pas = new PAS();
+            pas.Identifier = PAS.GetNewIdentifier(_pasMessage.Elements);
             EditPASDialog epd = new EditPASDialog();
             epd.PAS = pas;
 
@@ -207,6 +210,7 @@ namespace ENI2.DetailViewControls
                 this._pasMessage.Elements.Add(epd.PAS);
                 this.dataGridPassengerList.Items.Refresh();
                 epd.PAS = new PAS();
+                epd.PAS.Identifier = PAS.GetNewIdentifier(_pasMessage.Elements);
                 this.SublistElementChanged(Message.NotificationClass.PAS);
             };
 
@@ -227,6 +231,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _pasMessage.Elements.Remove(pas);
                 DBManager.Instance.Delete(pas);
+                DatabaseEntity.ResetIdentifiers(_pasMessage.Elements);
+                this.SublistElementChanged(Message.NotificationClass.PAS);
                 this.dataGridPassengerList.Items.Refresh();
             }
         }
@@ -245,6 +251,7 @@ namespace ENI2.DetailViewControls
                     _pasMessage.Elements.Add(epd.PAS);
                     this.dataGridPassengerList.Items.Refresh();
                     epd.PAS = new PAS();
+                    epd.PAS.Identifier = PAS.GetNewIdentifier(_pasMessage.Elements);
                     epd.PAS.MessageHeader = _pasMessage;
                     this.SublistElementChanged(Message.NotificationClass.PAS);
                 };
@@ -269,6 +276,7 @@ namespace ENI2.DetailViewControls
         private void DataGridCrewList_CreateRequested()
         {
             CREW crew = new CREW();
+            crew.Identifier = CREW.GetNewIdentifier(_crewMessage.Elements);
             EditCREWDialog ecd = new EditCREWDialog();
             ecd.CREW = crew;
 
@@ -279,6 +287,7 @@ namespace ENI2.DetailViewControls
                 this._crewMessage.Elements.Add(ecd.CREW);
                 this.dataGridCrewList.Items.Refresh();
                 ecd.CREW = new CREW();
+                ecd.CREW.Identifier = CREW.GetNewIdentifier(_crewMessage.Elements);
                 this.SublistElementChanged(Message.NotificationClass.CREW);
             };
 
@@ -299,6 +308,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _crewMessage.Elements.Remove(crew);
                 DBManager.Instance.Delete(crew);
+                DatabaseEntity.ResetIdentifiers(_crewMessage.Elements);
+                this.SublistElementChanged(Message.NotificationClass.CREW);
                 this.dataGridCrewList.Items.Refresh();
             }
         }
@@ -317,6 +328,7 @@ namespace ENI2.DetailViewControls
                     _crewMessage.Elements.Add(ecd.CREW);
                     this.dataGridCrewList.Items.Refresh();
                     ecd.CREW = new CREW();
+                    ecd.CREW.Identifier = CREW.GetNewIdentifier(_crewMessage.Elements);
                     ecd.CREW.MessageHeader = _crewMessage;
                     this.SublistElementChanged(Message.NotificationClass.CREW);
                 };
@@ -394,6 +406,7 @@ namespace ENI2.DetailViewControls
 
                                 crew.MessageHeader = this._crewMessage;
                                 crew.Identifier = CREW.GetNewIdentifier(this._crewMessage.Elements);
+                                this._crewMessage.Elements.Add(crew);
                                 importCrew.Add(crew);
                             }
                         } while (reader.NextResult());
@@ -404,12 +417,12 @@ namespace ENI2.DetailViewControls
                     }
 
                     if (importCrew.Count > 0)
-                    {
-                        this._crewMessage.Elements.AddRange(importCrew);
+                    {                        
                         this.dataGridCrewList.Items.Refresh();
                         this.SublistElementChanged(Message.NotificationClass.CREW);
-                    }
-                }
+                        MessageBox.Show(String.Format(Properties.Resources.textCrewImported, importCrew.Count), Properties.Resources.textCaptionInformation, MessageBoxButton.OK, MessageBoxImage.Information);
+                    }                                                                
+               }
 
                 stream.Close();
             }
@@ -466,6 +479,7 @@ namespace ENI2.DetailViewControls
 
                                 pas.MessageHeader = this._pasMessage;
                                 pas.Identifier = PAS.GetNewIdentifier(this._pasMessage.Elements);
+                                this._pasMessage.Elements.Add(pas);
                                 importPassenger.Add(pas);
                             }
                         } while (reader.NextResult());
@@ -476,10 +490,10 @@ namespace ENI2.DetailViewControls
                     }
 
                     if (importPassenger.Count > 0)
-                    {
-                        this._pasMessage.Elements.AddRange(importPassenger);
+                    {                        
                         this.dataGridPassengerList.Items.Refresh();
                         this.SublistElementChanged(Message.NotificationClass.PAS);
+                        MessageBox.Show(String.Format(Properties.Resources.textPassengerImported, importPassenger.Count), Properties.Resources.textCaptionInformation, MessageBoxButton.OK, MessageBoxImage.Information);
                     }
                 }
                 stream.Close();
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml
index 84376e08..fba9a4e2 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml
@@ -137,7 +137,7 @@
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding Name}" IsReadOnly="True" Width="auto" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textFlashpointInformation}" Binding="{Binding FlashpointInformationDisplay}" IsReadOnly="True" Width="auto" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint}" IsReadOnly="True" Width="auto" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint_CEL}" IsReadOnly="True" Width="auto" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
index 451ef3f6..672f0315 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
@@ -298,6 +298,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(marpol);
                 this.haz.MARPOLPositions.Remove(marpol);
+                DatabaseEntity.ResetIdentifiers(haz.MARPOLPositions);
+                this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
                 this.dataGridMARPOLItems.Items.Refresh();
             }
         }
@@ -373,6 +375,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(imsbc);
                 this.haz.IMSBCPositions.Remove(imsbc);
+                DatabaseEntity.ResetIdentifiers(haz.IMSBCPositions);
+                this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
                 this.dataGridIMSBCItems.Items.Refresh();
             }
         }
@@ -448,6 +452,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(igc);
                 this.haz.IGCPositions.Remove(igc);
+                DatabaseEntity.ResetIdentifiers(haz.IGCPositions);
+                this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
                 this.dataGridIGCItems.Items.Refresh();
             }
         }
@@ -523,6 +529,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(ibc);
                 this.haz.IBCPositions.Remove(ibc);
+                DatabaseEntity.ResetIdentifiers(haz.IBCPositions);
+                this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
                 this.dataGridIBCItems.Items.Refresh();
             }
         }
@@ -598,6 +606,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(imdg);
                 this.haz.IMDGPositions.Remove(imdg);
+                DatabaseEntity.ResetIdentifiers(haz.IMDGPositions);
+                this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
                 this.dataGridIMDGItems.Items.Refresh();
             }
         }
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs
index 738f9f2f..7ab38fcb 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs
@@ -143,6 +143,7 @@ namespace ENI2.DetailViewControls
         private void DataGridBKRD_CreateRequested()
         {
             BRKD brkd = new BRKD();
+            brkd.Identifier = BRKD.GetNewIdentifier(_bkrdMessage.Elements);
             EditBKRDialog ebd = new EditBKRDialog();
             ebd.BRKD = brkd;
             ebd.IsDeparture = true;
@@ -154,6 +155,7 @@ namespace ENI2.DetailViewControls
                 ebd.BRKD.MessageHeader = _bkrdMessage;
                 this.dataGridBKRD.Items.Refresh();
                 ebd.BRKD = new BRKD();
+                ebd.BRKD.Identifier = BRKD.GetNewIdentifier(_bkrdMessage.Elements);
                 this.SublistElementChanged(Message.NotificationClass.BKRD);
             };
 
@@ -173,6 +175,9 @@ namespace ENI2.DetailViewControls
             {
                 // are you sure dialog is in base class
                 this._bkrdMessage.Elements.Remove(brkd);
+                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(brkd);
+                DatabaseEntity.ResetIdentifiers(this._bkrdMessage.Elements);
+                this.SublistElementChanged(Message.NotificationClass.BKRD);
                 this.dataGridBKRD.Items.Refresh();
             }
         }
@@ -192,6 +197,7 @@ namespace ENI2.DetailViewControls
                     _bkrdMessage.Elements.Add(eld.BRKD);
                     this.dataGridBKRD.Items.Refresh();
                     eld.BRKD = new BRKD();
+                    eld.BRKD.Identifier = BRKD.GetNewIdentifier(_bkrdMessage.Elements);
                     eld.BRKD.MessageHeader = _bkrdMessage;
                     this.SublistElementChanged(Message.NotificationClass.BKRD);
                 };
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml
index 4a7efbe7..53809348 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml
@@ -111,19 +111,16 @@
         <TabItem Header="{x:Static p:Resources.textVisitsInfectedAreas}" Name="tabInfectedAreas">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="60*" />
-                    <ColumnDefinition Width="190*"/>
-                    <ColumnDefinition Width="430*" />
-                    <ColumnDefinition Width="17*"/>
-                    <ColumnDefinition Width="301*"/>
+                    <ColumnDefinition Width="28" />
+                    <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="28"/>
                     <RowDefinition Height="200"/>
                 </Grid.RowDefinitions>
-                <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="0"  Content="{x:Static p:Resources.textShipVisitedInfectedArea}" Name="labelHasShipVisited" Margin="0,0,10,0" Grid.ColumnSpan="2"/>
-                <CheckBox Name="checkBoxHasShipVisited" IsChecked="{Binding MDHSimplification}" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" Margin="0,8,0,7" Grid.ColumnSpan="3"/>
-                <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5" x:Name="dataGridInfectedAreas" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                <CheckBox Name="checkBoxHasShipVisited" IsChecked="{Binding InfectedAreaVisited}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="6,0,0,0"/>
+                <Label HorizontalContentAlignment="Left" Grid.Row="0" Grid.Column="1"  Content="{x:Static p:Resources.textShipVisitedInfectedArea}" Name="labelHasShipVisited" Margin="0,0,10,0" />
+                <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridInfectedAreas" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
@@ -136,15 +133,15 @@
         <TabItem Header="{x:Static p:Resources.textSanitaryMeasuresApplied}" Name="tabSanitaryMeasuresApplied">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="28" />
+                    <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="28"/>
                     <RowDefinition Height="200"/>
                 </Grid.RowDefinitions>
-                <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="0"  Content="{x:Static p:Resources.textAnySanitaryMeasures}" Name="labelSanitaryMeasuresApplied" Margin="0,0,10,0"/>
-                <CheckBox Name="checkBoxSanitaryMeasuresApplied" IsChecked="{Binding SanitaryMeasuresApplied}" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"/>
+                <CheckBox Name="checkBoxSanitaryMeasuresApplied" IsChecked="{Binding SanitaryMeasuresApplied}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="6,0,0,0 "/>
+                <Label HorizontalContentAlignment="Left" Grid.Row="0" Grid.Column="1"  Content="{x:Static p:Resources.textAnySanitaryMeasures}" Name="labelSanitaryMeasuresApplied" Margin="0,0,10,0"/>
                 <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridSanitaryMeasures" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
                     <DataGrid.Columns>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml.cs
index 76442b90..8269536b 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml.cs
@@ -57,7 +57,7 @@ namespace ENI2.DetailViewControls
 
             this.checkBoxHasShipVisited.Checked += CheckBoxHasShipVisited_Checked;
             this.checkBoxHasShipVisited.Unchecked += CheckBoxHasShipVisited_Checked;
-            this.CheckBoxHasShipVisited_Checked(null, null);
+            this.CheckBoxHasShipVisited_Checked(null, null);            
 
             this.checkBoxHavePersonsDied.Checked += CheckBoxHavePersonsDied_Checked;
             this.checkBoxHavePersonsDied.Unchecked += CheckBoxHavePersonsDied_Checked;
@@ -90,6 +90,7 @@ namespace ENI2.DetailViewControls
             this.dataGridInfectedAreas.Initialize();
             this.dataGridInfectedAreas.IsReadOnly = !(mdh.InfectedAreaVisited ?? false);            
 
+            
             this.dataGridInfectedAreas.ItemsSource = mdh.InfectedAreas;
             this.dataGridInfectedAreas.AddingNewItem += DataGridInfectedAreas_AddingNewItem;
             this.dataGridInfectedAreas.EditRequested += DataGridInfectedAreas_EditRequested;
@@ -98,6 +99,9 @@ namespace ENI2.DetailViewControls
 
             this.dataGridSanitaryMeasures.Initialize();
             this.dataGridSanitaryMeasures.IsReadOnly = !(mdh.SanitaryMeasuresApplied ?? false);
+
+            this.checkBoxHasShipVisited.DataContext = mdh;
+            this.checkBoxSanitaryMeasuresApplied.DataContext = mdh;
             this.checkBoxSanitaryMeasuresApplied.Checked += CheckBoxSanitaryMeasuresApplied_Checked;
             this.checkBoxSanitaryMeasuresApplied.Unchecked += CheckBoxSanitaryMeasuresApplied_Checked;
             this.dataGridSanitaryMeasures.ItemsSource = mdh.SanitaryMeasuresDetails;
@@ -111,12 +115,7 @@ namespace ENI2.DetailViewControls
 
             #endregion
 
-        }
-
-        private void CheckBoxHasShipVisited_Checked1(object sender, RoutedEventArgs e)
-        {
-            throw new System.NotImplementedException();
-        }
+        }        
 
         private void CheckBoxSanitaryControlExemption_Checked(object sender, RoutedEventArgs e)
         {
@@ -214,6 +213,7 @@ namespace ENI2.DetailViewControls
         private void DataGridSanitaryMeasures_CreateRequested()
         {
             SanitaryMeasuresDetail smDetail = new SanitaryMeasuresDetail();
+            smDetail.Identifier = SanitaryMeasuresDetail.GetNewIdentifier(_mdh.SanitaryMeasuresDetails);
             EditSanitaryMeasureDialog epd = new EditSanitaryMeasureDialog();
             epd.SanitaryMeasureDetail = smDetail;
 
@@ -224,6 +224,7 @@ namespace ENI2.DetailViewControls
                 this._mdh.SanitaryMeasuresDetails.Add(epd.SanitaryMeasureDetail);
                 this.dataGridSanitaryMeasures.Items.Refresh();
                 epd.SanitaryMeasureDetail = new SanitaryMeasuresDetail();
+                epd.SanitaryMeasureDetail.Identifier = SanitaryMeasuresDetail.GetNewIdentifier(_mdh.SanitaryMeasuresDetails);
                 this.SublistElementChanged(Message.NotificationClass.MDH);
             };
 
@@ -244,6 +245,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _mdh.SanitaryMeasuresDetails.Remove(smd);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(smd);
+                DatabaseEntity.ResetIdentifiers(_mdh.SanitaryMeasuresDetails);
+                this.SublistElementChanged(Message.NotificationClass.MDH);
                 this.dataGridSanitaryMeasures.Items.Refresh();
             }
         }
@@ -259,6 +262,7 @@ namespace ENI2.DetailViewControls
                     _mdh.SanitaryMeasuresDetails.Add(ecpd.SanitaryMeasureDetail);
                 this.dataGridSanitaryMeasures.Items.Refresh();
                 ecpd.SanitaryMeasureDetail = new SanitaryMeasuresDetail();
+                ecpd.SanitaryMeasureDetail.Identifier = SanitaryMeasuresDetail.GetNewIdentifier(_mdh.SanitaryMeasuresDetails);
             };
             if (ecpd.ShowDialog() ?? false)
             {
@@ -282,6 +286,7 @@ namespace ENI2.DetailViewControls
         private void DataGridInfectedAreas_CreateRequested()
         {
             InfectedArea ia = new InfectedArea();
+            ia.Identifier = InfectedArea.GetNewIdentifier(_mdh.InfectedAreas);
             EditInfectedAreaDialog epd = new EditInfectedAreaDialog();
             epd.InfectedArea = ia;
 
@@ -292,6 +297,7 @@ namespace ENI2.DetailViewControls
                 this._mdh.InfectedAreas.Add(epd.InfectedArea);
                 this.dataGridInfectedAreas.Items.Refresh();
                 epd.InfectedArea = new InfectedArea();
+                epd.InfectedArea.Identifier = InfectedArea.GetNewIdentifier(_mdh.InfectedAreas);
                 this.SublistElementChanged(Message.NotificationClass.MDH);
             };
 
@@ -312,6 +318,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _mdh.InfectedAreas.Remove(ia);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(ia);
+                DatabaseEntity.ResetIdentifiers(_mdh.InfectedAreas);
+                this.SublistElementChanged(Message.NotificationClass.MDH);
                 this.dataGridInfectedAreas.Items.Refresh();
             }
         }
@@ -327,6 +335,7 @@ namespace ENI2.DetailViewControls
                     _mdh.InfectedAreas.Add(ecpd.InfectedArea);
                 this.dataGridInfectedAreas.Items.Refresh();
                 ecpd.InfectedArea= new InfectedArea();
+                ecpd.InfectedArea.Identifier = InfectedArea.GetNewIdentifier(_mdh.InfectedAreas);
             };
             if (ecpd.ShowDialog() ?? false)
             {
@@ -350,6 +359,7 @@ namespace ENI2.DetailViewControls
         private void DataGridPortOfCallLast30Days_CreateRequested()
         {
             PortOfCallLast30Days poc30 = new PortOfCallLast30Days();
+            poc30.Identifier = PortOfCallLast30Days.GetNewIdentifier(_mdh.PortOfCallLast30Days);
             EditPortOfCallLast30DaysDialog epd = new EditPortOfCallLast30DaysDialog();
             epd.PocLast30Days = poc30;
 
@@ -360,6 +370,7 @@ namespace ENI2.DetailViewControls
                 this._mdh.PortOfCallLast30Days.Add(epd.PocLast30Days);
                 this.dataGridPortOfCallLast30Days.Items.Refresh();
                 epd.PocLast30Days = new PortOfCallLast30Days();
+                epd.PocLast30Days.Identifier = PortOfCallLast30Days.GetNewIdentifier(_mdh.PortOfCallLast30Days);
                 this.SublistElementChanged(Message.NotificationClass.MDH);
             };
 
@@ -380,6 +391,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _mdh.PortOfCallLast30Days.Remove(poc30d);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(poc30d);
+                DatabaseEntity.ResetIdentifiers(_mdh.PortOfCallLast30Days);
+                this.SublistElementChanged(Message.NotificationClass.MDH);
                 this.dataGridPortOfCallLast30Days.Items.Refresh();
             }
         }
@@ -395,6 +408,7 @@ namespace ENI2.DetailViewControls
                     _mdh.PortOfCallLast30Days.Add(ecpd.PocLast30Days);
                 this.dataGridPortOfCallLast30Days.Items.Refresh();
                 ecpd.PocLast30Days = new PortOfCallLast30Days();
+                ecpd.PocLast30Days.Identifier = PortOfCallLast30Days.GetNewIdentifier(_mdh.PortOfCallLast30Days);
             };
             if (ecpd.ShowDialog() ?? false)
             {
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index cd38b007..21f66bfc 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -74,7 +74,7 @@ namespace ENI2.DetailViewControls
             vtBinding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
             BindingOperations.SetBinding(textBoxDisplayId, TextBox.TextProperty, vtBinding);
 
-            if (this.Core.Cancelled ?? false) this.ShowCancelledLabel();
+            if (this.Core.Cancelled ?? false) this.ShowCancelledLabel();            
 
             #region Meldeklassen einrichten und Icons / Gruppen / Index zuordnen
 
@@ -196,6 +196,7 @@ namespace ENI2.DetailViewControls
             {
                 // kann das eigentlich passieren??!
             }
+            
 
             #region Context-Menu Meldeklassen
 
@@ -334,7 +335,7 @@ namespace ENI2.DetailViewControls
         {
             this.stackPanelLock.Visibility = Visibility.Visible;
             this.textBlockLockUserName.Text = reportingParty.FirstName + " " + reportingParty.LastName;
-        }
+        }        
 
         #endregion
 
@@ -387,8 +388,7 @@ namespace ENI2.DetailViewControls
         #region Command button event handler
 
         private void contextSendMessage(object sender, RoutedEventArgs e)
-        {
-            //MessageBox.Show("not yet..");
+        {            
             MessageBoxResult result = MessageBox.Show(Properties.Resources.textConfirmSend, Properties.Resources.textConfirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
             if (result == MessageBoxResult.Yes)
             {
@@ -401,6 +401,8 @@ namespace ENI2.DetailViewControls
 
                 // komplette Anmeldung auf "zu versenden" stellen
                 this.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+                this.Core.DefaultReportingPartyId = App.UserId;
+
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core);
                 this.dataGridMessages.Items.Refresh();
             }
@@ -421,6 +423,8 @@ namespace ENI2.DetailViewControls
 
                 // komplette Anmeldung auf "zu versenden" stellen
                 this.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+                this.Core.DefaultReportingPartyId = App.UserId;
+
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core);
                 this.dataGridMessages.Items.Refresh();
             }
@@ -439,8 +443,11 @@ namespace ENI2.DetailViewControls
                 {
                     this.Core.Cancelled = true;
                     this.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+                    this.Core.DefaultReportingPartyId = App.UserId;
                     this.ShowCancelledLabel();
                     DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core);
+
+                    this.OnRequestDisable();
                 }
             }
         }
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
index 10a1cb00..ce0c3f92 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
@@ -102,7 +102,9 @@ namespace ENI2.DetailViewControls
             this.dateTimePicker_ETDFromPortOfCall.DataContext = _noa_nod;
 
             this.checkBox_IsAnchored.IsEnabled = this.Core.IsDK;
-        }        
+        }
+
+        #region datagrid call purposes
 
         private void DataGridCallPurposes_DeleteRequested(DatabaseEntity obj)
         {
@@ -112,6 +114,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _noa_nod.CallPurposes.Remove(cp);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(cp);
+                DatabaseEntity.ResetIdentifiers(_noa_nod.CallPurposes);
+                this.SublistElementChanged(Message.NotificationClass.NOA_NOD);
                 this.dataGridCallPurposes.Items.Refresh();
             }
         }
@@ -126,10 +130,12 @@ namespace ENI2.DetailViewControls
                     _noa_nod.CallPurposes.Add(ecpd.CallPurpose);
                 this.dataGridCallPurposes.Items.Refresh();
                 ecpd.CallPurpose = new CallPurpose();
+                ecpd.CallPurpose.Identifier = CallPurpose.GetNewIdentifier(_noa_nod.CallPurposes);
                 ecpd.CallPurpose.NOA_NOD = this._noa_nod;
                 this.SublistElementChanged(Message.NotificationClass.NOA_NOD);
             };
             ecpd.CallPurpose = new CallPurpose();
+            ecpd.CallPurpose.Identifier = CallPurpose.GetNewIdentifier(_noa_nod.CallPurposes);
             ecpd.CallPurpose.NOA_NOD = this._noa_nod;
 
             if(ecpd.ShowDialog() ?? false)
@@ -158,6 +164,7 @@ namespace ENI2.DetailViewControls
                     _noa_nod.CallPurposes.Add(ecpd.CallPurpose);
                 this.dataGridCallPurposes.Items.Refresh();
                 ecpd.CallPurpose = new CallPurpose();
+                ecpd.CallPurpose.Identifier = CallPurpose.GetNewIdentifier(_noa_nod.CallPurposes);
                 ecpd.CallPurpose.NOA_NOD = this._noa_nod;
                 this.SublistElementChanged(Message.NotificationClass.NOA_NOD);
             };
@@ -171,6 +178,8 @@ namespace ENI2.DetailViewControls
             }
         }
 
+        #endregion
+
         #region Highlighting
 
         public override void HighlightErrorMessageContainer()
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
index 02f5cd35..9c02fed5 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
@@ -149,12 +149,15 @@ namespace ENI2.DetailViewControls
 
             #endregion
 
-        }        
+        }
+
+        #region datagrid LADG
 
         private void DataGridLADG_CreateRequested()
         {            
             EditLADGDialog eld = new EditLADGDialog();
             eld.LADG = new LADG();
+            eld.LADG.Identifier = LADG.GetNewIdentifier(_ladgMessage.Elements);
             eld.Core = this.Core;                        
 
             eld.AddClicked += () =>
@@ -164,6 +167,7 @@ namespace ENI2.DetailViewControls
                 eld.LADG.MessageHeader = _ladgMessage;
                 this.dataGridLADG.Items.Refresh();
                 eld.LADG = new LADG();
+                eld.LADG.Identifier = LADG.GetNewIdentifier(_ladgMessage.Elements);
                 this.SublistElementChanged(Message.NotificationClass.LADG);
             };
 
@@ -184,6 +188,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 this._ladgMessage.Elements.Remove(ladg);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(ladg);
+                DatabaseEntity.ResetIdentifiers(_ladgMessage.Elements);
+                this.SublistElementChanged(Message.NotificationClass.LADG);
                 this.dataGridLADG.Items.Refresh();
             }
         }
@@ -201,6 +207,7 @@ namespace ENI2.DetailViewControls
                 {
                     eld.CopyValuesToEntity();
                     eld.LADG = new LADG();
+                    eld.LADG.Identifier = LADG.GetNewIdentifier(_ladgMessage.Elements);
                     _ladgMessage.Elements.Add(eld.LADG);
                     eld.LADG.MessageHeader = _ladgMessage;
                     this.SublistElementChanged(Message.NotificationClass.LADG);
@@ -219,10 +226,15 @@ namespace ENI2.DetailViewControls
             this.DataGridLADG_CreateRequested();
         }
 
+        #endregion
+
+        #region datagrid SERV
+
         private void DataGridSERV_CreateRequested()
         {            
             EditSERVDialog esd = new EditSERVDialog();
             esd.SERV = new SERV();
+            esd.SERV.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
 
             esd.AddClicked += () =>
             {
@@ -231,6 +243,7 @@ namespace ENI2.DetailViewControls
                 esd.SERV.MessageHeader = _servMessage;
                 this.dataGridSERV.Items.Refresh();
                 esd.SERV = new SERV();
+                esd.SERV.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
                 this.SublistElementChanged(Message.NotificationClass.SERV);
             };
 
@@ -251,6 +264,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _servMessage.Elements.Remove(serv);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(serv);
+                DatabaseEntity.ResetIdentifiers(_servMessage.Elements);
+                this.SublistElementChanged(Message.NotificationClass.SERV);
                 this.dataGridSERV.Items.Refresh();
             }
         }
@@ -267,6 +282,7 @@ namespace ENI2.DetailViewControls
                 {
                     esd.CopyValuesToEntity();
                     esd.SERV = new SERV();
+                    esd.SERV.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
                     _servMessage.Elements.Add(esd.SERV);
                     esd.SERV.MessageHeader = _servMessage;
                     this.SublistElementChanged(Message.NotificationClass.SERV);
@@ -285,6 +301,8 @@ namespace ENI2.DetailViewControls
             this.DataGridSERV_CreateRequested();
         }
 
+        #endregion
+
         #region Highlighting
 
         public override void HighlightErrorMessageContainer()
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml
index e6ec38d6..821b0b09 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml
@@ -68,8 +68,8 @@
                     <Label HorizontalContentAlignment="Right" Grid.Row="18" Grid.Column="2" Content="{x:Static p:Resources.textGeneralCargoDescription}" Name="label_GeneralCargoDescription" Margin="0,0,10,0"/>
 
                     <CheckBox Name="checkBoxKielCanalPassagePlanned" IsChecked="{Binding KielCanalPassagePlanned}" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"/>
-                    <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedIncomming" Grid.Row="1" Grid.Column="1" Value="{Binding KielCanalPassagePlannedIncomming}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
-                    <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedOutgoing" Grid.Row="1" Grid.Column="3" Value="{Binding KielCanalPassagePlannedOutgoing}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                    <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedIncomming" Grid.Row="1" Grid.Column="1" Value="{Binding KielCanalPassagePlannedIncomming, Converter={util:UtcToLocalDateTimeConverter}}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
+                    <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedOutgoing" Grid.Row="1" Grid.Column="3" Value="{Binding KielCanalPassagePlannedOutgoing, Converter={util:UtcToLocalDateTimeConverter}}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left"/>
                     <ComboBox Name="comboBoxCurrentShipSecurityLevel" Grid.Row="3" Grid.Column="1" SelectedValue="{Binding CurrentShipSecurityLevel}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
                     <CheckBox Name="checkBoxSECSimplification" IsChecked="{Binding SECSimplification}" Grid.Row="5" Grid.Column="1" VerticalAlignment="Center"/>
                     <enictrl:LocodeControl x:Name="locodePortOfCallWhereCompleteSECNotified" Grid.Row="6" Grid.Column="1" LocodeValue="{Binding PortOfCallWhereCompleteSECNotified}" />
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
index d006a3a5..2b636f8e 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
@@ -102,6 +102,7 @@ namespace ENI2.DetailViewControls
         private void DataGridShip2ShipActivities_CreateRequested()
         {
             ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2s = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
+            s2s.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled);
             EditShip2ShipActivitiesDialog epd = new EditShip2ShipActivitiesDialog();
             epd.ShipToShipActivity = s2s;
 
@@ -112,6 +113,7 @@ namespace ENI2.DetailViewControls
                 this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(epd.ShipToShipActivity);
                 this.dataGridShip2ShipActivities.Items.Refresh();
                 epd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
+                epd.ShipToShipActivity.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled);
                 this.SublistElementChanged(Message.NotificationClass.SEC);
             };
 
@@ -132,6 +134,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Remove(s2s);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(s2s);
+                DatabaseEntity.ResetIdentifiers(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled);
+                this.SublistElementChanged(Message.NotificationClass.SEC);
                 this.dataGridShip2ShipActivities.Items.Refresh();
             }
         }
@@ -147,6 +151,7 @@ namespace ENI2.DetailViewControls
                     _sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(ecpd.ShipToShipActivity);
                 this.dataGridShip2ShipActivities.Items.Refresh();
                 ecpd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
+                ecpd.ShipToShipActivity.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled);
             };
             if (ecpd.ShowDialog() ?? false)
             {
@@ -170,6 +175,7 @@ namespace ENI2.DetailViewControls
         private void DataGridLast10PortFacilities_CreateRequested()
         {
             LastTenPortFacilitiesCalled l10c = new LastTenPortFacilitiesCalled();
+            l10c.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled);
             EditLast10PortFacilitiesDialog epd = new EditLast10PortFacilitiesDialog();
             epd.LastTenPortFacilitiesCalled = l10c;
 
@@ -180,6 +186,7 @@ namespace ENI2.DetailViewControls
                 this._sec.LastTenPortFacilitesCalled.Add(epd.LastTenPortFacilitiesCalled);
                 this.dataGridLast10PortFacilities.Items.Refresh();
                 epd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled();
+                epd.LastTenPortFacilitiesCalled.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled);
                 this.SublistElementChanged(Message.NotificationClass.SEC);
             };
 
@@ -200,6 +207,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _sec.LastTenPortFacilitesCalled.Remove(l10c);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(l10c);
+                DatabaseEntity.ResetIdentifiers(_sec.LastTenPortFacilitesCalled);
+                this.SublistElementChanged(Message.NotificationClass.SEC);
                 this.dataGridLast10PortFacilities.Items.Refresh();
             }
         }
@@ -215,6 +224,7 @@ namespace ENI2.DetailViewControls
                     _sec.LastTenPortFacilitesCalled.Add(ecpd.LastTenPortFacilitiesCalled);
                 this.dataGridLast10PortFacilities.Items.Refresh();
                 ecpd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled();
+                ecpd.LastTenPortFacilitiesCalled.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled);
             };
             if (ecpd.ShowDialog() ?? false)
             {
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml
index 2939b0b8..f3237cb3 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml
@@ -48,21 +48,21 @@
                 <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="3" Content="{x:Static p:Resources.textBeamOverAll}" Margin="0,0,10,0" />
                 <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" VerticalContentAlignment="Center"/>
+                <TextBox Name="textBoxVesselName" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Text="{Binding ShipName}" Margin="2" VerticalContentAlignment="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="True" />
-                <TextBox Name="textBoxCallsign" Grid.Column="4" Grid.Row="1" Text="{Binding CallSign}" Margin="2" VerticalAlignment="Center" VerticalContentAlignment="Center"/>
+                <TextBox Name="textBoxCallsign" Grid.Column="4" Grid.Row="1" Text="{Binding CallSign}" Margin="2" VerticalContentAlignment="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="True" />
                 <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="True" />
                 <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" TextAlignment="Left"/>
                 <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" TextAlignment="Left"/>
+                <xctk:DoubleUpDown Name="doubleUpDownLength" Grid.Column="1" Grid.Row="5" Margin="2" Value="{Binding LengthOverall_MTR}" ShowButtonSpinner="False" TextAlignment="Left" ParsingNumberStyle="Any" FormatString="N2" />
                 <Label Content="m" Grid.Column="2" Grid.Row="5" />
-                <xctk:DoubleUpDown Name="doubleUpDownBeam" Grid.Column="4" Grid.Row="5" Margin="2" Value="{Binding Beam_MTR}" ShowButtonSpinner="False" TextAlignment="Left" />
+                <xctk:DoubleUpDown Name="doubleUpDownBeam" Grid.Column="4" Grid.Row="5" Margin="2" Value="{Binding Beam_MTR}" ShowButtonSpinner="False" TextAlignment="Left"  ParsingNumberStyle="Any" FormatString="N2" />
                 <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" VerticalContentAlignment="Center"/>
-                <TextBox Name="textBoxInmarsatCallNumber" Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="6" VerticalAlignment="Center" Margin="2" Text="{Binding InmarsatCallNumber}" VerticalContentAlignment="Center" />
+                <TextBox Name="textBoxMMSI" Grid.Column="1" Grid.Row="6" Margin="2" Text="{Binding MMSINumber}" VerticalContentAlignment="Center"/>
+                <TextBox Name="textBoxInmarsatCallNumber" Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="6" Margin="2" Text="{Binding InmarsatCallNumber}" VerticalContentAlignment="Center" />
 
             </Grid>
             <GroupBox Name="groupBoxISMCompany" Header="{x:Static p:Resources.textISMCompany}" Grid.Row="1">
@@ -89,12 +89,12 @@
                     <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="3" Content="{x:Static p:Resources.textCompanyId}" Margin="0,0,10,0" />
                     <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" VerticalContentAlignment="Center"/>
-                    <TextBox VerticalAlignment="Center" Name="textBoxCompanyId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyId}" MaxLength="100" VerticalContentAlignment="Center"/>
-                    <TextBox VerticalAlignment="Center" Name="textBoxStreetNumber" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyStreetAndNumber}" MaxLength="100" VerticalContentAlignment="Center"/>
-                    <TextBox VerticalAlignment="Center" Name="textBoxCity" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCity}" MaxLength="100" VerticalContentAlignment="Center"/>
-                    <TextBox VerticalAlignment="Center" Name="textBoxPostalCode" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="1" Margin="2" Text="{Binding ISMCompanyPostalCode}" MaxLength="24" VerticalContentAlignment="Center"/>
-                    <TextBox VerticalAlignment="Center" Name="textBoxCountry" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCountry}" MaxLength="100" VerticalContentAlignment="Center"/>
+                    <TextBox Name="textBoxCompanyName" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyName}" MaxLength="100" VerticalContentAlignment="Center"/>
+                    <TextBox Name="textBoxCompanyId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyId}" MaxLength="100" VerticalContentAlignment="Center"/>
+                    <TextBox Name="textBoxStreetNumber" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyStreetAndNumber}" MaxLength="100" VerticalContentAlignment="Center"/>
+                    <TextBox Name="textBoxCity" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCity}" MaxLength="100" VerticalContentAlignment="Center"/>
+                    <TextBox Name="textBoxPostalCode" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="1" Margin="2" Text="{Binding ISMCompanyPostalCode}" MaxLength="24" VerticalContentAlignment="Center"/>
+                    <TextBox Name="textBoxCountry" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCountry}" MaxLength="100" VerticalContentAlignment="Center"/>
 
                 </Grid>
             </GroupBox>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/TowageDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/TowageDetailControl.xaml
index d2baa210..d379f1af 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/TowageDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/TowageDetailControl.xaml
@@ -29,7 +29,6 @@
                     <DataGridTextColumn Header="{x:Static p:Resources.textBeamOverAll}" Binding="{Binding TowageOnArrivalBeam_MTR}" IsReadOnly="True" Width="Auto" />
                     <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding TowageOnArrivalRemarks}" IsReadOnly="True" Width="Auto" />
                     <DataGridTextColumn Header="{x:Static p:Resources.textCompanyName}" Binding="{Binding TowageOnArrivalOperatorCompanyName}" IsReadOnly="True" Width="Auto" />
-                    <DataGridTextColumn Header="{x:Static p:Resources.textPurposeOfCall}" Binding="{Binding TowageOnArrivalPurposeOfCall}" IsReadOnly="True" Width="Auto" />
                     <DataGridTextColumn Header="{x:Static p:Resources.textStreetNumber}" Binding="{Binding TowageOnArrivalOperatorStreetNameAndNumber}" IsReadOnly="True" Width="Auto" />
                     <DataGridTextColumn Header="{x:Static p:Resources.textPostalCode}" Binding="{Binding TowageOnArrivalOperatorPostalCode}" IsReadOnly="True" Width="Auto" />
                     <DataGridTextColumn Header="{x:Static p:Resources.textCity}" Binding="{Binding TowageOnArrivalOperatorCity}" IsReadOnly="True" Width="Auto" />
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/TowageDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/TowageDetailControl.xaml.cs
index 51489bb1..546c0a24 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/TowageDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/TowageDetailControl.xaml.cs
@@ -21,6 +21,7 @@ namespace ENI2.DetailViewControls
 
         private Message _towaMessage;
         private Message _towdMessage;
+        private bool _ctxInitialized = false;
 
         public TowageDetailControl()
         {
@@ -30,12 +31,16 @@ namespace ENI2.DetailViewControls
 
         private void TowageDetailControl_Loaded(object sender, RoutedEventArgs e)
         {
-            this.dataGridTowageOnArrival.ContextMenu.Items.Add(new Separator());
-            MenuItem copyItem = new MenuItem();
-            copyItem.Header = Properties.Resources.textCopyTOWATOWD;
-            copyItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
-            copyItem.Click += new RoutedEventHandler(this.copyItem);
-            this.dataGridTowageOnArrival.ContextMenu.Items.Add(copyItem);
+            if (!_ctxInitialized)
+            {
+                this.dataGridTowageOnArrival.ContextMenu.Items.Add(new Separator());
+                MenuItem copyItem = new MenuItem();
+                copyItem.Header = Properties.Resources.textCopyTOWATOWD;
+                copyItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
+                copyItem.Click += new RoutedEventHandler(this.copyItem);
+                this.dataGridTowageOnArrival.ContextMenu.Items.Add(copyItem);
+                _ctxInitialized = true;
+            }
         }
 
         private void copyItem(object sender, RoutedEventArgs e)
@@ -49,6 +54,7 @@ namespace ENI2.DetailViewControls
                     TOWD copyTOWD = new TOWD();
                     copyTOWD.MessageHeader = _towdMessage;
                     copyTOWD.CopyFromTOWA(selectedTOWA);
+                    copyTOWD.Identifier = TOWD.GetNewIdentifier(this._towdMessage.Elements);
                     this._towdMessage.Elements.Add(copyTOWD);
                     this.dataGridTowageOnDeparture.Items.Refresh();
                     this.SublistElementChanged(Message.NotificationClass.TOWD);
@@ -102,9 +108,12 @@ namespace ENI2.DetailViewControls
 
         }
 
+        #region TOWD grid
+
         private void DataGridTowageOnDeparture_CreateRequested()
         {
             TOWD towd = new TOWD();
+            towd.Identifier = TOWD.GetNewIdentifier(this._towdMessage.Elements);
             EditTOWDialog ebd = new EditTOWDialog();
             ebd.TOWD = towd;
             ebd.IsDeparture = true;
@@ -116,6 +125,7 @@ namespace ENI2.DetailViewControls
                 ebd.TOWD.MessageHeader = _towdMessage;
                 this.dataGridTowageOnDeparture.Items.Refresh();
                 ebd.TOWD = new TOWD();
+                ebd.TOWD.Identifier = TOWD.GetNewIdentifier(this._towdMessage.Elements);
                 this.SublistElementChanged(Message.NotificationClass.TOWD);
             };
 
@@ -137,6 +147,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 this._towdMessage.Elements.Remove(towd);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(towd);
+                DatabaseEntity.ResetIdentifiers(this._towdMessage.Elements);
+                this.SublistElementChanged(Message.NotificationClass.TOWD);
                 this.dataGridTowageOnDeparture.Items.Refresh();
             }
         }
@@ -154,6 +166,7 @@ namespace ENI2.DetailViewControls
                 {
                     eld.CopyValuesToEntity();                                        
                     eld.TOWD = new TOWD();
+                    eld.TOWD.Identifier = TOWD.GetNewIdentifier(this._towdMessage.Elements);
                     _towdMessage.Elements.Add(eld.TOWD);
                     eld.TOWD.MessageHeader = _towdMessage;
                     this.SublistElementChanged(Message.NotificationClass.TOWD);
@@ -173,11 +186,14 @@ namespace ENI2.DetailViewControls
             this.DataGridTowageOnDeparture_CreateRequested();
         }
 
+        #endregion
 
+        #region TOWA grid
 
         private void DataGridTowageOnArrival_CreateRequested()
         {
             TOWA towa = new TOWA();
+            towa.Identifier = TOWA.GetNewIdentifier(this._towaMessage.Elements);
             EditTOWDialog ebd = new EditTOWDialog();
             ebd.TOWA = towa;
             ebd.IsDeparture = false;
@@ -189,6 +205,7 @@ namespace ENI2.DetailViewControls
                 ebd.TOWA.MessageHeader = _towaMessage;
                 this.dataGridTowageOnArrival.Items.Refresh();
                 ebd.TOWA = new TOWA();
+                ebd.TOWA.Identifier = TOWA.GetNewIdentifier(this._towaMessage.Elements);
                 this.SublistElementChanged(Message.NotificationClass.TOWA);                
             };
 
@@ -210,6 +227,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 this._towaMessage.Elements.Remove(towa);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(towa);
+                DatabaseEntity.ResetIdentifiers(this._towaMessage.Elements);
+                this.SublistElementChanged(Message.NotificationClass.TOWA);
                 this.dataGridTowageOnArrival.Items.Refresh();
             }
         }
@@ -227,6 +246,7 @@ namespace ENI2.DetailViewControls
                 {
                     eld.CopyValuesToEntity();                                        
                     eld.TOWA = new TOWA();
+                    eld.TOWA.Identifier = TOWA.GetNewIdentifier(this._towaMessage.Elements);
                     _towaMessage.Elements.Add(eld.TOWA);
                     eld.TOWA.MessageHeader = _towaMessage;
                     this.SublistElementChanged(Message.NotificationClass.TOWA);                    
@@ -246,6 +266,8 @@ namespace ENI2.DetailViewControls
             this.DataGridTowageOnArrival_CreateRequested();
         }
 
+        #endregion
+
         #region Highlighting
 
         public override void HighlightErrorMessageContainer()
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml
index 680e52dc..1239e9ed 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml
@@ -42,7 +42,7 @@
                 <CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Name="checkBoxAccurateCorrectDetails" IsChecked="{Binding ConfirmationOfCorrectness}" />
                 <CheckBox Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" Name="checkBoxValidExemption" IsChecked="{Binding WasteDisposalValidExemption}" />
                 <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxWasteDisposal" Margin="2" SelectedIndex="{Binding WasteDisposalDelivery}"/>
-                <DatePicker Grid.Row="2" Grid.Column="1" Name="datePickerDateLastDisposal" Margin="2" SelectedDate="{Binding LastWasteDisposalDate, Converter={util:ByteConverter}}" />
+                <DatePicker Grid.Row="2" Grid.Column="1" Name="datePickerDateLastDisposal" Margin="2" SelectedDate="{Binding LastWasteDisposalDate}" />
                 <enictrl:LocodeControl Grid.Row="3" Grid.Column="1" x:Name="locodeCtrlLastWastePort" LocodeValue="{Binding LastWasteDisposalPort}" />
                 <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="2" Name="textBoxWasteDisposalServiceProviders" Text="{Binding WasteDisposalServiceProviderText}" Margin="2" />
             </Grid>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index 855b3ecb..9f3c666e 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -105,6 +105,7 @@ namespace ENI2.DetailViewControls
         private void DataGridWaste_CreateRequested()
         {
             Waste waste = new Waste();
+            waste.Identifier = Waste.GetNewIdentifier(_was.Waste);
             EditWasteDialog epd = new EditWasteDialog();
             epd.Waste = waste;
 
@@ -115,6 +116,7 @@ namespace ENI2.DetailViewControls
                 this._was.Waste.Add(epd.Waste);
                 this.dataGridWaste.Items.Refresh();
                 epd.Waste = new Waste();
+                epd.Waste.Identifier = Waste.GetNewIdentifier(_was.Waste);
                 this.SublistElementChanged(Message.NotificationClass.WAS);
             };
 
@@ -135,6 +137,8 @@ namespace ENI2.DetailViewControls
                 // are you sure dialog is in base class
                 _was.Waste.Remove(waste);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(waste);
+                DatabaseEntity.ResetIdentifiers(_was.Waste);
+                this.SublistElementChanged(Message.NotificationClass.WAS);
                 this.dataGridWaste.Items.Refresh();
             }
         }
@@ -153,6 +157,7 @@ namespace ENI2.DetailViewControls
                     _was.Waste.Add(epd.Waste);
                     this.dataGridWaste.Items.Refresh();
                     epd.Waste = new Waste();
+                    epd.Waste.Identifier = Waste.GetNewIdentifier(_was.Waste);
                     epd.Waste.WAS = _was;
                     this.SublistElementChanged(Message.NotificationClass.WAS);
                 };
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 9020c7d1..cb0d95b7 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>4</ApplicationRevision>
     <ApplicationVersion>3.7.2.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml
index 988c9ce8..978170f5 100644
--- a/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml
@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textNewWithId}" Height="192" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize">
+        Title="{x:Static p:Resources.textNewWithId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize">
     
         <Grid Margin="4">
         <Grid.RowDefinitions>
@@ -16,6 +16,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*" />
@@ -28,6 +29,7 @@
         <Label Name="labelIMO" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textIMO}" />
         <Label Name="labelENI" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textENI}" />
         <Label Name="labelETA" Grid.Row="3" Grid.Column="0" Content="ETA" />
+        <Label Name="labelHIS" Grid.Row="4" Grid.Column="0" Content="HIS" />
         <xctk:DoubleUpDown x:Name="doubleUpDownIMO" Margin="2" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2"                                                            
                                   ClipValueToMinMax="True"
                                   ShowButtonSpinner="False" 
@@ -57,6 +59,6 @@
                                   Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged" TextAlignment="Left"/>
         <DatePicker Name="datePickerETA" Grid.Row="3" Grid.Column="1" Margin="2" Grid.ColumnSpan="2"
                     SelectedDateChanged="datePickerETA_SelectedDateChanged" />
-
+        <ComboBox Name="comboBoxInitialHIS" Grid.Row="4" Grid.Column="1" Margin="2" Grid.ColumnSpan="2" DisplayMemberPath="Value" SelectedValuePath="Key" />
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml.cs
index 9ea8907c..e1373d69 100644
--- a/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml.cs
@@ -3,10 +3,13 @@
 // 
 //
 
+
 using System.Windows;
 using System.Windows.Controls;
 using ENI2.Controls;
+using bsmd.database;
 using System;
+using System.Collections.Generic;
 
 namespace ENI2.EditControls
 {
@@ -24,6 +27,16 @@ namespace ENI2.EditControls
         private void NewWithIdDialog_Loaded(object sender, RoutedEventArgs e)
         {
             this.EnableOK(false);
+
+            List<KeyValuePair<Message.NSWProvider, string>> comboDataSource = new List<KeyValuePair<Message.NSWProvider, string>>()
+            {
+                new KeyValuePair<Message.NSWProvider, string>( Message.NSWProvider.DUDR, "HIS-Nord live" ),
+                new KeyValuePair<Message.NSWProvider, string>( Message.NSWProvider.DUDR_TEST, "HIS-Nord Testsystem" ),
+                new KeyValuePair<Message.NSWProvider, string>(Message.NSWProvider.DBH, "DBH")
+            };
+
+            this.comboBoxInitialHIS.ItemsSource = comboDataSource;
+            
         }
 
         public bool ValidId { get; set; }
@@ -36,6 +49,8 @@ namespace ENI2.EditControls
 
         public DateTime? ETA { get { return this.datePickerETA.SelectedDate; } }
 
+        public Message.NSWProvider SelectedHIS { get { return (Message.NSWProvider) this.comboBoxInitialHIS.SelectedValue; } }
+
         private void textBoxVisitTransitId_TextChanged(object sender, TextChangedEventArgs e)
         {
             this.CheckComplete();    
diff --git a/ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml
index 8f4a1e0c..9cc689ee 100644
--- a/ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml
@@ -16,11 +16,22 @@
         <enictrl:ENIDataGrid Grid.Row="0" Grid.Column="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0" x:Name="dataGridSystemErrors">
             <DataGrid.Columns>
-                <DataGridTextColumn Header="At" Binding="{Binding ErrorAt}" IsReadOnly="True" Width="0.15*" />
-                <DataGridTextColumn Header="{x:Static p:Resources.textSendDate}" Binding="{Binding SendDate}" IsReadOnly="True" Width="0.15*" />
+                <DataGridTextColumn Header="At" Binding="{Binding Created}" IsReadOnly="True" Width="0.15*" />
                 <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding ErrorCode}" IsReadOnly="True" Width="0.1*" />
-                <DataGridTextColumn Header="{x:Static p:Resources.textMessage}" Binding="{Binding ErrorMessage}" IsReadOnly="True" Width="0.2*" />
-                <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding ErrorDescription}" IsReadOnly="True" Width="0.3*"  />
+                <DataGridTextColumn Header="{x:Static p:Resources.textMessage}" Binding="{Binding ErrorMessage}" IsReadOnly="True" Width="0.25*">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style>
+                            <Setter Property="TextBlock.TextWrapping" Value="Wrap" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
+                <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding ErrorDescription}" IsReadOnly="True" Width="0.5*">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style>
+                            <Setter Property="TextBlock.TextWrapping" Value="Wrap" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
             </DataGrid.Columns>
         </enictrl:ENIDataGrid>
     </Grid>
diff --git a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml
index 0f4a2ffa..3191ecd4 100644
--- a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml
@@ -8,13 +8,14 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textNewVisitTransitId}" Height="192" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize">
+        Title="{x:Static p:Resources.textNewVisitTransitId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize">
     <Grid Margin="4">
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*" />
@@ -24,6 +25,7 @@
         <Label Name="labelENI" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textENI}" />
         <Label Name="labelPoC" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textPortCall}" />
         <Label Name="labelETA" Grid.Row="3" Grid.Column="0" Content="ETA" />
+        <Label Name="labelHIS" Grid.Row="4" Grid.Column="0" Content="HIS" />
         <xctk:DoubleUpDown x:Name="doubleUpDownIMO" Margin="2" Grid.Row="0" Grid.Column="1"                                                             
                                   ClipValueToMinMax="True"
                                   ShowButtonSpinner="False" 
@@ -52,5 +54,6 @@
                                   Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged" TextAlignment="Left"/>
         <enictrl:LocodeControl Grid.Column="1" Grid.Row="2" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" />
         <DatePicker Name="datePickerETA" Grid.Row="3" Grid.Column="1" Margin="2" SelectedDateChanged="datePickerETA_SelectedDateChanged" />
+        <ComboBox Name="comboBoxInitialHIS" Grid.Row="4" Grid.Column="1" Margin="2" Grid.ColumnSpan="2" DisplayMemberPath="Value" SelectedValuePath="Key" SelectionChanged="comboBoxInitialHIS_SelectionChanged"/>
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml.cs
index 5c604994..bc88fb11 100644
--- a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml.cs
@@ -2,6 +2,7 @@
 // Description: Mit diesem Dialog können neue Visit/Transit-Id's beantragt werden (DE only)
 //
 
+using System.Collections.Generic;
 using System.Windows;
 using ENI2.Controls;
 
@@ -26,6 +27,13 @@ namespace ENI2.EditControls
         private void VisitIdDialog_Loaded(object sender, RoutedEventArgs e)
         {            
             this.OKClicked += VisitIdDialog_OKClicked;
+            List<KeyValuePair<bsmd.database.Message.NSWProvider, string>> comboDataSource = new List<KeyValuePair<bsmd.database.Message.NSWProvider, string>>()
+            {
+                new KeyValuePair<bsmd.database.Message.NSWProvider, string>( Message.NSWProvider.DUDR, "HIS-Nord live" ),
+                new KeyValuePair<bsmd.database.Message.NSWProvider, string>( Message.NSWProvider.DUDR_TEST, "HIS-Nord Testsystem" )
+            };
+
+            this.comboBoxInitialHIS.ItemsSource = comboDataSource;
             this.EnableOK(false);
             this.locodePoC.PropertyChanged += LocodePoC_PropertyChanged;
         }        
@@ -54,6 +62,8 @@ namespace ENI2.EditControls
 
             this.Core.PoC = this.locodePoC.LocodeValue;
             this.Core.Portname = LocodeDB.PortNameFromLocode(this.Core.PoC);
+            this.Core.InitialHIS = (Message.NSWProvider) this.comboBoxInitialHIS.SelectedValue;
+
             this._isOK = true;
         }
 
@@ -87,6 +97,11 @@ namespace ENI2.EditControls
             this.CheckComplete();
         }
 
+        private void comboBoxInitialHIS_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+            this.CheckComplete();
+        }
+
         #endregion
 
         #region input validation
@@ -107,6 +122,8 @@ namespace ENI2.EditControls
 
             isComplete &= validLocode;
 
+            isComplete &= (comboBoxInitialHIS.SelectedValue != null);
+
             this.EnableOK(isComplete);
         }
 
diff --git a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
index fc2f8174..7190016b 100644
--- a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
+++ b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
@@ -108,10 +108,10 @@ namespace ENI2
                     DetailRootControl drc = new DetailRootControl(aMessageCore);
                     drc.LockedByOtherUser = !iDidLockIt;
 
-                    //if (!aMessageCore.Cancelled ?? false)
-                    //{                        
+                    if (!aMessageCore.Cancelled ?? false)
+                    {                        
                         drc.LockedBy = iDidLockIt ? this.userEntity : DBManager.Instance.GetReportingPartyDict()[lockedUserId];
-                    //}
+                    }
 
                     searchResultItem.Content = drc;
                     this.mainFrame.Items.Add(searchResultItem);
@@ -375,6 +375,7 @@ namespace ENI2
                         newCore.Portname = LocodeDB.PortNameFromLocode(newCore.PoC);
                         newCore.IMO = newWithIdDialog.IMO;
                         newCore.ENI = newWithIdDialog.ENI;
+                        newCore.InitialHIS = newWithIdDialog.SelectedHIS;
                         if (newCore.IsTransit)
                             newCore.ETAKielCanal = newWithIdDialog.ETA;
                         else
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
index 9804080c..a86b9f1b 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
@@ -1313,6 +1313,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to {0} crew members imported.
+        /// </summary>
+        public static string textCrewImported {
+            get {
+                return ResourceManager.GetString("textCrewImported", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Crew member.
         /// </summary>
@@ -2852,6 +2861,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to {0} passengers imported.
+        /// </summary>
+        public static string textPassengerImported {
+            get {
+                return ResourceManager.GetString("textPassengerImported", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Number of passengers on board.
         /// </summary>
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.resx b/ENI-2/ENI2/ENI2/Properties/Resources.resx
index aafe21db..47049335 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.resx
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.resx
@@ -1507,4 +1507,10 @@
   <data name="textValue" xml:space="preserve">
     <value>Value</value>
   </data>
+  <data name="textCrewImported" xml:space="preserve">
+    <value>{0} crew members imported</value>
+  </data>
+  <data name="textPassengerImported" xml:space="preserve">
+    <value>{0} passengers imported</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index bc48f86d66d4833fc4988e0e120814305f182457..95f42fc3803fcfabaee302a6b8de5623b9be0e2a 100644
GIT binary patch
delta 21459
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

delta 21357
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

diff --git a/nsw/Source/SendNSWMessageService/NSWSendService.cs b/nsw/Source/SendNSWMessageService/NSWSendService.cs
index 75dbd060..d2065124 100644
--- a/nsw/Source/SendNSWMessageService/NSWSendService.cs
+++ b/nsw/Source/SendNSWMessageService/NSWSendService.cs
@@ -263,10 +263,15 @@ namespace SendNSWMessageService
                     }
                 }
 
-                bsmd.hisnord.transmitter.CallTransmitter();
-                bsmd.hisnord.Request.ReadResponseFiles();
+                bsmd.hisnord.transmitter.CallTransmitter(true);
+                bsmd.hisnord.transmitter.CallTransmitter(false);
+
+                // ob test oder nicht ist in stat. dict gespeicher
+                bsmd.hisnord.Request.ReadResponseFiles();                
                 bsmd.hisnord.Request.Clear();
-                bsmd.hisnord.Response.ReadAnswers();                
+
+                bsmd.hisnord.Response.ReadAnswers(true);
+                bsmd.hisnord.Response.ReadAnswers(false);
 
                 List<MessageCore> coresMarkedForStatusQuery = DBManager.Instance.GetMessageCoresWithNSWStatusFlag();
 
diff --git a/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs b/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
index f3fe7167..3e2224bf 100644
--- a/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
+++ b/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
@@ -498,11 +498,11 @@ namespace bsmd.ExcelReadService
                 result = new DateTime(etaDate.Value.Year, etaDate.Value.Month, etaDate.Value.Day);
                 if (etaTime != null)
                 {
-                    result = new DateTime(etaDate.Value.Year, etaDate.Value.Month, etaDate.Value.Day, etaTime.Value.Hour, etaTime.Value.Minute, etaTime.Value.Second);
+                    result = new DateTime(etaDate.Value.Year, etaDate.Value.Month, etaDate.Value.Day, etaTime.Value.Hour, etaTime.Value.Minute, etaTime.Value.Second, DateTimeKind.Local);
                 }
             }
             if(result.HasValue)
-            {
+            {                
                 // wir haben local time gelesen, wird jetzt in UTC konvertiert                
                 result = result.Value.ToUniversalTime();                
             }
diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index 2e970caf..46dd1bdd 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -299,7 +299,9 @@ namespace bsmd.ExcelReadService
                 string bpolETATime = string.Format("BPOL.PortOfItineraryETATime_{0}", i);
 
                 string bpolNameValue = reader.ReadText(bpolName)?.Trim();
-                if (!bpolNameValue.IsNullOrEmpty())
+                string bpolLocodeValue = reader.ReadLoCode(bpolLocode);
+
+                if (!bpolNameValue.IsNullOrEmpty() || !bpolLocodeValue.IsNullOrEmpty())
                 {
                     PortOfItinerary poi = bpol.GetSublistElementWithIdentifier(i.ToString()) as PortOfItinerary;
                     if (poi == null)
@@ -309,13 +311,11 @@ namespace bsmd.ExcelReadService
                         poi.Identifier = i.ToString();
                         bpol.PortOfItineraries.Add(poi);
                     }
+
                     poi.PortOfItineraryName = bpolNameValue;
                     reader.Conf.ConfirmText(bpolName, bpolNameValue, ExcelReader.ReadState.OK);
-                    poi.PortOfItineraryLocode = reader.ReadLoCode(bpolLocode);
-                    if (!poi.PortOfItineraryLocode.IsNullOrEmpty() && (poi.PortOfItineraryLocode.Length > 5))
-                    {
-                        reader.Conf.ConfirmText(bpolLocode, poi.PortOfItineraryLocode, ExcelReader.ReadState.WARN);
-                    }
+                    poi.PortOfItineraryLocode = bpolLocodeValue;                    
+                    // falls nur Locode angegeben wurde, Portname aus Locode ermitteln                    
                     if(poi.PortOfItineraryName.IsNullOrEmpty() && !poi.PortOfItineraryLocode.IsNullOrEmpty() && (poi.PortOfItineraryLocode.Length == 5))
                     {
                         poi.PortOfItineraryName = LocodeDB.PortNameFromLocode(poi.PortOfItineraryLocode);
@@ -412,10 +412,10 @@ namespace bsmd.ExcelReadService
             } 
             else
             {
-                if (shipClass.Contains('1')) haza.INFShipClass = 1;
-                if (shipClass.Contains('2')) haza.INFShipClass = 2;
-                if (shipClass.Contains('3')) haza.INFShipClass = 3;
-                if (shipClass.Equals("none", StringComparison.OrdinalIgnoreCase)) haza.INFShipClass = 0;
+                if (shipClass.Contains('1')) haza.INFShipClass = 0;
+                if (shipClass.Contains('2')) haza.INFShipClass = 1;
+                if (shipClass.Contains('3')) haza.INFShipClass = 2;
+                // if (shipClass.Equals("none", StringComparison.OrdinalIgnoreCase)) haza.INFShipClass = 0; // "NONE" existiert nicht in der Enumeration!!
                 reader.Conf.ConfirmText("HAZA.INFShipClass", shipClass, haza.INFShipClass.HasValue ? ExcelReader.ReadState.OK : ExcelReader.ReadState.WARN);
             }
 
@@ -717,10 +717,10 @@ namespace bsmd.ExcelReadService
             }
             else
             {
-                if (shipClass.Contains('1')) hazd.INFShipClass = 1;
-                if (shipClass.Contains('2')) hazd.INFShipClass = 2;
-                if (shipClass.Contains('3')) hazd.INFShipClass = 3;
-                if (shipClass.Equals("none", StringComparison.OrdinalIgnoreCase)) hazd.INFShipClass = 0;
+                if (shipClass.Contains('1')) hazd.INFShipClass = 0;
+                if (shipClass.Contains('2')) hazd.INFShipClass = 1;
+                if (shipClass.Contains('3')) hazd.INFShipClass = 2;
+                // if (shipClass.Equals("none", StringComparison.OrdinalIgnoreCase)) hazd.INFShipClass = 0;
                 reader.Conf.ConfirmText("HAZD.INFShipClass", shipClass, hazd.INFShipClass.HasValue ? ExcelReader.ReadState.OK : ExcelReader.ReadState.WARN);
             }
 
@@ -2028,6 +2028,7 @@ namespace bsmd.ExcelReadService
             {
                 SERV newSERV = new SERV();
                 newSERV.MessageHeader = servMessage;
+                newSERV.Identifier = "1";
                 servMessage.Elements.Add(newSERV);
             }
             SERV serv = servMessage.Elements[0] as SERV;
diff --git a/nsw/Source/bsmd.dakosy/Request.cs b/nsw/Source/bsmd.dakosy/Request.cs
index 87ee77a4..6fb65013 100644
--- a/nsw/Source/bsmd.dakosy/Request.cs
+++ b/nsw/Source/bsmd.dakosy/Request.cs
@@ -180,8 +180,9 @@ namespace bsmd.dakosy
                                     for (int i = 0; i < numCallPurpose; i++)
                                     {
                                         vList.Visit[0].NOA_NOD.CallPurpose[i] = new CallPurpose();
-                                        vList.Visit[0].NOA_NOD.CallPurpose[i].CallPurposeCode = noa_nod.CallPurposes[i].CallPurposeCode;
-                                        vList.Visit[0].NOA_NOD.CallPurpose[i].CallPurposeDescription = noa_nod.CallPurposes[i].CallPurposeDescription;
+                                        bsmd.database.CallPurpose callPurpose = noa_nod.CallPurposes[i] as bsmd.database.CallPurpose;
+                                        vList.Visit[0].NOA_NOD.CallPurpose[i].CallPurposeCode = callPurpose.CallPurposeCode;
+                                        vList.Visit[0].NOA_NOD.CallPurpose[i].CallPurposeDescription = callPurpose.CallPurposeDescription;
                                     }
                                 }                                
                                 break;
@@ -206,9 +207,10 @@ namespace bsmd.dakosy
                                     for (int i = 0; i < bpol.PortOfItineraries.Count; i++)
                                     {
                                         vList.Visit[0].BPOL.PortOfItinerary[i] = new PortOfItinerary();
-                                        if (bpol.PortOfItineraries[i].PortOfItineraryETA.HasValue)
-                                            vList.Visit[0].BPOL.PortOfItinerary[i].PortOfItineraryETA = bpol.PortOfItineraries[i].PortOfItineraryETA.Value;
-                                        vList.Visit[0].BPOL.PortOfItinerary[i].PortOfItineraryName = bpol.PortOfItineraries[i].PortOfItineraryName;
+                                        bsmd.database.PortOfItinerary portOfItinerary = bpol.PortOfItineraries[i] as bsmd.database.PortOfItinerary;
+                                        if (portOfItinerary.PortOfItineraryETA.HasValue)
+                                            vList.Visit[0].BPOL.PortOfItinerary[i].PortOfItineraryETA = portOfItinerary.PortOfItineraryETA.Value;
+                                        vList.Visit[0].BPOL.PortOfItinerary[i].PortOfItineraryName = portOfItinerary.PortOfItineraryName;
                                     }
                                 }
                                 vList.Visit[0].BPOL.StowawayOnBoard = bpol.StowawaysOnBoard ?? false;
@@ -358,10 +360,11 @@ namespace bsmd.dakosy
                                     vList.Visit[0].MDH.SanitaryMeasuresDetails = new SanitaryMeasuresDetails[mdh.SanitaryMeasuresDetails.Count];
                                     for (int smIndex = 0; smIndex < mdh.SanitaryMeasuresDetails.Count; smIndex++) {
                                         SanitaryMeasuresDetails smDetails = new SanitaryMeasuresDetails();
-                                        if (mdh.SanitaryMeasuresDetails[smIndex].SanitaryMeasuresDate.HasValue)
-                                            smDetails.SanitaryMeasuresDate = mdh.SanitaryMeasuresDetails[smIndex].SanitaryMeasuresDate.Value;
-                                        smDetails.SanitaryMeasuresLocation = mdh.SanitaryMeasuresDetails[smIndex].SanitaryMeasuresLocation;
-                                        smDetails.SanitaryMeasuresType = mdh.SanitaryMeasuresDetails[smIndex].SanitaryMeasuresType;
+                                        bsmd.database.SanitaryMeasuresDetail sanitaryMeasuresDetail = mdh.SanitaryMeasuresDetails[smIndex] as bsmd.database.SanitaryMeasuresDetail;
+                                        if (sanitaryMeasuresDetail.SanitaryMeasuresDate.HasValue)
+                                            smDetails.SanitaryMeasuresDate = sanitaryMeasuresDetail.SanitaryMeasuresDate.Value;
+                                        smDetails.SanitaryMeasuresLocation = sanitaryMeasuresDetail.SanitaryMeasuresLocation;
+                                        smDetails.SanitaryMeasuresType = sanitaryMeasuresDetail.SanitaryMeasuresType;
                                         vList.Visit[0].MDH.SanitaryMeasuresDetails[smIndex] = smDetails;
                                     }
                                 }
@@ -386,9 +389,10 @@ namespace bsmd.dakosy
                                     for (int iaIndex = 0; iaIndex < mdh.InfectedAreas.Count; iaIndex++)
                                     {
                                         InfectedArea infectedArea = new InfectedArea();
-                                        if (mdh.InfectedAreas[iaIndex].InfectedAreaDate.HasValue)
-                                            infectedArea.InfectedAreaDate = mdh.InfectedAreas[iaIndex].InfectedAreaDate.Value;
-                                        infectedArea.InfectedAreaPort = mdh.InfectedAreas[iaIndex].InfectedAreaPort;
+                                        bsmd.database.InfectedArea ia = mdh.InfectedAreas[iaIndex] as bsmd.database.InfectedArea;
+                                        if (ia.InfectedAreaDate.HasValue)
+                                            infectedArea.InfectedAreaDate = ia.InfectedAreaDate.Value;
+                                        infectedArea.InfectedAreaPort = ia.InfectedAreaPort;
                                         vList.Visit[0].MDH.InfectedArea[iaIndex] = infectedArea;
                                     }
                                 }
@@ -397,19 +401,20 @@ namespace bsmd.dakosy
                                     vList.Visit[0].MDH.PortsOfCallLast30Days = new PortOfCallLast30Days[mdh.PortOfCallLast30Days.Count];
                                     for (int i = 0; i < mdh.PortOfCallLast30Days.Count; i++)
                                     {
+                                        bsmd.database.PortOfCallLast30Days poc30d = mdh.PortOfCallLast30Days[i] as bsmd.database.PortOfCallLast30Days;
                                         vList.Visit[0].MDH.PortsOfCallLast30Days[i] = new PortOfCallLast30Days();
-                                        vList.Visit[0].MDH.PortsOfCallLast30Days[i].Locode = mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysLocode;
-                                        if (mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysDateOfDeparture.HasValue)
-                                            vList.Visit[0].MDH.PortsOfCallLast30Days[i].DateOfDeparture = mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysDateOfDeparture.Value;
-                                        if (mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysCrewMembersJoined.HasValue)
+                                        vList.Visit[0].MDH.PortsOfCallLast30Days[i].Locode = poc30d.PortOfCallLast30DaysLocode;
+                                        if (poc30d.PortOfCallLast30DaysDateOfDeparture.HasValue)
+                                            vList.Visit[0].MDH.PortsOfCallLast30Days[i].DateOfDeparture = poc30d.PortOfCallLast30DaysDateOfDeparture.Value;
+                                        if (poc30d.PortOfCallLast30DaysCrewMembersJoined.HasValue)
                                         {
-                                            vList.Visit[0].MDH.PortsOfCallLast30Days[i].CrewMembersJoined = mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysCrewMembersJoined.Value;
-                                            if(mdh.PortOfCallLast30Days[i].CrewJoinedShip.Count > 0) {
-                                                vList.Visit[0].MDH.PortsOfCallLast30Days[i].CrewJoinedShipName = new CrewJoinedShipName[mdh.PortOfCallLast30Days[i].CrewJoinedShip.Count];
+                                            vList.Visit[0].MDH.PortsOfCallLast30Days[i].CrewMembersJoined = poc30d.PortOfCallLast30DaysCrewMembersJoined.Value;
+                                            if(poc30d.CrewJoinedShip.Count > 0) {
+                                                vList.Visit[0].MDH.PortsOfCallLast30Days[i].CrewJoinedShipName = new CrewJoinedShipName[poc30d.CrewJoinedShip.Count];
                                                 for (int j = 0; j < vList.Visit[0].MDH.PortsOfCallLast30Days[i].CrewJoinedShipName.Length; j++)
                                                 {
                                                     vList.Visit[0].MDH.PortsOfCallLast30Days[i].CrewJoinedShipName[j] = new CrewJoinedShipName();
-                                                    vList.Visit[0].MDH.PortsOfCallLast30Days[i].CrewJoinedShipName[j].Name = mdh.PortOfCallLast30Days[i].CrewJoinedShip[j].PortOfCallLast30DaysCrewJoinedShipName;
+                                                    vList.Visit[0].MDH.PortsOfCallLast30Days[i].CrewJoinedShipName[j].Name = poc30d.CrewJoinedShip[j].PortOfCallLast30DaysCrewJoinedShipName;
                                                 }
                                             }
                                         }
@@ -539,25 +544,28 @@ namespace bsmd.dakosy
                                     vList.Visit[0].SEC.PortFacilityOfArrival = sec.PortFacilityOfArrival;
                                     vList.Visit[0].SEC.GeneralDescriptionOfCargoSpecified = sec.GeneralDescriptionOfCargo.HasValue;
                                     byte gdc = sec.GeneralDescriptionOfCargo ?? 0;
-                                    vList.Visit[0].SEC.GeneralDescriptionOfCargo = CargoTypeFromNSWEnumeration(gdc);                                    if (sec.LastTenPortFacilitesCalled.Count > 0)
+                                    vList.Visit[0].SEC.GeneralDescriptionOfCargo = CargoTypeFromNSWEnumeration(gdc);
+
+                                    if (sec.LastTenPortFacilitesCalled.Count > 0)
                                     {
                                         vList.Visit[0].SEC.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled[sec.LastTenPortFacilitesCalled.Count];
                                         for (int i = 0; i < sec.LastTenPortFacilitesCalled.Count; i++)
                                         {
                                             vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i] = new LastTenPortFacilitiesCalled();
-                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].PortName = sec.LastTenPortFacilitesCalled[i].PortFacilityPortName;
-                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].PortCountry = sec.LastTenPortFacilitesCalled[i].PortFacilityPortCountry;
-                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].PortLoCode = sec.LastTenPortFacilitesCalled[i].PortFacilityPortLoCode;
-                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].DateOfArrivalSpecified = sec.LastTenPortFacilitesCalled[i].PortFacilityDateOfArrival.HasValue;
-                                            if (sec.LastTenPortFacilitesCalled[i].PortFacilityDateOfArrival.HasValue)
-                                                vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].DateOfArrival = sec.LastTenPortFacilitesCalled[i].PortFacilityDateOfArrival.Value;
-                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].DateOfDepartureSpecified = sec.LastTenPortFacilitesCalled[i].PortFacilityDateOfDeparture.HasValue;
-                                            if (sec.LastTenPortFacilitesCalled[i].PortFacilityDateOfDeparture.HasValue)
-                                                vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].DateOfDeparture = sec.LastTenPortFacilitesCalled[i].PortFacilityDateOfDeparture.Value;
-                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].ShipSecurityLevelSpecified = sec.LastTenPortFacilitesCalled[i].PortFacilityShipSecurityLevel.HasValue;
-                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].ShipSecurityLevel = sec.LastTenPortFacilitesCalled[i].PortFacilityShipSecurityLevel ?? 0;
-                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].SecurityMattersToReport = sec.LastTenPortFacilitesCalled[i].PortFacilitySecurityMattersToReport;
-                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].GISISCode = sec.LastTenPortFacilitesCalled[i].PortFacilityGISISCode;
+                                            bsmd.database.LastTenPortFacilitiesCalled l10c = sec.LastTenPortFacilitesCalled[i] as bsmd.database.LastTenPortFacilitiesCalled;
+                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].PortName = l10c.PortFacilityPortName;
+                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].PortCountry = l10c.PortFacilityPortCountry;
+                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].PortLoCode = l10c.PortFacilityPortLoCode;
+                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].DateOfArrivalSpecified = l10c.PortFacilityDateOfArrival.HasValue;
+                                            if (l10c.PortFacilityDateOfArrival.HasValue)
+                                                vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].DateOfArrival = l10c.PortFacilityDateOfArrival.Value;
+                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].DateOfDepartureSpecified = l10c.PortFacilityDateOfDeparture.HasValue;
+                                            if (l10c.PortFacilityDateOfDeparture.HasValue)
+                                                vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].DateOfDeparture = l10c.PortFacilityDateOfDeparture.Value;
+                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].ShipSecurityLevelSpecified = l10c.PortFacilityShipSecurityLevel.HasValue;
+                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].ShipSecurityLevel = l10c.PortFacilityShipSecurityLevel ?? 0;
+                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].SecurityMattersToReport = l10c.PortFacilitySecurityMattersToReport;
+                                            vList.Visit[0].SEC.LastTenPortFacilitiesCalled[i].GISISCode = l10c.PortFacilityGISISCode;
                                         }
                                     }
                                     if (sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Count > 0)
@@ -565,21 +573,22 @@ namespace bsmd.dakosy
                                         vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Count];
                                         for(int i=0;i<sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Count;i++)
                                         {
+                                            bsmd.database.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2sl = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i] as bsmd.database.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled;
                                             vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i] = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
-                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationName = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationName;
-                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationCode = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationLoCode;
-                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationCoordinatesLatitudeSpecified = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationCoordinatesLatitude.HasValue;
-                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationCoordinatesLatitude = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationCoordinatesLatitude ?? 0;
-                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationCoordinatesLongitudeSpecified = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationCoordinatesLongitude.HasValue;
-                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationCoordinatesLongitude = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationCoordinatesLongitude ?? 0;
-                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].DateFromSpecified = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityDateFrom.HasValue;
-                                            if (sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityDateFrom.HasValue)
-                                                vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].DateFrom = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityDateFrom.Value;
-                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].DateToSpecified = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityDateTo.HasValue;
-                                            if (sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityDateTo.HasValue)
-                                                vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].DateTo = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityDateTo.Value;
-                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ActivityType = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityType;
-                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].SecurityMattersToReport = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivitySecurityMattersToReport;                                                
+                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationName = s2sl.ShipToShipActivityLocationName;
+                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationCode = s2sl.ShipToShipActivityLocationLoCode;
+                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationCoordinatesLatitudeSpecified = s2sl.ShipToShipActivityLocationCoordinatesLatitude.HasValue;
+                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationCoordinatesLatitude = s2sl.ShipToShipActivityLocationCoordinatesLatitude ?? 0;
+                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationCoordinatesLongitudeSpecified = s2sl.ShipToShipActivityLocationCoordinatesLongitude.HasValue;
+                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].LocationCoordinatesLongitude = s2sl.ShipToShipActivityLocationCoordinatesLongitude ?? 0;
+                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].DateFromSpecified = s2sl.ShipToShipActivityDateFrom.HasValue;
+                                            if (s2sl.ShipToShipActivityDateFrom.HasValue)
+                                                vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].DateFrom = s2sl.ShipToShipActivityDateFrom.Value;
+                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].DateToSpecified = s2sl.ShipToShipActivityDateTo.HasValue;
+                                            if (s2sl.ShipToShipActivityDateTo.HasValue)
+                                                vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].DateTo = s2sl.ShipToShipActivityDateTo.Value;
+                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ActivityType = s2sl.ShipToShipActivityType;
+                                            vList.Visit[0].SEC.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].SecurityMattersToReport = s2sl.ShipToShipActivitySecurityMattersToReport;                                                
                                         }
                                     }
                                 }
@@ -739,19 +748,20 @@ namespace bsmd.dakosy
                                         vList.Visit[0].WAS.Waste = new Waste[was.Waste.Count];
                                         for (int i = 0; i < was.Waste.Count; i++)
                                         {
-                                            byte wt = (byte) (was.Waste[i].WasteType ?? 0);
+                                            bsmd.database.Waste waste = was.Waste[i] as bsmd.database.Waste;
+                                            byte wt = (byte) (waste.WasteType ?? 0);
                                             vList.Visit[0].WAS.Waste[i] = new Waste();
                                             vList.Visit[0].WAS.Waste[i].WasteType = Request.setWasteType(wt);
-                                            vList.Visit[0].WAS.Waste[i].Description = was.Waste[i].WasteDescription;
-                                            vList.Visit[0].WAS.Waste[i].DisposalAmountMTQSpecified = was.Waste[i].WasteDisposalAmount_MTQ.HasValue;
-                                            vList.Visit[0].WAS.Waste[i].DisposalAmountMTQ = was.Waste[i].WasteDisposalAmount_MTQ ?? 0;
-                                            vList.Visit[0].WAS.Waste[i].CapacityMTQSpecified = was.Waste[i].WasteCapacity_MTQ.HasValue;
-                                            vList.Visit[0].WAS.Waste[i].CapacityMTQ = was.Waste[i].WasteCapacity_MTQ ?? 0;
-                                            vList.Visit[0].WAS.Waste[i].AmountRetainedMTQSpecified = was.Waste[i].WasteAmountRetained_MTQ.HasValue;
-                                            vList.Visit[0].WAS.Waste[i].AmountRetainedMTQ = was.Waste[i].WasteAmountRetained_MTQ ?? 0;
-                                            vList.Visit[0].WAS.Waste[i].DisposalPort = was.Waste[i].WasteDisposalPort;
-                                            vList.Visit[0].WAS.Waste[i].AmountGeneratedTillNextPortMTQSpecified = was.Waste[i].WasteAmountGeneratedTillNextPort_MTQ.HasValue;
-                                            vList.Visit[0].WAS.Waste[i].AmountGeneratedTillNextPortMTQ = was.Waste[i].WasteAmountGeneratedTillNextPort_MTQ ?? 0;
+                                            vList.Visit[0].WAS.Waste[i].Description = waste.WasteDescription;
+                                            vList.Visit[0].WAS.Waste[i].DisposalAmountMTQSpecified = waste.WasteDisposalAmount_MTQ.HasValue;
+                                            vList.Visit[0].WAS.Waste[i].DisposalAmountMTQ = waste.WasteDisposalAmount_MTQ ?? 0;
+                                            vList.Visit[0].WAS.Waste[i].CapacityMTQSpecified = waste.WasteCapacity_MTQ.HasValue;
+                                            vList.Visit[0].WAS.Waste[i].CapacityMTQ = waste.WasteCapacity_MTQ ?? 0;
+                                            vList.Visit[0].WAS.Waste[i].AmountRetainedMTQSpecified = waste.WasteAmountRetained_MTQ.HasValue;
+                                            vList.Visit[0].WAS.Waste[i].AmountRetainedMTQ = waste.WasteAmountRetained_MTQ ?? 0;
+                                            vList.Visit[0].WAS.Waste[i].DisposalPort = waste.WasteDisposalPort;
+                                            vList.Visit[0].WAS.Waste[i].AmountGeneratedTillNextPortMTQSpecified = waste.WasteAmountGeneratedTillNextPort_MTQ.HasValue;
+                                            vList.Visit[0].WAS.Waste[i].AmountGeneratedTillNextPortMTQ = waste.WasteAmountGeneratedTillNextPort_MTQ ?? 0;
                                         }
                                     }
                                 }
diff --git a/nsw/Source/bsmd.database/BKRA.cs b/nsw/Source/bsmd.database/BKRA.cs
index 707e2d1b..2a80bf35 100644
--- a/nsw/Source/bsmd.database/BKRA.cs
+++ b/nsw/Source/bsmd.database/BKRA.cs
@@ -67,7 +67,7 @@ namespace bsmd.database
             else
             {
                 scmd.Parameters.AddWithValue(@"ID", this.Id);
-                scmd.CommandText = string.Format("UPDATE {0} SET BunkerFuelType = @P2, BunkerFuelQuantity_TNE = @P3 WHERE Id = @ID", this.Tablename);
+                scmd.CommandText = string.Format("UPDATE {0} SET BunkerFuelType = @P2, BunkerFuelQuantity_TNE = @P3, Identifiery = @P4 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/BPOL.cs b/nsw/Source/bsmd.database/BPOL.cs
index d023a1bc..124797d2 100644
--- a/nsw/Source/bsmd.database/BPOL.cs
+++ b/nsw/Source/bsmd.database/BPOL.cs
@@ -17,7 +17,7 @@ namespace bsmd.database
     public class BPOL : DatabaseEntity, ISublistContainer
     {
 
-        private List<PortOfItinerary> poi = new List<PortOfItinerary>();
+        private List<DatabaseEntity> poi = new List<DatabaseEntity>();
 
         public BPOL()
         {
@@ -36,7 +36,7 @@ namespace bsmd.database
         [ENI2Validation]
         public bool? CruiseShip { get; set; }
 
-        public List<PortOfItinerary> PortOfItineraries { get { return this.poi; } }
+        public List<DatabaseEntity> PortOfItineraries { get { return this.poi; } }
 
         #endregion
 
diff --git a/nsw/Source/bsmd.database/BRKD.cs b/nsw/Source/bsmd.database/BRKD.cs
index 1866c484..8a1e43ce 100644
--- a/nsw/Source/bsmd.database/BRKD.cs
+++ b/nsw/Source/bsmd.database/BRKD.cs
@@ -67,7 +67,7 @@ namespace bsmd.database
             else
             {
                 scmd.Parameters.AddWithValue(@"ID", this.Id);
-                scmd.CommandText = string.Format("UPDATE {0} SET BunkerFuelType = @P2, BunkerFuelQuantity_TNE = @P3 WHERE Id = @ID", this.Tablename);
+                scmd.CommandText = string.Format("UPDATE {0} SET BunkerFuelType = @P2, BunkerFuelQuantity_TNE = @P3, Identifier = @P4 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/CREW.cs b/nsw/Source/bsmd.database/CREW.cs
index c22b400b..c7d3daa7 100644
--- a/nsw/Source/bsmd.database/CREW.cs
+++ b/nsw/Source/bsmd.database/CREW.cs
@@ -155,7 +155,7 @@ namespace bsmd.database
                 scmd.CommandText = string.Format("UPDATE {0} SET CrewMemberLastName = @P2, CrewMemberFirstName = @P3, " +
                     "CrewMemberPlaceOfBirth = @P4, CrewMemberDateOfBirth = @P5, CrewMemberGender = @P6, CrewMemberNationality = @P7, "+
                     "CrewMemberIdentityDocumentType = @P8, CrewMemberIdentityDocumentId = @P9, CrewMemberVisaNumber = @P10, " +
-                    "CrewMemberDuty = @P11, IsDeparture = @P13 WHERE Id = @ID", this.Tablename);
+                    "CrewMemberDuty = @P11, Identifier = @P12, IsDeparture = @P13 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/CallPurpose.cs b/nsw/Source/bsmd.database/CallPurpose.cs
index 89795728..0298d85d 100644
--- a/nsw/Source/bsmd.database/CallPurpose.cs
+++ b/nsw/Source/bsmd.database/CallPurpose.cs
@@ -58,7 +58,7 @@ namespace bsmd.database
             else
             {
                 scmd.Parameters.AddWithValue(@"ID", this.Id);
-                scmd.CommandText = string.Format("UPDATE {0} SET CallPurposeCode = @P2, CallPurposeDescription = @P3 " +                    
+                scmd.CommandText = string.Format("UPDATE {0} SET CallPurposeCode = @P2, CallPurposeDescription = @P3, Identifier = @P4 " +                    
                     "WHERE Id = @ID", this.Tablename);
             }
         }
diff --git a/nsw/Source/bsmd.database/DBManager.cs b/nsw/Source/bsmd.database/DBManager.cs
index d237c5fd..3d39e5f9 100644
--- a/nsw/Source/bsmd.database/DBManager.cs
+++ b/nsw/Source/bsmd.database/DBManager.cs
@@ -556,6 +556,9 @@ namespace bsmd.database
                 _log.WarnFormat("Entity {0} save: Field truncated: {1}", entity.GetType(), truncatedField);
             }
 
+            
+
+
             SqlCommand cmd = new SqlCommand();
             entity.PrepareSave(cmd);
             int queryResult = this.PerformNonQuery(cmd);
@@ -633,6 +636,13 @@ namespace bsmd.database
 
         #region internal/private funcs
 
+        private void CheckConnection()
+        {
+            if ((this._con == null) ||
+                (this._con.State == ConnectionState.Closed))
+                this.Connect(this.ConnectionString);
+        }
+
         private void LogNonQueryResult(string query, int queryResult)
         {
             switch (queryResult)
@@ -1112,6 +1122,9 @@ namespace bsmd.database
             {
                 try
                 {
+
+                    this.CheckConnection();
+
                     cmd.Connection = this._con;
                     // Stopwatch sw = new Stopwatch();
                     // sw.Start();
@@ -1142,6 +1155,8 @@ namespace bsmd.database
             {
                 try
                 {
+                    this.CheckConnection();
+
                     cmd.Connection = this._con;
                     result = cmd.ExecuteNonQuery();
                 }
@@ -1168,6 +1183,7 @@ namespace bsmd.database
             {
                 try
                 {
+                    this.CheckConnection();
                     cmd.Connection = this._con;
                     result = (bool?)cmd.ExecuteScalar();                    
                 }
@@ -1193,6 +1209,7 @@ namespace bsmd.database
             {
                 try
                 {
+                    this.CheckConnection();
                     cmd.Connection = this._con;
                     result = (int?)cmd.ExecuteScalar();
                 }
@@ -1215,6 +1232,8 @@ namespace bsmd.database
         {
             lock (this._lock)
             {
+                this.CheckConnection();
+
                 using (SqlBulkCopy bulkCopy = new SqlBulkCopy(this._con, SqlBulkCopyOptions.UseInternalTransaction | SqlBulkCopyOptions.TableLock, null))
                 {
                     bulkCopy.BulkCopyTimeout = 180;
diff --git a/nsw/Source/bsmd.database/DatabaseEntity.cs b/nsw/Source/bsmd.database/DatabaseEntity.cs
index 11880bb4..432312ff 100644
--- a/nsw/Source/bsmd.database/DatabaseEntity.cs
+++ b/nsw/Source/bsmd.database/DatabaseEntity.cs
@@ -194,10 +194,39 @@ namespace bsmd.database
                 }
             }
 
-            if (maxVal == -1) return 1.ToString();
+            if (maxVal == -1)
+            {
+                // Spezialbalkone
+                try
+                {
+                    Type type = sublist.GetType().GetGenericArguments()[0];
+                    if (type == typeof(IMDGPosition)) return "IMDG-1";
+                    if (type == typeof(IBCPosition)) return "IBC-1";
+                    if (type == typeof(IGCPosition)) return "IGC-1";
+                    if (type == typeof(IMSBCPosition)) return "IMSBC-1";
+                    if (type == typeof(MARPOL_Annex_I_Position)) return "MARPOL-1";
+                }
+                catch
+                {                    
+                }
+
+                return 1.ToString();
+
+            }
             return maxString;                        
         }
 
+        public static void ResetIdentifiers(IList<DatabaseEntity> sublist)
+        {
+            List<DatabaseEntity> tmpList = new List<DatabaseEntity>(sublist);
+            sublist.Clear();
+            foreach(ISublistElement element in tmpList)
+            {
+                element.Identifier = DatabaseEntity.GetNewIdentifier(sublist);
+                sublist.Add(element as DatabaseEntity);
+            }
+        }
+
         #endregion
 
         #region IEquatable<T> implementation
diff --git a/nsw/Source/bsmd.database/HAZ.cs b/nsw/Source/bsmd.database/HAZ.cs
index ebd94399..91dfc543 100644
--- a/nsw/Source/bsmd.database/HAZ.cs
+++ b/nsw/Source/bsmd.database/HAZ.cs
@@ -15,11 +15,11 @@ namespace bsmd.database
     public class HAZ : DatabaseEntity, ISublistContainer
     {
 
-        private List<IMDGPosition> imdgPositions = new List<IMDGPosition>();
-        private List<IBCPosition> ibcPositions = new List<IBCPosition>();
-        private List<IGCPosition> igcPositions = new List<IGCPosition>();
-        private List<IMSBCPosition> imsbcPositions = new List<IMSBCPosition>();
-        private List<MARPOL_Annex_I_Position> marpolPositions = new List<MARPOL_Annex_I_Position>();
+        private List<DatabaseEntity> imdgPositions = new List<DatabaseEntity>();
+        private List<DatabaseEntity> ibcPositions = new List<DatabaseEntity>();
+        private List<DatabaseEntity> igcPositions = new List<DatabaseEntity>();
+        private List<DatabaseEntity> imsbcPositions = new List<DatabaseEntity>();
+        private List<DatabaseEntity> marpolPositions = new List<DatabaseEntity>();
         private bool _isDeparture;
 
         public HAZ()
@@ -72,15 +72,15 @@ namespace bsmd.database
         [ENI2Validation]
         public string DPGContactPhone { get; set; }
         
-        public List<IMDGPosition> IMDGPositions { get { return this.imdgPositions; } }
+        public List<DatabaseEntity> IMDGPositions { get { return this.imdgPositions; } }
         
-        public List<IBCPosition> IBCPositions { get { return this.ibcPositions; } }
+        public List<DatabaseEntity> IBCPositions { get { return this.ibcPositions; } }
 
-        public List<IGCPosition> IGCPositions { get { return this.igcPositions; } }
+        public List<DatabaseEntity> IGCPositions { get { return this.igcPositions; } }
 
-        public List<IMSBCPosition> IMSBCPositions { get { return this.imsbcPositions; } }
+        public List<DatabaseEntity> IMSBCPositions { get { return this.imsbcPositions; } }
 
-        public List<MARPOL_Annex_I_Position> MARPOLPositions { get { return this.marpolPositions; } }
+        public List<DatabaseEntity> MARPOLPositions { get { return this.marpolPositions; } }
 
         // selektor HAZA / HAZD
         [ShowReport]
diff --git a/nsw/Source/bsmd.database/InfectedArea.cs b/nsw/Source/bsmd.database/InfectedArea.cs
index 63a48202..32afe712 100644
--- a/nsw/Source/bsmd.database/InfectedArea.cs
+++ b/nsw/Source/bsmd.database/InfectedArea.cs
@@ -100,7 +100,7 @@ namespace bsmd.database
             }
             else
             {
-                scmd.CommandText = string.Format("UPDATE {0} SET InfectedAreaPort = @P2, InfectedAreaDate = @P3 " +
+                scmd.CommandText = string.Format("UPDATE {0} SET InfectedAreaPort = @P2, InfectedAreaDate = @P3, Identifier = @P4 " +
                     "WHERE Id = @ID", this.Tablename);
                 scmd.Parameters.AddWithNullableValue("@ID", this.Id);
             }
diff --git a/nsw/Source/bsmd.database/LADG.cs b/nsw/Source/bsmd.database/LADG.cs
index 7af0f0e4..7af22590 100644
--- a/nsw/Source/bsmd.database/LADG.cs
+++ b/nsw/Source/bsmd.database/LADG.cs
@@ -160,7 +160,8 @@ namespace bsmd.database
             {
                 scmd.Parameters.AddWithValue(@"ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET CargoHandlingType = @P2, CargoCodeNST = @P3,  CargoNumberOfItems = @P4, " +
-                    "CargoGrossQuantity_TNE = @P5, PortOfLoading = @P6, PortOfDischarge = @P7, CargoLACode = @P9, CargoCodeNST_3 = @P10 WHERE Id = @ID", this.Tablename);
+                    "CargoGrossQuantity_TNE = @P5, PortOfLoading = @P6, PortOfDischarge = @P7, CargoLACode = @P9, CargoCodeNST_3 = @P10, " +
+                    "Identifier = @P8 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/LastTenPortFacilitiesCalled.cs b/nsw/Source/bsmd.database/LastTenPortFacilitiesCalled.cs
index 1c656250..3c1a6bfb 100644
--- a/nsw/Source/bsmd.database/LastTenPortFacilitiesCalled.cs
+++ b/nsw/Source/bsmd.database/LastTenPortFacilitiesCalled.cs
@@ -101,8 +101,8 @@ namespace bsmd.database
                 scmd.Parameters.AddWithValue(@"ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET PortFacilityPortName = @P2, PortFacilityPortCountry = @P3, " +
                     "PortFacilityPortLoCode = @P4, PortFacilityDateOfArrival = @P5, PortFacilityDateOfDeparture = @P6," +
-                    "PortFacilityShipSecurityLevel = @P7, PortFacilitySecurityMattersToReport = @P8, PortFacilityGISISCode = @P9 " +
-                    " WHERE Id = @ID", this.Tablename);
+                    "PortFacilityShipSecurityLevel = @P7, PortFacilitySecurityMattersToReport = @P8, PortFacilityGISISCode = @P9, " +
+                    "Identifier = @P10 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/MDH.cs b/nsw/Source/bsmd.database/MDH.cs
index 1d99b48e..6490177d 100644
--- a/nsw/Source/bsmd.database/MDH.cs
+++ b/nsw/Source/bsmd.database/MDH.cs
@@ -18,28 +18,29 @@ namespace bsmd.database
     public class MDH : DatabaseEntity, ISublistContainer
     {
 
-        private List<PortOfCallLast30Days> portOfCallLast30Days = new List<PortOfCallLast30Days>();
+        private List<DatabaseEntity> portOfCallLast30Days = new List<DatabaseEntity>();
 
-        private List<SanitaryMeasuresDetail> sanitaryMeasuresDetails = new List<SanitaryMeasuresDetail>();
+        private List<DatabaseEntity> sanitaryMeasuresDetails = new List<DatabaseEntity>();
 
-        private List<StowawaysJoiningLocation> stowawaysJoiningLocations = new List<database.StowawaysJoiningLocation>();
+        private List<DatabaseEntity> stowawaysJoiningLocations = new List<DatabaseEntity>();
 
-        private List<InfectedArea> infectedAreas = new List<InfectedArea>();
+        private List<DatabaseEntity> infectedAreas = new List<DatabaseEntity>();
 
         public MDH()
         {
             this.tablename = "[dbo].[MDH]";
+            this.MDHSimplification = false;
         }
 
         #region Properties
 
-        public List<PortOfCallLast30Days> PortOfCallLast30Days { get { return this.portOfCallLast30Days; } }
+        public List<DatabaseEntity> PortOfCallLast30Days { get { return this.portOfCallLast30Days; } }
 
-        public List<SanitaryMeasuresDetail> SanitaryMeasuresDetails { get { return this.sanitaryMeasuresDetails; } }
+        public List<DatabaseEntity> SanitaryMeasuresDetails { get { return this.sanitaryMeasuresDetails; } }
 
-        public List<StowawaysJoiningLocation> StowawaysJoiningLocations { get { return this.stowawaysJoiningLocations; } }
+        public List<DatabaseEntity> StowawaysJoiningLocations { get { return this.stowawaysJoiningLocations; } }
 
-        public List<InfectedArea> InfectedAreas { get { return this.infectedAreas; } }
+        public List<DatabaseEntity> InfectedAreas { get { return this.infectedAreas; } }
 
         [ShowReport]
         [Validation1(ValidationCode.NOT_NULL)]
@@ -191,7 +192,7 @@ namespace bsmd.database
                 {
                     if (i > 0)
                         sb.Append(", ");
-                    sb.Append(this.StowawaysJoiningLocations[i].StowawayJoiningLocation);
+                    sb.Append(((StowawaysJoiningLocation)this.StowawaysJoiningLocations[i]).StowawayJoiningLocation);
                 }
                 return sb.ToString();
             }
diff --git a/nsw/Source/bsmd.database/NOA_NOD.cs b/nsw/Source/bsmd.database/NOA_NOD.cs
index df6125f8..2c9e96ec 100644
--- a/nsw/Source/bsmd.database/NOA_NOD.cs
+++ b/nsw/Source/bsmd.database/NOA_NOD.cs
@@ -17,7 +17,7 @@ namespace bsmd.database
     public class NOA_NOD : DatabaseEntity, ISublistContainer
     {
 
-        List<CallPurpose> callPurposes = new List<CallPurpose>();
+        List<DatabaseEntity> callPurposes = new List<DatabaseEntity>();
 
         public NOA_NOD()
         {
@@ -37,7 +37,7 @@ namespace bsmd.database
         public DateTime? ETDFromPortOfCall { get; set; }
 
         [Validation1(ValidationCode.NOT_NULL)]
-        public List<CallPurpose> CallPurposes { get { return this.callPurposes; } }
+        public List<DatabaseEntity> CallPurposes { get { return this.callPurposes; } }
 
         [ShowReport]
         [Validation2(ValidationCode.NOT_NULL)]
diff --git a/nsw/Source/bsmd.database/PAS.cs b/nsw/Source/bsmd.database/PAS.cs
index e0787c07..907b5544 100644
--- a/nsw/Source/bsmd.database/PAS.cs
+++ b/nsw/Source/bsmd.database/PAS.cs
@@ -170,7 +170,7 @@ namespace bsmd.database
                     "PassengerPlaceOfBirth = @P4, PassengerDateOfBirth = @P5, PassengerGender = @P6," +
                     "PassengerNationality = @P7, PassengerIdentityDocumentType = @P8, PassengerIdentityDocumentId = @P9, " +
                     "PassengerVisaNumber = @P10, PassengerPortOfEmbarkation = @P11, PassengerPortOfDisembarkation = @P12, " +
-                    "PassengerInTransit = @P13, IsDeparture = @P15 WHERE Id = @ID", this.Tablename);
+                    "PassengerInTransit = @P13, IsDeparture = @P15, Identifier = @P14 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/PortOfCallLast30Days.cs b/nsw/Source/bsmd.database/PortOfCallLast30Days.cs
index 1ece87b8..597f4633 100644
--- a/nsw/Source/bsmd.database/PortOfCallLast30Days.cs
+++ b/nsw/Source/bsmd.database/PortOfCallLast30Days.cs
@@ -141,7 +141,7 @@ namespace bsmd.database
             else
             {
                 scmd.CommandText = string.Format("UPDATE {0} SET PortOfCallLast30DaysLocode = @P2, PortOfCallLast30DaysDateOfDeparture = @P3, " +
-                    "PortOfCallLast30DaysCrewMembersJoined = @P4 WHERE Id = @ID", this.Tablename);
+                    "PortOfCallLast30DaysCrewMembersJoined = @P4, Identifier = @P5 WHERE Id = @ID", this.Tablename);
                 scmd.Parameters.AddWithNullableValue("@ID", this.Id);
             }
         }
diff --git a/nsw/Source/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs b/nsw/Source/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs
index 9a0e02a4..702c854f 100644
--- a/nsw/Source/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs
+++ b/nsw/Source/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs
@@ -53,7 +53,7 @@ namespace bsmd.database
             }
             else
             {
-                cmd.CommandText = string.Format("UPDATE {0} SET PortOfCallLast30DaysCrewJoinedShipName = @P2 WHERE Id = @ID", this.Tablename);
+                cmd.CommandText = string.Format("UPDATE {0} SET PortOfCallLast30DaysCrewJoinedShipName = @P2, Identifier = @P3 WHERE Id = @ID", this.Tablename);
                 scmd.Parameters.AddWithValue("@ID", this.Id);
             }
 
diff --git a/nsw/Source/bsmd.database/PortOfItinerary.cs b/nsw/Source/bsmd.database/PortOfItinerary.cs
index fd989b92..32385669 100644
--- a/nsw/Source/bsmd.database/PortOfItinerary.cs
+++ b/nsw/Source/bsmd.database/PortOfItinerary.cs
@@ -67,7 +67,7 @@ namespace bsmd.database
             {
                 scmd.Parameters.AddWithValue(@"ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET PortOfItineraryName = @P2, PortOfItineraryETA = @P3, " +
-                    "PortOfItineraryLocode = @P5 WHERE Id = @ID", this.Tablename);
+                    "PortOfItineraryLocode = @P5, Identifier = @P4 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 5c2dd954..d752dc66 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("3.7.2")]
+[assembly: AssemblyInformationalVersion("3.7.3")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2017 Informatikbüro Daniel Schick. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index 2efeaf3f..b90d04e8 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.7.2.*")]
+[assembly: AssemblyVersion("3.7.3.*")]
 
diff --git a/nsw/Source/bsmd.database/SEC.cs b/nsw/Source/bsmd.database/SEC.cs
index 3c9ac593..502c1830 100644
--- a/nsw/Source/bsmd.database/SEC.cs
+++ b/nsw/Source/bsmd.database/SEC.cs
@@ -17,13 +17,14 @@ namespace bsmd.database
     public class SEC : DatabaseEntity, ISublistContainer
     {
 
-        private List<LastTenPortFacilitiesCalled> ltpfc = new List<LastTenPortFacilitiesCalled>();
+        private List<DatabaseEntity> ltpfc = new List<DatabaseEntity>();
 
-        private List<ShipToShipActivitiesDuringLastTenPortFacilitiesCalled> lsts = new List<ShipToShipActivitiesDuringLastTenPortFacilitiesCalled>();
+        private List<DatabaseEntity> lsts = new List<DatabaseEntity>();
 
         public SEC()
         {
             this.tablename = "[dbo].[SEC]";
+            this.SECSimplification = false;
         }
 
         #region Properties
@@ -151,9 +152,9 @@ namespace bsmd.database
         [ENI2Validation]
         public DateTime? KielCanalPassagePlannedOutgoing { get; set; }
 
-        public List<LastTenPortFacilitiesCalled> LastTenPortFacilitesCalled { get { return this.ltpfc; } }
+        public List<DatabaseEntity> LastTenPortFacilitesCalled { get { return this.ltpfc; } }
 
-        public List<ShipToShipActivitiesDuringLastTenPortFacilitiesCalled> ShipToShipActivitiesDuringLastTenPortFacilitiesCalled { get { return this.lsts; } }
+        public List<DatabaseEntity> ShipToShipActivitiesDuringLastTenPortFacilitiesCalled { get { return this.lsts; } }
 
         #endregion
 
diff --git a/nsw/Source/bsmd.database/SERV.cs b/nsw/Source/bsmd.database/SERV.cs
index 3ba9b76c..e15a89b4 100644
--- a/nsw/Source/bsmd.database/SERV.cs
+++ b/nsw/Source/bsmd.database/SERV.cs
@@ -76,8 +76,8 @@ namespace bsmd.database
             else
             {
                 scmd.Parameters.AddWithValue(@"ID", this.Id);
-                scmd.CommandText = string.Format("UPDATE {0} SET ServiceName = @P2, ServiceBeneficiary = @P3, ServiceInvoiceRecipient = @P4 " +
-                    "WHERE Id = @ID", this.Tablename);
+                scmd.CommandText = string.Format("UPDATE {0} SET ServiceName = @P2, ServiceBeneficiary = @P3, ServiceInvoiceRecipient = @P4, " +
+                    "Identifier = @P5 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/STO.cs b/nsw/Source/bsmd.database/STO.cs
index 678e9973..f1080f68 100644
--- a/nsw/Source/bsmd.database/STO.cs
+++ b/nsw/Source/bsmd.database/STO.cs
@@ -134,7 +134,7 @@ namespace bsmd.database
             {
                 scmd.Parameters.AddWithValue(@"ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET Name = @P2, Quantity = @P3,  QuantityUnit = @P4, " +
-                    "LocationOnBoard = @P5, OfficialUse = @P6 WHERE Id = @ID", this.Tablename);
+                    "LocationOnBoard = @P5, OfficialUse = @P6, Identifier = @P7 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/SanitaryMeasuresDetail.cs b/nsw/Source/bsmd.database/SanitaryMeasuresDetail.cs
index f85b1244..0a386e37 100644
--- a/nsw/Source/bsmd.database/SanitaryMeasuresDetail.cs
+++ b/nsw/Source/bsmd.database/SanitaryMeasuresDetail.cs
@@ -67,7 +67,7 @@ namespace bsmd.database
             else
             {
                 scmd.CommandText = string.Format("UPDATE {0} SET SanitaryMeasuresType = @P2, SanitaryMeasuresLocation = @P3, " +
-                    "SanitaryMeasuresDate = @P4 WHERE Id = @ID", this.Tablename);
+                    "SanitaryMeasuresDate = @P4, Identifier = @P5 WHERE Id = @ID", this.Tablename);
                 scmd.Parameters.AddWithNullableValue("@ID", this.Id);
             }
         }
diff --git a/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs b/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
index 50cd4b34..48a1fe1a 100644
--- a/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
+++ b/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
@@ -99,7 +99,7 @@ namespace bsmd.database
                 scmd.Parameters.AddWithValue(@"ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET ShipToShipActivityLocationName = @P2, ShipToShipActivityLocationLoCode = @P3, " +
                     "ShipToShipActivityLocationCoordinatesLatitude = @P4, ShipToShipActivityLocationCoordinatesLongitude = @P5, ShipToShipActivityDateFrom = @P6," +
-                    "ShipToShipActivityDateTo = @P7, ShipToShipActivityType = @P8, ShipToShipActivitySecurityMattersToReport = @P9 " +
+                    "ShipToShipActivityDateTo = @P7, ShipToShipActivityType = @P8, ShipToShipActivitySecurityMattersToReport = @P9, Identifier = @P10 " +
                     " WHERE Id = @ID", this.Tablename);
             }
         }
diff --git a/nsw/Source/bsmd.database/StowawaysJoiningLocation.cs b/nsw/Source/bsmd.database/StowawaysJoiningLocation.cs
index 2658e4ea..6ab01e3a 100644
--- a/nsw/Source/bsmd.database/StowawaysJoiningLocation.cs
+++ b/nsw/Source/bsmd.database/StowawaysJoiningLocation.cs
@@ -55,7 +55,7 @@ namespace bsmd.database
             }
             else
             {
-                scmd.CommandText = string.Format("UPDATE {0} SET StowawaysJoiningLocation = @P2 WHERE Id = @ID", this.Tablename);
+                scmd.CommandText = string.Format("UPDATE {0} SET StowawaysJoiningLocation = @P2, Identifier = @P3 WHERE Id = @ID", this.Tablename);
                 scmd.Parameters.AddWithNullableValue("@ID", this.Id);
             }
         }
diff --git a/nsw/Source/bsmd.database/SubsidiaryRisks.cs b/nsw/Source/bsmd.database/SubsidiaryRisks.cs
index 0ebf7813..b6047d8d 100644
--- a/nsw/Source/bsmd.database/SubsidiaryRisks.cs
+++ b/nsw/Source/bsmd.database/SubsidiaryRisks.cs
@@ -52,7 +52,7 @@ namespace bsmd.database
             }
             else
             {
-                cmd.CommandText = string.Format("UPDATE {0} SET SubsidiaryRisk = @P2 WHERE Id = @ID", this.Tablename);
+                cmd.CommandText = string.Format("UPDATE {0} SET SubsidiaryRisk = @P2, Identifier = @P3 WHERE Id = @ID", this.Tablename);
                 scmd.Parameters.AddWithValue("@ID", this.Id);
             }
         }
diff --git a/nsw/Source/bsmd.database/TOWA.cs b/nsw/Source/bsmd.database/TOWA.cs
index a2dff0b0..98d22841 100644
--- a/nsw/Source/bsmd.database/TOWA.cs
+++ b/nsw/Source/bsmd.database/TOWA.cs
@@ -164,7 +164,7 @@ namespace bsmd.database
                     "TowageOnArrivalOperatorPhone = @P9, TowageOnArrivalOperatorFax = @P10, TowageOnArrivalOperatorEmail = @P11, " +
                     "TowageOnArrivalGrossTonnage = @P12, TowageOnArrivalLengthOverall_MTR = @P13, " +
                     "TowageOnArrivalBeam_MTR = @P14, TowageOnArrivalPurposeOfCall = @P15, TowageOnArrivalDraught_DMT = @P16, " +
-                    "TowageOnArrivalRemarks = @P17 WHERE Id = @ID", this.Tablename);
+                    "TowageOnArrivalRemarks = @P17, Identifier = @P18 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/TOWD.cs b/nsw/Source/bsmd.database/TOWD.cs
index 9f048c73..66880380 100644
--- a/nsw/Source/bsmd.database/TOWD.cs
+++ b/nsw/Source/bsmd.database/TOWD.cs
@@ -148,7 +148,7 @@ namespace bsmd.database
                     "TowageOnDepartureOperatorPhone = @P9, TowageOnDepartureOperatorFax = @P10, TowageOnDepartureOperatorEmail = @P11, " +
                     "TowageOnDepartureLengthOverall_MTR = @P12, " +
                     "TowageOnDepartureBeam_MTR = @P13, TowageOnDepartureDraught_DMT = @P14, " +
-                    "TowageOnDepartureRemarks = @P15 WHERE Id = @ID", this.Tablename);
+                    "TowageOnDepartureRemarks = @P15, Identifier = @P16 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/ValidationCondition.cs b/nsw/Source/bsmd.database/ValidationCondition.cs
index 48fe4342..194f505e 100644
--- a/nsw/Source/bsmd.database/ValidationCondition.cs
+++ b/nsw/Source/bsmd.database/ValidationCondition.cs
@@ -44,16 +44,14 @@ namespace bsmd.database
 
         public ConditionOperatorEnum ConditionOperator { get; set; }
 
-        public string Value { get; set; }
-
-        public string ErrorMessage { get; set; }
+        public string Value { get; set; }        
         
 
         #endregion
 
         #region static methods
 
-        public static bool? CheckConditions(MessageCore core, List<Message> messages, ConditionGroup cGroup, out string message)
+        public static bool? CheckConditions(MessageCore core, List<Message> messages, ConditionGroup cGroup, List<ValidationField> failedFieldList, out string message)
         {
             bool? result = null;
             message = "";
@@ -70,7 +68,7 @@ namespace bsmd.database
 
 
 
-                    string errorMessage = condition.ErrorMessage;
+                    string errorMessage = cGroup.ErrorMessage;
                     if (otherargs != null)
                         errorMessage = string.Format(errorMessage, otherargs);
 
@@ -89,7 +87,7 @@ namespace bsmd.database
                 foreach (ConditionGroup subGroup in cGroup.SubGroups)
                 {
                     string subMessage = "";
-                    bool? subResult = ValidationCondition.CheckConditions(core, messages, subGroup, out subMessage);
+                    bool? subResult = ValidationCondition.CheckConditions(core, messages, subGroup, failedFieldList, out subMessage);
                     if (!subResult.HasValue) // an error occurred evaluating this element
                     {
                         return subResult;
@@ -316,6 +314,8 @@ namespace bsmd.database
             set;
         }
 
+        public string ErrorMessage { get; set; }
+
         [XmlIgnore]
         public ObservableCollection<ConditionGroup> SubGroups
         {
diff --git a/nsw/Source/bsmd.database/WAS.cs b/nsw/Source/bsmd.database/WAS.cs
index e16248b9..fbe5098f 100644
--- a/nsw/Source/bsmd.database/WAS.cs
+++ b/nsw/Source/bsmd.database/WAS.cs
@@ -19,7 +19,7 @@ namespace bsmd.database
 
         private List<WasteDisposalServiceProvider> wdsp = new List<WasteDisposalServiceProvider>();
 
-        private List<Waste> waste = new List<Waste>();
+        private List<DatabaseEntity> waste = new List<DatabaseEntity>();
 
         private static readonly int[] dkWasteCodes = { 1100, 1200, 1300, 2100, 2200, 2300, 2311, 2308, 2300, 2309, 3000, 5100, 5200, 5300, 2300 };
         private static readonly string[] dkWasteTypes = { "Waste oils - Sludge", "Waste oils - Bilge water", "Waste oils - Other", "Garbage - Food waste", "Garbage - Plastic", "Garbage - Other", "Garbage - Other - Cooking oil", "Garbage - Other - Incinerator ashes and clinkers", "Garbage - Other", "Garbage - Other - Animal carcasses", "Sewage", "Cargo residues - Marpol Annex I - Other", "Cargo residues - Marpol Annex II - Other", "Cargo residues - Marpol Annex V - Other", "Garbage - Other" };
@@ -27,6 +27,7 @@ namespace bsmd.database
         public WAS()
         {
             this.tablename = "[dbo].[WAS]";
+            this.WasteDisposalValidExemption = false;
         }
 
         #region Properties
@@ -67,7 +68,7 @@ namespace bsmd.database
         [ENI2Validation]
         public bool? ConfirmationOfSufficiency { get; set; }
 
-        public List<Waste> Waste { get { return this.waste; } }
+        public List<DatabaseEntity> Waste { get { return this.waste; } }
 
         public List<WasteDisposalServiceProvider> WasteDisposalServiceProvider { get { return this.wdsp; } }
 
diff --git a/nsw/Source/bsmd.database/Waste.cs b/nsw/Source/bsmd.database/Waste.cs
index 4bd42faa..797f5206 100644
--- a/nsw/Source/bsmd.database/Waste.cs
+++ b/nsw/Source/bsmd.database/Waste.cs
@@ -152,8 +152,8 @@ namespace bsmd.database
                 scmd.Parameters.AddWithValue(@"ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET WasteType = @P2, WasteDescription = @P3, " +
                     "WasteDisposalAmount_MTQ = @P4, WasteCapacity_MTQ = @P5, WasteAmountRetained_MTQ = @P6," +
-                    "WasteDisposalPort = @P7, WasteAmountGeneratedTillNextPort_MTQ = @P8, WasteDisposedAtLastPort_MTQ = @P9 " +
-                    "WHERE Id = @ID", this.Tablename);
+                    "WasteDisposalPort = @P7, WasteAmountGeneratedTillNextPort_MTQ = @P8, WasteDisposedAtLastPort_MTQ = @P9, " +
+                    "Identifier = @P10 WHERE Id = @ID", this.Tablename);
             }
         }
 
diff --git a/nsw/Source/bsmd.dbh/Request.cs b/nsw/Source/bsmd.dbh/Request.cs
index 9ce69f04..e35fe950 100644
--- a/nsw/Source/bsmd.dbh/Request.cs
+++ b/nsw/Source/bsmd.dbh/Request.cs
@@ -185,8 +185,9 @@ namespace bsmd.dbh
                                 {
                                     choiceList.Add(ItemsChoiceType.CallPurpose);
                                     RootNOA_NODCallPurpose rnncp = new RootNOA_NODCallPurpose();
-                                    rnncp.CallPurposeCode = noa_nod.CallPurposes[i].CallPurposeCode;
-                                    rnncp.CallPurposeDescription = noa_nod.CallPurposes[i].CallPurposeDescription;
+                                    CallPurpose callPurpose = noa_nod.CallPurposes[i] as CallPurpose;
+                                    rnncp.CallPurposeCode = callPurpose.CallPurposeCode;
+                                    rnncp.CallPurposeDescription = callPurpose.CallPurposeDescription;
                                     choices.Add(rnncp);
                                 }
                             }                            
@@ -328,17 +329,18 @@ namespace bsmd.dbh
                                 choiceType1s.Add(ItemsChoiceType1.LastTenPortFacilitiesCalled);
                                 RootSECLastTenPortFacilitiesCalled lastTen = new RootSECLastTenPortFacilitiesCalled();
                                 secItems.Add(lastTen);
-                                lastTen.PortFacilityPortName = sec.LastTenPortFacilitesCalled[i].PortFacilityPortName;
-                                lastTen.PortFacilityPortCountry = sec.LastTenPortFacilitesCalled[i].PortFacilityPortCountry;
-                                lastTen.PortFacilityPortLoCode = sec.LastTenPortFacilitesCalled[i].PortFacilityPortLoCode;
-                                if (sec.LastTenPortFacilitesCalled[i].PortFacilityDateOfArrival.HasValue)
-                                    lastTen.PortFacilityDateOfArrival = sec.LastTenPortFacilitesCalled[i].PortFacilityDateOfArrival.Value;
-                                if (sec.LastTenPortFacilitesCalled[i].PortFacilityDateOfDeparture.HasValue)
-                                    lastTen.PortFacilityDateOfDeparture = sec.LastTenPortFacilitesCalled[i].PortFacilityDateOfDeparture.Value;
-                                if (sec.LastTenPortFacilitesCalled[i].PortFacilityShipSecurityLevel.HasValue)
-                                    lastTen.PortFacilityShipSecurityLevel = sec.LastTenPortFacilitesCalled[i].PortFacilityShipSecurityLevel.Value;
-                                lastTen.PortFacilitySecurityMattersToReport = sec.LastTenPortFacilitesCalled[i].PortFacilitySecurityMattersToReport;
-                                lastTen.PortFacilityGISISCode = sec.LastTenPortFacilitesCalled[i].PortFacilityGISISCode;
+                                LastTenPortFacilitiesCalled lastTenPortFacilitiesCalled = sec.LastTenPortFacilitesCalled[i] as LastTenPortFacilitiesCalled;
+                                lastTen.PortFacilityPortName = lastTenPortFacilitiesCalled.PortFacilityPortName;
+                                lastTen.PortFacilityPortCountry = lastTenPortFacilitiesCalled.PortFacilityPortCountry;
+                                lastTen.PortFacilityPortLoCode = lastTenPortFacilitiesCalled.PortFacilityPortLoCode;
+                                if (lastTenPortFacilitiesCalled.PortFacilityDateOfArrival.HasValue)
+                                    lastTen.PortFacilityDateOfArrival = lastTenPortFacilitiesCalled.PortFacilityDateOfArrival.Value;
+                                if (lastTenPortFacilitiesCalled.PortFacilityDateOfDeparture.HasValue)
+                                    lastTen.PortFacilityDateOfDeparture = lastTenPortFacilitiesCalled.PortFacilityDateOfDeparture.Value;
+                                if (lastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel.HasValue)
+                                    lastTen.PortFacilityShipSecurityLevel = lastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel.Value;
+                                lastTen.PortFacilitySecurityMattersToReport = lastTenPortFacilitiesCalled.PortFacilitySecurityMattersToReport;
+                                lastTen.PortFacilityGISISCode = lastTenPortFacilitiesCalled.PortFacilityGISISCode;
                             }
 
                             for (int i = 0; i < sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Count; i++)
@@ -346,24 +348,25 @@ namespace bsmd.dbh
                                 choiceType1s.Add(ItemsChoiceType1.ShipToShipActivities);
                                 RootSECShipToShipActivities s2s = new RootSECShipToShipActivities();
                                 secItems.Add(s2s);
+                                ShipToShipActivitiesDuringLastTenPortFacilitiesCalled shipToShip = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i] as ShipToShipActivitiesDuringLastTenPortFacilitiesCalled;
                                 s2s.ShipToShipActivityLocation = new RootSECShipToShipActivitiesShipToShipActivityLocation();
-                                s2s.ShipToShipActivityLocation.ShipToShipActivityLocationName = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationName;
-                                s2s.ShipToShipActivityLocation.ShipToShipActivityLocationLoCode = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationLoCode;
+                                s2s.ShipToShipActivityLocation.ShipToShipActivityLocationName = shipToShip.ShipToShipActivityLocationName;
+                                s2s.ShipToShipActivityLocation.ShipToShipActivityLocationLoCode = shipToShip.ShipToShipActivityLocationLoCode;
                                 s2s.ShipToShipActivityLocation.ShipToShipActivityLocationCoordinates = new RootSECShipToShipActivitiesShipToShipActivityLocationShipToShipActivityLocationCoordinates();
-                                if (sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationCoordinatesLatitude.HasValue)
-                                    s2s.ShipToShipActivityLocation.ShipToShipActivityLocationCoordinates.ShipToShipActivityLocationCoordinatesLatitude = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationCoordinatesLatitude.Value;
-                                if (sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationCoordinatesLongitude.HasValue)
-                                    s2s.ShipToShipActivityLocation.ShipToShipActivityLocationCoordinates.ShipToShipActivityLocationCoordinatesLongitude = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityLocationCoordinatesLongitude.Value;
-                                if (sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityDateFrom.HasValue)
-                                    s2s.ShipToShipActivityDateFrom = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityDateFrom.Value;
-                                if (sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityDateTo.HasValue)
-                                    s2s.ShipToShipActivityDateTo = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityDateTo.Value;
+                                if (shipToShip.ShipToShipActivityLocationCoordinatesLatitude.HasValue)
+                                    s2s.ShipToShipActivityLocation.ShipToShipActivityLocationCoordinates.ShipToShipActivityLocationCoordinatesLatitude = shipToShip.ShipToShipActivityLocationCoordinatesLatitude.Value;
+                                if (shipToShip.ShipToShipActivityLocationCoordinatesLongitude.HasValue)
+                                    s2s.ShipToShipActivityLocation.ShipToShipActivityLocationCoordinates.ShipToShipActivityLocationCoordinatesLongitude = shipToShip.ShipToShipActivityLocationCoordinatesLongitude.Value;
+                                if (shipToShip.ShipToShipActivityDateFrom.HasValue)
+                                    s2s.ShipToShipActivityDateFrom = shipToShip.ShipToShipActivityDateFrom.Value;
+                                if (shipToShip.ShipToShipActivityDateTo.HasValue)
+                                    s2s.ShipToShipActivityDateTo = shipToShip.ShipToShipActivityDateTo.Value;
 
                                 int activityType;                                
-                                if (!Int32.TryParse(sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityType, out activityType))
-                                    activityType = NOA_NOD.getCallPurposeCodeFromDescription(sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivityType) ?? 0;
+                                if (!Int32.TryParse(shipToShip.ShipToShipActivityType, out activityType))
+                                    activityType = NOA_NOD.getCallPurposeCodeFromDescription(shipToShip.ShipToShipActivityType) ?? 0;
                                 s2s.ShipToShipActivityType = activityType;
-                                s2s.ShipToShipActivitySecurityMattersToReport = sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[i].ShipToShipActivitySecurityMattersToReport;
+                                s2s.ShipToShipActivitySecurityMattersToReport = shipToShip.ShipToShipActivitySecurityMattersToReport;
                             }
                         }
 
@@ -388,9 +391,10 @@ namespace bsmd.dbh
                             for (int i = 0; i < bpol.PortOfItineraries.Count; i++)
                             {
                                 RootBPOLPortOfItinerary port = new RootBPOLPortOfItinerary();
-                                if (bpol.PortOfItineraries[i].PortOfItineraryETA.HasValue)
-                                    port.PortOfItineraryETA = bpol.PortOfItineraries[i].PortOfItineraryETA.Value.ToDBHDateString();
-                                port.PortOfItineraryName = bpol.PortOfItineraries[i].PortOfItineraryName;
+                                PortOfItinerary portOfItinerary = bpol.PortOfItineraries[i] as PortOfItinerary;
+                                if (portOfItinerary.PortOfItineraryETA.HasValue)
+                                    port.PortOfItineraryETA = portOfItinerary.PortOfItineraryETA.Value.ToDBHDateString();
+                                port.PortOfItineraryName = portOfItinerary.PortOfItineraryName;
                                 poiArray[i] = port;
                             }
 
@@ -868,19 +872,20 @@ namespace bsmd.dbh
                                 for (int i = 0; i < mdh.PortOfCallLast30Days.Count; i++)
                                 {
                                     l30d.PortOfCallLast30Days[i] = new RootMDHPortsOfCallLast30DaysPortOfCallLast30Days();
+                                    PortOfCallLast30Days portOfCallLast30Days = mdh.PortOfCallLast30Days[i] as PortOfCallLast30Days;
                                     l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysCrewJoinedShip = new RootMDHPortsOfCallLast30DaysPortOfCallLast30DaysPortOfCallLast30DaysCrewJoinedShip();
-                                    if (mdh.PortOfCallLast30Days[i].CrewJoinedShip.Count > 0)
+                                    if (portOfCallLast30Days.CrewJoinedShip.Count > 0)
                                     {
-                                        l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysCrewJoinedShip.PortOfCallLast30DaysCrewJoinedShipName = new string[mdh.PortOfCallLast30Days[i].CrewJoinedShip.Count];
-                                        for (int j = 0; j < mdh.PortOfCallLast30Days[i].CrewJoinedShip.Count; j++)
+                                        l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysCrewJoinedShip.PortOfCallLast30DaysCrewJoinedShipName = new string[portOfCallLast30Days.CrewJoinedShip.Count];
+                                        for (int j = 0; j < portOfCallLast30Days.CrewJoinedShip.Count; j++)
                                         {
-                                            l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysCrewJoinedShip.PortOfCallLast30DaysCrewJoinedShipName[j] = mdh.PortOfCallLast30Days[i].CrewJoinedShip[j].PortOfCallLast30DaysCrewJoinedShipName;
+                                            l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysCrewJoinedShip.PortOfCallLast30DaysCrewJoinedShipName[j] = portOfCallLast30Days.CrewJoinedShip[j].PortOfCallLast30DaysCrewJoinedShipName;
                                         }
                                     }
-                                    l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysCrewMembersJoined = mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysCrewMembersJoined ?? false ? RootSECValidISSCOnBoard.Y : RootSECValidISSCOnBoard.N;
-                                    if (mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysDateOfDeparture.HasValue)
-                                        l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysDateOfDeparture = mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysDateOfDeparture.Value;
-                                    l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysLocode = mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysLocode;
+                                    l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysCrewMembersJoined = portOfCallLast30Days.PortOfCallLast30DaysCrewMembersJoined ?? false ? RootSECValidISSCOnBoard.Y : RootSECValidISSCOnBoard.N;
+                                    if (portOfCallLast30Days.PortOfCallLast30DaysDateOfDeparture.HasValue)
+                                        l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysDateOfDeparture = portOfCallLast30Days.PortOfCallLast30DaysDateOfDeparture.Value;
+                                    l30d.PortOfCallLast30Days[i].PortOfCallLast30DaysLocode = portOfCallLast30Days.PortOfCallLast30DaysLocode;
                                 }
                             }
 
@@ -946,7 +951,7 @@ namespace bsmd.dbh
                             {
                                 choiceType3s.Add(ItemsChoiceType3.Waste);
                                 RootWASWaste rww = new RootWASWaste();                                
-                                Waste waste = was.Waste[j];
+                                Waste waste = was.Waste[j] as Waste;
                                 if ((waste.WasteType ?? 0) == 0) continue; // not a valid waste type
                                 rww.WasteType = new RootWASWasteWasteType();
                                 rww.WasteType.WasteCode = waste.WasteType ?? 0;
@@ -1080,7 +1085,7 @@ namespace bsmd.dbh
                                 dpgOnArrival.DPGItemIMDG = new bsmd.dbh.DBHWebReference.IMDGPosition[haz.IMDGPositions.Count];
                                 for (int i = 0; i < haz.IMDGPositions.Count; i++)
                                 {
-                                    bsmd.database.IMDGPosition imdgPos = haz.IMDGPositions[i];
+                                    bsmd.database.IMDGPosition imdgPos = haz.IMDGPositions[i] as bsmd.database.IMDGPosition;
                                     bsmd.dbh.DBHWebReference.IMDGPosition rootIMDG = new bsmd.dbh.DBHWebReference.IMDGPosition();
 
                                     rootIMDG.UNNumber = imdgPos.UNNumber;
@@ -1159,7 +1164,7 @@ namespace bsmd.dbh
                                 for (int i = 0; i < haz.IBCPositions.Count; i++)
                                 {
                                     bsmd.dbh.DBHWebReference.IBCPosition rootIBC = new bsmd.dbh.DBHWebReference.IBCPosition();
-                                    bsmd.database.IBCPosition ibcPos = haz.IBCPositions[i];
+                                    bsmd.database.IBCPosition ibcPos = haz.IBCPositions[i] as bsmd.database.IBCPosition;
 
                                     rootIBC.ProductName = ibcPos.ProductName;
                                     if (ibcPos.PollutionCategory.HasValue)
@@ -1192,7 +1197,7 @@ namespace bsmd.dbh
                                 for (int i = 0; i < haz.IGCPositions.Count; i++)
                                 {
                                     bsmd.dbh.DBHWebReference.IGCPosition rootIGC = new bsmd.dbh.DBHWebReference.IGCPosition();
-                                    bsmd.database.IGCPosition igcPos = haz.IGCPositions[i];
+                                    bsmd.database.IGCPosition igcPos = haz.IGCPositions[i] as bsmd.database.IGCPosition;
 
                                     rootIGC.UNNumber = igcPos.UNNumber;
                                     rootIGC.IMOClass = igcPos.IMOClass;
@@ -1216,7 +1221,7 @@ namespace bsmd.dbh
                                 for (int i = 0; i < haz.IMSBCPositions.Count; i++)
                                 {
                                     bsmd.dbh.DBHWebReference.IMSBCPosition rootIMSBC = new bsmd.dbh.DBHWebReference.IMSBCPosition();
-                                    bsmd.database.IMSBCPosition imsbcPos = haz.IMSBCPositions[i];
+                                    bsmd.database.IMSBCPosition imsbcPos = haz.IMSBCPositions[i] as bsmd.database.IMSBCPosition;
 
                                     rootIMSBC.BulkCargoShippingName = imsbcPos.BulkCargoShippingName;
                                     if (imsbcPos.MHB.HasValue)
@@ -1242,7 +1247,7 @@ namespace bsmd.dbh
                                 for (int i = 0; i < haz.MARPOLPositions.Count; i++)
                                 {
                                     DBHWebReference.MARPOLPosition rootMarpol = new DBHWebReference.MARPOLPosition();
-                                    MARPOL_Annex_I_Position marpolPos = haz.MARPOLPositions[i];
+                                    MARPOL_Annex_I_Position marpolPos = haz.MARPOLPositions[i] as MARPOL_Annex_I_Position;
 
                                     rootMarpol.Name = marpolPos.Name;
                                     if (marpolPos.FlashpointInformation.HasValue)
@@ -1313,7 +1318,7 @@ namespace bsmd.dbh
                                 dpgOnDeparture.DPGItemIMDG = new bsmd.dbh.DBHWebReference.IMDGPosition[haz.IMDGPositions.Count];
                                 for (int i = 0; i < haz.IMDGPositions.Count; i++)
                                 {
-                                    bsmd.database.IMDGPosition imdgPos = haz.IMDGPositions[i];
+                                    bsmd.database.IMDGPosition imdgPos = haz.IMDGPositions[i] as bsmd.database.IMDGPosition;
                                     bsmd.dbh.DBHWebReference.IMDGPosition rootIMDG = new bsmd.dbh.DBHWebReference.IMDGPosition();
 
                                     rootIMDG.UNNumber = imdgPos.UNNumber;
@@ -1392,7 +1397,7 @@ namespace bsmd.dbh
                                 for (int i = 0; i < haz.IBCPositions.Count; i++)
                                 {
                                     bsmd.dbh.DBHWebReference.IBCPosition rootIBC = new bsmd.dbh.DBHWebReference.IBCPosition();
-                                    bsmd.database.IBCPosition ibcPos = haz.IBCPositions[i];
+                                    bsmd.database.IBCPosition ibcPos = haz.IBCPositions[i] as bsmd.database.IBCPosition;
 
                                     rootIBC.ProductName = ibcPos.ProductName;
                                     if (ibcPos.PollutionCategory.HasValue)
@@ -1425,7 +1430,7 @@ namespace bsmd.dbh
                                 for (int i = 0; i < haz.IGCPositions.Count; i++)
                                 {
                                     bsmd.dbh.DBHWebReference.IGCPosition rootIGC = new bsmd.dbh.DBHWebReference.IGCPosition();
-                                    bsmd.database.IGCPosition igcPos = haz.IGCPositions[i];
+                                    bsmd.database.IGCPosition igcPos = haz.IGCPositions[i] as bsmd.database.IGCPosition;
 
                                     rootIGC.UNNumber = igcPos.UNNumber;
                                     rootIGC.IMOClass = igcPos.IMOClass;
@@ -1449,7 +1454,7 @@ namespace bsmd.dbh
                                 for (int i = 0; i < haz.IMSBCPositions.Count; i++)
                                 {
                                     bsmd.dbh.DBHWebReference.IMSBCPosition rootIMSBC = new bsmd.dbh.DBHWebReference.IMSBCPosition();
-                                    bsmd.database.IMSBCPosition imsbcPos = haz.IMSBCPositions[i];
+                                    bsmd.database.IMSBCPosition imsbcPos = haz.IMSBCPositions[i] as bsmd.database.IMSBCPosition;
 
                                     rootIMSBC.BulkCargoShippingName = imsbcPos.BulkCargoShippingName;
                                     if (imsbcPos.MHB.HasValue)
@@ -1475,7 +1480,7 @@ namespace bsmd.dbh
                                 for (int i = 0; i < haz.MARPOLPositions.Count; i++)
                                 {
                                     MARPOLPosition rootMarpol = new MARPOLPosition();
-                                    MARPOL_Annex_I_Position marpolPos = haz.MARPOLPositions[i];
+                                    MARPOL_Annex_I_Position marpolPos = haz.MARPOLPositions[i] as MARPOL_Annex_I_Position;
 
                                     rootMarpol.Name = marpolPos.Name;
                                     if (marpolPos.FlashpointInformation.HasValue)
diff --git a/nsw/Source/bsmd.hisnord/NSWResponse.cs b/nsw/Source/bsmd.hisnord/NSWResponse.cs
index 48a0ee41..ddac45ae 100644
--- a/nsw/Source/bsmd.hisnord/NSWResponse.cs
+++ b/nsw/Source/bsmd.hisnord/NSWResponse.cs
@@ -36,6 +36,7 @@ namespace bsmd.hisnord
             XNamespace soap = "http://schemas.xmlsoap.org/soap/envelope/";
             XNamespace ns15 = "http://api.national-single-window.de/visitIdResponse";
             XNamespace ns16 = "http://api.national-single-window.de/transitIdResponse";
+            XNamespace resetNS = "http://api.national-single-window.de/reset";
             XNamespace ladgNS = "http://api.national-single-window.de/ladg";
             XNamespace hazaNS = "http://api.national-single-window.de/haza";
             XNamespace hazdNS = "http://api.national-single-window.de/hazd";
@@ -74,143 +75,148 @@ namespace bsmd.hisnord
                     _messageCoreId = aGuid;
                 else
                     _log.WarnFormat("cannot parse ConveyanceCode {0}", elem.FirstOrDefault());
-            }else
+            }
+            else
             {
                 _log.Warn("NSWResponse does not contain ConveyanceCode!!");
             }
 
-            // detect response type
+            XName meldeTypeName = "Meldetype";
+            var mElem = xml.Descendants(meldeTypeName);
+            Message.NotificationClass? notificationClass = null;
 
-            foreach (Message.NotificationClass messageClassType in Enum.GetValues(typeof(Message.NotificationClass)))
+            if(mElem.Count() > 0)
+            {
+                Message.NotificationClass tmpClass;
+                if (Enum.TryParse<Message.NotificationClass>(mElem.FirstOrDefault()?.Value, out tmpClass))
+                    notificationClass = tmpClass;
+                else
+                {
+                    // könnte VISIT/TRANSIT Id Beantragung sein
+                    XName test = ns15 + "VisitIdResponse";
+                    if (xml.Descendants(test).Count() > 0)
+                    {
+                        notificationClass = Message.NotificationClass.VISIT;
+                    }
+                    else
+                    {
+                        test = ns16 + "TransitIdResponse";
+                        if (xml.Descendants(test).Count() > 0) notificationClass = Message.NotificationClass.TRANSIT;
+                    }
+                    
+                    if(!notificationClass.HasValue)
+                        _log.WarnFormat("NSWResponse does not contain Notification class");
+                }
+            }
+
+            // detect response type
+            
+            if(notificationClass.HasValue)
             {                             
                 XName lookupName;
-                XName resetLookup;
+                XName resetLookup = resetNS + "ResetResponse";
 
-                switch (messageClassType)
-                {
-                    // we won't get answers for these message types
-                    case Message.NotificationClass.STO: continue;
-                    case Message.NotificationClass.CREWD: continue;
-                    case Message.NotificationClass.PASD: continue;
+                switch (notificationClass.Value)
+                {                    
+                    
 
                     case Message.NotificationClass.VISIT:                        
-                        lookupName = ns15 + "VisitIdResponse";
-                        resetLookup = ns15 + "ResetResponse";
+                        lookupName = ns15 + "VisitIdResponse";                        
                         break;
                     case Message.NotificationClass.TRANSIT:
-                        lookupName = ns16 + "TransitIdResponse";
-                        resetLookup = ns16 + "ResetResponse";
+                        lookupName = ns16 + "TransitIdResponse";                        
                         break;
                     case Message.NotificationClass.LADG:
-                        lookupName = ladgNS + "LADGResponse";
-                        resetLookup = ladgNS + "ResetResponse";
+                        lookupName = ladgNS + "LADGResponse";                        
                         break;
                     case Message.NotificationClass.HAZA:
-                        lookupName = hazaNS + "HAZAResponse";
-                        resetLookup = hazaNS + "ResetResponse";
+                        lookupName = hazaNS + "HAZAResponse";                        
                         break;
                     case Message.NotificationClass.HAZD:
-                        lookupName = hazdNS + "HAZDResponse";
-                        resetLookup = hazdNS + "ResetResponse";
+                        lookupName = hazdNS + "HAZDResponse";                        
                         break;
                     case Message.NotificationClass.MDH:
-                        lookupName = mdhNS + "MDHResponse";
-                        resetLookup = mdhNS + "ResetResponse";
+                        lookupName = mdhNS + "MDHResponse";                        
                         break;
                     case Message.NotificationClass.AGNT:
-                        lookupName = agntNS + "AGNTResponse";
-                        resetLookup = agntNS + "ResetResponse";
+                        lookupName = agntNS + "AGNTResponse";                        
                         break;
                     case Message.NotificationClass.SEC:
-                        lookupName = secNS + "SECResponse";
-                        resetLookup = secNS + "ResetResponse";
+                        lookupName = secNS + "SECResponse";                        
                         break;
                     case Message.NotificationClass.STAT:
-                        lookupName = statNS + "STATResponse";
-                        resetLookup = statNS + "ResetResponse";
+                        lookupName = statNS + "STATResponse";                        
                         break;
                     case Message.NotificationClass.NOA_NOD:
-                        lookupName = noa_nodNS + "NOA_NODResponse";
-                        resetLookup = noa_nodNS + "ResetResponse";
+                        lookupName = noa_nodNS + "NOA_NODResponse";                        
                         break;
                     case Message.NotificationClass.ATA:
-                        lookupName = ataNS + "ATAResponse";
-                        resetLookup = ataNS + "ResetResponse";
+                        lookupName = ataNS + "ATAResponse";                        
                         break;
                     case Message.NotificationClass.ATD:
-                        lookupName = atdNS + "ATDResponse";
-                        resetLookup = atdNS + "ResetResponse";
+                        lookupName = atdNS + "ATDResponse";                        
                         break;
                     case Message.NotificationClass.POBA:
-                        lookupName = pobaNS + "POBAResponse";
-                        resetLookup = pobaNS + "ResetResponse";
+                        lookupName = pobaNS + "POBAResponse";                        
                         break;
                     case Message.NotificationClass.POBD:
-                        lookupName = pobdNS + "POBDResponse";
-                        resetLookup = pobdNS + "ResetResponse";
+                        lookupName = pobdNS + "POBDResponse";                        
                         break;
                     case Message.NotificationClass.NAME:
-                        lookupName = nameNS + "NAMEResponse";
-                        resetLookup = nameNS + "ResetResponse";
+                        lookupName = nameNS + "NAMEResponse";                        
                         break;
                     case Message.NotificationClass.TIEFA:
-                        lookupName = tiefaNS + "TIEFAResponse";
-                        resetLookup = tiefaNS + "ResetResponse";
+                        lookupName = tiefaNS + "TIEFAResponse";                        
                         break;
                     case Message.NotificationClass.TIEFD:
-                        lookupName = tiefdNS + "TIEFDResponse";
-                        resetLookup = tiefdNS + "ResetResponse";
+                        lookupName = tiefdNS + "TIEFDResponse";                        
                         break;
                     case Message.NotificationClass.BKRA:
-                        lookupName = bkraNS + "BKRAResponse";
-                        resetLookup = bkraNS + "ResetResponse";
+                        lookupName = bkraNS + "BKRAResponse";                        
                         break;
                     case Message.NotificationClass.BKRD:
-                        lookupName = bkrdNS + "BKRDResponse";
-                        resetLookup = bkrdNS + "ResetResponse";
+                        lookupName = bkrdNS + "BKRDResponse";                        
                         break;
                     case Message.NotificationClass.INFO:
-                        lookupName = infoNS + "INFOResponse";
-                        resetLookup = infoNS + "ResetResponse";
+                        lookupName = infoNS + "INFOResponse";                        
                         break;
                     case Message.NotificationClass.SERV:
-                        lookupName = servNS + "SERVResponse";
-                        resetLookup = servNS + "ResetResponse";
+                        lookupName = servNS + "SERVResponse";                        
                         break;
                     case Message.NotificationClass.PRE72H:
-                        lookupName = pre72hNS + "PRE72HResponse";
-                        resetLookup = pre72hNS + "ResetResponse";
+                        lookupName = pre72hNS + "PRE72HResponse";                        
                         break;
                     case Message.NotificationClass.WAS:
-                        lookupName = wasNS + "WASResponse";
-                        resetLookup = wasNS + "ResetResponse";
+                        lookupName = wasNS + "WASResponse";                        
                         break;
                     case Message.NotificationClass.CREW:
-                        lookupName = crewNS + "CREWResponse";
-                        resetLookup = crewNS + "ResetResponse";
+                        lookupName = crewNS + "CREWResponse";                        
                         break;
                     case Message.NotificationClass.PAS:
-                        lookupName = pasNS + "PASResponse";
-                        resetLookup = pasNS + "ResetResponse";
+                        lookupName = pasNS + "PASResponse";                        
                         break;
                     case Message.NotificationClass.BPOL:
-                        lookupName = bpolNS + "BPOLResponse";
-                        resetLookup = bpolNS + "ResetResponse";
+                        lookupName = bpolNS + "BPOLResponse";                        
                         break;
                     case Message.NotificationClass.TOWA:
-                        lookupName = towaNS + "TOWAResponse";
-                        resetLookup = towaNS + "ResetResponse";
+                        lookupName = towaNS + "TOWAResponse";                        
                         break;
                     case Message.NotificationClass.TOWD:
-                        lookupName = towdNS + "TOWDResponse";
-                        resetLookup = towdNS + "ResetResponse";
+                        lookupName = towdNS + "TOWDResponse";                        
                         break;
+
                     default:
+                    // we won't get answers for these message types
+                    case Message.NotificationClass.STO:
+                    case Message.NotificationClass.CREWD:
+                    case Message.NotificationClass.PASD:
                         lookupName = "dontmatchmeplease";
                         resetLookup = "dontmatchmeplease";
                         break;
                 }
 
+
+
                 bool lookupMatch = (xml.Descendants(lookupName).Count() > 0);
                 bool resetMatch = (xml.Descendants(resetLookup).Count() > 0);
 
@@ -219,7 +225,7 @@ namespace bsmd.hisnord
 
                     _isReset = resetMatch;
 
-                    _notificationClass = messageClassType;
+                    _notificationClass = notificationClass.Value;
                    
                     // match found
                     XName xname = ns6 + "ClientRequestId";
@@ -296,8 +302,7 @@ namespace bsmd.hisnord
                         me.ErrorText = anElem.Element(eTextName).Value;
                         _errors.Add(me);
                     }
-
-                    break;
+                    
                 }
             }            
         }
diff --git a/nsw/Source/bsmd.hisnord/Properties/Settings.Designer.cs b/nsw/Source/bsmd.hisnord/Properties/Settings.Designer.cs
index 31de90e2..9e393807 100644
--- a/nsw/Source/bsmd.hisnord/Properties/Settings.Designer.cs
+++ b/nsw/Source/bsmd.hisnord/Properties/Settings.Designer.cs
@@ -25,7 +25,7 @@ namespace bsmd.hisnord.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("5")]
+        [global::System.Configuration.DefaultSettingValueAttribute("1")]
         public int BatchTimeoutMins {
             get {
                 return ((int)(this["BatchTimeoutMins"]));
@@ -106,5 +106,29 @@ namespace bsmd.hisnord.Properties {
                 this["AnswerCorruptDir"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("E:\\svnlager\\BSMD\\nsw\\HIS-NORD\\")]
+        public string TestTransmitterRoot {
+            get {
+                return ((string)(this["TestTransmitterRoot"]));
+            }
+            set {
+                this["TestTransmitterRoot"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string LiveTransmitterRoot {
+            get {
+                return ((string)(this["LiveTransmitterRoot"]));
+            }
+            set {
+                this["LiveTransmitterRoot"] = value;
+            }
+        }
     }
 }
diff --git a/nsw/Source/bsmd.hisnord/Properties/Settings.settings b/nsw/Source/bsmd.hisnord/Properties/Settings.settings
index 2a64a155..def01398 100644
--- a/nsw/Source/bsmd.hisnord/Properties/Settings.settings
+++ b/nsw/Source/bsmd.hisnord/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="BatchTimeoutMins" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">5</Value>
+      <Value Profile="(Default)">1</Value>
     </Setting>
     <Setting Name="OutputDir" Type="System.String" Scope="User">
       <Value Profile="(Default)">E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool\IMP</Value>
@@ -23,5 +23,11 @@
     <Setting Name="AnswerCorruptDir" Type="System.String" Scope="User">
       <Value Profile="(Default)">E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool\ANSWERS_CORRUPT</Value>
     </Setting>
+    <Setting Name="TestTransmitterRoot" Type="System.String" Scope="User">
+      <Value Profile="(Default)">E:\svnlager\BSMD\nsw\HIS-NORD\</Value>
+    </Setting>
+    <Setting Name="LiveTransmitterRoot" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.hisnord/Request.cs b/nsw/Source/bsmd.hisnord/Request.cs
index 72df85b3..7212bb2d 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<MessageCore, bool> coreUseTestDict = new Dictionary<MessageCore, bool>();
         private static Dictionary<Message.NotificationClass, Message> noteMessageDict = new Dictionary<Message.NotificationClass, Message>();
 
         internal static Dictionary<Guid, ReportingParty> ReportingPartyDict
@@ -39,13 +40,14 @@ namespace bsmd.hisnord
         public static void Clear()
         {
             coreFilenameDict.Clear();
+            coreUseTestDict.Clear();
         }
 
         public static void ReadResponseFiles()
         {
             foreach (MessageCore core in coreFilenameDict.Keys)
-            {
-                transmitter.result theResult = transmitter.GetResult(coreFilenameDict[core]);
+            {                
+                transmitter.result theResult = transmitter.GetResult(coreFilenameDict[core], coreUseTestDict[core]);
                 if (theResult != null)
                 {
                     _log.InfoFormat("Result: Code {0} Detail {1} Message {2}", theResult.code, theResult.detail, theResult.message);
@@ -110,6 +112,7 @@ namespace bsmd.hisnord
                         {
                             _log.DebugFormat("preparing {0}", noteMessageDict[notificationClass].MessageNotificationClassDisplay);
                             noteMessageDict[notificationClass].StatusInfo = "";
+                            noteMessageDict[notificationClass].ChangedBy = ""; // Leeren nach RS mit CH: Sie möchte das Feld als Indikator "zu versenden" verwenden (ich war dagegen ;-)
                             noteMessageDict[notificationClass].InternalStatus = Message.BSMDStatus.SENT;
                             noteMessageDict[notificationClass].SentAt = DateTime.Now;
                             DBManager.Instance.DeleteSystemErrors(noteMessageDict[notificationClass]);
@@ -316,8 +319,9 @@ namespace bsmd.hisnord
                                     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;
+                                        CallPurpose callPurpose = noa_nod.CallPurposes[i] as CallPurpose;
+                                        hn_noanod.CallPurposes[i].CallPurposeCode = callPurpose.CallPurposeCode.ToString();
+                                        hn_noanod.CallPurposes[i].CallPurposeDescription = callPurpose.CallPurposeDescription;
                                     }
                                 }
 
@@ -1085,7 +1089,7 @@ namespace bsmd.hisnord
                                         sanitarydetail[] sanitaryDetails = new sanitarydetail[mdh.SanitaryMeasuresDetails.Count];
                                         for (int j = 0; j < mdh.SanitaryMeasuresDetails.Count; j++)
                                         {
-                                            SanitaryMeasuresDetail detail = mdh.SanitaryMeasuresDetails[j];
+                                            SanitaryMeasuresDetail detail = mdh.SanitaryMeasuresDetails[j] as SanitaryMeasuresDetail;
                                             sanitaryDetails[j] = new sanitarydetail();
                                             if (detail.SanitaryMeasuresDate.HasValue)
                                                 sanitaryDetails[j].SanitaryMeasuresDate = detail.SanitaryMeasuresDate.Value;
@@ -1148,18 +1152,19 @@ namespace bsmd.hisnord
                                     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;
+                                        PortOfCallLast30Days portOfCallLast30Days = mdh.PortOfCallLast30Days[j] as PortOfCallLast30Days;
+                                        pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysLocode = portOfCallLast30Days.PortOfCallLast30DaysLocode;
+                                        if (portOfCallLast30Days.PortOfCallLast30DaysDateOfDeparture.HasValue)
+                                            pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysDateOfDeparture = portOfCallLast30Days.PortOfCallLast30DaysDateOfDeparture.Value;
+                                        pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysCrewMembersJoined = (portOfCallLast30Days.PortOfCallLast30DaysCrewMembersJoined ?? false) ? yorntype.Y : yorntype.N;
 
-                                        if (mdh.PortOfCallLast30Days[j].CrewJoinedShip.Count > 0)
+                                        if (portOfCallLast30Days.CrewJoinedShip.Count > 0)
                                         {
                                             List<string> crewJoinedShipList = new List<string>();
-                                            for (int k = 0; k < mdh.PortOfCallLast30Days[j].CrewJoinedShip.Count; k++)
+                                            for (int k = 0; k < portOfCallLast30Days.CrewJoinedShip.Count; k++)
                                             {
-                                                if (!mdh.PortOfCallLast30Days[j].CrewJoinedShip[k].PortOfCallLast30DaysCrewJoinedShipName.IsNullOrEmpty())
-                                                    crewJoinedShipList.Add(mdh.PortOfCallLast30Days[j].CrewJoinedShip[k].PortOfCallLast30DaysCrewJoinedShipName);
+                                                if (!portOfCallLast30Days.CrewJoinedShip[k].PortOfCallLast30DaysCrewJoinedShipName.IsNullOrEmpty())
+                                                    crewJoinedShipList.Add(portOfCallLast30Days.CrewJoinedShip[k].PortOfCallLast30DaysCrewJoinedShipName);
                                             }
                                             pocs.PortOfCallLast30Days[j].PortOfCallLast30DaysCrewJoinedShip = crewJoinedShipList.ToArray();
                                         }
@@ -1228,7 +1233,7 @@ namespace bsmd.hisnord
                                         for (int i = 0; i < was.Waste.Count; i++)
                                         {
                                             waste hn_waste = new waste();
-                                            Waste waste = was.Waste[i];
+                                            Waste waste = was.Waste[i] as Waste;
 
                                             if (waste.WasteDisposalAmount_MTQ.HasValue)
                                                 hn_waste.WasteDisposalAmount_MTQ = (float)waste.WasteDisposalAmount_MTQ.Value;
@@ -1304,9 +1309,10 @@ namespace bsmd.hisnord
                                     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;
+                                        PortOfItinerary portOfItinerary = bpol.PortOfItineraries[i] as PortOfItinerary;
+                                        hn_bpol.PortOfItinerary[i].PortOfItineryName = portOfItinerary.PortOfItineraryName;
+                                        if (portOfItinerary.PortOfItineraryETA.HasValue)
+                                            hn_bpol.PortOfItinerary[i].PortOfItineryETA = portOfItinerary.PortOfItineraryETA.Value;
                                     }
                                 }
 
@@ -1577,16 +1583,20 @@ namespace bsmd.hisnord
 
                 #region serialize and save message
 
+                string outputDir = Path.Combine(useTest ? Properties.Settings.Default.TestTransmitterRoot : Properties.Settings.Default.LiveTransmitterRoot,
+                    Properties.Settings.Default.OutputDir);
+
                 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);
+                string filePath = Path.Combine(outputDir, filename);
                 XmlSerializer serializer = new XmlSerializer(typeof(nsw));
                 using(TextWriter tw = new StreamWriter(filePath)) {
                     serializer.Serialize(tw, _nsw);
                 }
 
                 coreFilenameDict[core] = filename;
+                coreUseTestDict[core] = useTest;
 
                 #endregion
 
@@ -1612,7 +1622,7 @@ namespace bsmd.hisnord
             {                
                 for (int i = 0; i < haz.IMDGPositions.Count; i++)
                 {
-                    IMDGPosition imdgPosition = haz.IMDGPositions[i];
+                    IMDGPosition imdgPosition = haz.IMDGPositions[i] as IMDGPosition;
                     positionimdg pi = new positionimdg();
 
                     pi.UNNumber = imdgPosition.UNNumber;
@@ -1683,7 +1693,8 @@ namespace bsmd.hisnord
                     }
                     pi.PortOfLoading = imdgPosition.PortOfLoading;
                     pi.PortOfDischarge = imdgPosition.PortOfDischarge;
-                    pi.Remarks = imdgPosition.Remarks;                    
+                    if(!imdgPosition.Remarks.IsNullOrEmpty())
+                        pi.Remarks = imdgPosition.Remarks;                    
 
                     dgList.Add(pi);
                 }
@@ -1699,7 +1710,7 @@ namespace bsmd.hisnord
                 for (int i = 0; i < haz.IBCPositions.Count; i++)
                 {
                     positionibc pi = new positionibc();
-                    IBCPosition ibcPosition = haz.IBCPositions[i];
+                    IBCPosition ibcPosition = haz.IBCPositions[i] as IBCPosition;
 
                     pi.ProductName = ibcPosition.ProductName;                    
                     if (ibcPosition.PollutionCategory.HasValue)
@@ -1718,7 +1729,8 @@ namespace bsmd.hisnord
                     pi.SpecRef15_19Specified = ibcPosition.SpecRef15_19.HasValue;
                     if (pi.SpecRef15_19Specified)
                         pi.SpecRef15_19 = ibcPosition.SpecRef15_19.Value ? yorntype.Y : yorntype.N;
-                    pi.Remarks = ibcPosition.Remarks;                    
+                    if(!ibcPosition.Remarks.IsNullOrEmpty())
+                        pi.Remarks = ibcPosition.Remarks;                    
 
                     dgList.Add(pi);
                 }                
@@ -1733,7 +1745,7 @@ namespace bsmd.hisnord
                 for (int i = 0; i < haz.IGCPositions.Count; i++)
                 {
                     positionigc pi = new positionigc();
-                    IGCPosition igcPosition = haz.IGCPositions[i];
+                    IGCPosition igcPosition = haz.IGCPositions[i] as IGCPosition;
 
                     pi.UNNumber = igcPosition.UNNumber;
                     pi.IMOClass = igcPosition.IMOClass;
@@ -1743,7 +1755,8 @@ namespace bsmd.hisnord
                     pi.StowagePosition = igcPosition.StowagePosition;
                     pi.PortOfLoading = igcPosition.PortOfLoading;
                     pi.PortOfDischarge = igcPosition.PortOfDischarge;
-                    pi.Remarks = igcPosition.Remarks;
+                    if(!igcPosition.Remarks.IsNullOrEmpty())
+                        pi.Remarks = igcPosition.Remarks;
 
                     dgList.Add(pi);
                 }                
@@ -1758,7 +1771,7 @@ namespace bsmd.hisnord
                 for (int i = 0; i < haz.IMSBCPositions.Count; i++)
                 {
                     positionimsbc pi = new positionimsbc();
-                    IMSBCPosition imsbcPosition = haz.IMSBCPositions[i];
+                    IMSBCPosition imsbcPosition = haz.IMSBCPositions[i] as IMSBCPosition;
 
                     pi.BulkCargoShippingName = imsbcPosition.BulkCargoShippingName;
                     pi.MHB = (imsbcPosition.MHB ?? false) ? yorntype.Y : yorntype.N;
@@ -1769,7 +1782,8 @@ namespace bsmd.hisnord
                     pi.StowagePosition = imsbcPosition.StowagePosition;
                     pi.PortOfLoading = imsbcPosition.PortOfLoading;
                     pi.PortOfDischarge = imsbcPosition.PortOfDischarge;
-                    pi.Remarks = imsbcPosition.Remarks;
+                    if(!imsbcPosition.Remarks.IsNullOrEmpty())
+                        pi.Remarks = imsbcPosition.Remarks;
                     
                     dgList.Add(pi);
                 }                
@@ -1785,7 +1799,7 @@ namespace bsmd.hisnord
                 for (int i = 0; i < haz.MARPOLPositions.Count; i++)
                 {
                     positionmarpol pi = new positionmarpol();
-                    MARPOL_Annex_I_Position marpolPosition = haz.MARPOLPositions[i];
+                    MARPOL_Annex_I_Position marpolPosition = haz.MARPOLPositions[i] as MARPOL_Annex_I_Position;
 
                     pi.Name = marpolPosition.Name;
                     if (marpolPosition.FlashpointInformation.HasValue)
@@ -1796,7 +1810,8 @@ namespace bsmd.hisnord
                     pi.StowagePosition = marpolPosition.StowagePosition;
                     pi.PortOfLoading = marpolPosition.PortOfLoading;
                     pi.PortOfDischarge = marpolPosition.PortOfDischarge;
-                    pi.Remarks = marpolPosition.Remarks;
+                    if(!marpolPosition.Remarks.IsNullOrEmpty())
+                        pi.Remarks = marpolPosition.Remarks;
 
                     dgList.Add(pi);
                 }                
diff --git a/nsw/Source/bsmd.hisnord/Response.cs b/nsw/Source/bsmd.hisnord/Response.cs
index d1d6f2d7..e5d089d9 100644
--- a/nsw/Source/bsmd.hisnord/Response.cs
+++ b/nsw/Source/bsmd.hisnord/Response.cs
@@ -16,9 +16,12 @@ namespace bsmd.hisnord
         private static ILog _log = LogManager.GetLogger(typeof(Response));
         
 
-        public static void ReadAnswers()
+        public static void ReadAnswers(bool useTest)
         {
-            foreach (string answerFile in Directory.GetFiles(Properties.Settings.Default.AnswerDir))
+            string answerDir = Path.Combine(useTest ? Properties.Settings.Default.TestTransmitterRoot : Properties.Settings.Default.LiveTransmitterRoot,
+                Properties.Settings.Default.AnswerDir);
+
+            foreach (string answerFile in Directory.GetFiles(answerDir))
             {
                 bool isOK = true;
 
@@ -91,13 +94,17 @@ namespace bsmd.hisnord
                                             }
 
                                             _log.WarnFormat("SystemError received for Core [{0}], IMO {1} ETA {2}: {3} Class {4}", aCore.Id, aCore.IMO, aCore.ETADisplay, systemError.ErrorMessage, Enum.GetName(typeof(Message.NotificationClass), notificationClass));
+
+                                            // Nach einiger Diskussion (vs. "SENT" und "FAILURE" geht das hier jetzt auf RESPONDED)
+                                            aCore.BSMDStatusInternal = MessageCore.BSMDStatus.RESPONDED;
+                                            DBManager.Instance.Save(aCore);
                                         }
                                         else
                                         {
                                             _log.WarnFormat("SystemError received for unknown core {0}: {1}", systemError.MessageCoreId, systemError.ErrorMessage);
                                         }
                                         // trotzdem immer speichern
-                                        DBManager.Instance.Save(systemError);
+                                        DBManager.Instance.Save(systemError);                                       
                                     }
                                 }
                                 else
@@ -227,12 +234,16 @@ namespace bsmd.hisnord
                 if(isOK)
                 {
                     // archive file
-                    File.Move(answerFile, Path.Combine(Properties.Settings.Default.AnswerArchiveDir, Path.GetFileName(answerFile)));
+                    string answerArchiveDir = Path.Combine(useTest ? Properties.Settings.Default.TestTransmitterRoot : Properties.Settings.Default.LiveTransmitterRoot,
+                        Properties.Settings.Default.AnswerArchiveDir);
+                    File.Move(answerFile, Path.Combine(answerArchiveDir, Path.GetFileName(answerFile)));
                 }
                 else
                 {
                     // save in separate folder (to look at it later?)
-                    File.Move(answerFile, Path.Combine(Properties.Settings.Default.AnswerCorruptDir, Path.GetFileName(answerFile)));
+                    string answerCorruptDir = Path.Combine(useTest ? Properties.Settings.Default.TestTransmitterRoot : Properties.Settings.Default.LiveTransmitterRoot,
+                        Properties.Settings.Default.AnswerCorruptDir);
+                    File.Move(answerFile, Path.Combine(answerCorruptDir, Path.GetFileName(answerFile)));
                 }
             }
         }
diff --git a/nsw/Source/bsmd.hisnord/app.config b/nsw/Source/bsmd.hisnord/app.config
index 19f2675e..68e7f51b 100644
--- a/nsw/Source/bsmd.hisnord/app.config
+++ b/nsw/Source/bsmd.hisnord/app.config
@@ -8,7 +8,7 @@
     <userSettings>
         <bsmd.hisnord.Properties.Settings>
             <setting name="BatchTimeoutMins" serializeAs="String">
-                <value>5</value>
+                <value>1</value>
             </setting>
             <setting name="OutputDir" serializeAs="String">
                 <value>E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool\IMP</value>
@@ -28,6 +28,12 @@
             <setting name="AnswerCorruptDir" serializeAs="String">
                 <value>E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool\ANSWERS_CORRUPT</value>
             </setting>
+            <setting name="TestTransmitterRoot" serializeAs="String">
+                <value>E:\svnlager\BSMD\nsw\HIS-NORD\</value>
+            </setting>
+            <setting name="LiveTransmitterRoot" serializeAs="String">
+                <value />
+            </setting>
         </bsmd.hisnord.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.hisnord/transmitter.cs b/nsw/Source/bsmd.hisnord/transmitter.cs
index e66d82a3..cb836d79 100644
--- a/nsw/Source/bsmd.hisnord/transmitter.cs
+++ b/nsw/Source/bsmd.hisnord/transmitter.cs
@@ -24,11 +24,11 @@ namespace bsmd.hisnord
         private static ILog _log = LogManager.GetLogger(typeof(transmitter));
 
 		
-        public static void CallTransmitter()
+        public static void CallTransmitter(bool useTest)
         {
             Process process = new Process();
             process.StartInfo.FileName = Properties.Settings.Default.Transmitter;
-            process.StartInfo.WorkingDirectory = Path.GetDirectoryName(Properties.Settings.Default.Transmitter);
+            process.StartInfo.WorkingDirectory = Path.GetDirectoryName(useTest ? Properties.Settings.Default.TestTransmitterRoot : Properties.Settings.Default.LiveTransmitterRoot);
             process.StartInfo.RedirectStandardError = true;
             process.StartInfo.RedirectStandardOutput = true;
             process.StartInfo.RedirectStandardInput = false;
@@ -50,11 +50,15 @@ namespace bsmd.hisnord
             // process.WaitForExit();
         }
 		
-        public static result GetResult(string filenameFullPath)
+        public static result GetResult(string filenameFullPath, bool useTest)
         {            
             // now we should read the response message...
             string resultFilename = string.Format("{0}.result.xml", Path.GetFileName(filenameFullPath));
-            string resultFullPath = Path.Combine(Properties.Settings.Default.ResultDir, resultFilename);
+
+            string resultDir = Path.Combine(useTest ? Properties.Settings.Default.TestTransmitterRoot : Properties.Settings.Default.LiveTransmitterRoot,
+                Properties.Settings.Default.ResultDir);
+
+            string resultFullPath = Path.Combine(resultDir, resultFilename);
             return result.ReadResult(resultFullPath);
         }