diff --git a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java
index 7cda7d1..f13ca0b 100644
--- a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java
+++ b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java
@@ -23,6 +23,7 @@ public class Myexternal implements BerType, Serializable {
   private BerObjectIdentifier directReference = null;
   private BerInteger indirectReference = null;
   private Encoding encoding = null;
+
   public Myexternal() {}
 
   public Myexternal(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java
index 53292cb..98f550b 100644
--- a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java
+++ b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java
@@ -23,6 +23,7 @@ public class Myexternal2 implements BerType, Serializable {
   private BerObjectIdentifier directReference = null;
   private BerInteger indirectReference = null;
   private Encoding encoding = null;
+
   public Myexternal2() {}
 
   public Myexternal2(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java
index 2f2f417..7ccf2d5 100644
--- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java
+++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java
@@ -17,6 +17,7 @@ public class CPAPPDU implements BerType, Serializable {
   public byte[] code = null;
   private ModeSelector modeSelector = null;
   private NormalModeParameters normalModeParameters = null;
+
   public CPAPPDU() {}
 
   public CPAPPDU(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java
index 92e062f..98362ba 100644
--- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java
+++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java
@@ -17,6 +17,7 @@ public class CPType implements BerType, Serializable {
   public byte[] code = null;
   private ModeSelector modeSelector = null;
   private NormalModeParameters normalModeParameters = null;
+
   public CPType() {}
 
   public CPType(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java
index 38153bb..db2534e 100644
--- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java
+++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java
@@ -19,6 +19,7 @@ public class ContextList implements BerType, Serializable {
   private static final long serialVersionUID = 1L;
   public byte[] code = null;
   private List<SEQUENCE> seqOf = null;
+
   public ContextList() {
     seqOf = new ArrayList<SEQUENCE>();
   }
@@ -145,6 +146,7 @@ public class ContextList implements BerType, Serializable {
     private PresentationContextIdentifier presentationContextIdentifier = null;
     private AbstractSyntaxName abstractSyntaxName = null;
     private TransferSyntaxNameList transferSyntaxNameList = null;
+
     public SEQUENCE() {}
 
     public SEQUENCE(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java
index 91becbf..3ec991d 100644
--- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java
+++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java
@@ -21,6 +21,7 @@ public class PDVList implements BerType, Serializable {
   private TransferSyntaxName transferSyntaxName = null;
   private PresentationContextIdentifier presentationContextIdentifier = null;
   private PresentationDataValues presentationDataValues = null;
+
   public PDVList() {}
 
   public PDVList(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java
index 9f0d126..d4ccbe1 100644
--- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java
+++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java
@@ -20,6 +20,7 @@ public class ResultList implements BerType, Serializable {
   private static final long serialVersionUID = 1L;
   public byte[] code = null;
   private List<SEQUENCE> seqOf = null;
+
   public ResultList() {
     seqOf = new ArrayList<SEQUENCE>();
   }
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java
index be56001..0127765 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java
@@ -19,6 +19,7 @@ public class AlternateAccess implements BerType, Serializable {
   private static final long serialVersionUID = 1L;
   public byte[] code = null;
   private List<CHOICE> seqOf = null;
+
   public AlternateAccess() {
     seqOf = new ArrayList<CHOICE>();
   }
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java
index f263b1d..b03dd15 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java
@@ -20,6 +20,7 @@ public class AlternateAccessSelection implements BerType, Serializable {
   private SelectAccess selectAccess = null;
 
   public AlternateAccessSelection() {}
+
   public AlternateAccessSelection(byte[] code) {
     this.code = code;
   }
@@ -137,6 +138,7 @@ public class AlternateAccessSelection implements BerType, Serializable {
     public byte[] code = null;
     private AccessSelection accessSelection = null;
     private AlternateAccess alternateAccess = null;
+
     public SelectAlternateAccess() {}
 
     public SelectAlternateAccess(byte[] code) {
@@ -280,7 +282,9 @@ public class AlternateAccessSelection implements BerType, Serializable {
       private Unsigned32 index = null;
       private IndexRange indexRange = null;
       private BerNull allElements = null;
+
       public AccessSelection() {}
+
       public AccessSelection(byte[] code) {
         this.code = code;
       }
@@ -705,7 +709,9 @@ public class AlternateAccessSelection implements BerType, Serializable {
     private Unsigned32 index = null;
     private IndexRange indexRange = null;
     private BerNull allElements = null;
+
     public SelectAccess() {}
+
     public SelectAccess(byte[] code) {
       this.code = code;
     }
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java
index b1d4980..32e5bc3 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java
@@ -35,7 +35,9 @@ public class Data implements BerType, Serializable {
   private TimeOfDay binaryTime = null;
   private MMSString mMSString = null;
   private UtcTime utcTime = null;
+
   public Data() {}
+
   public Data(byte[] code) {
     this.code = code;
   }
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java
index 30db7a0..96cc695 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java
@@ -22,7 +22,9 @@ public class DeleteNamedVariableListRequest implements BerType, Serializable {
   private BerInteger scopeOfDelete = null;
   private ListOfVariableListName listOfVariableListName = null;
   private DomainName domainName = null;
+
   public DeleteNamedVariableListRequest() {}
+
   public DeleteNamedVariableListRequest(byte[] code) {
     this.code = code;
   }
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java
index c6eb3ec..168303d 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java
@@ -21,6 +21,7 @@ public class FileDirectoryResponse implements BerType, Serializable {
   public byte[] code = null;
   private ListOfDirectoryEntry listOfDirectoryEntry = null;
   private BerBoolean moreFollows = null;
+
   public FileDirectoryResponse() {}
 
   public FileDirectoryResponse(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java
index 72eded1..b0b48ef 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java
@@ -19,6 +19,7 @@ public class GetNameListRequest implements BerType, Serializable {
   private ObjectClass objectClass = null;
   private ObjectScope objectScope = null;
   private Identifier continueAfter = null;
+
   public GetNameListRequest() {}
 
   public GetNameListRequest(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java
index f2df664..c5fd18a 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java
@@ -21,6 +21,7 @@ public class GetNameListResponse implements BerType, Serializable {
   public byte[] code = null;
   private ListOfIdentifier listOfIdentifier = null;
   private BerBoolean moreFollows = null;
+
   public GetNameListResponse() {}
 
   public GetNameListResponse(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java
index 2e1d6ab..e852b90 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java
@@ -20,6 +20,7 @@ public class InformationReport implements BerType, Serializable {
   public byte[] code = null;
   private VariableAccessSpecification variableAccessSpecification = null;
   private ListOfAccessResult listOfAccessResult = null;
+
   public InformationReport() {}
 
   public InformationReport(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java
index e597270..c8249b8 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java
@@ -20,6 +20,7 @@ public class InitiateRequestPDU implements BerType, Serializable {
   private Integer16 proposedMaxServOutstandingCalled = null;
   private Integer8 proposedDataStructureNestingLevel = null;
   private InitRequestDetail initRequestDetail = null;
+
   public InitiateRequestPDU() {}
 
   public InitiateRequestPDU(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java
index 4270e9f..7286f8e 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java
@@ -20,6 +20,7 @@ public class InitiateResponsePDU implements BerType, Serializable {
   private Integer16 negotiatedMaxServOutstandingCalled = null;
   private Integer8 negotiatedDataStructureNestingLevel = null;
   private InitResponseDetail initResponseDetail = null;
+
   public InitiateResponsePDU() {}
 
   public InitiateResponsePDU(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java
index 6d3f845..f9f1ee7 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java
@@ -18,6 +18,7 @@ public class ObjectName implements BerType, Serializable {
   private Identifier vmdSpecific = null;
   private DomainSpecific domainSpecific = null;
   private Identifier aaSpecific = null;
+
   public ObjectName() {}
 
   public ObjectName(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java
index 0b7ecd2..d698f5a 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java
@@ -20,6 +20,7 @@ public class ReadResponse implements BerType, Serializable {
   public byte[] code = null;
   private VariableAccessSpecification variableAccessSpecification = null;
   private ListOfAccessResult listOfAccessResult = null;
+
   public ReadResponse() {}
 
   public ReadResponse(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java
index 0819077..0a636ec 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java
@@ -18,6 +18,7 @@ public class RejectPDU implements BerType, Serializable {
   public byte[] code = null;
   private Unsigned32 originalInvokeID = null;
   private RejectReason rejectReason = null;
+
   public RejectPDU() {}
 
   public RejectPDU(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java
index 86a962e..4ba70b3 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java
@@ -20,6 +20,7 @@ public class ServiceError implements BerType, Serializable {
   private ErrorClass errorClass = null;
   private BerInteger additionalCode = null;
   private BerVisibleString additionalDescription = null;
+
   public ServiceError() {}
 
   public ServiceError(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java
index 3be1f06..f95e882 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java
@@ -32,7 +32,9 @@ public class TypeDescription implements BerType, Serializable {
   private BerBoolean binaryTime = null;
   private Integer32 mMSString = null;
   private BerNull utcTime = null;
+
   public TypeDescription() {}
+
   public TypeDescription(byte[] code) {
     this.code = code;
   }
@@ -613,6 +615,7 @@ public class TypeDescription implements BerType, Serializable {
     public byte[] code = null;
     private BerBoolean packed = null;
     private Components components = null;
+
     public Structure() {}
 
     public Structure(byte[] code) {
@@ -764,6 +767,7 @@ public class TypeDescription implements BerType, Serializable {
       private static final long serialVersionUID = 1L;
       public byte[] code = null;
       private List<SEQUENCE> seqOf = null;
+
       public Components() {
         seqOf = new ArrayList<SEQUENCE>();
       }
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java
index 194a413..143330a 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java
@@ -19,6 +19,7 @@ public class VariableDefs implements BerType, Serializable {
   private static final long serialVersionUID = 1L;
   public byte[] code = null;
   private List<SEQUENCE> seqOf = null;
+
   public VariableDefs() {
     seqOf = new ArrayList<SEQUENCE>();
   }
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java
index 5142b2f..69ddf10 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java
@@ -20,6 +20,7 @@ public class WriteRequest implements BerType, Serializable {
   public byte[] code = null;
   private VariableAccessSpecification variableAccessSpecification = null;
   private ListOfData listOfData = null;
+
   public WriteRequest() {}
 
   public WriteRequest(byte[] code) {
diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java
index 7f9cda6..82ac720 100644
--- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java
+++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java
@@ -20,6 +20,7 @@ public class WriteResponse implements BerType, Serializable {
   private static final long serialVersionUID = 1L;
   public byte[] code = null;
   private List<CHOICE> seqOf = null;
+
   public WriteResponse() {
     seqOf = new ArrayList<CHOICE>();
   }
diff --git a/src/main/java/com/beanit/josistack/AcseAssociation.java b/src/main/java/com/beanit/josistack/AcseAssociation.java
index 8bb6b68..441342f 100644
--- a/src/main/java/com/beanit/josistack/AcseAssociation.java
+++ b/src/main/java/com/beanit/josistack/AcseAssociation.java
@@ -13,6 +13,11 @@
  */
 package com.beanit.josistack;
 
+import com.beanit.jasn1.ber.ReverseByteArrayOutputStream;
+import com.beanit.jasn1.ber.types.BerAny;
+import com.beanit.jasn1.ber.types.BerInteger;
+import com.beanit.jasn1.ber.types.BerObjectIdentifier;
+import com.beanit.jasn1.ber.types.string.BerGraphicString;
 import com.beanit.josistack.internal.acse.asn1.AAREApdu;
 import com.beanit.josistack.internal.acse.asn1.AARQApdu;
 import com.beanit.josistack.internal.acse.asn1.ACSEApdu;
@@ -53,11 +58,6 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
-import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
-import org.openmuc.jasn1.ber.types.BerAny;
-import org.openmuc.jasn1.ber.types.BerInteger;
-import org.openmuc.jasn1.ber.types.BerObjectIdentifier;
-import org.openmuc.jasn1.ber.types.string.BerGraphicString;
 
 public final class AcseAssociation {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaBitString.java b/src/main/java/com/beanit/openiec61850/BdaBitString.java
index 6393a13..81c07a2 100644
--- a/src/main/java/com/beanit/openiec61850/BdaBitString.java
+++ b/src/main/java/com/beanit/openiec61850/BdaBitString.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerBitString;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.Integer32;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
-import org.openmuc.jasn1.ber.types.BerBitString;
 
 public abstract class BdaBitString extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaBoolean.java b/src/main/java/com/beanit/openiec61850/BdaBoolean.java
index de3f457..59ebc76 100644
--- a/src/main/java/com/beanit/openiec61850/BdaBoolean.java
+++ b/src/main/java/com/beanit/openiec61850/BdaBoolean.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerBoolean;
+import com.beanit.jasn1.ber.types.BerNull;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
-import org.openmuc.jasn1.ber.types.BerBoolean;
-import org.openmuc.jasn1.ber.types.BerNull;
 
 public final class BdaBoolean extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaEntryTime.java b/src/main/java/com/beanit/openiec61850/BdaEntryTime.java
index 949933d..6e90aa8 100644
--- a/src/main/java/com/beanit/openiec61850/BdaEntryTime.java
+++ b/src/main/java/com/beanit/openiec61850/BdaEntryTime.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerBoolean;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TimeOfDay;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
-import org.openmuc.jasn1.ber.types.BerBoolean;
 
 /**
  * BdaEntryTime stores time in terms of days and ms since 1984.
diff --git a/src/main/java/com/beanit/openiec61850/BdaInt128.java b/src/main/java/com/beanit/openiec61850/BdaInt128.java
index faddb98..14e4472 100644
--- a/src/main/java/com/beanit/openiec61850/BdaInt128.java
+++ b/src/main/java/com/beanit/openiec61850/BdaInt128.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerInteger;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
 import com.beanit.openiec61850.internal.mms.asn1.Unsigned8;
-import org.openmuc.jasn1.ber.types.BerInteger;
 
 public final class BdaInt128 extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaInt16.java b/src/main/java/com/beanit/openiec61850/BdaInt16.java
index a1f2424..1ca3856 100644
--- a/src/main/java/com/beanit/openiec61850/BdaInt16.java
+++ b/src/main/java/com/beanit/openiec61850/BdaInt16.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerInteger;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
 import com.beanit.openiec61850.internal.mms.asn1.Unsigned8;
-import org.openmuc.jasn1.ber.types.BerInteger;
 
 public final class BdaInt16 extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaInt16U.java b/src/main/java/com/beanit/openiec61850/BdaInt16U.java
index 077e7a0..8fc07b6 100644
--- a/src/main/java/com/beanit/openiec61850/BdaInt16U.java
+++ b/src/main/java/com/beanit/openiec61850/BdaInt16U.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerInteger;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
 import com.beanit.openiec61850.internal.mms.asn1.Unsigned8;
-import org.openmuc.jasn1.ber.types.BerInteger;
 
 public final class BdaInt16U extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaInt32.java b/src/main/java/com/beanit/openiec61850/BdaInt32.java
index 4f67ddb..6527f84 100644
--- a/src/main/java/com/beanit/openiec61850/BdaInt32.java
+++ b/src/main/java/com/beanit/openiec61850/BdaInt32.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerInteger;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
 import com.beanit.openiec61850.internal.mms.asn1.Unsigned8;
-import org.openmuc.jasn1.ber.types.BerInteger;
 
 public final class BdaInt32 extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaInt32U.java b/src/main/java/com/beanit/openiec61850/BdaInt32U.java
index 4e50e05..22b6e1b 100644
--- a/src/main/java/com/beanit/openiec61850/BdaInt32U.java
+++ b/src/main/java/com/beanit/openiec61850/BdaInt32U.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerInteger;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
 import com.beanit.openiec61850.internal.mms.asn1.Unsigned8;
-import org.openmuc.jasn1.ber.types.BerInteger;
 
 public final class BdaInt32U extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaInt64.java b/src/main/java/com/beanit/openiec61850/BdaInt64.java
index 8a421d5..096472a 100644
--- a/src/main/java/com/beanit/openiec61850/BdaInt64.java
+++ b/src/main/java/com/beanit/openiec61850/BdaInt64.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerInteger;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
 import com.beanit.openiec61850.internal.mms.asn1.Unsigned8;
-import org.openmuc.jasn1.ber.types.BerInteger;
 
 public final class BdaInt64 extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaInt8.java b/src/main/java/com/beanit/openiec61850/BdaInt8.java
index ab7e679..a01b2c6 100644
--- a/src/main/java/com/beanit/openiec61850/BdaInt8.java
+++ b/src/main/java/com/beanit/openiec61850/BdaInt8.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerInteger;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
 import com.beanit.openiec61850.internal.mms.asn1.Unsigned8;
-import org.openmuc.jasn1.ber.types.BerInteger;
 
 public final class BdaInt8 extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaInt8U.java b/src/main/java/com/beanit/openiec61850/BdaInt8U.java
index 1a30714..f741f9f 100644
--- a/src/main/java/com/beanit/openiec61850/BdaInt8U.java
+++ b/src/main/java/com/beanit/openiec61850/BdaInt8U.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerInteger;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
 import com.beanit.openiec61850.internal.mms.asn1.Unsigned8;
-import org.openmuc.jasn1.ber.types.BerInteger;
 
 public final class BdaInt8U extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaOctetString.java b/src/main/java/com/beanit/openiec61850/BdaOctetString.java
index e9d8703..c226f4b 100644
--- a/src/main/java/com/beanit/openiec61850/BdaOctetString.java
+++ b/src/main/java/com/beanit/openiec61850/BdaOctetString.java
@@ -13,11 +13,11 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerOctetString;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.Integer32;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
 import java.util.Arrays;
-import org.openmuc.jasn1.ber.types.BerOctetString;
 
 public final class BdaOctetString extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaTimestamp.java b/src/main/java/com/beanit/openiec61850/BdaTimestamp.java
index cffa98d..b0e9aa9 100644
--- a/src/main/java/com/beanit/openiec61850/BdaTimestamp.java
+++ b/src/main/java/com/beanit/openiec61850/BdaTimestamp.java
@@ -13,12 +13,12 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerNull;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
 import com.beanit.openiec61850.internal.mms.asn1.UtcTime;
 import java.util.Calendar;
 import java.util.Date;
-import org.openmuc.jasn1.ber.types.BerNull;
 
 public final class BdaTimestamp extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/BdaVisibleString.java b/src/main/java/com/beanit/openiec61850/BdaVisibleString.java
index 86c705a..351074b 100644
--- a/src/main/java/com/beanit/openiec61850/BdaVisibleString.java
+++ b/src/main/java/com/beanit/openiec61850/BdaVisibleString.java
@@ -13,10 +13,10 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.string.BerVisibleString;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.Integer32;
 import com.beanit.openiec61850.internal.mms.asn1.TypeDescription;
-import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 public final class BdaVisibleString extends BasicDataAttribute {
 
diff --git a/src/main/java/com/beanit/openiec61850/ClientAssociation.java b/src/main/java/com/beanit/openiec61850/ClientAssociation.java
index 42c976d..5e49d6e 100644
--- a/src/main/java/com/beanit/openiec61850/ClientAssociation.java
+++ b/src/main/java/com/beanit/openiec61850/ClientAssociation.java
@@ -13,6 +13,12 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.ReverseByteArrayOutputStream;
+import com.beanit.jasn1.ber.types.BerBoolean;
+import com.beanit.jasn1.ber.types.BerInteger;
+import com.beanit.jasn1.ber.types.BerNull;
+import com.beanit.jasn1.ber.types.string.BerGraphicString;
+import com.beanit.jasn1.ber.types.string.BerVisibleString;
 import com.beanit.josistack.AcseAssociation;
 import com.beanit.josistack.ByteBufferInputStream;
 import com.beanit.josistack.ClientAcseSap;
@@ -80,12 +86,6 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
-import org.openmuc.jasn1.ber.types.BerBoolean;
-import org.openmuc.jasn1.ber.types.BerInteger;
-import org.openmuc.jasn1.ber.types.BerNull;
-import org.openmuc.jasn1.ber.types.string.BerGraphicString;
-import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 /**
  * Represents an association/connection to an IEC 61850 MMS server. An instance of <code>
diff --git a/src/main/java/com/beanit/openiec61850/ServerAssociation.java b/src/main/java/com/beanit/openiec61850/ServerAssociation.java
index 1db08e1..aa1652c 100644
--- a/src/main/java/com/beanit/openiec61850/ServerAssociation.java
+++ b/src/main/java/com/beanit/openiec61850/ServerAssociation.java
@@ -13,6 +13,11 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.ReverseByteArrayOutputStream;
+import com.beanit.jasn1.ber.types.BerBoolean;
+import com.beanit.jasn1.ber.types.BerInteger;
+import com.beanit.jasn1.ber.types.BerNull;
+import com.beanit.jasn1.ber.types.string.BerVisibleString;
 import com.beanit.josistack.AcseAssociation;
 import com.beanit.josistack.ByteBufferInputStream;
 import com.beanit.josistack.DecodingException;
@@ -74,11 +79,6 @@ import java.util.ListIterator;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeoutException;
-import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
-import org.openmuc.jasn1.ber.types.BerBoolean;
-import org.openmuc.jasn1.ber.types.BerInteger;
-import org.openmuc.jasn1.ber.types.BerNull;
-import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/beanit/openiec61850/Urcb.java b/src/main/java/com/beanit/openiec61850/Urcb.java
index 8c08cbd..a07f5e7 100644
--- a/src/main/java/com/beanit/openiec61850/Urcb.java
+++ b/src/main/java/com/beanit/openiec61850/Urcb.java
@@ -13,6 +13,7 @@
  */
 package com.beanit.openiec61850;
 
+import com.beanit.jasn1.ber.types.BerBitString;
 import com.beanit.openiec61850.internal.mms.asn1.AccessResult;
 import com.beanit.openiec61850.internal.mms.asn1.Data;
 import com.beanit.openiec61850.internal.mms.asn1.Identifier;
@@ -30,7 +31,6 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import com.beanit.jasn1.ber.types.BerBitString;
 
 public class Urcb extends Rcb {