diff --git a/src/main/java/teetime/framework/AbstractCompositeStage.java b/src/main/java/teetime/framework/AbstractCompositeStage.java
index 984ca18157bcdeab7809b13c0eeee41d7ddeaee8..d09ed0bb56bd9031c9b89e17899a76d76da6d293 100644
--- a/src/main/java/teetime/framework/AbstractCompositeStage.java
+++ b/src/main/java/teetime/framework/AbstractCompositeStage.java
@@ -18,7 +18,7 @@ package teetime.framework;
 /**
  * Represents a minimal stage that composes several other stages.
  *
- * @since 1.2
+ * @since 2.0
  *
  * @author Christian Wulf, Nelson Tavares de Sousa
  *
diff --git a/src/main/java/teetime/framework/Configuration.java b/src/main/java/teetime/framework/Configuration.java
index 35f225ea03a56e4cfe4a1e301c342331389dd0de..e01908f7399cfe10f70688ad0e4b4ad5118bb88c 100644
--- a/src/main/java/teetime/framework/Configuration.java
+++ b/src/main/java/teetime/framework/Configuration.java
@@ -1,5 +1,13 @@
 package teetime.framework;
 
+/**
+ *
+ *
+ * @author Christian Wulf, Nelson Tavares de Sousa
+ *
+ * @since 2.0
+ *
+ */
 public abstract class Configuration extends AbstractCompositeStage {
 
 	public Configuration() {
diff --git a/src/main/java/teetime/framework/ConfigurationContext.java b/src/main/java/teetime/framework/ConfigurationContext.java
index a89df56746a88171dc8b59b7b14543b90e4a7fbd..48122ca39835b8ead82e0b54b948a345a209ee35 100644
--- a/src/main/java/teetime/framework/ConfigurationContext.java
+++ b/src/main/java/teetime/framework/ConfigurationContext.java
@@ -31,6 +31,8 @@ import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication;
 /**
  * Represents a context that is used by a configuration and composite stages to connect ports, for example.
  * Stages can be added by executing {@link #addThreadableStage(Stage)}.
+ *
+ * @since 2.0
  */
 public final class ConfigurationContext {
 
diff --git a/src/main/java/teetime/framework/Execution.java b/src/main/java/teetime/framework/Execution.java
index 7c14597cfca2907e4bd9b722d4d48731511eca93..69148a4fd8cc96d4e940d72a0ce3efd727ce4023 100644
--- a/src/main/java/teetime/framework/Execution.java
+++ b/src/main/java/teetime/framework/Execution.java
@@ -44,6 +44,8 @@ import teetime.util.Pair;
  *
  * @param <T>
  *            the type of the {@link Configuration}
+ * 
+ * @since 2.0
  */
 public final class Execution<T extends Configuration> implements UncaughtExceptionHandler {