diff -r e78d6e055a5b -r b34d53f6acdf activityfw/activityserviceplugin/src/afserviceplugin.cpp
--- a/activityfw/activityserviceplugin/src/afserviceplugin.cpp	Fri Jul 23 14:03:00 2010 +0300
+++ b/activityfw/activityserviceplugin/src/afserviceplugin.cpp	Fri Aug 06 13:40:46 2010 +0300
@@ -21,8 +21,11 @@
 #include <qabstractsecuritysession.h>
 #include <qservicecontext.h>
 
+#include "afstorageproxy.h"
 #include "afclient.h"
 #include "afmanager.h"
+#include "afactivation.h"
+#include "afactivitystorage.h"
 
 QObject *AfServicePlugin::createInstance(const QServiceInterfaceDescriptor &descriptor, QServiceContext *context, QAbstractSecuritySession *session)
 {
@@ -30,9 +33,13 @@
     Q_UNUSED(session);
 
     if (descriptor.interfaceName() == "com.nokia.qt.activities.ActivityClient") {
-        return new AfClient(QSharedPointer<AfStorageClient>(new AfStorageClient()));
+        return new AfClient(QSharedPointer<AfActivityStorage>(new AfActivityStorage()), QSharedPointer<AfActivation>(new AfActivation()));
     } else if (descriptor.interfaceName() == "com.nokia.qt.activities.ActivityManager") {
-        return new AfManager(QSharedPointer<AfStorageClient>(new AfStorageClient()));
+        return new AfManager(QSharedPointer<AfStorageProxy>(new AfStorageProxy()));
+    } else if (descriptor.interfaceName() == "com.nokia.qt.activities.Storage") {
+        return new AfActivityStorage();
+    } else if (descriptor.interfaceName() == "com.nokia.qt.activities.Activation") {
+        return new AfActivation();
     } else {
         return NULL;
     }