diff --git a/src/main/java/teetime/framework/Configuration.java b/src/main/java/teetime/framework/Configuration.java
index e01908f7399cfe10f70688ad0e4b4ad5118bb88c..ea1a69f123e7b74a651274c2c13949e3d36f532f 100644
--- a/src/main/java/teetime/framework/Configuration.java
+++ b/src/main/java/teetime/framework/Configuration.java
@@ -1,7 +1,7 @@
 package teetime.framework;
 
 /**
- *
+ * Represents a configuration of connected stages.
  *
  * @author Christian Wulf, Nelson Tavares de Sousa
  *
diff --git a/src/main/java/teetime/framework/ConfigurationContext.java b/src/main/java/teetime/framework/ConfigurationContext.java
index 4c6e011b890c15cd375ccff1a5be1490aeae8804..f1cdf0381f41e026b616fdea38eafb7d07a98577 100644
--- a/src/main/java/teetime/framework/ConfigurationContext.java
+++ b/src/main/java/teetime/framework/ConfigurationContext.java
@@ -35,6 +35,8 @@ public final class ConfigurationContext {
 
 	private final Set<Stage> threadableStages = new HashSet<Stage>();
 
+	ConfigurationContext() {}
+
 	Set<Stage> getThreadableStages() {
 		return this.threadableStages;
 	}
diff --git a/src/main/java/teetime/framework/Execution.java b/src/main/java/teetime/framework/Execution.java
index 6219bd924f0943444dc5bd4873c177bd9d482b91..fd15a5af31b35d32297d4bc453abbe195c952fce 100644
--- a/src/main/java/teetime/framework/Execution.java
+++ b/src/main/java/teetime/framework/Execution.java
@@ -44,7 +44,7 @@ import teetime.util.ThreadThrowableContainer;
  *
  * @param <T>
  *            the type of the {@link Configuration}
- * 
+ *
  * @since 2.0
  */
 public final class Execution<T extends Configuration> implements UncaughtExceptionHandler {
@@ -61,7 +61,7 @@ public final class Execution<T extends Configuration> implements UncaughtExcepti
 	private final List<Thread> finiteProducerThreads = new LinkedList<Thread>();
 	private final List<Thread> infiniteProducerThreads = new LinkedList<Thread>();
 
-	private final Collection<ThreadThrowableContainer<Thread, Throwable>> exceptions = new ConcurrentLinkedQueue<ThreadThrowableContainer<Thread, Throwable>>();
+	private final Collection<ThreadThrowableContainer> exceptions = new ConcurrentLinkedQueue<ThreadThrowableContainer>();
 
 	private final List<RunnableProducerStage> producerRunnables = new LinkedList<RunnableProducerStage>();
 
diff --git a/src/main/java/teetime/framework/ExecutionException.java b/src/main/java/teetime/framework/ExecutionException.java
index 60f595ba3a5509d4a2a24856d88b8022f1acefed..eff44d02e9c0c80a0cb4018614922b510cbebc20 100644
--- a/src/main/java/teetime/framework/ExecutionException.java
+++ b/src/main/java/teetime/framework/ExecutionException.java
@@ -32,9 +32,9 @@ public class ExecutionException extends RuntimeException {
 	 */
 	private static final long serialVersionUID = 7486086437171884298L;
 
-	private final Collection<ThreadThrowableContainer<Thread, Throwable>> exceptions;
+	private final Collection<ThreadThrowableContainer> exceptions;
 
-	public ExecutionException(final Collection<ThreadThrowableContainer<Thread, Throwable>> exceptions) {
+	public ExecutionException(final Collection<ThreadThrowableContainer> exceptions) {
 		super("Error(s) while running analysis. Check thrown exceptions.");
 		this.exceptions = exceptions;
 	}
@@ -45,7 +45,7 @@ public class ExecutionException extends RuntimeException {
 	 *
 	 * @return a collection of pairs
 	 */
-	public Collection<ThreadThrowableContainer<Thread, Throwable>> getThrownExceptions() {
+	public Collection<ThreadThrowableContainer> getThrownExceptions() {
 		return exceptions;
 	}
 
diff --git a/src/main/java/teetime/util/ThreadThrowableContainer.java b/src/main/java/teetime/util/ThreadThrowableContainer.java
index ecd6808ec33d71162161f8d8703bc868249e8010..bae87418eeed839dba82b2c4862a7e4d2bd0464a 100644
--- a/src/main/java/teetime/util/ThreadThrowableContainer.java
+++ b/src/main/java/teetime/util/ThreadThrowableContainer.java
@@ -15,30 +15,25 @@
  */
 package teetime.util;
 
-/**
- * @deprecated since 2.0
- */
-@Deprecated
-// See http://stackoverflow.com/questions/156275/what-is-the-equivalent-of-the-c-pairl-r-in-java
-public final class ThreadThrowableContainer<F, S> {
+public final class ThreadThrowableContainer {
 
-	private final F first;
-	private final S second;
+	private final Thread first;
+	private final Throwable second;
 
-	public ThreadThrowableContainer(final F first, final S second) {
+	public ThreadThrowableContainer(final Thread first, final Throwable second) {
 		this.first = first;
 		this.second = second;
 	}
 
-	public static <F, S> ThreadThrowableContainer<F, S> of(final F first, final S second) {
-		return new ThreadThrowableContainer<F, S>(first, second);
+	public static ThreadThrowableContainer of(final Thread first, final Throwable second) {
+		return new ThreadThrowableContainer(first, second);
 	}
 
-	public F getFirst() {
+	public Thread getThread() {
 		return this.first;
 	}
 
-	public S getSecond() {
+	public Throwable getThrowable() {
 		return this.second;
 	}
 
diff --git a/src/test/java/teetime/framework/RunnableConsumerStageTest.java b/src/test/java/teetime/framework/RunnableConsumerStageTest.java
index f894429eca0570903508e1f89acd272386515c56..11aff4bdcb54aecafa99035671b930a084f76e0b 100644
--- a/src/test/java/teetime/framework/RunnableConsumerStageTest.java
+++ b/src/test/java/teetime/framework/RunnableConsumerStageTest.java
@@ -118,16 +118,16 @@ public class RunnableConsumerStageTest {
 	}
 
 	private void start(final Execution execution) {
-		Collection<ThreadThrowableContainer<Thread, Throwable>> exceptions = new ArrayList<ThreadThrowableContainer<Thread, Throwable>>();
+		Collection<ThreadThrowableContainer> exceptions = new ArrayList<ThreadThrowableContainer>();
 		try {
 			execution.executeBlocking();
 		} catch (ExecutionException e) {
 			exceptions = e.getThrownExceptions();
 		}
-		for (ThreadThrowableContainer<Thread, Throwable> pair : exceptions) {
-			System.err.println(pair.getSecond());
-			System.err.println(Joiner.on("\n").join(pair.getSecond().getStackTrace()));
-			throw new AssertionError(pair.getSecond());
+		for (ThreadThrowableContainer pair : exceptions) {
+			System.err.println(pair.getThrowable());
+			System.err.println(Joiner.on("\n").join(pair.getThrowable().getStackTrace()));
+			throw new AssertionError(pair.getThrowable());
 		}
 		assertEquals(0, exceptions.size());
 	}
diff --git a/src/test/java/teetime/stage/InstanceOfFilterTest.java b/src/test/java/teetime/stage/InstanceOfFilterTest.java
index a9e8d1acf9fe80ae432a560d13f46eb6747e9d3f..d2f90dc16322727d212d6abcf1464b17daaa496a 100644
--- a/src/test/java/teetime/stage/InstanceOfFilterTest.java
+++ b/src/test/java/teetime/stage/InstanceOfFilterTest.java
@@ -117,7 +117,7 @@ public class InstanceOfFilterTest {
 		try {
 			execution.executeBlocking();
 		} catch (ExecutionException e) {
-			Collection<ThreadThrowableContainer<Thread, Throwable>> thrownExceptions = e.getThrownExceptions();
+			Collection<ThreadThrowableContainer> thrownExceptions = e.getThrownExceptions();
 			// TODO: handle exception
 		}
 	}