diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 745303908..057267435 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -4,136 +4,6 @@
     <bytecodeTargetLevel target="1.8">
       <module name="prowide-core.main" target="8" />
       <module name="prowide-core.test" target="8" />
-      <module name="prowide-iso20022.iso20022-core.main" target="8" />
-      <module name="prowide-iso20022.iso20022-core.test" target="8" />
-      <module name="prowide-iso20022.main" target="8" />
-      <module name="prowide-iso20022.model-acmt-mx.main" target="8" />
-      <module name="prowide-iso20022.model-acmt-mx.test" target="8" />
-      <module name="prowide-iso20022.model-acmt-types.main" target="8" />
-      <module name="prowide-iso20022.model-acmt-types.test" target="8" />
-      <module name="prowide-iso20022.model-admi-mx.main" target="8" />
-      <module name="prowide-iso20022.model-admi-mx.test" target="8" />
-      <module name="prowide-iso20022.model-admi-types.main" target="8" />
-      <module name="prowide-iso20022.model-admi-types.test" target="8" />
-      <module name="prowide-iso20022.model-auth-mx.main" target="8" />
-      <module name="prowide-iso20022.model-auth-mx.test" target="8" />
-      <module name="prowide-iso20022.model-auth-types.main" target="8" />
-      <module name="prowide-iso20022.model-auth-types.test" target="8" />
-      <module name="prowide-iso20022.model-caaa-mx.main" target="8" />
-      <module name="prowide-iso20022.model-caaa-mx.test" target="8" />
-      <module name="prowide-iso20022.model-caaa-types.main" target="8" />
-      <module name="prowide-iso20022.model-caaa-types.test" target="8" />
-      <module name="prowide-iso20022.model-caad-mx.main" target="8" />
-      <module name="prowide-iso20022.model-caad-mx.test" target="8" />
-      <module name="prowide-iso20022.model-caad-types.main" target="8" />
-      <module name="prowide-iso20022.model-caad-types.test" target="8" />
-      <module name="prowide-iso20022.model-caam-mx.main" target="8" />
-      <module name="prowide-iso20022.model-caam-mx.test" target="8" />
-      <module name="prowide-iso20022.model-caam-types.main" target="8" />
-      <module name="prowide-iso20022.model-caam-types.test" target="8" />
-      <module name="prowide-iso20022.model-cafc-mx.main" target="8" />
-      <module name="prowide-iso20022.model-cafc-mx.test" target="8" />
-      <module name="prowide-iso20022.model-cafc-types.main" target="8" />
-      <module name="prowide-iso20022.model-cafc-types.test" target="8" />
-      <module name="prowide-iso20022.model-cain-mx.main" target="8" />
-      <module name="prowide-iso20022.model-cain-mx.test" target="8" />
-      <module name="prowide-iso20022.model-cain-types.main" target="8" />
-      <module name="prowide-iso20022.model-cain-types.test" target="8" />
-      <module name="prowide-iso20022.model-camt-mx.main" target="8" />
-      <module name="prowide-iso20022.model-camt-mx.test" target="8" />
-      <module name="prowide-iso20022.model-camt-types.main" target="8" />
-      <module name="prowide-iso20022.model-camt-types.test" target="8" />
-      <module name="prowide-iso20022.model-casp-mx.main" target="8" />
-      <module name="prowide-iso20022.model-casp-mx.test" target="8" />
-      <module name="prowide-iso20022.model-casp-types.main" target="8" />
-      <module name="prowide-iso20022.model-casp-types.test" target="8" />
-      <module name="prowide-iso20022.model-catm-mx.main" target="8" />
-      <module name="prowide-iso20022.model-catm-mx.test" target="8" />
-      <module name="prowide-iso20022.model-catm-types.main" target="8" />
-      <module name="prowide-iso20022.model-catm-types.test" target="8" />
-      <module name="prowide-iso20022.model-catp-mx.main" target="8" />
-      <module name="prowide-iso20022.model-catp-mx.test" target="8" />
-      <module name="prowide-iso20022.model-catp-types.main" target="8" />
-      <module name="prowide-iso20022.model-catp-types.test" target="8" />
-      <module name="prowide-iso20022.model-cbrf-mx.main" target="8" />
-      <module name="prowide-iso20022.model-cbrf-mx.test" target="8" />
-      <module name="prowide-iso20022.model-cbrf-types.main" target="8" />
-      <module name="prowide-iso20022.model-cbrf-types.test" target="8" />
-      <module name="prowide-iso20022.model-colr-mx.main" target="8" />
-      <module name="prowide-iso20022.model-colr-mx.test" target="8" />
-      <module name="prowide-iso20022.model-colr-types.main" target="8" />
-      <module name="prowide-iso20022.model-colr-types.test" target="8" />
-      <module name="prowide-iso20022.model-common-types.main" target="8" />
-      <module name="prowide-iso20022.model-common-types.test" target="8" />
-      <module name="prowide-iso20022.model-fxtr-mx.main" target="8" />
-      <module name="prowide-iso20022.model-fxtr-mx.test" target="8" />
-      <module name="prowide-iso20022.model-fxtr-types.main" target="8" />
-      <module name="prowide-iso20022.model-fxtr-types.test" target="8" />
-      <module name="prowide-iso20022.model-pacs-mx.main" target="8" />
-      <module name="prowide-iso20022.model-pacs-mx.test" target="8" />
-      <module name="prowide-iso20022.model-pacs-types.main" target="8" />
-      <module name="prowide-iso20022.model-pacs-types.test" target="8" />
-      <module name="prowide-iso20022.model-pain-mx.main" target="8" />
-      <module name="prowide-iso20022.model-pain-mx.test" target="8" />
-      <module name="prowide-iso20022.model-pain-types.main" target="8" />
-      <module name="prowide-iso20022.model-pain-types.test" target="8" />
-      <module name="prowide-iso20022.model-reda-mx.main" target="8" />
-      <module name="prowide-iso20022.model-reda-mx.test" target="8" />
-      <module name="prowide-iso20022.model-reda-types.main" target="8" />
-      <module name="prowide-iso20022.model-reda-types.test" target="8" />
-      <module name="prowide-iso20022.model-remt-mx.main" target="8" />
-      <module name="prowide-iso20022.model-remt-mx.test" target="8" />
-      <module name="prowide-iso20022.model-remt-types.main" target="8" />
-      <module name="prowide-iso20022.model-remt-types.test" target="8" />
-      <module name="prowide-iso20022.model-secl-mx.main" target="8" />
-      <module name="prowide-iso20022.model-secl-mx.test" target="8" />
-      <module name="prowide-iso20022.model-secl-types.main" target="8" />
-      <module name="prowide-iso20022.model-secl-types.test" target="8" />
-      <module name="prowide-iso20022.model-seev-mx.main" target="8" />
-      <module name="prowide-iso20022.model-seev-mx.test" target="8" />
-      <module name="prowide-iso20022.model-seev-types.main" target="8" />
-      <module name="prowide-iso20022.model-seev-types.test" target="8" />
-      <module name="prowide-iso20022.model-semt-mx.main" target="8" />
-      <module name="prowide-iso20022.model-semt-mx.test" target="8" />
-      <module name="prowide-iso20022.model-semt-types.main" target="8" />
-      <module name="prowide-iso20022.model-semt-types.test" target="8" />
-      <module name="prowide-iso20022.model-sese-mx.main" target="8" />
-      <module name="prowide-iso20022.model-sese-mx.test" target="8" />
-      <module name="prowide-iso20022.model-sese-types.main" target="8" />
-      <module name="prowide-iso20022.model-sese-types.test" target="8" />
-      <module name="prowide-iso20022.model-seti-mx.main" target="8" />
-      <module name="prowide-iso20022.model-seti-mx.test" target="8" />
-      <module name="prowide-iso20022.model-seti-types.main" target="8" />
-      <module name="prowide-iso20022.model-seti-types.test" target="8" />
-      <module name="prowide-iso20022.model-setr-mx.main" target="8" />
-      <module name="prowide-iso20022.model-setr-mx.test" target="8" />
-      <module name="prowide-iso20022.model-setr-types.main" target="8" />
-      <module name="prowide-iso20022.model-setr-types.test" target="8" />
-      <module name="prowide-iso20022.model-supl-mx.main" target="8" />
-      <module name="prowide-iso20022.model-supl-mx.test" target="8" />
-      <module name="prowide-iso20022.model-supl-types.main" target="8" />
-      <module name="prowide-iso20022.model-supl-types.test" target="8" />
-      <module name="prowide-iso20022.model-trck-mx.main" target="8" />
-      <module name="prowide-iso20022.model-trck-mx.test" target="8" />
-      <module name="prowide-iso20022.model-trck-types.main" target="8" />
-      <module name="prowide-iso20022.model-trck-types.test" target="8" />
-      <module name="prowide-iso20022.model-tsin-mx.main" target="8" />
-      <module name="prowide-iso20022.model-tsin-mx.test" target="8" />
-      <module name="prowide-iso20022.model-tsin-types.main" target="8" />
-      <module name="prowide-iso20022.model-tsin-types.test" target="8" />
-      <module name="prowide-iso20022.model-tsmt-mx.main" target="8" />
-      <module name="prowide-iso20022.model-tsmt-mx.test" target="8" />
-      <module name="prowide-iso20022.model-tsmt-types.main" target="8" />
-      <module name="prowide-iso20022.model-tsmt-types.test" target="8" />
-      <module name="prowide-iso20022.model-tsrv-mx.main" target="8" />
-      <module name="prowide-iso20022.model-tsrv-mx.test" target="8" />
-      <module name="prowide-iso20022.model-tsrv-types.main" target="8" />
-      <module name="prowide-iso20022.model-tsrv-types.test" target="8" />
-      <module name="prowide-iso20022.model-xsys-mx.main" target="8" />
-      <module name="prowide-iso20022.model-xsys-mx.test" target="8" />
-      <module name="prowide-iso20022.model-xsys-types.main" target="8" />
-      <module name="prowide-iso20022.model-xsys-types.test" target="8" />
-      <module name="prowide-iso20022.test" target="8" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/iso20022-core/src/test/java/com/prowidesoftware/issues/Issue1958.java b/iso20022-core/src/test/java/com/prowidesoftware/issues/Issue1958.java
index 6d82cdf0f..a1ad67acf 100644
--- a/iso20022-core/src/test/java/com/prowidesoftware/issues/Issue1958.java
+++ b/iso20022-core/src/test/java/com/prowidesoftware/issues/Issue1958.java
@@ -1,10 +1,10 @@
 package com.prowidesoftware.issues;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 import com.prowidesoftware.swift.model.MxSwiftMessage;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.fail;
-
 public class Issue1958 {
 
     @Test