diff --git a/build.gradle b/build.gradle
index 05d0de2..0d308f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,9 +25,8 @@ dependencies {
     // one-record-ontologymodel from riege.com is a public GitHub repository
     // but not published on mavenCentral.
     // Nevertheless it can be retrieved via https://jitpack.io
-    // See also https://jitpack.io/#riege/one-record-ontologymodel/1.1.0
-    implementation('com.github.riege:one-record-ontologymodel:1.1.0') { transitive = false }
-
+    // See also https://jitpack.io/#riege/one-record-ontologymodel
+    implementation('com.riege:one-record-ontologymodel:1.1.2') { transitive = false }
     // cargoxml-jaxb from riege.com cannot be retrieved via https://jitpack.io
     // because building it requires access to the Cargo-XML Toolkit schema files
     // which are not included on GitHub and JitPack has not access to them!
diff --git a/src/main/java/com/riege/onerecord/converter/XFWB3toOneRecordConverter.java b/src/main/java/com/riege/onerecord/converter/XFWB3toOneRecordConverter.java
index 6db0d81..c958cca 100644
--- a/src/main/java/com/riege/onerecord/converter/XFWB3toOneRecordConverter.java
+++ b/src/main/java/com/riege/onerecord/converter/XFWB3toOneRecordConverter.java
@@ -107,7 +107,6 @@ public final class XFWB3toOneRecordConverter {
      * Converter for CargoXML XFWB into a OneRecord (master or direct) Waybill.
      *
      * @param xfwb CargoXML XFWB
-     * @return OneRecord Waybill - Master or Direct Waybill
      */
     public XFWB3toOneRecordConverter(WaybillType xfwb) {
         this.xfwb = xfwb;
@@ -1287,7 +1286,7 @@ private RegulatedEntity convert(CustomsInfo ci) {
         OtherIdentifier oi = OneRecordTypeConstants.createOtherIdentifier();
         oi.setOtherIdentifierType(regulated.getRegulatedEntityCategory());
         oi.setIdentifier(ci.getCustomsInfoNote());
-        company.getBranch().setOtherIdentifiers(oi);
+        company.getBranch().setOtherIdentifiers(buildSet(oi));
         regulated.setRegulatedEntityIdentifier(company);
         return regulated;
     }
@@ -1420,7 +1419,7 @@ private Company enhanceCompany(Company company, TextType xmlName, IDType xmlAcco
             OtherIdentifier oi = OneRecordTypeConstants.createOtherIdentifier();
             oi.setOtherIdentifierType(OneRecordTypeConstants.OTHER_IDENTIFIER_FORWARDER_ACCOUNT_NUMBER_AT_CARRIER);
             oi.setIdentifier(value);
-            company.getBranch().setOtherIdentifiers(oi);
+            company.getBranch().setOtherIdentifiers(buildSet(oi));
         }
 
         final Person person = OneRecordTypeConstants.createPerson();
@@ -1471,7 +1470,7 @@ private Company enhanceCompany(Company company, TextType xmlName, IDType xmlAcco
             if (mail != null) {
                 person.getContact().add(createContact(ContactTypeCode.EMAIL, mail));
             }
-            company.getBranch().setContactPersons(person);
+            company.getBranch().setContactPersons(buildSet(person));
         }
         return company;
     }