diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 728c9b07..952ee5e8 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>15</ApplicationRevision>
-    <ApplicationVersion>7.0.0.15</ApplicationVersion>
+    <ApplicationRevision>16</ApplicationRevision>
+    <ApplicationVersion>7.0.0.16</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/Excel/ExcelBase.cs b/ENI2/Excel/ExcelBase.cs
index fc55d48c..34a2df7f 100644
--- a/ENI2/Excel/ExcelBase.cs
+++ b/ENI2/Excel/ExcelBase.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using Microsoft.Office.Interop.Excel;
 using System.Runtime.InteropServices;
 using log4net;
+using System.Globalization;
 
 namespace ENI2.Excel
 {
@@ -100,6 +101,41 @@ namespace ENI2.Excel
             }
         }
 
+        internal double? ReadNumber(string lookup)
+        {
+            double? result = null;
+            try
+            {
+                if (_nameDict.ContainsKey(lookup))
+                {
+                    var val = _nameDict[lookup].RefersToRange.Value;
+                    if (val is double) result = val;
+                    if (val is string)
+                    {
+                        if (double.TryParse(val, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite,
+                            CultureInfo.InvariantCulture, out double tmpDouble))
+                            result = tmpDouble;
+                        if (result == null)
+                        {
+                            if (double.TryParse(val, out tmpDouble)) // current language style (==GER, mit , statt .)
+                                result = tmpDouble;
+                        }
+                    }
+
+                    if ((result == null) && (val != null))
+                    {
+                        double tmpDouble2 = val[1, 1];
+                        result = tmpDouble2;
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                _log.WarnFormat("error reading number for lookup {0}", lookup);
+            }
+            return result;
+        }
+
         #endregion
 
         #region Dispose
diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs
index 402d79cd..c1157675 100644
--- a/ENI2/Excel/ExcelReader.cs
+++ b/ENI2/Excel/ExcelReader.cs
@@ -512,42 +512,7 @@ namespace ENI2.Excel
             }
 
             return result;
-        }
-
-        internal double? ReadNumber(string lookup)
-        {
-            double? result = null;
-            try
-            {
-                if (_nameDict.ContainsKey(lookup))
-                {
-                    var val = _nameDict[lookup].RefersToRange.Value;
-                    if (val is double) result = val;
-                    if (val is string)
-                    {
-                        if (double.TryParse(val, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite,
-                            CultureInfo.InvariantCulture, out double tmpDouble))
-                            result = tmpDouble;
-                        if (result == null)
-                        {
-                            if (double.TryParse(val, out tmpDouble)) // current language style (==GER, mit , statt .)
-                                result = tmpDouble;
-                        }
-                    }
-
-                    if ((result == null) && (val != null))
-                    {
-                        double tmpDouble2 = val[1, 1];
-                        result = tmpDouble2;                                                                                 
-                    }
-                }
-            }
-            catch (Exception)
-            {             
-                _log.WarnFormat("error reading number for lookup {0}", lookup);                
-            }
-            return result;
-        }
+        }        
 
         internal double ReadNumberDefaultZero(string lookup)
         {
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index b9b74870..ef11842a 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -24,6 +24,7 @@ namespace ENI2.Excel
         internal static bool ProcessSheet(ExcelReader reader, out string readMessage, MessageCore messageCore, List<Message.NotificationClass> notificationClasses)
         {
             bool result = true;
+            bool isOldVersion = false;
             readMessage = "";
 
             MessageCore aMessageCore = ExcelUtil.LookupCoreById(reader);
@@ -35,6 +36,10 @@ namespace ENI2.Excel
             
             // load messages if already present
             List<Message> messages = DBManager.Instance.GetMessagesForCore(messageCore, DBManager.MessageLoad.ALL);
+            
+            int? testCode = (int?)reader.ReadNumber("WAS.WasteCode_1");
+            if (testCode > 999) isOldVersion = true;
+
             messages.Sort();
 
             // parse selected classes
@@ -56,11 +61,11 @@ namespace ENI2.Excel
                     if ((message.MessageNotificationClass == Message.NotificationClass.BPOL) && notificationClasses.Contains(Message.NotificationClass.BPOL))
                     { if (ScanBPOL(message, messages, messageCore, reader)) SaveMessage(message); }
                     if ((message.MessageNotificationClass == Message.NotificationClass.CREW) && notificationClasses.Contains(Message.NotificationClass.CREW))
-                    { if (ScanCREW(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanCREW(message, reader, isOldVersion)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.CREWD) && notificationClasses.Contains(Message.NotificationClass.CREWD))
                     { if (ScanCREWD(message, reader)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.HAZA) && notificationClasses.Contains(Message.NotificationClass.HAZA))
-                    { if (ScanHAZA(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanHAZA(message, reader, isOldVersion)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.HAZD) && notificationClasses.Contains(Message.NotificationClass.HAZD))
                     { if (ScanHAZD(message, reader)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.INFO) && notificationClasses.Contains(Message.NotificationClass.INFO))
@@ -74,7 +79,7 @@ namespace ENI2.Excel
                     if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD))
                     { if (ScanNOA_NOD(message, messageCore, reader)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.PAS) && notificationClasses.Contains(Message.NotificationClass.PAS))
-                    { if (ScanPAS(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanPAS(message, reader, isOldVersion)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD))
                     { if (ScanPASD(message, reader)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.POBA) && notificationClasses.Contains(Message.NotificationClass.POBA))
@@ -92,15 +97,15 @@ namespace ENI2.Excel
                     if ((message.MessageNotificationClass == Message.NotificationClass.STO) && notificationClasses.Contains(Message.NotificationClass.STO))
                     { if (ScanSTO(message, reader)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.TIEFA) && notificationClasses.Contains(Message.NotificationClass.TIEFA))
-                    { if (ScanTIEFA(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanTIEFA(message, reader, isOldVersion)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.TIEFD) && notificationClasses.Contains(Message.NotificationClass.TIEFD))
-                    { if (ScanTIEFD(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanTIEFD(message, reader, isOldVersion)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.TOWA) && notificationClasses.Contains(Message.NotificationClass.TOWA))
                     { if (ScanTOWA(message, reader)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.TOWD) && notificationClasses.Contains(Message.NotificationClass.TOWD))
                     { if (ScanTOWD(message, reader)) SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.WAS) && notificationClasses.Contains(Message.NotificationClass.WAS))
-                    { if (ScanWAS(message, reader)) SaveMessage(message); continue; }
+                    { if (ScanWAS(message, reader, isOldVersion)) SaveMessage(message); continue; }
                     if((message.MessageNotificationClass == Message.NotificationClass.WAS_RCPT) && notificationClasses.Contains(Message.NotificationClass.WAS_RCPT))
                     { if (ScanWAS_RCPT(message, reader)) SaveMessage(message); continue; }
 
@@ -177,7 +182,7 @@ namespace ENI2.Excel
 
         #region TIEFA
 
-        private static bool ScanTIEFA(Message tiefaMessage, ExcelReader reader)
+        private static bool ScanTIEFA(Message tiefaMessage, ExcelReader reader, bool isOldVersion)
         {            
             if (tiefaMessage.Elements.Count == 0)
             {
@@ -189,7 +194,7 @@ namespace ENI2.Excel
             ScanMessage(tiefa, reader);
             if (!tiefa.DraughtUponArrival_DMT.HasValue && tiefaMessage.IsNew)
                 return false;
-            if (tiefa.DraughtUponArrival_DMT.HasValue)
+            if (tiefa.DraughtUponArrival_DMT.HasValue && !isOldVersion)
                 tiefa.DraughtUponArrival_DMT = tiefa.DraughtUponArrival_DMT.Value * 10; // m to dm
             return true;
         }
@@ -198,7 +203,7 @@ namespace ENI2.Excel
 
         #region TIEFD
 
-        private static bool ScanTIEFD(Message tiefdMessage, ExcelReader reader)
+        private static bool ScanTIEFD(Message tiefdMessage, ExcelReader reader, bool isOldVersion)
         {            
             if(tiefdMessage.Elements.Count == 0)
             {
@@ -210,7 +215,7 @@ namespace ENI2.Excel
             ScanMessage(tiefd, reader);
             if (!tiefd.DraughtUponDeparture_DMT.HasValue && tiefdMessage.IsNew)
                 return false;
-            if (tiefd.DraughtUponDeparture_DMT.HasValue)
+            if (tiefd.DraughtUponDeparture_DMT.HasValue && ! isOldVersion)
                 tiefd.DraughtUponDeparture_DMT = tiefd.DraughtUponDeparture_DMT.Value * 10; // m to dm
             return true;                       
         }
@@ -342,7 +347,7 @@ namespace ENI2.Excel
 
         #region HAZA
 
-        private static bool ScanHAZA(Message hazaMessage, ExcelReader reader)
+        private static bool ScanHAZA(Message hazaMessage, ExcelReader reader, bool isOldVersion)
         {
             
             if(hazaMessage.Elements.Count == 0)
@@ -435,6 +440,8 @@ namespace ENI2.Excel
                 string ibc_productName = string.Format("HAZA.IBC.ProductName_{0}", i);
                 string ibc_pollutionCategory = string.Format("HAZA.IBC.PollutionCategory_{0}", i);
                 string ibc_flash = string.Format("HAZA.IBC.Flashpoint_CEL_{0}", i);
+                if (isOldVersion)
+                    ibc_flash = string.Format("HAZA.IBC.FlashpointInformation_{0}", i);
                 string ibc_quantity = string.Format("HAZA.IBC.Quantity_KGM_{0}", i);
                 string ibc_stowagePosition = string.Format("HAZA.IBC.StowagePosition_{0}", i);
                 string ibc_portOfLoading = string.Format("HAZA.IBC.PortOfLoading_{0}", i);
@@ -1120,7 +1127,7 @@ namespace ENI2.Excel
 
         #region WAS
 
-        private static bool ScanWAS(Message wasMessage, ExcelReader reader)
+        private static bool ScanWAS(Message wasMessage, ExcelReader reader, bool isOldVersion)
         {            
             if (wasMessage.Elements.Count == 0)
             {
@@ -1149,10 +1156,11 @@ namespace ENI2.Excel
                     was.WasteDisposalServiceProvider.Add(wdsp);
                 }
                 was.WasteDisposalServiceProvider[0].WasteDisposalServiceProviderName = wastedispServProvName;
-            }            
+            }
 
             // Waste 1 - 25
-            for (int i = 1; i <= was.NumberOfExcelRows; i++)
+            int maxWaste = isOldVersion ? 15 : was.NumberOfExcelRows;
+            for (int i = 1; i <= maxWaste; i++)
             {
                 //string wastetype = string.Format("WAS.WasteType_{0}", i);
                 string wasteCode = string.Format("WAS.WasteCode_{0}", i);
@@ -2032,7 +2040,7 @@ namespace ENI2.Excel
 
         #region CREW
 
-        private static bool ScanCREW(Message crewMessage, ExcelReader reader)
+        private static bool ScanCREW(Message crewMessage, ExcelReader reader, bool isOldVersion)
         {
             crewMessage.DeleteElements();
 
@@ -2082,7 +2090,11 @@ namespace ENI2.Excel
                     crew.CrewMemberIdentityDocumentId = reader.ReadText(crewIdentDocId);                    
                     crew.CrewMemberVisaNumber = reader.ReadText(crewVisaNo);
                     crew.CrewMemberIdentityDocumentIssuingState = reader.ReadNationality(crewIssuing);
+                    if (crew.CrewMemberIdentityDocumentIssuingState.IsNullOrEmpty() && isOldVersion)
+                        crew.CrewMemberIdentityDocumentIssuingState = "XX";
                     crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadDate(crewIdentDocExpiry);
+                    if (!crew.CrewMemberIdentityDocumentExpiryDate.HasValue && isOldVersion)
+                        crew.CrewMemberIdentityDocumentExpiryDate = new DateTime(2100, 12, 31);
                     crew.CrewMemberCountryOfBirth = reader.ReadNationality(crewCountryOfBirth);
                     crew.Effects = reader.ReadText(crewEffects);
                 }
@@ -2152,7 +2164,7 @@ namespace ENI2.Excel
 
         #region PAS
 
-        private static bool ScanPAS(Message pasMessage, ExcelReader reader)
+        private static bool ScanPAS(Message pasMessage, ExcelReader reader, bool isOldVersion)
         {
             pasMessage.DeleteElements();
 
@@ -2208,7 +2220,11 @@ namespace ENI2.Excel
                     pas.PassengerIdentityDocumentId = reader.ReadText(pasIdentDocId);
                     pas.PassengerVisaNumber = reader.ReadText(pasVisaNo);
                     pas.PassengerIdentityDocumentIssuingState = reader.ReadNationality(pasIssuing);
+                    if (pas.PassengerIdentityDocumentIssuingState.IsNullOrEmpty() && isOldVersion)
+                        pas.PassengerIdentityDocumentIssuingState = "XX";
                     pas.PassengerIdentityDocumentExpiryDate = reader.ReadDate(pasExpiryDate);
+                    if (!pas.PassengerIdentityDocumentExpiryDate.HasValue && isOldVersion)
+                        pas.PassengerIdentityDocumentExpiryDate = new DateTime(2100, 12, 31);
                     pas.PassengerCountryOfBirth = reader.ReadNationality(pasCountryOfBirth);
                     pas.EmergencyCare = reader.ReadText(pasEmergencyCare);
                     pas.EmergencyContactNumber = reader.ReadText(pasEmergencyContact);
diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs
index b76c559f..65756ece 100644
--- a/ENI2/Excel/ExcelWriter.cs
+++ b/ENI2/Excel/ExcelWriter.cs
@@ -740,7 +740,13 @@ namespace ENI2.Excel
 
         private void WriteNOA_NOD(NOA_NOD noa_nod, bool isTransit, bool isRefSheet)
         {
-            if(noa_nod.ETAToPortOfCall.HasValue)
+            if(isTransit && noa_nod.ETAToKielCanal.HasValue)
+            {
+                WriteDate("NOA_NOD.ETADateToPortOfCall", noa_nod.ETAToKielCanal.Value);
+                WriteTime("NOA_NOD.ETATimeToPortOfCall", noa_nod.ETAToKielCanal.Value);
+            }
+
+            if(!isTransit && noa_nod.ETAToPortOfCall.HasValue)
             {
                 WriteDate("NOA_NOD.ETADateToPortOfCall", noa_nod.ETAToPortOfCall.Value);
                 WriteTime("NOA_NOD.ETATimeToPortOfCall", noa_nod.ETAToPortOfCall.Value);
@@ -1122,25 +1128,20 @@ namespace ENI2.Excel
             WriteBoolean("WAS.ConfirmationOfCorrectness", true);
             WriteBoolean("WAS.ConfirmationOfSufficiency", true);
 
-            for(int i = 0; i < Math.Min(was.NumberOfExcelRows, was.Waste.Count); i++)
+            for(int i = 0; i < was.NumberOfExcelRows; i++)
             {
-                string wastetype = string.Format("WAS.WasteType_{0}", i + 1);
-                string wasteCode = string.Format("WAS.WasteCode_{0}", i + 1);
+                int? wasteType = (int?)ReadNumber(string.Format("WAS.WasteCode_{0}", i + 1));
+                if (!wasteType.HasValue) continue;
+                
                 string wasteDescription = string.Format("WAS.WasteDescription_{0}", i + 1);
                 string wasteAmount = string.Format("WAS.WasteDisposalAmount_MTQ_{0}", i + 1);
                 string wasteCapacity = string.Format("WAS.WasteCapacity_MTQ_{0}", i + 1);
                 string wasteRetained = string.Format("WAS.WasteAmountRetained_MTQ_{0}", i + 1);
                 string wastePort = string.Format("WAS.WasteDisposalPort_{0}", i + 1);
-                string amountGen = string.Format("WAS.WasteAmountGeneratedTillNextPort_MTQ_{0}", i + 1);                
+                string amountGen = string.Format("WAS.WasteAmountGeneratedTillNextPort_MTQ_{0}", i + 1);
 
-                Waste waste = was.Waste[i];
-
-                if (waste.WasteType.HasValue)
-                {
-                    WriteNumber(wasteCode, waste.WasteType.Value);
-                    if (WAS.WasteCodeDict.ContainsKey(waste.WasteType.Value.ToString()))
-                        WriteText(wastetype, WAS.WasteCodeDict[waste.WasteType.Value.ToString()]);
-                }
+                Waste waste = was.GetWasteForType(wasteType.Value);
+                
                 WriteText(wasteDescription, waste.WasteDescription);
                 if (waste.WasteDisposalAmount_MTQ.HasValue)
                     WriteNumber(wasteAmount, waste.WasteDisposalAmount_MTQ.Value);
@@ -1182,12 +1183,15 @@ namespace ENI2.Excel
                 WriteDate(wddtd, wrcpt.WasteDeliveryDateTo);
                 WriteTime(wddtt, wrcpt.WasteDeliveryDateTo);
 
-                for(int j = 1; j <= Math.Min(wrcpt.NumberOfExcelRows, wrcpt.WasteReceived.Count); j++)
+                for(int j = 1; j <= wrcpt.NumberOfExcelRows; j++)
                 {
+                    int? wasteType = (int?)ReadNumber(string.Format("WAS_RCPT.WasteDeliveryReceipt.WasteCode_{0}", i + 1));
+                    if (!wasteType.HasValue) continue;
+
                     string wdesc = string.Format("WAS_RCPT.WasteDeliveryReceipt_{0}.WasteDescription_{1}", i, j);
                     string wamount = string.Format("WAS_RCPT.WasteDeliveryReceipt_{0}.AmountWasteReceived_MTQ_{1}", i, j);
 
-                    WasteReceived wReceived = wrcpt.WasteReceived[j - 1];
+                    WasteReceived wReceived = wrcpt.GetWasteReceivedForType(wasteType.Value);
 
                     WriteText(wdesc, wReceived.WasteDescription);
                     WriteNumber(wamount, wReceived.AmountWasteReceived_MTQ);
diff --git a/bsmd.database/CREW.cs b/bsmd.database/CREW.cs
index 1a5f3449..779f8f53 100644
--- a/bsmd.database/CREW.cs
+++ b/bsmd.database/CREW.cs
@@ -45,9 +45,9 @@ namespace bsmd.database
         [ENI2Validation]
         public string CrewMemberPlaceOfBirth { get; set; }
 
-        [Validation(ValidationCode.FLAG_CODE)]
+        // [Validation(ValidationCode.FLAG_CODE)]
         [MaxLength(2)]
-        [ENI2Validation]
+        [ENI2Validation] // XXX - TODO
         public string CrewMemberCountryOfBirth { get; set; }
 
         [Validation(ValidationCode.NOT_NULL)]
diff --git a/bsmd.database/PAS.cs b/bsmd.database/PAS.cs
index e651f781..4131f729 100644
--- a/bsmd.database/PAS.cs
+++ b/bsmd.database/PAS.cs
@@ -134,9 +134,9 @@ namespace bsmd.database
         [ENI2Validation]
         public bool? NotificationPAX { get; set; }
 
-        [Validation(ValidationCode.FLAG_CODE)]
+        //[Validation(ValidationCode.FLAG_CODE)]
         [MaxLength(2)]
-        [ENI2Validation]
+        [ENI2Validation] // XXX - TODO
         public string PassengerCountryOfBirth { get; set; }
 
         [ENI2Validation]
diff --git a/bsmd.database/ValidationRule.cs b/bsmd.database/ValidationRule.cs
index 1aeca587..624805a6 100644
--- a/bsmd.database/ValidationRule.cs
+++ b/bsmd.database/ValidationRule.cs
@@ -13,12 +13,12 @@ namespace bsmd.database
 {
     public class ValidationRule : DatabaseEntity
     {
-        private static ILog _log = LogManager.GetLogger("ValidationRule");
+        private static readonly ILog _log = LogManager.GetLogger("ValidationRule");
         private static List<ValidationField> _validationFields = null;
         private static Dictionary<string, ValidationField> _validationFieldDict = null;
 
-        private static Dictionary<ValidationField, object> _lookupDict = new Dictionary<ValidationField, object>();
-        private static Dictionary<ValidationField, List<object>> _lookupListDict = new Dictionary<ValidationField, List<object>>();
+        private static readonly Dictionary<ValidationField, object> _lookupDict = new Dictionary<ValidationField, object>();
+        private static readonly Dictionary<ValidationField, List<object>> _lookupListDict = new Dictionary<ValidationField, List<object>>();
 
         public ValidationRule()
         {
diff --git a/bsmd.database/WAS_RCPT.cs b/bsmd.database/WAS_RCPT.cs
index 2733602c..c3603513 100644
--- a/bsmd.database/WAS_RCPT.cs
+++ b/bsmd.database/WAS_RCPT.cs
@@ -404,6 +404,16 @@ namespace bsmd.database
 
         }
 
+        public WasteReceived GetWasteReceivedForType(int value)
+        {
+            foreach(WasteReceived wr in this.WasteReceived)
+            {
+                if (Int32.TryParse(wr.WasteCode, out int code) && (code == value))
+                    return wr;
+            }
+            return null;
+        }
+
         #endregion
 
     }
diff --git a/bsmd.hisnord/Request.cs b/bsmd.hisnord/Request.cs
index 863c8ba6..eba850fc 100644
--- a/bsmd.hisnord/Request.cs
+++ b/bsmd.hisnord/Request.cs
@@ -1391,7 +1391,7 @@ namespace bsmd.hisnord
                                         hn_pas.Passenger[i].PassengerDateOfBirth = pas.PassengerDateOfBirth.Value;
                                     hn_pas.Passenger[i].PassengerFirstName = pas.PassengerFirstName;
                                     if (pas.PassengerGender.HasValue)
-                                        hn_pas.Passenger[i].PassengerGender = (gendertype)pas.PassengerGender.Value;
+                                        hn_pas.Passenger[i].PassengerGender = (GenderType)pas.PassengerGender.Value;
                                     hn_pas.Passenger[i].PassengerGenderSpecified = pas.PassengerGender.HasValue;
                                     hn_pas.Passenger[i].PassengerIdentityDocumentId = pas.PassengerIdentityDocumentId;
                                     if (pas.PassengerIdentityDocumentType.HasValue)
@@ -1473,7 +1473,7 @@ namespace bsmd.hisnord
 
                                     hn_pas.FirstName = pasd.PassengerFirstName;
                                     if (pasd.PassengerGender.HasValue)
-                                        hn_pas.Gender = (gendertype)pasd.PassengerGender.Value;
+                                        hn_pas.Gender = (GenderType)pasd.PassengerGender.Value;
                                     hn_pas.LastName = pasd.PassengerLastName;
                                     hn_pas.Nationality = pasd.PassengerNationality;
                                     hn_pas.PlaceOfBirth = pasd.PassengerPlaceOfBirth;                                    
@@ -1516,7 +1516,7 @@ namespace bsmd.hisnord
                                     hn_crew.CrewMember[i].CrewMemberDuty = crew.CrewMemberDuty;
                                     hn_crew.CrewMember[i].CrewMemberFirstName = crew.CrewMemberFirstName;
                                     if (crew.CrewMemberGender.HasValue)
-                                        hn_crew.CrewMember[i].CrewMemberGender = (gendertype)crew.CrewMemberGender.Value;
+                                        hn_crew.CrewMember[i].CrewMemberGender = (GenderType)crew.CrewMemberGender.Value;
                                     hn_crew.CrewMember[i].CrewMemberGenderSpecified = crew.CrewMemberGender.HasValue;
                                     hn_crew.CrewMember[i].CrewMemberIdentityDocumentId = crew.CrewMemberIdentityDocumentId;
                                     if (crew.CrewMemberIdentityDocumentType.HasValue)
@@ -1579,7 +1579,7 @@ namespace bsmd.hisnord
                                     hn_crew.DutyOnBoard = crewd.CrewMemberDuty;
                                     hn_crew.FirstName = crewd.CrewMemberFirstName;
                                     if(crewd.CrewMemberGender.HasValue)
-                                        hn_crew.Gender = (gendertype)crewd.CrewMemberGender.Value;
+                                        hn_crew.Gender = (GenderType)crewd.CrewMemberGender.Value;
                                     hn_crew.LastName = crewd.CrewMemberLastName;
                                     hn_crew.Nationality = crewd.CrewMemberNationality;
                                     hn_crew.PlaceOfBirth = crewd.CrewMemberPlaceOfBirth;                                    
diff --git a/bsmd.hisnord/his-nord.cs b/bsmd.hisnord/his-nord.cs
index 2f46b82a..18037713 100644
--- a/bsmd.hisnord/his-nord.cs
+++ b/bsmd.hisnord/his-nord.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:2.0.50727.9151
+//     Laufzeitversion:4.0.30319.42000
 //
 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 //     der Code erneut generiert wird.
@@ -11,12 +11,12 @@
 using System.Xml.Serialization;
 
 // 
-// This source code was auto-generated by xsd, Version=2.0.50727.312.
+// Dieser Quellcode wurde automatisch generiert von xsd, Version=4.8.3928.0.
 // 
 
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -121,7 +121,7 @@ public partial class nsw {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -279,7 +279,7 @@ public partial class conveyance {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
 public enum ItemsChoiceType {
@@ -307,7 +307,7 @@ public enum ItemsChoiceType {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -367,7 +367,7 @@ public partial class broker_owner {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -428,7 +428,7 @@ public partial class addresstype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -566,7 +566,7 @@ public partial class agnt {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -587,7 +587,7 @@ public partial class towd {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -712,7 +712,7 @@ public partial class departure {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -824,7 +824,7 @@ public partial class departureoperator {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -845,7 +845,7 @@ public partial class towa {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -970,7 +970,7 @@ public partial class arrival {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1082,7 +1082,7 @@ public partial class arrivaloperator {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1130,7 +1130,7 @@ public partial class crewtype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="yorn-type")]
 public enum yorntype {
@@ -1143,7 +1143,7 @@ public enum yorntype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1160,7 +1160,7 @@ public partial class crewtypeCrewMember {
     
     private System.DateTime dateOfBirthField;
     
-    private gendertype genderField;
+    private GenderType genderField;
     
     private string nationalityField;
     
@@ -1225,7 +1225,7 @@ public partial class crewtypeCrewMember {
     
     /// <remarks/>
     [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public gendertype Gender {
+    public GenderType Gender {
         get {
             return this.genderField;
         }
@@ -1269,26 +1269,29 @@ public partial class crewtypeCrewMember {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
-[System.Xml.Serialization.XmlTypeAttribute(TypeName="gender-type")]
-public enum gendertype {
+public enum GenderType {
     
     /// <remarks/>
-    MALE,
+    [System.Xml.Serialization.XmlEnumAttribute("0")]
+    Item0,
     
     /// <remarks/>
-    FEMALE,
+    [System.Xml.Serialization.XmlEnumAttribute("1")]
+    Item1,
     
     /// <remarks/>
-    OTHER,
+    [System.Xml.Serialization.XmlEnumAttribute("2")]
+    Item2,
     
     /// <remarks/>
-    NOT_APPLICABLE,
+    [System.Xml.Serialization.XmlEnumAttribute("9")]
+    Item9,
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1362,7 +1365,7 @@ public partial class crewtypeCrewMemberDetailsSchengen {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="document-type")]
 public enum documenttype {
@@ -1387,7 +1390,7 @@ public enum documenttype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1408,7 +1411,7 @@ public partial class crew {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1422,7 +1425,7 @@ public partial class crewmember {
     
     private System.DateTime crewMemberDateOfBirthField;
     
-    private gendertype crewMemberGenderField;
+    private GenderType crewMemberGenderField;
     
     private bool crewMemberGenderFieldSpecified;
     
@@ -1486,7 +1489,7 @@ public partial class crewmember {
     
     /// <remarks/>
     [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public gendertype CrewMemberGender {
+    public GenderType CrewMemberGender {
         get {
             return this.crewMemberGenderField;
         }
@@ -1585,7 +1588,7 @@ public partial class crewmember {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1633,7 +1636,7 @@ public partial class pastype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1650,7 +1653,7 @@ public partial class pastypePassenger {
     
     private System.DateTime dateOfBirthField;
     
-    private gendertype genderField;
+    private GenderType genderField;
     
     private string nationalityField;
     
@@ -1715,7 +1718,7 @@ public partial class pastypePassenger {
     
     /// <remarks/>
     [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public gendertype Gender {
+    public GenderType Gender {
         get {
             return this.genderField;
         }
@@ -1759,7 +1762,7 @@ public partial class pastypePassenger {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1872,7 +1875,7 @@ public partial class pastypePassengerDetailsSchengen {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1907,7 +1910,7 @@ public partial class pastypePassengerDetailsPAX {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1928,7 +1931,7 @@ public partial class pas {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1942,7 +1945,7 @@ public partial class passenger {
     
     private System.DateTime passengerDateOfBirthField;
     
-    private gendertype passengerGenderField;
+    private GenderType passengerGenderField;
     
     private bool passengerGenderFieldSpecified;
     
@@ -2012,7 +2015,7 @@ public partial class passenger {
     
     /// <remarks/>
     [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public gendertype PassengerGender {
+    public GenderType PassengerGender {
         get {
             return this.passengerGenderField;
         }
@@ -2144,7 +2147,7 @@ public partial class passenger {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2178,7 +2181,7 @@ public partial class portofitinery {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2212,7 +2215,7 @@ public partial class bpol {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2233,7 +2236,7 @@ public partial class was_rcpt {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2321,7 +2324,7 @@ public partial class was_rcptWasteDeliveryReceipt {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2356,7 +2359,7 @@ public partial class was_rcptWasteDeliveryReceiptWasteDeliveryPeriod {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2391,7 +2394,7 @@ public partial class was_rcptWasteDeliveryReceiptWasteReceived {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2426,7 +2429,7 @@ public partial class was_rcptWasteDeliveryReceiptWasteReceivedWasteType {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2525,7 +2528,7 @@ public partial class wastedetails {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2559,7 +2562,7 @@ public partial class wastetyp {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2606,7 +2609,7 @@ public partial class waste {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2648,7 +2651,7 @@ public partial class was {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="y-type")]
 public enum ytype {
@@ -2658,7 +2661,7 @@ public enum ytype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
 public enum ItemsChoiceType6 {
@@ -2686,7 +2689,7 @@ public enum ItemsChoiceType6 {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2707,7 +2710,7 @@ public partial class portofcalls {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2768,7 +2771,7 @@ public partial class portofcallmdh {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2802,7 +2805,7 @@ public partial class infectedarea {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2836,7 +2839,7 @@ public partial class sanitarycertificate {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2883,7 +2886,7 @@ public partial class sanitarydetail {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2939,7 +2942,7 @@ public partial class mdh {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
 public enum ItemsChoiceType5 {
@@ -3009,7 +3012,7 @@ public enum ItemsChoiceType5 {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3047,7 +3050,7 @@ public partial class location {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3081,7 +3084,7 @@ public partial class coordinates {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
 public enum ItemsChoiceType3 {
@@ -3097,7 +3100,7 @@ public enum ItemsChoiceType3 {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3170,7 +3173,7 @@ public partial class lastactivity {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
 public enum lastactivityShipToShipActivityType {
@@ -3273,7 +3276,7 @@ public enum lastactivityShipToShipActivityType {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3398,7 +3401,7 @@ public partial class last10port {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="posint1-3-type")]
 public enum posint13type {
@@ -3417,7 +3420,7 @@ public enum posint13type {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3490,7 +3493,7 @@ public partial class KielCanalPassage {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3569,7 +3572,7 @@ public partial class sec {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="cargodescription-type")]
 public enum cargodescriptiontype {
@@ -3594,7 +3597,7 @@ public enum cargodescriptiontype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="isscissuer-type")]
 public enum isscissuertype {
@@ -3607,7 +3610,7 @@ public enum isscissuertype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="issc-type")]
 public enum issctype {
@@ -3620,7 +3623,7 @@ public enum issctype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
 public enum ItemsChoiceType4 {
@@ -3681,7 +3684,7 @@ public enum ItemsChoiceType4 {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3754,7 +3757,7 @@ public partial class tankerdetails {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="hullconfig-type")]
 public enum hullconfigtype {
@@ -3770,7 +3773,7 @@ public enum hullconfigtype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="cargocondition-type")]
 public enum cargoconditiontype {
@@ -3786,7 +3789,7 @@ public enum cargoconditiontype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3885,7 +3888,7 @@ public partial class pre72 {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3906,7 +3909,7 @@ public partial class serv {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3953,7 +3956,7 @@ public partial class service {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3974,7 +3977,7 @@ public partial class generalcargo {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4086,7 +4089,7 @@ public partial class loadunit {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="handlingcode-type")]
 public enum handlingcodetype {
@@ -4099,7 +4102,7 @@ public enum handlingcodetype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4139,7 +4142,7 @@ public partial class hazd {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4164,7 +4167,7 @@ public partial class dglist {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4342,7 +4345,7 @@ public partial class positionibc {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="polcat-type")]
 public enum polcattype {
@@ -4361,7 +4364,7 @@ public enum polcattype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="hazard-type")]
 public enum hazardtype {
@@ -4378,7 +4381,7 @@ public enum hazardtype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="flashpointinfo-type")]
 public enum flashpointinfotype {
@@ -4394,7 +4397,7 @@ public enum flashpointinfotype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4507,7 +4510,7 @@ public partial class positionigc {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5051,7 +5054,7 @@ public partial class positionimdg {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="packinggroup-type")]
 public enum packinggrouptype {
@@ -5067,7 +5070,7 @@ public enum packinggrouptype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5102,7 +5105,7 @@ public partial class positionimdgClass7MaxActivity_BQL {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
 public enum positionimdgClass7MaxActivity_BQLMaxActivity_Unit {
@@ -5118,7 +5121,7 @@ public enum positionimdgClass7MaxActivity_BQLMaxActivity_Unit {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="class7cat-type")]
 public enum class7cattype {
@@ -5137,7 +5140,7 @@ public enum class7cattype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5184,7 +5187,7 @@ public partial class stowagepositionbayrowtier {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5336,7 +5339,7 @@ public partial class positionimsbc {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
 public enum positionimsbcIMOHazardClass {
@@ -5353,7 +5356,7 @@ public enum positionimsbcIMOHazardClass {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5466,7 +5469,7 @@ public partial class positionmarpol {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="infclass-type")]
 public enum infclasstype {
@@ -5482,7 +5485,7 @@ public enum infclasstype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
 public enum ItemsChoiceType2 {
@@ -5504,7 +5507,7 @@ public enum ItemsChoiceType2 {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5544,7 +5547,7 @@ public partial class haza {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
 public enum ItemsChoiceType1 {
@@ -5566,7 +5569,7 @@ public enum ItemsChoiceType1 {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5587,7 +5590,7 @@ public partial class bkrd {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5621,7 +5624,7 @@ public partial class bunkerfuel {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5642,7 +5645,7 @@ public partial class bkra {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5780,7 +5783,7 @@ public partial class info {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(TypeName="shippingarea-type")]
 public enum shippingareatype {
@@ -5796,7 +5799,7 @@ public enum shippingareatype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5856,7 +5859,7 @@ public partial class pobd {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5916,7 +5919,7 @@ public partial class poba {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5950,7 +5953,7 @@ public partial class callpurpose {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6076,7 +6079,7 @@ public partial class noanod {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6162,7 +6165,7 @@ public partial class ismcompany {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6327,7 +6330,7 @@ public partial class vesseltype {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6349,7 +6352,7 @@ public partial class vesseltypeInmarsatCallNumbers {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6422,7 +6425,7 @@ public partial class contacts {
 }
 
 /// <remarks/>
-[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.312")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
 [System.SerializableAttribute()]
 [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
 public enum Items1ChoiceType {