diff --git a/src/main/java/teetime/framework/Configuration.java b/src/main/java/teetime/framework/Configuration.java
index 418569c62fd9a946da894194e7aa33febac8e700..97e9c344ade98c7c9b65ce50ac0324bb5c77c125 100644
--- a/src/main/java/teetime/framework/Configuration.java
+++ b/src/main/java/teetime/framework/Configuration.java
@@ -28,7 +28,7 @@ import teetime.framework.exceptionHandling.TerminatingExceptionListenerFactory;
  */
 public abstract class Configuration extends AbstractCompositeStage {
 
-	private final IExceptionListenerFactory factory;
+	private final IExceptionListenerFactory<?> factory;
 	private final ConfigurationContext context;
 
 	private boolean executed;
@@ -38,7 +38,7 @@ public abstract class Configuration extends AbstractCompositeStage {
 		this(new TerminatingExceptionListenerFactory());
 	}
 
-	protected Configuration(final IExceptionListenerFactory factory) {
+	protected Configuration(final IExceptionListenerFactory<?> factory) {
 		this.factory = factory;
 		this.context = new ConfigurationContext(this);
 	}
@@ -51,7 +51,7 @@ public abstract class Configuration extends AbstractCompositeStage {
 		this.executed = executed;
 	}
 
-	public IExceptionListenerFactory getFactory() {
+	public IExceptionListenerFactory<?> getFactory() {
 		return factory;
 	}