diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target
index 3de7c9e..146343c 100644
--- a/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -31,6 +31,11 @@
 		<repository location="http://download.eclipse.org/nebula/releases/latest"/>
 		<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.1.0.202011020719"/>
 	</location>
+	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<repository location="http://download.eclipse.org/collections/10.4.0/repository"/>
+		<unit id="org.eclipse.collections.feature.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.collections.feature.source.feature.group" version="0.0.0"/>
+	</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>
diff --git a/plugins/com.minres.scviewer.database.text/.classpath b/plugins/com.minres.scviewer.database.text/.classpath
index f0eb6dc..384de53 100644
--- a/plugins/com.minres.scviewer.database.text/.classpath
+++ b/plugins/com.minres.scviewer.database.text/.classpath
@@ -11,13 +11,9 @@
 			<attribute name="javadoc_location" value="jar:platform:/resource/com.minres.scviewer.database.text/lib/mapdb-3.0.7-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry exported="true" kind="lib" path="lib/eclipse-collections-9.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/eclipse-collections-api-9.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/eclipse-collections-forkjoin-9.2.0.jar"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/kotlin-stdlib-1.2.42.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lz4-1.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/elsa-3.0.0-M5.jar"/>
-	<classpathentry kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/com.minres.scviewer.database.text/.project b/plugins/com.minres.scviewer.database.text/.project
index e6c7553..fb8e0fc 100644
--- a/plugins/com.minres.scviewer.database.text/.project
+++ b/plugins/com.minres.scviewer.database.text/.project
@@ -33,7 +33,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
index ffdda45..3c4386c 100644
--- a/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
@@ -7,17 +7,13 @@ Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: com.minres.scviewer.database,
- org.codehaus.groovy;bundle-version="2.5.8",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: com.minres.scviewer.database.text
-Bundle-ClassPath: lib/mapdb-3.0.7.jar,
- .,
- lib/eclipse-collections-9.2.0.jar,
- lib/eclipse-collections-api-9.2.0.jar,
- lib/eclipse-collections-forkjoin-9.2.0.jar,
+Bundle-ClassPath: .,
+ lib/mapdb-3.0.7.jar,
  lib/kotlin-stdlib-1.2.42.jar,
  lib/lz4-1.3.0.jar,
  lib/elsa-3.0.0-M5.jar
diff --git a/plugins/com.minres.scviewer.database.text/build.properties b/plugins/com.minres.scviewer.database.text/build.properties
index 5a2fc62..391d9fb 100644
--- a/plugins/com.minres.scviewer.database.text/build.properties
+++ b/plugins/com.minres.scviewer.database.text/build.properties
@@ -13,9 +13,6 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                lib/,\
                lib/mapdb-3.0.7.jar,\
-               lib/eclipse-collections-9.2.0.jar,\
-               lib/eclipse-collections-api-9.2.0.jar,\
-               lib/eclipse-collections-forkjoin-9.2.0.jar,\
                lib/kotlin-stdlib-1.2.42.jar,\
                lib/lz4-1.3.0.jar,\
                lib/elsa-3.0.0-M5.jar
diff --git a/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-9.2.0.jar b/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-9.2.0.jar
deleted file mode 100755
index 694343e..0000000
Binary files a/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-9.2.0.jar and /dev/null differ
diff --git a/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-api-9.2.0.jar b/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-api-9.2.0.jar
deleted file mode 100755
index e585e77..0000000
Binary files a/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-api-9.2.0.jar and /dev/null differ
diff --git a/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-forkjoin-9.2.0.jar b/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-forkjoin-9.2.0.jar
deleted file mode 100755
index 2ccffc1..0000000
Binary files a/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-forkjoin-9.2.0.jar and /dev/null differ
diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java
index 51c2090..4fd6be9 100644
--- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java
+++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java
@@ -52,9 +52,9 @@ public class TextDbLoader implements IWaveformDbLoader{
 
 	DB mapDb;
     
-    TreeMap<Long, TxStream> txStreams;
+    Map<Long, TxStream> txStreams;
     
-    TreeMap<Long, TxGenerator> txGenerators;
+    Map<Long, TxGenerator> txGenerators;
     
     BTreeMap<Long, ScvTx> transactions;
     
@@ -121,8 +121,8 @@ public class TextDbLoader implements IWaveformDbLoader{
 			return false;
 		}
 		transactions=txSink.create();
-		txStreams=new TreeMap<>(parser.streamsById);
-		txGenerators=new TreeMap<>(parser.generatorsById);
+		txStreams=new HashMap<>(parser.streamsById);
+		txGenerators=new HashMap<>(parser.generatorsById);
 		txCache.clear();
 		return true;
 	}
diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.java
index bc6dbff..f8082f3 100644
--- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.java
+++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.java
@@ -10,20 +10,14 @@
  *******************************************************************************/
 package com.minres.scviewer.database.text;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.tx.ITx;
-import com.minres.scviewer.database.tx.ITxAttributeType;
 import com.minres.scviewer.database.tx.ITxGenerator;
 
-class TxGenerator implements ITxGenerator, Serializable{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -1477511353554904763L;
+class TxGenerator implements ITxGenerator {
 
 	Long id;
 
@@ -33,11 +27,11 @@ class TxGenerator implements ITxGenerator, Serializable{
 	
 	Boolean active = false;
 	
-	ArrayList<ITx> transactions=new ArrayList<ITx>();
+	List<ITx> transactions=new ArrayList<>();
 	
-	ArrayList<TxAttributeType> beginAttrs = new ArrayList<>();
+	List<TxAttributeType> beginAttrs = new ArrayList<>();
 	
-	ArrayList<TxAttributeType> endAttrs= new ArrayList<>();
+	List<TxAttributeType> endAttrs= new ArrayList<>();
 
 	TxGenerator(Long id, TxStream stream, String name){
 		this.id=id;
diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.java
index a36150f..943fb05 100644
--- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.java
+++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.java
@@ -1,16 +1,10 @@
 package com.minres.scviewer.database.text;
 
-import java.io.Serializable;
-
 import com.minres.scviewer.database.RelationType;
 import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxRelation;
 
-class TxRelation implements ITxRelation, Serializable {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -347668857680574140L;
+class TxRelation implements ITxRelation {
 
 	final TextDbLoader loader;