5.0.1 Zwischenstand (dbh-Änderungen)

2018-03-10 16:51:26 +00:00 · 2018-03-10 16:51:26 +00:00 · 83a95a9a6a
commit 83a95a9a6a
parent 6b26e8039b
19 changed files with 3658 additions and 226 deletions
--- a/ENI-2/ENI2/ENI2/App.config
+++ b/ENI-2/ENI2/ENI2/App.config
@ -26,12 +26,12 @@
                <value>1000</value>
            </setting>
            <setting name="LockingServerAddress" serializeAs="String">
-              <value>http://192.168.2.4/LockingService/LockingService.svc</value>
-              <!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
+              <!--value>http://192.168.2.4/LockingService/LockingService.svc</value-->
+              <value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
            </setting>
            <setting name="ConnectionString" serializeAs="String">
-              <value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
-                <!--value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
+              <!--value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
+                <value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
            </setting>
        </ENI2.Properties.Settings>
    </applicationSettings>
--- a/Stundensheet.xlsx
+++ b/Stundensheet.xlsx
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@ -1360,6 +1360,12 @@ namespace bsmd.ExcelReadService
                    }
                }

+                // RM am 24.1.18, ich hoffe das stimmt so wie sie meint..
+                if((reader.Mode == ExcelReader.CountryMode.DK) && (i==9))
+                {
+                    waste.WasteType = 2300;
+                }
+
                reader.Conf.ConfirmText(wasteDescription, waste.WasteDescription, waste.WasteDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN :  ExcelReader.ReadState.OK);
                waste.WasteDisposalAmount_MTQ = reader.ReadNumberDefaultZero(wasteAmount);				
                waste.WasteCapacity_MTQ = reader.ReadNumberDefaultZero(wasteCapacity);				
--- a/nsw/Source/bsmd.database/IBCPosition.cs
+++ b/nsw/Source/bsmd.database/IBCPosition.cs
@ -253,6 +253,14 @@ namespace bsmd.database
            if (this.FlashpointInformation.HasValue && (this.FlashpointInformation.Value == 2) &&
            this.Flashpoint_CEL.IsNullOrEmpty())
                violations.Add(RuleEngine.CreateViolation(ValidationCode.V804, "Flashpoint_CEL", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+
+            if(!this.Flashpoint_CEL.IsNullOrEmpty())
+            {
+                double flashVal;
+                if (!Double.TryParse(this.Flashpoint_CEL, out flashVal))
+                    errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "Flashpoint_CEL", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+            }
+
        }

        #endregion
--- a/nsw/Source/bsmd.database/IMDGPosition.cs
+++ b/nsw/Source/bsmd.database/IMDGPosition.cs
@ -448,6 +448,14 @@ namespace bsmd.database

            foreach (SubsidiaryRisks sr in this.SubsidiaryRiskList)
                RuleEngine.ValidateProperties(sr, errors, violations);
+
+            if (!this.Flashpoint_CEL.IsNullOrEmpty())
+            {
+                double flashVal;
+                if (!Double.TryParse(this.Flashpoint_CEL, out flashVal))
+                    errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "Flashpoint_CEL", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+            }
+
        }

        #endregion
--- a/nsw/Source/bsmd.database/MARPOL_Annex_I_Position.cs
+++ b/nsw/Source/bsmd.database/MARPOL_Annex_I_Position.cs
@ -180,6 +180,14 @@ namespace bsmd.database
            this.Flashpoint_CEL.IsNullOrEmpty())
                violations.Add(RuleEngine.CreateViolation(ValidationCode.V804, "Flashpoint_CEL", null, this.Title, this.Identifier,
                    this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+
+            if (!this.Flashpoint_CEL.IsNullOrEmpty())
+            {
+                double flashVal;
+                if (!Double.TryParse(this.Flashpoint_CEL, out flashVal))
+                    errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "Flashpoint_CEL", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+            }
+
        }

        #endregion
--- a/nsw/Source/bsmd.database/MessageCore.cs
+++ b/nsw/Source/bsmd.database/MessageCore.cs
@ -686,7 +686,7 @@ namespace bsmd.database
        {
            if(obj is MessageCore)
            {
-                return Nullable.Compare(((MessageCore)obj).ETADisplay, this.ETADisplay);
+                return Nullable.Compare(((MessageCore)obj).ETA_NOA_NOD, this.ETA_NOA_NOD);
            }
            return 0;
        }
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@ -2,6 +2,6 @@

 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("5.0.0")]
+[assembly: AssemblyInformationalVersion("5.0.1")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2018 schick Informatik")]
 [assembly: AssemblyTrademark("")]
--- 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("5.0.0.*")]
+[assembly: AssemblyVersion("5.0.1.*")]

--- a/nsw/Source/bsmd.database/RuleEngine.cs
+++ b/nsw/Source/bsmd.database/RuleEngine.cs
@ -357,7 +357,7 @@ namespace bsmd.database
                        break;                   
                    case ValidationCode.FRZ:
                        {                            
-                            Regex rgx = new Regex(@"^[A-Z, a-z,0-9]{4,7}$");
+                            Regex rgx = new Regex(@"^[A-Z,a-z,0-9]{4,7}$");
                            if (!rgx.IsMatch(value)) errors.Add(RuleEngine.CreateError(validationCode, property.Name, value, entity.Title, identifier, entity.Tablename));

                            break;
--- a/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
+++ b/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
@ -186,13 +186,13 @@ namespace bsmd.database

            if (locationInsufficient)
            {
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.V701, null, null , this.Title, this.Identifier, this.SEC.Tablename));
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.V701, "ShipToShipActivity", null , this.Title, this.Identifier, this.SEC.Tablename));
            }

            if(!this.ShipToShipActivityLocationLoCode.IsNullOrEmpty() && (RuleEngine.LocodeChecker != null))
            {
                if (!RuleEngine.LocodeChecker(this.ShipToShipActivityLocationLoCode, RuleEngine.LocodeMode.STANDARD))
-                    errors.Add(RuleEngine.CreateError(ValidationCode.LOCODE, null, null, this.Title, this.Identifier, this.SEC.Tablename));
+                    errors.Add(RuleEngine.CreateError(ValidationCode.LOCODE, "ShipToShipActivityLocationLoCode", this.ShipToShipActivityLocationLoCode, this.Title, this.Identifier, this.SEC.Tablename));
            }

        }
--- a/nsw/Source/bsmd.database/Util.cs
+++ b/nsw/Source/bsmd.database/Util.cs
@ -194,6 +194,12 @@ namespace bsmd.database
                        {
                            ((MDH)classElement).SetBoolsToFalse();
                        }
+                        if(notificationClass == Message.NotificationClass.BPOL)
+                        {
+                            // Vorbelegung, Spezialwunsch aus BRV 5.2.18
+                            ((BPOL)classElement).CruiseShip = false;
+                            ((BPOL)classElement).StowawaysOnBoard = false;
+                        }
                        if (classElement != null) // null für Visit/Transit
                        {
                            classElement.MessageHeader = message;
--- a/nsw/Source/bsmd.database/WAS.cs
+++ b/nsw/Source/bsmd.database/WAS.cs
@ -342,7 +342,6 @@ namespace bsmd.database
                        entryMissing = true;
                        break;
                    }                    
-                    
                }

                if(entryMissing)
@ -350,6 +349,11 @@ namespace bsmd.database
                    errors.Add(RuleEngine.CreateError(ValidationCode.POSITION_COUNT, string.Format("Waste {0}", missingType), null, this.Title, null, this.Tablename));
                }

+                if(!(this.ConfirmationOfCorrectness ?? false))
+                {
+                    errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "Confirmation of correctness not set!", null, this.Title, null, this.Tablename));
+                }
+
            }
        }

--- a/nsw/Source/bsmd.dbh/Request.cs
+++ b/nsw/Source/bsmd.dbh/Request.cs
@ -76,7 +76,7 @@ namespace bsmd.dbh

                _log.InfoFormat("Send Url: {0}", client.Url);

-                RootVersion rootVersion = RootVersion.Item40;
+                RootVersion rootVersion = RootVersion.Item50;

                string result = client.Root(
                    rootVersion,
@ -673,12 +673,15 @@ namespace bsmd.dbh
                        rootStat.CallSign = stat.CallSign;
                        rootStat.MMSINumber = stat.MMSINumber;
                        rootStat.Flag = stat.Flag;
-                        if (stat.LengthOverall_MTR.HasValue) rootStat.LengthOverall_MTR = Decimal.Round((decimal) (stat.LengthOverall_MTR.Value), 2);
-                        if (stat.Beam_MTR.HasValue) rootStat.Beam_MTR = Decimal.Round((decimal) (stat.Beam_MTR.Value), 2);
+                        if (stat.LengthOverall_MTR.HasValue) rootStat.LengthOverall_MTR = Decimal.Round((decimal)(stat.LengthOverall_MTR.Value), 2);
+                        if (stat.Beam_MTR.HasValue) rootStat.Beam_MTR = Decimal.Round((decimal)(stat.Beam_MTR.Value), 2);
                        if (stat.GrossTonnage.HasValue) rootStat.GrossTonnage = stat.GrossTonnage.Value;
                        rootStat.PortOfRegistry = stat.PortOfRegistry;
                        rootStat.ShipType = stat.ShipType;
-                        rootStat.InmarsatCallNumber = stat.InmarsatCallNumber;
+
+                        rootStat.InmarsatCallNumbers = stat.InmarsatCallNumber.Split('\n');
+                        for (int i = 0; i < rootStat.InmarsatCallNumbers.Length; i++)
+                            rootStat.InmarsatCallNumbers[i] = rootStat.InmarsatCallNumbers[i].Trim();

                        rootStat.TransportMode = RootSTATTransportMode.Item1; // default is maritime transport!
                        if (!stat.TransportMode.IsNullOrEmpty() && stat.TransportMode.Equals("8"))
@ -818,7 +821,7 @@ namespace bsmd.dbh
                                rootPre.TankerDetails.TankerHullConfiguration = (HullConfiguration)pre72h.TankerHullConfiguration.Value;
                            if (pre72h.ConditionCargoBallastTanks.HasValue)
                                rootPre.TankerDetails.ConditionCargoBallastTanks = (TankCondition)pre72h.ConditionCargoBallastTanks.Value;
-                            rootPre.TankerDetails.NatureOfCargo = pre72h.NatureOfCargo;
+                            rootPre.TankerDetails.TypeOfCargo = pre72h.NatureOfCargo;
                            rootPre.TankerDetails.VolumeOfCargo_TNESpecified = pre72h.VolumeOfCargo.HasValue;
                            if (pre72h.VolumeOfCargo.HasValue)
                                rootPre.TankerDetails.VolumeOfCargo_TNE = Decimal.Round((decimal)(pre72h.VolumeOfCargo.Value), 3);
@ -1645,7 +1648,7 @@ namespace bsmd.dbh

                _log.InfoFormat("Send Url: {0}", client.Url);

-                RootVersion rootVersion = RootVersion.Item40;
+                RootVersion rootVersion = RootVersion.Item50;

                string result = client.Root(
                    rootVersion,
--- a/References/DBHWebReference/NSWRequest.xsd
+++ b/References/DBHWebReference/NSWRequest.xsd
@ -12,7 +12,7 @@
          </xs:annotation>
          <xs:simpleType>
            <xs:restriction base="xs:string">
-              <xs:enumeration value="4.0" />
+              <xs:enumeration value="5.0" />
            </xs:restriction>
          </xs:simpleType>
        </xs:element>
@ -346,7 +346,7 @@
                  <xs:element name="ATAPortOfCall" type="NswDateTime">
                    <xs:annotation>
                      <xs:documentation>Actual Time of Arrival (ATA) at first port facility in port of call (YYYY-MM-DDThh:mm:ssTZD).
-The provided value must not be more than 15 minutes in the future, otherwise Violation 141 will occur.
+The provided value must not be more than 15 minutes in the future, otherwise Error 141 will occur.
 If ATA is notified before any voyage information was provided via NOA_NOD, Violation 861 will occur.</xs:documentation>
                    </xs:annotation>
                  </xs:element>
@ -367,7 +367,7 @@ If ATA is notified before any voyage information was provided via NOA_NOD, Viola
                  <xs:element name="ATDPortOfCall" type="NswDateTime">
                    <xs:annotation>
                      <xs:documentation>Actual Time of Departure (ATD) from last port facility in port of call (YYYY-MM-DDThh:mm:ssTZD).
-The provided value must not be more than 15 minutes in the future, otherwise Violation 141 will occur.
+The provided value must not be more than 15 minutes in the future, otherwise Error 141 will occur.
 If ATD is notified before any voyage information was provided via NOA_NOD, Violation 881 will occur.
 If ATD is notified before ATA was provided, Violation 882 will occur.</xs:documentation>
                    </xs:annotation>
@ -401,16 +401,13 @@ This attribute is only applicable for a port call (VISIT). If it is provided for
                        <xs:element minOccurs="0" name="KielCanalPassagePlannedIncoming" type="NswDateTime">
                          <xs:annotation>
                            <xs:documentation>Estimated Time of Arrival at Kiel-Canal Lock (ETA-NOK) - Date incoming journey to PortOfCall. Mandatory if KielCanalPassagePlanned=Y and KielCanalPassagePlannedOutgoing is empty.
-If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing is provided, Violation 706 occurs.
-
-</xs:documentation>
+If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing is provided, Violation 706 occurs.</xs:documentation>
                          </xs:annotation>
                        </xs:element>
                        <xs:element minOccurs="0" name="KielCanalPassagePlannedOutgoing" type="NswDateTime">
                          <xs:annotation>
                            <xs:documentation>Estimated Time of Arrival at Kiel-Canal Lock (ETA-NOK) - Date outgoing journey from PortOfCall. Mandatory if KielCanalPassagePlanned=Y and KielCanalPassagePlannedIncoming is empty.
-If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing is provided, Violation 706 occurs.
-</xs:documentation>
+If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing is provided, Violation 706 occurs.</xs:documentation>
                          </xs:annotation>
                        </xs:element>
                      </xs:sequence>
@ -433,7 +430,7 @@ If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing i
                      </xs:element>
                      <xs:element name="PortOfCallWhereCompleteSECNotified" type="UnLoCode">
                        <xs:annotation>
-                          <xs:documentation>PortofCall where the complete information was notified (requires the LOCODE of a german seaport, otherwise Violation 704 will occur)</xs:documentation>
+                          <xs:documentation>Port of call where the complete information was notified (requires the LOCODE of a german seaport, otherwise Violation 704 will occur)</xs:documentation>
                        </xs:annotation>
                      </xs:element>
                    </xs:sequence>
@ -521,17 +518,17 @@ If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing i
                          <xs:sequence>
                            <xs:element minOccurs="0" name="PortFacilityPortName" type="String99">
                              <xs:annotation>
-                                <xs:documentation>Port name. Either port name and country or the LOCODE must be given or Violation 703 will occur.</xs:documentation>
+                                <xs:documentation>Name of port where port facility is located.</xs:documentation>
                              </xs:annotation>
                            </xs:element>
                            <xs:element minOccurs="0" name="PortFacilityPortCountry" type="String99">
                              <xs:annotation>
-                                <xs:documentation>Country where port is located. Either port name and country or the LOCODE must be given or Violation 703 will occur.</xs:documentation>
+                                <xs:documentation>Country where port is located.</xs:documentation>
                              </xs:annotation>
                            </xs:element>
-                            <xs:element minOccurs="0" name="PortFacilityPortLoCode" type="UnLoCode">
+                            <xs:element name="PortFacilityPortLoCode" type="UnLoCode">
                              <xs:annotation>
-                                <xs:documentation>LoCode of port where port facility is located (UNECE LOCODE). Either port name and country or the LOCODE must be given or Violation 703 will occur.</xs:documentation>
+                                <xs:documentation>LoCode of port where port facility is located (UNECE LOCODE).</xs:documentation>
                              </xs:annotation>
                            </xs:element>
                            <xs:element name="PortFacilityDateOfArrival" type="xs:date">
@ -554,9 +551,14 @@ If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing i
                                <xs:documentation>Any security matters to report</xs:documentation>
                              </xs:annotation>
                            </xs:element>
+                            <xs:element minOccurs="0" name="PortFacilityGISISCodeLoCode" type="UnLoCode">
+                              <xs:annotation>
+                                <xs:documentation>LoCode the port facility's code is connected to. Must be specified if the LoCode differs from the value in PortFacilityPortLoCode.</xs:documentation>
+                              </xs:annotation>
+                            </xs:element>
                            <xs:element name="PortFacilityGISISCode" type="Numeric4">
                              <xs:annotation>
-                                <xs:documentation>Port facility's code in the IMO GISIS maritime security database (ISPS)</xs:documentation>
+                                <xs:documentation>Port facility's code in the IMO GISIS maritime security database (ISPS). Use "0000" if not available.</xs:documentation>
                              </xs:annotation>
                            </xs:element>
                          </xs:sequence>
@ -564,7 +566,7 @@ If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing i
                      </xs:element>
                      <xs:element minOccurs="0" maxOccurs="unbounded" name="ShipToShipActivities">
                        <xs:annotation>
-                          <xs:documentation>List of ship-to-ship acitivities</xs:documentation>
+                          <xs:documentation>List of ship-to-ship activities</xs:documentation>
                        </xs:annotation>
                        <xs:complexType>
                          <xs:sequence>
@ -616,12 +618,34 @@ If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing i
                            <xs:element name="ShipToShipActivityType">
                              <xs:annotation>
                                <xs:documentation>Ship-to-ship-activity, coded.
-Use one of the codes specifying the purpose of the conveyance call declared  in UN/EDIFACT DataElement 8025 (http://www.unece.org/trade/untdid/d01a/tred/tred8025.htm).</xs:documentation>
+Use one of the codes specifying the purpose of the conveyance call declared  in UN/EDIFACT DataElement 8025, D16A (http://www.unece.org/trade/untdid/d16a/tred/tred8025.htm).</xs:documentation>
                              </xs:annotation>
                              <xs:simpleType>
                                <xs:restriction base="xs:int">
-                                  <xs:minInclusive value="1" />
-                                  <xs:maxInclusive value="23" />
+                                  <xs:enumeration value="1" />
+                                  <xs:enumeration value="2" />
+                                  <xs:enumeration value="3" />
+                                  <xs:enumeration value="4" />
+                                  <xs:enumeration value="5" />
+                                  <xs:enumeration value="6" />
+                                  <xs:enumeration value="7" />
+                                  <xs:enumeration value="8" />
+                                  <xs:enumeration value="9" />
+                                  <xs:enumeration value="10" />
+                                  <xs:enumeration value="11" />
+                                  <xs:enumeration value="12" />
+                                  <xs:enumeration value="13" />
+                                  <xs:enumeration value="14" />
+                                  <xs:enumeration value="15" />
+                                  <xs:enumeration value="16" />
+                                  <xs:enumeration value="17" />
+                                  <xs:enumeration value="18" />
+                                  <xs:enumeration value="19" />
+                                  <xs:enumeration value="20" />
+                                  <xs:enumeration value="21" />
+                                  <xs:enumeration value="22" />
+                                  <xs:enumeration value="23" />
+                                  <xs:enumeration value="98" />
                                </xs:restriction>
                              </xs:simpleType>
                            </xs:element>
@ -929,10 +953,19 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
                      <xs:documentation>Port of registry (UNECE LOCODE)</xs:documentation>
                    </xs:annotation>
                  </xs:element>
-                  <xs:element minOccurs="0" name="InmarsatCallNumber" type="String99">
+                  <xs:element minOccurs="0" name="InmarsatCallNumbers">
                    <xs:annotation>
-                      <xs:documentation>Inmarsat call number</xs:documentation>
+                      <xs:documentation>Inmarsat call numbers</xs:documentation>
                    </xs:annotation>
+                    <xs:complexType>
+                      <xs:sequence>
+                        <xs:element minOccurs="1" maxOccurs="5" name="InmarsatCallNumber" type="InmarsatNumber">
+                          <xs:annotation>
+                            <xs:documentation>Inmarsat call number (single entry)</xs:documentation>
+                          </xs:annotation>
+                        </xs:element>
+                      </xs:sequence>
+                    </xs:complexType>
                  </xs:element>
                  <xs:element name="TransportMode">
                    <xs:annotation>
@ -1223,7 +1256,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
                            <xs:documentation>Condition of cargo and ballast tanks (full, empty, inerted)</xs:documentation>
                          </xs:annotation>
                        </xs:element>
-                        <xs:element minOccurs="0" name="NatureOfCargo" type="String99">
+                        <xs:element minOccurs="0" name="TypeOfCargo" type="String99">
                          <xs:annotation>
                            <xs:documentation>Nature of cargo</xs:documentation>
                          </xs:annotation>
@ -1282,7 +1315,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
                      </xs:element>
                      <xs:element name="PortOfCallWhereCompleteMDHNotified">
                        <xs:annotation>
-                          <xs:documentation>PortofCall where the complete information was notified (requires the LOCODE of a german seaport, otherwise Violation 768 will occur).</xs:documentation>
+                          <xs:documentation>Port of call where the complete information was notified (requires the LOCODE of a german seaport, otherwise Error 161 will occur).</xs:documentation>
                        </xs:annotation>
                        <xs:simpleType>
                          <xs:restriction base="UnLoCode">
@ -1544,8 +1577,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
                                <xs:sequence>
                                  <xs:element name="WasteCode">
                                    <xs:annotation>
-                                      <xs:documentation>Waste code according to Waste Type Codes list. Results in Violation 784 if an invalid waste code is provided.
-</xs:documentation>
+                                      <xs:documentation>Waste code according to Waste Type Codes list. Results in Violation 784 if an invalid waste code is provided.</xs:documentation>
                                    </xs:annotation>
                                    <xs:simpleType>
                                      <xs:restriction base="xs:int">
@ -2292,7 +2324,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element minOccurs="0" name="PackingGroup" type="PackingGroupType">
        <xs:annotation>
-          <xs:documentation>Packing group (none, I, II, or III). Throws Violation 806 if no material is found fitting to the provided combination of UN number and Packing group.</xs:documentation>
+          <xs:documentation>Packing group (I, II, or III). If no packing group is available, omit field. Throws Violation 806 if no material is found fitting to the provided combination of UN number and Packing group. </xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="ProperShippingName" type="String500">
@ -2433,12 +2465,12 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element minOccurs="0" name="NetQuantity_KGM" type="DecimalZeroPositive3">
        <xs:annotation>
-          <xs:documentation>Net quantity in kilos (KGM). One of NetQuantity_KGM, GrossQuantity_KGM, or Volume_MTQ has to be filled out. Otherwise Violation 802 will be returned.</xs:documentation>
+          <xs:documentation>Net mass in kilos (KGM). One of NetQuantity_KGM, GrossQuantity_KGM, or Volume_MTQ has to be filled out. Otherwise Violation 802 will be returned.</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element minOccurs="0" name="GrossQuantity_KGM" type="DecimalZeroPositive3">
        <xs:annotation>
-          <xs:documentation>Gross quantity in kilos (KGM). One of NetQuantity_KGM, GrossQuantity_KGM, or Volume_MTQ has to be filled out. Otherwise Violation 802 will be returned.</xs:documentation>
+          <xs:documentation>Gross mass in kilos (KGM). One of NetQuantity_KGM, GrossQuantity_KGM, or Volume_MTQ has to be filled out. Otherwise Violation 802 will be returned.</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element minOccurs="0" name="Volume_MTQ" type="DecimalZeroPositive3">
@ -2521,7 +2553,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element minOccurs="0" name="Hazards" type="HazardType">
        <xs:annotation>
-          <xs:documentation>Hazards (column "d" of the IBC code (P, S, or S/P)</xs:documentation>
+          <xs:documentation>Hazards (column "d" of the IBC code (P, S, or S/P). Violation 810 will occur if hazard class must be provided for this particular IBC position.</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="FlashpointInformation" type="FlashpointInfoType">
@ -2536,7 +2568,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element name="Quantity_KGM" type="DecimalPositive3">
        <xs:annotation>
-          <xs:documentation>Quantity in kilos (KGM)</xs:documentation>
+          <xs:documentation>Mass in kilos (KGM)</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="StowagePosition" type="String24">
@ -2590,7 +2622,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element name="Quantity_KGM" type="DecimalPositive3">
        <xs:annotation>
-          <xs:documentation>Quantity in kilos (KGM)</xs:documentation>
+          <xs:documentation>Mass in kilos (KGM)</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="StowagePosition" type="String24">
@ -2644,7 +2676,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element name="Quantity_KGM" type="DecimalPositive3">
        <xs:annotation>
-          <xs:documentation>Quantity  in kilos (KGM)</xs:documentation>
+          <xs:documentation>Mass in kilos (KGM)</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="StowagePosition" type="String24">
@ -2693,7 +2725,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element name="Quantity_KGM" type="DecimalPositive3">
        <xs:annotation>
-          <xs:documentation>Quantity  in kilos (KGM)</xs:documentation>
+          <xs:documentation>Mass in kilos (KGM)</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="StowagePosition" type="String24">
@ -2727,7 +2759,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
    <xs:restriction base="xs:string">
      <xs:minLength value="4" />
      <xs:maxLength value="7" />
-      <xs:pattern value="[A-Z,a-z,0-9]{4,7}" />
+      <xs:pattern value="[A-Za-z0-9]{4,7}" />
    </xs:restriction>
  </xs:simpleType>
  <xs:simpleType name="CargoDescription">
@ -2877,6 +2909,13 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      <xs:enumeration value="INF3" />
    </xs:restriction>
  </xs:simpleType>
+  <xs:simpleType name="InmarsatNumber">
+    <xs:restriction base="xs:string">
+      <xs:minLength value="1" />
+      <xs:maxLength value="50" />
+      <xs:pattern value="[^,_&amp;]*" />
+    </xs:restriction>
+  </xs:simpleType>
  <xs:simpleType name="ISSCIssuerType">
    <xs:restriction base="xs:string">
      <xs:enumeration value="ADMINISTRATION" />
@ -2921,7 +2960,6 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
  </xs:simpleType>
  <xs:simpleType name="PackingGroupType">
    <xs:restriction base="xs:string">
-      <xs:enumeration value="NONE" />
      <xs:enumeration value="I" />
      <xs:enumeration value="II" />
      <xs:enumeration value="III" />
@ -3040,19 +3078,6 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      <xs:length value="17" />
    </xs:restriction>
  </xs:simpleType>
-  <xs:simpleType name="WasteType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="1_WASTE_OILS-SLUDGE" />
-      <xs:enumeration value="2_WASTE_OILS-BILGE_WATER" />
-      <xs:enumeration value="3_WASTE_OILS-OTHERS" />
-      <xs:enumeration value="4_GARBAGE-FOOD_WASTE" />
-      <xs:enumeration value="5_GARBAGE-PLASTIC" />
-      <xs:enumeration value="6_GARBAGE-OTHER" />
-      <xs:enumeration value="7_SEWAGE" />
-      <xs:enumeration value="8_CARGO-ASSOCIATED_WASTE" />
-      <xs:enumeration value="9_CARGO-RESIDUES" />
-    </xs:restriction>
-  </xs:simpleType>
  <xs:simpleType name="YesOrNo">
    <xs:restriction base="xs:string">
      <xs:enumeration value="Y" />
--- a/References/DBHWebReference/Reference.cs
+++ b/References/DBHWebReference/Reference.cs
@ -23,7 +23,7 @@ namespace bsmd.dbh.DBHWebReference {
    
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    [System.Web.Services.WebServiceBindingAttribute(Name="Dbh_Osis_Answ_Ws", Namespace="http://www.openuri.org/")]
@ -144,18 +144,18 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.openuri.org/")]
    public enum RootVersion {
        
        /// <remarks/>
-        [System.Xml.Serialization.XmlEnumAttribute("4.0")]
-        Item40,
+        [System.Xml.Serialization.XmlEnumAttribute("5.0")]
+        Item50,
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.openuri.org/")]
    public enum RootType {
@ -177,7 +177,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -226,7 +226,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
    public enum ItemChoiceType1 {
@ -239,7 +239,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -356,7 +356,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum FlashpointInfoType {
@ -372,7 +372,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -501,7 +501,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum RootSECValidISSCOnBoard {
@ -514,7 +514,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -631,7 +631,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -810,7 +810,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum PollutionCategoryType {
@ -829,7 +829,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum HazardType {
@ -846,7 +846,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1403,14 +1403,11 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum PackingGroupType {
        
-        /// <remarks/>
-        NONE,
-        
        /// <remarks/>
        I,
        
@ -1422,7 +1419,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
    public enum ItemsChoiceType4 {
@ -1441,7 +1438,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1595,7 +1592,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.openuri.org/")]
    public enum ReportingPartyRPType {
@ -1623,7 +1620,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1684,7 +1681,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
    public enum ItemChoiceType {
@ -1697,7 +1694,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
    public enum ItemChoiceType2 {
@ -1716,7 +1713,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1857,7 +1854,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1890,7 +1887,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1923,7 +1920,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1957,7 +1954,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1990,7 +1987,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2024,7 +2021,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2057,7 +2054,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2103,7 +2100,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2136,7 +2133,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2170,7 +2167,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2313,7 +2310,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum Gender {
@ -2329,7 +2326,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum IdDocType {
@ -2354,7 +2351,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2407,7 +2404,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2481,7 +2478,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum INFClassType {
@ -2497,7 +2494,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
    public enum ItemsChoiceType5 {
@ -2519,7 +2516,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2572,7 +2569,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2646,7 +2643,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
    public enum ItemsChoiceType6 {
@ -2668,7 +2665,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2810,7 +2807,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum ShippingArea {
@ -2826,7 +2823,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.openuri.org/")]
    public enum RootINFOFumigatedBulkCargo {
@ -2839,7 +2836,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -2873,7 +2870,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3004,7 +3001,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum HandlingType {
@ -3017,7 +3014,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3086,7 +3083,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3120,7 +3117,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3142,7 +3139,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3200,7 +3197,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3222,7 +3219,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3268,7 +3265,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3302,7 +3299,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
    public enum ItemsChoiceType2 {
@ -3372,7 +3369,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3405,7 +3402,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3506,7 +3503,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3539,7 +3536,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
    public enum ItemsChoiceType {
@ -3561,7 +3558,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3595,7 +3592,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3762,7 +3759,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3831,7 +3828,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -3900,7 +3897,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4007,7 +4004,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4018,7 +4015,7 @@ namespace bsmd.dbh.DBHWebReference {
        
        private TankCondition conditionCargoBallastTanksField;
        
-        private string natureOfCargoField;
+        private string typeOfCargoField;
        
        private decimal volumeOfCargo_TNEField;
        
@ -4045,12 +4042,12 @@ namespace bsmd.dbh.DBHWebReference {
        }
        
        /// <remarks/>
-        public string NatureOfCargo {
+        public string TypeOfCargo {
            get {
-                return this.natureOfCargoField;
+                return this.typeOfCargoField;
            }
            set {
-                this.natureOfCargoField = value;
+                this.typeOfCargoField = value;
            }
        }
        
@ -4077,7 +4074,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum HullConfiguration {
@ -4093,7 +4090,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum TankCondition {
@ -4109,7 +4106,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4131,7 +4128,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4221,7 +4218,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4266,7 +4263,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum CargoDescription {
@ -4291,7 +4288,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum ISSCIssuerType {
@ -4304,7 +4301,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum ISSCType {
@ -4317,7 +4314,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4338,6 +4335,8 @@ namespace bsmd.dbh.DBHWebReference {
        
        private string portFacilitySecurityMattersToReportField;
        
+        private string portFacilityGISISCodeLoCodeField;
+        
        private string portFacilityGISISCodeField;
        
        /// <remarks/>
@ -4412,6 +4411,16 @@ namespace bsmd.dbh.DBHWebReference {
            }
        }
        
+        /// <remarks/>
+        public string PortFacilityGISISCodeLoCode {
+            get {
+                return this.portFacilityGISISCodeLoCodeField;
+            }
+            set {
+                this.portFacilityGISISCodeLoCodeField = value;
+            }
+        }
+        
        /// <remarks/>
        public string PortFacilityGISISCode {
            get {
@ -4424,7 +4433,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4495,7 +4504,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4540,7 +4549,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4573,7 +4582,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
    public enum ItemsChoiceType1 {
@ -4634,7 +4643,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4668,7 +4677,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4713,7 +4722,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4738,7 +4747,7 @@ namespace bsmd.dbh.DBHWebReference {
        
        private string portOfRegistryField;
        
-        private string inmarsatCallNumberField;
+        private string[] inmarsatCallNumbersField;
        
        private RootSTATTransportMode transportModeField;
        
@ -4837,12 +4846,13 @@ namespace bsmd.dbh.DBHWebReference {
        }
        
        /// <remarks/>
-        public string InmarsatCallNumber {
+        [System.Xml.Serialization.XmlArrayItemAttribute("InmarsatCallNumber", IsNullable=false)]
+        public string[] InmarsatCallNumbers {
            get {
-                return this.inmarsatCallNumberField;
+                return this.inmarsatCallNumbersField;
            }
            set {
-                this.inmarsatCallNumberField = value;
+                this.inmarsatCallNumbersField = value;
            }
        }
        
@ -4878,7 +4888,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.openuri.org/")]
    public enum RootSTATTransportMode {
@ -4893,7 +4903,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -4974,7 +4984,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5007,7 +5017,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5040,7 +5050,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5074,7 +5084,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5191,7 +5201,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5296,7 +5306,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5330,7 +5340,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5449,7 +5459,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5554,7 +5564,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5609,7 +5619,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5666,7 +5676,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5699,7 +5709,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5756,7 +5766,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/")]
    public enum DisposalType {
@ -5772,7 +5782,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.openuri.org/", IncludeInSchema=false)]
    public enum ItemsChoiceType3 {
@ -5800,7 +5810,7 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@ -5833,11 +5843,11 @@ namespace bsmd.dbh.DBHWebReference {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")]
    public delegate void RootCompletedEventHandler(object sender, RootCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1586.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class RootCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
--- a/nsw/dbh/NSWRequest.xsd
+++ b/nsw/dbh/NSWRequest.xsd
@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!--Created with Liquid XML Studio - FREE Community Edition 7.0.3.780 (http://www.liquid-technologies.com)-->
 <xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <xs:element name="Root">
    <xs:annotation>
@ -13,7 +12,7 @@
          </xs:annotation>
          <xs:simpleType>
            <xs:restriction base="xs:string">
-              <xs:enumeration value="4.0" />
+              <xs:enumeration value="5.0" />
            </xs:restriction>
          </xs:simpleType>
        </xs:element>
@ -347,7 +346,7 @@
                  <xs:element name="ATAPortOfCall" type="NswDateTime">
                    <xs:annotation>
                      <xs:documentation>Actual Time of Arrival (ATA) at first port facility in port of call (YYYY-MM-DDThh:mm:ssTZD).
-The provided value must not be more than 15 minutes in the future, otherwise Violation 141 will occur.
+The provided value must not be more than 15 minutes in the future, otherwise Error 141 will occur.
 If ATA is notified before any voyage information was provided via NOA_NOD, Violation 861 will occur.</xs:documentation>
                    </xs:annotation>
                  </xs:element>
@ -368,7 +367,7 @@ If ATA is notified before any voyage information was provided via NOA_NOD, Viola
                  <xs:element name="ATDPortOfCall" type="NswDateTime">
                    <xs:annotation>
                      <xs:documentation>Actual Time of Departure (ATD) from last port facility in port of call (YYYY-MM-DDThh:mm:ssTZD).
-The provided value must not be more than 15 minutes in the future, otherwise Violation 141 will occur.
+The provided value must not be more than 15 minutes in the future, otherwise Error 141 will occur.
 If ATD is notified before any voyage information was provided via NOA_NOD, Violation 881 will occur.
 If ATD is notified before ATA was provided, Violation 882 will occur.</xs:documentation>
                    </xs:annotation>
@ -402,16 +401,13 @@ This attribute is only applicable for a port call (VISIT). If it is provided for
                        <xs:element minOccurs="0" name="KielCanalPassagePlannedIncoming" type="NswDateTime">
                          <xs:annotation>
                            <xs:documentation>Estimated Time of Arrival at Kiel-Canal Lock (ETA-NOK) - Date incoming journey to PortOfCall. Mandatory if KielCanalPassagePlanned=Y and KielCanalPassagePlannedOutgoing is empty.
-If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing is provided, Violation 706 occurs.
-
-</xs:documentation>
+If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing is provided, Violation 706 occurs.</xs:documentation>
                          </xs:annotation>
                        </xs:element>
                        <xs:element minOccurs="0" name="KielCanalPassagePlannedOutgoing" type="NswDateTime">
                          <xs:annotation>
                            <xs:documentation>Estimated Time of Arrival at Kiel-Canal Lock (ETA-NOK) - Date outgoing journey from PortOfCall. Mandatory if KielCanalPassagePlanned=Y and KielCanalPassagePlannedIncoming is empty.
-If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing is provided, Violation 706 occurs.
-</xs:documentation>
+If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing is provided, Violation 706 occurs.</xs:documentation>
                          </xs:annotation>
                        </xs:element>
                      </xs:sequence>
@ -434,7 +430,7 @@ If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing i
                      </xs:element>
                      <xs:element name="PortOfCallWhereCompleteSECNotified" type="UnLoCode">
                        <xs:annotation>
-                          <xs:documentation>PortofCall where the complete information was notified (requires the LOCODE of a german seaport, otherwise Violation 704 will occur)</xs:documentation>
+                          <xs:documentation>Port of call where the complete information was notified (requires the LOCODE of a german seaport, otherwise Violation 704 will occur)</xs:documentation>
                        </xs:annotation>
                      </xs:element>
                    </xs:sequence>
@ -522,17 +518,17 @@ If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing i
                          <xs:sequence>
                            <xs:element minOccurs="0" name="PortFacilityPortName" type="String99">
                              <xs:annotation>
-                                <xs:documentation>Port name. Either port name and country or the LOCODE must be given or Violation 703 will occur.</xs:documentation>
+                                <xs:documentation>Name of port where port facility is located.</xs:documentation>
                              </xs:annotation>
                            </xs:element>
                            <xs:element minOccurs="0" name="PortFacilityPortCountry" type="String99">
                              <xs:annotation>
-                                <xs:documentation>Country where port is located. Either port name and country or the LOCODE must be given or Violation 703 will occur.</xs:documentation>
+                                <xs:documentation>Country where port is located.</xs:documentation>
                              </xs:annotation>
                            </xs:element>
-                            <xs:element minOccurs="0" name="PortFacilityPortLoCode" type="UnLoCode">
+                            <xs:element name="PortFacilityPortLoCode" type="UnLoCode">
                              <xs:annotation>
-                                <xs:documentation>LoCode of port where port facility is located (UNECE LOCODE). Either port name and country or the LOCODE must be given or Violation 703 will occur.</xs:documentation>
+                                <xs:documentation>LoCode of port where port facility is located (UNECE LOCODE).</xs:documentation>
                              </xs:annotation>
                            </xs:element>
                            <xs:element name="PortFacilityDateOfArrival" type="xs:date">
@ -555,9 +551,14 @@ If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing i
                                <xs:documentation>Any security matters to report</xs:documentation>
                              </xs:annotation>
                            </xs:element>
+                            <xs:element minOccurs="0" name="PortFacilityGISISCodeLoCode" type="UnLoCode">
+                              <xs:annotation>
+                                <xs:documentation>LoCode the port facility's code is connected to. Must be specified if the LoCode differs from the value in PortFacilityPortLoCode.</xs:documentation>
+                              </xs:annotation>
+                            </xs:element>
                            <xs:element name="PortFacilityGISISCode" type="Numeric4">
                              <xs:annotation>
-                                <xs:documentation>Port facility's code in the IMO GISIS maritime security database (ISPS)</xs:documentation>
+                                <xs:documentation>Port facility's code in the IMO GISIS maritime security database (ISPS). Use "0000" if not available.</xs:documentation>
                              </xs:annotation>
                            </xs:element>
                          </xs:sequence>
@ -565,7 +566,7 @@ If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing i
                      </xs:element>
                      <xs:element minOccurs="0" maxOccurs="unbounded" name="ShipToShipActivities">
                        <xs:annotation>
-                          <xs:documentation>List of ship-to-ship acitivities</xs:documentation>
+                          <xs:documentation>List of ship-to-ship activities</xs:documentation>
                        </xs:annotation>
                        <xs:complexType>
                          <xs:sequence>
@ -617,12 +618,34 @@ If neither KielCanalPassagePlannedIncoming nor KielCanalPassagePlannedOutgoing i
                            <xs:element name="ShipToShipActivityType">
                              <xs:annotation>
                                <xs:documentation>Ship-to-ship-activity, coded.
-Use one of the codes specifying the purpose of the conveyance call declared  in UN/EDIFACT DataElement 8025 (http://www.unece.org/trade/untdid/d01a/tred/tred8025.htm).</xs:documentation>
+Use one of the codes specifying the purpose of the conveyance call declared  in UN/EDIFACT DataElement 8025, D16A (http://www.unece.org/trade/untdid/d16a/tred/tred8025.htm).</xs:documentation>
                              </xs:annotation>
                              <xs:simpleType>
                                <xs:restriction base="xs:int">
-                                  <xs:minInclusive value="1" />
-                                  <xs:maxInclusive value="23" />
+                                  <xs:enumeration value="1" />
+                                  <xs:enumeration value="2" />
+                                  <xs:enumeration value="3" />
+                                  <xs:enumeration value="4" />
+                                  <xs:enumeration value="5" />
+                                  <xs:enumeration value="6" />
+                                  <xs:enumeration value="7" />
+                                  <xs:enumeration value="8" />
+                                  <xs:enumeration value="9" />
+                                  <xs:enumeration value="10" />
+                                  <xs:enumeration value="11" />
+                                  <xs:enumeration value="12" />
+                                  <xs:enumeration value="13" />
+                                  <xs:enumeration value="14" />
+                                  <xs:enumeration value="15" />
+                                  <xs:enumeration value="16" />
+                                  <xs:enumeration value="17" />
+                                  <xs:enumeration value="18" />
+                                  <xs:enumeration value="19" />
+                                  <xs:enumeration value="20" />
+                                  <xs:enumeration value="21" />
+                                  <xs:enumeration value="22" />
+                                  <xs:enumeration value="23" />
+                                  <xs:enumeration value="98" />
                                </xs:restriction>
                              </xs:simpleType>
                            </xs:element>
@ -930,10 +953,19 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
                      <xs:documentation>Port of registry (UNECE LOCODE)</xs:documentation>
                    </xs:annotation>
                  </xs:element>
-                  <xs:element minOccurs="0" name="InmarsatCallNumber" type="String99">
+                  <xs:element minOccurs="0" name="InmarsatCallNumbers">
                    <xs:annotation>
-                      <xs:documentation>Inmarsat call number</xs:documentation>
+                      <xs:documentation>Inmarsat call numbers</xs:documentation>
                    </xs:annotation>
+                    <xs:complexType>
+                      <xs:sequence>
+                        <xs:element minOccurs="1" maxOccurs="5" name="InmarsatCallNumber" type="InmarsatNumber">
+                          <xs:annotation>
+                            <xs:documentation>Inmarsat call number (single entry)</xs:documentation>
+                          </xs:annotation>
+                        </xs:element>
+                      </xs:sequence>
+                    </xs:complexType>
                  </xs:element>
                  <xs:element name="TransportMode">
                    <xs:annotation>
@ -1224,7 +1256,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
                            <xs:documentation>Condition of cargo and ballast tanks (full, empty, inerted)</xs:documentation>
                          </xs:annotation>
                        </xs:element>
-                        <xs:element minOccurs="0" name="NatureOfCargo" type="String99">
+                        <xs:element minOccurs="0" name="TypeOfCargo" type="String99">
                          <xs:annotation>
                            <xs:documentation>Nature of cargo</xs:documentation>
                          </xs:annotation>
@ -1283,7 +1315,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
                      </xs:element>
                      <xs:element name="PortOfCallWhereCompleteMDHNotified">
                        <xs:annotation>
-                          <xs:documentation>PortofCall where the complete information was notified (requires the LOCODE of a german seaport, otherwise Violation 768 will occur).</xs:documentation>
+                          <xs:documentation>Port of call where the complete information was notified (requires the LOCODE of a german seaport, otherwise Error 161 will occur).</xs:documentation>
                        </xs:annotation>
                        <xs:simpleType>
                          <xs:restriction base="UnLoCode">
@ -1545,8 +1577,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
                                <xs:sequence>
                                  <xs:element name="WasteCode">
                                    <xs:annotation>
-                                      <xs:documentation>Waste code according to Waste Type Codes list. Results in Violation 784 if an invalid waste code is provided.
-</xs:documentation>
+                                      <xs:documentation>Waste code according to Waste Type Codes list. Results in Violation 784 if an invalid waste code is provided.</xs:documentation>
                                    </xs:annotation>
                                    <xs:simpleType>
                                      <xs:restriction base="xs:int">
@ -2293,7 +2324,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element minOccurs="0" name="PackingGroup" type="PackingGroupType">
        <xs:annotation>
-          <xs:documentation>Packing group (none, I, II, or III). Throws Violation 806 if no material is found fitting to the provided combination of UN number and Packing group.</xs:documentation>
+          <xs:documentation>Packing group (I, II, or III). If no packing group is available, omit field. Throws Violation 806 if no material is found fitting to the provided combination of UN number and Packing group. </xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="ProperShippingName" type="String500">
@ -2434,12 +2465,12 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element minOccurs="0" name="NetQuantity_KGM" type="DecimalZeroPositive3">
        <xs:annotation>
-          <xs:documentation>Net quantity in kilos (KGM). One of NetQuantity_KGM, GrossQuantity_KGM, or Volume_MTQ has to be filled out. Otherwise Violation 802 will be returned.</xs:documentation>
+          <xs:documentation>Net mass in kilos (KGM). One of NetQuantity_KGM, GrossQuantity_KGM, or Volume_MTQ has to be filled out. Otherwise Violation 802 will be returned.</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element minOccurs="0" name="GrossQuantity_KGM" type="DecimalZeroPositive3">
        <xs:annotation>
-          <xs:documentation>Gross quantity in kilos (KGM). One of NetQuantity_KGM, GrossQuantity_KGM, or Volume_MTQ has to be filled out. Otherwise Violation 802 will be returned.</xs:documentation>
+          <xs:documentation>Gross mass in kilos (KGM). One of NetQuantity_KGM, GrossQuantity_KGM, or Volume_MTQ has to be filled out. Otherwise Violation 802 will be returned.</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element minOccurs="0" name="Volume_MTQ" type="DecimalZeroPositive3">
@ -2522,7 +2553,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element minOccurs="0" name="Hazards" type="HazardType">
        <xs:annotation>
-          <xs:documentation>Hazards (column "d" of the IBC code (P, S, or S/P)</xs:documentation>
+          <xs:documentation>Hazards (column "d" of the IBC code (P, S, or S/P). Violation 810 will occur if hazard class must be provided for this particular IBC position.</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="FlashpointInformation" type="FlashpointInfoType">
@ -2537,7 +2568,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element name="Quantity_KGM" type="DecimalPositive3">
        <xs:annotation>
-          <xs:documentation>Quantity in kilos (KGM)</xs:documentation>
+          <xs:documentation>Mass in kilos (KGM)</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="StowagePosition" type="String24">
@ -2591,7 +2622,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element name="Quantity_KGM" type="DecimalPositive3">
        <xs:annotation>
-          <xs:documentation>Quantity in kilos (KGM)</xs:documentation>
+          <xs:documentation>Mass in kilos (KGM)</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="StowagePosition" type="String24">
@ -2645,7 +2676,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element name="Quantity_KGM" type="DecimalPositive3">
        <xs:annotation>
-          <xs:documentation>Quantity  in kilos (KGM)</xs:documentation>
+          <xs:documentation>Mass in kilos (KGM)</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="StowagePosition" type="String24">
@ -2694,7 +2725,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      </xs:element>
      <xs:element name="Quantity_KGM" type="DecimalPositive3">
        <xs:annotation>
-          <xs:documentation>Quantity  in kilos (KGM)</xs:documentation>
+          <xs:documentation>Mass in kilos (KGM)</xs:documentation>
        </xs:annotation>
      </xs:element>
      <xs:element name="StowagePosition" type="String24">
@ -2728,7 +2759,7 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
    <xs:restriction base="xs:string">
      <xs:minLength value="4" />
      <xs:maxLength value="7" />
-      <xs:pattern value="[A-Z,a-z,0-9]{4,7}" />
+      <xs:pattern value="[A-Za-z0-9]{4,7}" />
    </xs:restriction>
  </xs:simpleType>
  <xs:simpleType name="CargoDescription">
@ -2878,6 +2909,13 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      <xs:enumeration value="INF3" />
    </xs:restriction>
  </xs:simpleType>
+  <xs:simpleType name="InmarsatNumber">
+    <xs:restriction base="xs:string">
+      <xs:minLength value="1" />
+      <xs:maxLength value="50" />
+      <xs:pattern value="[^,_&amp;]*" />
+    </xs:restriction>
+  </xs:simpleType>
  <xs:simpleType name="ISSCIssuerType">
    <xs:restriction base="xs:string">
      <xs:enumeration value="ADMINISTRATION" />
@ -2922,7 +2960,6 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
  </xs:simpleType>
  <xs:simpleType name="PackingGroupType">
    <xs:restriction base="xs:string">
-      <xs:enumeration value="NONE" />
      <xs:enumeration value="I" />
      <xs:enumeration value="II" />
      <xs:enumeration value="III" />
@ -3041,19 +3078,6 @@ Use one of the codes specifying the purpose of the conveyance call declared  in
      <xs:length value="17" />
    </xs:restriction>
  </xs:simpleType>
-  <xs:simpleType name="WasteType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="1_WASTE_OILS-SLUDGE" />
-      <xs:enumeration value="2_WASTE_OILS-BILGE_WATER" />
-      <xs:enumeration value="3_WASTE_OILS-OTHERS" />
-      <xs:enumeration value="4_GARBAGE-FOOD_WASTE" />
-      <xs:enumeration value="5_GARBAGE-PLASTIC" />
-      <xs:enumeration value="6_GARBAGE-OTHER" />
-      <xs:enumeration value="7_SEWAGE" />
-      <xs:enumeration value="8_CARGO-ASSOCIATED_WASTE" />
-      <xs:enumeration value="9_CARGO-RESIDUES" />
-    </xs:restriction>
-  </xs:simpleType>
  <xs:simpleType name="YesOrNo">
    <xs:restriction base="xs:string">
      <xs:enumeration value="Y" />
--- a/nsw/dbh/NSWRequest_V5.0_2017-01-12.xsd
+++ b/nsw/dbh/NSWRequest_V5.0_2017-01-12.xsd
--- a/nsw/dbh/NSWResponse_V5.0_2017-01-12.xsd
+++ b/nsw/dbh/NSWResponse_V5.0_2017-01-12.xsd
@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="Root">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="Version">
+          <xs:annotation>
+            <xs:documentation>Version number of schema</xs:documentation>
+          </xs:annotation>
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:minLength value="1" />
+              <xs:maxLength value="5" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="MessageId" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Unique message identifier.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element minOccurs="0" name="VisitId">
+          <xs:annotation>
+            <xs:documentation>Required when TransitId is missing and field "Type" is not "VISIT or "TRANSIT"</xs:documentation>
+          </xs:annotation>
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:pattern value="(DE)([A-Z]{3})-([0-9]{4})-([A-Z]{6})" />
+              <xs:length value="17" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element minOccurs="0" name="TransitId">
+          <xs:annotation>
+            <xs:documentation>Required when VisitId is missing and field "Type" is not "VISIT or "TRANSIT"</xs:documentation>
+          </xs:annotation>
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:pattern value="(ZZNOK)-([0-9]{4})-([A-Z]{6})" />
+              <xs:length value="17" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element minOccurs="0" name="SisNumbers">
+          <xs:annotation>
+            <xs:documentation>A list of SIS numbers. An empty list means that all sent numbers will be deleted. Sending a new list overwrites existing ones completely.</xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element minOccurs="0" maxOccurs="unbounded" name="SisNumber">
+                <xs:annotation>
+                  <xs:documentation>One SIS number</xs:documentation>
+                </xs:annotation>
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:pattern value="[A-Z0-9]{4}" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Timestamp" type="xs:dateTime">
+          <xs:annotation>
+            <xs:documentation>Timestamp, when the message is sent</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element minOccurs="0" name="SenderReference">
+          <xs:annotation>
+            <xs:documentation>A customer reference that can be freely filled and will be send back in the following response. No checks are made on this field. When a new Visit- or TransitId is obtained, it should be used as a reference to match the response to its corresponding request.</xs:documentation>
+          </xs:annotation>
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:maxLength value="35" />
+              <xs:minLength value="0" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="Type">
+          <xs:annotation>
+            <xs:documentation>The message type (should be the same as in the request message):
+- VISIT: Creates a new declaration with the application for a VisitId. It's allowed to send further data in one or more reporting classes
+- TRANSIT: same with TransitId
+- DATA: Only data for one or more reporting classes are included
+- RESET: The data of one or more reporting classes are deleted
+- CANCEL: The whole declaration is cancelled</xs:documentation>
+          </xs:annotation>
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:enumeration value="VISIT" />
+              <xs:enumeration value="TRANSIT" />
+              <xs:enumeration value="DATA" />
+              <xs:enumeration value="RESET" />
+              <xs:enumeration value="CANCEL" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element minOccurs="0" name="ReportingClassesFull">
+          <xs:annotation>
+            <xs:documentation>Reporting classes that are received with all necessary data.</xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="ReportingClass" type="ReportingClassCode">
+                <xs:annotation>
+                  <xs:documentation>The code of a reporting class.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element minOccurs="0" name="ReportingClassesPartial">
+          <xs:annotation>
+            <xs:documentation>Reporting classes that are received with some data missing (see Messages for errors/violations).</xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="ReportingClass" type="ReportingClassCode">
+                <xs:annotation>
+                  <xs:documentation>The code of a reporting class.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element minOccurs="0" name="ReportingClassesError">
+          <xs:annotation>
+            <xs:documentation>Reporting classes that are received with some data missing (see Messages for errors/violations).</xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="ReportingClass" type="ReportingClassCode">
+                <xs:annotation>
+                  <xs:documentation>The code of a reporting class.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element minOccurs="0" name="ReportingClassesResetted">
+          <xs:annotation>
+            <xs:documentation>Reporting classes that are resetted (due to a message with Type RESET).</xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="ReportingClass" type="ReportingClassCode">
+                <xs:annotation>
+                  <xs:documentation>The code of a reporting class.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Messages">
+          <xs:annotation>
+            <xs:documentation>Errors, Violations, etc.</xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="Message">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ID">
+                      <xs:annotation>
+                        <xs:documentation>ID (given from NSW)</xs:documentation>
+                      </xs:annotation>
+                      <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                          <xs:minLength value="3" />
+                          <xs:maxLength value="4" />
+                          <xs:pattern value="([1-9][0-9]{2,3})" />
+                        </xs:restriction>
+                      </xs:simpleType>
+                    </xs:element>
+                    <xs:element name="Type">
+                      <xs:annotation>
+                        <xs:documentation>Type of Message (functional error, process error in report, process error in message basket, process error during status request, or violation)</xs:documentation>
+                      </xs:annotation>
+                      <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                          <xs:enumeration value="INFO" />
+                          <xs:enumeration value="WARNING" />
+                          <xs:enumeration value="VIOLATION" />
+                          <xs:enumeration value="ERROR" />
+                        </xs:restriction>
+                      </xs:simpleType>
+                    </xs:element>
+                    <xs:element name="Location">
+                      <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                          <xs:minLength value="1" />
+                          <xs:maxLength value="32" />
+                        </xs:restriction>
+                      </xs:simpleType>
+                    </xs:element>
+                    <xs:element name="Text">
+                      <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                          <xs:minLength value="1" />
+                          <xs:maxLength value="255" />
+                        </xs:restriction>
+                      </xs:simpleType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:simpleType name="ReportingClassCode">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="NOA_NOD" />
+      <xs:enumeration value="ATA" />
+      <xs:enumeration value="ATD" />
+      <xs:enumeration value="SEC" />
+      <xs:enumeration value="AGNT" />
+      <xs:enumeration value="POBA" />
+      <xs:enumeration value="POBD" />
+      <xs:enumeration value="NAME" />
+      <xs:enumeration value="TIEFA" />
+      <xs:enumeration value="TIEFD" />
+      <xs:enumeration value="BKRA" />
+      <xs:enumeration value="BKRD" />
+      <xs:enumeration value="STAT" />
+      <xs:enumeration value="LADG" />
+      <xs:enumeration value="INFO" />
+      <xs:enumeration value="SERV" />
+      <xs:enumeration value="PRE72H" />
+      <xs:enumeration value="MDH" />
+      <xs:enumeration value="WAS" />
+      <xs:enumeration value="CREW" />
+      <xs:enumeration value="PAS" />
+      <xs:enumeration value="BPOL" />
+      <xs:enumeration value="TOWA" />
+      <xs:enumeration value="TOWD" />
+      <xs:enumeration value="HAZA" />
+      <xs:enumeration value="HAZD" />
+    </xs:restriction>
+  </xs:simpleType>
+</xs:schema>