diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 01dc2b6e48c1b2e189e5f0ff65992aa54062ece5..bac2e61ba4beea98f03091bee3f4bb730cf35ded 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
 #FindBugs User Preferences
-#Wed Mar 04 08:22:02 CET 2015
+#Tue Mar 17 16:42:14 CET 2015
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
diff --git a/src/main/java/teetime/framework/Pipeline.java b/src/main/java/teetime/framework/Pipeline.java
index 5b971756f600a54c1556455dd026bc41a69427ad..e5bafe82ead88ec7f211b72d511a158f330495df 100644
--- a/src/main/java/teetime/framework/Pipeline.java
+++ b/src/main/java/teetime/framework/Pipeline.java
@@ -12,7 +12,7 @@ import java.util.List;
  *            the type of the last stage in this pipeline
  */
 // TODO Consider to move it in the framework
-public final class Pipeline<L extends Stage> extends CompositeStage {
+public final class Pipeline<L extends Stage> extends AbstractCompositeStage {
 
 	private final Stage firstStage;
 	private final List<L> lastStages = new LinkedList<L>();
diff --git a/src/main/java/teetime/stage/io/filesystem/Dir2RecordsFilter.java b/src/main/java/teetime/stage/io/filesystem/Dir2RecordsFilter.java
index ffbf9d7d7d0a04b11642feba045e1a5d4f6f9398..1e174c9fa9814b25b15819b1f54e77c2eb2a82f1 100644
--- a/src/main/java/teetime/stage/io/filesystem/Dir2RecordsFilter.java
+++ b/src/main/java/teetime/stage/io/filesystem/Dir2RecordsFilter.java
@@ -19,7 +19,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;
 
-import teetime.framework.CompositeStage;
+import teetime.framework.AbstractCompositeStage;
 import teetime.framework.InputPort;
 import teetime.framework.OutputPort;
 import teetime.framework.Stage;
@@ -44,7 +44,7 @@ import kieker.common.util.filesystem.FSUtil;
  *
  * @since 1.0
  */
-public final class Dir2RecordsFilter extends CompositeStage {
+public final class Dir2RecordsFilter extends AbstractCompositeStage {
 
 	private final PipeFactoryRegistry pipeFactoryRegistry = PipeFactoryRegistry.INSTANCE;
 
diff --git a/src/main/java/teetime/stage/io/filesystem/format/text/file/DatFile2RecordFilter.java b/src/main/java/teetime/stage/io/filesystem/format/text/file/DatFile2RecordFilter.java
index 122e96b0dc2264f28e46693dcc7450ab507b72b4..2c83348f961a77b860580f847952787079511800 100644
--- a/src/main/java/teetime/stage/io/filesystem/format/text/file/DatFile2RecordFilter.java
+++ b/src/main/java/teetime/stage/io/filesystem/format/text/file/DatFile2RecordFilter.java
@@ -19,7 +19,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;
 
-import teetime.framework.CompositeStage;
+import teetime.framework.AbstractCompositeStage;
 import teetime.framework.InputPort;
 import teetime.framework.OutputPort;
 import teetime.framework.Stage;
@@ -37,7 +37,7 @@ import kieker.common.record.IMonitoringRecord;
  *
  * @since 1.10
  */
-public class DatFile2RecordFilter extends CompositeStage {
+public class DatFile2RecordFilter extends AbstractCompositeStage {
 
 	private final PipeFactoryRegistry pipeFactoryRegistry = PipeFactoryRegistry.INSTANCE;