diff --git a/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java b/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java
index e7ee17f..fd316f1 100644
--- a/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java
+++ b/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java
@@ -47,13 +47,12 @@
 
         Class<?> serviceInterface = b.loadClass(serviceMetaData.getString(Params.service));
         String serviceFilter = serviceMetaData.getString(Params.filter, null);
-        Dictionary<String, Object> aspectProperties = serviceMetaData.getDictionary(Params.properties,
-            null);
+        Dictionary<String, Object> aspectProperties = serviceMetaData.getDictionary(Params.properties, null);
         int ranking = serviceMetaData.getInt(Params.ranking, 1);
         String implClass = serviceMetaData.getString(Params.impl);
-        Object impl = b.loadClass(implClass);
-        // TODO add attribute name
-        Service service = dm.createAspectService(serviceInterface, serviceFilter, ranking, null)
+        Object impl = b.loadClass(implClass);        
+        String field = serviceMetaData.getString(Params.field, null);        
+        Service service = dm.createAspectService(serviceInterface, serviceFilter, ranking, field)
                             .setImplementation(impl)
                             .setServiceProperties(aspectProperties);
         setCommonServiceParams(service, serviceMetaData);
diff --git a/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/Params.java b/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/Params.java
index 264d3da..fa0ffb7 100644
--- a/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/Params.java
+++ b/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/Params.java
@@ -53,5 +53,6 @@
     factoryPid,    
     factory,
     factoryConfigure,
-    name
+    name,
+    field
 }
