diff --git a/scr/src/main/java/org/osgi/service/component/runtime/dto/ComponentConfigurationDTO.java b/scr/src/main/java/org/osgi/service/component/runtime/dto/ComponentConfigurationDTO.java
index b320f62..dc3227d 100755
--- a/scr/src/main/java/org/osgi/service/component/runtime/dto/ComponentConfigurationDTO.java
+++ b/scr/src/main/java/org/osgi/service/component/runtime/dto/ComponentConfigurationDTO.java
@@ -26,7 +26,7 @@
  * 
  * @since 1.3
  * @NotThreadSafe
- * @author $Id: f519b5fddd8002ffc252d039856acc8ba6f422d6 $
+ * @author $Id: a3e98bbac97a1d79805f9be0ed7f2ae811f112d0 $
  */
 public class ComponentConfigurationDTO extends DTO {
 	/**
@@ -65,22 +65,24 @@
 	public ComponentDescriptionDTO	description;
 
 	/**
-	 * The id of the component configuration.
-	 * 
-	 * <p>
-	 * The id is a non-persistent, unique value assigned at runtime. The id is
-	 * also available as the {@code component.id} component property.
-	 */
-	public long						id;
-
-	/**
 	 * The current state of the component configuration.
 	 * 
 	 * <p>
 	 * This is one of {@link #UNSATISFIED_CONFIGURATION},
 	 * {@link #UNSATISFIED_REFERENCE}, {@link #SATISFIED} or {@link #ACTIVE}.
 	 */
-	public int					state;
+	public int							state;
+
+	/**
+	 * The id of the component configuration.
+	 * 
+	 * <p>
+	 * The id is a non-persistent, unique value assigned at runtime. The id is
+	 * also available as the {@code component.id} component property. The value
+	 * of this field is unspecified if the state of this component configuration
+	 * is unsatisfied.
+	 */
+	public long							id;
 
 	/**
 	 * The component properties for the component configuration.
diff --git a/scr/src/main/java/org/osgi/service/component/runtime/dto/ReferenceDTO.java b/scr/src/main/java/org/osgi/service/component/runtime/dto/ReferenceDTO.java
index e4392bc..7d7fc31 100755
--- a/scr/src/main/java/org/osgi/service/component/runtime/dto/ReferenceDTO.java
+++ b/scr/src/main/java/org/osgi/service/component/runtime/dto/ReferenceDTO.java
@@ -23,7 +23,7 @@
  * 
  * @since 1.3
  * @NotThreadSafe
- * @author $Id: a02ee5ad7b783a19bf7e1d8f9dcc6f44685ccd41 $
+ * @author $Id: 906b26512776b149670ec3048a8714dc99ff447a $
  */
 public class ReferenceDTO extends DTO {
 
@@ -32,28 +32,28 @@
 	 * 
 	 * @see #strategy
 	 */
-	String			STRATEGY_LOOKUP			= "LOOKUP";
+	public static final String	STRATEGY_LOOKUP			= "LOOKUP";
 
 	/**
 	 * Constant for the method strategy
 	 * 
 	 * @see #strategy
 	 */
-	String			STRATEGY_METHOD			= "METHOD";
+	public static final String	STRATEGY_METHOD			= "METHOD";
 
 	/**
 	 * Constant for the field replace strategy
 	 * 
 	 * @see #strategy
 	 */
-	String			STRATEGY_FIELD_REPLACE	= "FIELD_REPLACE";
+	public static final String	STRATEGY_FIELD_REPLACE	= "FIELD_REPLACE";
 
 	/**
 	 * Constant for the field update strategy
 	 * 
 	 * @see #strategy
 	 */
-	String			STRATEGY_FIELD_UPDATE	= "FIELD_UPDATE";
+	public static final String	STRATEGY_FIELD_UPDATE	= "FIELD_UPDATE";
 
 	/**
 	 * The strategy of the reference.